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

#941 adapting more logical names for local variables

Browse Source
This commit is contained in:
sjaakd 2016-12-21 19:43:15 +01:00
parent 2fdd392e19
commit 78db48f7cb
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,7 +366,7 @@ public class PropertyMapping extends ModelElement {
Assignment result = rightHandSide; Assignment result = rightHandSide;
if ( result.getSourceType().isCollectionType() ) { if ( result.getSourceType().isCollectionType() ) {
result = new AdderWrapper( result, method.getThrownTypes(), isFieldAssignment() ); result = new AdderWrapper( result, method.getThrownTypes(), isFieldAssignment(), targetPropertyName );
} }
else { else {
// Possibly adding null to a target collection. So should be surrounded by an null check. // Possibly adding null to a target collection. So should be surrounded by an null check.
@ -508,7 +508,7 @@ public class PropertyMapping extends ModelElement {
); );
// create a local variable to which forged method can be assigned. // create a local variable to which forged method can be assigned.
String desiredName = first( sourceReference.getPropertyEntries() ).getName(); String desiredName = last( sourceReference.getPropertyEntries() ).getName();
sourceRhs.setSourceLocalVarName( sourceRhs.createLocalVarName( desiredName ) ); sourceRhs.setSourceLocalVarName( sourceRhs.createLocalVarName( desiredName ) );
return sourceRhs; return sourceRhs;

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

@ -24,6 +24,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import org.mapstruct.ap.internal.model.common.Type; import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.Nouns;
/** /**
* Wraps the assignment in a target setter. * Wraps the assignment in a target setter.
@ -34,10 +35,13 @@ public class AdderWrapper extends AssignmentWrapper {
private final List<Type> thrownTypesToExclude; private final List<Type> thrownTypesToExclude;
public AdderWrapper( Assignment rhs, List<Type> thrownTypesToExclude, boolean fieldAssignment ) { public AdderWrapper( Assignment rhs,
List<Type> thrownTypesToExclude,
boolean fieldAssignment,
String targetPropertyName ) {
super( rhs, fieldAssignment ); super( rhs, fieldAssignment );
this.thrownTypesToExclude = thrownTypesToExclude; this.thrownTypesToExclude = thrownTypesToExclude;
String desiredName = rhs.getSourceType().getTypeParameters().get( 0 ).getName(); String desiredName = Nouns.singularize( targetPropertyName );
rhs.setSourceLocalVarName( rhs.createLocalVarName( desiredName ) ); rhs.setSourceLocalVarName( rhs.createLocalVarName( desiredName ) );
} }