From b07bf5b96c425e09dfda22a69d618a656d558b4c Mon Sep 17 00:00:00 2001 From: David Britch Date: Tue, 18 Apr 2017 16:25:54 +0100 Subject: [PATCH] Removed unused methods from RequestProvider class. --- .../RequestProvider/IRequestProvider.cs | 8 ---- .../RequestProvider/RequestProvider.cs | 48 +------------------ 2 files changed, 2 insertions(+), 54 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/IRequestProvider.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/IRequestProvider.cs index 4bb899c90..67b8f8c59 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/IRequestProvider.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/IRequestProvider.cs @@ -6,16 +6,8 @@ namespace eShopOnContainers.Core.Services.RequestProvider { Task GetAsync(string uri, string token = ""); - Task PostAsync(string uri, TResult data, string token = ""); - Task PostAsync(string uri, TResult data, string token = "", string header = ""); - Task PostAsync(string uri, TRequest data, string token = ""); - - Task PutAsync(string uri, TResult data, string token = ""); - - Task PutAsync(string uri, TRequest data, string token = ""); - Task DeleteAsync(string uri, string token = ""); } } \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs index a63f2096c..f498532ca 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs @@ -5,7 +5,6 @@ using Newtonsoft.Json.Serialization; using System.Net; using System.Net.Http; using System.Net.Http.Headers; -using System.Text; using System.Threading.Tasks; using System; @@ -23,7 +22,6 @@ namespace eShopOnContainers.Core.Services.RequestProvider DateTimeZoneHandling = DateTimeZoneHandling.Utc, NullValueHandling = NullValueHandling.Ignore }; - _serializerSettings.Converters.Add(new StringEnumConverter()); } @@ -33,7 +31,6 @@ namespace eShopOnContainers.Core.Services.RequestProvider HttpResponseMessage response = await httpClient.GetAsync(uri); await HandleResponse(response); - string serialized = await response.Content.ReadAsStringAsync(); TResult result = await Task.Run(() => @@ -56,7 +53,6 @@ namespace eShopOnContainers.Core.Services.RequestProvider HttpResponseMessage response = await httpClient.PostAsync(uri, content); await HandleResponse(response); - string serialized = await response.Content.ReadAsStringAsync(); TResult result = await Task.Run(() => @@ -65,61 +61,21 @@ namespace eShopOnContainers.Core.Services.RequestProvider return result; } - public Task PostAsync(string uri, TResult data, string token = "") - { - return PostAsync(uri, data, token); - } - - public async Task PostAsync(string uri, TRequest data, string token = "") - { - HttpClient httpClient = CreateHttpClient(token); - string serialized = await Task.Run(() => JsonConvert.SerializeObject(data, _serializerSettings)); - var content = new StringContent(serialized, Encoding.UTF8, "application/json"); - HttpResponseMessage response = await httpClient.PostAsync(uri, content); - - await HandleResponse(response); - - string responseData = await response.Content.ReadAsStringAsync(); - - return await Task.Run(() => JsonConvert.DeserializeObject(responseData, _serializerSettings)); - } - - public Task PutAsync(string uri, TResult data, string token = "") - { - return PutAsync(uri, data, token); - } - - public async Task PutAsync(string uri, TRequest data, string token = "") - { - HttpClient httpClient = CreateHttpClient(token); - string serialized = await Task.Run(() => JsonConvert.SerializeObject(data, _serializerSettings)); - HttpResponseMessage response = await httpClient.PutAsync(uri, new StringContent(serialized, Encoding.UTF8, "application/json")); - - await HandleResponse(response); - - string responseData = await response.Content.ReadAsStringAsync(); - - return await Task.Run(() => JsonConvert.DeserializeObject(responseData, _serializerSettings)); - } - public async Task DeleteAsync(string uri, string token = "") { HttpClient httpClient = CreateHttpClient(token); - await httpClient.DeleteAsync(uri); } private HttpClient CreateHttpClient(string token = "") { var httpClient = new HttpClient(); - httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); if (!string.IsNullOrEmpty(token)) { httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token); } - return httpClient; } @@ -140,8 +96,8 @@ namespace eShopOnContainers.Core.Services.RequestProvider { var content = await response.Content.ReadAsStringAsync(); - if (response.StatusCode == HttpStatusCode.Forbidden - || response.StatusCode == HttpStatusCode.Unauthorized) + if (response.StatusCode == HttpStatusCode.Forbidden || + response.StatusCode == HttpStatusCode.Unauthorized) { throw new ServiceAuthenticationException(content); }