diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/JavaBeanPropertyDescriptorTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/JavaBeanPropertyDescriptorTests.java index 1a9acdb7635..bab390926d3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/JavaBeanPropertyDescriptorTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/JavaBeanPropertyDescriptorTests.java @@ -266,7 +266,8 @@ public class JavaBeanPropertyDescriptorTests extends PropertyDescriptorTests { protected JavaBeanPropertyDescriptor createPropertyDescriptor( TypeElement ownerElement, String name) { return createPropertyDescriptor(ownerElement, name, - createAccessorMethod("get", name), createAccessorMethod("set", name)); + createAccessorMethodName("get", name), + createAccessorMethodName("set", name)); } protected JavaBeanPropertyDescriptor createPropertyDescriptor( @@ -278,10 +279,4 @@ public class JavaBeanPropertyDescriptorTests extends PropertyDescriptorTests { getter.getReturnType(), field, setter); } - private String createAccessorMethod(String prefix, String name) { - char[] chars = name.toCharArray(); - chars[0] = Character.toUpperCase(chars[0]); - return prefix + new String(chars, 0, chars.length); - } - } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/LombokPropertyDescriptorTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/LombokPropertyDescriptorTests.java index 9ab994ae66e..538906638a2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/LombokPropertyDescriptorTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/LombokPropertyDescriptorTests.java @@ -301,8 +301,10 @@ public class LombokPropertyDescriptorTests extends PropertyDescriptorTests { protected LombokPropertyDescriptor createPropertyDescriptor(TypeElement ownerElement, String name) { VariableElement field = getField(ownerElement, name); + ExecutableElement getter = getMethod(ownerElement, + createAccessorMethodName("get", name)); return new LombokPropertyDescriptor(ownerElement, null, field, name, - field.asType(), null); + field.asType(), getter); } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/PropertyDescriptorTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/PropertyDescriptorTests.java index 04da993da1f..6f4e6e6ebbb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/PropertyDescriptorTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/PropertyDescriptorTests.java @@ -43,6 +43,12 @@ public abstract class PropertyDescriptorTests { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); + protected String createAccessorMethodName(String prefix, String name) { + char[] chars = name.toCharArray(); + chars[0] = Character.toUpperCase(chars[0]); + return prefix + new String(chars, 0, chars.length); + } + protected ExecutableElement getMethod(TypeElement element, String name) { return ElementFilter.methodsIn(element.getEnclosedElements()).stream().filter( (method) -> ((Element) method).getSimpleName().toString().equals(name))