From e902f6b91d08e66353983b21cdcc06af57649cf6 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 10 Nov 2014 23:03:32 -0800 Subject: [PATCH] Fix annotation processor builder setter detection Update TypeElementMembers to correctly detect builder style setters. The previous logic could fail because of the crazy way that TypeMirror implements its equals() method. Fixes gh-1859 See gh-1854 --- .../boot/configurationprocessor/TypeElementMembers.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java index b4d8b93a8c..8e9bb0ebf8 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java @@ -95,8 +95,9 @@ class TypeElementMembers { } private boolean isSetterReturnType(ExecutableElement method) { - return (TypeKind.VOID == method.getReturnType().getKind() || method - .getEnclosingElement().asType().equals(method.getReturnType())); + return (TypeKind.VOID == method.getReturnType().getKind() || this.env + .getTypeUtils().isSameType(method.getEnclosingElement().asType(), + method.getReturnType())); } private String getAccessorName(String methodName) {