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

#1578 Rename isBuilderSetter to isFluentSetter in the DefaultAccessorNamingStrategy

Browse Source
This commit is contained in:
Filip Hrisafov 2018-08-18 21:58:22 +02:00 committed by GitHub
parent 04576de1d1
commit ded8d88c73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
processor/src/main/java/org/mapstruct/ap/spi/DefaultAccessorNamingStrategy.java
View File

@ -83,10 +83,10 @@ public class DefaultAccessorNamingStrategy implements AccessorNamingStrategy {
public boolean isSetterMethod(ExecutableElement method) { public boolean isSetterMethod(ExecutableElement method) {
String methodName = method.getSimpleName().toString(); 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 && return method.getParameters().size() == 1 &&
!JAVA_JAVAX_PACKAGE.matcher( method.getEnclosingElement().asType().toString() ).matches() && !JAVA_JAVAX_PACKAGE.matcher( method.getEnclosingElement().asType().toString() ).matches() &&
!isAdderWithUpperCase4thCharacter( method ) && !isAdderWithUpperCase4thCharacter( method ) &&
@ -159,7 +159,7 @@ public class DefaultAccessorNamingStrategy implements AccessorNamingStrategy {
if ( methodName.startsWith( "is" ) || methodName.startsWith( "get" ) || methodName.startsWith( "set" ) ) { if ( methodName.startsWith( "is" ) || methodName.startsWith( "get" ) || methodName.startsWith( "set" ) ) {
return IntrospectorUtils.decapitalize( methodName.substring( methodName.startsWith( "is" ) ? 2 : 3 ) ); return IntrospectorUtils.decapitalize( methodName.substring( methodName.startsWith( "is" ) ? 2 : 3 ) );
} }
else if ( isBuilderSetter( getterOrSetterMethod ) ) { else if ( isFluentSetter( getterOrSetterMethod ) ) {
return methodName; return methodName;
} }
return IntrospectorUtils.decapitalize( methodName.substring( methodName.startsWith( "is" ) ? 2 : 3 ) ); return IntrospectorUtils.decapitalize( methodName.substring( methodName.startsWith( "is" ) ? 2 : 3 ) );

4
processor/src/main/java/org/mapstruct/ap/spi/ImmutablesAccessorNamingStrategy.java
View File

@ -17,7 +17,7 @@ import javax.lang.model.element.ExecutableElement;
public class ImmutablesAccessorNamingStrategy extends DefaultAccessorNamingStrategy { public class ImmutablesAccessorNamingStrategy extends DefaultAccessorNamingStrategy {
@Override @Override
protected boolean isBuilderSetter(ExecutableElement method) { protected boolean isFluentSetter(ExecutableElement method) {
return super.isBuilderSetter( method ) && !method.getSimpleName().toString().equals( "from" ); return super.isFluentSetter( method ) && !method.getSimpleName().toString().equals( "from" );
} }
} }