mapstruct#1578 Rename isBuilderSetter to isFluentSetter in the DefaultAccessorNamingStrategy

filiphr · web-flow · commit ded8d88c73c1 · 2018-08-18T21:58:22.000+02:00
diff --git 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 boolean isGetterMethod(ExecutableElement method) {
     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 String getPropertyName(ExecutableElement getterOrSetterMethod) {
         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
@@ -17,7 +17,7 @@
 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" );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,10 @@ public boolean isGetterMethod(ExecutableElement method) {`
`83`	`83`	`public boolean isSetterMethod(ExecutableElement method) {`
`84`	`84`	`String methodName = method.getSimpleName().toString();`
`85`	`85`
`86`		`- return methodName.startsWith( "set" ) && methodName.length() > 3 \|\| isBuilderSetter( method );`
	`86`	`+ return methodName.startsWith( "set" ) && methodName.length() > 3 \|\| isFluentSetter( method );`
`87`	`87`	`}`
`88`	`88`
`89`		`- protected boolean isBuilderSetter(ExecutableElement method) {`
	`89`	`+ protected boolean isFluentSetter(ExecutableElement method) {`
`90`	`90`	`return method.getParameters().size() == 1 &&`
`91`	`91`	`!JAVA_JAVAX_PACKAGE.matcher( method.getEnclosingElement().asType().toString() ).matches() &&`
`92`	`92`	`!isAdderWithUpperCase4thCharacter( method ) &&`
`@@ -159,7 +159,7 @@ public String getPropertyName(ExecutableElement getterOrSetterMethod) {`
`159`	`159`	`if ( methodName.startsWith( "is" ) \|\| methodName.startsWith( "get" ) \|\| methodName.startsWith( "set" ) ) {`
`160`	`160`	`return IntrospectorUtils.decapitalize( methodName.substring( methodName.startsWith( "is" ) ? 2 : 3 ) );`
`161`	`161`	`}`
`162`		`- else if ( isBuilderSetter( getterOrSetterMethod ) ) {`
	`162`	`+ else if ( isFluentSetter( getterOrSetterMethod ) ) {`
`163`	`163`	`return methodName;`
`164`	`164`	`}`
`165`	`165`	`return IntrospectorUtils.decapitalize( methodName.substring( methodName.startsWith( "is" ) ? 2 : 3 ) );`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`public class ImmutablesAccessorNamingStrategy extends DefaultAccessorNamingStrategy {`
`18`	`18`
`19`	`19`	`@Override`
`20`		`- protected boolean isBuilderSetter(ExecutableElement method) {`
`21`		`- return super.isBuilderSetter( method ) && !method.getSimpleName().toString().equals( "from" );`
	`20`	`+ protected boolean isFluentSetter(ExecutableElement method) {`
	`21`	`+ return super.isFluentSetter( method ) && !method.getSimpleName().toString().equals( "from" );`
`22`	`22`	`}`
`23`	`23`	`}`