Delete collectionGenerator interface, and move maxSizeExclusive and minSizeInclusive configs to RandomInstanceGenerator class

HamzaBenyazid · HamzaBenyazid · commit 1ae629556bb2 · 2023-10-21T14:22:15.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,6 @@ target/
 *.iml
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+# vscode files
+.vscode/
diff --git a/src/main/java/io/javarig/RandomInstanceGenerator.java b/src/main/java/io/javarig/RandomInstanceGenerator.java
@@ -2,30 +2,27 @@
 
 import io.javarig.exception.InstanceGenerationException;
 import io.javarig.exception.NestedObjectRecursionException;
-import io.javarig.generator.CollectionGenerator;
 import io.javarig.generator.TypeGenerator;
+import lombok.Getter;
 import lombok.NonNull;
 import org.apache.commons.lang3.Validate;
 
 import java.lang.reflect.Type;
 import java.util.Stack;
-import java.util.function.Consumer;
 
+@Getter
 public class RandomInstanceGenerator {
-
+    
     private final Stack<Type> objectStack = new Stack<>();
     private final TypeGeneratorFactory typeGeneratorFactory = new TypeGeneratorFactory();
 
-    @SuppressWarnings({"unchecked"})
-    private synchronized <T> T generate(Type type, Consumer<TypeGenerator> generatorSetup) throws InstanceGenerationException {
-        checkForRecursion(type);
-        objectStack.push(type);
-        TypeGenerator generator = typeGeneratorFactory.getGenerator(type, this);
-        generatorSetup.accept(generator);
-        T generated = (T) generator.generate();
-        objectStack.pop();
-        return generated;
-    }
+    // default values
+    public final static int DEFAULT_MAX_SIZE_EXCLUSIVE = 15;
+    public final static int DEFAULT_MIN_SIZE_INCLUSIVE = 5;
+
+    // configurations 
+    private int maxSizeExclusive = DEFAULT_MAX_SIZE_EXCLUSIVE;
+    private int minSizeInclusive = DEFAULT_MIN_SIZE_INCLUSIVE;
 
     /**
      * generate a random instance of the given type
@@ -34,9 +31,14 @@ private synchronized <T> T generate(Type type, Consumer<TypeGenerator> generator
      * @throws InstanceGenerationException if the instance cannot be generated for some reason (class doesn't have
      * a default constructor , class have a non-public default constructor , setter cannot be invoked ... )
      */
+    @SuppressWarnings({"unchecked"})
     public <T> T generate(@NonNull Type objectType) throws InstanceGenerationException {
-        return generate(objectType, ignore -> {
-        });
+        checkForRecursion(objectType);
+        objectStack.push(objectType);
+        TypeGenerator generator = typeGeneratorFactory.getGenerator(objectType, this);
+        T generated = (T) generator.generate();
+        objectStack.pop();
+        return generated;
     }
 
     /**
@@ -52,11 +54,8 @@ public <T> T generate(
             int collectionSize
     ) throws InstanceGenerationException {
         validateSize(collectionSize);
-        return generate(type, generator -> {
-            if(generator instanceof CollectionGenerator collectionGenerator){
-                collectionGenerator.setSize(collectionSize);
-            }
-        });
+        setSize(collectionSize);
+        return generate(type);
     }
 
     /**
@@ -72,12 +71,9 @@ public <T> T generate(@NonNull Type objectType,
                           int maxSizeExclusive
     ) throws InstanceGenerationException {
         validateSize(minSizeInclusive, maxSizeExclusive);
-        return generate(objectType, generator -> {
-            if(generator instanceof CollectionGenerator collectionGenerator){
-                collectionGenerator.setMinSizeInclusive(minSizeInclusive);
-                collectionGenerator.setMaxSizeExclusive(maxSizeExclusive);
-            }
-        });
+        this.maxSizeExclusive = maxSizeExclusive;
+        this.minSizeInclusive = minSizeInclusive;
+        return generate(objectType);
     }
 
     /**
@@ -154,4 +150,9 @@ private void validateSize(int size) {
         Validate.isTrue(size >= 0, "Size must be non-negative.");
     }
 
+    private void setSize(int size){
+        this.maxSizeExclusive = size + 1;
+        this.minSizeInclusive = size;
+    }
+
 }
diff --git a/src/main/java/io/javarig/generator/ArrayGenerator.java b/src/main/java/io/javarig/generator/ArrayGenerator.java
@@ -13,9 +13,7 @@
 
 @Setter
 @Getter
-public class ArrayGenerator extends TypeGenerator implements CollectionGenerator {
-    private int minSizeInclusive = DEFAULT_MIN_SIZE_INCLUSIVE;
-    private int maxSizeExclusive = DEFAULT_MAX_SIZE_EXCLUSIVE;
+public class ArrayGenerator extends TypeGenerator {
 
     public ArrayGenerator(Type type, RandomInstanceGenerator randomInstanceGenerator) {
         super(type, randomInstanceGenerator);
@@ -37,7 +35,7 @@ private Object generatePrimitiveArray(Class<?> primitiveType) {
 
     private Object[] generateArray(Class<?> arrayParameterType) {
         List<Object> objectList = getRandomInstanceGenerator()
-                .generate(List.class, getMinSizeInclusive(), getMaxSizeExclusive(), arrayParameterType);
+                .generate(List.class, getRandomInstanceGenerator().getMinSizeInclusive(), getRandomInstanceGenerator().getMaxSizeExclusive(), arrayParameterType);
         Object[] arrayInstance = (Object[]) Array.newInstance(arrayParameterType, 0);
         arrayInstance = objectList.toArray(arrayInstance);
         return arrayInstance;
diff --git a/src/main/java/io/javarig/generator/CollectionGenerator.java b/src/main/java/io/javarig/generator/CollectionGenerator.java
diff --git a/src/main/java/io/javarig/generator/StringGenerator.java b/src/main/java/io/javarig/generator/StringGenerator.java
@@ -9,16 +9,13 @@
 
 @Setter
 @Getter
-public class StringGenerator extends TypeGenerator implements CollectionGenerator {
-    private int minSizeInclusive = DEFAULT_MIN_SIZE_INCLUSIVE;
-    private int maxSizeExclusive = DEFAULT_MAX_SIZE_EXCLUSIVE;
-
+public class StringGenerator extends TypeGenerator {
     public StringGenerator(Type type, RandomInstanceGenerator randomInstanceGenerator) {
         super(type, randomInstanceGenerator);
     }
 
     @Override
     public String generate() {
-        return RandomStringUtils.randomAlphanumeric(this.getMinSizeInclusive(), this.getMaxSizeExclusive());
+        return RandomStringUtils.randomAlphanumeric(getRandomInstanceGenerator().getMinSizeInclusive(), getRandomInstanceGenerator().getMaxSizeExclusive());
     }
 }
diff --git a/src/main/java/io/javarig/generator/collection/GenericCollectionGenerator.java b/src/main/java/io/javarig/generator/collection/GenericCollectionGenerator.java
@@ -1,10 +1,9 @@
 package io.javarig.generator.collection;
 
-import io.javarig.generator.CollectionGenerator;
 import io.javarig.generator.GenericTypeGenerator;
 
 
-public interface GenericCollectionGenerator<T> extends CollectionGenerator, GenericTypeGenerator {
+public interface GenericCollectionGenerator<T> extends GenericTypeGenerator {
     Class<? extends T> getImplementationType();
 
 }
diff --git a/src/main/java/io/javarig/generator/collection/SingleGenericTypeCollectionGenerator.java b/src/main/java/io/javarig/generator/collection/SingleGenericTypeCollectionGenerator.java
@@ -16,8 +16,6 @@
 @SuppressWarnings({"rawtypes", "unchecked"})
 public abstract class SingleGenericTypeCollectionGenerator<T extends Collection> extends TypeGenerator implements GenericCollectionGenerator<T> {
     private final static int NUMBER_OF_GENERIC_PARAMS = 1;
-    private int minSizeInclusive = DEFAULT_MIN_SIZE_INCLUSIVE;
-    private int maxSizeExclusive = DEFAULT_MAX_SIZE_EXCLUSIVE;
 
     public SingleGenericTypeCollectionGenerator(Type type, RandomInstanceGenerator randomInstanceGenerator) {
         super(type, randomInstanceGenerator);
@@ -30,7 +28,7 @@ public int getNumberOfGenericParams() {
 
     @Override
     public T generate() throws InstanceGenerationException {
-        int randomSize = getRandom().nextInt(getMinSizeInclusive(), getMaxSizeExclusive());
+        int randomSize = getRandom().nextInt(getRandomInstanceGenerator().getMinSizeInclusive(), getRandomInstanceGenerator().getMaxSizeExclusive());
         checkIfValidNumberOfGenericArguments(getType());
         ParameterizedType parameterizedType = (ParameterizedType) getType();
         Type listParameterType = parameterizedType.getActualTypeArguments()[0];
diff --git a/src/main/java/io/javarig/generator/collection/map/MapGenerator.java b/src/main/java/io/javarig/generator/collection/map/MapGenerator.java
@@ -20,8 +20,6 @@
 @SuppressWarnings({"rawtypes", "unchecked"})
 public abstract class MapGenerator extends TypeGenerator implements GenericCollectionGenerator<Map> {
     private final static int NUMBER_OF_GENERIC_PARAMS = 2;
-    private int minSizeInclusive = DEFAULT_MIN_SIZE_INCLUSIVE;
-    private int maxSizeExclusive = DEFAULT_MAX_SIZE_EXCLUSIVE;
 
     public MapGenerator(Type type, RandomInstanceGenerator randomInstanceGenerator) {
         super(type, randomInstanceGenerator);
@@ -35,10 +33,9 @@ public int getNumberOfGenericParams() {
     @Override
     public Map<Object, Object> generate() throws InstanceGenerationException {
         checkIfValidNumberOfGenericArguments(getType());
-        int size = getRandom().nextInt(getMinSizeInclusive(), getMaxSizeExclusive());
+        int size = getRandom().nextInt(getRandomInstanceGenerator().getMinSizeInclusive(), getRandomInstanceGenerator().getMaxSizeExclusive());
         ParameterizedType parameterizedType = (ParameterizedType) getType();
         return generate(parameterizedType, size);
-
     }
 
     /**
diff --git a/src/test/java/io/javarig/generation/ObjectGenerationTest.java b/src/test/java/io/javarig/generation/ObjectGenerationTest.java
@@ -2,7 +2,6 @@
 
 import io.javarig.RandomInstanceGenerator;
 import io.javarig.exception.*;
-import io.javarig.generator.CollectionGenerator;
 import io.javarig.testclasses.*;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeEach;
@@ -165,7 +164,7 @@ public void shouldGenerateObjectWithFieldsContainingSetterPrefix() {
                 .extracting(ClassWithFieldContainingSetterPrefix::getSettersList)
                 .asList()
                 .isNotNull()
-                .hasSizeBetween(CollectionGenerator.DEFAULT_MIN_SIZE_INCLUSIVE, CollectionGenerator.DEFAULT_MAX_SIZE_EXCLUSIVE)// could be better if we had access to collectionGenerator defaultMin defaultMax size as public static fields
+                .hasSizeBetween(RandomInstanceGenerator.DEFAULT_MIN_SIZE_INCLUSIVE, RandomInstanceGenerator.DEFAULT_MAX_SIZE_EXCLUSIVE)// could be better if we had access to collectionGenerator defaultMin defaultMax size as public static fields
                 .element(0)
                 .isNotNull()
                 .asString()
@@ -205,7 +204,7 @@ public void shouldGenerateAGenericClass(Type genericType) {
                 .extracting(GenericTestClass::getList)
                 .asList()
                 .isNotNull()
-                .hasSizeBetween(CollectionGenerator.DEFAULT_MIN_SIZE_INCLUSIVE, CollectionGenerator.DEFAULT_MAX_SIZE_EXCLUSIVE)// could be better if we had access to collectionGenerator defaultMin defaultMax size as public static fields
+                .hasSizeBetween(RandomInstanceGenerator.DEFAULT_MIN_SIZE_INCLUSIVE, RandomInstanceGenerator.DEFAULT_MAX_SIZE_EXCLUSIVE)// could be better if we had access to collectionGenerator defaultMin defaultMax size as public static fields
                 .element(0)
                 .isInstanceOf((Class<?>) genericType);
     }

Original file line number	Diff line number	Diff line change
`@@ -9,16 +9,13 @@`
`9`	`9`
`10`	`10`	`@Setter`
`11`	`11`	`@Getter`
`12`		`-public class StringGenerator extends TypeGenerator implements CollectionGenerator {`
`13`		`- private int minSizeInclusive = DEFAULT_MIN_SIZE_INCLUSIVE;`
`14`		`- private int maxSizeExclusive = DEFAULT_MAX_SIZE_EXCLUSIVE;`
`15`		`-`
	`12`	`+public class StringGenerator extends TypeGenerator {`
`16`	`13`	`public StringGenerator(Type type, RandomInstanceGenerator randomInstanceGenerator) {`
`17`	`14`	`super(type, randomInstanceGenerator);`
`18`	`15`	`}`
`19`	`16`
`20`	`17`	`@Override`
`21`	`18`	`public String generate() {`
`22`		`- return RandomStringUtils.randomAlphanumeric(this.getMinSizeInclusive(), this.getMaxSizeExclusive());`
	`19`	`+ return RandomStringUtils.randomAlphanumeric(getRandomInstanceGenerator().getMinSizeInclusive(), getRandomInstanceGenerator().getMaxSizeExclusive());`
`23`	`20`	`}`
`24`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`	`1`	`package io.javarig.generator.collection;`
`2`	`2`
`3`		`-import io.javarig.generator.CollectionGenerator;`
`4`	`3`	`import io.javarig.generator.GenericTypeGenerator;`
`5`	`4`
`6`	`5`
`7`		`-public interface GenericCollectionGenerator<T> extends CollectionGenerator, GenericTypeGenerator {`
	`6`	`+public interface GenericCollectionGenerator<T> extends GenericTypeGenerator {`
`8`	`7`	`Class<? extends T> getImplementationType();`
`9`	`8`
`10`	`9`	`}`