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

Accessor#getSimpleName should return a String

Browse Source
This commit is contained in:
Filip Hrisafov 2020-04-13 20:14:11 +02:00
parent 7c62aec281
commit d6ff5204d7
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,7 @@ public class NestedPropertyMappingMethod extends MappingMethod {
this.safeName = safeName; this.safeName = safeName;
this.readAccessorName = ValueProvider.of( entry.getReadAccessor() ).getValue(); this.readAccessorName = ValueProvider.of( entry.getReadAccessor() ).getValue();
if ( entry.getPresenceChecker() != null ) { if ( entry.getPresenceChecker() != null ) {
this.presenceCheckerName = entry.getPresenceChecker().getSimpleName().toString(); this.presenceCheckerName = entry.getPresenceChecker().getSimpleName();
} }
else { else {
this.presenceCheckerName = null; this.presenceCheckerName = null;

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

@ -273,7 +273,7 @@ public class PropertyMapping extends ModelElement {
return new PropertyMapping( return new PropertyMapping(
targetPropertyName, targetPropertyName,
rightHandSide.getSourceParameterName(), rightHandSide.getSourceParameterName(),
targetWriteAccessor.getSimpleName().toString(), targetWriteAccessor.getSimpleName(),
ValueProvider.of( targetReadAccessor ), ValueProvider.of( targetReadAccessor ),
targetType, targetType,
assignment, assignment,
@ -869,7 +869,7 @@ public class PropertyMapping extends ModelElement {
return new PropertyMapping( return new PropertyMapping(
targetPropertyName, targetPropertyName,
targetWriteAccessor.getSimpleName().toString(), targetWriteAccessor.getSimpleName(),
ValueProvider.of( targetReadAccessor ), ValueProvider.of( targetReadAccessor ),
targetType, targetType,
assignment, assignment,
@ -934,7 +934,7 @@ public class PropertyMapping extends ModelElement {
return new PropertyMapping( return new PropertyMapping(
targetPropertyName, targetPropertyName,
targetWriteAccessor.getSimpleName().toString(), targetWriteAccessor.getSimpleName(),
ValueProvider.of( targetReadAccessor ), ValueProvider.of( targetReadAccessor ),
targetType, targetType,
assignment, assignment,

2
processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java
View File

@ -488,7 +488,7 @@ public class Type extends ModelElement implements Comparable<Type> {
if ( modifiableGetters.containsKey( propertyName ) ) { if ( modifiableGetters.containsKey( propertyName ) ) {
// In the DefaultAccessorNamingStrategy, this can only be the case for Booleans: isFoo() and // In the DefaultAccessorNamingStrategy, this can only be the case for Booleans: isFoo() and
// getFoo(); The latter is preferred. // getFoo(); The latter is preferred.
if ( !getter.getSimpleName().toString().startsWith( "is" ) ) { if ( !getter.getSimpleName().startsWith( "is" ) ) {
modifiableGetters.put( propertyName, getter ); modifiableGetters.put( propertyName, getter );
} }

2
processor/src/main/java/org/mapstruct/ap/internal/util/ValueProvider.java
View File

@ -45,7 +45,7 @@ public class ValueProvider {
if ( accessor == null ) { if ( accessor == null ) {
return null; return null;
} }
String value = accessor.getSimpleName().toString(); String value = accessor.getSimpleName();
if ( accessor.getAccessorType() != AccessorType.FIELD ) { if ( accessor.getAccessorType() != AccessorType.FIELD ) {
value += "()"; value += "()";
} }

5
processor/src/main/java/org/mapstruct/ap/internal/util/accessor/AbstractAccessor.java
View File

@ -9,7 +9,6 @@ import java.util.Set;
import javax.lang.model.element.Element; import javax.lang.model.element.Element;
import javax.lang.model.element.Modifier; import javax.lang.model.element.Modifier;
import javax.lang.model.element.Name;
/** /**
* This is an abstract implementation of an {@link Accessor} that provides the common implementation. * This is an abstract implementation of an {@link Accessor} that provides the common implementation.
@ -25,8 +24,8 @@ abstract class AbstractAccessor<T extends Element> implements Accessor {
} }
@Override @Override
public Name getSimpleName() { public String getSimpleName() {
return element.getSimpleName(); return element.getSimpleName().toString();
} }
@Override @Override

2
processor/src/main/java/org/mapstruct/ap/internal/util/accessor/Accessor.java
View File

@ -33,7 +33,7 @@ public interface Accessor {
/** /**
* @return the simple name of the accessor * @return the simple name of the accessor
*/ */
Name getSimpleName(); String getSimpleName();
/** /**
* @return the set of modifiers that the accessor has * @return the set of modifiers that the accessor has