Ignore nulls by default

seedstack · Nov 30, 2017 · c3fb8b9 · c3fb8b9
1 parent d67e235
commit c3fb8b9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
-# Version 1.0.0 (2017-09-??)
+# Version 1.0.0 (2017-11-30)
 
-* Initial commit.
+* Initial release.
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
 
     <properties>
         <seed.version>3.4.0</seed.version>
-        <business.version>4.0.0-SNAPSHOT</business.version>
+        <business.version>4.0.0</business.version>
         <modelmapper.version>1.1.1</modelmapper.version>
 
         <compatibility.skip>true</compatibility.skip>

diff --git a/src/main/java/org/seedstack/business/modelmapper/ModelMapperConfig.java b/src/main/java/org/seedstack/business/modelmapper/ModelMapperConfig.java
@@ -25,6 +25,7 @@ public class ModelMapperConfig {
     private boolean ambiguityIgnored = false;
     private boolean fullTypeMatchingRequired = false;
     private boolean implicitMatching = true;
+    private boolean ignoreNulls = true;
     private SourceConfig source = new SourceConfig();
     private DestinationConfig destination = new DestinationConfig();
 
@@ -82,6 +83,15 @@ public ModelMapperConfig setImplicitMatching(boolean implicitMatching) {
         return this;
     }
 
+    public boolean isIgnoreNulls() {
+        return ignoreNulls;
+    }
+
+    public ModelMapperConfig setIgnoreNulls(boolean ignoreNulls) {
+        this.ignoreNulls = ignoreNulls;
+        return this;
+    }
+
     public SourceConfig source() {
         return source;
     }

diff --git a/src/main/java/org/seedstack/business/modelmapper/internal/ModelMapperProvider.java b/src/main/java/org/seedstack/business/modelmapper/internal/ModelMapperProvider.java
@@ -9,6 +9,7 @@
 package org.seedstack.business.modelmapper.internal;
 
 import javax.inject.Provider;
+import org.modelmapper.Conditions;
 import org.modelmapper.ModelMapper;
 import org.seedstack.business.modelmapper.ModelMapperConfig;
 import org.seedstack.seed.Configuration;
@@ -39,6 +40,10 @@ public ModelMapper get() {
         configuration.setDestinationNameTransformer(modelMapperConfig.destination().getNameTransformer());
         configuration.setDestinationNamingConvention(modelMapperConfig.destination().getNamingConvention());
 
+        if (modelMapperConfig.isIgnoreNulls()) {
+            configuration.setPropertyCondition(Conditions.isNotNull());
+        }
+
         return modelMapper;
     }
 }
diff --git a/src/test/java/org/seedstack/business/modelmapper/ModelMapperAssemblerIT.java b/src/test/java/org/seedstack/business/modelmapper/ModelMapperAssemblerIT.java
@@ -20,7 +20,6 @@
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.modelmapper.Conditions;
 import org.modelmapper.PropertyMap;
 import org.seedstack.business.assembler.Assembler;
 import org.seedstack.business.assembler.DtoOf;
@@ -415,8 +414,6 @@ protected void configure(org.modelmapper.ModelMapper modelMapper) {
                         mapper.map(src -> src.getBillingAddress().getCity(), OrderDTO::setBillingCity);
                     });
 
-            modelMapper.getConfiguration().setPropertyCondition(Conditions.isNotNull());
-
             modelMapper.createTypeMap(OrderDTO.class, Order.class)
                     .addMappings(mapper -> {
                         mapper.<String>map(OrderDTO::getBillingCity, (dest, v) -> dest.getBillingAddress().setCity(v));