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

#1057 Towards controlling name based mapping from root @Mapping

Browse Source
This commit is contained in:
sjaakd 2017-02-10 22:21:07 +01:00 committed by Filip Hrisafov
parent bdbee40dcf
commit 6f51cf4a8a
4 changed files with 22 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
processor/src/main/java/org/mapstruct/ap/internal/model/AbstractMappingMethodBuilder.java
View File

@ -68,7 +68,8 @@ public abstract class AbstractMappingMethodBuilder<B extends AbstractMappingMeth
targetType,
shouldUsePropertyNamesInHistory(),
sourceRHS.getSourceErrorMessagePart()
)
),
null
);
return createForgedBeanAssignment( sourceRHS, forgedMethod );

41
processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java
View File

@ -222,6 +222,7 @@ public class PropertyMapping extends ModelElement {
* Force the created mapping to use update methods when forging a method.
*
* @param forceUpdateMethod whether the mapping should force update method for forged mappings
* @return the builder for chaining
*/
public PropertyMappingBuilder forceUpdateMethod(boolean forceUpdateMethod) {
this.forceUpdateMethod = forceUpdateMethod;
@ -585,7 +586,8 @@ public class PropertyMapping extends ModelElement {
element,
method.getContextParameters(),
method.getContextProvidedMethods(),
getForgedMethodHistory( source, suffix )
getForgedMethodHistory( source, suffix ),
null
);
}
@ -627,32 +629,17 @@ public class PropertyMapping extends ModelElement {
else {
returnType = targetType;
}
ForgedMethod forgedMethod;
if ( forgeMethodWithMappingOptions != null ) {
forgedMethod = new ForgedMethod(
name,
sourceType,
returnType,
method.getMapperConfiguration(),
method.getExecutable(),
parameters,
method.getContextProvidedMethods(),
forgeMethodWithMappingOptions
);
}
else {
forgedMethod = new ForgedMethod(
name,
sourceType,
returnType,
method.getMapperConfiguration(),
method.getExecutable(),
parameters,
method.getContextProvidedMethods(),
getForgedMethodHistory( sourceRHS )
);
}
ForgedMethod forgedMethod = new ForgedMethod(
name,
sourceType,
returnType,
method.getMapperConfiguration(),
method.getExecutable(),
parameters,
method.getContextProvidedMethods(),
getForgedMethodHistory( sourceRHS ),
forgeMethodWithMappingOptions
);
return createForgedBeanAssignment( sourceRHS, forgedMethod );
}

72
processor/src/main/java/org/mapstruct/ap/internal/model/source/ForgedMethod.java
View File

@ -49,7 +49,6 @@ public class ForgedMethod implements Method {
private final List<Parameter> contextParameters;
private final Parameter mappingTargetParameter;
private final MappingOptions mappingOptions;
private final boolean autoMapping;
private final ParameterProvidedMethods contextProvidedMethods;
/**
@ -76,66 +75,7 @@ public class ForgedMethod implements Method {
additionalParameters,
parameterProvidedMethods,
null,
false,
MappingOptions.empty() );
}
/**
* Creates a new forged method with the given name with history
*
* @param name the (unique name) for this method
* @param sourceType the source type
* @param returnType the return type.
* @param mapperConfiguration the mapper configuration
* @param positionHintElement element used to for reference to the position in the source file.
* @param additionalParameters additional parameters to add to the forged method
* @param parameterProvidedMethods additional factory/lifecycle methods to consider that are provided by context
* parameters
* @param history a parent forged method if this is a forged method within a forged method
*/
public ForgedMethod(String name, Type sourceType, Type returnType, MapperConfiguration mapperConfiguration,
ExecutableElement positionHintElement, List<Parameter> additionalParameters,
ParameterProvidedMethods parameterProvidedMethods, ForgedMethodHistory history) {
this(
name,
sourceType,
returnType,
mapperConfiguration,
positionHintElement,
additionalParameters,
parameterProvidedMethods,
history,
true,
MappingOptions.empty() );
}
/**
* Creates a new forged method with the given name with mapping options
*
* @param name the (unique name) for this method
* @param sourceType the source type
* @param returnType the return type.
* @param mapperConfiguration the mapper configuration
* @param positionHintElement element used to for reference to the position in the source file.
* @param additionalParameters additional parameters to add to the forged method
* @param parameterProvidedMethods additional factory/lifecycle methods to consider that are provided by context
* parameters
* @param mappingOptions with mapping options
*/
public ForgedMethod(String name, Type sourceType, Type returnType, MapperConfiguration mapperConfiguration,
ExecutableElement positionHintElement, List<Parameter> additionalParameters,
ParameterProvidedMethods parameterProvidedMethods, MappingOptions mappingOptions) {
this(
name,
sourceType,
returnType,
mapperConfiguration,
positionHintElement,
additionalParameters,
parameterProvidedMethods,
null,
false,
mappingOptions );
null );
}
/**
@ -152,10 +92,10 @@ public class ForgedMethod implements Method {
* @param history a parent forged method if this is a forged method within a forged method
* @param mappingOptions the mapping options for this method
*/
private ForgedMethod(String name, Type sourceType, Type returnType, MapperConfiguration mapperConfiguration,
public ForgedMethod(String name, Type sourceType, Type returnType, MapperConfiguration mapperConfiguration,
ExecutableElement positionHintElement, List<Parameter> additionalParameters,
ParameterProvidedMethods parameterProvidedMethods, ForgedMethodHistory history,
boolean autoMapping, MappingOptions mappingOptions) {
MappingOptions mappingOptions) {
String sourceParamName = Strings.decapitalize( sourceType.getName() );
String sourceParamSafeName = Strings.getSaveVariableName( sourceParamName );
@ -174,8 +114,7 @@ public class ForgedMethod implements Method {
this.mapperConfiguration = mapperConfiguration;
this.positionHintElement = positionHintElement;
this.history = history;
this.autoMapping = autoMapping;
this.mappingOptions = mappingOptions;
this.mappingOptions = mappingOptions == null ? MappingOptions.empty() : mappingOptions;
this.mappingOptions.initWithParameter( sourceParameter );
}
@ -191,7 +130,6 @@ public class ForgedMethod implements Method {
this.mapperConfiguration = forgedMethod.mapperConfiguration;
this.positionHintElement = forgedMethod.positionHintElement;
this.history = forgedMethod.history;
this.autoMapping = forgedMethod.autoMapping;
this.sourceParameters = Parameter.getSourceParameters( parameters );
this.contextParameters = Parameter.getContextParameters( parameters );
@ -287,7 +225,7 @@ public class ForgedMethod implements Method {
}
public boolean isAutoMapping() {
return autoMapping;
return mappingOptions.getValueMappings().isEmpty();
}
public void addThrownTypes(List<Type> thrownTypesToAdd) {

2
processor/src/main/java/org/mapstruct/ap/internal/model/source/Mapping.java
View File

@ -249,7 +249,7 @@ public class Mapping {
/**
* Initializes the mapping with a new source parameter.
*
* @param sourceParameter
* @param sourceParameter sets the source parameter that acts as a basis for this mapping
*/
public void init( Parameter sourceParameter ) {
if ( sourceReference != null ) {