removed tasks we dont need

ThreeMammals · Apr 13, 2020 · 2843cdb · 2843cdb
1 parent ccb5b84
commit 2843cdb
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 20 deletions.
diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancerFactory.cs b/src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancerFactory.cs
@@ -2,10 +2,9 @@
 {
     using Ocelot.Configuration;
     using Ocelot.Responses;
-    using System.Threading.Tasks;
 
     public interface ILoadBalancerFactory
     {
-        Task<Response<ILoadBalancer>> Get(DownstreamReRoute reRoute, ServiceProviderConfiguration config);
+        Response<ILoadBalancer> Get(DownstreamReRoute reRoute, ServiceProviderConfiguration config);
     }
 }
diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancerHouse.cs b/src/Ocelot/LoadBalancer/LoadBalancers/ILoadBalancerHouse.cs
@@ -1,11 +1,10 @@
 using Ocelot.Configuration;
 using Ocelot.Responses;
-using System.Threading.Tasks;
 
 namespace Ocelot.LoadBalancer.LoadBalancers
 {
     public interface ILoadBalancerHouse
     {
-        Task<Response<ILoadBalancer>> Get(DownstreamReRoute reRoute, ServiceProviderConfiguration config);
+        Response<ILoadBalancer> Get(DownstreamReRoute reRoute, ServiceProviderConfiguration config);
     }
 }
diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/LoadBalancerFactory.cs b/src/Ocelot/LoadBalancer/LoadBalancers/LoadBalancerFactory.cs
@@ -18,7 +18,7 @@ public LoadBalancerFactory(IServiceDiscoveryProviderFactory serviceProviderFacto
             _loadBalancerCreators = loadBalancerCreators;
         }
 
-        public Task<Response<ILoadBalancer>> Get(DownstreamReRoute reRoute, ServiceProviderConfiguration config)
+        public Response<ILoadBalancer> Get(DownstreamReRoute reRoute, ServiceProviderConfiguration config)
         {
             var serviceProviderFactoryResponse = _serviceProviderFactory.Get(config, reRoute);
 
@@ -36,7 +36,7 @@ public Task<Response<ILoadBalancer>> Get(DownstreamReRoute reRoute, ServiceProvi
                 response = new OkResponse<ILoadBalancer>(createdLoadBalancer);
             }
 
-            return Task.FromResult(response);
+            return response;
         }
     }
 }
diff --git a/src/Ocelot/LoadBalancer/LoadBalancers/LoadBalancerHouse.cs b/src/Ocelot/LoadBalancer/LoadBalancers/LoadBalancerHouse.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Ocelot.LoadBalancer.LoadBalancers
 {
@@ -18,7 +17,7 @@ public LoadBalancerHouse(ILoadBalancerFactory factory)
             _loadBalancers = new ConcurrentDictionary<string, ILoadBalancer>();
         }
 
-        public async Task<Response<ILoadBalancer>> Get(DownstreamReRoute reRoute, ServiceProviderConfiguration config)
+        public Response<ILoadBalancer> Get(DownstreamReRoute reRoute, ServiceProviderConfiguration config)
         {
             try
             {
@@ -30,7 +29,7 @@ public async Task<Response<ILoadBalancer>> Get(DownstreamReRoute reRoute, Servic
 
                     if (reRoute.LoadBalancerOptions.Type != loadBalancer.GetType().Name)
                     {
-                        result = await _factory.Get(reRoute, config);
+                        result = _factory.Get(reRoute, config);
                         if (result.IsError)
                         {
                             return new ErrorResponse<ILoadBalancer>(result.Errors);
@@ -43,7 +42,7 @@ public async Task<Response<ILoadBalancer>> Get(DownstreamReRoute reRoute, Servic
                     return new OkResponse<ILoadBalancer>(loadBalancer);
                 }
 
-                result = await _factory.Get(reRoute, config);
+                result = _factory.Get(reRoute, config);
 
                 if (result.IsError)
                 {
@@ -58,7 +57,7 @@ public async Task<Response<ILoadBalancer>> Get(DownstreamReRoute reRoute, Servic
             {
                 return new ErrorResponse<ILoadBalancer>(new List<Ocelot.Errors.Error>()
                 {
-                    new UnableToFindLoadBalancerError($"unabe to find load balancer for {reRoute.LoadBalancerKey} exception is {ex}")
+                    new UnableToFindLoadBalancerError($"unabe to find load balancer for {reRoute.LoadBalancerKey} exception is {ex}"),
                 });
             }
         }

diff --git a/src/Ocelot/LoadBalancer/Middleware/LoadBalancingMiddleware.cs b/src/Ocelot/LoadBalancer/Middleware/LoadBalancingMiddleware.cs
@@ -22,7 +22,7 @@ public LoadBalancingMiddleware(OcelotRequestDelegate next,
 
         public async Task Invoke(DownstreamContext context)
         {
-            var loadBalancer = await _loadBalancerHouse.Get(context.DownstreamReRoute, context.Configuration.ServiceProviderConfiguration);
+            var loadBalancer = _loadBalancerHouse.Get(context.DownstreamReRoute, context.Configuration.ServiceProviderConfiguration);
             if (loadBalancer.IsError)
             {
                 Logger.LogDebug("there was an error retriving the loadbalancer, setting pipeline error");

diff --git a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerFactoryTests.cs b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerFactoryTests.cs
@@ -134,7 +134,7 @@ private void GivenAReRoute(DownstreamReRoute reRoute)
 
         private void WhenIGetTheLoadBalancer()
         {
-            _result = _factory.Get(_reRoute, _serviceProviderConfig).Result;
+            _result = _factory.Get(_reRoute, _serviceProviderConfig);
         }
 
         private void ThenTheLoadBalancerIsReturned<T>()

diff --git a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerHouseTests.cs
@@ -111,8 +111,8 @@ public void should_get_new_load_balancer_if_reroute_load_balancer_has_changed()
         private void WhenIGetTheReRouteWithTheSameKeyButDifferentLoadBalancer(DownstreamReRoute reRoute)
         {
             _reRoute = reRoute;
-            _factory.Setup(x => x.Get(_reRoute, _serviceProviderConfig)).ReturnsAsync(new OkResponse<ILoadBalancer>(new LeastConnection(null, null)));
-            _getResult = _loadBalancerHouse.Get(_reRoute, _serviceProviderConfig).Result;
+            _factory.Setup(x => x.Get(_reRoute, _serviceProviderConfig)).Returns(new OkResponse<ILoadBalancer>(new LeastConnection(null, null)));
+            _getResult = _loadBalancerHouse.Get(_reRoute, _serviceProviderConfig);
         }
 
         private void ThenAnErrorIsReturned()
@@ -138,13 +138,13 @@ private void GivenThereIsALoadBalancer(DownstreamReRoute reRoute, ILoadBalancer
         {
             _reRoute = reRoute;
             _loadBalancer = loadBalancer;
-            _factory.Setup(x => x.Get(_reRoute, _serviceProviderConfig)).ReturnsAsync(new OkResponse<ILoadBalancer>(loadBalancer));
-            _getResult = _loadBalancerHouse.Get(reRoute, _serviceProviderConfig).Result;
+            _factory.Setup(x => x.Get(_reRoute, _serviceProviderConfig)).Returns(new OkResponse<ILoadBalancer>(loadBalancer));
+            _getResult = _loadBalancerHouse.Get(reRoute, _serviceProviderConfig);
         }
 
         private void WhenWeGetTheLoadBalancer(DownstreamReRoute reRoute)
         {
-            _getResult = _loadBalancerHouse.Get(reRoute, _serviceProviderConfig).Result;
+            _getResult = _loadBalancerHouse.Get(reRoute, _serviceProviderConfig);
         }
 
         private void ThenItIsReturned()

diff --git a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs
@@ -182,7 +182,7 @@ private void GivenTheLoadBalancerHouseReturns()
         {
             _loadBalancerHouse
                 .Setup(x => x.Get(It.IsAny<DownstreamReRoute>(), It.IsAny<ServiceProviderConfiguration>()))
-                .ReturnsAsync(new OkResponse<ILoadBalancer>(_loadBalancer.Object));
+                .Returns(new OkResponse<ILoadBalancer>(_loadBalancer.Object));
         }
 
         private void GivenTheLoadBalancerHouseReturnsAnError()
@@ -194,7 +194,7 @@ private void GivenTheLoadBalancerHouseReturnsAnError()
 
             _loadBalancerHouse
                 .Setup(x => x.Get(It.IsAny<DownstreamReRoute>(), It.IsAny<ServiceProviderConfiguration>()))
-                .ReturnsAsync(_getLoadBalancerHouseError);
+                .Returns(_getLoadBalancerHouseError);
         }
 
         private void ThenAnErrorStatingLoadBalancerCouldNotBeFoundIsSetOnPipeline()