Merge pull request #367 from TNG/chore/reduce-code-duplication

Reduce Code Duplication in Fluent Syntax Conditions

Author: alexanderlinne

ArchUnitNET/Domain/ISizedObjectProvider.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace ArchUnitNET.Domain
+{
+    /// <summary>
+    /// An interface for object providers that can provide a size independent of the used architecture.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public interface ISizedObjectProvider<out T> : IObjectProvider<T>
+    {
+        int Count { get; }
+    }
+}

ArchUnitNET/Fluent/Conditions/RelationCondition.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using ArchUnitNET.Domain;
 
 namespace ArchUnitNET.Fluent.Conditions
@@ -8,10 +9,10 @@ public class RelationCondition<TRuleType, TRelatedType> : IHasDescription
         where TRuleType : ICanBeAnalyzed
         where TRelatedType : ICanBeAnalyzed
     {
-        private readonly Func<IEnumerable<TRelatedType>, ICondition<TRuleType>> _relation;
+        private readonly Func<IObjectProvider<TRelatedType>, ICondition<TRuleType>> _relation;
 
         public RelationCondition(
-            Func<IEnumerable<TRelatedType>, ICondition<TRuleType>> relation,
+            Func<IObjectProvider<TRelatedType>, ICondition<TRuleType>> relation,
             string description,
             string failDescription
         )
@@ -25,9 +26,9 @@ string failDescription
 
         public string Description { get; }
 
-        public ICondition<TRuleType> GetCondition(IEnumerable<TRelatedType> objectProvider)
+        public ICondition<TRuleType> GetCondition(IEnumerable<TRelatedType> objects)
         {
-            return _relation(objectProvider);
+            return _relation(new ListObjectProvider<TRelatedType>(objects.ToList()));
         }
 
         private bool Equals(RelationCondition<TRuleType, TRelatedType> other)

ArchUnitNET/Fluent/ListObjectProvider.cs

@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using System.Linq;
+using ArchUnitNET.Domain;
+
+namespace ArchUnitNET.Fluent
+{
+    public class ListObjectProvider<T> : ISizedObjectProvider<T>
+        where T : ICanBeAnalyzed
+    {
+        private readonly IEnumerable<T> _objects;
+
+        public ListObjectProvider(List<T> objects)
+        {
+            _objects = objects;
+            Description = string.Join(" or ", objects.Select(obj => $"\"{obj.FullName}\""));
+        }
+
+        public string Description { get; }
+
+        public int Count => _objects.Count();
+
+        public IEnumerable<T> GetObjects(Architecture architecture)
+        {
+            return _objects;
+        }
+
+        private bool Equals(ListObjectProvider<T> other)
+        {
+            return string.Equals(Description, other.Description);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj))
+            {
+                return false;
+            }
+
+            if (ReferenceEquals(this, obj))
+            {
+                return true;
+            }
+
+            return obj.GetType() == GetType() && Equals((ListObjectProvider<T>)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return Description != null ? Description.GetHashCode() : 0;
+        }
+    }
+}