Revert API change to IHttpService

sharwell · sharwell · commit 5042a321ee41 · 2015-05-13T22:11:26.000-05:00
Media type is just like any other property that can be altered between the
time the HttpRequestMessage is created and the HTTP request is actually sent.
diff --git a/src/OpenStack.Net/OpenStack/Services/ContentDelivery/V1/ContentDeliveryClient.cs b/src/OpenStack.Net/OpenStack/Services/ContentDelivery/V1/ContentDeliveryClient.cs
@@ -57,7 +57,7 @@ public virtual Task<GetHomeApiCall> PrepareGetHomeAsync(CancellationToken cancel
             UriTemplate template = new UriTemplate(string.Empty);
             Dictionary<string, string> parameters = new Dictionary<string, string>();
             return GetBaseUriAsync(cancellationToken)
-                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken, "application/json"))
+                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken))
                 .Select(task => new GetHomeApiCall(CreateJsonApiCall<HomeDocument>(task.Result)));
         }
 
@@ -79,7 +79,7 @@ public virtual Task<PingApiCall> PreparePingAsync(CancellationToken cancellation
             UriTemplate template = new UriTemplate("ping");
             Dictionary<string, string> parameters = new Dictionary<string, string>();
             return GetBaseUriAsync(cancellationToken)
-                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken, "application/json"))
+                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken))
                 //.Select(RemoveAcceptHeader) **DLS**
                 .Select(task => new PingApiCall(CreateBasicApiCall(task.Result)));
         }
@@ -209,8 +209,14 @@ public virtual Task<UpdateServiceApiCall> PrepareUpdateServiceAsync(ServiceId se
             UriTemplate template = new UriTemplate("services/{service_id}");
             Dictionary<string, string> parameters = new Dictionary<string, string> { { "service_id", serviceId.Value } };
             return GetBaseUriAsync(cancellationToken)
-                .Then(PrepareRequestAsyncFunc(new HttpMethod("PATCH"), "application/json-patch+json", template, parameters, jsonPatchDocument, cancellationToken))
-                .Select(task => new UpdateServiceApiCall(CreateBasicApiCall(task.Result)));
+                .Then(PrepareRequestAsyncFunc(new HttpMethod("PATCH"), template, parameters, jsonPatchDocument, cancellationToken))
+                .Select(
+                    task =>
+                    {
+                        HttpRequestMessage requestMessage = task.Result;
+                        requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json-patch+json");
+                        return new UpdateServiceApiCall(CreateBasicApiCall(requestMessage));
+                    });
         }
 
         /// <inheritdoc/>
diff --git a/src/OpenStack.Net/OpenStack/Services/IHttpService.cs b/src/OpenStack.Net/OpenStack/Services/IHttpService.cs
@@ -38,7 +38,7 @@ public interface IHttpService : IDisposable
         /// <para>-or-</para>
         /// <para>If <paramref name="parameters"/> is <see langword="null"/>.</para>
         /// </exception>
-        Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T>(HttpMethod method, UriTemplate template, IDictionary<string, T> parameters, CancellationToken cancellationToken, string mediaType);
+        Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T>(HttpMethod method, UriTemplate template, IDictionary<string, T> parameters, CancellationToken cancellationToken);
 
         /// <summary>
         /// Creates a task continuation function responsible for creating an <see cref="HttpRequestMessage"/> for use in
@@ -66,7 +66,7 @@ public interface IHttpService : IDisposable
         /// <para>-or-</para>
         /// <para>If <paramref name="parameters"/> is <see langword="null"/>.</para>
         /// </exception>
-        Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T, TBody>(HttpMethod method, UriTemplate template, IDictionary<string, T> parameters, TBody body, CancellationToken cancellationToken, string mediaType);
+        Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T, TBody>(HttpMethod method, UriTemplate template, IDictionary<string, T> parameters, TBody body, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets the base absolute URI to use for making asynchronous HTTP API calls to this service.
diff --git a/src/OpenStack.Net/OpenStack/Services/Identity/BaseIdentityClient.cs b/src/OpenStack.Net/OpenStack/Services/Identity/BaseIdentityClient.cs
@@ -141,7 +141,7 @@ public virtual Task<ListApiVersionsApiCall> PrepareListApiVersionsAsync(Cancella
                 };
 
             return GetBaseUriAsync(cancellationToken)
-                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken, "application/json"))
+                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken))
                 .Select(task => new ListApiVersionsApiCall(CreateCustomApiCall(task.Result, HttpCompletionOption.ResponseContentRead, deserializeResult)));
         }
 
@@ -152,7 +152,7 @@ public virtual Task<GetApiVersionApiCall> PrepareGetApiVersionAsync(ApiVersionId
             Dictionary<string, string> parameters = new Dictionary<string, string> { { "version_id", apiVersionId.Value } };
 
             return GetBaseUriAsync(cancellationToken)
-                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken, "application/json"))
+                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken))
                 .Select(task => new GetApiVersionApiCall(CreateJsonApiCall<ApiVersionResponse>(task.Result)));
         }
 
diff --git a/src/OpenStack.Net/OpenStack/Services/Identity/V2/IdentityClient.cs b/src/OpenStack.Net/OpenStack/Services/Identity/V2/IdentityClient.cs
@@ -127,7 +127,7 @@ public virtual Task<ListExtensionsApiCall> PrepareListExtensionsAsync(Cancellati
                 };
 
             return GetBaseUriAsync(cancellationToken)
-                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken, "application/json"))
+                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken))
                 .Select(task => new ListExtensionsApiCall(CreateCustomApiCall(task.Result, HttpCompletionOption.ResponseContentRead, deserializeResult)));
         }
 
@@ -141,7 +141,7 @@ public virtual Task<GetExtensionApiCall> PrepareGetExtensionAsync(ExtensionAlias
             Dictionary<string, string> parameters = new Dictionary<string, string> { { "alias", alias.Value } };
 
             return GetBaseUriAsync(cancellationToken)
-                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken, "application/json"))
+                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken))
                 .Select(task => new GetExtensionApiCall(CreateJsonApiCall<ExtensionResponse>(task.Result)));
         }
 
@@ -152,7 +152,7 @@ public virtual Task<AuthenticateApiCall> PrepareAuthenticateAsync(Authentication
             Dictionary<string, string> parameters = new Dictionary<string, string>();
 
             return GetBaseUriAsync(cancellationToken)
-                .Then(PrepareRequestAsyncFunc(HttpMethod.Post, template, parameters, request, cancellationToken, "application/json"))
+                .Then(PrepareRequestAsyncFunc(HttpMethod.Post, template, parameters, request, cancellationToken))
                 .Select(task => new AuthenticateApiCall(CreateJsonApiCall<AccessResponse>(task.Result)));
         }
 
@@ -208,7 +208,7 @@ public virtual Task<ListTenantsApiCall> PrepareListTenantsAsync(CancellationToke
                 };
 
             return GetBaseUriAsync(cancellationToken)
-                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken, "application/json"))
+                .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken))
                 .Select(task => new ListTenantsApiCall(CreateCustomApiCall(task.Result, HttpCompletionOption.ResponseContentRead, deserializeResult)));
         }
 
diff --git a/src/OpenStack.Net/OpenStack/Services/ServiceClient.cs b/src/OpenStack.Net/OpenStack/Services/ServiceClient.cs
@@ -301,9 +301,9 @@ protected virtual void Dispose(bool disposing)
         /// <para>-or-</para>
         /// <para>If <paramref name="parameters"/> is <see langword="null"/>.</para>
         /// </exception>
-        public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T>(HttpMethod method, UriTemplate template, IDictionary<string, T> parameters, CancellationToken cancellationToken, Func<Uri, Uri> uriTransform, string mediaType = "application/json")
+        public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T>(HttpMethod method, UriTemplate template, IDictionary<string, T> parameters, CancellationToken cancellationToken, Func<Uri, Uri> uriTransform)
         {
-            var prepared = PrepareRequestAsyncFunc(method, template, parameters, cancellationToken, mediaType);
+            var prepared = PrepareRequestAsyncFunc(method, template, parameters, cancellationToken);
             if (uriTransform == null)
                 return prepared;
 
@@ -343,7 +343,7 @@ public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T>(Http
         /// <para>-or-</para>
         /// <para>If <paramref name="parameters"/> is <see langword="null"/>.</para>
         /// </exception>
-        public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T>(HttpMethod method, UriTemplate template, IDictionary<string, T> parameters, CancellationToken cancellationToken, string mediaType = "application/json")
+        public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T>(HttpMethod method, UriTemplate template, IDictionary<string, T> parameters, CancellationToken cancellationToken)
         {
             if (template == null)
                 throw new ArgumentNullException("template");
@@ -354,7 +354,7 @@ public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T>(Http
                 task =>
                 {
                     Uri baseUri = task.Result;
-                    HttpRequestMessage request = PrepareRequestImpl(method, template, baseUri, parameters, mediaType);
+                    HttpRequestMessage request = PrepareRequestImpl(method, template, baseUri, parameters);
 
                     Func<Task<HttpRequestMessage>, Task<HttpRequestMessage>> authenticateRequest =
                         task2 => AuthenticationService.AuthenticateRequestAsync(task2.Result, cancellationToken).Select(_ => task2.Result);
@@ -393,7 +393,7 @@ public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T>(Http
         /// <para>-or-</para>
         /// <para>If <paramref name="parameters"/> is <see langword="null"/>.</para>
         /// </exception>
-        public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T, TBody>(HttpMethod method, UriTemplate template, IDictionary<string, T> parameters, TBody body, CancellationToken cancellationToken, Func<Uri, Uri> uriTransform, string mediaType = "application/json")
+        public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T, TBody>(HttpMethod method, UriTemplate template, IDictionary<string, T> parameters, TBody body, CancellationToken cancellationToken, Func<Uri, Uri> uriTransform)
         {
             var prepared = PrepareRequestAsyncFunc(method, template, parameters, body, cancellationToken);
             if (uriTransform == null)
@@ -439,7 +439,7 @@ public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T, TBod
         /// <para>-or-</para>
         /// <para>If <paramref name="parameters"/> is <see langword="null"/>.</para>
         /// </exception>
-        public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T, TBody>(HttpMethod method, UriTemplate template, IDictionary<string, T> parameters, TBody body, CancellationToken cancellationToken, string mediaType = "application/json")
+        public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T, TBody>(HttpMethod method, UriTemplate template, IDictionary<string, T> parameters, TBody body, CancellationToken cancellationToken)
         {
             return
                 task =>
@@ -454,20 +454,6 @@ public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T, TBod
                 };
         }
 
-        public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T, TBody>(HttpMethod method, string mediaType, UriTemplate template, IDictionary<string, T> parameters, TBody body, CancellationToken cancellationToken) 
-        {
-            return
-                task =>
-                {
-                    Uri baseUri = task.Result;
-                    HttpRequestMessage request = PrepareRequestImpl(method, template, baseUri, parameters);
-                    request.Content = EncodeRequestBodyImpl(request, body, mediaType);
-
-                    Func<Task<HttpRequestMessage>, Task<HttpRequestMessage>> authenticateRequest =
-                        task2 => AuthenticationService.AuthenticateRequestAsync(task2.Result, cancellationToken).Select(_ => task2.Result);
-                    return CompletedTask.FromResult(request).Then(authenticateRequest);
-                };
-        }
         /// <summary>
         /// Encode the body of a request, and update the <see cref="HttpRequestMessage"/> properties as necessary to
         /// support the encoded body.
@@ -485,15 +471,15 @@ public Func<Task<Uri>, Task<HttpRequestMessage>> PrepareRequestAsyncFunc<T, TBod
         /// <returns>An <see cref="HttpContent"/> object representing the body of the
         /// <see cref="HttpRequestMessage"/>.</returns>
         /// <exception cref="ArgumentNullException">If <paramref name="request"/> is <see langword="null"/>.</exception>
-        protected virtual HttpContent EncodeRequestBodyImpl<TBody>(HttpRequestMessage request, TBody body, string mediaType = "application/json")
+        protected virtual HttpContent EncodeRequestBodyImpl<TBody>(HttpRequestMessage request, TBody body)
         {
             if (request == null)
                 throw new ArgumentNullException("request");
 
             string bodyText = JsonConvert.SerializeObject(body);
             byte[] encodedBody = Encoding.UTF8.GetBytes(bodyText);
             ByteArrayContent content = new ByteArrayContent(encodedBody);
-            content.Headers.ContentType = new MediaTypeHeaderValue(mediaType) { CharSet = "UTF-8" };
+            content.Headers.ContentType = new MediaTypeHeaderValue("application/json") { CharSet = "UTF-8" };
 
             content.Headers.ContentLength = encodedBody.Length;
 
@@ -547,12 +533,12 @@ protected virtual HttpContent EncodeRequestBodyImpl<TBody>(HttpRequestMessage re
         /// <para>If <paramref name="parameters"/> is <see langword="null"/>.</para>
         /// </exception>
         /// <exception cref="ArgumentException">If <paramref name="baseUri"/> is not an absolute URI.</exception>
-        protected virtual HttpRequestMessage PrepareRequestImpl<T>(HttpMethod method, UriTemplate template, Uri baseUri, IDictionary<string, T> parameters, string mediaType = "application/json")
+        protected virtual HttpRequestMessage PrepareRequestImpl<T>(HttpMethod method, UriTemplate template, Uri baseUri, IDictionary<string, T> parameters)
         {
             Uri boundUri = template.BindByName(baseUri, parameters);
 
             HttpRequestMessage request = new HttpRequestMessage(method, boundUri);
-            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(mediaType));
+            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
             request.Headers.UserAgent.Add(new ProductInfoHeaderValue(AssemblyInfo.AssemblyProduct, AssemblyInfo.AssemblyInformationalVersion));
 #if !PORTABLE
             if (ConnectionLimit.HasValue)

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public virtual Task<ListApiVersionsApiCall> PrepareListApiVersionsAsync(Cancella`
`141`	`141`	`};`
`142`	`142`
`143`	`143`	`return GetBaseUriAsync(cancellationToken)`
`144`		`- .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken, "application/json"))`
	`144`	`+ .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken))`
`145`	`145`	`.Select(task => new ListApiVersionsApiCall(CreateCustomApiCall(task.Result, HttpCompletionOption.ResponseContentRead, deserializeResult)));`
`146`	`146`	`}`
`147`	`147`
`@@ -152,7 +152,7 @@ public virtual Task<GetApiVersionApiCall> PrepareGetApiVersionAsync(ApiVersionId`
`152`	`152`	`Dictionary<string, string> parameters = new Dictionary<string, string> { { "version_id", apiVersionId.Value } };`
`153`	`153`
`154`	`154`	`return GetBaseUriAsync(cancellationToken)`
`155`		`- .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken, "application/json"))`
	`155`	`+ .Then(PrepareRequestAsyncFunc(HttpMethod.Get, template, parameters, cancellationToken))`
`156`	`156`	`.Select(task => new GetApiVersionApiCall(CreateJsonApiCall<ApiVersionResponse>(task.Result)));`
`157`	`157`	`}`
`158`	`158`