Refactor Admin and Upload APIs

Author: YomesInc

CloudinaryDotNet/ApiShared.Internal.cs

@@ -73,11 +73,7 @@ internal virtual Task<T> CallApiAsync<T>(
             CancellationToken? cancellationToken = null)
             where T : BaseResult, new()
         {
-            parameters?.Check();
-
-            var callParams = (method == HttpMethod.PUT || method == HttpMethod.POST)
-                ? parameters?.ToParamsDictionary()
-                : null;
+            var callParams = GetCallParams(method, parameters);
 
             return CallAndParseAsync<T>(method, url, callParams, file, extraHeaders, cancellationToken);
         }
@@ -95,12 +91,12 @@ internal virtual Task<T> CallApiAsync<T>(
         internal virtual T CallApi<T>(HttpMethod method, string url, BaseParams parameters, FileDescription file, Dictionary<string, string> extraHeaders = null)
             where T : BaseResult, new()
         {
-            parameters?.Check();
+            var callParams = GetCallParams(method, parameters);
 
             return CallAndParse<T>(
                 method,
                 url,
-                (method == HttpMethod.PUT || method == HttpMethod.POST) ? parameters?.ToParamsDictionary() : null,
+                callParams,
                 file,
                 extraHeaders);
         }
@@ -252,6 +248,14 @@ protected void HandleUnsignedParameters(IDictionary<string, object> parameters)
             }
         }
 
+        private static SortedDictionary<string, object> GetCallParams(HttpMethod method, BaseParams parameters)
+        {
+            parameters?.Check();
+            return (method == HttpMethod.PUT || method == HttpMethod.POST)
+                            ? parameters?.ToParamsDictionary()
+                            : null;
+        }
+
         private static T CreateResult<T>(HttpResponseMessage response, Stream s)
             where T : BaseResult
         {

CloudinaryDotNet/Cloudinary.MetadataFields.cs renamed to CloudinaryDotNet/Cloudinary.AdminApi.MetadataFields.cs

@@ -18,7 +18,7 @@ public partial class Cloudinary
         public MetadataFieldResult AddMetadataField<T>(MetadataFieldCreateParams<T> parameters)
         {
             var url = m_api.ApiUrlMetadataFieldV.BuildUrl();
-            var result = m_api.CallApi<MetadataFieldResult>(HttpMethod.POST, url, parameters, null, PrepareHeaders());
+            var result = CallAdminApiAsync<MetadataFieldResult>(HttpMethod.POST, url, parameters, null, PrepareHeaders()).GetAwaiter().GetResult();
             return result;
         }
 
@@ -28,8 +28,8 @@ public MetadataFieldResult AddMetadataField<T>(MetadataFieldCreateParams<T> para
         /// <returns>Parsed list of metadata field definitions.</returns>
         public MetadataFieldListResult ListMetadataFields()
         {
-            var result = m_api.CallApi<MetadataFieldListResult>(
-                HttpMethod.GET, m_api.ApiUrlMetadataFieldV.BuildUrl(), null, null);
+            var result = CallAdminApiAsync<MetadataFieldListResult>(
+                HttpMethod.GET, m_api.ApiUrlMetadataFieldV.BuildUrl(), null, null).GetAwaiter().GetResult();
             return result;
         }
 
@@ -41,7 +41,7 @@ public MetadataFieldListResult ListMetadataFields()
         public MetadataFieldResult GetMetadataField(string fieldExternalId)
         {
             var url = m_api.ApiUrlMetadataFieldV.Add(fieldExternalId).BuildUrl();
-            var result = m_api.CallApi<MetadataFieldResult>(HttpMethod.GET, url, null, null);
+            var result = CallAdminApiAsync<MetadataFieldResult>(HttpMethod.GET, url, null, null).GetAwaiter().GetResult();
             return result;
         }
 
@@ -61,7 +61,7 @@ public MetadataFieldResult UpdateMetadataField<T>(string fieldExternalId, Metada
             }
 
             var url = m_api.ApiUrlMetadataFieldV.Add(fieldExternalId).BuildUrl();
-            var result = m_api.CallApi<MetadataFieldResult>(HttpMethod.PUT, url, parameters, null, PrepareHeaders());
+            var result = CallAdminApiAsync<MetadataFieldResult>(HttpMethod.PUT, url, parameters, null, PrepareHeaders()).GetAwaiter().GetResult();
             return result;
         }
 
@@ -81,7 +81,7 @@ public MetadataDataSourceResult UpdateMetadataDataSourceEntries(string fieldExte
             }
 
             var url = m_api.ApiUrlMetadataFieldV.Add(fieldExternalId).Add(Constants.DATASOURCE_MANAGMENT).BuildUrl();
-            var result = m_api.CallApi<MetadataDataSourceResult>(HttpMethod.PUT, url, parameters, null, PrepareHeaders());
+            var result = CallAdminApiAsync<MetadataDataSourceResult>(HttpMethod.PUT, url, parameters, null, PrepareHeaders()).GetAwaiter().GetResult();
             return result;
         }
 
@@ -99,7 +99,7 @@ public DelMetadataFieldResult DeleteMetadataField(string fieldExternalId)
             }
 
             var url = m_api.ApiUrlMetadataFieldV.Add(fieldExternalId).BuildUrl();
-            var result = m_api.CallApi<DelMetadataFieldResult>(HttpMethod.DELETE, url, null, null);
+            var result = CallAdminApiAsync<DelMetadataFieldResult>(HttpMethod.DELETE, url, null, null).GetAwaiter().GetResult();
             return result;
         }
 
@@ -113,7 +113,7 @@ public DelMetadataFieldResult DeleteMetadataField(string fieldExternalId)
         public MetadataDataSourceResult DeleteMetadataDataSourceEntries(string fieldExternalId, List<string> entriesExternalIds)
         {
             var url = PrepareUrlForDatasourceOperation(fieldExternalId, entriesExternalIds, Constants.DATASOURCE_MANAGMENT);
-            var result = m_api.CallApi<MetadataDataSourceResult>(HttpMethod.DELETE, url, null, null);
+            var result = CallAdminApiAsync<MetadataDataSourceResult>(HttpMethod.DELETE, url, null, null).GetAwaiter().GetResult();
             return result;
         }
 
@@ -127,7 +127,7 @@ public MetadataDataSourceResult DeleteMetadataDataSourceEntries(string fieldExte
         public MetadataDataSourceResult RestoreMetadataDataSourceEntries(string fieldExternalId, List<string> entriesExternalIds)
         {
             var url = PrepareUrlForDatasourceOperation(fieldExternalId, entriesExternalIds, $"{Constants.DATASOURCE_MANAGMENT}_restore");
-            var result = m_api.CallApi<MetadataDataSourceResult>(HttpMethod.POST, url, null, null);
+            var result = CallAdminApiAsync<MetadataDataSourceResult>(HttpMethod.POST, url, null, null).GetAwaiter().GetResult();
             return result;
         }
 
@@ -145,7 +145,7 @@ public MetadataUpdateResult UpdateMetadata(MetadataUpdateParams parameters)
                 Add(Api.GetCloudinaryParam(parameters.ResourceType)).
                 Add(Constants.METADATA).
                 BuildUrl();
-            var result = m_api.CallApi<MetadataUpdateResult>(HttpMethod.POST, url, parameters, null);
+            var result = CallAdminApiAsync<MetadataUpdateResult>(HttpMethod.POST, url, parameters, null).GetAwaiter().GetResult();
             return result;
         }
 

CloudinaryDotNet/Cloudinary.StreamingProfiles.cs renamed to CloudinaryDotNet/Cloudinary.AdminApi.StreamingProfiles.cs

@@ -115,12 +115,10 @@ public StreamingProfileResult GetStreamingProfile(string name)
         /// <returns>Detailed information about streaming profiles.</returns>
         public Task<StreamingProfileListResult> ListStreamingProfilesAsync(CancellationToken? cancellationToken = null)
         {
-            return m_api.CallApiAsync<StreamingProfileListResult>(
+            return CallAdminApiAsync<StreamingProfileListResult>(
                 HttpMethod.GET,
                 m_api.ApiUrlStreamingProfileV.BuildUrl(),
                 null,
-                null,
-                null,
                 cancellationToken);
         }
 
@@ -130,8 +128,7 @@ public Task<StreamingProfileListResult> ListStreamingProfilesAsync(CancellationT
         /// <returns>Detailed information about streaming profiles.</returns>
         public StreamingProfileListResult ListStreamingProfiles()
         {
-            return m_api.CallApi<StreamingProfileListResult>(
-                HttpMethod.GET, m_api.ApiUrlStreamingProfileV.BuildUrl(), null, null);
+            return ListStreamingProfilesAsync().GetAwaiter().GetResult();
         }
 
         private static void ValidateCallStreamingProfileApiParameters(string name, StreamingProfileUpdateParams parameters)
@@ -162,22 +159,20 @@ private Task<StreamingProfileResult> CallStreamingProfileApiAsync(
             CancellationToken? cancellationToken,
             string name = null)
         {
-            return m_api.CallApiAsync<StreamingProfileResult>(
+            return CallAdminApiAsync<StreamingProfileResult>(
                 httpMethod,
                 m_api.ApiUrlStreamingProfileV.Add(name).BuildUrl(),
                 parameters,
-                null,
-                null,
                 cancellationToken);
         }
 
         private StreamingProfileResult CallStreamingProfileApi(HttpMethod httpMethod, BaseParams parameters, string name = null)
         {
-            return m_api.CallApi<StreamingProfileResult>(
+            return CallStreamingProfileApiAsync(
                 httpMethod,
-                m_api.ApiUrlStreamingProfileV.Add(name).BuildUrl(),
                 parameters,
-                null);
+                null,
+                name).GetAwaiter().GetResult();
         }
     }
 }