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

#302 Formatting

Browse Source
This commit is contained in:
Gunnar Morling 2014-10-12 18:24:17 +02:00
parent 9adbb423c6
commit a5dc5d78ab
5 changed files with 282 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java
View File

@ -27,8 +27,8 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.ExecutableElement;
import javax.tools.Diagnostic; import javax.tools.Diagnostic;
import org.mapstruct.CollectionMappingStrategy;
import org.mapstruct.CollectionMappingStrategy;
import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Parameter;
import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.common.Type;
import org.mapstruct.ap.model.source.Mapping; import org.mapstruct.ap.model.source.Mapping;
@ -64,7 +64,7 @@ public class BeanMappingMethod extends MappingMethod {
return this; return this;
} }
public Builder souceMethod( SourceMethod sourceMethod ) { public Builder souceMethod(SourceMethod sourceMethod) {
this.method = sourceMethod; this.method = sourceMethod;
return this; return this;
} }
@ -339,11 +339,11 @@ public class BeanMappingMethod extends MappingMethod {
return !foundUnmappedProperty; return !foundUnmappedProperty;
} }
private void reportErrorForUnmappedTargetPropertiesIfRequired( SourceMethod method, private void reportErrorForUnmappedTargetPropertiesIfRequired(SourceMethod method,
ReportingPolicy unmappedTargetPolicy, ReportingPolicy unmappedTargetPolicy,
Set<String> targetProperties, Set<String> targetProperties,
Set<String> mappedTargetProperties, Set<String> mappedTargetProperties,
Set<String> ignoredTargetProperties ) { Set<String> ignoredTargetProperties) {
Set<String> unmappedTargetProperties = new HashSet<String>(); Set<String> unmappedTargetProperties = new HashSet<String>();
@ -366,7 +366,7 @@ public class BeanMappingMethod extends MappingMethod {
} }
} }
private boolean hasSourceProperty( String propertyName ) { private boolean hasSourceProperty(String propertyName) {
for ( Parameter parameter : method.getSourceParameters() ) { for ( Parameter parameter : method.getSourceParameters() ) {
if ( hasSourceProperty( parameter, propertyName ) ) { if ( hasSourceProperty( parameter, propertyName ) ) {
return true; return true;
@ -376,7 +376,7 @@ public class BeanMappingMethod extends MappingMethod {
return false; return false;
} }
private boolean hasSourceProperty( Parameter parameter, String propertyName ) { private boolean hasSourceProperty(Parameter parameter, String propertyName) {
List<ExecutableElement> getters = parameter.getType().getGetters(); List<ExecutableElement> getters = parameter.getType().getGetters();
return Executables.getPropertyNames( getters ).contains( propertyName ); return Executables.getPropertyNames( getters ).contains( propertyName );
} }

18
processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java
View File

@ -18,11 +18,12 @@
*/ */
package org.mapstruct.ap.model; package org.mapstruct.ap.model;
import org.mapstruct.ap.model.assignment.Assignment;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import javax.lang.model.type.TypeMirror; import javax.lang.model.type.TypeMirror;
import javax.tools.Diagnostic; import javax.tools.Diagnostic;
import org.mapstruct.ap.model.assignment.Assignment;
import org.mapstruct.ap.model.assignment.SetterWrapper; import org.mapstruct.ap.model.assignment.SetterWrapper;
import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Parameter;
import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.common.Type;
@ -48,27 +49,27 @@ public class IterableMappingMethod extends MappingMethod {
private String dateFormat; private String dateFormat;
private List<TypeMirror> qualifiers; private List<TypeMirror> qualifiers;
public Builder mappingContext( MappingContext mappingContext ) { public Builder mappingContext(MappingContext mappingContext) {
this.ctx = mappingContext; this.ctx = mappingContext;
return this; return this;
} }
public Builder method( Method sourceMethod ) { public Builder method(Method sourceMethod) {
this.method = sourceMethod; this.method = sourceMethod;
return this; return this;
} }
public Builder dateFormat( String dateFormat ) { public Builder dateFormat(String dateFormat) {
this.dateFormat = dateFormat; this.dateFormat = dateFormat;
return this; return this;
} }
public Builder qualifiers( List<TypeMirror> qualifiers ) { public Builder qualifiers(List<TypeMirror> qualifiers) {
this.qualifiers = qualifiers; this.qualifiers = qualifiers;
return this; return this;
} }
public IterableMappingMethod build( ) { public IterableMappingMethod build() {
Type sourceElementType = Type sourceElementType =
method.getSourceParameters().iterator().next().getType().getTypeParameters().get( 0 ); method.getSourceParameters().iterator().next().getType().getTypeParameters().get( 0 );
Type targetElementType = Type targetElementType =
@ -77,7 +78,8 @@ public class IterableMappingMethod extends MappingMethod {
Strings.getSaveVariableName( sourceElementType.getName(), method.getParameterNames() ); Strings.getSaveVariableName( sourceElementType.getName(), method.getParameterNames() );
Assignment assignment = ctx.getMappingResolver().getTargetAssignment( method, Assignment assignment = ctx.getMappingResolver().getTargetAssignment(
method,
"collection element", "collection element",
sourceElementType, sourceElementType,
targetElementType, targetElementType,
@ -177,7 +179,7 @@ public class IterableMappingMethod extends MappingMethod {
return false; return false;
} }
for (int i = 0; i < getSourceParameters().size(); i++ ) { for ( int i = 0; i < getSourceParameters().size(); i++ ) {
if ( !getSourceParameters().get( i ).getType().getTypeParameters().get( 0 ) if ( !getSourceParameters().get( i ).getType().getTypeParameters().get( 0 )
.equals( other.getSourceParameters().get( i ).getType().getTypeParameters().get( 0 ) ) ) { .equals( other.getSourceParameters().get( i ).getType().getTypeParameters().get( 0 ) ) ) {
return false; return false;

35
processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java
View File

@ -18,11 +18,12 @@
*/ */
package org.mapstruct.ap.model; package org.mapstruct.ap.model;
import org.mapstruct.ap.model.assignment.Assignment;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import javax.lang.model.type.TypeMirror; import javax.lang.model.type.TypeMirror;
import javax.tools.Diagnostic; import javax.tools.Diagnostic;
import org.mapstruct.ap.model.assignment.Assignment;
import org.mapstruct.ap.model.assignment.LocalVarWrapper; import org.mapstruct.ap.model.assignment.LocalVarWrapper;
import org.mapstruct.ap.model.common.Parameter; import org.mapstruct.ap.model.common.Parameter;
import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.common.Type;
@ -51,32 +52,32 @@ public class MapMappingMethod extends MappingMethod {
private Method method; private Method method;
private MappingContext ctx; private MappingContext ctx;
public Builder mappingContext( MappingContext mappingContext ) { public Builder mappingContext(MappingContext mappingContext) {
this.ctx = mappingContext; this.ctx = mappingContext;
return this; return this;
} }
public Builder method( Method sourceMethod ) { public Builder method(Method sourceMethod) {
this.method = sourceMethod; this.method = sourceMethod;
return this; return this;
} }
public Builder keyDateFormat( String keyDateFormat ) { public Builder keyDateFormat(String keyDateFormat) {
this.keyDateFormat = keyDateFormat; this.keyDateFormat = keyDateFormat;
return this; return this;
} }
public Builder valueDateFormat( String valueDateFormat ) { public Builder valueDateFormat(String valueDateFormat) {
this.valueDateFormat = valueDateFormat; this.valueDateFormat = valueDateFormat;
return this; return this;
} }
public Builder keyQualifiers( List<TypeMirror> keyQualifiers ) { public Builder keyQualifiers(List<TypeMirror> keyQualifiers) {
this.keyQualifiers = keyQualifiers; this.keyQualifiers = keyQualifiers;
return this; return this;
} }
public Builder valueQualifiers( List<TypeMirror> valueQualifiers ) { public Builder valueQualifiers(List<TypeMirror> valueQualifiers) {
this.valueQualifiers = valueQualifiers; this.valueQualifiers = valueQualifiers;
return this; return this;
} }
@ -90,7 +91,8 @@ public class MapMappingMethod extends MappingMethod {
Type keySourceType = sourceTypeParams.get( 0 ); Type keySourceType = sourceTypeParams.get( 0 );
Type keyTargetType = resultTypeParams.get( 0 ); Type keyTargetType = resultTypeParams.get( 0 );
Assignment keyAssignment = ctx.getMappingResolver().getTargetAssignment( method, Assignment keyAssignment = ctx.getMappingResolver().getTargetAssignment(
method,
"map key", "map key",
keySourceType, keySourceType,
keyTargetType, keyTargetType,
@ -101,8 +103,10 @@ public class MapMappingMethod extends MappingMethod {
); );
if ( keyAssignment == null ) { if ( keyAssignment == null ) {
String message = String.format( "Can't create implementation of method %s. Found no method nor " String message = String.format(
+ "built-in conversion for mapping source key type to target key type.", method ); "Can't create implementation of method %s. Found no method nor "
+ "built-in conversion for mapping source key type to target key type.", method
);
method.printMessage( ctx.getMessager(), Diagnostic.Kind.ERROR, message ); method.printMessage( ctx.getMessager(), Diagnostic.Kind.ERROR, message );
} }
@ -110,7 +114,8 @@ public class MapMappingMethod extends MappingMethod {
Type valueSourceType = sourceTypeParams.get( 1 ); Type valueSourceType = sourceTypeParams.get( 1 );
Type valueTargetType = resultTypeParams.get( 1 ); Type valueTargetType = resultTypeParams.get( 1 );
Assignment valueAssignment = ctx.getMappingResolver().getTargetAssignment( method, Assignment valueAssignment = ctx.getMappingResolver().getTargetAssignment(
method,
"map value", "map value",
valueSourceType, valueSourceType,
valueTargetType, valueTargetType,
@ -121,8 +126,10 @@ public class MapMappingMethod extends MappingMethod {
); );
if ( valueAssignment == null ) { if ( valueAssignment == null ) {
String message = String.format( "Can't create implementation of method %s. Found no method nor " String message = String.format(
+ "built-in conversion for mapping source value type to target value type.", method ); "Can't create implementation of method %s. Found no method nor "
+ "built-in conversion for mapping source value type to target value type.", method
);
method.printMessage( ctx.getMessager(), Diagnostic.Kind.ERROR, message ); method.printMessage( ctx.getMessager(), Diagnostic.Kind.ERROR, message );
} }
@ -232,7 +239,7 @@ public class MapMappingMethod extends MappingMethod {
return false; return false;
} }
for (int i = 0; i < getSourceParameters().size(); i++ ) { for ( int i = 0; i < getSourceParameters().size(); i++ ) {
if ( !getSourceParameters().get( i ).getType().getTypeParameters().get( 0 ) if ( !getSourceParameters().get( i ).getType().getTypeParameters().get( 0 )
.equals( other.getSourceParameters().get( i ).getType().getTypeParameters().get( 0 ) ) ) { .equals( other.getSourceParameters().get( i ).getType().getTypeParameters().get( 0 ) ) ) {
return false; return false;

18
processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java
View File

@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.TreeSet; import java.util.TreeSet;
import javax.annotation.processing.Messager; import javax.annotation.processing.Messager;
import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement; import javax.lang.model.element.TypeElement;
@ -88,7 +87,14 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
typeUtils, typeUtils,
messager, messager,
options, options,
new MappingResolverImpl( context.getMessager(), elementUtils, typeUtils, typeFactory, sourceModel, mapperReferences ), new MappingResolverImpl(
context.getMessager(),
elementUtils,
typeUtils,
typeFactory,
sourceModel,
mapperReferences
),
mapperTypeElement, mapperTypeElement,
sourceModel, sourceModel,
mapperReferences mapperReferences
@ -232,7 +238,7 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
return extraImports; return extraImports;
} }
private List<MappingMethod> getMappingMethods(List<SourceMethod> methods ) { private List<MappingMethod> getMappingMethods(List<SourceMethod> methods) {
List<MappingMethod> mappingMethods = new ArrayList<MappingMethod>(); List<MappingMethod> mappingMethods = new ArrayList<MappingMethod>();
for ( SourceMethod method : methods ) { for ( SourceMethod method : methods ) {
@ -245,7 +251,7 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
boolean hasFactoryMethod = false; boolean hasFactoryMethod = false;
if ( method.isIterableMapping() ) { if ( method.isIterableMapping() ) {
IterableMappingMethod.Builder builder = new IterableMappingMethod.Builder( ); IterableMappingMethod.Builder builder = new IterableMappingMethod.Builder();
if ( method.getIterableMapping() == null && reverseMappingMethod != null && if ( method.getIterableMapping() == null && reverseMappingMethod != null &&
reverseMappingMethod.getIterableMapping() != null ) { reverseMappingMethod.getIterableMapping() != null ) {
method.setIterableMapping( reverseMappingMethod.getIterableMapping() ); method.setIterableMapping( reverseMappingMethod.getIterableMapping() );
@ -270,7 +276,7 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
} }
else if ( method.isMapMapping() ) { else if ( method.isMapMapping() ) {
MapMappingMethod.Builder builder = new MapMappingMethod.Builder( ); MapMappingMethod.Builder builder = new MapMappingMethod.Builder();
if ( method.getMapMapping() == null && reverseMappingMethod != null && if ( method.getMapMapping() == null && reverseMappingMethod != null &&
reverseMappingMethod.getMapMapping() != null ) { reverseMappingMethod.getMapMapping() != null ) {
@ -320,7 +326,7 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
} }
else { else {
BeanMappingMethod.Builder builder = new BeanMappingMethod.Builder( ); BeanMappingMethod.Builder builder = new BeanMappingMethod.Builder();
if ( method.getMappings().isEmpty() ) { if ( method.getMappings().isEmpty() ) {
if ( reverseMappingMethod != null && !reverseMappingMethod.getMappings().isEmpty() ) { if ( reverseMappingMethod != null && !reverseMappingMethod.getMappings().isEmpty() ) {

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

@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import javax.annotation.processing.Messager; import javax.annotation.processing.Messager;
import javax.lang.model.type.TypeMirror; import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.Elements; import javax.lang.model.util.Elements;
@ -74,7 +73,8 @@ public class MappingResolverImpl implements MappingResolver {
*/ */
private final Set<VirtualMappingMethod> usedVirtualMappings = new HashSet<VirtualMappingMethod>(); private final Set<VirtualMappingMethod> usedVirtualMappings = new HashSet<VirtualMappingMethod>();
public MappingResolverImpl(Messager messager, Elements elementUtils, Types typeUtils, TypeFactory typeFactory, List<SourceMethod> sourceModel, List<MapperReference> mapperReferences) { public MappingResolverImpl(Messager messager, Elements elementUtils, Types typeUtils, TypeFactory typeFactory,
List<SourceMethod> sourceModel, List<MapperReference> mapperReferences) {
this.messager = messager; this.messager = messager;
this.typeUtils = typeUtils; this.typeUtils = typeUtils;
this.typeFactory = typeFactory; this.typeFactory = typeFactory;
@ -120,9 +120,10 @@ public class MappingResolverImpl implements MappingResolver {
String targetPropertyName, String targetPropertyName,
String dateFormat, String dateFormat,
List<TypeMirror> qualifiers, List<TypeMirror> qualifiers,
String sourceReference ) { String sourceReference) {
ResolvingAttempt attempt = new ResolvingAttempt( sourceModel, ResolvingAttempt attempt = new ResolvingAttempt(
sourceModel,
mapperReferences, mapperReferences,
mappingMethod, mappingMethod,
mappedElement, mappedElement,
@ -155,14 +156,14 @@ public class MappingResolverImpl implements MappingResolver {
// so this set must be cleared. // so this set must be cleared.
private final Set<VirtualMappingMethod> virtualMethodCandidates; private final Set<VirtualMappingMethod> virtualMethodCandidates;
private ResolvingAttempt( List<SourceMethod> sourceModel, private ResolvingAttempt(List<SourceMethod> sourceModel,
List<MapperReference> mapperReferences, List<MapperReference> mapperReferences,
Method mappingMethod, Method mappingMethod,
String mappedElement, String mappedElement,
String targetPropertyName, String targetPropertyName,
String dateFormat, String dateFormat,
List<TypeMirror> qualifiers, List<TypeMirror> qualifiers,
String sourceReference ) { String sourceReference) {
this.mappingMethod = mappingMethod; this.mappingMethod = mappingMethod;
this.mappedElement = mappedElement; this.mappedElement = mappedElement;
this.methods = sourceModel; this.methods = sourceModel;
@ -173,7 +174,7 @@ public class MappingResolverImpl implements MappingResolver {
this.virtualMethodCandidates = new HashSet<VirtualMappingMethod>(); this.virtualMethodCandidates = new HashSet<VirtualMappingMethod>();
} }
private Assignment getTargetAssignment( Type sourceType, Type targetType ) { private Assignment getTargetAssignment(Type sourceType, Type targetType) {
// first simple mapping method // first simple mapping method
Assignment referencedMethod = resolveViaMethod( sourceType, targetType ); Assignment referencedMethod = resolveViaMethod( sourceType, targetType );
@ -192,7 +193,7 @@ public class MappingResolverImpl implements MappingResolver {
// then type conversion // then type conversion
Assignment conversion = resolveViaConversion( sourceType, targetType ); Assignment conversion = resolveViaConversion( sourceType, targetType );
if ( conversion != null ) { if ( conversion != null ) {
conversion.setAssignment( AssignmentFactory.createSimple( sourceReference) ); conversion.setAssignment( AssignmentFactory.createSimple( sourceReference ) );
return conversion; return conversion;
} }
@ -221,7 +222,7 @@ public class MappingResolverImpl implements MappingResolver {
return null; return null;
} }
private Assignment resolveViaConversion( Type sourceType, Type targetType ) { private Assignment resolveViaConversion(Type sourceType, Type targetType) {
ConversionProvider conversionProvider = conversions.getConversion( sourceType, targetType ); ConversionProvider conversionProvider = conversions.getConversion( sourceType, targetType );
if ( conversionProvider == null ) { if ( conversionProvider == null ) {
@ -236,9 +237,8 @@ public class MappingResolverImpl implements MappingResolver {
/** /**
* 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.
*
*/ */
private Assignment resolveViaMethod( Type sourceType, Type targetType ) { private Assignment resolveViaMethod(Type sourceType, Type targetType) {
// first try to find a matching source method // first try to find a matching source method
SourceMethod matchingSourceMethod = getBestMatch( methods, sourceType, targetType ); SourceMethod matchingSourceMethod = getBestMatch( methods, sourceType, targetType );
@ -273,7 +273,7 @@ public class MappingResolverImpl implements MappingResolver {
* </ul> * </ul>
* then this method tries to resolve this combination and make a mapping methodY( methodX ( parameter ) ) * then this method tries to resolve this combination and make a mapping methodY( methodX ( parameter ) )
*/ */
private Assignment resolveViaMethodAndMethod( Type sourceType, Type targetType ) { private Assignment resolveViaMethodAndMethod(Type sourceType, Type targetType) {
List<Method> methodYCandidates = new ArrayList<Method>( methods ); List<Method> methodYCandidates = new ArrayList<Method>( methods );
methodYCandidates.addAll( builtInMethods.getBuiltInMethods() ); methodYCandidates.addAll( builtInMethods.getBuiltInMethods() );
@ -288,8 +288,10 @@ public class MappingResolverImpl implements MappingResolver {
// a nested method call can be called. so C = methodY( methodX (A) ) // a nested method call can be called. so C = methodY( methodX (A) )
for ( Method methodYCandidate : methodYCandidates ) { for ( Method methodYCandidate : methodYCandidates ) {
if ( methodYCandidate.getSourceParameters().size() == 1 ) { if ( methodYCandidate.getSourceParameters().size() == 1 ) {
methodRefY = resolveViaMethod( methodYCandidate.getSourceParameters().get( 0 ).getType(), methodRefY = resolveViaMethod(
targetType ); methodYCandidate.getSourceParameters().get( 0 ).getType(),
targetType
);
if ( methodRefY != null ) { if ( methodRefY != null ) {
Assignment methodRefX = resolveViaMethod( Assignment methodRefX = resolveViaMethod(
sourceType, sourceType,
@ -319,7 +321,7 @@ public class MappingResolverImpl implements MappingResolver {
* </ul> * </ul>
* then this method tries to resolve this combination and make a mapping methodY( conversionX ( parameter ) ) * then this method tries to resolve this combination and make a mapping methodY( conversionX ( parameter ) )
*/ */
private Assignment resolveViaConversionAndMethod( Type sourceType, Type targetType ) { private Assignment resolveViaConversionAndMethod(Type sourceType, Type targetType) {
List<Method> methodYCandidates = new ArrayList<Method>( methods ); List<Method> methodYCandidates = new ArrayList<Method>( methods );
methodYCandidates.addAll( builtInMethods.getBuiltInMethods() ); methodYCandidates.addAll( builtInMethods.getBuiltInMethods() );
@ -361,7 +363,7 @@ public class MappingResolverImpl implements MappingResolver {
* </ul> * </ul>
* then this method tries to resolve this combination and make a mapping methodY( conversionX ( parameter ) ) * then this method tries to resolve this combination and make a mapping methodY( conversionX ( parameter ) )
*/ */
private Assignment resolveViaMethodAndConversion( Type sourceType, Type targetType ) { private Assignment resolveViaMethodAndConversion(Type sourceType, Type targetType) {
List<Method> methodXCandidates = new ArrayList<Method>( methods ); List<Method> methodXCandidates = new ArrayList<Method>( methods );
methodXCandidates.addAll( builtInMethods.getBuiltInMethods() ); methodXCandidates.addAll( builtInMethods.getBuiltInMethods() );
@ -393,7 +395,7 @@ public class MappingResolverImpl implements MappingResolver {
return conversionYRef; return conversionYRef;
} }
private <T extends Method> T getBestMatch( List<T> methods, Type sourceType, Type returnType ) { private <T extends Method> T getBestMatch(List<T> methods, Type sourceType, Type returnType) {
List<T> candidates = methodSelectors.getMatchingMethods( List<T> candidates = methodSelectors.getMatchingMethods(
mappingMethod, mappingMethod,
@ -412,7 +414,8 @@ public class MappingResolverImpl implements MappingResolver {
"Ambiguous mapping methods found for mapping " + mappedElement + " from %s to %s: %s.", "Ambiguous mapping methods found for mapping " + mappedElement + " from %s to %s: %s.",
sourceType, sourceType,
returnType, returnType,
Strings.join( candidates, ", " ) ); Strings.join( candidates, ", " )
);
mappingMethod.printMessage( messager, Kind.ERROR, errorMsg ); mappingMethod.printMessage( messager, Kind.ERROR, errorMsg );
} }
@ -424,8 +427,8 @@ public class MappingResolverImpl implements MappingResolver {
return null; return null;
} }
private Assignment getMappingMethodReference( SourceMethod method, private Assignment getMappingMethodReference(SourceMethod method,
Type targetType ) { Type targetType) {
MapperReference mapperReference = findMapperReference( method ); MapperReference mapperReference = findMapperReference( method );
return AssignmentFactory.createMethodReference( return AssignmentFactory.createMethodReference(
@ -435,7 +438,7 @@ public class MappingResolverImpl implements MappingResolver {
); );
} }
private MapperReference findMapperReference( SourceMethod method ) { private MapperReference findMapperReference(SourceMethod method) {
for ( MapperReference ref : mapperReferences ) { for ( MapperReference ref : mapperReferences ) {
if ( ref.getType().equals( method.getDeclaringMapper() ) ) { if ( ref.getType().equals( method.getDeclaringMapper() ) ) {
return ref; return ref;
@ -459,7 +462,7 @@ public class MappingResolverImpl implements MappingResolver {
* *
* @return {@code true} if the specified property can be mapped, {@code false} otherwise. * @return {@code true} if the specified property can be mapped, {@code false} otherwise.
*/ */
private boolean isPropertyMappable( Type sourceType, Type targetType ) { private boolean isPropertyMappable(Type sourceType, Type targetType) {
boolean collectionOrMapTargetTypeHasCompatibleConstructor = false; boolean collectionOrMapTargetTypeHasCompatibleConstructor = false;
if ( sourceType.isCollectionType() && targetType.isCollectionType() ) { if ( sourceType.isCollectionType() && targetType.isCollectionType() ) {
@ -495,7 +498,7 @@ public class MappingResolverImpl implements MappingResolver {
* @return {@code true} if the target type has a constructor accepting the given source type, {@code false} * @return {@code true} if the target type has a constructor accepting the given source type, {@code false}
* otherwise. * otherwise.
*/ */
private boolean collectionTypeHasCompatibleConstructor( Type sourceType, Type targetType ) { private boolean collectionTypeHasCompatibleConstructor(Type sourceType, Type targetType) {
// note (issue #127): actually this should check for the presence of a matching constructor, with help of // note (issue #127): actually this should check for the presence of a matching constructor, with help of
// Types#asMemberOf(); but this method seems to not work correctly in the Eclipse implementation, so instead // Types#asMemberOf(); but this method seems to not work correctly in the Eclipse implementation, so instead
// we just check whether the target type is parameterized in a way that it implicitly should have a // we just check whether the target type is parameterized in a way that it implicitly should have a
@ -521,7 +524,7 @@ public class MappingResolverImpl implements MappingResolver {
* @return {@code true} if the target type has a constructor accepting the given source type, {@code false} * @return {@code true} if the target type has a constructor accepting the given source type, {@code false}
* otherwise. * otherwise.
*/ */
private boolean mapTypeHasCompatibleConstructor( Type sourceType, Type targetType ) { private boolean mapTypeHasCompatibleConstructor(Type sourceType, Type targetType) {
// note (issue #127): actually this should check for the presence of a matching constructor, with help of // note (issue #127): actually this should check for the presence of a matching constructor, with help of
// Types#asMemberOf(); but this method seems to not work correctly in the Eclipse implementation, so instead // Types#asMemberOf(); but this method seems to not work correctly in the Eclipse implementation, so instead
// we just check whether the target type is parameterized in a way that it implicitly should have a // we just check whether the target type is parameterized in a way that it implicitly should have a