Fix false positive unmapped target property for multi source mappers

filiphr · filiphr · commit 89e9a6efea6a · 2020-10-10T14:11:31.000+02:00
Fixes #60
diff --git a/change-notes.html b/change-notes.html
@@ -1,4 +1,8 @@
 <html>
+<h2>1.2.3</h2>
+<ul>
+    <li>Bug fix: False positive unmapped target property for multi source methods</li>
+</ul>
 <h2>1.2.2</h2>
 <ul>
     <li>Support for mapping nested bean properties to current target</li>
diff --git a/src/main/java/org/mapstruct/intellij/util/SourceUtils.java b/src/main/java/org/mapstruct/intellij/util/SourceUtils.java
@@ -12,8 +12,6 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.CommonClassNames;
@@ -43,7 +41,8 @@ private SourceUtils() {
 
     /**
      * Find all source properties for the given {@code method}. If the method has only one source parameter then the
-     * properties of the source class are returned. Otherwise the names of all the source parameters are returned
+     * properties of the source class are returned. Otherwise the names of all the source parameters
+     * and their properties are returned.
      *
      * @param method to be used
      *
@@ -56,9 +55,14 @@ public static Set<String> findAllSourceProperties(@NotNull PsiMethod method) {
             return SourceUtils.publicReadAccessors( parameterType ).keySet();
         }
 
-        return Stream.of( sourceParameters )
-            .map( PsiParameter::getName )
-            .collect( Collectors.toSet() );
+        Set<String> sourceProperties = new HashSet<>();
+        for ( PsiParameter sourceParameter : sourceParameters ) {
+            sourceProperties.add( sourceParameter.getName() );
+            PsiType parameterType = SourceUtils.getParameterType( sourceParameter );
+            sourceProperties.addAll( SourceUtils.publicReadAccessors( parameterType ).keySet() );
+        }
+
+        return sourceProperties;
     }
 
     /**
diff --git a/src/test/java/org/mapstruct/intellij/inspection/UnmappedFluentTargetPropertiesInspectionTest.java b/src/test/java/org/mapstruct/intellij/inspection/UnmappedFluentTargetPropertiesInspectionTest.java
@@ -52,11 +52,8 @@ public void testUnmappedFluentTargetProperties() {
                 "Ignore all unmapped target properties",
                 "Ignore unmapped target property: 'testName'",
                 "Add unmapped target property: 'testName'",
-                "Ignore unmapped target property: 'matching'",
-                "Add unmapped target property: 'matching'",
                 "Ignore unmapped target property: 'moreTarget'",
-                "Add unmapped target property: 'moreTarget'",
-                "Ignore all unmapped target properties"
+                "Add unmapped target property: 'moreTarget'"
             );
 
         allQuickFixes.forEach( myFixture::launchAction );
diff --git a/src/test/java/org/mapstruct/intellij/inspection/UnmappedTargetPropertiesInspectionTest.java b/src/test/java/org/mapstruct/intellij/inspection/UnmappedTargetPropertiesInspectionTest.java
@@ -64,11 +64,8 @@ public void testUnmappedTargetProperties() {
                 "Ignore all unmapped target properties",
                 "Ignore unmapped target property: 'testName'",
                 "Add unmapped target property: 'testName'",
-                "Ignore unmapped target property: 'matching'",
-                "Add unmapped target property: 'matching'",
                 "Ignore unmapped target property: 'moreTarget'",
-                "Add unmapped target property: 'moreTarget'",
-                "Ignore all unmapped target properties"
+                "Add unmapped target property: 'moreTarget'"
             );
 
         allQuickFixes.forEach( myFixture::launchAction );
diff --git a/src/test/java/org/mapstruct/intellij/inspection/UnmappedTargetPropertiesJdk8InspectionTest.java b/src/test/java/org/mapstruct/intellij/inspection/UnmappedTargetPropertiesJdk8InspectionTest.java
@@ -52,11 +52,8 @@ public void testUnmappedTargetPropertiesJdk8() {
                 "Ignore all unmapped target properties",
                 "Ignore unmapped target property: 'testName'",
                 "Add unmapped target property: 'testName'",
-                "Ignore unmapped target property: 'matching'",
-                "Add unmapped target property: 'matching'",
                 "Ignore unmapped target property: 'moreTarget'",
-                "Add unmapped target property: 'moreTarget'",
-                "Ignore all unmapped target properties"
+                "Add unmapped target property: 'moreTarget'"
             );
 
         allQuickFixes.forEach( myFixture::launchAction );
diff --git a/testData/inspection/UnmappedFluentTargetProperties.java b/testData/inspection/UnmappedFluentTargetProperties.java
@@ -60,5 +60,5 @@ interface UpdateMapper {
 @Mapper
 interface MultiSourceUpdateMapper {
 
-    void <warning descr="Unmapped target properties: matching, moreTarget">update</warning>(@MappingTarget Target moreTarget, Source source, String testName, @Context String matching);
+    void <warning descr="Unmapped target property: moreTarget">update</warning>(@MappingTarget Target moreTarget, Source source, String testName, @Context String matching);
 }
diff --git a/testData/inspection/UnmappedFluentTargetProperties_after.java b/testData/inspection/UnmappedFluentTargetProperties_after.java
@@ -72,11 +72,7 @@ interface UpdateMapper {
 @Mapper
 interface MultiSourceUpdateMapper {
 
-    @Mapping(target = "moreTarget", ignore = true)
-    @Mapping(target = "matching", ignore = true)
     @Mapping(target = "moreTarget", source = "")
     @Mapping(target = "moreTarget", ignore = true)
-    @Mapping(target = "matching", source = "")
-    @Mapping(target = "matching", ignore = true)
     void update(@MappingTarget Target moreTarget, Source source, String testName, @Context String matching);
 }
diff --git a/testData/inspection/UnmappedTargetProperties.java b/testData/inspection/UnmappedTargetProperties.java
@@ -79,5 +79,5 @@ interface UpdateMapper {
 @Mapper
 interface MultiSourceUpdateMapper {
 
-    void <warning descr="Unmapped target properties: matching, moreTarget">update</warning>(@MappingTarget Target moreTarget, Source source, String testName, @org.mapstruct.Context String matching);
+    void <warning descr="Unmapped target property: moreTarget">update</warning>(@MappingTarget Target moreTarget, Source source, String testName, @org.mapstruct.Context String matching);
 }
diff --git a/testData/inspection/UnmappedTargetPropertiesJdk8.java b/testData/inspection/UnmappedTargetPropertiesJdk8.java
@@ -50,6 +50,12 @@ interface AllMappingMapper {
     Target mapWithAllMapping(Source source);
 }
 
+@Mapper
+interface MultiSourceMappingsMapper {
+
+    Target mapWithAllMapping(Source source, String moreTarget, String testName);
+}
+
 @Mapper
 interface UpdateMapper {
 
@@ -60,7 +66,7 @@ interface UpdateMapper {
 @Mapper
 interface MultiSourceUpdateMapper {
 
-    void <warning descr="Unmapped target properties: matching, moreTarget">update</warning>(@MappingTarget Target moreTarget, Source source, String testName, @Context String matching);
+    void <warning descr="Unmapped target property: moreTarget">update</warning>(@MappingTarget Target moreTarget, Source source, String testName, @Context String matching);
 }
 
 @Mapper
diff --git a/testData/inspection/UnmappedTargetPropertiesJdk8_after.java b/testData/inspection/UnmappedTargetPropertiesJdk8_after.java
@@ -60,6 +60,12 @@ interface AllMappingMapper {
     Target mapWithAllMapping(Source source);
 }
 
+@Mapper
+interface MultiSourceMappingsMapper {
+
+    Target mapWithAllMapping(Source source, String moreTarget, String testName);
+}
+
 @Mapper
 interface UpdateMapper {
 
@@ -72,12 +78,8 @@ interface UpdateMapper {
 @Mapper
 interface MultiSourceUpdateMapper {
 
-    @Mapping(target = "moreTarget", ignore = true)
-    @Mapping(target = "matching", ignore = true)
     @Mapping(target = "moreTarget", source = "")
     @Mapping(target = "moreTarget", ignore = true)
-    @Mapping(target = "matching", source = "")
-    @Mapping(target = "matching", ignore = true)
     void update(@MappingTarget Target moreTarget, Source source, String testName, @Context String matching);
 }
 
diff --git a/testData/inspection/UnmappedTargetProperties_after.java b/testData/inspection/UnmappedTargetProperties_after.java
@@ -106,12 +106,8 @@ interface UpdateMapper {
 interface MultiSourceUpdateMapper {
 
     @Mappings({
-            @Mapping(target = "matching", ignore = true),
-            @Mapping(target = "matching", source = ""),
             @Mapping(target = "moreTarget", ignore = true),
-            @Mapping(target = "moreTarget", source = ""),
-            @Mapping(target = "matching", ignore = true),
-            @Mapping(target = "moreTarget", ignore = true)
+            @Mapping(target = "moreTarget", source = "")
     })
     void update(@MappingTarget Target moreTarget, Source source, String testName, @org.mapstruct.Context String matching);
 }

Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,5 @@ interface UpdateMapper {`
`60`	`60`	`@Mapper`
`61`	`61`	`interface MultiSourceUpdateMapper {`
`62`	`62`
`63`		`- void <warning descr="Unmapped target properties: matching, moreTarget">update</warning>(@MappingTarget Target moreTarget, Source source, String testName, @Context String matching);`
	`63`	`+ void <warning descr="Unmapped target property: moreTarget">update</warning>(@MappingTarget Target moreTarget, Source source, String testName, @Context String matching);`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,5 +79,5 @@ interface UpdateMapper {`
`79`	`79`	`@Mapper`
`80`	`80`	`interface MultiSourceUpdateMapper {`
`81`	`81`
`82`		`- void <warning descr="Unmapped target properties: matching, moreTarget">update</warning>(@MappingTarget Target moreTarget, Source source, String testName, @org.mapstruct.Context String matching);`
	`82`	`+ void <warning descr="Unmapped target property: moreTarget">update</warning>(@MappingTarget Target moreTarget, Source source, String testName, @org.mapstruct.Context String matching);`
`83`	`83`	`}`