[ServiceFactoryCreation] Rename from ServiceFactoryPair to match Depe…

…ndencyContainerCreation.
Aleksbgbg · Jun 20, 2019 · 33bbf53 · 33bbf53
1 parent accadd0
commit 33bbf53
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/Wingman.Tests/Integration/ServiceFactoryTests.cs b/Wingman.Tests/Integration/ServiceFactoryTests.cs
@@ -19,11 +19,11 @@ public ServiceFactoryTests()
 
             _dependencyRegistrar = dependencyContainerCreation.Registrar;
 
-            ServiceFactoryPair serviceFactoryPair = ServiceFactoryFactory.Create(dependencyContainerCreation.Registrar,
-                                                                                 dependencyContainerCreation.Retriever);
+            ServiceFactoryCreation serviceFactoryCreation = ServiceFactoryFactory.Create(dependencyContainerCreation.Registrar,
+                                                                                         dependencyContainerCreation.Retriever);
 
-            _serviceFactoryRegistrar = serviceFactoryPair.Registrar;
-            _serviceFactory = serviceFactoryPair.Factory;
+            _serviceFactoryRegistrar = serviceFactoryCreation.Registrar;
+            _serviceFactory = serviceFactoryCreation.Factory;
         }
 
         [Fact]

diff --git a/Wingman/Bootstrapper/BootstrapperBase.cs b/Wingman/Bootstrapper/BootstrapperBase.cs
@@ -63,16 +63,16 @@ protected sealed override object GetInstance(Type service, string key)
 
         protected sealed override void Configure()
         {
-            ServiceFactoryPair serviceFactoryPair = ServiceFactoryFactory.Create(_dependencyRegistrar, _dependencyRetriever);
+            ServiceFactoryCreation serviceFactoryCreation = ServiceFactoryFactory.Create(_dependencyRegistrar, _dependencyRetriever);
 
-            RegisterCommonDependencies(serviceFactoryPair.Factory);
+            RegisterCommonDependencies(serviceFactoryCreation.Factory);
 
             RegisterViewModels(_dependencyRegistrar);
             CheckRootViewModelRegistered();
 
             RegisterServices(_dependencyRegistrar);
-            RegisterFactoryViewModels(serviceFactoryPair.Registrar);
-            RegisterFactoryServices(serviceFactoryPair.Registrar);
+            RegisterFactoryViewModels(serviceFactoryCreation.Registrar);
+            RegisterFactoryServices(serviceFactoryCreation.Registrar);
         }
 
         /// <summary> Override to register ViewModels in the provided dependency registrar. Required as ViewModels are always needed. </summary>

diff --git a/Wingman/ServiceFactory/ServiceFactoryPair.cs → .../ServiceFactory/ServiceFactoryCreation.cs b/Wingman/ServiceFactory/ServiceFactoryPair.cs → .../ServiceFactory/ServiceFactoryCreation.cs
@@ -1,8 +1,8 @@
 namespace Wingman.ServiceFactory
 {
-    public class ServiceFactoryPair
+    public class ServiceFactoryCreation
     {
-        public ServiceFactoryPair(IServiceFactoryRegistrar registrar, IServiceFactory factory)
+        public ServiceFactoryCreation(IServiceFactoryRegistrar registrar, IServiceFactory factory)
         {
             Registrar = registrar;
             Factory = factory;

diff --git a/Wingman/ServiceFactory/ServiceFactoryFactory.cs b/Wingman/ServiceFactory/ServiceFactoryFactory.cs
@@ -7,18 +7,18 @@
     /// <summary> Factory that invokes the internal constructor of <see cref="ServiceFactory"/> and <see cref="ServiceFactoryRegistrar"/>. </summary>
     public static class ServiceFactoryFactory
     {
-        public static ServiceFactoryPair Create(IDependencyRegistrar dependencyRegistrar, IDependencyRetriever dependencyRetriever)
+        public static ServiceFactoryCreation Create(IDependencyRegistrar dependencyRegistrar, IDependencyRetriever dependencyRetriever)
         {
             RetrievalStrategyStore retrievalStrategyStore = new RetrievalStrategyStore();
 
-            return new ServiceFactoryPair(new ServiceFactoryRegistrar(dependencyRegistrar,
-                                                                      new RetrievalStrategyFactory(dependencyRetriever,
-                                                                                                   new ArgumentBuilderFactory(dependencyRetriever),
-                                                                                                   new ConstructorMapFactory(new ConstructorFactory())
-                                                                      ),
-                                                                      retrievalStrategyStore
-                                          ),
-                                          new ServiceFactory(retrievalStrategyStore)
+            return new ServiceFactoryCreation(new ServiceFactoryRegistrar(dependencyRegistrar,
+                                                                          new RetrievalStrategyFactory(dependencyRetriever,
+                                                                                                       new ArgumentBuilderFactory(dependencyRetriever),
+                                                                                                       new ConstructorMapFactory(new ConstructorFactory())
+                                                                          ),
+                                                                          retrievalStrategyStore
+                                              ),
+                                              new ServiceFactory(retrievalStrategyStore)
             );
         }
     }