Refractor length of ApiService

Author: AshleyPoole

SSLLWrapper/ApiService.cs

@@ -14,9 +14,9 @@ public class ApiService
 	    private readonly IApi _api;
 	    private readonly IHttpWebResponseHelper _webResponseHelper;
 	    private readonly IRequestModelHelper _requestModelHelper;
+	    private readonly IResponsePopulationHelper _responsePopulationHelper;
 		private readonly IUrlHelper _urlHelper;
-	    public string ApiUrl { get; set; }
-	    public JsonSerializerSettings JsonSerializerSettings;
+	    private string ApiUrl { get; set; }
 
 	    public enum Publish
 	    {
@@ -48,13 +48,9 @@ public ApiService(string apiUrl)
 			_webResponseHelper = new HttpWebResponseHelper();
 			_requestModelHelper = new RequestModelHelper();
 		    _urlHelper = new UrlHelper();
-			JsonSerializerSettings = new JsonSerializerSettings();
 			_responsePopulationHelper = new ResponsePopulationHelper();
 
 		    ApiUrl = apiUrl;
-
-			// Ignoring null values when serializing json objects
-			JsonSerializerSettings.NullValueHandling = NullValueHandling.Ignore;
 		}
 
 		#endregion
@@ -63,19 +59,16 @@ public InfoModel Info()
 		{
 			var infoModel = new InfoModel();
 
-			// Building request model
+			// Building new request model
 		    var requestModel = _requestModelHelper.InfoProperties(ApiUrl, "info");
 
 			try
 			{
 				// Making Api request and gathering response
 				var webResponse = _api.MakeGetRequest(requestModel);
-				var webResult = _webResponseHelper.GetResponsePayload(webResponse);
 
-				// Trying to bind result to model
-				infoModel = JsonConvert.DeserializeObject<InfoModel>(webResult, JsonSerializerSettings);
-				infoModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);
-				infoModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);
+				// Binding result to model
+				_responsePopulationHelper.InfoModel(webResponse, infoModel);
 
 				if (infoModel.engineVersion != null)
 				{
@@ -120,12 +113,9 @@ public AnalyzeModel Analyze(string host, Publish publish, ClearCache clearCache,
 			{
 				// Making Api request and gathering response
 				var webResponse = _api.MakeGetRequest(requestModel);
-				var webResult = _webResponseHelper.GetResponsePayload(webResponse);
 
-				// Trying to bind result to model
-				analyzeModel = JsonConvert.DeserializeObject<AnalyzeModel>(webResult, JsonSerializerSettings);
-				analyzeModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);
-				analyzeModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);
+				// Binding result to model
+				_responsePopulationHelper.AnalyzeModel(webResponse, analyzeModel);
 			}
 			catch (Exception ex)
 			{
@@ -164,12 +154,9 @@ public EndpointDataModel GetEndpointData(string host, string s, FromCache fromCa
 			{
 				// Making Api request and gathering response
 				var webResponse = _api.MakeGetRequest(requestModel);
-				var webResult = _webResponseHelper.GetResponsePayload(webResponse);
 
-				// Trying to bind result to model
-				endpointDataModel = JsonConvert.DeserializeObject<EndpointDataModel>(webResult, JsonSerializerSettings);
-				endpointDataModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);
-				endpointDataModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);
+				// Binding result to model
+				_responsePopulationHelper.EndpointDataModel(webResponse, endpointDataModel);
 			}
 			catch (Exception ex)
 			{

SSLLWrapper/Helpers/ResponsePopulationHelper.cs

@@ -0,0 +1,54 @@
+using System.Net;
+using Newtonsoft.Json;
+using SSLLWrapper.Interfaces;
+using SSLLWrapper.Models.Response;
+
+namespace SSLLWrapper.Helpers
+{
+	public class ResponsePopulationHelper : IResponsePopulationHelper
+	{
+		public JsonSerializerSettings JsonSerializerSettings;
+		private readonly IHttpWebResponseHelper _webResponseHelper;
+
+		public ResponsePopulationHelper()
+		{
+			// Ignoring null values when serializing json objects
+			JsonSerializerSettings = new JsonSerializerSettings {NullValueHandling = NullValueHandling.Ignore};
+
+			_webResponseHelper = new HttpWebResponseHelper();
+		}
+
+		public InfoModel InfoModel(HttpWebResponse webResponse, InfoModel infoModel)
+		{
+			var webResult = _webResponseHelper.GetResponsePayload(webResponse);
+
+			infoModel = JsonConvert.DeserializeObject<InfoModel>(webResult, JsonSerializerSettings);
+			infoModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);
+			infoModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);
+
+			return infoModel;
+		}
+
+		public AnalyzeModel AnalyzeModel(HttpWebResponse webResponse, AnalyzeModel analyzeModel)
+		{
+			var webResult = _webResponseHelper.GetResponsePayload(webResponse);
+
+			analyzeModel = JsonConvert.DeserializeObject<AnalyzeModel>(webResult, JsonSerializerSettings);
+			analyzeModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);
+			analyzeModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);
+
+			return analyzeModel;
+		}
+
+		public EndpointDataModel EndpointDataModel(HttpWebResponse webResponse, EndpointDataModel endpointDataModel)
+		{
+			var webResult = _webResponseHelper.GetResponsePayload(webResponse);
+
+			endpointDataModel = JsonConvert.DeserializeObject<EndpointDataModel>(webResult, JsonSerializerSettings);
+			endpointDataModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);
+			endpointDataModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);
+
+			return endpointDataModel;
+		}
+	}
+}

SSLLWrapper/Interfaces/IResponsePopulationHelper.cs

@@ -1,10 +1,12 @@
-using SSLLWrapper.Models.Response;
+using System.Net;
+using SSLLWrapper.Models.Response;
 
 namespace SSLLWrapper.Interfaces
 {
 	interface IResponsePopulationHelper
 	{
-		InfoModel InfoModel(InfoModel infoModel);
-		AnalyzeModel AnalyzeModel(AnalyzeModel analyzeModel);
+		InfoModel InfoModel(HttpWebResponse webResponse, InfoModel infoModel);
+		AnalyzeModel AnalyzeModel(HttpWebResponse webResponse, AnalyzeModel analyzeModel);
+		EndpointDataModel EndpointDataModel(HttpWebResponse webResponse, EndpointDataModel endpointDataModel);
 	}
 }

SSLLWrapper/SSLLWrapper.csproj

@@ -54,6 +54,7 @@
     <Compile Include="Helpers\RequestModelHelper.cs" />
     <Compile Include="Interfaces\IResponsePopulationHelper.cs" />
     <Compile Include="Helpers\UrlHelper.cs" />
+    <Compile Include="Helpers\ResponsePopulationHelper.cs" />
     <Compile Include="Models\Response\AnalyzeModel.cs" />
     <Compile Include="Models\Response\Endpoint.cs" />
     <Compile Include="Models\Response\BaseModel.cs" />