add extend by class and simplify wrapByFunction

Author: runafterasun

README.md

@@ -16,7 +16,6 @@ From maven central <br>
 testImplementation 'ru.objectsfill:objects-fill-processor:x.x.x'
 testAnnotationProcessor 'ru.objectsfill:objects-fill-processor:x.x.x'
 ```
-4. Read doc
 ________________________________________________________________________
 This project can help with generation some random information to object.
 
@@ -135,8 +134,7 @@ public void TestNext() {
                             .valueLength(10)// change size of field
                         .gen(),// construct object
                         Extend
-                            .wrapByFunction()
-                            .addMutationFunction(t -> "You Can do this")
+                            .wrapByFunction(t -> "You Can do this")
                         .gen()) // construct object
                 .withGeneric("T", String.class) // if object with generic
                 .collectionSize(10)// change global size for collections, stream, arrays
@@ -246,8 +244,7 @@ CollectionType collectionType = RandomValue.fill(Fill.object(CollectionType.clas
 ```java
 Stream<String> collectionType = RandomValue.fillStream(Fill.object(String.class)
                 .fieldParams(
-                        Extend.wrapByFunction()
-                                .addMutationFunction(t -> "You Can do this")
+                        Extend.wrapByFunction(t -> "You Can do this")
                                 .gen())
                 .gen());
 ```
@@ -265,8 +262,7 @@ Stream<String> collectionType = RandomValue.fillStream(Fill.object(String.class)
                       .valueLength(10)// change size of field
                       .gen(),// construct object
                 Extend
-                      .wrapByFunction() //change behavior for all
-                      .addMutationFunction(t -> "You Can do this")
+                      .wrapByFunction(t -> "You Can do this") //change behavior for all
                       .gen())
    .gen()
 ```

build.gradle

@@ -36,6 +36,19 @@ tasks.register('javadocJar', Jar) {
     classifier = 'javadoc'
     from javadoc.destinationDir
 }
+//publishing {
+//    publications {
+//        mavenJava(MavenPublication) {
+//            groupId = 'ru.objectsfill'
+//            artifactId = 'objects-fill-processor'
+//            version = "0.1.2"
+//            from components.java
+//        }
+//    }
+//    repositories {
+//        mavenLocal()
+//    }
+//}
 
 publishing {
     publications {
@@ -44,7 +57,7 @@ publishing {
             artifact javadocJar
             artifactId = "objects-fill-processor"
             groupId = "ru.objectsfill"
-            version = "0.1.1"
+            version = "0.1.2"
             from(components["java"])
             pom {
                 packaging 'jar'

src/main/java/ru/objectsfill/core/RandomValueFieldSetterCallback.java

@@ -1,5 +1,6 @@
 package ru.objectsfill.core;
 
+import ru.objectsfill.object_param.Extend;
 import ru.objectsfill.object_param.Fill;
 import ru.objectsfill.service.CollectionElementCreationService;
 import ru.objectsfill.types.primitive_type.PrimitiveTypeName;
@@ -9,6 +10,7 @@
 import java.lang.reflect.Modifier;
 import java.util.Optional;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 import static ru.objectsfill.service.CollectionElementCreationService.getTypeClass;
 import static ru.objectsfill.types.primitive_type.PrimitiveTypeName.*;
@@ -99,7 +101,7 @@ private Optional<Fill> getExtendedParameterForField(Field field) {
 
         return fill.getExtendedFieldParams()
                 .stream()
-                .filter(fillFieldParameter -> fillFieldParameter.getFieldName().equals(field.getName()))
+                .filter(getExtendPredicate(field))
                 .map(extendedFieldParameter -> Fill.object(fill.getObjectz())
                         .excludeField(fill.getExcludedField())
                         .fieldParams(fill.getExtendedFieldParams())
@@ -111,4 +113,21 @@ private Optional<Fill> getExtendedParameterForField(Field field) {
                 )
                 .findFirst();
     }
+
+    /**
+     * get fields by class or name
+     *
+     * @param field The field to process.
+     */
+    public static Predicate<Extend> getExtendPredicate(Field field) {
+        return fillFieldParameter -> {
+            if(fillFieldParameter.getFieldName() != null) {
+                return fillFieldParameter.getFieldName().equals(field.getName());
+            } else {
+                return field.getType().isAssignableFrom(fillFieldParameter.getClazz());
+            }
+        };
+    }
+
+
 }

src/main/java/ru/objectsfill/object_param/Extend.java

@@ -7,6 +7,11 @@
  */
 public class Extend {
 
+    /**
+     * class type for extend
+     */
+    private Class<?> clazz;
+
     /**
      * name of the field
      */
@@ -25,6 +30,14 @@ public class Extend {
      */
     private UnaryOperator<Object> singleChangeFunction;
 
+    /**
+     Gets class type for extend.
+     @return class type for extend.
+     */
+    public Class<?> getClazz() {
+        return clazz;
+    }
+
     /**
      Gets mutation function.
      @return mutation function.
@@ -70,33 +83,49 @@ public static FillFieldParametersBuilder field(String fieldName) {
     }
 
     /**
-     start empty builder
+     start builder with name
+     @param clazz set class type
+     @return fill field parameter builder.
+     */
+    public static FillFieldParametersBuilder clazz(Class<?> clazz) {
+        return new FillFieldParametersBuilder(clazz);
+    }
+
+    /**
+     start function builder
      @return fill field parameter builder.
      */
-    public static FillFieldParametersBuilder wrapByFunction() {
-        return new FillFieldParametersBuilder();
+    public static FillFieldParametersBuilder wrapByFunction(UnaryOperator<Object> singleChangeFunction) {
+        return new FillFieldParametersBuilder(singleChangeFunction);
     }
 
     /**
      * constructor for builder
      * @param fieldName field name
      * @param collectionSize size
      * @param valueLength length
+     * @param clazz class type for extend
      * @param singleChangeFunction mutation function
      */
     public Extend(String fieldName, Integer collectionSize, Integer valueLength,
-                  UnaryOperator<Object> singleChangeFunction) {
+                  UnaryOperator<Object> singleChangeFunction, Class<?> clazz) {
         this.fieldName = fieldName;
         this.collectionSize = collectionSize;
         this.valueLength = valueLength;
         this.singleChangeFunction = singleChangeFunction;
+        this.clazz = clazz;
     }
 
     /**
      *  builder for extend class
      */
     public static final class FillFieldParametersBuilder {
 
+        /**
+         * class type for extend
+         */
+        private Class<?> clazz;
+
         /**
          * name of the field
          */
@@ -125,12 +154,29 @@ public FillFieldParametersBuilder(String fieldName) {
             this.fieldName = fieldName;
         }
 
+        /**
+         constructor with field class type
+         @param clazz set field class type
+         */
+        public FillFieldParametersBuilder(Class<?> clazz) {
+            this.clazz = clazz;
+        }
+
+        /**
+         constructor with function
+         @param singleChangeFunction with function
+         */
+        public FillFieldParametersBuilder(UnaryOperator<Object> singleChangeFunction) {
+            this.singleChangeFunction = singleChangeFunction;
+        }
+
         /**
          constructor
          */
         public FillFieldParametersBuilder() {
         }
 
+
         /**
          Sets the collection size.
          @param collectionSize The collection size.
@@ -166,7 +212,7 @@ public FillFieldParametersBuilder addMutationFunction(UnaryOperator<Object> sing
          @return The created FillFieldParameters object.
          */
         public Extend gen() {
-            return new Extend(fieldName, collectionSize, valueLength, singleChangeFunction);
+            return new Extend(fieldName, collectionSize, valueLength, singleChangeFunction, clazz);
         }
     }
 }

src/main/java/ru/objectsfill/service/ElementCreationService.java

@@ -165,7 +165,10 @@ private Stream<?> generateCollectionByClassType(Field field, Fill fill, Class<?>
      @return An optional containing the value if found, or empty if not found.
      */
     public static <T> Optional<T> findClassInContainer(Class<?> fieldType, Map<Class<?>, T> container) {
-        Optional<Class<?>> clazzVal = container.keySet().stream().filter(types -> types.isAssignableFrom(fieldType)).findFirst();
+        Optional<Class<?>> clazzVal = container.keySet()
+                .stream()
+                .filter(types -> types.isAssignableFrom(fieldType))
+                .findFirst();
         if(container.containsKey(fieldType)) {
             return Optional.ofNullable(container.get(fieldType));
         }

src/main/java/ru/objectsfill/utils/FieldUtils.java

@@ -13,6 +13,8 @@
 import java.util.function.UnaryOperator;
 
 import static org.apache.commons.lang3.ArrayUtils.EMPTY_FIELD_ARRAY;
+import static ru.objectsfill.core.RandomValueFieldSetterCallback.getExtendPredicate;
+
 /**
  * Utility class for working with fields in Java classes.
  */
@@ -148,7 +150,10 @@ public static UnaryOperator<Object> getObjectUnaryOperator(Fill fill, Field fiel
         UnaryOperator<Object> mutationFunction = t -> t;
         if(field == null) {
             Optional<Extend> extend = getFirstSingleParamFunction(fill);
-            if (extend.isPresent() && extend.get().getFieldName() == null && extend.get().getFieldChangeFunction() != null) {
+            if (extend.isPresent() &&
+                    extend.get().getFieldName() == null &&
+                    extend.get().getFieldChangeFunction() != null &&
+                    extend.get().getClazz() == null) {
                 mutationFunction = extend.get().getFieldChangeFunction();
             }
         } else {
@@ -181,7 +186,7 @@ private static Optional<Extend> getFirstSingleParamFunction(Fill fill) {
     public static Optional<Extend> getExtFillParam(Field field, Fill fill) {
         return fill.getExtendedFieldParams()
                 .stream()
-                .filter(fillFieldParameter -> fillFieldParameter.getFieldName().equals(field.getName()))
+                .filter(getExtendPredicate(field))
                 .findFirst();
     }
 

src/main/java/ru/objectsfill/utils/ScanningForClassUtils.java

@@ -1,6 +1,7 @@
 package ru.objectsfill.utils;
 
 import org.reflections.Reflections;
+import ru.objectsfill.annotation_processor.exceptions.FillException;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
@@ -35,12 +36,12 @@ public static <T extends Annotation, K> List<K> scanProjectForAnnotationAndCastT
         Set<Class<?>> annotated =
                 reflections.get(SubTypes.of(TypesAnnotated.with(annotationClazz)).asClass());
         return annotated.stream()
-                .map(ss -> {
+                .map(castClass -> {
                     try {
-                        return (K) ss.getConstructor().newInstance();
+                        return (K) castClass.getConstructor().newInstance();
                     } catch (InstantiationException | IllegalAccessException | InvocationTargetException |
                              NoSuchMethodException e) {
-                        throw new RuntimeException(e);
+                        throw new FillException(e.getMessage());
                     }
                 })
                 .toList();
@@ -61,12 +62,12 @@ public static <T> List<T> scanClassImplInterface(Class<T> castInterface, String
                 reflections.get(SubTypes.of(castInterface).asClass());
 
         return subTypes.stream()
-                .map(ss -> {
+                .map(castClass -> {
                     try {
-                        return (T) ss.getConstructor().newInstance();
+                        return (T) castClass.getConstructor().newInstance();
                     } catch (InstantiationException | IllegalAccessException | InvocationTargetException |
                              NoSuchMethodException e) {
-                        throw new RuntimeException(e);
+                        throw new FillException(e.getMessage());
                     }
                 })
                 .toList();