From 4ccc7dc55498a709cf24ba3ab2c67dde0483a71c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 2 May 2016 10:38:19 +0200 Subject: [PATCH] Ignore invalid accessors Previously, if a void method with a single argument was named "set", the annotation processor wrongly considered it was a setter candidate. This commit updates the condition to ignore it. Closes gh-5826 --- .../TypeElementMembers.java | 8 ++-- ...ationMetadataAnnotationProcessorTests.java | 11 ++++- .../specific/InvalidAccessorProperties.java | 48 +++++++++++++++++++ 3 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidAccessorProperties.java 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 d449646848..882ceaa4c5 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -110,14 +110,16 @@ class TypeElementMembers { private boolean isGetter(ExecutableElement method) { String name = method.getSimpleName().toString(); - return (name.startsWith("get") || name.startsWith("is")) + return ((name.startsWith("get") && name.length() > 3) + || (name.startsWith("is") && name.length() > 2)) && method.getParameters().isEmpty() && (TypeKind.VOID != method.getReturnType().getKind()); } private boolean isSetter(ExecutableElement method) { final String name = method.getSimpleName().toString(); - return name.startsWith("set") && method.getParameters().size() == 1 + return (name.startsWith("set") && name.length() > 3) + && method.getParameters().size() == 1 && (isSetterReturnType(method)); } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java index 99fa18ad0d..d7e9c15f13 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,12 +60,14 @@ import org.springframework.boot.configurationsample.specific.ExcludedTypesPojo; import org.springframework.boot.configurationsample.specific.InnerClassAnnotatedGetterConfig; import org.springframework.boot.configurationsample.specific.InnerClassProperties; import org.springframework.boot.configurationsample.specific.InnerClassRootConfig; +import org.springframework.boot.configurationsample.specific.InvalidAccessorProperties; import org.springframework.boot.configurationsample.specific.SimplePojo; import org.springframework.util.FileCopyUtils; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; @@ -330,6 +332,13 @@ public class ConfigurationMetadataAnnotationProcessorTests { assertThat(metadata, not(containsProperty("excluded.writer-array"))); } + @Test + public void invalidAccessor() throws IOException { + ConfigurationMetadata metadata = compile(InvalidAccessorProperties.class); + assertThat(metadata, containsGroup("config")); + assertThat(metadata.getItems(), hasSize(1)); + } + @Test public void lombokDataProperties() throws Exception { ConfigurationMetadata metadata = compile(LombokSimpleDataProperties.class); diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidAccessorProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidAccessorProperties.java new file mode 100644 index 0000000000..9af572dadd --- /dev/null +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidAccessorProperties.java @@ -0,0 +1,48 @@ +/* + * Copyright 2012-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.configurationsample.specific; + +import org.springframework.boot.configurationsample.ConfigurationProperties; + +/** + * Demonstrates that invalid accessors are ignored. + * + * @author Stephane Nicoll + */ +@ConfigurationProperties(prefix = "config") +public class InvalidAccessorProperties { + + private String name; + private boolean flag; + + public void set(String name) { + this.name = name; + } + + public String get() { + return this.name; + } + + public void setFlag(boolean flag) { + this.flag = flag; + } + + public boolean is() { + return this.flag; + } + +}