Skip to content

#2515 Added ambiguous constructors to ambiguous constructor error mes… #2516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filiphr merged 4 commits into from
Aug 14, 2021
Merged

#2515 Added ambiguous constructors to ambiguous constructor error mes… #2516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04c9172
#2515 Added ambiguous constructors to ambiguous constructor error mes…
basclaessen Jul 14, 2021
f5a6cbb
#2515 Changed constructors to string conversion
basclaessen Jul 15, 2021
cf0b78a
#2515 Reverted change of test method name
basclaessen Jul 15, 2021
1768651
Add space after the comma delimiter
filiphr Aug 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.VariableElement;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.ElementFilter;
Expand Down Expand Up @@ -699,7 +700,14 @@ private ConstructorAccessor getConstructorAccessor(Type type) {
method.getExecutable(),
GENERAL_AMBIGUOUS_CONSTRUCTORS,
type,
Strings.join( constructors, ", " )
constructors.stream()
.map( ExecutableElement::getParameters )
.map( ps -> ps.stream()
.map( VariableElement::asType )
.map( String::valueOf )
.collect( Collectors.joining( ", ", type.getName() + "(", ")" ) )
)
.collect( Collectors.joining( ", " ) )
);
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion processor/src/main/java/org/mapstruct/ap/internal/util/Message.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public enum Message {
GENERAL_AMBIGUOUS_MAPPING_METHOD( "Ambiguous mapping methods found for mapping %s to %s: %s. See " + FAQ_AMBIGUOUS_URL + " for more info." ),
GENERAL_AMBIGUOUS_FACTORY_METHOD( "Ambiguous factory methods found for creating %s: %s. See " + FAQ_AMBIGUOUS_URL + " for more info." ),
GENERAL_AMBIGUOUS_PRESENCE_CHECK_METHOD( "Ambiguous presence check methods found for checking %s: %s. See " + FAQ_AMBIGUOUS_URL + " for more info." ),
GENERAL_AMBIGUOUS_CONSTRUCTORS( "Ambiguous constructors found for creating %s. Either declare parameterless constructor or annotate the default constructor with an annotation named @Default." ),
GENERAL_AMBIGUOUS_CONSTRUCTORS( "Ambiguous constructors found for creating %s: %s. Either declare parameterless constructor or annotate the default constructor with an annotation named @Default." ),
GENERAL_CONSTRUCTOR_PROPERTIES_NOT_MATCHING_PARAMETERS( "Incorrect @ConstructorProperties for %s. The size of the @ConstructorProperties does not match the number of constructor parameters" ),
GENERAL_UNSUPPORTED_DATE_FORMAT_CHECK( "No dateFormat check is supported for types %s, %s" ),
GENERAL_VALID_DATE( "Given date format \"%s\" is valid.", Diagnostic.Kind.NOTE ),
Expand Down
6 changes: 4 additions & 2 deletions ...r/src/test/java/org/mapstruct/ap/test/constructor/erroneous/ErroneousConstructorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ public class ErroneousConstructorTest {
kind = javax.tools.Diagnostic.Kind.ERROR,
line = 17,
message = "Ambiguous constructors found for creating org.mapstruct.ap.test.constructor.erroneous" +
".ErroneousAmbiguousConstructorsMapper.PersonWithMultipleConstructors. Either declare parameterless " +
"constructor or annotate the default constructor with an annotation named @Default."
".ErroneousAmbiguousConstructorsMapper.PersonWithMultipleConstructors: " +
"PersonWithMultipleConstructors(java.lang.String), " +
"PersonWithMultipleConstructors(java.lang.String, int). Either declare parameterless constructor " +
"or annotate the default constructor with an annotation named @Default."
)
})
public void shouldUseMultipleConstructors() {
Expand Down