Merge pull request #46

Removed the surplus `IConfigurableComplexRandomizer` interface.

Author: TonyTroeff

src/TryAtSoftware.Randomizer.Core/ComplexRandomizer.cs

@@ -2,10 +2,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
 using TryAtSoftware.Randomizer.Core.Interfaces;
 
-public class ComplexRandomizer<TEntity> : IConfigurableComplexRandomizer<TEntity>
+public class ComplexRandomizer<TEntity> : IComplexRandomizer<TEntity>
 {
     private readonly List<string> _orderedMembers = new ();
     private readonly HashSet<string> _randomizedMembers = new ();
@@ -49,24 +48,6 @@ public void Randomize(IRandomizationRule<TEntity> rule)
         this.SetRuleInternally(rule);
     }
 
-    /// <inheritdoc />
-    public void Randomize<TValue>(Expression<Func<TEntity, TValue>> propertySelector, IRandomizer<TValue> randomizer)
-    {
-        if (propertySelector is null) throw new ArgumentNullException(nameof(propertySelector));
-        if (randomizer is null) throw new ArgumentNullException(nameof(randomizer));
-        
-        this.SetRuleInternally(new RandomizationRule<TEntity,TValue>(propertySelector, randomizer));
-    }
-
-    /// <inheritdoc />
-    public void Randomize<TValue>(Expression<Func<TEntity, TValue>> propertySelector, Func<TEntity, IRandomizer<TValue>?> getRandomizer)
-    {
-        if (propertySelector is null) throw new ArgumentNullException(nameof(propertySelector));
-        if (getRandomizer is null) throw new ArgumentNullException(nameof(getRandomizer));
-        
-        this.SetRuleInternally(new RandomizationRule<TEntity,TValue>(propertySelector, getRandomizer));
-    }
-
     private void SetRuleInternally(IRandomizationRule<TEntity> rule)
     {
         if (string.IsNullOrWhiteSpace(rule.PropertyName)) return;

src/TryAtSoftware.Randomizer.Core/Interfaces/IComplexRandomizer.cs

@@ -1,16 +1,8 @@
 namespace TryAtSoftware.Randomizer.Core.Interfaces;
 
-using System;
-using System.Linq.Expressions;
-
 public interface IComplexRandomizer<out TEntity> : IRandomizer<TEntity>
 {
     IInstanceBuilder<TEntity> InstanceBuilder { get; }
-}
-
-public interface IConfigurableComplexRandomizer<TEntity> : IComplexRandomizer<TEntity>
-{
+    
     void Randomize(IRandomizationRule<TEntity> rule);
-    void Randomize<TValue>(Expression<Func<TEntity, TValue>> propertySelector, IRandomizer<TValue> randomizer);
-    void Randomize<TValue>(Expression<Func<TEntity, TValue>> propertySelector, Func<TEntity, IRandomizer<TValue>?> getRandomizer);
-}
+}

src/TryAtSoftware.Randomizer.Core/RandomizationExtensions.cs

@@ -1,9 +1,29 @@
 namespace TryAtSoftware.Randomizer.Core;
 
+using System;
+using System.Linq.Expressions;
 using TryAtSoftware.Randomizer.Core.Interfaces;
 using TryAtSoftware.Randomizer.Core.Primitives;
 
 public static class RandomizationExtensions
 {
     public static IRandomizer<TValue> AsConstantRandomizer<TValue>(this TValue value) => new ConstantValueRandomizer<TValue>(value);
+    
+    public static void Randomize<TEntity, TValue>(this IComplexRandomizer<TEntity> complexRandomizer, Expression<Func<TEntity, TValue>> propertySelector, IRandomizer<TValue> randomizer)
+    {
+        if (complexRandomizer is null) throw new ArgumentNullException(nameof(complexRandomizer));
+        if (propertySelector is null) throw new ArgumentNullException(nameof(propertySelector));
+        if (randomizer is null) throw new ArgumentNullException(nameof(randomizer));
+        
+        complexRandomizer.Randomize(new RandomizationRule<TEntity,TValue>(propertySelector, randomizer));
+    }
+
+    public static void Randomize<TEntity, TValue>(this IComplexRandomizer<TEntity> complexRandomizer, Expression<Func<TEntity, TValue>> propertySelector, Func<TEntity, IRandomizer<TValue>?> getRandomizer)
+    {
+        if (complexRandomizer is null) throw new ArgumentNullException(nameof(complexRandomizer));
+        if (propertySelector is null) throw new ArgumentNullException(nameof(propertySelector));
+        if (getRandomizer is null) throw new ArgumentNullException(nameof(getRandomizer));
+        
+        complexRandomizer.Randomize(new RandomizationRule<TEntity,TValue>(propertySelector, getRandomizer));
+    }
 }

tests/TryAtSoftware.Randomizer.Core.Tests/ComplexRandomizerTests.cs

@@ -1,6 +1,7 @@
 namespace TryAtSoftware.Randomizer.Core.Tests;
 
 using System;
+using TryAtSoftware.Randomizer.Core.Interfaces;
 using TryAtSoftware.Randomizer.Core.Primitives;
 using TryAtSoftware.Randomizer.Core.Tests.Models;
 using Xunit;
@@ -13,9 +14,11 @@ public void RandomizeShouldThrowExceptionWhenInvalidParametersAreProvided()
         var randomizer = new ComplexRandomizer<Person>();
         Assert.Throws<ArgumentNullException>(() => randomizer.Randomize(null!));
         Assert.Throws<ArgumentNullException>(() => randomizer.Randomize(null!, new StringRandomizer()));
-        Assert.Throws<ArgumentNullException>(() => randomizer.Randomize<string>(x => x.Name, randomizer: null!));
+        Assert.Throws<ArgumentNullException>(() => randomizer.Randomize<Person, string>(x => x.Name, randomizer: null!));
+        Assert.Throws<ArgumentNullException>(() => ((IComplexRandomizer<Person>)null!).Randomize(x => x.Name, new StringRandomizer()));
         Assert.Throws<ArgumentNullException>(() => randomizer.Randomize(null!, _ => new StringRandomizer()));
-        Assert.Throws<ArgumentNullException>(() => randomizer.Randomize<string>(x => x.Name, getRandomizer: null!));
+        Assert.Throws<ArgumentNullException>(() => randomizer.Randomize<Person, string>(x => x.Name, getRandomizer: null!));
+        Assert.Throws<ArgumentNullException>(() => ((IComplexRandomizer<Person>)null!).Randomize(x => x.Name, _ => new StringRandomizer()));
     }
 
     [Fact]