Implement GetStatusCodes and refactoring

AshleyPoole · AshleyPoole · commit f996c9f3786e · 2014-12-26T10:29:59.000Z
diff --git a/SSLLWrapper/ApiService.cs b/SSLLWrapper/ApiService.cs
@@ -1,9 +1,8 @@
 ﻿using System;
-using Newtonsoft.Json;
 using SSLLWrapper.Helpers;
 using SSLLWrapper.Interfaces;
 using SSLLWrapper.Models.Response;
-using SSLLWrapper.Models.Response.BaseResponseSubModels;
+using SSLLWrapper.Models.Response.BaseSubModels;
 
 namespace SSLLWrapper
 {
@@ -55,9 +54,9 @@ public ApiService(string apiUrl)
 
 		#endregion
 
-		public InfoModel Info()
+		public Info Info()
 		{
-			var infoModel = new InfoModel();
+			var infoModel = new Info();
 
 			// Building new request model
 		    var requestModel = _requestModelHelper.InfoProperties(ApiUrl, "info");
@@ -87,15 +86,15 @@ public InfoModel Info()
 			return infoModel;
 		}
 
-	    public AnalyzeModel Analyze(string host)
+	    public Analyze Analyze(string host)
 	    {
 			// overloaded method to provide a default set of options
 		    return Analyze(host, Publish.Off, ClearCache.On, FromCache.Off, All.On);
 	    }
 
-		public AnalyzeModel Analyze(string host, Publish publish, ClearCache clearCache, FromCache fromCache, All all)
+		public Analyze Analyze(string host, Publish publish, ClearCache clearCache, FromCache fromCache, All all)
 		{
-			var analyzeModel = new AnalyzeModel();
+			var analyzeModel = new Analyze();
 
 			// Checking host is valid before continuing
 			if (!_urlHelper.IsValid(host))
@@ -129,21 +128,21 @@ public AnalyzeModel Analyze(string host, Publish publish, ClearCache clearCache,
 			return analyzeModel;
 		}
 
-		public EndpointDataModel GetEndpointData(string host, string s)
+		public Endpoint GetEndpointData(string host, string s)
 		{
 			return GetEndpointData(host, s, FromCache.Off);
 		}
 
-		public EndpointDataModel GetEndpointData(string host, string s, FromCache fromCache)
+		public Endpoint GetEndpointData(string host, string s, FromCache fromCache)
 	    {
-		    var endpointDataModel = new EndpointDataModel();
+		    var endpointModel = new Endpoint();
 
 			// Checking host is valid before continuing
 			if (!_urlHelper.IsValid(host))
 			{
-				endpointDataModel.HasErrorOccurred = true;
-				endpointDataModel.Errors.Add(new Error { message = "Host does not pass preflight validation. No Api call has been made." });
-				return endpointDataModel;
+				endpointModel.HasErrorOccurred = true;
+				endpointModel.Errors.Add(new Error { message = "Host does not pass preflight validation. No Api call has been made." });
+				return endpointModel;
 			}
 
 			// Building request model
@@ -156,23 +155,42 @@ public EndpointDataModel GetEndpointData(string host, string s, FromCache fromCa
 				var webResponse = _api.MakeGetRequest(requestModel);
 
 				// Binding result to model
-				_responsePopulationHelper.EndpointDataModel(webResponse, endpointDataModel);
+				_responsePopulationHelper.EndpointModel(webResponse, endpointModel);
 			}
 			catch (Exception ex)
 			{
-				endpointDataModel.HasErrorOccurred = true;
-				endpointDataModel.Errors.Add(new Error { message = ex.ToString() });
+				endpointModel.HasErrorOccurred = true;
+				endpointModel.Errors.Add(new Error { message = ex.ToString() });
 			}
 
 			// Checking if errors have occoured either from ethier api or wrapper
-			if (endpointDataModel.Errors.Count != 0 && !endpointDataModel.HasErrorOccurred) { endpointDataModel.HasErrorOccurred = true; }
+			if (endpointModel.Errors.Count != 0 && !endpointModel.HasErrorOccurred) { endpointModel.HasErrorOccurred = true; }
 
-		    return endpointDataModel;
+		    return endpointModel;
 	    }
 
-	    public string GetStatusCodes()
+	    public StatusDetails GetStatusCodes()
 	    {
-		    throw new NotImplementedException();
+		    var statusDetailsModel = new StatusDetails();
+
+			// Building request model
+		    var requestModel = _requestModelHelper.GetStatusCodeProperties(ApiUrl, "getStatusCodes");
+
+		    try
+		    {
+				// Making Api request and gathering response
+			    var webResponse = _api.MakeGetRequest(requestModel);
+
+				// Binding result to model
+			    _responsePopulationHelper.StatusDetailsModel(webResponse, statusDetailsModel);
+		    }
+		    catch (Exception ex)
+		    {
+				statusDetailsModel.HasErrorOccurred = true;
+				statusDetailsModel.Errors.Add(new Error { message = ex.ToString() });
+		    }
+
+		    return statusDetailsModel;
 	    }
     }
 }
diff --git a/SSLLWrapper/Helpers/RequestModelHelper.cs b/SSLLWrapper/Helpers/RequestModelHelper.cs
@@ -35,5 +35,10 @@ public RequestModel GetEndpointDataProperties(string apiBaseUrl, string action,
 
 			return requestModel;
 		}
+
+		public RequestModel GetStatusCodeProperties(string apiBaseUrl, string action)
+		{
+			return new RequestModel() {ApiBaseUrl = apiBaseUrl, Action = action};
+		}
 	}
 }
diff --git a/SSLLWrapper/Helpers/ResponsePopulationHelper.cs b/SSLLWrapper/Helpers/ResponsePopulationHelper.cs
@@ -18,37 +18,48 @@ public ResponsePopulationHelper()
 			_webResponseHelper = new HttpWebResponseHelper();
 		}
 
-		public InfoModel InfoModel(HttpWebResponse webResponse, InfoModel infoModel)
+		public Info InfoModel(HttpWebResponse webResponse, Info infoModel)
 		{
 			var webResult = _webResponseHelper.GetResponsePayload(webResponse);
 
-			infoModel = JsonConvert.DeserializeObject<InfoModel>(webResult, JsonSerializerSettings);
+			infoModel = JsonConvert.DeserializeObject<Info>(webResult, JsonSerializerSettings);
 			infoModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);
 			infoModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);
 
 			return infoModel;
 		}
 
-		public AnalyzeModel AnalyzeModel(HttpWebResponse webResponse, AnalyzeModel analyzeModel)
+		public Analyze AnalyzeModel(HttpWebResponse webResponse, Analyze analyzeModel)
 		{
 			var webResult = _webResponseHelper.GetResponsePayload(webResponse);
 
-			analyzeModel = JsonConvert.DeserializeObject<AnalyzeModel>(webResult, JsonSerializerSettings);
+			analyzeModel = JsonConvert.DeserializeObject<Analyze>(webResult, JsonSerializerSettings);
 			analyzeModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);
 			analyzeModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);
 
 			return analyzeModel;
 		}
 
-		public EndpointDataModel EndpointDataModel(HttpWebResponse webResponse, EndpointDataModel endpointDataModel)
+		public Endpoint EndpointModel(HttpWebResponse webResponse, Endpoint endpointModel)
 		{
 			var webResult = _webResponseHelper.GetResponsePayload(webResponse);
 
-			endpointDataModel = JsonConvert.DeserializeObject<EndpointDataModel>(webResult, JsonSerializerSettings);
-			endpointDataModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);
-			endpointDataModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);
+			endpointModel = JsonConvert.DeserializeObject<Endpoint>(webResult, JsonSerializerSettings);
+			endpointModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);
+			endpointModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);
 
-			return endpointDataModel;
+			return endpointModel;
+		}
+
+		public StatusDetails StatusDetailsModel(HttpWebResponse webResponse, StatusDetails statusDetails)
+		{
+			var webResult = _webResponseHelper.GetResponsePayload(webResponse);
+
+			statusDetails = JsonConvert.DeserializeObject<StatusDetails>(webResult, JsonSerializerSettings);
+			statusDetails.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);
+			statusDetails.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);
+
+			return statusDetails;
 		}
 	}
 }
diff --git a/SSLLWrapper/Interfaces/IRequestModelHelper.cs b/SSLLWrapper/Interfaces/IRequestModelHelper.cs
@@ -7,5 +7,6 @@ interface IRequestModelHelper
 		RequestModel InfoProperties(string apiBaseUrl, string action);
 		RequestModel AnalyzeProperties(string apiBaseUrl, string action, string host, string publish, string clearCache, string fromCache, string all);
 		RequestModel GetEndpointDataProperties(string apiBaseUrl, string action, string host, string s, string fromCache);
+		RequestModel GetStatusCodeProperties(string apiBaseUrl, string action);
 	}
 }
diff --git a/SSLLWrapper/Interfaces/IResponsePopulationHelper.cs b/SSLLWrapper/Interfaces/IResponsePopulationHelper.cs
@@ -5,8 +5,9 @@ namespace SSLLWrapper.Interfaces
 {
 	interface IResponsePopulationHelper
 	{
-		InfoModel InfoModel(HttpWebResponse webResponse, InfoModel infoModel);
-		AnalyzeModel AnalyzeModel(HttpWebResponse webResponse, AnalyzeModel analyzeModel);
-		EndpointDataModel EndpointDataModel(HttpWebResponse webResponse, EndpointDataModel endpointDataModel);
+		Info InfoModel(HttpWebResponse webResponse, Info infoModel);
+		Analyze AnalyzeModel(HttpWebResponse webResponse, Analyze analyzeModel);
+		Endpoint EndpointModel(HttpWebResponse webResponse, Endpoint endpointDataModel);
+		StatusDetails StatusDetailsModel(HttpWebResponse webResponse, StatusDetails statusDetails);
 	}
 }
diff --git a/SSLLWrapper/Models/Response/Analyze.cs b/SSLLWrapper/Models/Response/Analyze.cs
@@ -2,7 +2,7 @@
 
 namespace SSLLWrapper.Models.Response
 {
-	public class AnalyzeModel : BaseModel
+	public class Analyze : BaseModel
 	{
 		public string host { get; set; }
 		public int port { get; set; }
diff --git a/SSLLWrapper/Models/Response/BaseModel.cs b/SSLLWrapper/Models/Response/BaseModel.cs
@@ -1,5 +1,5 @@
 ﻿using System.Collections.Generic;
-using SSLLWrapper.Models.Response.BaseResponseSubModels;
+using SSLLWrapper.Models.Response.BaseSubModels;
 
 namespace SSLLWrapper.Models.Response
 {
diff --git a/SSLLWrapper/Models/Response/BaseSubModels/Error.cs b/SSLLWrapper/Models/Response/BaseSubModels/Error.cs
@@ -1,4 +1,4 @@
-﻿namespace SSLLWrapper.Models.Response.BaseResponseSubModels
+﻿namespace SSLLWrapper.Models.Response.BaseSubModels
 {
 	public class Error
 	{
diff --git a/SSLLWrapper/Models/Response/BaseSubModels/Header.cs b/SSLLWrapper/Models/Response/BaseSubModels/Header.cs
@@ -1,4 +1,4 @@
-﻿namespace SSLLWrapper.Models.Response.BaseResponseSubModels
+﻿namespace SSLLWrapper.Models.Response.BaseSubModels
 {
 	public class Header
 	{
diff --git a/SSLLWrapper/Models/Response/Endpoint.cs b/SSLLWrapper/Models/Response/Endpoint.cs
@@ -2,7 +2,7 @@
 
 namespace SSLLWrapper.Models.Response
 {
-	public class Endpoint
+	public class Endpoint : BaseModel
 	{
 		public string ipAddress { get; set; }
 		public string statusMessage { get; set; }
diff --git a/SSLLWrapper/Models/Response/EndpointDataModel.cs b/SSLLWrapper/Models/Response/EndpointDataModel.cs
diff --git a/SSLLWrapper/Models/Response/Info.cs b/SSLLWrapper/Models/Response/Info.cs
@@ -1,14 +1,14 @@
 ﻿namespace SSLLWrapper.Models.Response
 {
-	public class InfoModel : BaseModel
+	public class Info : BaseModel
 	{
 		public string engineVersion { get; set; }
 		public string criteriaVersion { get; set; }
 		public int clientMaxAssessments { get; set; }
 		public string notice { get; set; }
 		public bool Online { get; set; }
 
-		public InfoModel()
+		public Info()
 		{
 			// Assigning default online status
 			this.Online = false;
diff --git a/SSLLWrapper/Models/Response/StatusDetails.cs b/SSLLWrapper/Models/Response/StatusDetails.cs
@@ -1,6 +1,6 @@
 ﻿namespace SSLLWrapper.Models.Response
 {
-	public class StatusDetails
+	public class StatusDetails : BaseModel
 	{
 		public string TESTING_PROTOCOL_INTOLERANCE_399 { get; set; }
 		public string PREPARING_REPORT { get; set; }
diff --git a/SSLLWrapper/SSLLWrapper.csproj b/SSLLWrapper/SSLLWrapper.csproj
@@ -55,12 +55,11 @@
     <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\Analyze.cs" />
     <Compile Include="Models\Response\Endpoint.cs" />
     <Compile Include="Models\Response\BaseModel.cs" />
-    <Compile Include="Models\Response\BaseResponseSubModels\Header.cs" />
-    <Compile Include="Models\Response\BaseResponseSubModels\Error.cs" />
-    <Compile Include="Models\Response\EndpointDataModel.cs" />
+    <Compile Include="Models\Response\BaseSubModels\Header.cs" />
+    <Compile Include="Models\Response\BaseSubModels\Error.cs" />
     <Compile Include="Models\Response\EndpointSubModels\Cert.cs" />
     <Compile Include="Models\Response\EndpointSubModels\Cert2.cs" />
     <Compile Include="Models\Response\EndpointSubModels\Chain.cs" />
@@ -72,7 +71,7 @@
     <Compile Include="Models\Response\EndpointSubModels\Result.cs" />
     <Compile Include="Models\Response\EndpointSubModels\Sims.cs" />
     <Compile Include="Models\Response\EndpointSubModels\Details.cs" />
-    <Compile Include="Models\Response\InfoModel.cs" />
+    <Compile Include="Models\Response\Info.cs" />
     <Compile Include="Models\RequestModel.cs" />
     <Compile Include="Models\Response\StatusDetails.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`using System;`
`2`		`-using Newtonsoft.Json;`
`3`	`2`	`using SSLLWrapper.Helpers;`
`4`	`3`	`using SSLLWrapper.Interfaces;`
`5`	`4`	`using SSLLWrapper.Models.Response;`
`6`		`-using SSLLWrapper.Models.Response.BaseResponseSubModels;`
	`5`	`+using SSLLWrapper.Models.Response.BaseSubModels;`
`7`	`6`
`8`	`7`	`namespace SSLLWrapper`
`9`	`8`	`{`
`@@ -55,9 +54,9 @@ public ApiService(string apiUrl)`
`55`	`54`
`56`	`55`	`#endregion`
`57`	`56`
`58`		`- public InfoModel Info()`
	`57`	`+ public Info Info()`
`59`	`58`	`{`
`60`		`- var infoModel = new InfoModel();`
	`59`	`+ var infoModel = new Info();`
`61`	`60`
`62`	`61`	`// Building new request model`
`63`	`62`	`var requestModel = _requestModelHelper.InfoProperties(ApiUrl, "info");`
`@@ -87,15 +86,15 @@ public InfoModel Info()`
`87`	`86`	`return infoModel;`
`88`	`87`	`}`
`89`	`88`
`90`		`- public AnalyzeModel Analyze(string host)`
	`89`	`+ public Analyze Analyze(string host)`
`91`	`90`	`{`
`92`	`91`	`// overloaded method to provide a default set of options`
`93`	`92`	`return Analyze(host, Publish.Off, ClearCache.On, FromCache.Off, All.On);`
`94`	`93`	`}`
`95`	`94`
`96`		`- public AnalyzeModel Analyze(string host, Publish publish, ClearCache clearCache, FromCache fromCache, All all)`
	`95`	`+ public Analyze Analyze(string host, Publish publish, ClearCache clearCache, FromCache fromCache, All all)`
`97`	`96`	`{`
`98`		`- var analyzeModel = new AnalyzeModel();`
	`97`	`+ var analyzeModel = new Analyze();`
`99`	`98`
`100`	`99`	`// Checking host is valid before continuing`
`101`	`100`	`if (!_urlHelper.IsValid(host))`
`@@ -129,21 +128,21 @@ public AnalyzeModel Analyze(string host, Publish publish, ClearCache clearCache,`
`129`	`128`	`return analyzeModel;`
`130`	`129`	`}`
`131`	`130`
`132`		`- public EndpointDataModel GetEndpointData(string host, string s)`
	`131`	`+ public Endpoint GetEndpointData(string host, string s)`
`133`	`132`	`{`
`134`	`133`	`return GetEndpointData(host, s, FromCache.Off);`
`135`	`134`	`}`
`136`	`135`
`137`		`- public EndpointDataModel GetEndpointData(string host, string s, FromCache fromCache)`
	`136`	`+ public Endpoint GetEndpointData(string host, string s, FromCache fromCache)`
`138`	`137`	`{`
`139`		`- var endpointDataModel = new EndpointDataModel();`
	`138`	`+ var endpointModel = new Endpoint();`
`140`	`139`
`141`	`140`	`// Checking host is valid before continuing`
`142`	`141`	`if (!_urlHelper.IsValid(host))`
`143`	`142`	`{`
`144`		`- endpointDataModel.HasErrorOccurred = true;`
`145`		`- endpointDataModel.Errors.Add(new Error { message = "Host does not pass preflight validation. No Api call has been made." });`
`146`		`- return endpointDataModel;`
	`143`	`+ endpointModel.HasErrorOccurred = true;`
	`144`	`+ endpointModel.Errors.Add(new Error { message = "Host does not pass preflight validation. No Api call has been made." });`
	`145`	`+ return endpointModel;`
`147`	`146`	`}`
`148`	`147`
`149`	`148`	`// Building request model`
`@@ -156,23 +155,42 @@ public EndpointDataModel GetEndpointData(string host, string s, FromCache fromCa`
`156`	`155`	`var webResponse = _api.MakeGetRequest(requestModel);`
`157`	`156`
`158`	`157`	`// Binding result to model`
`159`		`- _responsePopulationHelper.EndpointDataModel(webResponse, endpointDataModel);`
	`158`	`+ _responsePopulationHelper.EndpointModel(webResponse, endpointModel);`
`160`	`159`	`}`
`161`	`160`	`catch (Exception ex)`
`162`	`161`	`{`
`163`		`- endpointDataModel.HasErrorOccurred = true;`
`164`		`- endpointDataModel.Errors.Add(new Error { message = ex.ToString() });`
	`162`	`+ endpointModel.HasErrorOccurred = true;`
	`163`	`+ endpointModel.Errors.Add(new Error { message = ex.ToString() });`
`165`	`164`	`}`
`166`	`165`
`167`	`166`	`// Checking if errors have occoured either from ethier api or wrapper`
`168`		`- if (endpointDataModel.Errors.Count != 0 && !endpointDataModel.HasErrorOccurred) { endpointDataModel.HasErrorOccurred = true; }`
	`167`	`+ if (endpointModel.Errors.Count != 0 && !endpointModel.HasErrorOccurred) { endpointModel.HasErrorOccurred = true; }`
`169`	`168`
`170`		`- return endpointDataModel;`
	`169`	`+ return endpointModel;`
`171`	`170`	`}`
`172`	`171`
`173`		`- public string GetStatusCodes()`
	`172`	`+ public StatusDetails GetStatusCodes()`
`174`	`173`	`{`
`175`		`- throw new NotImplementedException();`
	`174`	`+ var statusDetailsModel = new StatusDetails();`
	`175`	`+`
	`176`	`+ // Building request model`
	`177`	`+ var requestModel = _requestModelHelper.GetStatusCodeProperties(ApiUrl, "getStatusCodes");`
	`178`	`+`
	`179`	`+ try`
	`180`	`+ {`
	`181`	`+ // Making Api request and gathering response`
	`182`	`+ var webResponse = _api.MakeGetRequest(requestModel);`
	`183`	`+`
	`184`	`+ // Binding result to model`
	`185`	`+ _responsePopulationHelper.StatusDetailsModel(webResponse, statusDetailsModel);`
	`186`	`+ }`
	`187`	`+ catch (Exception ex)`
	`188`	`+ {`
	`189`	`+ statusDetailsModel.HasErrorOccurred = true;`
	`190`	`+ statusDetailsModel.Errors.Add(new Error { message = ex.ToString() });`
	`191`	`+ }`
	`192`	`+`
	`193`	`+ return statusDetailsModel;`
`176`	`194`	`}`
`177`	`195`	`}`
`178`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,10 @@ public RequestModel GetEndpointDataProperties(string apiBaseUrl, string action,`
`35`	`35`
`36`	`36`	`return requestModel;`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+ public RequestModel GetStatusCodeProperties(string apiBaseUrl, string action)`
	`40`	`+ {`
	`41`	`+ return new RequestModel() {ApiBaseUrl = apiBaseUrl, Action = action};`
	`42`	`+ }`
`38`	`43`	`}`
`39`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,37 +18,48 @@ public ResponsePopulationHelper()`
`18`	`18`	`_webResponseHelper = new HttpWebResponseHelper();`
`19`	`19`	`}`
`20`	`20`
`21`		`- public InfoModel InfoModel(HttpWebResponse webResponse, InfoModel infoModel)`
	`21`	`+ public Info InfoModel(HttpWebResponse webResponse, Info infoModel)`
`22`	`22`	`{`
`23`	`23`	`var webResult = _webResponseHelper.GetResponsePayload(webResponse);`
`24`	`24`
`25`		`- infoModel = JsonConvert.DeserializeObject<InfoModel>(webResult, JsonSerializerSettings);`
	`25`	`+ infoModel = JsonConvert.DeserializeObject<Info>(webResult, JsonSerializerSettings);`
`26`	`26`	`infoModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);`
`27`	`27`	`infoModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);`
`28`	`28`
`29`	`29`	`return infoModel;`
`30`	`30`	`}`
`31`	`31`
`32`		`- public AnalyzeModel AnalyzeModel(HttpWebResponse webResponse, AnalyzeModel analyzeModel)`
	`32`	`+ public Analyze AnalyzeModel(HttpWebResponse webResponse, Analyze analyzeModel)`
`33`	`33`	`{`
`34`	`34`	`var webResult = _webResponseHelper.GetResponsePayload(webResponse);`
`35`	`35`
`36`		`- analyzeModel = JsonConvert.DeserializeObject<AnalyzeModel>(webResult, JsonSerializerSettings);`
	`36`	`+ analyzeModel = JsonConvert.DeserializeObject<Analyze>(webResult, JsonSerializerSettings);`
`37`	`37`	`analyzeModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);`
`38`	`38`	`analyzeModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);`
`39`	`39`
`40`	`40`	`return analyzeModel;`
`41`	`41`	`}`
`42`	`42`
`43`		`- public EndpointDataModel EndpointDataModel(HttpWebResponse webResponse, EndpointDataModel endpointDataModel)`
	`43`	`+ public Endpoint EndpointModel(HttpWebResponse webResponse, Endpoint endpointModel)`
`44`	`44`	`{`
`45`	`45`	`var webResult = _webResponseHelper.GetResponsePayload(webResponse);`
`46`	`46`
`47`		`- endpointDataModel = JsonConvert.DeserializeObject<EndpointDataModel>(webResult, JsonSerializerSettings);`
`48`		`- endpointDataModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);`
`49`		`- endpointDataModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);`
	`47`	`+ endpointModel = JsonConvert.DeserializeObject<Endpoint>(webResult, JsonSerializerSettings);`
	`48`	`+ endpointModel.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);`
	`49`	`+ endpointModel.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);`
`50`	`50`
`51`		`- return endpointDataModel;`
	`51`	`+ return endpointModel;`
	`52`	`+ }`
	`53`	`+`
	`54`	`+ public StatusDetails StatusDetailsModel(HttpWebResponse webResponse, StatusDetails statusDetails)`
	`55`	`+ {`
	`56`	`+ var webResult = _webResponseHelper.GetResponsePayload(webResponse);`
	`57`	`+`
	`58`	`+ statusDetails = JsonConvert.DeserializeObject<StatusDetails>(webResult, JsonSerializerSettings);`
	`59`	`+ statusDetails.Headers.statusCode = _webResponseHelper.GetStatusCode(webResponse);`
	`60`	`+ statusDetails.Headers.statusDescription = _webResponseHelper.GetStatusDescription(webResponse);`
	`61`	`+`
	`62`	`+ return statusDetails;`
`52`	`63`	`}`
`53`	`64`	`}`
`54`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ interface IRequestModelHelper`
`7`	`7`	`RequestModel InfoProperties(string apiBaseUrl, string action);`
`8`	`8`	`RequestModel AnalyzeProperties(string apiBaseUrl, string action, string host, string publish, string clearCache, string fromCache, string all);`
`9`	`9`	`RequestModel GetEndpointDataProperties(string apiBaseUrl, string action, string host, string s, string fromCache);`
	`10`	`+ RequestModel GetStatusCodeProperties(string apiBaseUrl, string action);`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,9 @@ namespace SSLLWrapper.Interfaces`
`5`	`5`	`{`
`6`	`6`	`interface IResponsePopulationHelper`
`7`	`7`	`{`
`8`		`- InfoModel InfoModel(HttpWebResponse webResponse, InfoModel infoModel);`
`9`		`- AnalyzeModel AnalyzeModel(HttpWebResponse webResponse, AnalyzeModel analyzeModel);`
`10`		`- EndpointDataModel EndpointDataModel(HttpWebResponse webResponse, EndpointDataModel endpointDataModel);`
	`8`	`+ Info InfoModel(HttpWebResponse webResponse, Info infoModel);`
	`9`	`+ Analyze AnalyzeModel(HttpWebResponse webResponse, Analyze analyzeModel);`
	`10`	`+ Endpoint EndpointModel(HttpWebResponse webResponse, Endpoint endpointDataModel);`
	`11`	`+ StatusDetails StatusDetailsModel(HttpWebResponse webResponse, StatusDetails statusDetails);`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace SSLLWrapper.Models.Response`
`4`	`4`	`{`
`5`		`- public class AnalyzeModel : BaseModel`
	`5`	`+ public class Analyze : BaseModel`
`6`	`6`	`{`
`7`	`7`	`public string host { get; set; }`
`8`	`8`	`public int port { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`		`-using SSLLWrapper.Models.Response.BaseResponseSubModels;`
	`2`	`+using SSLLWrapper.Models.Response.BaseSubModels;`
`3`	`3`
`4`	`4`	`namespace SSLLWrapper.Models.Response`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace SSLLWrapper.Models.Response.BaseResponseSubModels`
	`1`	`+namespace SSLLWrapper.Models.Response.BaseSubModels`
`2`	`2`	`{`
`3`	`3`	`public class Error`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace SSLLWrapper.Models.Response`
`4`	`4`	`{`
`5`		`- public class Endpoint`
	`5`	`+ public class Endpoint : BaseModel`
`6`	`6`	`{`
`7`	`7`	`public string ipAddress { get; set; }`
`8`	`8`	`public string statusMessage { get; set; }`