Move ConfigureOptions to CreateClient

SteeltoeOSS · Nov 22, 2016 · 23512f9 · 23512f9
1 parent 98731ce
commit 23512f9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/Steeltoe.Discovery.Client/DiscoveryClientFactory.cs b/src/Steeltoe.Discovery.Client/DiscoveryClientFactory.cs
@@ -44,8 +44,6 @@ internal protected virtual object Create(IServiceProvider provider)
                 return null;
             }
 
-            ConfigureOptions();
-
             var logFactory = provider.GetService(typeof(ILoggerFactory)) as ILoggerFactory;
             var lifeCycle = provider.GetService(typeof(IApplicationLifetime)) as IApplicationLifetime;
 
@@ -54,7 +52,11 @@ internal protected virtual object Create(IServiceProvider provider)
 
         public virtual object CreateClient(IApplicationLifetime lifeCycle = null, ILoggerFactory logFactory = null)
         {
+
             var logger = logFactory?.CreateLogger<DiscoveryClientFactory>();
+
+            ConfigureOptions();
+
             if (_config == null)
             {
                 logger?.LogWarning("Failed to create DiscoveryClient, no DiscoveryOptions");

diff --git a/test/Steeltoe.Discovery.Client.Test/DiscoveryClientFactoryTest.cs b/test/Steeltoe.Discovery.Client.Test/DiscoveryClientFactoryTest.cs
@@ -63,6 +63,16 @@ public void CreateClient_ClientTypeEureka_CreatesClient()
             Assert.IsType(typeof(EurekaDiscoveryClient), client);
         }
 
+        [Fact]
+        public void CreateClient_Calls_ConfigureOptions()
+        {
+            MyDiscoveryClientFactory factory = new MyDiscoveryClientFactory();
+            IServiceProvider provider = new MyServiceProvier();
+            IDiscoveryClient result = factory.CreateClient() as IDiscoveryClient;
+            Assert.NotNull(result);
+            Assert.True(factory.ConfigureOptionsCalled);
+        }
+
         [Fact]
         public void Create_NullIServiceProvider_ReturnsNull()
         {
@@ -100,15 +110,6 @@ public void Create_MissingOptions_ReturnsUnknown()
             Assert.Equal("Unknown", result.Description);
         }
 
-        [Fact]
-        public void Create_Calls_ConfigureOptions()
-        {
-            MyDiscoveryClientFactory factory = new MyDiscoveryClientFactory();
-            IServiceProvider provider = new MyServiceProvier();
-            IDiscoveryClient result = factory.Create(provider) as IDiscoveryClient;
-            Assert.NotNull(result);
-            Assert.True(factory.ConfigureOptionsCalled);
-        }
     }
     class MyDiscoveryClientFactory : DiscoveryClientFactory
     {