refactor(common): GraphHelper теперь не статический класс, ParallerBuilder...

Author: ArXa1L

Commands/BuildDeps.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Common;
-using Common.Extensions;
 using Common.Graph;
 using Common.Logging;
 using Microsoft.Extensions.Logging;
@@ -176,7 +175,12 @@ private static bool BuildDepsSequential(ModulesOrder modulesOrder, BuildInfoStor
 
         private static bool BuildDepsParallel(ModulesOrder modulesOrder, BuildInfoStorage buildStorage, List<Dep> modulesToBuild, ModuleBuilder builder)
         {
-            var parallelBuilder = new ParallelBuilder(modulesOrder.ConfigsGraph);
+            var logger = LogManager.GetLogger<ParallelBuilder>();
+            var graphHelper = new GraphHelper();
+
+            var parallelBuilder = new ParallelBuilder(logger, graphHelper);
+            parallelBuilder.Initialize(modulesOrder.ConfigsGraph);
+
             var tasks = new List<Task>();
             var builtCount = 1;
 

Common/Graph/GraphHelper.cs

@@ -2,9 +2,9 @@
 
 namespace Common.Graph
 {
-    public static class GraphHelper
+    public sealed class GraphHelper
     {
-        public static HashSet<Dep> GetChildren(Dep dep, Dictionary<Dep, List<Dep>> graph)
+        public HashSet<Dep> GetChildren(Dep dep, Dictionary<Dep, List<Dep>> graph)
         {
             var result = new HashSet<Dep>();
             GetChildrenDfs(dep, graph, result);

Common/Graph/ParallelBuilder.cs

@@ -1,14 +1,15 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Common.Logging;
 using Microsoft.Extensions.Logging;
 
 namespace Common.Graph
 {
     public sealed class ParallelBuilder
     {
-        private static readonly ILogger Log = LogManager.GetLogger(typeof(ParallelBuilder));
+        private readonly ILogger logger;
+        private readonly GraphHelper graphHelper;
+
         public bool IsFailed;
 
         private readonly Dictionary<Dep, List<Dep>> graph = new Dictionary<Dep, List<Dep>>();
@@ -20,16 +21,23 @@ public sealed class ParallelBuilder
         private readonly List<Dep> built = new List<Dep>();
         private bool needChecking = true;
 
-        public ParallelBuilder(Dictionary<Dep, List<Dep>> graph)
+        public ParallelBuilder(ILogger<ParallelBuilder> logger, GraphHelper graphHelper)
+
+        {
+            this.logger = logger;
+            this.graphHelper = graphHelper;
+        }
+
+        public void Initialize(Dictionary<Dep, List<Dep>> source)
         {
-            foreach (var key in graph.Keys)
+            foreach (var key in source.Keys)
             {
-                this.graph[key] = GraphHelper.GetChildren(key, graph)
+                graph[key] = graphHelper.GetChildren(key, source)
                     .Where(d => d.Name != key.Name)
                     .ToList();
             }
 
-            waiting.AddRange(this.graph.Keys);
+            waiting.AddRange(graph.Keys);
         }
 
         public Dep TryStartBuild()
@@ -83,7 +91,7 @@ private Dep TryStartOnce(out bool finished)
 
                 if (!needChecking)
                 {
-                    Log.LogInformation("Nothing to build - already checked.");
+                    logger.LogInformation("Nothing to build - already checked.");
                     return null;
                 }
 
@@ -100,14 +108,14 @@ private Dep TryStartOnce(out bool finished)
 
                     building.Add(module);
                     waiting.Remove(module);
-                    Log.LogInformation($"Building {module} with {building.Count - 1} others.");
+                    logger.LogInformation($"Building {module} with {building.Count - 1} others.");
                     return module;
                 }
 
                 needChecking = false;
             }
 
-            Log.LogInformation("Nothing to build.");
+            logger.LogInformation("Nothing to build.");
             return null;
         }
     }