From ded8d88c73c18323eae421e92c14949dccbd78be Mon Sep 17 00:00:00 2001 From: Filip Hrisafov Date: Sat, 18 Aug 2018 21:58:22 +0200 Subject: [PATCH] #1578 Rename isBuilderSetter to isFluentSetter in the DefaultAccessorNamingStrategy --- .../org/mapstruct/ap/spi/DefaultAccessorNamingStrategy.java | 6 +++--- .../mapstruct/ap/spi/ImmutablesAccessorNamingStrategy.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/processor/src/main/java/org/mapstruct/ap/spi/DefaultAccessorNamingStrategy.java b/processor/src/main/java/org/mapstruct/ap/spi/DefaultAccessorNamingStrategy.java index 8f82c8f89..908963f5d 100644 --- a/processor/src/main/java/org/mapstruct/ap/spi/DefaultAccessorNamingStrategy.java +++ b/processor/src/main/java/org/mapstruct/ap/spi/DefaultAccessorNamingStrategy.java @@ -83,10 +83,10 @@ public class DefaultAccessorNamingStrategy implements AccessorNamingStrategy { public boolean isSetterMethod(ExecutableElement method) { String methodName = method.getSimpleName().toString(); - return methodName.startsWith( "set" ) && methodName.length() > 3 || isBuilderSetter( method ); + return methodName.startsWith( "set" ) && methodName.length() > 3 || isFluentSetter( method ); } - protected boolean isBuilderSetter(ExecutableElement method) { + protected boolean isFluentSetter(ExecutableElement method) { return method.getParameters().size() == 1 && !JAVA_JAVAX_PACKAGE.matcher( method.getEnclosingElement().asType().toString() ).matches() && !isAdderWithUpperCase4thCharacter( method ) && @@ -159,7 +159,7 @@ public class DefaultAccessorNamingStrategy implements AccessorNamingStrategy { if ( methodName.startsWith( "is" ) || methodName.startsWith( "get" ) || methodName.startsWith( "set" ) ) { return IntrospectorUtils.decapitalize( methodName.substring( methodName.startsWith( "is" ) ? 2 : 3 ) ); } - else if ( isBuilderSetter( getterOrSetterMethod ) ) { + else if ( isFluentSetter( getterOrSetterMethod ) ) { return methodName; } return IntrospectorUtils.decapitalize( methodName.substring( methodName.startsWith( "is" ) ? 2 : 3 ) ); diff --git a/processor/src/main/java/org/mapstruct/ap/spi/ImmutablesAccessorNamingStrategy.java b/processor/src/main/java/org/mapstruct/ap/spi/ImmutablesAccessorNamingStrategy.java index 98d34407d..cc1d66895 100644 --- a/processor/src/main/java/org/mapstruct/ap/spi/ImmutablesAccessorNamingStrategy.java +++ b/processor/src/main/java/org/mapstruct/ap/spi/ImmutablesAccessorNamingStrategy.java @@ -17,7 +17,7 @@ import javax.lang.model.element.ExecutableElement; public class ImmutablesAccessorNamingStrategy extends DefaultAccessorNamingStrategy { @Override - protected boolean isBuilderSetter(ExecutableElement method) { - return super.isBuilderSetter( method ) && !method.getSimpleName().toString().equals( "from" ); + protected boolean isFluentSetter(ExecutableElement method) { + return super.isFluentSetter( method ) && !method.getSimpleName().toString().equals( "from" ); } }