diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/PropertyDescriptor.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/PropertyDescriptor.java index 5e7be15c6d..355ac02b1a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/PropertyDescriptor.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/PropertyDescriptor.java @@ -101,7 +101,7 @@ abstract class PropertyDescriptor { protected ItemDeprecation resolveItemDeprecation(MetadataGenerationEnvironment environment) { boolean deprecated = environment.isDeprecated(getGetter()) || environment.isDeprecated(getSetter()) - || environment.isDeprecated(getFactoryMethod()); + || environment.isDeprecated(getField()) || environment.isDeprecated(getFactoryMethod()); return deprecated ? environment.resolveItemDeprecation(getGetter()) : null; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java index 0b1509d318..dce5779a8f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java @@ -21,6 +21,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.configurationprocessor.metadata.ConfigurationMetadata; import org.springframework.boot.configurationprocessor.metadata.Metadata; import org.springframework.boot.configurationsample.simple.ClassWithNestedProperties; +import org.springframework.boot.configurationsample.simple.DeprecatedFieldSingleProperty; import org.springframework.boot.configurationsample.simple.DeprecatedSingleProperty; import org.springframework.boot.configurationsample.simple.DescriptionProperties; import org.springframework.boot.configurationsample.simple.HierarchicalProperties; @@ -167,6 +168,15 @@ class ConfigurationMetadataAnnotationProcessorTests extends AbstractMetadataGene .withDeprecation("renamed", "singledeprecated.new-name")); } + @Test + void singleDeprecatedFieldProperty() { + Class type = DeprecatedFieldSingleProperty.class; + ConfigurationMetadata metadata = compile(type); + assertThat(metadata).has(Metadata.withGroup("singlefielddeprecated").fromSource(type)); + assertThat(metadata).has(Metadata.withProperty("singlefielddeprecated.name", String.class).fromSource(type) + .withDeprecation(null, null)); + } + @Test void deprecatedOnUnrelatedSetter() { Class type = DeprecatedUnrelatedMethodPojo.class; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedFieldSingleProperty.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedFieldSingleProperty.java new file mode 100644 index 0000000000..4c439b7ae4 --- /dev/null +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedFieldSingleProperty.java @@ -0,0 +1,40 @@ +/* + * Copyright 2012-2019 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 + * + * https://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.simple; + +import org.springframework.boot.configurationsample.ConfigurationProperties; + +/** + * Configuration properties with a single deprecated element. + * + * @author Andy Wilkinson + */ +@ConfigurationProperties("singlefielddeprecated") +public class DeprecatedFieldSingleProperty { + + @Deprecated + private String name; + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + +}