Merge branch 1.3.x

This commit is contained in:
Phillip Webb
2016-05-10 09:35:49 -07:00
4 changed files with 9 additions and 9 deletions

View File

@@ -118,15 +118,14 @@ class TypeElementMembers {
private boolean isSetter(ExecutableElement method) {
final String name = method.getSimpleName().toString();
return (name.startsWith("set") && name.length() > 3)
&& method.getParameters().size() == 1
&& (isSetterReturnType(method));
return (name.startsWith("set") && name.length() > 3
&& method.getParameters().size() == 1 && isSetterReturnType(method));
}
private boolean isSetterReturnType(ExecutableElement method) {
return (TypeKind.VOID == method.getReturnType().getKind()
|| this.env.getTypeUtils().isSameType(
method.getEnclosingElement().asType(), method.getReturnType()));
TypeMirror returnType = method.getReturnType();
return (TypeKind.VOID == returnType.getKind() || this.env.getTypeUtils()
.isSameType(method.getEnclosingElement().asType(), returnType));
}
private String getAccessorName(String methodName) {

View File

@@ -27,6 +27,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
public class InvalidAccessorProperties {
private String name;
private boolean flag;
public void set(String name) {