From 29008e12bf4d8f5c2136f8ab3cb6aec8547d3325 Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Sun, 7 Nov 2021 09:14:13 +0100
Subject: [PATCH] #2005 Parameter type should only be checked if we are mapping
 from a single argument source

---
 .../processor/MethodRetrievalProcessor.java   | 54 ++++++++++---------
 .../test/multisource/MultiSourceMapper.java   | 46 ++++++++++++++++
 .../multisource/MultiSourceMapperTest.java    | 45 ++++++++++++++++
 3 files changed, 119 insertions(+), 26 deletions(-)
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/multisource/MultiSourceMapper.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/multisource/MultiSourceMapperTest.java

diff --git a/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java
index 9bf55e731..b226c1a05 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java
@@ -512,11 +512,35 @@ public class MethodRetrievalProcessor implements ModelElementProcessor<Void, Lis
                 return false;
         }
 
-        Type parameterType = sourceParameters.get( 0 ).getType();
+        if ( sourceParameters.size() == 1 ) {
+            Type parameterType = sourceParameters.get( 0 ).getType();
 
-        if ( isStreamTypeOrIterableFromJavaStdLib( parameterType ) && !resultType.isIterableOrStreamType() ) {
-            messager.printMessage( method, Message.RETRIEVAL_ITERABLE_TO_NON_ITERABLE );
-            return false;
+            if ( isStreamTypeOrIterableFromJavaStdLib( parameterType ) && !resultType.isIterableOrStreamType() ) {
+                messager.printMessage( method, Message.RETRIEVAL_ITERABLE_TO_NON_ITERABLE );
+                return false;
+            }
+
+            if ( !parameterType.isIterableOrStreamType() && isStreamTypeOrIterableFromJavaStdLib( resultType ) ) {
+                messager.printMessage( method, Message.RETRIEVAL_NON_ITERABLE_TO_ITERABLE );
+                return false;
+            }
+
+            if ( parameterType.isPrimitive() ) {
+                messager.printMessage( method, Message.RETRIEVAL_PRIMITIVE_PARAMETER );
+                return false;
+            }
+
+            for ( Type typeParameter : parameterType.getTypeParameters() ) {
+                if ( typeParameter.hasSuperBound() ) {
+                    messager.printMessage( method, Message.RETRIEVAL_WILDCARD_SUPER_BOUND_SOURCE );
+                    return false;
+                }
+
+                if ( typeParameter.isTypeVar() ) {
+                    messager.printMessage( method, Message.RETRIEVAL_TYPE_VAR_SOURCE );
+                    return false;
+                }
+            }
         }
 
         if ( containsTargetTypeParameter ) {
@@ -524,16 +548,6 @@ public class MethodRetrievalProcessor implements ModelElementProcessor<Void, Lis
             return false;
         }
 
-        if ( !parameterType.isIterableOrStreamType() && isStreamTypeOrIterableFromJavaStdLib( resultType ) ) {
-            messager.printMessage( method, Message.RETRIEVAL_NON_ITERABLE_TO_ITERABLE );
-            return false;
-        }
-
-        if ( parameterType.isPrimitive() ) {
-            messager.printMessage( method, Message.RETRIEVAL_PRIMITIVE_PARAMETER );
-            return false;
-        }
-
         if ( resultType.isPrimitive() ) {
             messager.printMessage( method, Message.RETRIEVAL_PRIMITIVE_RETURN );
             return false;
@@ -550,18 +564,6 @@ public class MethodRetrievalProcessor implements ModelElementProcessor<Void, Lis
             }
         }
 
-        for ( Type typeParameter : parameterType.getTypeParameters() ) {
-            if ( typeParameter.hasSuperBound() ) {
-                messager.printMessage( method, Message.RETRIEVAL_WILDCARD_SUPER_BOUND_SOURCE );
-                return false;
-            }
-
-            if ( typeParameter.isTypeVar() ) {
-                messager.printMessage( method, Message.RETRIEVAL_TYPE_VAR_SOURCE );
-                return false;
-            }
-        }
-
         return true;
     }
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/multisource/MultiSourceMapper.java b/processor/src/test/java/org/mapstruct/ap/test/multisource/MultiSourceMapper.java
new file mode 100644
index 000000000..51ee99761
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/multisource/MultiSourceMapper.java
@@ -0,0 +1,46 @@
+/*
+ * 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.multisource;
+
+import java.util.Collection;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author Filip Hrisafov
+ */
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface MultiSourceMapper {
+
+    MultiSourceMapper INSTANCE = Mappers.getMapper( MultiSourceMapper.class );
+
+    Target mapFromPrimitiveAndCollection(int value, Collection<String> elements);
+
+    Target mapFromCollectionAndPrimitive(Collection<String> elements, int value);
+
+    class Target {
+        private int value;
+        private Collection<String> elements;
+
+        public int getValue() {
+            return value;
+        }
+
+        public void setValue(int value) {
+            this.value = value;
+        }
+
+        public Collection<String> getElements() {
+            return elements;
+        }
+
+        public void setElements(Collection<String> elements) {
+            this.elements = elements;
+        }
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/multisource/MultiSourceMapperTest.java b/processor/src/test/java/org/mapstruct/ap/test/multisource/MultiSourceMapperTest.java
new file mode 100644
index 000000000..c4e1eaaee
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/multisource/MultiSourceMapperTest.java
@@ -0,0 +1,45 @@
+/*
+ * 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.multisource;
+
+import java.util.Collections;
+
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.ProcessorTest;
+import org.mapstruct.ap.testutil.WithClasses;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class MultiSourceMapperTest {
+
+    @IssueKey("2005")
+    @ProcessorTest
+    @WithClasses({
+        MultiSourceMapper.class
+    })
+    void shouldBeAbleToMapFromPrimitiveAndCollectionAsMultiSource() {
+        MultiSourceMapper.Target target = MultiSourceMapper.INSTANCE.mapFromPrimitiveAndCollection(
+            10,
+            Collections.singleton( "test" )
+        );
+
+        assertThat( target ).isNotNull();
+        assertThat( target.getValue() ).isEqualTo( 10 );
+        assertThat( target.getElements() ).containsExactly( "test" );
+
+        target = MultiSourceMapper.INSTANCE.mapFromCollectionAndPrimitive(
+            Collections.singleton( "otherTest" ),
+            20
+        );
+
+        assertThat( target ).isNotNull();
+        assertThat( target.getValue() ).isEqualTo( 20 );
+        assertThat( target.getElements() ).containsExactly( "otherTest" );
+    }
+}