Adding ignore value to enum for clearCache and fromCache as well as bug fix

Author: AshleyPoole

SSLLWrapper/ApiService.cs

@@ -26,13 +26,15 @@ public enum Publish
 	    public enum ClearCache
 	    {
 		    On,
-		    Off
+		    Off,
+			Ignore
 	    }
 
 	    public enum FromCache
 	    {
 		    On,
-		    Off
+		    Off,
+			Ignore
 	    }
 
 	    public enum All
@@ -67,7 +69,7 @@ public Info Info()
 				var webResponse = _api.MakeGetRequest(requestModel);
 
 				// Binding result to model
-				_responsePopulationHelper.InfoModel(webResponse, infoModel);
+				infoModel = _responsePopulationHelper.InfoModel(webResponse, infoModel);
 
 				if (infoModel.engineVersion != null)
 				{
@@ -89,7 +91,7 @@ public Info Info()
 	    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);
+		    return Analyze(host, Publish.Off, ClearCache.On, FromCache.Ignore, All.On);
 	    }
 
 		public Analyze Analyze(string host, Publish publish, ClearCache clearCache, FromCache fromCache, All all)
@@ -114,7 +116,7 @@ public Analyze Analyze(string host, Publish publish, ClearCache clearCache, From
 				var webResponse = _api.MakeGetRequest(requestModel);
 
 				// Binding result to model
-				_responsePopulationHelper.AnalyzeModel(webResponse, analyzeModel);
+				analyzeModel = _responsePopulationHelper.AnalyzeModel(webResponse, analyzeModel);
 			}
 			catch (Exception ex)
 			{
@@ -155,7 +157,7 @@ public Endpoint GetEndpointData(string host, string s, FromCache fromCache)
 				var webResponse = _api.MakeGetRequest(requestModel);
 
 				// Binding result to model
-				_responsePopulationHelper.EndpointModel(webResponse, endpointModel);
+				endpointModel = _responsePopulationHelper.EndpointModel(webResponse, endpointModel);
 			}
 			catch (Exception ex)
 			{
@@ -182,7 +184,7 @@ public StatusDetails GetStatusCodes()
 			    var webResponse = _api.MakeGetRequest(requestModel);
 
 				// Binding result to model
-			    _responsePopulationHelper.StatusDetailsModel(webResponse, statusDetailsModel);
+			    statusDetailsModel = _responsePopulationHelper.StatusDetailsModel(webResponse, statusDetailsModel);
 		    }
 		    catch (Exception ex)
 		    {

SSLLWrapper/Helpers/RequestModelHelper.cs

@@ -18,10 +18,11 @@ public RequestModel AnalyzeProperties(string apiBaseUrl, string action, string h
 
 			requestModel.Parameters.Add("host", host);
 			requestModel.Parameters.Add("publish", publish);
-			requestModel.Parameters.Add("clearCache", clearCache);
-			//requestModel.Parameters.Add("fromCache", fromCache); // Temp commenting out
 			requestModel.Parameters.Add("all", all);
 
+			if (clearCache != "ignore") { requestModel.Parameters.Add("clearCache", clearCache); }
+			if (fromCache != "ignore") { requestModel.Parameters.Add("fromCache", fromCache); }
+
 			return requestModel;
 		}