diff --git a/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolverImpl.java b/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolverImpl.java index 5401049ff..1cf6b92ad 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolverImpl.java +++ b/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolverImpl.java @@ -426,8 +426,7 @@ public class MappingResolverImpl implements MappingResolver { if ( candidates.size() > 1 ) { String errorMsg = String.format( - "Ambiguous mapping methods found for mapping " + mappedElement + " from %s to %s: %s.", - sourceType, + "Ambiguous mapping methods found for mapping " + mappedElement + " to %s: %s.", returnType, Strings.join( candidates, ", " ) ); diff --git a/processor/src/test/java/org/mapstruct/ap/test/inheritance/complex/ComplexInheritanceTest.java b/processor/src/test/java/org/mapstruct/ap/test/inheritance/complex/ComplexInheritanceTest.java index 56e41039a..be333cd7f 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/inheritance/complex/ComplexInheritanceTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/inheritance/complex/ComplexInheritanceTest.java @@ -84,7 +84,7 @@ public class ComplexInheritanceTest { line = 32, messageRegExp = "Ambiguous mapping methods found for mapping property " - + "\"org.mapstruct.ap.test.inheritance.complex.SourceExt prop1\" from .*SourceExt to .*Reference: " + + "\"org.mapstruct.ap.test.inheritance.complex.SourceExt prop1\" to .*Reference: " + ".*Reference .*AdditionalMappingHelper\\.asReference\\(.*SourceBase source\\), " + ".*Reference .*AdditionalMappingHelper\\.asReference\\(.*AdditionalFooSource source\\)")) public void ambiguousMappingMethodsReportError() { diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/QualifierTest.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/QualifierTest.java index 351ff660f..e262049b5 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/QualifierTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/QualifierTest.java @@ -110,7 +110,7 @@ public class QualifierTest { kind = Kind.ERROR, line = 42, messageRegExp = "Ambiguous mapping methods found for mapping property " - + "\"java.lang.String title\" from java.lang.String to java.lang.String.*" ) + + "\"java.lang.String title\" to java.lang.String.*" ) } ) public void shouldNotProduceMatchingMethod() {