From 1e280f83c9e80cc21a221fa4af9967f2a9d7ac92 Mon Sep 17 00:00:00 2001
From: Gunnar Morling <gunnar.morling@googlemail.com>
Date: Thu, 15 Aug 2013 20:23:49 +0200
Subject: [PATCH] #61 Making sure attributes can be mapped if target attribute
 is of a super-type

---
 .../ap/processor/MapperCreationProcessor.java |  6 +-
 .../attribute/AttributeInheritanceTest.java   | 62 +++++++++++++++++++
 .../ap/test/inheritance/attribute/Source.java | 32 ++++++++++
 .../attribute/SourceTargetMapper.java         | 30 +++++++++
 .../ap/test/inheritance/attribute/Target.java | 32 ++++++++++
 .../attribute/TargetSourceMapper.java         | 30 +++++++++
 6 files changed, 189 insertions(+), 3 deletions(-)
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/AttributeInheritanceTest.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/Source.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/SourceTargetMapper.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/Target.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/TargetSourceMapper.java

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 53e757d23..a2903c303 100644
--- a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
+++ b/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
@@ -562,7 +562,7 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Metho
      * @param property The property mapping to check.
      */
     private void reportErrorIfPropertyCanNotBeMapped(Method method, PropertyMapping property) {
-        if ( property.getSourceType().equals( property.getTargetType() ) ||
+        if ( property.getSourceType().isAssignableTo( property.getTargetType() ) ||
             property.getMappingMethod() != null ||
             property.getConversion() != null ||
             property.getTargetType().getImplementationType() != null ) {
@@ -573,9 +573,9 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Metho
             Kind.ERROR,
             String.format(
                 "Can't map property \"%s %s\" to \"%s %s\".",
-                property.getSourceType().getName(),
+                property.getSourceType(),
                 property.getSourceName(),
-                property.getTargetType().getName(),
+                property.getTargetType(),
                 property.getTargetName()
             ),
             method.getExecutable()
diff --git a/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/AttributeInheritanceTest.java b/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/AttributeInheritanceTest.java
new file mode 100644
index 000000000..b94892c6f
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/AttributeInheritanceTest.java
@@ -0,0 +1,62 @@
+/**
+ *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.inheritance.attribute;
+
+import static org.fest.assertions.Assertions.assertThat;
+
+import javax.tools.Diagnostic.Kind;
+
+import org.mapstruct.ap.testutil.MapperTestBase;
+import org.mapstruct.ap.testutil.WithClasses;
+import org.mapstruct.ap.testutil.compilation.annotation.CompilationResult;
+import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
+import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
+import org.testng.annotations.Test;
+
+/**
+ * Test for setting an attribute where the target attribute of a super-type.
+ *
+ * @author Gunnar Morling
+ */
+public class AttributeInheritanceTest extends MapperTestBase {
+
+    @Test
+    @WithClasses({ Source.class, Target.class, SourceTargetMapper.class })
+    public void shouldMapAttributeFromSuperType() {
+        Source source = new Source();
+        source.setFoo( "Bob" );
+
+        Target target = SourceTargetMapper.INSTANCE.sourceToTarget( source );
+        assertThat( target.getFoo() ).isNotNull();
+        assertThat( target.getFoo().toString() ).isEqualTo( "Bob" );
+    }
+
+    @Test
+    @WithClasses({ Source.class, Target.class, TargetSourceMapper.class })
+    @ExpectedCompilationOutcome(
+        value = CompilationResult.FAILED,
+        diagnostics = @Diagnostic(
+            type = TargetSourceMapper.class,
+            kind = Kind.ERROR,
+            line = 29,
+            messageRegExp = "Can't map property \"java.lang.CharSequence foo\" to \"java.lang.String foo\""
+        ))
+    public void shouldReportErrorDueToUnmappableAttribute() {
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/Source.java b/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/Source.java
new file mode 100644
index 000000000..0d64e424f
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/Source.java
@@ -0,0 +1,32 @@
+/**
+ *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.inheritance.attribute;
+
+public class Source {
+
+    private String foo;
+
+    public String getFoo() {
+        return foo;
+    }
+
+    public void setFoo(String foo) {
+        this.foo = foo;
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/SourceTargetMapper.java
new file mode 100644
index 000000000..1062ab01e
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/SourceTargetMapper.java
@@ -0,0 +1,30 @@
+/**
+ *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.inheritance.attribute;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mappers;
+
+@Mapper
+public interface SourceTargetMapper {
+
+    SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class );
+
+    Target sourceToTarget(Source source);
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/Target.java b/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/Target.java
new file mode 100644
index 000000000..11e00fc23
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/Target.java
@@ -0,0 +1,32 @@
+/**
+ *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.inheritance.attribute;
+
+public class Target {
+
+    private CharSequence foo;
+
+    public CharSequence getFoo() {
+        return foo;
+    }
+
+    public void setFoo(CharSequence foo) {
+        this.foo = foo;
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/TargetSourceMapper.java b/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/TargetSourceMapper.java
new file mode 100644
index 000000000..444b58b53
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/inheritance/attribute/TargetSourceMapper.java
@@ -0,0 +1,30 @@
+/**
+ *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.inheritance.attribute;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mappers;
+
+@Mapper
+public interface TargetSourceMapper {
+
+    TargetSourceMapper INSTANCE = Mappers.getMapper( TargetSourceMapper.class );
+
+    Source targetToSource(Target target);
+}