ListBuckets API implementation. The Response object for the API. (#457)

minio · Sep 15, 2020 · dd1342c · dd1342c
1 parent d49910c
commit dd1342c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/Minio/ApiEndpoints/BucketOperations.cs b/Minio/ApiEndpoints/BucketOperations.cs
@@ -142,28 +142,20 @@ public partial class MinioClient : IBucketOperations
             await this.ExecuteTaskAsync(this.NoErrorHandlers, request, cancellationToken).ConfigureAwait(false);
         }
 
-
         /// <summary>
-        /// List all objects in a bucket
+        /// List all the buckets for the current Endpoint URL
         /// </summary>
         /// <param name="cancellationToken">Optional cancellation token to cancel the operation</param>
         /// <returns>Task with an iterator lazily populated with objects</returns>
         public async Task<ListAllMyBucketsResult> ListBucketsAsync(CancellationToken cancellationToken = default(CancellationToken))
         {
             var request = await this.CreateRequest(Method.GET, resourcePath: "/").ConfigureAwait(false);
             var response = await this.ExecuteTaskAsync(this.NoErrorHandlers, request, cancellationToken).ConfigureAwait(false);
-
-            ListAllMyBucketsResult bucketList = new ListAllMyBucketsResult();
-            if (HttpStatusCode.OK.Equals(response.StatusCode))
-            {
-                var contentBytes = System.Text.Encoding.UTF8.GetBytes(response.Content);
-                using (var stream = new MemoryStream(contentBytes))
-                    bucketList = (ListAllMyBucketsResult)new XmlSerializer(typeof(ListAllMyBucketsResult)).Deserialize(stream);
-                return bucketList;
-            }
-            return bucketList;
+            ListBucketsResponse listBucketsResponse = new ListBucketsResponse(response.StatusCode, response.Content);
+            return listBucketsResponse.BucketsResult;
         }
 
+
         /// <summary>
         /// Create a private bucket with the given name.
         /// </summary>

diff --git a/Minio/DataModel/BucketOperationsReponse.cs b/Minio/DataModel/BucketOperationsReponse.cs
@@ -25,18 +25,34 @@ internal class GetVersioningResponse : GenericResponse
     {
         internal VersioningConfiguration VersioningConfig { get; set; }
         internal GetVersioningResponse(HttpStatusCode statusCode, string responseContent)
-            : base(statusCode, responseContent)
+                    : base(statusCode, responseContent)
         {
-            if ( string.IsNullOrEmpty(responseContent) )
+            if (string.IsNullOrEmpty(responseContent) ||
+                    !HttpStatusCode.OK.Equals(statusCode))
             {
                 return;
             }
-            if (HttpStatusCode.OK.Equals(statusCode))
+            using (var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(responseContent)))
             {
-                using (var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(responseContent)))
-                {
-                    this.VersioningConfig = (VersioningConfiguration)new XmlSerializer(typeof(VersioningConfiguration)).Deserialize(stream);
-                }
+                this.VersioningConfig = (VersioningConfiguration)new XmlSerializer(typeof(VersioningConfiguration)).Deserialize(stream);
+            }
+        }
+    }
+
+    internal class ListBucketsResponse : GenericResponse
+    {
+        internal ListAllMyBucketsResult BucketsResult;
+        internal ListBucketsResponse(HttpStatusCode statusCode, string responseContent)
+                    : base(statusCode, responseContent)
+        {
+            if (string.IsNullOrEmpty(responseContent) ||
+                    !HttpStatusCode.OK.Equals(statusCode))
+            {
+                return;
+            }
+            using (var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(responseContent)))
+            {
+                this.BucketsResult = (ListAllMyBucketsResult)new XmlSerializer(typeof(ListAllMyBucketsResult)).Deserialize(stream);
             }
         }
     }