Version 2.2.0

eye2web · May 25, 2020 · 9c8f11b · 9c8f11b
1 parent a988965
commit 9c8f11b
Show file tree

Hide file tree

Showing 19 changed files with 152 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
 # model-mapper
 Easy to use annotation based model mapper with advanced capabilities.
 
+## Highlights 2.2.0
+- Now supports custom mapping of each element in a Iterable field.
+- Each ValueMapper class will now receive the ModelMapper Object to support mapping of nested Objects.
+
 ## Highlights 2.1.0
 - Now supports Spring boot managed ValueMapper and MultiValueMapper beans! (check tests for examples)
 
@@ -24,7 +28,7 @@ Maven
 <dependency>
   <groupId>com.github.eye2web</groupId>
   <artifactId>model-mapper</artifactId>
-  <version>2.1.0</version>
+  <version>2.2.0</version>
 </dependency>
 ```
 
@@ -33,10 +37,22 @@ For advanced use, the following field annotations can be used.
 
 Examples can be found in src/main/test.
 
+Usage:
+```java
+final ModelMapper modelMapper = new ModelMapper();
+final ModelAResponse modelAResponse = modelMapper.map(modelA, ModelAResponse.class);
+```
+
 ```java
 @MapValue(fieldName = "firstName")
 private String firstName;
 ```
+Iterates over each value in given Iterable. Currently only supports ArrayList<Object> as result map.
+For each item the mapper class will be called.
+```java
+@MapValue(fieldName = "names", valueMapper = UpperCaseValueMapper.class, iterate = true)
+    private List<String> upperCaseNames;
+```
 
 Mapping multiple fields into one. The multi value mapper is custom and implements the 'MultiValueMapper' interface. 
 ```java

diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ ext {
     lombokVersion = '1.18.10'
     groupName = 'com.github.eye2web'
     artifactIdentifier = 'model-mapper'
-    projectVersion = '2.1.0'
+    projectVersion = '2.2.0'
 }
 
 group groupName

diff --git a/src/main/java/eye2web/modelmapper/ModelMapper.java b/src/main/java/eye2web/modelmapper/ModelMapper.java
@@ -48,15 +48,15 @@ public <D> D map(final Object source, final Class<D> destinationType)
 
         final D destinationObj = destinationType.cast(createEmptyInstanceOfNoArgsClass(destinationType));
 
-        getCurrentStrategy().mapObjects(source, destinationObj);
+        getCurrentStrategy().mapObjects(source, destinationObj, this);
 
         return destinationObj;
     }
 
     @Override
     public <D> void map(final Object source, final D destinationObj)
             throws Exception {
-        getCurrentStrategy().mapObjects(source, destinationObj);
+        getCurrentStrategy().mapObjects(source, destinationObj, this);
     }
 
     @Override

diff --git a/src/main/java/eye2web/modelmapper/annotations/MapValue.java b/src/main/java/eye2web/modelmapper/annotations/MapValue.java
@@ -15,5 +15,8 @@
 
     Class<? extends ValueMapper> valueMapper() default DefaultValueMapper.class;
 
+    // Currently only supports arrayList as return type
+    boolean iterate() default false;
+
     FieldProperties[] properties() default {};
 }
diff --git a/src/main/java/eye2web/modelmapper/model/FromField.java b/src/main/java/eye2web/modelmapper/model/FromField.java
@@ -12,6 +12,9 @@ public class FromField {
     private final String fieldName;
     private final Object fieldValue;
 
+    @Builder.Default
+    private final boolean isIterableItem = false;
+
     public boolean containsValue() {
         return Objects.nonNull(fieldValue);
     }

diff --git a/src/main/java/eye2web/modelmapper/strategy/FieldStrategy.java b/src/main/java/eye2web/modelmapper/strategy/FieldStrategy.java
@@ -1,5 +1,6 @@
 package eye2web.modelmapper.strategy;
 
+import eye2web.modelmapper.ModelMapperI;
 import eye2web.modelmapper.annotations.MapValue;
 import eye2web.modelmapper.annotations.MapValues;
 import eye2web.modelmapper.model.FromField;
@@ -23,17 +24,17 @@ public static Strategy getInstance() {
 
         return strategy;
     }
-    
+
     @Override
-    public void mapObjects(Object source, Object destinationObj) throws Exception {
+    public void mapObjects(final Object source, final Object destinationObj, final ModelMapperI modelMapper) throws Exception {
         final List<Map.Entry<String, Object>> sourceFieldValues = StrategyUtil.getFieldValues(source);
 
         for (final Field field : destinationObj.getClass().getDeclaredFields()) {
 
             if (Objects.nonNull(field.getAnnotation(MapValues.class))) {
                 tryMapMultiValueField(field, sourceFieldValues, destinationObj);
             } else {
-                tryMapSingleValueField(field, sourceFieldValues, destinationObj);
+                tryMapSingleValueField(field, sourceFieldValues, destinationObj, modelMapper);
             }
         }
     }
@@ -69,7 +70,8 @@ private void tryMapMultiValueField(final Field field, final List<Map.Entry<Strin
 
 
     private void tryMapSingleValueField(final Field field, final List<Map.Entry<String, Object>> sourceFieldValues,
-                                        final Object destinationObj) throws Exception {
+                                        final Object destinationObj,
+                                        ModelMapperI modelMapper) throws Exception {
 
         final String fieldName = StrategyUtil.getFieldName(field);
 
@@ -78,13 +80,14 @@ private void tryMapSingleValueField(final Field field, final List<Map.Entry<Stri
                 .findFirst();
 
         if (vOpt.isPresent()) {
-            mapFieldValue(destinationObj, field, fieldName, vOpt.get().getValue());
+            mapFieldValue(destinationObj, field, fieldName, vOpt.get().getValue(), modelMapper);
         }
     }
 
 
     private void mapFieldValue(final Object destinationObj, final Field field, final String fieldName,
-                               final Object fieldValue)
+                               final Object fieldValue,
+                               final ModelMapperI modelMapper)
             throws Exception {
 
         final Object value;
@@ -95,14 +98,22 @@ private void mapFieldValue(final Object destinationObj, final Field field, final
             return;
         }
 
-        final var mapFromField = FromField.builder()
-                .fieldName(fieldName)
-                .fieldValue(fieldValue)
-                .build();
-
         final var objectValueMapper = StrategyUtil.getSingleValueMapper(field);
 
-        value = objectValueMapper.mapToValue(mapFromField);
+        if (Objects.isNull(mapValue)) {
+            value = fieldValue;
+        } else if (mapValue.iterate()) {
+            value = StrategyUtil.iterateElements(fieldValue, fieldName, objectValueMapper, modelMapper);
+
+        } else {
+            final var mapFromField = FromField.builder()
+                    .fieldName(fieldName)
+                    .fieldValue(fieldValue)
+                    .build();
+
+            value = objectValueMapper.mapToValue(mapFromField, modelMapper);
+        }
+
 
         boolean isPrivate = StrategyUtil.setFieldPublic(field, destinationObj);
 
@@ -113,7 +124,6 @@ private void mapFieldValue(final Object destinationObj, final Field field, final
         }
     }
 
-
     private void mapFieldValues(final Object destinationObj, final Field field, final Set<FromField> fromFieldSet)
             throws Exception {
 

diff --git a/src/main/java/eye2web/modelmapper/strategy/MethodStrategy.java b/src/main/java/eye2web/modelmapper/strategy/MethodStrategy.java
@@ -1,5 +1,6 @@
 package eye2web.modelmapper.strategy;
 
+import eye2web.modelmapper.ModelMapperI;
 import eye2web.modelmapper.annotations.MapValue;
 import eye2web.modelmapper.annotations.MapValues;
 import eye2web.modelmapper.model.FromField;
@@ -28,7 +29,7 @@ public static Strategy getInstance() {
     }
 
     @Override
-    public void mapObjects(Object source, Object destinationObj) {
+    public void mapObjects(final Object source, final Object destinationObj, final ModelMapperI modelMapper) {
 
         final var METHOD_GET_PREFIX = "get";
         final var METHOD_SET_PREFIX = "set";
@@ -73,13 +74,14 @@ public void mapObjects(Object source, Object destinationObj) {
                 .map(Optional::get)
                 .collect(Collectors.toList());
 
-        mapGettersToSetters(source, getters, destinationObj, setters);
+        mapGettersToSetters(source, getters, destinationObj, setters, modelMapper);
     }
 
     private void mapGettersToSetters(final Object source,
                                      final List<Pair<Field, Method>> getters,
                                      final Object destination,
-                                     final List<Pair<Field, Method>> setters) {
+                                     final List<Pair<Field, Method>> setters,
+                                     final ModelMapperI modelMapper) {
         setters.forEach(setter -> {
 
             // Multimap many to one
@@ -135,17 +137,36 @@ private void mapGettersToSetters(final Object source,
                         try {
                             final var value = getter.getValue().invoke(source);
 
-                            if (!StrategyUtil.shouldIgnoreFieldValue(setter.getKey().getAnnotation(MapValue.class), value)) {
+                            final var annotation = setter.getKey().getAnnotation(MapValue.class);
+
+                            if (Objects.isNull(annotation)) {
+                                // set field values without annotation
+                                setter.getValue().invoke(destination, value);
+                            } else if (!StrategyUtil.shouldIgnoreFieldValue(annotation, value)) {
+
+                                final Object resultValue;
 
                                 final var
                                         objectValueMapper = StrategyUtil.getSingleValueMapper(setter.getKey());
 
-                                final var mapFromField = FromField.builder()
-                                        .fieldValue(value)
-                                        .fieldName(getter.getKey().getName())
-                                        .build();
+                                // If iterable - value should be handled as iterable
+                                if (annotation.iterate()) {
+                                    resultValue = StrategyUtil.iterateElements(value,
+                                            getter.getKey().getName(),
+                                            objectValueMapper,
+                                            modelMapper);
+
+                                } else {
+                                    final var mapFromField = FromField.builder()
+                                            .fieldValue(value)
+                                            .fieldName(getter.getKey().getName())
+                                            .build();
 
-                                setter.getValue().invoke(destination, objectValueMapper.mapToValue(mapFromField));
+                                    resultValue = objectValueMapper.mapToValue(mapFromField, modelMapper);
+                                }
+
+                                // Set value
+                                setter.getValue().invoke(destination, resultValue);
                             }
                         } catch (Exception ex) {
                             System.out.println(
@@ -155,4 +176,5 @@ private void mapGettersToSetters(final Object source,
                     });
         });
     }
+
 }
diff --git a/src/main/java/eye2web/modelmapper/strategy/Strategy.java b/src/main/java/eye2web/modelmapper/strategy/Strategy.java
@@ -1,8 +1,10 @@
 package eye2web.modelmapper.strategy;
 
+import eye2web.modelmapper.ModelMapperI;
+
 public interface Strategy {
 
 
-    void mapObjects(final Object source, final Object destinationObj) throws Exception;
+    void mapObjects(final Object source, final Object destinationObj, final ModelMapperI modelMapper) throws Exception;
 
 }
diff --git a/src/main/java/eye2web/modelmapper/strategy/StrategyUtil.java b/src/main/java/eye2web/modelmapper/strategy/StrategyUtil.java
@@ -1,8 +1,10 @@
 package eye2web.modelmapper.strategy;
 
-import eye2web.modelmapper.model.FieldProperties;
+import eye2web.modelmapper.ModelMapperI;
 import eye2web.modelmapper.annotations.MapValue;
 import eye2web.modelmapper.annotations.MapValues;
+import eye2web.modelmapper.model.FieldProperties;
+import eye2web.modelmapper.model.FromField;
 import eye2web.modelmapper.value.map.*;
 
 import java.lang.reflect.Field;
@@ -77,5 +79,25 @@ public static boolean setFieldPublic(final Field field, final Object object) {
         return didSetPublic;
     }
 
+    public static List<Object> iterateElements(final Object value,
+                                               final String fieldName,
+                                               final ValueMapper valueMapper,
+                                               final ModelMapperI modelMapper) {
+
+        final var results = new ArrayList<>();
+
+        for (Object val : (Iterable<Object>) value) {
+
+            final var mapFromField = FromField.builder()
+                    .fieldValue(val)
+                    .fieldName(fieldName)
+                    .isIterableItem(true)
+                    .build();
+
+            results.add(valueMapper.mapToValue(mapFromField, modelMapper));
+        }
+
+        return results;
+    }
 
 }
diff --git a/src/main/java/eye2web/modelmapper/value/map/DefaultValueMapper.java b/src/main/java/eye2web/modelmapper/value/map/DefaultValueMapper.java
@@ -1,11 +1,12 @@
 package eye2web.modelmapper.value.map;
 
+import eye2web.modelmapper.ModelMapperI;
 import eye2web.modelmapper.model.FromField;
 
 public class DefaultValueMapper implements ValueMapper {
 
     @Override
-    public Object mapToValue(final FromField fromField) {
+    public Object mapToValue(final FromField fromField, final ModelMapperI modelMapper) {
         return fromField.getFieldValue();
     }
 }
diff --git a/src/main/java/eye2web/modelmapper/value/map/ValueMapper.java b/src/main/java/eye2web/modelmapper/value/map/ValueMapper.java
@@ -1,9 +1,10 @@
 package eye2web.modelmapper.value.map;
 
+import eye2web.modelmapper.ModelMapperI;
 import eye2web.modelmapper.model.FromField;
 
 public interface ValueMapper {
 
-    Object mapToValue(final FromField fromField);
+    Object mapToValue(final FromField fromField, final ModelMapperI modelMapper);
 
 }
diff --git a/src/test/java/eye2web/modelmapper/ModelMapperTest.java b/src/test/java/eye2web/modelmapper/ModelMapperTest.java
@@ -11,6 +11,7 @@
 
 import java.time.LocalDate;
 import java.time.Period;
+import java.util.ArrayList;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ModelMapperTest {
@@ -26,11 +27,18 @@ public void setup() {
     public void shouldFullyMapModelAResponseToRequest() throws Exception {
 
         final var age = Period.between(LocalDate.of(1990, 3, 14), LocalDate.now()).getYears();
-
+
+        final var names = new ArrayList<String>();
+
+        names.add("piet");
+        names.add("jan");
+        names.add("henk");
+
         final ModelA modelA = ModelA.builder()
                 .id(1)
                 .isActive(true)
                 .valid(true)
+                .names(names)
                 .firstName("Remco")
                 .lastName("van der Heijden")
                 .birthday(LocalDate.of(1990, 3, 14))
@@ -42,6 +50,7 @@ public void shouldFullyMapModelAResponseToRequest() throws Exception {
         final ModelAResponse modelAResponse = modelMapper.map(modelA, ModelAResponse.class);
 
         Assert.assertEquals(1, modelAResponse.getId());
+        Assert.assertEquals(3, modelAResponse.getUpperCaseNames().size());
         Assert.assertTrue(modelAResponse.isActive());
         Assert.assertTrue(modelAResponse.isValid());
         Assert.assertEquals("Remco", modelAResponse.getFirstName());

diff --git a/src/test/java/eye2web/modelmapper/mapper/AgeValueMapper.java b/src/test/java/eye2web/modelmapper/mapper/AgeValueMapper.java
@@ -1,5 +1,6 @@
 package eye2web.modelmapper.mapper;
 
+import eye2web.modelmapper.ModelMapperI;
 import eye2web.modelmapper.model.FromField;
 import eye2web.modelmapper.value.map.ValueMapper;
 
@@ -9,7 +10,7 @@
 public class AgeValueMapper implements ValueMapper {
 
     @Override
-    public Object mapToValue(final FromField fromField) {
+    public Object mapToValue(final FromField fromField, final ModelMapperI modelMapper) {
 
         if (!fromField.containsValue())
             return 0;

diff --git a/src/test/java/eye2web/modelmapper/mapper/ConcatMultiValueMapper.java b/src/test/java/eye2web/modelmapper/mapper/ConcatMultiValueMapper.java
@@ -9,7 +9,7 @@ public class ConcatMultiValueMapper implements MultiValueMapper {
 
     @Override
     public Object mapToValue(final Set<FromField> fromFieldSet) {
-
+        
         return fromFieldSet.stream()
                 .filter(FromField::containsValue)
                 .filter(field -> field.getType().equals(String.class))