Merge pull request #416 from TNG/refactor/add-types-to-namespaces-lodader-task

Improve implementation of AddTypesToNamespaces loader task

Author: alexanderlinne

ArchUnitNET/Loader/ArchBuilder.cs

@@ -113,15 +113,10 @@ public void LoadTypesForModule(ModuleDefinition module, string namespaceFilter)
                     }
                 });
 
-            _namespaceRegistry
-                .Namespaces.Where(ns => RegexUtils.MatchNamespaces(namespaceFilter, ns.FullName))
-                .ForEach(ns =>
-                {
-                    _loadTaskRegistry.Add(
-                        typeof(AddTypesToNamespace),
-                        new AddTypesToNamespace(ns, currentTypes)
-                    );
-                });
+            _loadTaskRegistry.Add(
+                typeof(AddTypesToNamespaces),
+                new AddTypesToNamespaces(currentTypes)
+            );
         }
 
         private void UpdateTypeDefinitions()
@@ -138,7 +133,7 @@ private void UpdateTypeDefinitions()
                     typeof(AddGenericArgumentDependencies),
                     typeof(AddClassDependencies),
                     typeof(AddBackwardsDependencies),
-                    typeof(AddTypesToNamespace),
+                    typeof(AddTypesToNamespaces),
                 }
             );
         }

ArchUnitNET/Loader/LoadTasks/AddTypesToNamespace.cs renamed to ArchUnitNET/Loader/LoadTasks/AddTypesToNamespaces.cs

@@ -4,20 +4,21 @@
 
 namespace ArchUnitNET.Loader.LoadTasks
 {
-    internal class AddTypesToNamespace : ILoadTask
+    internal class AddTypesToNamespaces : ILoadTask
     {
-        private readonly Namespace _ns;
         private readonly List<IType> _types;
 
-        public AddTypesToNamespace(Namespace ns, List<IType> types)
+        public AddTypesToNamespaces(List<IType> types)
         {
-            _ns = ns;
             _types = types;
         }
 
         public void Execute()
         {
-            ((List<IType>)_ns.Types).AddRange(_types.Where(type => type.Namespace.Equals(_ns)));
+            foreach (var type in _types)
+            {
+                ((List<IType>)type.Namespace.Types).Add(type);
+            }
         }
     }
 }