#2221: Fix configuration inheritance when there are multiple matching source parameters of the same type

processor/src/main/java/org/mapstruct/ap/internal/model/beanmapping/SourceReference.java

@@ -10,7 +10,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.type.DeclaredType;
@@ -239,11 +238,24 @@ public class SourceReference extends AbstractReference {
             if ( isForwarded ) {
                 Parameter parameter = Parameter.getSourceParameter( templateMethod.getParameters(), parameterName );
                 if ( parameter != null ) {
-                    result = method.getSourceParameters()
+
-                                   .stream()
+                    // When forward inheriting we should find the matching source parameter by type
-                                   .filter( p -> p.getType().isAssignableTo( parameter.getType() ) )
+                    // If there are multiple parameters of the same type
-                                   .collect( Collectors.reducing( (a, b) -> null ) )
+                    // then we fallback to match the parameter name to the current method source parameters
-                                   .orElse( null );
+                    for ( Parameter sourceParameter : method.getSourceParameters() ) {
+                        if ( sourceParameter.getType().isAssignableTo( parameter.getType() ) ) {
+                            if ( result == null ) {
+                                result = sourceParameter;
+                            }
+                            else {
+                                // When we reach here it means that we found a second source parameter
+                                // that has the same type, then fallback to the matching source parameter
+                                // in the current method
+                                result = Parameter.getSourceParameter( method.getParameters(), parameterName );
+                                break;
+                            }
+                        }
+                    }
                 }
             }
             else {

processor/src/test/java/org/mapstruct/ap/test/bugs/_2221/Issue2221Test.java

@@ -0,0 +1,43 @@
+/*
+ * 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._2221;
+
+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("2221")
+@RunWith(AnnotationProcessorTestRunner.class)
+@WithClasses({
+    RestConfig.class,
+    RestSiteDto.class,
+    RestSiteMapper.class,
+    SiteDto.class,
+})
+public class Issue2221Test {
+
+    @Test
+    public void multiSourceInheritConfigurationShouldWork() {
+        SiteDto site = RestSiteMapper.INSTANCE.convert(
+            new RestSiteDto( "restTenant", "restSite", "restCti" ),
+            "parameterTenant",
+            "parameterSite"
+        );
+
+        assertThat( site ).isNotNull();
+        assertThat( site.getTenantId() ).isEqualTo( "parameterTenant" );
+        assertThat( site.getSiteId() ).isEqualTo( "parameterSite" );
+        assertThat( site.getCtiId() ).isEqualTo( "restCti" );
+
+    }
+}

processor/src/test/java/org/mapstruct/ap/test/bugs/_2221/RestConfig.java

@@ -0,0 +1,21 @@
+/*
+ * 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._2221;
+
+import org.mapstruct.MapperConfig;
+import org.mapstruct.Mapping;
+
+/**
+ * @author Filip Hrisafov
+ */
+@MapperConfig
+public interface RestConfig {
+
+    @Mapping(target = "tenantId", source = "tenantId")
+    @Mapping(target = "siteId", source = "siteId")
+    @Mapping(target = "ctiId", source = "source.cti", defaultValue = "unknown")
+    SiteDto convert(RestSiteDto source, String tenantId, String siteId);
+}

processor/src/test/java/org/mapstruct/ap/test/bugs/_2221/RestSiteDto.java

@@ -0,0 +1,34 @@
+/*
+ * 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._2221;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class RestSiteDto {
+
+    private final String tenantId;
+    private final String siteId;
+    private final String cti;
+
+    public RestSiteDto(String tenantId, String siteId, String cti) {
+        this.tenantId = tenantId;
+        this.siteId = siteId;
+        this.cti = cti;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public String getCti() {
+        return cti;
+    }
+}

processor/src/test/java/org/mapstruct/ap/test/bugs/_2221/RestSiteMapper.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._2221;
+
+import org.mapstruct.InheritConfiguration;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author Filip Hrisafov
+ */
+@Mapper(config = RestConfig.class)
+public interface RestSiteMapper {
+
+    RestSiteMapper INSTANCE = Mappers.getMapper( RestSiteMapper.class );
+
+    @InheritConfiguration
+    SiteDto convert(RestSiteDto source, String tenantId, String siteId);
+}

processor/src/test/java/org/mapstruct/ap/test/bugs/_2221/SiteDto.java

@@ -0,0 +1,34 @@
+/*
+ * 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._2221;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class SiteDto {
+
+    private final String tenantId;
+    private final String siteId;
+    private final String ctiId;
+
+    public SiteDto(String tenantId, String siteId, String ctiId) {
+        this.tenantId = tenantId;
+        this.siteId = siteId;
+        this.ctiId = ctiId;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public String getCtiId() {
+        return ctiId;
+    }
+}