Accessor#getSimpleName should return a String

Author: filiphr

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

@@ -150,7 +150,7 @@ public SafePropertyEntry(PropertyEntry entry, String safeName) {
             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;

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

@@ -273,7 +273,7 @@ else if ( targetType.isArrayType() && sourceType.isArrayType() && assignment.get
             return new PropertyMapping(
                 targetPropertyName,
                 rightHandSide.getSourceParameterName(),
-                targetWriteAccessor.getSimpleName().toString(),
+                targetWriteAccessor.getSimpleName(),
                 ValueProvider.of( targetReadAccessor ),
                 targetType,
                 assignment,
@@ -869,7 +869,7 @@ else if ( errorMessageDetails == null ) {
 
             return new PropertyMapping(
                 targetPropertyName,
-                targetWriteAccessor.getSimpleName().toString(),
+                targetWriteAccessor.getSimpleName(),
                 ValueProvider.of( targetReadAccessor ),
                 targetType,
                 assignment,
@@ -934,7 +934,7 @@ public PropertyMapping build() {
 
             return new PropertyMapping(
                 targetPropertyName,
-                targetWriteAccessor.getSimpleName().toString(),
+                targetWriteAccessor.getSimpleName(),
                 ValueProvider.of( targetReadAccessor ),
                 targetType,
                 assignment,

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

@@ -488,7 +488,7 @@ public Map<String, Accessor> getPropertyReadAccessors() {
                 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 );
                     }
 

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

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

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

@@ -9,7 +9,6 @@
 
 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<T extends Element> implements Accessor {
     }
 
     @Override
-    public Name getSimpleName() {
-        return element.getSimpleName();
+    public String getSimpleName() {
+        return element.getSimpleName().toString();
     }
 
     @Override

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