third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-12 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#1504 adding position hints for ambiguous mapping methods (#1639)

Browse Source
This commit is contained in:
Sjaak Derksen 2018-11-03 08:57:42 +00:00 committed by GitHub
parent 60611d94cf
commit 1266796921
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
processor/src/main/java/org/mapstruct/ap/internal/processor/creation/MappingResolverImpl.java
View File

@ -198,7 +198,6 @@ public class MappingResolverImpl implements MappingResolver {
if ( sourceType.isLiteral() if ( sourceType.isLiteral()
&& "java.lang.String".equals( sourceType.getFullyQualifiedName( ) ) && "java.lang.String".equals( sourceType.getFullyQualifiedName( ) )
&& targetType.isNative() ) { && targetType.isNative() ) {
// TODO: convey some error message
return null; return null;
} }
@ -273,8 +272,6 @@ public class MappingResolverImpl implements MappingResolver {
return null; return null;
} }
/** /**
* Returns a reference to a method mapping the given source type to the given target type, if such a method * Returns a reference to a method mapping the given source type to the given target type, if such a method
* exists. * exists.
@ -485,6 +482,7 @@ public class MappingResolverImpl implements MappingResolver {
if ( sourceRHS.getSourceErrorMessagePart() != null ) { if ( sourceRHS.getSourceErrorMessagePart() != null ) {
messager.printMessage( mappingMethod.getExecutable(), messager.printMessage( mappingMethod.getExecutable(),
positionHint,
Message.GENERAL_AMBIGIOUS_MAPPING_METHOD, Message.GENERAL_AMBIGIOUS_MAPPING_METHOD,
sourceRHS.getSourceErrorMessagePart(), sourceRHS.getSourceErrorMessagePart(),
returnType, returnType,
@ -493,6 +491,7 @@ public class MappingResolverImpl implements MappingResolver {
} }
else { else {
messager.printMessage( mappingMethod.getExecutable(), messager.printMessage( mappingMethod.getExecutable(),
positionHint,
Message.GENERAL_AMBIGIOUS_FACTORY_METHOD, Message.GENERAL_AMBIGIOUS_FACTORY_METHOD,
returnType, returnType,
Strings.join( candidates, ", " ) Strings.join( candidates, ", " )

2
processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/QualifierTest.java
View File

@ -100,7 +100,7 @@ public class QualifierTest {
diagnostics = { diagnostics = {
@Diagnostic( type = ErroneousMapper.class, @Diagnostic( type = ErroneousMapper.class,
kind = Kind.ERROR, kind = Kind.ERROR,
line = 29, line = 28,
messageRegExp = "Ambiguous mapping methods found for mapping property " messageRegExp = "Ambiguous mapping methods found for mapping property "
+ "\"java.lang.String title\" to java.lang.String.*" ) + "\"java.lang.String title\" to java.lang.String.*" )
} }