Quick code review by @raman-m

raman-m · raman-m · commit 024d2d21f335 · 2024-04-25T20:40:58.000+03:00
diff --git a/src/Ocelot/Configuration/HttpHandlerOptions.cs b/src/Ocelot/Configuration/HttpHandlerOptions.cs
@@ -1,6 +1,4 @@
-﻿using System.Net.Http;
-
-namespace Ocelot.Configuration
+﻿namespace Ocelot.Configuration
 {
     /// <summary>
     /// Describes configuration parameters for http handler, that is created to handle a request to service.
diff --git a/src/Ocelot/Configuration/HttpHandlerOptionsBuilder.cs b/src/Ocelot/Configuration/HttpHandlerOptionsBuilder.cs
@@ -54,9 +54,13 @@ public HttpHandlerOptionsBuilder WithUseDefaultCredentials(bool input)
             return this;
         }
 
-        public HttpHandlerOptions Build()
-        {
-            return new HttpHandlerOptions(_allowAutoRedirect, _useCookieContainer, _useTracing, _useProxy, _maxConnectionPerServer, _pooledConnectionLifetime, _useDefaultCredentials);
-        }
+        public HttpHandlerOptions Build() => new(
+            _allowAutoRedirect,
+            _useCookieContainer,
+            _useTracing,
+            _useProxy,
+            _maxConnectionPerServer,
+            _pooledConnectionLifetime,
+            _useDefaultCredentials);
     }
 }
diff --git a/src/Ocelot/Requester/MessageInvokerPool.cs b/src/Ocelot/Requester/MessageInvokerPool.cs
@@ -12,7 +12,8 @@ public class MessageInvokerPool : IMessageInvokerPool
 
     public MessageInvokerPool(IDelegatingHandlerHandlerFactory handlerFactory, IOcelotLoggerFactory loggerFactory)
     {
-        _handlerFactory = handlerFactory ?? throw new ArgumentNullException(nameof(handlerFactory));
+        ArgumentNullException.ThrowIfNull(handlerFactory);
+        _handlerFactory = handlerFactory;
         _handlersPool = new ConcurrentDictionary<MessageInvokerCacheKey, Lazy<HttpMessageInvoker>>();
 
         ArgumentNullException.ThrowIfNull(loggerFactory);
@@ -70,17 +71,18 @@ private HttpMessageInvoker CreateMessageInvoker(DownstreamRoute downstreamRoute)
 
     private HttpMessageHandler CreateHandler(DownstreamRoute downstreamRoute)
     {
+        var options = downstreamRoute.HttpHandlerOptions;
         var handler = new SocketsHttpHandler
         {
-            AllowAutoRedirect = downstreamRoute.HttpHandlerOptions.AllowAutoRedirect,
-            UseCookies = downstreamRoute.HttpHandlerOptions.UseCookieContainer,
-            UseProxy = downstreamRoute.HttpHandlerOptions.UseProxy,
-            MaxConnectionsPerServer = downstreamRoute.HttpHandlerOptions.MaxConnectionsPerServer,
-            PooledConnectionLifetime = downstreamRoute.HttpHandlerOptions.PooledConnectionLifeTime,
-            Credentials = downstreamRoute.HttpHandlerOptions.UseDefaultCredentials ? CredentialCache.DefaultCredentials : null,
+            AllowAutoRedirect = options.AllowAutoRedirect,
+            UseCookies = options.UseCookieContainer,
+            UseProxy = options.UseProxy,
+            MaxConnectionsPerServer = options.MaxConnectionsPerServer,
+            PooledConnectionLifetime = options.PooledConnectionLifeTime,
+            Credentials = options.UseDefaultCredentials ? CredentialCache.DefaultCredentials : null,
         };
 
-        if (downstreamRoute.HttpHandlerOptions.UseCookieContainer)
+        if (options.UseCookieContainer)
         {
             handler.CookieContainer = new CookieContainer();
         }
diff --git a/test/Ocelot.UnitTests/Configuration/HttpHandlerOptionsCreatorTests.cs b/test/Ocelot.UnitTests/Configuration/HttpHandlerOptionsCreatorTests.cs
@@ -23,7 +23,7 @@ public HttpHandlerOptionsCreatorTests()
         }
 
         [Fact]
-        public void should_not_use_tracing_if_fake_tracer_registered()
+        public void Should_not_use_tracing_if_fake_tracer_registered()
         {
             var fileRoute = new FileRoute
             {
@@ -42,7 +42,7 @@ public void should_not_use_tracing_if_fake_tracer_registered()
         }
 
         [Fact]
-        public void should_use_tracing_if_real_tracer_registered()
+        public void Should_use_tracing_if_real_tracer_registered()
         {
             var fileRoute = new FileRoute
             {
@@ -62,7 +62,7 @@ public void should_use_tracing_if_real_tracer_registered()
         }
 
         [Fact]
-        public void should_create_options_with_useCookie_false_and_allowAutoRedirect_true_as_default()
+        public void Should_create_options_with_useCookie_false_and_allowAutoRedirect_true_as_default()
         {
             var fileRoute = new FileRoute();
             var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, DefaultPooledConnectionLifeTime, false);
@@ -74,7 +74,7 @@ public void should_create_options_with_useCookie_false_and_allowAutoRedirect_tru
         }
 
         [Fact]
-        public void should_create_options_with_specified_useCookie_and_allowAutoRedirect()
+        public void Should_create_options_with_specified_useCookie_and_allowAutoRedirect()
         {
             var fileRoute = new FileRoute
             {
@@ -95,7 +95,7 @@ public void should_create_options_with_specified_useCookie_and_allowAutoRedirect
         }
 
         [Fact]
-        public void should_create_options_with_useproxy_true_as_default()
+        public void Should_create_options_with_useproxy_true_as_default()
         {
             var fileRoute = new FileRoute
             {
@@ -111,7 +111,7 @@ public void should_create_options_with_useproxy_true_as_default()
         }
 
         [Fact]
-        public void should_create_options_with_specified_useproxy()
+        public void Should_create_options_with_specified_useproxy()
         {
             var fileRoute = new FileRoute
             {
@@ -130,7 +130,7 @@ public void should_create_options_with_specified_useproxy()
         }
 
         [Fact]
-        public void should_create_options_with_specified_MaxConnectionsPerServer()
+        public void Should_create_options_with_specified_MaxConnectionsPerServer()
         {
             var fileRoute = new FileRoute
             {
@@ -149,7 +149,7 @@ public void should_create_options_with_specified_MaxConnectionsPerServer()
         }
 
         [Fact]
-        public void should_create_options_fixing_specified_MaxConnectionsPerServer_range()
+        public void Should_create_options_fixing_specified_MaxConnectionsPerServer_range()
         {
             var fileRoute = new FileRoute
             {
@@ -168,7 +168,7 @@ public void should_create_options_fixing_specified_MaxConnectionsPerServer_range
         }
 
         [Fact]
-        public void should_create_options_fixing_specified_MaxConnectionsPerServer_range_when_zero()
+        public void Should_create_options_fixing_specified_MaxConnectionsPerServer_range_when_zero()
         {
             var fileRoute = new FileRoute
             {
@@ -187,38 +187,46 @@ public void should_create_options_fixing_specified_MaxConnectionsPerServer_range
         }
 
         [Fact]
+        [Trait("Feat", "657")]
         public void Should_create_options_with_useDefaultCredentials_false_as_default()
         {
+            // Arrange
             var fileRoute = new FileRoute
             {
-                HttpHandlerOptions = new FileHttpHandlerOptions(),
+                HttpHandlerOptions = new(),
             };
-
-            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, DefaultPooledConnectionLifeTime, false);
-
-            this.Given(x => GivenTheFollowing(fileRoute))
-                .When(x => WhenICreateHttpHandlerOptions())
-                .Then(x => ThenTheFollowingOptionsReturned(expectedOptions))
-                .BDDfy();
+            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, DefaultPooledConnectionLifeTime,
+                useDefaultCredentials: false);
+            GivenTheFollowing(fileRoute);
+
+            // Act
+            WhenICreateHttpHandlerOptions();
+
+            // Assert
+            ThenTheFollowingOptionsReturned(expectedOptions);
         }
 
         [Fact]
-        public void Should_create_options_with_useDefaultCredentials_true_if_set()
+        [Trait("Feat", "657")]
+        public void Should_create_options_with_UseDefaultCredentials_true_if_set()
         {
+            // Arrange
             var fileRoute = new FileRoute
             {
-                HttpHandlerOptions = new FileHttpHandlerOptions
+                HttpHandlerOptions = new()
                 {
                     UseDefaultCredentials = true,
                 },
             };
+            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, DefaultPooledConnectionLifeTime,
+                useDefaultCredentials: true);
+            GivenTheFollowing(fileRoute);
 
-            var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, DefaultPooledConnectionLifeTime, true);
+            // Act
+            WhenICreateHttpHandlerOptions();
 
-            this.Given(x => GivenTheFollowing(fileRoute))
-                .When(x => WhenICreateHttpHandlerOptions())
-                .Then(x => ThenTheFollowingOptionsReturned(expectedOptions))
-                .BDDfy();
+            // Assert
+            ThenTheFollowingOptionsReturned(expectedOptions);
         }
 
         private void GivenTheFollowing(FileRoute fileRoute)
@@ -244,7 +252,6 @@ private void ThenTheFollowingOptionsReturned(HttpHandlerOptions expected)
 
         private void GivenARealTracer()
         {
-            var tracer = new FakeTracer();
             _serviceCollection.AddSingleton<ITracer, FakeTracer>();
             _serviceProvider = _serviceCollection.BuildServiceProvider();
             _httpHandlerOptionsCreator = new HttpHandlerOptionsCreator(_serviceProvider);
diff --git a/test/Ocelot.UnitTests/Requester/DelegatingHandlerHandlerProviderFactoryTests.cs b/test/Ocelot.UnitTests/Requester/DelegatingHandlerHandlerProviderFactoryTests.cs
@@ -36,7 +36,7 @@ public DelegatingHandlerHandlerProviderFactoryTests()
         }
 
         [Fact]
-        public void should_follow_ordering_add_specifics()
+        public void Should_follow_ordering_add_specifics()
         {
             var qosOptions = new QoSOptionsBuilder()
                 .WithTimeoutValue(1)
@@ -72,7 +72,7 @@ public void should_follow_ordering_add_specifics()
         }
 
         [Fact]
-        public void should_follow_ordering_order_specifics_and_globals()
+        public void Should_follow_ordering_order_specifics_and_globals()
         {
             var qosOptions = new QoSOptionsBuilder()
                 .WithTimeoutValue(1)
@@ -109,7 +109,7 @@ public void should_follow_ordering_order_specifics_and_globals()
         }
 
         [Fact]
-        public void should_follow_ordering_order_specifics()
+        public void Should_follow_ordering_order_specifics()
         {
             var qosOptions = new QoSOptionsBuilder()
                 .WithTimeoutValue(1)
@@ -145,7 +145,7 @@ public void should_follow_ordering_order_specifics()
         }
 
         [Fact]
-        public void should_follow_ordering_order_and_only_add_specifics_in_config()
+        public void Should_follow_ordering_order_and_only_add_specifics_in_config()
         {
             var qosOptions = new QoSOptionsBuilder()
                 .WithTimeoutValue(1)
@@ -179,7 +179,7 @@ public void should_follow_ordering_order_and_only_add_specifics_in_config()
         }
 
         [Fact]
-        public void should_follow_ordering_dont_add_specifics()
+        public void Should_follow_ordering_dont_add_specifics()
         {
             var qosOptions = new QoSOptionsBuilder()
                 .WithTimeoutValue(1)
@@ -208,7 +208,7 @@ public void should_follow_ordering_dont_add_specifics()
         }
 
         [Fact]
-        public void should_apply_re_route_specific()
+        public void Should_apply_re_route_specific()
         {
             var qosOptions = new QoSOptionsBuilder()
                 .Build();
@@ -233,7 +233,7 @@ public void should_apply_re_route_specific()
         }
 
         [Fact]
-        public void should_all_from_all_routes_provider_and_qos()
+        public void Should_all_from_all_routes_provider_and_qos()
         {
             var qosOptions = new QoSOptionsBuilder()
                 .WithTimeoutValue(1)
@@ -258,7 +258,7 @@ public void should_all_from_all_routes_provider_and_qos()
         }
 
         [Fact]
-        public void should_return_provider_with_no_delegates()
+        public void Should_return_provider_with_no_delegates()
         {
             var qosOptions = new QoSOptionsBuilder()
                 .Build();
@@ -277,7 +277,7 @@ public void should_return_provider_with_no_delegates()
         }
 
         [Fact]
-        public void should_return_provider_with_qos_delegate()
+        public void Should_return_provider_with_qos_delegate()
         {
             var qosOptions = new QoSOptionsBuilder()
                 .WithTimeoutValue(1)
@@ -301,7 +301,7 @@ public void should_return_provider_with_qos_delegate()
         }
 
         [Fact]
-        public void should_return_provider_with_qos_delegate_when_timeout_value_set()
+        public void Should_return_provider_with_qos_delegate_when_timeout_value_set()
         {
             var qosOptions = new QoSOptionsBuilder()
                 .WithTimeoutValue(1)
@@ -323,7 +323,7 @@ public void should_return_provider_with_qos_delegate_when_timeout_value_set()
         }
 
         [Fact]
-        public void should_log_error_and_return_no_qos_provider_delegate_when_qos_factory_returns_error()
+        public void Should_log_error_and_return_no_qos_provider_delegate_when_qos_factory_returns_error()
         {
             var qosOptions = new QoSOptionsBuilder()
                 .WithTimeoutValue(1)
@@ -353,7 +353,7 @@ public void should_log_error_and_return_no_qos_provider_delegate_when_qos_factor
         }
 
         [Fact]
-        public void should_log_error_and_return_no_qos_provider_delegate_when_qos_factory_returns_null()
+        public void Should_log_error_and_return_no_qos_provider_delegate_when_qos_factory_returns_null()
         {
             var qosOptions = new QoSOptionsBuilder()
                 .WithTimeoutValue(1)
@@ -384,7 +384,9 @@ public void should_log_error_and_return_no_qos_provider_delegate_when_qos_factor
 
         private void ThenTheWarningIsLogged()
         {
-            _logger.Verify(x => x.LogWarning(It.Is<Func<string>>(y => y.Invoke() == $"Route {_downstreamRoute.UpstreamPathTemplate} specifies use QoS but no QosHandler found in DI container. Will use not use a QosHandler, please check your setup!")), Times.Once);
+            _logger.Verify(x => x.LogWarning(It.Is<Func<string>>(
+                y => y.Invoke() == $"Route {_downstreamRoute.UpstreamPathTemplate} specifies use QoS but no QosHandler found in DI container. Will use not use a QosHandler, please check your setup!")),
+                Times.Once);
         }
 
         private void ThenHandlerAtPositionIs<T>(int pos)
diff --git a/test/Ocelot.UnitTests/Requester/MessageInvokerPoolTests.cs b/test/Ocelot.UnitTests/Requester/MessageInvokerPoolTests.cs
@@ -162,7 +162,7 @@ private void ThenTheDangerousAcceptAnyServerCertificateValidatorWarningIsLogged(
 
     private void ThenTheCookieIsSet()
     {
-        _response.Headers.TryGetValues("Set-Cookie", out var test).ShouldBeTrue();
+        _response.Headers.TryGetValues("Set-Cookie", out _).ShouldBeTrue();
     }
 
     private void GivenADownstreamService()
@@ -249,8 +249,6 @@ private void WhenGettingMessageInvokerForBothRoutes()
 
     private void ThenTheInvokersShouldNotBeTheSame() => Assert.NotEqual(_firstInvoker, _secondInvoker);
 
-    private void GivenARequest(string url) => GivenARequestWithAUrlAndMethod(_downstreamRoute1, url, HttpMethod.Get);
-
     private void GivenARequest() =>
         GivenARequestWithAUrlAndMethod(_downstreamRoute1, "http://localhost:5003", HttpMethod.Get);
 
@@ -317,15 +315,15 @@ private void GivenTheFactoryReturns(List<Func<DelegatingHandler>> handlers)
             .Returns(new OkResponse<List<Func<DelegatingHandler>>>(handlers));
     }
 
-    private Mock<IDelegatingHandlerHandlerFactory> GetHandlerFactory()
+    private static Mock<IDelegatingHandlerHandlerFactory> GetHandlerFactory()
     {
         var handlerFactory = new Mock<IDelegatingHandlerHandlerFactory>();
         handlerFactory.Setup(x => x.Get(It.IsAny<DownstreamRoute>()))
             .Returns(new OkResponse<List<Func<DelegatingHandler>>>(new()));
         return handlerFactory;
     }
 
-    private DownstreamRoute DownstreamRouteFactory(string path)
+    private static DownstreamRoute DownstreamRouteFactory(string path)
     {
         var downstreamRoute = new DownstreamRouteBuilder()
             .WithDownstreamPathTemplate(path)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using System.Net.Http;`
`2`		`-`
`3`		`-namespace Ocelot.Configuration`
	`1`	`+namespace Ocelot.Configuration`
`4`	`2`	`{`
`5`	`3`	`/// <summary>`
`6`	`4`	`/// Describes configuration parameters for http handler, that is created to handle a request to service.`
Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,13 @@ public HttpHandlerOptionsBuilder WithUseDefaultCredentials(bool input)`
`54`	`54`	`return this;`
`55`	`55`	`}`
`56`	`56`
`57`		`- public HttpHandlerOptions Build()`
`58`		`- {`
`59`		`- return new HttpHandlerOptions(_allowAutoRedirect, _useCookieContainer, _useTracing, _useProxy, _maxConnectionPerServer, _pooledConnectionLifetime, _useDefaultCredentials);`
`60`		`- }`
	`57`	`+ public HttpHandlerOptions Build() => new(`
	`58`	`+ _allowAutoRedirect,`
	`59`	`+ _useCookieContainer,`
	`60`	`+ _useTracing,`
	`61`	`+ _useProxy,`
	`62`	`+ _maxConnectionPerServer,`
	`63`	`+ _pooledConnectionLifetime,`
	`64`	`+ _useDefaultCredentials);`
`61`	`65`	`}`
`62`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public HttpHandlerOptionsCreatorTests()`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`[Fact]`
`26`		`- public void should_not_use_tracing_if_fake_tracer_registered()`
	`26`	`+ public void Should_not_use_tracing_if_fake_tracer_registered()`
`27`	`27`	`{`
`28`	`28`	`var fileRoute = new FileRoute`
`29`	`29`	`{`
`@@ -42,7 +42,7 @@ public void should_not_use_tracing_if_fake_tracer_registered()`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`[Fact]`
`45`		`- public void should_use_tracing_if_real_tracer_registered()`
	`45`	`+ public void Should_use_tracing_if_real_tracer_registered()`
`46`	`46`	`{`
`47`	`47`	`var fileRoute = new FileRoute`
`48`	`48`	`{`
`@@ -62,7 +62,7 @@ public void should_use_tracing_if_real_tracer_registered()`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`[Fact]`
`65`		`- public void should_create_options_with_useCookie_false_and_allowAutoRedirect_true_as_default()`
	`65`	`+ public void Should_create_options_with_useCookie_false_and_allowAutoRedirect_true_as_default()`
`66`	`66`	`{`
`67`	`67`	`var fileRoute = new FileRoute();`
`68`	`68`	`var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, DefaultPooledConnectionLifeTime, false);`
`@@ -74,7 +74,7 @@ public void should_create_options_with_useCookie_false_and_allowAutoRedirect_tru`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`[Fact]`
`77`		`- public void should_create_options_with_specified_useCookie_and_allowAutoRedirect()`
	`77`	`+ public void Should_create_options_with_specified_useCookie_and_allowAutoRedirect()`
`78`	`78`	`{`
`79`	`79`	`var fileRoute = new FileRoute`
`80`	`80`	`{`
`@@ -95,7 +95,7 @@ public void should_create_options_with_specified_useCookie_and_allowAutoRedirect`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`[Fact]`
`98`		`- public void should_create_options_with_useproxy_true_as_default()`
	`98`	`+ public void Should_create_options_with_useproxy_true_as_default()`
`99`	`99`	`{`
`100`	`100`	`var fileRoute = new FileRoute`
`101`	`101`	`{`
`@@ -111,7 +111,7 @@ public void should_create_options_with_useproxy_true_as_default()`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`[Fact]`
`114`		`- public void should_create_options_with_specified_useproxy()`
	`114`	`+ public void Should_create_options_with_specified_useproxy()`
`115`	`115`	`{`
`116`	`116`	`var fileRoute = new FileRoute`
`117`	`117`	`{`
`@@ -130,7 +130,7 @@ public void should_create_options_with_specified_useproxy()`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`[Fact]`
`133`		`- public void should_create_options_with_specified_MaxConnectionsPerServer()`
	`133`	`+ public void Should_create_options_with_specified_MaxConnectionsPerServer()`
`134`	`134`	`{`
`135`	`135`	`var fileRoute = new FileRoute`
`136`	`136`	`{`
`@@ -149,7 +149,7 @@ public void should_create_options_with_specified_MaxConnectionsPerServer()`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`[Fact]`
`152`		`- public void should_create_options_fixing_specified_MaxConnectionsPerServer_range()`
	`152`	`+ public void Should_create_options_fixing_specified_MaxConnectionsPerServer_range()`
`153`	`153`	`{`
`154`	`154`	`var fileRoute = new FileRoute`
`155`	`155`	`{`
`@@ -168,7 +168,7 @@ public void should_create_options_fixing_specified_MaxConnectionsPerServer_range`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`[Fact]`
`171`		`- public void should_create_options_fixing_specified_MaxConnectionsPerServer_range_when_zero()`
	`171`	`+ public void Should_create_options_fixing_specified_MaxConnectionsPerServer_range_when_zero()`
`172`	`172`	`{`
`173`	`173`	`var fileRoute = new FileRoute`
`174`	`174`	`{`
`@@ -187,38 +187,46 @@ public void should_create_options_fixing_specified_MaxConnectionsPerServer_range`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`[Fact]`
	`190`	`+ [Trait("Feat", "657")]`
`190`	`191`	`public void Should_create_options_with_useDefaultCredentials_false_as_default()`
`191`	`192`	`{`
	`193`	`+ // Arrange`
`192`	`194`	`var fileRoute = new FileRoute`
`193`	`195`	`{`
`194`		`- HttpHandlerOptions = new FileHttpHandlerOptions(),`
	`196`	`+ HttpHandlerOptions = new(),`
`195`	`197`	`};`
`196`		`-`
`197`		`- var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, DefaultPooledConnectionLifeTime, false);`
`198`		`-`
`199`		`- this.Given(x => GivenTheFollowing(fileRoute))`
`200`		`- .When(x => WhenICreateHttpHandlerOptions())`
`201`		`- .Then(x => ThenTheFollowingOptionsReturned(expectedOptions))`
`202`		`- .BDDfy();`
	`198`	`+ var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, DefaultPooledConnectionLifeTime,`
	`199`	`+ useDefaultCredentials: false);`
	`200`	`+ GivenTheFollowing(fileRoute);`
	`201`	`+`
	`202`	`+ // Act`
	`203`	`+ WhenICreateHttpHandlerOptions();`
	`204`	`+`
	`205`	`+ // Assert`
	`206`	`+ ThenTheFollowingOptionsReturned(expectedOptions);`
`203`	`207`	`}`
`204`	`208`
`205`	`209`	`[Fact]`
`206`		`- public void Should_create_options_with_useDefaultCredentials_true_if_set()`
	`210`	`+ [Trait("Feat", "657")]`
	`211`	`+ public void Should_create_options_with_UseDefaultCredentials_true_if_set()`
`207`	`212`	`{`
	`213`	`+ // Arrange`
`208`	`214`	`var fileRoute = new FileRoute`
`209`	`215`	`{`
`210`		`- HttpHandlerOptions = new FileHttpHandlerOptions`
	`216`	`+ HttpHandlerOptions = new()`
`211`	`217`	`{`
`212`	`218`	`UseDefaultCredentials = true,`
`213`	`219`	`},`
`214`	`220`	`};`
	`221`	`+ var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, DefaultPooledConnectionLifeTime,`
	`222`	`+ useDefaultCredentials: true);`
	`223`	`+ GivenTheFollowing(fileRoute);`
`215`	`224`
`216`		`- var expectedOptions = new HttpHandlerOptions(false, false, false, true, int.MaxValue, DefaultPooledConnectionLifeTime, true);`
	`225`	`+ // Act`
	`226`	`+ WhenICreateHttpHandlerOptions();`
`217`	`227`
`218`		`- this.Given(x => GivenTheFollowing(fileRoute))`
`219`		`- .When(x => WhenICreateHttpHandlerOptions())`
`220`		`- .Then(x => ThenTheFollowingOptionsReturned(expectedOptions))`
`221`		`- .BDDfy();`
	`228`	`+ // Assert`
	`229`	`+ ThenTheFollowingOptionsReturned(expectedOptions);`
`222`	`230`	`}`
`223`	`231`
`224`	`232`	`private void GivenTheFollowing(FileRoute fileRoute)`
`@@ -244,7 +252,6 @@ private void ThenTheFollowingOptionsReturned(HttpHandlerOptions expected)`
`244`	`252`
`245`	`253`	`private void GivenARealTracer()`
`246`	`254`	`{`
`247`		`- var tracer = new FakeTracer();`
`248`	`255`	`_serviceCollection.AddSingleton<ITracer, FakeTracer>();`
`249`	`256`	`_serviceProvider = _serviceCollection.BuildServiceProvider();`
`250`	`257`	`_httpHandlerOptionsCreator = new HttpHandlerOptionsCreator(_serviceProvider);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public DelegatingHandlerHandlerProviderFactoryTests()`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`[Fact]`
`39`		`- public void should_follow_ordering_add_specifics()`
	`39`	`+ public void Should_follow_ordering_add_specifics()`
`40`	`40`	`{`
`41`	`41`	`var qosOptions = new QoSOptionsBuilder()`
`42`	`42`	`.WithTimeoutValue(1)`
`@@ -72,7 +72,7 @@ public void should_follow_ordering_add_specifics()`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`[Fact]`
`75`		`- public void should_follow_ordering_order_specifics_and_globals()`
	`75`	`+ public void Should_follow_ordering_order_specifics_and_globals()`
`76`	`76`	`{`
`77`	`77`	`var qosOptions = new QoSOptionsBuilder()`
`78`	`78`	`.WithTimeoutValue(1)`
`@@ -109,7 +109,7 @@ public void should_follow_ordering_order_specifics_and_globals()`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`[Fact]`
`112`		`- public void should_follow_ordering_order_specifics()`
	`112`	`+ public void Should_follow_ordering_order_specifics()`
`113`	`113`	`{`
`114`	`114`	`var qosOptions = new QoSOptionsBuilder()`
`115`	`115`	`.WithTimeoutValue(1)`
`@@ -145,7 +145,7 @@ public void should_follow_ordering_order_specifics()`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`[Fact]`
`148`		`- public void should_follow_ordering_order_and_only_add_specifics_in_config()`
	`148`	`+ public void Should_follow_ordering_order_and_only_add_specifics_in_config()`
`149`	`149`	`{`
`150`	`150`	`var qosOptions = new QoSOptionsBuilder()`
`151`	`151`	`.WithTimeoutValue(1)`
`@@ -179,7 +179,7 @@ public void should_follow_ordering_order_and_only_add_specifics_in_config()`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`[Fact]`
`182`		`- public void should_follow_ordering_dont_add_specifics()`
	`182`	`+ public void Should_follow_ordering_dont_add_specifics()`
`183`	`183`	`{`
`184`	`184`	`var qosOptions = new QoSOptionsBuilder()`
`185`	`185`	`.WithTimeoutValue(1)`
`@@ -208,7 +208,7 @@ public void should_follow_ordering_dont_add_specifics()`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`[Fact]`
`211`		`- public void should_apply_re_route_specific()`
	`211`	`+ public void Should_apply_re_route_specific()`
`212`	`212`	`{`
`213`	`213`	`var qosOptions = new QoSOptionsBuilder()`
`214`	`214`	`.Build();`
`@@ -233,7 +233,7 @@ public void should_apply_re_route_specific()`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`[Fact]`
`236`		`- public void should_all_from_all_routes_provider_and_qos()`
	`236`	`+ public void Should_all_from_all_routes_provider_and_qos()`
`237`	`237`	`{`
`238`	`238`	`var qosOptions = new QoSOptionsBuilder()`
`239`	`239`	`.WithTimeoutValue(1)`
`@@ -258,7 +258,7 @@ public void should_all_from_all_routes_provider_and_qos()`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`[Fact]`
`261`		`- public void should_return_provider_with_no_delegates()`
	`261`	`+ public void Should_return_provider_with_no_delegates()`
`262`	`262`	`{`
`263`	`263`	`var qosOptions = new QoSOptionsBuilder()`
`264`	`264`	`.Build();`
`@@ -277,7 +277,7 @@ public void should_return_provider_with_no_delegates()`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`[Fact]`
`280`		`- public void should_return_provider_with_qos_delegate()`
	`280`	`+ public void Should_return_provider_with_qos_delegate()`
`281`	`281`	`{`
`282`	`282`	`var qosOptions = new QoSOptionsBuilder()`
`283`	`283`	`.WithTimeoutValue(1)`
`@@ -301,7 +301,7 @@ public void should_return_provider_with_qos_delegate()`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`[Fact]`
`304`		`- public void should_return_provider_with_qos_delegate_when_timeout_value_set()`
	`304`	`+ public void Should_return_provider_with_qos_delegate_when_timeout_value_set()`
`305`	`305`	`{`
`306`	`306`	`var qosOptions = new QoSOptionsBuilder()`
`307`	`307`	`.WithTimeoutValue(1)`
`@@ -323,7 +323,7 @@ public void should_return_provider_with_qos_delegate_when_timeout_value_set()`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`[Fact]`
`326`		`- public void should_log_error_and_return_no_qos_provider_delegate_when_qos_factory_returns_error()`
	`326`	`+ public void Should_log_error_and_return_no_qos_provider_delegate_when_qos_factory_returns_error()`
`327`	`327`	`{`
`328`	`328`	`var qosOptions = new QoSOptionsBuilder()`
`329`	`329`	`.WithTimeoutValue(1)`
`@@ -353,7 +353,7 @@ public void should_log_error_and_return_no_qos_provider_delegate_when_qos_factor`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`[Fact]`
`356`		`- public void should_log_error_and_return_no_qos_provider_delegate_when_qos_factory_returns_null()`
	`356`	`+ public void Should_log_error_and_return_no_qos_provider_delegate_when_qos_factory_returns_null()`
`357`	`357`	`{`
`358`	`358`	`var qosOptions = new QoSOptionsBuilder()`
`359`	`359`	`.WithTimeoutValue(1)`
`@@ -384,7 +384,9 @@ public void should_log_error_and_return_no_qos_provider_delegate_when_qos_factor`
`384`	`384`
`385`	`385`	`private void ThenTheWarningIsLogged()`
`386`	`386`	`{`
`387`		`- _logger.Verify(x => x.LogWarning(It.Is<Func<string>>(y => y.Invoke() == $"Route {_downstreamRoute.UpstreamPathTemplate} specifies use QoS but no QosHandler found in DI container. Will use not use a QosHandler, please check your setup!")), Times.Once);`
	`387`	`+ _logger.Verify(x => x.LogWarning(It.Is<Func<string>>(`
	`388`	`+ y => y.Invoke() == $"Route {_downstreamRoute.UpstreamPathTemplate} specifies use QoS but no QosHandler found in DI container. Will use not use a QosHandler, please check your setup!")),`
	`389`	`+ Times.Once);`
`388`	`390`	`}`
`389`	`391`
`390`	`392`	`private void ThenHandlerAtPositionIs<T>(int pos)`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ private void ThenTheDangerousAcceptAnyServerCertificateValidatorWarningIsLogged(`
`162`	`162`
`163`	`163`	`private void ThenTheCookieIsSet()`
`164`	`164`	`{`
`165`		`- _response.Headers.TryGetValues("Set-Cookie", out var test).ShouldBeTrue();`
	`165`	`+ _response.Headers.TryGetValues("Set-Cookie", out _).ShouldBeTrue();`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`private void GivenADownstreamService()`
`@@ -249,8 +249,6 @@ private void WhenGettingMessageInvokerForBothRoutes()`
`249`	`249`
`250`	`250`	`private void ThenTheInvokersShouldNotBeTheSame() => Assert.NotEqual(_firstInvoker, _secondInvoker);`
`251`	`251`
`252`		`- private void GivenARequest(string url) => GivenARequestWithAUrlAndMethod(_downstreamRoute1, url, HttpMethod.Get);`
`253`		`-`
`254`	`252`	`private void GivenARequest() =>`
`255`	`253`	`GivenARequestWithAUrlAndMethod(_downstreamRoute1, "http://localhost:5003", HttpMethod.Get);`
`256`	`254`
`@@ -317,15 +315,15 @@ private void GivenTheFactoryReturns(List<Func<DelegatingHandler>> handlers)`
`317`	`315`	`.Returns(new OkResponse<List<Func<DelegatingHandler>>>(handlers));`
`318`	`316`	`}`
`319`	`317`
`320`		`- private Mock<IDelegatingHandlerHandlerFactory> GetHandlerFactory()`
	`318`	`+ private static Mock<IDelegatingHandlerHandlerFactory> GetHandlerFactory()`
`321`	`319`	`{`
`322`	`320`	`var handlerFactory = new Mock<IDelegatingHandlerHandlerFactory>();`
`323`	`321`	`handlerFactory.Setup(x => x.Get(It.IsAny<DownstreamRoute>()))`
`324`	`322`	`.Returns(new OkResponse<List<Func<DelegatingHandler>>>(new()));`
`325`	`323`	`return handlerFactory;`
`326`	`324`	`}`
`327`	`325`
`328`		`- private DownstreamRoute DownstreamRouteFactory(string path)`
	`326`	`+ private static DownstreamRoute DownstreamRouteFactory(string path)`
`329`	`327`	`{`
`330`	`328`	`var downstreamRoute = new DownstreamRouteBuilder()`
`331`	`329`	`.WithDownstreamPathTemplate(path)`