More refactoring and tidy up from static analysis

coderpatros · coderpatros · commit b77e118d696f · 2019-11-12T12:26:20.000+10:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -24,5 +24,5 @@
             "request": "attach",
             "processId": "${command:pickProcess}"
         }
-    ,]
+    ]
 }
diff --git a/Patros.AuthenticatedHttpClient.AuthorizationHeader/AuthorizationHeaderAuthenticatedHttpClient.cs b/Patros.AuthenticatedHttpClient.AuthorizationHeader/AuthorizationHeaderAuthenticatedHttpClient.cs
@@ -4,7 +4,13 @@ namespace Patros.AuthenticatedHttpClient
 {
     public static class AuthorizationHeaderAuthenticatedHttpClient
     {
-        public static HttpClient GetClient(AuthorizationHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
+        public static HttpClient GetClient(AuthorizationHeaderAuthenticatedHttpClientOptions options)
+        {
+            var msgHandler = new AuthorizationHeaderAuthenticatedHttpMessageHandler(options);
+            return new HttpClient(msgHandler);
+        }
+
+        public static HttpClient GetClient(AuthorizationHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler)
         {
             var msgHandler = new AuthorizationHeaderAuthenticatedHttpMessageHandler(options, innerHandler);
             return new HttpClient(msgHandler);
diff --git a/Patros.AuthenticatedHttpClient.AuthorizationHeader/AuthorizationHeaderAuthenticatedHttpMessageHandler.cs b/Patros.AuthenticatedHttpClient.AuthorizationHeader/AuthorizationHeaderAuthenticatedHttpMessageHandler.cs
@@ -7,7 +7,7 @@ namespace Patros.AuthenticatedHttpClient
 {
     public class AuthorizationHeaderAuthenticatedHttpMessageHandler : DelegatingHandler
     {
-        private AuthenticationHeaderValue _authorizationHeader;
+        private readonly AuthenticationHeaderValue _authorizationHeader;
 
         public AuthorizationHeaderAuthenticatedHttpMessageHandler(AuthorizationHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
         {
diff --git a/Patros.AuthenticatedHttpClient.AzureAd.Tests/AzureAdAuthenticatedHttpClientTests.cs b/Patros.AuthenticatedHttpClient.AzureAd.Tests/AzureAdAuthenticatedHttpClientTests.cs
@@ -37,7 +37,7 @@ public async Task TestRequestHasAuthorizationHeader()
             mockMsgHandler.CallBase = true;
             var client = new HttpClient(mockMsgHandler.Object);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com");
+            await client.GetStringAsync("https://www.example.com");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
diff --git a/Patros.AuthenticatedHttpClient.AzureAd/AzureAdAuthenticatedHttpClient.cs b/Patros.AuthenticatedHttpClient.AzureAd/AzureAdAuthenticatedHttpClient.cs
@@ -6,7 +6,13 @@ namespace Patros.AuthenticatedHttpClient
     // https://github.com/Azure-Samples/active-directory-dotnet-daemon/blob/master/TodoListDaemon/Program.cs
     public static class AzureAdAuthenticatedHttpClient
     {
-        public static HttpClient GetClient(AzureAdAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
+        public static HttpClient GetClient(AzureAdAuthenticatedHttpClientOptions options)
+        {
+            var msgHandler = new AzureAdAuthenticatedHttpMessageHandler(options);
+            return new HttpClient(msgHandler);
+        }
+
+        public static HttpClient GetClient(AzureAdAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler)
         {
             var msgHandler = new AzureAdAuthenticatedHttpMessageHandler(options, innerHandler);
             return new HttpClient(msgHandler);
diff --git a/Patros.AuthenticatedHttpClient.AzureAd/AzureAdAuthenticatedHttpMessageHandler.cs b/Patros.AuthenticatedHttpClient.AzureAd/AzureAdAuthenticatedHttpMessageHandler.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Globalization;
@@ -14,7 +14,7 @@ public class AzureAdAuthenticatedHttpMessageHandler : DelegatingHandler
     {
         private string _resourceId;
         private AuthenticationContext _authContext;
-        private ClientCredential _clientCredential;
+        private readonly ClientCredential _clientCredential;
 
         public AzureAdAuthenticatedHttpMessageHandler(AzureAdAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
         {
diff --git a/Patros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity.Tests/AzureAppSericeManagedIdentityAuthenticatedHttpClientTests.cs b/Patros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity.Tests/AzureAppSericeManagedIdentityAuthenticatedHttpClientTests.cs
@@ -33,7 +33,7 @@ public async Task TestRequestHasAuthorizationHeader()
             mockMsgHandler.CallBase = true;
             var client = new HttpClient(mockMsgHandler.Object);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com");
+            await client.GetStringAsync("https://www.example.com");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
diff --git a/Patros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity/AzureAppServiceManagedIdentityAuthenticatedHttpClient.cs b/Patros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity/AzureAppServiceManagedIdentityAuthenticatedHttpClient.cs
@@ -2,9 +2,15 @@
 
 namespace Patros.AuthenticatedHttpClient
 {
-    public class AzureAppServiceManagedIdentityAuthenticatedHttpClient
+    public static class AzureAppServiceManagedIdentityAuthenticatedHttpClient
     {
-       public static HttpClient GetClient(AzureAppServiceManagedIdentityAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
+       public static HttpClient GetClient(AzureAppServiceManagedIdentityAuthenticatedHttpClientOptions options)
+        {
+            var msgHandler = new AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler(options);
+            return new HttpClient(msgHandler);
+        }
+
+       public static HttpClient GetClient(AzureAppServiceManagedIdentityAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler)
         {
             var msgHandler = new AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler(options, innerHandler);
             return new HttpClient(msgHandler);
diff --git a/Patros.AuthenticatedHttpClient.Basic.Tests/BasicAuthenticatedHttpClientTests.cs b/Patros.AuthenticatedHttpClient.Basic.Tests/BasicAuthenticatedHttpClientTests.cs
@@ -40,7 +40,7 @@ public async Task TestRequestHasAuthorizationHeader()
                 Password = "open sesame"
             }, mockHttp);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com");
+            await client.GetStringAsync("https://www.example.com");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
diff --git a/Patros.AuthenticatedHttpClient.Basic/BasicAuthenticatedHttpClient.cs b/Patros.AuthenticatedHttpClient.Basic/BasicAuthenticatedHttpClient.cs
@@ -4,7 +4,13 @@ namespace Patros.AuthenticatedHttpClient
 {
     public static class BasicAuthenticatedHttpClient
     {
-        public static HttpClient GetClient(BasicAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
+        public static HttpClient GetClient(BasicAuthenticatedHttpClientOptions options)
+        {
+            var msgHandler = new BasicAuthenticatedHttpMessageHandler(options);
+            return new HttpClient(msgHandler);
+        }
+
+        public static HttpClient GetClient(BasicAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler)
         {
             var msgHandler = new BasicAuthenticatedHttpMessageHandler(options, innerHandler);
             return new HttpClient(msgHandler);
diff --git a/Patros.AuthenticatedHttpClient.Basic/BasicAuthenticatedHttpMessageHandler.cs b/Patros.AuthenticatedHttpClient.Basic/BasicAuthenticatedHttpMessageHandler.cs
@@ -7,7 +7,7 @@ namespace Patros.AuthenticatedHttpClient
 {
     public class BasicAuthenticatedHttpMessageHandler : DelegatingHandler
     {
-        private AuthenticationHeaderValue _authorizationHeader;
+        private readonly AuthenticationHeaderValue _authorizationHeader;
 
         public BasicAuthenticatedHttpMessageHandler(BasicAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
         {
diff --git a/Patros.AuthenticatedHttpClient.CustomHeader/CustomHeaderAuthenticatedHttpClient.cs b/Patros.AuthenticatedHttpClient.CustomHeader/CustomHeaderAuthenticatedHttpClient.cs
@@ -6,13 +6,24 @@ namespace Patros.AuthenticatedHttpClient
 {
     public static class CustomHeaderAuthenticatedHttpClient
     {
-        public static HttpClient GetClient(CustomHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
+        public static HttpClient GetClient(CustomHeaderAuthenticatedHttpClientOptions options)
+        {
+            var msgHandler = new CustomHeaderAuthenticatedHttpMessageHandler(options);
+            return new HttpClient(msgHandler);
+        }
+
+        public static HttpClient GetClient(CustomHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler)
         {
             var msgHandler = new CustomHeaderAuthenticatedHttpMessageHandler(options, innerHandler);
             return new HttpClient(msgHandler);
         }
 
-        public static HttpClient GetClient(MultipleCustomHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
+        public static HttpClient GetClient(MultipleCustomHeaderAuthenticatedHttpClientOptions options)
+        {
+            return GetClient(options, null);
+        }
+
+        public static HttpClient GetClient(MultipleCustomHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler)
         {
             if (options.Headers.Count == 0) throw new ArgumentOutOfRangeException(nameof(options), "No headers supplied.");
 
diff --git a/Patros.AuthenticatedHttpClient.QueryStringParameter.Tests/QueryStringParameterAuthenticatedHttpClientTests.cs b/Patros.AuthenticatedHttpClient.QueryStringParameter.Tests/QueryStringParameterAuthenticatedHttpClientTests.cs
@@ -67,7 +67,7 @@ public async Task TestRequestReplacesAuthenticationParameter()
                 Value = "test-value"
             }, mockHttp);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com?test-name=incorrect-value");
+            await client.GetStringAsync("https://www.example.com?test-name=incorrect-value");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
@@ -89,7 +89,7 @@ public async Task TestRequestAddsAuthenticationParameterToExistingQuery()
                 Value = "test-value"
             }, mockHttp);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com?other-name=other-value");
+            await client.GetStringAsync("https://www.example.com?other-name=other-value");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
@@ -114,7 +114,7 @@ public async Task TestMultipleParameterRequestAddsAuthenticationParameters()
                 }
             }, mockHttp);
 
-            var responseContent = await client.GetStringAsync("https://www.example.com");
+            await client.GetStringAsync("https://www.example.com");
 
             mockHttp.VerifyNoOutstandingExpectation();
         }
diff --git a/Patros.AuthenticatedHttpClient.QueryStringParameter/QueryStringParameterAuthenticatedHttpClient.cs b/Patros.AuthenticatedHttpClient.QueryStringParameter/QueryStringParameterAuthenticatedHttpClient.cs
@@ -9,13 +9,24 @@ namespace Patros.AuthenticatedHttpClient
 {
     public static class QueryStringParameterAuthenticatedHttpClient
     {
-        public static HttpClient GetClient(QueryStringParameterAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
+        public static HttpClient GetClient(QueryStringParameterAuthenticatedHttpClientOptions options)
+        {
+            var msgHandler = new QueryStringParameterAuthenticatedHttpMessageHandler(options);
+            return new HttpClient(msgHandler);
+        }
+
+        public static HttpClient GetClient(QueryStringParameterAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler)
         {
             var msgHandler = new QueryStringParameterAuthenticatedHttpMessageHandler(options, innerHandler);
             return new HttpClient(msgHandler);
         }
 
-        public static HttpClient GetClient(MultipleQueryStringParameterAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)
+        public static HttpClient GetClient(MultipleQueryStringParameterAuthenticatedHttpClientOptions options)
+        {
+            return GetClient(options, null);
+        }
+
+        public static HttpClient GetClient(MultipleQueryStringParameterAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler)
         {
             if (options.Parameters.Count == 0) throw new ArgumentOutOfRangeException(nameof(options), "No parameters supplied.");
 
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ work too.
 Authorization Header Authenticated Http Client Example Usage
 ------------------------------------------------------------
 
-```
+```shell
 dotnet add package Patros.AuthenticatedHttpClient.AuthorizationHeader
 ```
 
@@ -86,7 +86,7 @@ var content = await client.GetStringAsync("https://www.example.com");
 Azure App Service Managed Identity Authenticated Http Client Example Usage
 --------------------------------------------------------------------------
 
-```
+```shell
 dotnet add package Patros.AuthenticatedHttpClient.AzureAppServiceManagedIdentity
 ```
 
@@ -108,7 +108,7 @@ var content = await client.GetStringAsync("https://www.example.com");
 Basic Authenticated Http Client Example Usage
 ---------------------------------------------
 
-```
+```shell
 dotnet add package Patros.AuthenticatedHttpClient.Basic
 ```
 
@@ -131,7 +131,7 @@ var content = await client.GetStringAsync("https://www.example.com");
 Custom Header Authenticated Http Client Example Usage
 -----------------------------------------------------
 
-```
+```shell
 dotnet add package Patros.AuthenticatedHttpClient.CustomHeader
 ```
 
@@ -177,7 +177,7 @@ var content = await client.GetStringAsync("https://www.example.com");
 Query String Parameter Authenticated Http Client Example Usage
 --------------------------------------------------------------
 
-```
+```shell
 dotnet add package Patros.AuthenticatedHttpClient.QueryStringParameter
 ```
 
@@ -228,7 +228,7 @@ multiple authentication methods. Just for an example, let's pretend it
 requires basic authentication, a query string parameter and a custom HTTP
 header. I know, that would never happen in the real world... oh wait... there's the [Whispir API](https://whispir.github.io/api/).
 
-```
+```shell
 dotnet add package Patros.AuthenticatedHttpClient.Basic
 dotnet add package Patros.AuthenticatedHttpClient.CustomHeader
 dotnet add package Patros.AuthenticatedHttpClient.QueryStringParameter

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@`
`24`	`24`	`"request": "attach",`
`25`	`25`	`"processId": "${command:pickProcess}"`
`26`	`26`	`}`
`27`		`- ,]`
	`27`	`+ ]`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,13 @@ namespace Patros.AuthenticatedHttpClient`
`4`	`4`	`{`
`5`	`5`	`public static class AuthorizationHeaderAuthenticatedHttpClient`
`6`	`6`	`{`
`7`		`- public static HttpClient GetClient(AuthorizationHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)`
	`7`	`+ public static HttpClient GetClient(AuthorizationHeaderAuthenticatedHttpClientOptions options)`
	`8`	`+ {`
	`9`	`+ var msgHandler = new AuthorizationHeaderAuthenticatedHttpMessageHandler(options);`
	`10`	`+ return new HttpClient(msgHandler);`
	`11`	`+ }`
	`12`	`+`
	`13`	`+ public static HttpClient GetClient(AuthorizationHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler)`
`8`	`14`	`{`
`9`	`15`	`var msgHandler = new AuthorizationHeaderAuthenticatedHttpMessageHandler(options, innerHandler);`
`10`	`16`	`return new HttpClient(msgHandler);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Patros.AuthenticatedHttpClient`
`7`	`7`	`{`
`8`	`8`	`public class AuthorizationHeaderAuthenticatedHttpMessageHandler : DelegatingHandler`
`9`	`9`	`{`
`10`		`- private AuthenticationHeaderValue _authorizationHeader;`
	`10`	`+ private readonly AuthenticationHeaderValue _authorizationHeader;`
`11`	`11`
`12`	`12`	`public AuthorizationHeaderAuthenticatedHttpMessageHandler(AuthorizationHeaderAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public async Task TestRequestHasAuthorizationHeader()`
`37`	`37`	`mockMsgHandler.CallBase = true;`
`38`	`38`	`var client = new HttpClient(mockMsgHandler.Object);`
`39`	`39`
`40`		`- var responseContent = await client.GetStringAsync("https://www.example.com");`
	`40`	`+ await client.GetStringAsync("https://www.example.com");`
`41`	`41`
`42`	`42`	`mockHttp.VerifyNoOutstandingExpectation();`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Net.Http;`
`3`	`3`	`using System.Net.Http.Headers;`
`4`	`4`	`using System.Globalization;`
`@@ -14,7 +14,7 @@ public class AzureAdAuthenticatedHttpMessageHandler : DelegatingHandler`
`14`	`14`	`{`
`15`	`15`	`private string _resourceId;`
`16`	`16`	`private AuthenticationContext _authContext;`
`17`		`- private ClientCredential _clientCredential;`
	`17`	`+ private readonly ClientCredential _clientCredential;`
`18`	`18`
`19`	`19`	`public AzureAdAuthenticatedHttpMessageHandler(AzureAdAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public async Task TestRequestHasAuthorizationHeader()`
`33`	`33`	`mockMsgHandler.CallBase = true;`
`34`	`34`	`var client = new HttpClient(mockMsgHandler.Object);`
`35`	`35`
`36`		`- var responseContent = await client.GetStringAsync("https://www.example.com");`
	`36`	`+ await client.GetStringAsync("https://www.example.com");`
`37`	`37`
`38`	`38`	`mockHttp.VerifyNoOutstandingExpectation();`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,15 @@`
`2`	`2`
`3`	`3`	`namespace Patros.AuthenticatedHttpClient`
`4`	`4`	`{`
`5`		`- public class AzureAppServiceManagedIdentityAuthenticatedHttpClient`
	`5`	`+ public static class AzureAppServiceManagedIdentityAuthenticatedHttpClient`
`6`	`6`	`{`
`7`		`- public static HttpClient GetClient(AzureAppServiceManagedIdentityAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)`
	`7`	`+ public static HttpClient GetClient(AzureAppServiceManagedIdentityAuthenticatedHttpClientOptions options)`
	`8`	`+ {`
	`9`	`+ var msgHandler = new AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler(options);`
	`10`	`+ return new HttpClient(msgHandler);`
	`11`	`+ }`
	`12`	`+`
	`13`	`+ public static HttpClient GetClient(AzureAppServiceManagedIdentityAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler)`
`8`	`14`	`{`
`9`	`15`	`var msgHandler = new AzureAppServiceManagedIdentityAuthenticatedHttpMessageHandler(options, innerHandler);`
`10`	`16`	`return new HttpClient(msgHandler);`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public async Task TestRequestHasAuthorizationHeader()`
`40`	`40`	`Password = "open sesame"`
`41`	`41`	`}, mockHttp);`
`42`	`42`
`43`		`- var responseContent = await client.GetStringAsync("https://www.example.com");`
	`43`	`+ await client.GetStringAsync("https://www.example.com");`
`44`	`44`
`45`	`45`	`mockHttp.VerifyNoOutstandingExpectation();`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,13 @@ namespace Patros.AuthenticatedHttpClient`
`4`	`4`	`{`
`5`	`5`	`public static class BasicAuthenticatedHttpClient`
`6`	`6`	`{`
`7`		`- public static HttpClient GetClient(BasicAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler = null)`
	`7`	`+ public static HttpClient GetClient(BasicAuthenticatedHttpClientOptions options)`
	`8`	`+ {`
	`9`	`+ var msgHandler = new BasicAuthenticatedHttpMessageHandler(options);`
	`10`	`+ return new HttpClient(msgHandler);`
	`11`	`+ }`
	`12`	`+`
	`13`	`+ public static HttpClient GetClient(BasicAuthenticatedHttpClientOptions options, HttpMessageHandler innerHandler)`
`8`	`14`	`{`
`9`	`15`	`var msgHandler = new BasicAuthenticatedHttpMessageHandler(options, innerHandler);`
`10`	`16`	`return new HttpClient(msgHandler);`