Merge branch 'master' of https://github.com/RallyTools/RallyRestToolkitFor.NET

krmorse · krmorse · commit d6c2f58781ed · 2016-07-12T09:57:11.000-06:00
diff --git a/Rally.RestApi.UiForWinforms/RestApiAuthMgrWinforms.cs b/Rally.RestApi.UiForWinforms/RestApiAuthMgrWinforms.cs
@@ -29,9 +29,10 @@ public class RestApiAuthMgrWinforms : ApiAuthManager
 		/// for UI support.</param>
 		/// <param name="encryptionRoutines">The encryption routines to use for encryption/decryption of data. Only used for UI support.</param>
 		/// <param name="webServiceVersion">The version of the WSAPI API to use.</param>
+		/// <param name="traceInfo">Controls diagnostic trace information being logged</param>
 		public RestApiAuthMgrWinforms(string applicationToken, string encryptionKey,
-			IEncryptionRoutines encryptionRoutines, string webServiceVersion = RallyRestApi.DEFAULT_WSAPI_VERSION)
-			: base(true, applicationToken, encryptionKey, encryptionRoutines, webServiceVersion)
+			IEncryptionRoutines encryptionRoutines, string webServiceVersion = RallyRestApi.DEFAULT_WSAPI_VERSION, TraceFieldEnum traceInfo = RallyRestApi.DEFAULT_TRACE_FIELDS)
+			: base(true, applicationToken, encryptionKey, encryptionRoutines, webServiceVersion, traceInfo)
 		{
 		}
 		#endregion
diff --git a/Rally.RestApi/Auth/ApiAuthManager.cs b/Rally.RestApi/Auth/ApiAuthManager.cs
@@ -171,8 +171,9 @@ static ApiAuthManager()
 		/// for UI support.</param>
 		/// <param name="encryptionRoutines">The encryption routines to use for encryption/decryption of data. Only used for UI support.</param>
 		/// <param name="webServiceVersion">The version of the WSAPI API to use.</param>
+		/// <param name="traceInfo">Controls diagnostic trace information being logged</param>
 		protected ApiAuthManager(bool isUiSupported, string applicationToken, string encryptionKey,
-			IEncryptionRoutines encryptionRoutines, string webServiceVersion = RallyRestApi.DEFAULT_WSAPI_VERSION)
+			IEncryptionRoutines encryptionRoutines, string webServiceVersion = RallyRestApi.DEFAULT_WSAPI_VERSION, TraceFieldEnum traceInfo = RallyRestApi.DEFAULT_TRACE_FIELDS)
 		{
 			if (isUiSupported)
 			{
@@ -203,7 +204,7 @@ protected ApiAuthManager(bool isUiSupported, string applicationToken, string enc
 			}
 
 			IsUiSupported = isUiSupported;
-			Api = new RallyRestApi(this, webServiceVersion: webServiceVersion);
+			Api = new RallyRestApi(this, webServiceVersion: webServiceVersion, traceInfo: traceInfo);
 		}
 		#endregion
 
diff --git a/Rally.RestApi/Auth/ApiConsoleAuthManager.cs b/Rally.RestApi/Auth/ApiConsoleAuthManager.cs
@@ -15,8 +15,9 @@ public class ApiConsoleAuthManager : ApiAuthManager
 		/// Constructor
 		/// </summary>
 		/// <param name="webServiceVersion">The version of the WSAPI API to use.</param>
-		public ApiConsoleAuthManager(string webServiceVersion = RallyRestApi.DEFAULT_WSAPI_VERSION)
-			: base(false, null, null, null, webServiceVersion)
+		/// <param name="traceInfo">Controls diagnostic trace information being logged</param>
+		public ApiConsoleAuthManager(string webServiceVersion = RallyRestApi.DEFAULT_WSAPI_VERSION, TraceFieldEnum traceInfo = RallyRestApi.DEFAULT_TRACE_FIELDS)
+			: base(false, null, null, null, webServiceVersion, traceInfo)
 		{
 		}
 		#endregion
diff --git a/Rally.RestApi/Rally.RestApi.csproj b/Rally.RestApi/Rally.RestApi.csproj
@@ -85,6 +85,7 @@
     <Compile Include="Connection\ConnectionType.cs" />
     <Compile Include="Exceptions\RallyFailedToDeserializeJson.cs" />
     <Compile Include="Response\AttachmentResult.cs" />
+    <Compile Include="TraceHelper.cs" />
     <Compile Include="Web\SsoWebClient.cs" />
     <Compile Include="Web\CookieAwareCacheableWebClient.cs" />
     <Compile Include="Web\CookieAwareWebClient.cs" />
diff --git a/Rally.RestApi/RallyRestApi.cs b/Rally.RestApi/RallyRestApi.cs
@@ -120,6 +120,10 @@ internal class StringValue : Attribute
 		/// </summary>
 		public const string DEFAULT_WSAPI_VERSION = "v2.0";
 		/// <summary>
+		/// The default Trace fields
+		/// </summary>
+		public const TraceFieldEnum DEFAULT_TRACE_FIELDS = TraceFieldEnum.Data | TraceFieldEnum.Headers | TraceFieldEnum.Cookies;
+		/// <summary>
 		/// The default server to use: (https://rally1.rallydev.com)
 		/// </summary>
 		public const string DEFAULT_SERVER = "https://rally1.rallydev.com";
@@ -132,6 +136,7 @@ internal class StringValue : Attribute
 		#region Properties and Fields
 		private ApiAuthManager authManger;
 		private HttpService httpService;
+		private int maxRetries;
 		private readonly DynamicJsonSerializer serializer = new DynamicJsonSerializer();
 		/// <summary>
 		/// The HTTP headers to be included on all REST requests
@@ -176,6 +181,8 @@ public string WebServiceUrl
 		/// <param name="authManger">The authorization manager to use when authentication requires it. If no driver is 
 		/// provided a console authentication manager will be used which does not allow SSO authentication.</param>
 		/// <param name="webServiceVersion">The WSAPI version to use (defaults to DEFAULT_WSAPI_VERSION)</param>
+		/// <param name="maxRetries">Requests will be attempted a number of times (defaults to 3)</param>
+		/// <param name="traceInfo">Controls diagnostic trace information being logged</param>
 		/// <example>
 		/// For a console application, no authentication manager is needed as shown in this example.
 		/// <code language="C#">
@@ -196,13 +203,15 @@ public string WebServiceUrl
 		/// wpfAuthMgr = new RestApiAuthMgrWpf(applicationToken, encryptionKey, encryptionUtilities);
 		/// </code>
 		/// </example>
-		public RallyRestApi(ApiAuthManager authManger = null, string webServiceVersion = DEFAULT_WSAPI_VERSION)
+		public RallyRestApi(ApiAuthManager authManger = null, string webServiceVersion = DEFAULT_WSAPI_VERSION, int maxRetries = 3, TraceFieldEnum traceInfo = RallyRestApi.DEFAULT_TRACE_FIELDS)
 		{
 			// NOTE: The example for using the RestApiAuthMgrWpf is also shown there. Make sure you 
 			// update both if you change it.
 
+			TraceHelper.TraceFields = traceInfo;
+
 			if (authManger == null)
-				authManger = new ApiConsoleAuthManager();
+				authManger = new ApiConsoleAuthManager(webServiceVersion, traceInfo);
 
 			this.authManger = authManger;
 
@@ -211,6 +220,8 @@ public RallyRestApi(ApiAuthManager authManger = null, string webServiceVersion =
 				WsapiVersion = DEFAULT_WSAPI_VERSION;
 
 			AuthenticationState = AuthenticationResult.NotAuthorized;
+
+			this.maxRetries = maxRetries;
 		}
 		#endregion
 
@@ -593,7 +604,7 @@ public QueryResult Query(Request request)
 				alreadyDownloadedItems = request.Start - 1 + request.PageSize;
 			}
 
-			Trace.TraceInformation("The number of threaded requests is : {0}", subsequentQueries.Count);
+			TraceHelper.TraceMessage("The number of threaded requests is : {0}", subsequentQueries.Count);
 
 			var resultDictionary = new Dictionary<int, QueryResult>();
 			Parallel.ForEach(subsequentQueries, new ParallelOptions { MaxDegreeOfParallelism = MAX_THREADS_ALLOWED }, request1 =>
@@ -1339,7 +1350,7 @@ private DynamicJsonObject DoGetAsPost(Request request, bool retry = true, int re
 				Dictionary<string, string> processedHeaders = GetProcessedHeaders();
 				DynamicJsonObject response = serializer.Deserialize(httpService.GetAsPost(GetSecuredUri(uri), data, processedHeaders));
 
-				if (retry && response[response.Fields.First()].Errors.Count > 0 && retryCounter < 3)
+				if (retry && response[response.Fields.First()].Errors.Count > 0 && retryCounter < this.maxRetries)
 				{
 					ConnectionInfo.SecurityToken = GetSecurityToken();
 					httpService = new HttpService(authManger, ConnectionInfo);
@@ -1351,7 +1362,7 @@ private DynamicJsonObject DoGetAsPost(Request request, bool retry = true, int re
 			}
 			catch (Exception)
 			{
-				if (retryCounter < 3)
+				if (retryCounter < this.maxRetries)
 				{
 					Thread.Sleep(retrySleepTime * retryCounter);
 					return DoGetAsPost(request, true, ++retryCounter);
@@ -1378,7 +1389,7 @@ private DynamicJsonObject DoGet(Uri uri, bool retry = true, int retryCounter = 1
 				Dictionary<string, string> processedHeaders = GetProcessedHeaders();
 				DynamicJsonObject response = serializer.Deserialize(httpService.Get(uri, processedHeaders));
 
-				if (retry && response[response.Fields.First()].Errors.Count > 0 && retryCounter < 3)
+				if (retry && response[response.Fields.First()].Errors.Count > 0 && retryCounter < this.maxRetries)
 				{
 					ConnectionInfo.SecurityToken = GetSecurityToken();
 					httpService = new HttpService(authManger, ConnectionInfo);
@@ -1390,7 +1401,7 @@ private DynamicJsonObject DoGet(Uri uri, bool retry = true, int retryCounter = 1
 			}
 			catch (Exception)
 			{
-				if (retryCounter < 3)
+				if (retryCounter < this.maxRetries)
 				{
 					Thread.Sleep(retrySleepTime * retryCounter);
 					return DoGet(uri, true, ++retryCounter);
@@ -1417,7 +1428,7 @@ private DynamicJsonObject DoPost(Uri uri, DynamicJsonObject data, bool retry = t
 				Dictionary<string, string> processedHeaders = GetProcessedHeaders();
 				var response = serializer.Deserialize(httpService.Post(GetSecuredUri(uri), serializer.Serialize(data), processedHeaders));
 
-				if (retry && response[response.Fields.First()].Errors.Count > 0 && retryCounter < 3)
+				if (retry && response[response.Fields.First()].Errors.Count > 0 && retryCounter < this.maxRetries)
 				{
 					ConnectionInfo.SecurityToken = GetSecurityToken();
 					httpService = new HttpService(authManger, ConnectionInfo);
@@ -1429,7 +1440,7 @@ private DynamicJsonObject DoPost(Uri uri, DynamicJsonObject data, bool retry = t
 			}
 			catch (Exception)
 			{
-				if (retryCounter < 3)
+				if (retryCounter < this.maxRetries)
 				{
 					Thread.Sleep(retrySleepTime * retryCounter);
 					return DoPost(uri, data, true, ++retryCounter);
@@ -1479,7 +1490,7 @@ private string GetSecurityToken()
 		{
 			try
 			{
-				DynamicJsonObject securityTokenResponse = DoGet(new Uri(GetFullyQualifiedRef(SECURITY_ENDPOINT)));
+				DynamicJsonObject securityTokenResponse = DoGet(new Uri(GetFullyQualifiedRef(SECURITY_ENDPOINT)), this.maxRetries > 1);
 				return securityTokenResponse["OperationResult"]["SecurityToken"];
 			}
 			catch
diff --git a/Rally.RestApi/TraceHelper.cs b/Rally.RestApi/TraceHelper.cs
@@ -0,0 +1,119 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Rally.RestApi
+{
+	/// <summary>
+	/// Diagnostic trace settings
+	/// </summary>
+	[Flags]
+	public enum TraceFieldEnum
+	{
+		/// <summary>
+		/// No trace
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// Includes Request/Response Data
+		/// </summary>
+		Data = 1,
+
+		/// <summary>
+		/// Include Request/Response Headers
+		/// </summary>
+		Headers = 2,
+
+		/// <summary>
+		/// Include Before/After Cookies
+		/// </summary>
+		Cookies = 4
+	}
+
+	/// <summary>
+	/// Helper class for logging diagnostic trace messages
+	/// </summary>
+	public static class TraceHelper
+	{
+		/// <summary>
+		/// Variable controlling level of Trace output
+		/// </summary>
+		public static TraceFieldEnum TraceFields { get; set; }
+
+		/// <summary>
+		/// Log a Trace message
+		/// </summary>
+		public static void TraceMessage(string format, params object[] args)
+		{
+			if (TraceHelper.TraceFields > 0)
+			{
+				Trace.TraceInformation(format + "\r\n\r\n", args);
+			}
+		}
+
+		/// <summary>
+		/// Log a Http Trace message
+		/// </summary>
+		public static void TraceHttpMessage(string action, DateTime startTime, Uri target, string requestHeaders, object responseData, string responseHeaders)
+		{
+			TraceHttpMessage(action, startTime, target, null, requestHeaders, null, responseData, responseHeaders, null);
+		}
+
+		/// <summary>
+		/// Log a Http Trace message
+		/// </summary>
+		public static void TraceHttpMessage(string action, DateTime startTime, Uri target, string requestHeaders, string cookiesBefore, object responseData, string responseHeaders, string cookiesAfter)
+		{
+			TraceHttpMessage(action, startTime, target, null, requestHeaders, cookiesBefore, responseData, responseHeaders, cookiesAfter);
+		}
+
+		/// <summary>
+		/// Log a Http Trace message
+		/// </summary>
+		public static void TraceHttpMessage(string action, DateTime startTime, Uri target, object requestData, string requestHeaders, string cookiesBefore, object responseData, string responseHeaders, string cookiesAfter)
+		{
+			if (TraceHelper.TraceFields > 0)
+			{
+				string traceRequestData = "", traceResponseData = "", traceRequestHeaders = "", traceResponseHeaders = "", traceCookiesBefore = "", traceCookiesAfter = "";
+
+				var traceSummary = string.Format("{0} ({1}):\r\n{2}", action, DateTime.Now.Subtract(startTime).ToString(), target.ToString());
+
+				// Include data
+				if (TraceHelper.TraceFields.HasFlag(TraceFieldEnum.Data))
+				{
+					traceRequestData = requestData == null ? "" : string.Format("\r\nRequest Data:\r\n{0}\r\n", requestData);
+					traceResponseData = string.Format("\r\nResponse Data\r\n{0}", responseData);
+				}
+
+				// Include headers
+				if (TraceHelper.TraceFields.HasFlag(TraceFieldEnum.Headers))
+				{
+					traceRequestHeaders = string.Format("\r\nRequest Headers:\r\n{0}", requestHeaders);
+					traceResponseHeaders = string.Format("\r\nResponse Headers:\r\n{0}", responseHeaders);
+				}
+
+				// Include cookies
+				if (TraceHelper.TraceFields.HasFlag(TraceFieldEnum.Cookies))
+				{
+					traceCookiesBefore = string.Format("\r\nCookies Before:\r\n{0}", cookiesBefore);
+					traceCookiesAfter = string.Format("\r\nCookies After:\r\n{0}", cookiesAfter);
+				}
+
+				// Log the trace information
+				Trace.TraceInformation(String.Concat(
+					traceSummary,
+					traceRequestHeaders,
+					traceCookiesBefore,
+					traceRequestData,
+					traceResponseHeaders,
+					traceCookiesAfter,
+					traceResponseData,
+					"\r\n\r\n"));
+			}
+		}
+	}
+}
diff --git a/Rally.RestApi/Web/HttpService.cs b/Rally.RestApi/Web/HttpService.cs
@@ -123,14 +123,7 @@ internal byte[] Download(Uri target, IDictionary<string, string> headers = null)
 			}
 			finally
 			{
-				Trace.TraceInformation("Get ({0}):\r\n{1}\r\nRequest Headers:\r\n{2}Cookies Before:\r\n{3}Response Headers:\r\n{4}Cookies After:\r\n{5}Response Data\r\n{6}",
-															 DateTime.Now.Subtract(startTime).ToString(),
-															 target.ToString(),
-															 requestHeaders,
-															 cookiesBefore,
-															 responseHeaders,
-															 cookiesAfter,
-															 response);
+				TraceHelper.TraceHttpMessage("GET", startTime, target, requestHeaders, cookiesBefore, response, responseHeaders, cookiesAfter);
 			}
 		}
 		#endregion
@@ -159,15 +152,7 @@ internal string Post(Uri target, string data, IDictionary<string, string> header
 			}
 			finally
 			{
-				Trace.TraceInformation("Post ({0}):\r\n{1}\r\nRequest Headers:\r\n{2}Cookies Before:\r\n{3}Request Data:\r\n{4}\r\nResponse Headers:\r\n{5}Cookies After:\r\n{6}Response Data\r\n{7}",
-															 DateTime.Now.Subtract(startTime).ToString(),
-															 target.ToString(),
-															 requestHeaders,
-															 cookiesBefore,
-															 data,
-															 responseHeaders,
-															 cookiesAfter,
-															 response);
+				TraceHelper.TraceHttpMessage("POST", startTime, target, data, requestHeaders, cookiesBefore, response, responseHeaders, cookiesAfter);
 			}
 		}
 		#endregion
@@ -211,15 +196,7 @@ internal string GetAsPost(Uri target, IDictionary<string, string> data, IDiction
 			}
 			finally
 			{
-				Trace.TraceInformation("Post ({0}):\r\n{1}\r\nRequest Headers:\r\n{2}Cookies Before:\r\n{3}Request Data:\r\n{4}\r\nResponse Headers:\r\n{5}Cookies After:\r\n{6}Response Data\r\n{7}",
-															 DateTime.Now.Subtract(startTime).ToString(),
-															 target.ToString(),
-															 requestHeaders,
-															 cookiesBefore,
-															 data,
-															 responseHeaders,
-															 cookiesAfter,
-															 response);
+				TraceHelper.TraceHttpMessage("POST", startTime, target, data, requestHeaders, cookiesBefore, response, responseHeaders, cookiesAfter);
 			}
 		}
 		#endregion
@@ -257,14 +234,7 @@ internal string Get(Uri target, IDictionary<string, string> headers = null)
 			}
 			finally
 			{
-				Trace.TraceInformation("Get ({0}):\r\n{1}\r\nRequest Headers:\r\n{2}Cookies Before:\r\n{3}Response Headers:\r\n{4}Cookies After:\r\n{5}Response Data\r\n{6}",
-															 DateTime.Now.Subtract(startTime).ToString(),
-															 target.ToString(),
-															 requestHeaders,
-															 cookiesBefore,
-															 responseHeaders,
-															 cookiesAfter,
-															 response);
+				TraceHelper.TraceHttpMessage("GET", startTime, target, requestHeaders, cookiesBefore, response, responseHeaders, cookiesAfter);
 			}
 		}
 		#endregion
@@ -300,12 +270,7 @@ internal DynamicJsonObject GetCacheable(Uri target, out bool isCachedResult, IDi
 			}
 			finally
 			{
-				Trace.TraceInformation("Get ({0}):\r\n{1}\r\nRequest Headers:\r\n{2}Response Headers:\r\n{3}Response Data\r\n{4}",
-															 DateTime.Now.Subtract(startTime).ToString(),
-															 target.ToString(),
-															 requestHeaders,
-															 responseHeaders,
-															 response);
+				TraceHelper.TraceHttpMessage("GET", startTime, target, requestHeaders, response, responseHeaders);
 			}
 		}
 		#endregion
@@ -353,14 +318,7 @@ internal string Delete(Uri target, IDictionary<string, string> headers = null)
 			}
 			finally
 			{
-				Trace.TraceInformation("Delete ({0}):\r\n{1}\r\nRequest Headers:\r\n{2}Cookies Before:\r\n{3}Response Headers:\r\n{4}Cookies After:\r\n{5}Response Data\r\n{6}",
-															 DateTime.Now.Subtract(startTime).ToString(),
-															 target.ToString(),
-															 requestHeaders,
-															 cookiesBefore,
-															 responseHeaders,
-															 cookiesAfter,
-															 response);
+				TraceHelper.TraceHttpMessage("DELETE", startTime, target, requestHeaders, cookiesBefore, response, responseHeaders, cookiesAfter);
 			}
 		}
 		#endregion

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,10 @@ public class RestApiAuthMgrWinforms : ApiAuthManager`
`29`	`29`	`/// for UI support.</param>`
`30`	`30`	`/// <param name="encryptionRoutines">The encryption routines to use for encryption/decryption of data. Only used for UI support.</param>`
`31`	`31`	`/// <param name="webServiceVersion">The version of the WSAPI API to use.</param>`
	`32`	`+ /// <param name="traceInfo">Controls diagnostic trace information being logged</param>`
`32`	`33`	`public RestApiAuthMgrWinforms(string applicationToken, string encryptionKey,`
`33`		`- IEncryptionRoutines encryptionRoutines, string webServiceVersion = RallyRestApi.DEFAULT_WSAPI_VERSION)`
`34`		`- : base(true, applicationToken, encryptionKey, encryptionRoutines, webServiceVersion)`
	`34`	`+ IEncryptionRoutines encryptionRoutines, string webServiceVersion = RallyRestApi.DEFAULT_WSAPI_VERSION, TraceFieldEnum traceInfo = RallyRestApi.DEFAULT_TRACE_FIELDS)`
	`35`	`+ : base(true, applicationToken, encryptionKey, encryptionRoutines, webServiceVersion, traceInfo)`
`35`	`36`	`{`
`36`	`37`	`}`
`37`	`38`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -171,8 +171,9 @@ static ApiAuthManager()`
`171`	`171`	`/// for UI support.</param>`
`172`	`172`	`/// <param name="encryptionRoutines">The encryption routines to use for encryption/decryption of data. Only used for UI support.</param>`
`173`	`173`	`/// <param name="webServiceVersion">The version of the WSAPI API to use.</param>`
	`174`	`+ /// <param name="traceInfo">Controls diagnostic trace information being logged</param>`
`174`	`175`	`protected ApiAuthManager(bool isUiSupported, string applicationToken, string encryptionKey,`
`175`		`- IEncryptionRoutines encryptionRoutines, string webServiceVersion = RallyRestApi.DEFAULT_WSAPI_VERSION)`
	`176`	`+ IEncryptionRoutines encryptionRoutines, string webServiceVersion = RallyRestApi.DEFAULT_WSAPI_VERSION, TraceFieldEnum traceInfo = RallyRestApi.DEFAULT_TRACE_FIELDS)`
`176`	`177`	`{`
`177`	`178`	`if (isUiSupported)`
`178`	`179`	`{`
`@@ -203,7 +204,7 @@ protected ApiAuthManager(bool isUiSupported, string applicationToken, string enc`
`203`	`204`	`}`
`204`	`205`
`205`	`206`	`IsUiSupported = isUiSupported;`
`206`		`- Api = new RallyRestApi(this, webServiceVersion: webServiceVersion);`
	`207`	`+ Api = new RallyRestApi(this, webServiceVersion: webServiceVersion, traceInfo: traceInfo);`
`207`	`208`	`}`
`208`	`209`	`#endregion`
`209`	`210`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,9 @@ public class ApiConsoleAuthManager : ApiAuthManager`
`15`	`15`	`/// Constructor`
`16`	`16`	`/// </summary>`
`17`	`17`	`/// <param name="webServiceVersion">The version of the WSAPI API to use.</param>`
`18`		`- public ApiConsoleAuthManager(string webServiceVersion = RallyRestApi.DEFAULT_WSAPI_VERSION)`
`19`		`- : base(false, null, null, null, webServiceVersion)`
	`18`	`+ /// <param name="traceInfo">Controls diagnostic trace information being logged</param>`
	`19`	`+ public ApiConsoleAuthManager(string webServiceVersion = RallyRestApi.DEFAULT_WSAPI_VERSION, TraceFieldEnum traceInfo = RallyRestApi.DEFAULT_TRACE_FIELDS)`
	`20`	`+ : base(false, null, null, null, webServiceVersion, traceInfo)`
`20`	`21`	`{`
`21`	`22`	`}`
`22`	`23`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -123,14 +123,7 @@ internal byte[] Download(Uri target, IDictionary<string, string> headers = null)`
`123`	`123`	`}`
`124`	`124`	`finally`
`125`	`125`	`{`
`126`		`- Trace.TraceInformation("Get ({0}):\r\n{1}\r\nRequest Headers:\r\n{2}Cookies Before:\r\n{3}Response Headers:\r\n{4}Cookies After:\r\n{5}Response Data\r\n{6}",`
`127`		`- DateTime.Now.Subtract(startTime).ToString(),`
`128`		`- target.ToString(),`
`129`		`- requestHeaders,`
`130`		`- cookiesBefore,`
`131`		`- responseHeaders,`
`132`		`- cookiesAfter,`
`133`		`- response);`
	`126`	`+ TraceHelper.TraceHttpMessage("GET", startTime, target, requestHeaders, cookiesBefore, response, responseHeaders, cookiesAfter);`
`134`	`127`	`}`
`135`	`128`	`}`
`136`	`129`	`#endregion`
`@@ -159,15 +152,7 @@ internal string Post(Uri target, string data, IDictionary<string, string> header`
`159`	`152`	`}`
`160`	`153`	`finally`
`161`	`154`	`{`
`162`		`- Trace.TraceInformation("Post ({0}):\r\n{1}\r\nRequest Headers:\r\n{2}Cookies Before:\r\n{3}Request Data:\r\n{4}\r\nResponse Headers:\r\n{5}Cookies After:\r\n{6}Response Data\r\n{7}",`
`163`		`- DateTime.Now.Subtract(startTime).ToString(),`
`164`		`- target.ToString(),`
`165`		`- requestHeaders,`
`166`		`- cookiesBefore,`
`167`		`- data,`
`168`		`- responseHeaders,`
`169`		`- cookiesAfter,`
`170`		`- response);`
	`155`	`+ TraceHelper.TraceHttpMessage("POST", startTime, target, data, requestHeaders, cookiesBefore, response, responseHeaders, cookiesAfter);`
`171`	`156`	`}`
`172`	`157`	`}`
`173`	`158`	`#endregion`
`@@ -211,15 +196,7 @@ internal string GetAsPost(Uri target, IDictionary<string, string> data, IDiction`
`211`	`196`	`}`
`212`	`197`	`finally`
`213`	`198`	`{`
`214`		`- Trace.TraceInformation("Post ({0}):\r\n{1}\r\nRequest Headers:\r\n{2}Cookies Before:\r\n{3}Request Data:\r\n{4}\r\nResponse Headers:\r\n{5}Cookies After:\r\n{6}Response Data\r\n{7}",`
`215`		`- DateTime.Now.Subtract(startTime).ToString(),`
`216`		`- target.ToString(),`
`217`		`- requestHeaders,`
`218`		`- cookiesBefore,`
`219`		`- data,`
`220`		`- responseHeaders,`
`221`		`- cookiesAfter,`
`222`		`- response);`
	`199`	`+ TraceHelper.TraceHttpMessage("POST", startTime, target, data, requestHeaders, cookiesBefore, response, responseHeaders, cookiesAfter);`
`223`	`200`	`}`
`224`	`201`	`}`
`225`	`202`	`#endregion`
`@@ -257,14 +234,7 @@ internal string Get(Uri target, IDictionary<string, string> headers = null)`
`257`	`234`	`}`
`258`	`235`	`finally`
`259`	`236`	`{`
`260`		`- Trace.TraceInformation("Get ({0}):\r\n{1}\r\nRequest Headers:\r\n{2}Cookies Before:\r\n{3}Response Headers:\r\n{4}Cookies After:\r\n{5}Response Data\r\n{6}",`
`261`		`- DateTime.Now.Subtract(startTime).ToString(),`
`262`		`- target.ToString(),`
`263`		`- requestHeaders,`
`264`		`- cookiesBefore,`
`265`		`- responseHeaders,`
`266`		`- cookiesAfter,`
`267`		`- response);`
	`237`	`+ TraceHelper.TraceHttpMessage("GET", startTime, target, requestHeaders, cookiesBefore, response, responseHeaders, cookiesAfter);`
`268`	`238`	`}`
`269`	`239`	`}`
`270`	`240`	`#endregion`
`@@ -300,12 +270,7 @@ internal DynamicJsonObject GetCacheable(Uri target, out bool isCachedResult, IDi`
`300`	`270`	`}`
`301`	`271`	`finally`
`302`	`272`	`{`
`303`		`- Trace.TraceInformation("Get ({0}):\r\n{1}\r\nRequest Headers:\r\n{2}Response Headers:\r\n{3}Response Data\r\n{4}",`
`304`		`- DateTime.Now.Subtract(startTime).ToString(),`
`305`		`- target.ToString(),`
`306`		`- requestHeaders,`
`307`		`- responseHeaders,`
`308`		`- response);`
	`273`	`+ TraceHelper.TraceHttpMessage("GET", startTime, target, requestHeaders, response, responseHeaders);`
`309`	`274`	`}`
`310`	`275`	`}`
`311`	`276`	`#endregion`
`@@ -353,14 +318,7 @@ internal string Delete(Uri target, IDictionary<string, string> headers = null)`
`353`	`318`	`}`
`354`	`319`	`finally`
`355`	`320`	`{`
`356`		`- Trace.TraceInformation("Delete ({0}):\r\n{1}\r\nRequest Headers:\r\n{2}Cookies Before:\r\n{3}Response Headers:\r\n{4}Cookies After:\r\n{5}Response Data\r\n{6}",`
`357`		`- DateTime.Now.Subtract(startTime).ToString(),`
`358`		`- target.ToString(),`
`359`		`- requestHeaders,`
`360`		`- cookiesBefore,`
`361`		`- responseHeaders,`
`362`		`- cookiesAfter,`
`363`		`- response);`
	`321`	`+ TraceHelper.TraceHttpMessage("DELETE", startTime, target, requestHeaders, cookiesBefore, response, responseHeaders, cookiesAfter);`
`364`	`322`	`}`
`365`	`323`	`}`
`366`	`324`	`#endregion`