From 5afc62773557b2b5bd13d1fe6c182da6109f6464 Mon Sep 17 00:00:00 2001
From: Andreas Gudian <agudian@apache.org>
Date: Sun, 22 Jun 2014 12:55:27 +0200
Subject: [PATCH] #229 Add null-check before auto-unboxing in direct
 assignments

---
 .../ap/processor/MapperCreationProcessor.java    |  6 +++---
 .../nativetypes/BooleanConversionTest.java       | 15 +++++++++++++--
 .../nativetypes/CharConversionTest.java          | 15 +++++++++++++--
 .../nativetypes/NumberConversionTest.java        | 16 ++++++++++++++--
 4 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java b/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
index d5d542291..9eac991d2 100644
--- a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
+++ b/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
@@ -791,13 +791,13 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
                 if ( assignment.getType() == DIRECT ) {
                     assignment = new NullCheckWrapper( assignment );
                 }
-
             }
             else {
-
                 if ( targetAccessorType == TargetAccessorType.SETTER ) {
                     assignment = new SetterWrapper( assignment, method.getThrownTypes() );
-                    if ( !sourceType.isPrimitive() && ( assignment.getType() == TYPE_CONVERTED ) ) {
+                    if ( !sourceType.isPrimitive() &&
+                        ( assignment.getType() == TYPE_CONVERTED ||
+                          assignment.getType() == DIRECT && targetType.isPrimitive() ) ) {
                         // for primitive types null check is not possible at all, but a conversion needs
                         // a null check.
                         assignment = new NullCheckWrapper( assignment );
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java
index 0e8959c77..8c7c4daa2 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java
@@ -18,13 +18,14 @@
  */
 package org.mapstruct.ap.test.conversion.nativetypes;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 @WithClasses({
     BooleanSource.class,
     BooleanTarget.class,
@@ -58,4 +59,14 @@ public class BooleanConversionTest {
         assertThat( source.isB() ).isEqualTo( true );
         assertThat( source.getBool() ).isEqualTo( true );
     }
+
+    @Test
+    @IssueKey( "229" )
+    public void wrapperToPrimitveIsNullSafe() {
+        BooleanTarget target = new BooleanTarget();
+
+        BooleanSource source = BooleanMapper.INSTANCE.targetToSource( target );
+
+        assertThat( source ).isNotNull();
+    }
 }
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java
index 42a3c6939..94ced2c0b 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java
@@ -18,13 +18,14 @@
  */
 package org.mapstruct.ap.test.conversion.nativetypes;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 @WithClasses({
     CharSource.class,
     CharTarget.class,
@@ -54,4 +55,14 @@ public class CharConversionTest {
         assertThat( source ).isNotNull();
         assertThat( source.getC() ).isEqualTo( 'G' );
     }
+
+    @Test
+    @IssueKey( "229" )
+    public void wrapperToPrimitveIsNullSafe() {
+        CharTarget target = new CharTarget();
+
+        CharSource source = CharMapper.INSTANCE.targetToSource( target );
+
+        assertThat( source ).isNotNull();
+    }
 }
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java
index 9f851a9f8..45aef42f2 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java
@@ -18,13 +18,14 @@
  */
 package org.mapstruct.ap.test.conversion.nativetypes;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 @WithClasses({
     ByteSource.class,
     ByteTarget.class,
@@ -450,4 +451,15 @@ public class NumberConversionTest {
         assertThat( target.getD() ).isEqualTo( 11d );
         assertThat( target.getDd() ).isEqualTo( Double.valueOf( 12d ) );
     }
+
+    @Test
+    @IssueKey( "229" )
+    public void wrapperToPrimitveIsNullSafe() {
+        assertThat( SourceTargetMapper.INSTANCE.sourceToTarget( new ByteWrapperSource() ) ).isNotNull();
+        assertThat( SourceTargetMapper.INSTANCE.sourceToTarget( new DoubleWrapperSource() ) ).isNotNull();
+        assertThat( SourceTargetMapper.INSTANCE.sourceToTarget( new ShortWrapperSource() ) ).isNotNull();
+        assertThat( SourceTargetMapper.INSTANCE.sourceToTarget( new IntWrapperSource() ) ).isNotNull();
+        assertThat( SourceTargetMapper.INSTANCE.sourceToTarget( new FloatWrapperSource() ) ).isNotNull();
+        assertThat( SourceTargetMapper.INSTANCE.sourceToTarget( new LongWrapperSource() ) ).isNotNull();
+    }
 }