#2251 Fix incorrect code generated for constructor mapping from implicit source parameter matching

filiphr · filiphr · commit e8713fb432a9 · 2020-11-01T17:17:56.000+01:00
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java
@@ -1315,6 +1315,7 @@ private void applyParameterNameBasedMapping() {
                         sourceParameters.remove();
                         unprocessedDefinedTargets.remove( targetProperty.getKey() );
                         unprocessedSourceProperties.remove( targetProperty.getKey() );
+                        unprocessedConstructorProperties.remove( targetProperty.getKey() );
                     }
                 }
             }
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2251/Issue2251Mapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2251/Issue2251Mapper.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2251;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface Issue2251Mapper {
+
+    Issue2251Mapper INSTANCE = Mappers.getMapper( Issue2251Mapper.class );
+
+    @Mapping(target = "value1", source = "source.value")
+    Target map(Source source, String value2);
+
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2251/Issue2251Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2251/Issue2251Test.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2251;
+
+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.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Filip Hrisafov
+ */
+@IssueKey("2251")
+@RunWith(AnnotationProcessorTestRunner.class)
+@WithClasses({
+    Issue2251Mapper.class,
+    Source.class,
+    Target.class,
+})
+public class Issue2251Test {
+
+    @Test
+    public void shouldGenerateCorrectCode() {
+
+        Target target = Issue2251Mapper.INSTANCE.map( new Source( "source" ), "test" );
+
+        assertThat( target ).isNotNull();
+        assertThat( target.getValue1() ).isEqualTo( "source" );
+        assertThat( target.getValue2() ).isEqualTo( "test" );
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2251/Source.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2251/Source.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2251;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class Source {
+
+    private final String value;
+
+    public Source(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2251/Target.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2251/Target.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2251;
+
+public class Target {
+    private final String value1;
+    private final String value2;
+
+    public Target(String value1, String value2) {
+        this.value1 = value1;
+        this.value2 = value2;
+    }
+
+    public String getValue1() {
+        return value1;
+    }
+
+    public String getValue2() {
+        return value2;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1315,6 +1315,7 @@ private void applyParameterNameBasedMapping() {`
`1315`	`1315`	`sourceParameters.remove();`
`1316`	`1316`	`unprocessedDefinedTargets.remove( targetProperty.getKey() );`
`1317`	`1317`	`unprocessedSourceProperties.remove( targetProperty.getKey() );`
	`1318`	`+ unprocessedConstructorProperties.remove( targetProperty.getKey() );`
`1318`	`1319`	`}`
`1319`	`1320`	`}`
`1320`	`1321`	`}`