From d6ff5204d743795816fa4a343b2ebff8c2b7c15c Mon Sep 17 00:00:00 2001 From: Filip Hrisafov Date: Mon, 13 Apr 2020 20:14:11 +0200 Subject: [PATCH] Accessor#getSimpleName should return a String --- .../ap/internal/model/NestedPropertyMappingMethod.java | 2 +- .../org/mapstruct/ap/internal/model/PropertyMapping.java | 6 +++--- .../java/org/mapstruct/ap/internal/model/common/Type.java | 2 +- .../java/org/mapstruct/ap/internal/util/ValueProvider.java | 2 +- .../ap/internal/util/accessor/AbstractAccessor.java | 5 ++--- .../org/mapstruct/ap/internal/util/accessor/Accessor.java | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java index f698f8345..f5616d127 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java @@ -150,7 +150,7 @@ public class NestedPropertyMappingMethod extends MappingMethod { this.safeName = safeName; this.readAccessorName = ValueProvider.of( entry.getReadAccessor() ).getValue(); if ( entry.getPresenceChecker() != null ) { - this.presenceCheckerName = entry.getPresenceChecker().getSimpleName().toString(); + this.presenceCheckerName = entry.getPresenceChecker().getSimpleName(); } else { this.presenceCheckerName = null; diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java b/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java index 24facce72..1558fc7f8 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java @@ -273,7 +273,7 @@ public class PropertyMapping extends ModelElement { return new PropertyMapping( targetPropertyName, rightHandSide.getSourceParameterName(), - targetWriteAccessor.getSimpleName().toString(), + targetWriteAccessor.getSimpleName(), ValueProvider.of( targetReadAccessor ), targetType, assignment, @@ -869,7 +869,7 @@ public class PropertyMapping extends ModelElement { return new PropertyMapping( targetPropertyName, - targetWriteAccessor.getSimpleName().toString(), + targetWriteAccessor.getSimpleName(), ValueProvider.of( targetReadAccessor ), targetType, assignment, @@ -934,7 +934,7 @@ public class PropertyMapping extends ModelElement { return new PropertyMapping( targetPropertyName, - targetWriteAccessor.getSimpleName().toString(), + targetWriteAccessor.getSimpleName(), ValueProvider.of( targetReadAccessor ), targetType, assignment, diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java index 6f3a7b79c..52a076270 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java @@ -488,7 +488,7 @@ public class Type extends ModelElement implements Comparable { if ( modifiableGetters.containsKey( propertyName ) ) { // In the DefaultAccessorNamingStrategy, this can only be the case for Booleans: isFoo() and // getFoo(); The latter is preferred. - if ( !getter.getSimpleName().toString().startsWith( "is" ) ) { + if ( !getter.getSimpleName().startsWith( "is" ) ) { modifiableGetters.put( propertyName, getter ); } diff --git a/processor/src/main/java/org/mapstruct/ap/internal/util/ValueProvider.java b/processor/src/main/java/org/mapstruct/ap/internal/util/ValueProvider.java index 31a3a9c6c..0f64c2b37 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/util/ValueProvider.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/ValueProvider.java @@ -45,7 +45,7 @@ public class ValueProvider { if ( accessor == null ) { return null; } - String value = accessor.getSimpleName().toString(); + String value = accessor.getSimpleName(); if ( accessor.getAccessorType() != AccessorType.FIELD ) { value += "()"; } diff --git a/processor/src/main/java/org/mapstruct/ap/internal/util/accessor/AbstractAccessor.java b/processor/src/main/java/org/mapstruct/ap/internal/util/accessor/AbstractAccessor.java index 5a16e45fa..04c4c9999 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/util/accessor/AbstractAccessor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/accessor/AbstractAccessor.java @@ -9,7 +9,6 @@ import java.util.Set; import javax.lang.model.element.Element; 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. @@ -25,8 +24,8 @@ abstract class AbstractAccessor implements Accessor { } @Override - public Name getSimpleName() { - return element.getSimpleName(); + public String getSimpleName() { + return element.getSimpleName().toString(); } @Override diff --git a/processor/src/main/java/org/mapstruct/ap/internal/util/accessor/Accessor.java b/processor/src/main/java/org/mapstruct/ap/internal/util/accessor/Accessor.java index f9dd435d5..917d1a216 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/util/accessor/Accessor.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/util/accessor/Accessor.java @@ -33,7 +33,7 @@ public interface Accessor { /** * @return the simple name of the accessor */ - Name getSimpleName(); + String getSimpleName(); /** * @return the set of modifiers that the accessor has