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

#227 small improvement, removing constructor argument from GetterCollectionOrMapWrapper

Browse Source
This commit is contained in:
sjaakd 2014-06-22 20:54:39 +02:00
parent 5afc627735
commit 6eed953fdf
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
processor/src/main/java/org/mapstruct/ap/model/assignment/GetterCollectionOrMapWrapper.java
View File

@ -35,15 +35,9 @@ import org.mapstruct.ap.model.Assignment;
*/ */
public class GetterCollectionOrMapWrapper extends AssignmentWrapper { public class GetterCollectionOrMapWrapper extends AssignmentWrapper {
private final String targetGetterName;
public GetterCollectionOrMapWrapper( Assignment decoratedAssignment, String targetGetterName ) { public GetterCollectionOrMapWrapper( Assignment decoratedAssignment ) {
super( decoratedAssignment ); super( decoratedAssignment );
this.targetGetterName = targetGetterName;
}
public String getTargetGetterName() {
return targetGetterName;
} }
} }

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

@ -779,10 +779,7 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
} }
else { else {
// target accessor is getter, so decorate assignment as getter // target accessor is getter, so decorate assignment as getter
assignment = new GetterCollectionOrMapWrapper( assignment = new GetterCollectionOrMapWrapper( assignment );
assignment,
targetAccessor.getSimpleName().toString()
);
} }
// For collections and maps include a null check, when the assignment type is DIRECT. // For collections and maps include a null check, when the assignment type is DIRECT.

8
processor/src/main/resources/org.mapstruct.ap.model.assignment.GetterCollectionOrMapWrapper.ftl
View File

@ -18,23 +18,23 @@
limitations under the License. limitations under the License.
--> -->
if ( ${ext.targetBeanName}.${targetGetterName}() != null ) { if ( ${ext.targetBeanName}.${ext.targetAccessorName}() != null ) {
<#if ext.existingInstanceMapping> <#if ext.existingInstanceMapping>
${ext.targetBeanName}.${targetGetterName}().clear(); ${ext.targetBeanName}.${ext.targetAccessorName}().clear();
</#if> </#if>
<#if ext.targetType.collectionType> <#if ext.targetType.collectionType>
<@includeModel object=assignment <@includeModel object=assignment
targetBeanName=ext.targetBeanName targetBeanName=ext.targetBeanName
raw=ext.raw raw=ext.raw
existingInstanceMapping=ext.existingInstanceMapping existingInstanceMapping=ext.existingInstanceMapping
targetAccessorName="${targetGetterName}().addAll" targetAccessorName="${ext.targetAccessorName}().addAll"
targetType=ext.targetType/> targetType=ext.targetType/>
<#else> <#else>
<@includeModel object=assignment <@includeModel object=assignment
targetBeanName=ext.targetBeanName targetBeanName=ext.targetBeanName
raw=ext.raw raw=ext.raw
existingInstanceMapping=ext.existingInstanceMapping existingInstanceMapping=ext.existingInstanceMapping
targetAccessorName="${targetGetterName}().putAll" targetAccessorName="${ext.targetAccessorName}().putAll"
targetType=ext.targetType/> targetType=ext.targetType/>
</#if> </#if>
} }