Merged PR 4: FeatureBuilder class refactor

FeatureBuilder class refactor

Cherry-picked from commit `cf53a3f3`.

Author: cstamas91

common/common.utils/StateMachineFeature/StateMachineFeatureBuilder.cs

@@ -17,16 +17,15 @@ public StateMachineFeatureBuilder(IServiceCollection services)
             _featureProviders = services.AddMvcCore().PartManager.FeatureProviders;
             _services = services;
         }
-        
+
         public StateMachineFeatureBuilder<T> WithKeyType<T>()
             where T : struct, IEquatable<T>
         {
-            _featureProviders.Add(new StateMachineFeatureProvider<T>());
             return new StateMachineFeatureBuilder<T>(_featureProviders, _services);
         }
     }
 
-    public class StateMachineFeatureBuilder<T1> 
+    public class StateMachineFeatureBuilder<T1>
         where T1 : struct, IEquatable<T1>
     {
         private readonly IList<IApplicationFeatureProvider> _featureProviders;
@@ -43,12 +42,12 @@ public StateMachineFeatureBuilder(
         public StateMachineFeatureBuilder<T1, T> WithGraphEnumType<T>()
             where T : struct, IConvertible
         {
-            return new StateMachineFeatureBuilder<T1,T>(_featureProviders, _services);
+            return new StateMachineFeatureBuilder<T1, T>(_featureProviders, _services);
         }
     }
 
-    public class StateMachineFeatureBuilder<T1, T2> 
-        where T1 : struct, IEquatable<T1> 
+    public class StateMachineFeatureBuilder<T1, T2>
+        where T1 : struct, IEquatable<T1>
         where T2 : struct, IConvertible
     {
         private readonly IList<IApplicationFeatureProvider> _featureProviders;
@@ -61,14 +60,15 @@ public StateMachineFeatureBuilder(
             _featureProviders = featureProviders;
             _services = services;
         }
+
         public StateMachineFeatureBuilder<T1, T2, T> WithVertexEnumType<T>()
             where T : struct, IConvertible
         {
             return new StateMachineFeatureBuilder<T1, T2, T>(_featureProviders, _services);
         }
     }
 
-    public class StateMachineFeatureBuilder<T1, T2, T3> 
+    public class StateMachineFeatureBuilder<T1, T2, T3>
         where T1 : struct, IEquatable<T1>
         where T2 : struct, IConvertible
         where T3 : struct, IConvertible
@@ -83,14 +83,15 @@ public StateMachineFeatureBuilder(
             _featureProviders = featureProviders;
             _services = services;
         }
+
         public StateMachineFeatureBuilder<T1, T2, T3, T> WithSubjectType<T>()
             where T : StateMachineSubject<T1, T2, T3, T>, new()
         {
-            return new StateMachineFeatureBuilder<T1,T2,T3,T>(_featureProviders, _services);
+            return new StateMachineFeatureBuilder<T1, T2, T3, T>(_featureProviders, _services);
         }
     }
 
-    public class StateMachineFeatureBuilder<T1, T2, T3, T4>    
+    public class StateMachineFeatureBuilder<T1, T2, T3, T4>
         where T1 : struct, IEquatable<T1>
         where T2 : struct, IConvertible
         where T3 : struct, IConvertible
@@ -106,20 +107,20 @@ public StateMachineFeatureBuilder(
             _featureProviders = featureProviders;
             _services = services;
         }
-        public StateMachineFeatureBuilder<T1, T2, T3, T4, T> WithRepositoryType<T>() 
+
+        public StateMachineFeatureBuilder<T1, T2, T3, T4, T> WithRepositoryType<T>()
             where T : BaseStateMachineRepository<T1, T2, T3, T4>
         {
-            _services.AddScoped<T>();
-            _services.AddScoped<BaseStateMachineRepository<T1, T2, T3, T4>>((svc) => svc.GetService<T>());
             return new StateMachineFeatureBuilder<T1, T2, T3, T4, T>(_featureProviders, _services);
         }
     }
-    public class StateMachineFeatureBuilder<T1, T2, T3, T4, T5> 
-        where T1 : struct, IEquatable<T1> 
-        where T2 : struct, IConvertible 
-        where T3 : struct, IConvertible 
+
+    public class StateMachineFeatureBuilder<T1, T2, T3, T4, T5>
+        where T1 : struct, IEquatable<T1>
+        where T2 : struct, IConvertible
+        where T3 : struct, IConvertible
         where T4 : StateMachineSubject<T1, T2, T3, T4>, new()
-        where T5 : BaseStateMachineRepository<T1, T2, T3, T4> 
+        where T5 : BaseStateMachineRepository<T1, T2, T3, T4>
     {
         private readonly IList<IApplicationFeatureProvider> _featureProviders;
         private readonly IServiceCollection _services;
@@ -130,25 +131,22 @@ public StateMachineFeatureBuilder(
         {
             _featureProviders = featureProviders;
             _services = services;
-            _services.AddScoped<IStateMachineMetaService<T1>, StateMachineMetaService<T1, T2, T3, T5, T4>>();
         }
 
         public StateMachineFeatureBuilder<T1, T2, T3, T4, T5, T> WithStateMachineService<T>()
             where T : BaseStateMachineService<T1, T2, T3, T4, T5>
         {
-            _services.AddScoped<T>();
-            _services.AddScoped<BaseStateMachineService<T1, T2, T3, T4, T5>>(
-                serviceProvider => serviceProvider.GetRequiredService<T>());
             return new StateMachineFeatureBuilder<T1, T2, T3, T4, T5, T>(_featureProviders, _services);
         }
-    } 
-    
-    public class StateMachineFeatureBuilder<T1, T2, T3, T4, T5, T6> 
-        where T1 : struct, IEquatable<T1> 
-        where T2 : struct, IConvertible 
-        where T3 : struct, IConvertible 
-        where T4 : StateMachineSubject<T1, T2, T3, T4>
-        where T5 : BaseStateMachineRepository<T1, T2, T3, T4> 
+    }
+
+    public class StateMachineFeatureBuilder<T1, T2, T3, T4, T5, T6>
+        where T1 : struct, IEquatable<T1>
+        where T2 : struct, IConvertible
+        where T3 : struct, IConvertible
+        where T4 : StateMachineSubject<T1, T2, T3, T4>, new()
+        where T5 : BaseStateMachineRepository<T1, T2, T3, T4>
+        where T6 : BaseStateMachineService<T1, T2, T3, T4, T5>
     {
         private readonly IList<IApplicationFeatureProvider> _featureProviders;
         private readonly IServiceCollection _services;
@@ -160,5 +158,36 @@ public StateMachineFeatureBuilder(
             _featureProviders = featureProviders;
             _services = services;
         }
-    } 
+
+        public void Build()
+        {
+            AddFeatureProvider();
+            AddStateMachineRepository();
+            AddStateMachineMetaService();
+            AddStateMachineService();
+        }
+
+        private void AddFeatureProvider()
+        {
+            _featureProviders.Add(new StateMachineFeatureProvider<T1>());
+        }
+
+        private void AddStateMachineRepository()
+        {
+            _services.AddScoped<T5>();
+            _services.AddScoped<BaseStateMachineRepository<T1, T2, T3, T4>>((svc) => svc.GetService<T5>());
+        }
+
+        private void AddStateMachineMetaService()
+        {
+            _services.AddScoped<IStateMachineMetaService<T1>, StateMachineMetaService<T1, T2, T3, T5, T4>>();
+        }
+
+        private void AddStateMachineService()
+        {
+            _services.AddScoped<T6>();
+            _services.AddScoped<BaseStateMachineService<T1, T2, T3, T4, T5>>(
+                serviceProvider => serviceProvider.GetRequiredService<T6>());
+        }
+    }
 }

common/common.utils/StateMachineFeature/StateMachineFeatureExtensions.cs

@@ -13,7 +13,6 @@ public static IServiceCollection AddStateMachineFeature(
         {
             var builder = new StateMachineFeatureBuilder(services);
             buildAction(builder);
-            
             return services;
         }
     }