From 30938e30f04651ba02fb0ab43220abc4682ad98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 10 Oct 2025 13:50:43 +0200 Subject: [PATCH] Rename annotations used by tests of the configuration processor This commit renames the annotations and other signals that the annotation processor uses to process configuration metadata. By adding a `Test` prefix, this prevents the confusion with the real annotation. Closes gh-47468 --- ...ationMetadataAnnotationProcessorTests.java | 12 +++--- .../EndpointMetadataGenerationTests.java | 38 +++++++++---------- ...crementalBuildMetadataGenerationTests.java | 4 +- .../configurationprocessor/TestProject.java | 8 ++-- .../AbstractFieldValuesProcessorTests.java | 2 +- .../metadata/Metadata.java | 4 +- ...figurationMetadataAnnotationProcessor.java | 30 +++++++-------- .../{Access.java => TestAccess.java} | 5 ++- .../{Autowired.java => TestAutowired.java} | 2 +- ....java => TestConfigurationProperties.java} | 2 +- ...nding.java => TestConstructorBinding.java} | 2 +- ...point.java => TestControllerEndpoint.java} | 4 +- ...efaultValue.java => TestDefaultValue.java} | 2 +- ... TestDeprecatedConfigurationProperty.java} | 11 ++---- .../{Endpoint.java => TestEndpoint.java} | 4 +- ...{JmxEndpoint.java => TestJmxEndpoint.java} | 4 +- .../{Name.java => TestName.java} | 2 +- ...a => TestNestedConfigurationProperty.java} | 2 +- ...dOperation.java => TestReadOperation.java} | 2 +- ...t.java => TestRestControllerEndpoint.java} | 4 +- ...Endpoint.java => TestServletEndpoint.java} | 4 +- ...{WebEndpoint.java => TestWebEndpoint.java} | 4 +- .../deprecation/Dbcp2Configuration.java | 4 +- .../endpoint/CamelCaseEndpoint.java | 4 +- .../endpoint/CustomPropertiesEndpoint.java | 12 +++--- .../endpoint/DisabledEndpoint.java | 4 +- .../endpoint/EnabledEndpoint.java | 8 ++-- .../endpoint/NoAccessEndpoint.java | 6 +-- .../endpoint/ReadOnlyAccessEndpoint.java | 6 +-- .../endpoint/SimpleEndpoint.java | 8 ++-- .../endpoint/SimpleEndpoint2.java | 8 ++-- .../endpoint/SimpleEndpoint3.java | 8 ++-- .../endpoint/SpecificEndpoint.java | 8 ++-- .../endpoint/UnrestrictedAccessEndpoint.java | 4 +- .../incremental/IncrementalEndpoint.java | 8 ++-- .../IncrementalSpecificEndpoint.java | 4 +- .../fieldvalues/FieldValues.java | 4 +- .../generic/ComplexGenericProperties.java | 8 ++-- .../generic/ConcreteBuilderProperties.java | 4 +- .../generic/GenericConfig.java | 10 ++--- .../generic/SimpleGenericProperties.java | 4 +- .../generic/UnresolvedGenericProperties.java | 4 +- .../generic/WildcardConfig.java | 4 +- .../DeducedImmutableClassProperties.java | 8 ++-- .../ImmutableCollectionProperties.java | 6 +-- ...leDeducedConstructorBindingProperties.java | 8 ++-- .../ImmutableInnerClassProperties.java | 4 +- .../ImmutableMultiConstructorProperties.java | 4 +- ...utablePrimitiveWithDefaultsProperties.java | 11 +++--- ...rimitiveWrapperWithDefaultsProperties.java | 11 +++--- .../immutable/ImmutableSimpleProperties.java | 12 +++--- .../incremental/BarProperties.java | 4 +- .../incremental/FooProperties.java | 4 +- .../incremental/RenamedBarProperties.java | 4 +- .../inheritance/ChildPropertiesConfig.java | 4 +- .../OverrideChildPropertiesConfig.java | 4 +- ...bokAccessLevelOverwriteDataProperties.java | 4 +- ...AccessLevelOverwriteDefaultProperties.java | 4 +- ...ccessLevelOverwriteExplicitProperties.java | 4 +- .../lombok/LombokAccessLevelProperties.java | 4 +- .../lombok/LombokDefaultValueProperties.java | 4 +- .../lombok/LombokDeprecatedProperties.java | 4 +- .../LombokDeprecatedSingleProperty.java | 4 +- .../lombok/LombokExplicitProperties.java | 4 +- .../lombok/LombokInnerClassProperties.java | 8 ++-- .../LombokInnerClassWithGetterProperties.java | 4 +- .../lombok/LombokSimpleDataProperties.java | 4 +- .../lombok/LombokSimpleProperties.java | 4 +- .../lombok/LombokSimpleValueProperties.java | 4 +- .../method/DeprecatedClassMethodConfig.java | 4 +- .../method/DeprecatedMethodConfig.java | 4 +- .../method/EmptyTypeMethodConfig.java | 6 +-- .../method/InvalidMethodConfig.java | 6 +-- .../method/MethodAndClassConfig.java | 6 +-- .../method/NestedPropertiesMethod.java | 10 ++--- .../method/PackagePrivateMethodConfig.java | 4 +- .../method/PrivateMethodConfig.java | 4 +- .../method/ProtectedMethodConfig.java | 4 +- .../method/PublicMethodConfig.java | 4 +- .../method/SingleConstructorMethodConfig.java | 4 +- ...ctorParameterNameAnnotationProperties.java | 12 +++--- .../JavaBeanNameAnnotationProperties.java | 10 ++--- .../name/LombokNameAnnotationProperties.java | 10 ++--- ...cordComponentNameAnnotationProperties.java | 12 +++--- .../record/ExampleRecord.java | 7 ++-- .../record/NestedPropertiesRecord.java | 10 ++--- .../record/RecordWithGetter.java | 4 +- .../recursive/RecursiveProperties.java | 4 +- .../simple/AutowiredProperties.java | 4 +- .../simple/ClassWithNestedProperties.java | 4 +- .../simple/DeprecatedFieldSingleProperty.java | 4 +- .../simple/DeprecatedProperties.java | 4 +- .../simple/DeprecatedRecord.java | 14 +++---- .../simple/DeprecatedSingleProperty.java | 8 ++-- .../simple/DescriptionProperties.java | 4 +- .../simple/HierarchicalProperties.java | 4 +- .../InnerClassWithPrivateConstructor.java | 4 +- .../simple/SimpleArrayProperties.java | 4 +- .../simple/SimpleCollectionProperties.java | 4 +- .../simple/SimplePrefixValueProperties.java | 4 +- .../simple/SimpleProperties.java | 4 +- .../simple/SimpleTypeProperties.java | 4 +- .../specific/AnnotatedGetter.java | 4 +- .../specific/BoxingPojo.java | 4 +- .../specific/BuilderPojo.java | 4 +- .../DeprecatedLessPreciseTypePojo.java | 4 +- .../DeprecatedUnrelatedMethodPojo.java | 4 +- .../DoubleRegistrationProperties.java | 6 +-- .../specific/EmptyDefaultValueProperties.java | 12 +++--- .../specific/EnumValuesPojo.java | 4 +- .../specific/ExcludedTypesPojo.java | 4 +- .../InnerClassAnnotatedGetterConfig.java | 6 +-- .../InnerClassHierarchicalProperties.java | 9 +++-- .../specific/InnerClassProperties.java | 10 ++--- .../specific/InnerClassRootConfig.java | 4 +- .../specific/InvalidAccessorProperties.java | 4 +- ...nvalidDefaultValueCharacterProperties.java | 12 +++--- ...idDefaultValueFloatingPointProperties.java | 8 ++-- .../InvalidDefaultValueNumberProperties.java | 8 ++-- .../InvalidDoubleRegistrationProperties.java | 6 +-- .../specific/SimpleConflictingProperties.java | 4 +- .../specific/StaticAccessor.java | 4 +- 122 files changed, 369 insertions(+), 369 deletions(-) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{Access.java => TestAccess.java} (83%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{Autowired.java => TestAutowired.java} (97%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{ConfigurationProperties.java => TestConfigurationProperties.java} (96%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{ConstructorBinding.java => TestConstructorBinding.java} (96%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{ControllerEndpoint.java => TestControllerEndpoint.java} (92%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{DefaultValue.java => TestDefaultValue.java} (97%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{DeprecatedConfigurationProperty.java => TestDeprecatedConfigurationProperty.java} (75%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{Endpoint.java => TestEndpoint.java} (92%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{JmxEndpoint.java => TestJmxEndpoint.java} (92%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{Name.java => TestName.java} (97%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{NestedConfigurationProperty.java => TestNestedConfigurationProperty.java} (95%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{ReadOperation.java => TestReadOperation.java} (96%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{RestControllerEndpoint.java => TestRestControllerEndpoint.java} (91%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{ServletEndpoint.java => TestServletEndpoint.java} (92%) rename spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/{WebEndpoint.java => TestWebEndpoint.java} (92%) 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 a51aae7c769..3273515df39 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 @@ -484,7 +484,7 @@ class ConfigurationMetadataAnnotationProcessorTests extends AbstractMetadataGene @Test void recordProperties() { String source = """ - @org.springframework.boot.configurationsample.ConfigurationProperties("implicit") + @org.springframework.boot.configurationsample.TestConfigurationProperties("implicit") public record ExampleRecord(String someString, Integer someInteger) { } """; @@ -496,10 +496,10 @@ class ConfigurationMetadataAnnotationProcessorTests extends AbstractMetadataGene @Test void recordPropertiesWithDefaultValues() { String source = """ - @org.springframework.boot.configurationsample.ConfigurationProperties("record.defaults") + @org.springframework.boot.configurationsample.TestConfigurationProperties("record.defaults") public record ExampleRecord( - @org.springframework.boot.configurationsample.DefaultValue("An1s9n") String someString, - @org.springframework.boot.configurationsample.DefaultValue("594") Integer someInteger) { + @org.springframework.boot.configurationsample.TestDefaultValue("An1s9n") String someString, + @org.springframework.boot.configurationsample.TestDefaultValue("594") Integer someInteger) { } """; ConfigurationMetadata metadata = compile(source); @@ -512,9 +512,9 @@ class ConfigurationMetadataAnnotationProcessorTests extends AbstractMetadataGene @Test void multiConstructorRecordProperties() { String source = """ - @org.springframework.boot.configurationsample.ConfigurationProperties("multi") + @org.springframework.boot.configurationsample.TestConfigurationProperties("multi") public record ExampleRecord(String someString, Integer someInteger) { - @org.springframework.boot.configurationsample.ConstructorBinding + @org.springframework.boot.configurationsample.TestConstructorBinding public ExampleRecord(String someString) { this(someString, 42); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/EndpointMetadataGenerationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/EndpointMetadataGenerationTests.java index 9efd601265e..dc069d18d3b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/EndpointMetadataGenerationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/EndpointMetadataGenerationTests.java @@ -23,7 +23,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.Access; +import org.springframework.boot.configurationsample.TestAccess; import org.springframework.boot.configurationsample.endpoint.CamelCaseEndpoint; import org.springframework.boot.configurationsample.endpoint.CustomPropertiesEndpoint; import org.springframework.boot.configurationsample.endpoint.DisabledEndpoint; @@ -54,7 +54,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { ConfigurationMetadata metadata = compile(SimpleEndpoint.class); assertThat(metadata).has(Metadata.withGroup("management.endpoint.simple").fromSource(SimpleEndpoint.class)); assertThat(metadata).has(enabledFlag("simple", true)); - assertThat(metadata).has(access("simple", Access.UNRESTRICTED)); + assertThat(metadata).has(access("simple", TestAccess.UNRESTRICTED)); assertThat(metadata).has(cacheTtl("simple")); assertThat(metadata.getItems()).hasSize(4); } @@ -64,7 +64,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { ConfigurationMetadata metadata = compile(DisabledEndpoint.class); assertThat(metadata).has(Metadata.withGroup("management.endpoint.disabled").fromSource(DisabledEndpoint.class)); assertThat(metadata).has(enabledFlag("disabled", false)); - assertThat(metadata).has(access("disabled", Access.NONE)); + assertThat(metadata).has(access("disabled", TestAccess.NONE)); assertThat(metadata.getItems()).hasSize(3); } @@ -73,7 +73,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { ConfigurationMetadata metadata = compile(EnabledEndpoint.class); assertThat(metadata).has(Metadata.withGroup("management.endpoint.enabled").fromSource(EnabledEndpoint.class)); assertThat(metadata).has(enabledFlag("enabled", true)); - assertThat(metadata).has(access("enabled", Access.UNRESTRICTED)); + assertThat(metadata).has(access("enabled", TestAccess.UNRESTRICTED)); assertThat(metadata.getItems()).hasSize(3); } @@ -82,7 +82,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { ConfigurationMetadata metadata = compile(NoAccessEndpoint.class); assertThat(metadata).has(Metadata.withGroup("management.endpoint.noaccess").fromSource(NoAccessEndpoint.class)); assertThat(metadata).has(enabledFlag("noaccess", false)); - assertThat(metadata).has(access("noaccess", Access.NONE)); + assertThat(metadata).has(access("noaccess", TestAccess.NONE)); assertThat(metadata.getItems()).hasSize(3); } @@ -92,7 +92,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { assertThat(metadata) .has(Metadata.withGroup("management.endpoint.readonlyaccess").fromSource(ReadOnlyAccessEndpoint.class)); assertThat(metadata).has(enabledFlag("readonlyaccess", true)); - assertThat(metadata).has(access("readonlyaccess", Access.READ_ONLY)); + assertThat(metadata).has(access("readonlyaccess", TestAccess.READ_ONLY)); assertThat(metadata.getItems()).hasSize(3); } @@ -102,7 +102,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { assertThat(metadata).has(Metadata.withGroup("management.endpoint.unrestrictedaccess") .fromSource(UnrestrictedAccessEndpoint.class)); assertThat(metadata).has(enabledFlag("unrestrictedaccess", true)); - assertThat(metadata).has(access("unrestrictedaccess", Access.UNRESTRICTED)); + assertThat(metadata).has(access("unrestrictedaccess", TestAccess.UNRESTRICTED)); assertThat(metadata.getItems()).hasSize(3); } @@ -115,7 +115,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { .ofType(String.class) .withDefaultValue("test")); assertThat(metadata).has(enabledFlag("customprops", true)); - assertThat(metadata).has(access("customprops", Access.UNRESTRICTED)); + assertThat(metadata).has(access("customprops", TestAccess.UNRESTRICTED)); assertThat(metadata).has(cacheTtl("customprops")); assertThat(metadata.getItems()).hasSize(5); } @@ -125,7 +125,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { ConfigurationMetadata metadata = compile(SpecificEndpoint.class); assertThat(metadata).has(Metadata.withGroup("management.endpoint.specific").fromSource(SpecificEndpoint.class)); assertThat(metadata).has(enabledFlag("specific", true)); - assertThat(metadata).has(access("specific", Access.UNRESTRICTED)); + assertThat(metadata).has(access("specific", TestAccess.UNRESTRICTED)); assertThat(metadata).has(cacheTtl("specific")); assertThat(metadata.getItems()).hasSize(4); } @@ -136,7 +136,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { assertThat(metadata) .has(Metadata.withGroup("management.endpoint.pascal-case").fromSource(CamelCaseEndpoint.class)); assertThat(metadata).has(enabledFlag("PascalCase", "pascal-case", true)); - assertThat(metadata).has(defaultAccess("PascalCase", "pascal-case", Access.UNRESTRICTED)); + assertThat(metadata).has(defaultAccess("PascalCase", "pascal-case", TestAccess.UNRESTRICTED)); assertThat(metadata.getItems()).hasSize(3); } @@ -147,7 +147,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { assertThat(metadata) .has(Metadata.withGroup("management.endpoint.incremental").fromSource(IncrementalEndpoint.class)); assertThat(metadata).has(enabledFlag("incremental", true)); - assertThat(metadata).has(access("incremental", Access.UNRESTRICTED)); + assertThat(metadata).has(access("incremental", TestAccess.UNRESTRICTED)); assertThat(metadata).has(cacheTtl("incremental")); assertThat(metadata.getItems()).hasSize(4); project.replaceText(IncrementalEndpoint.class, "id = \"incremental\"", @@ -156,7 +156,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { assertThat(metadata) .has(Metadata.withGroup("management.endpoint.incremental").fromSource(IncrementalEndpoint.class)); assertThat(metadata).has(enabledFlag("incremental", false)); - assertThat(metadata).has(access("incremental", Access.NONE)); + assertThat(metadata).has(access("incremental", TestAccess.NONE)); assertThat(metadata).has(cacheTtl("incremental")); assertThat(metadata.getItems()).hasSize(4); } @@ -168,7 +168,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { assertThat(metadata) .has(Metadata.withGroup("management.endpoint.incremental").fromSource(IncrementalEndpoint.class)); assertThat(metadata).has(enabledFlag("incremental", true)); - assertThat(metadata).has(access("incremental", Access.UNRESTRICTED)); + assertThat(metadata).has(access("incremental", TestAccess.UNRESTRICTED)); assertThat(metadata).has(cacheTtl("incremental")); assertThat(metadata.getItems()).hasSize(4); project.replaceText(IncrementalEndpoint.class, "@Nullable String param", "String param"); @@ -176,7 +176,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { assertThat(metadata) .has(Metadata.withGroup("management.endpoint.incremental").fromSource(IncrementalEndpoint.class)); assertThat(metadata).has(enabledFlag("incremental", true)); - assertThat(metadata).has(access("incremental", Access.UNRESTRICTED)); + assertThat(metadata).has(access("incremental", TestAccess.UNRESTRICTED)); assertThat(metadata.getItems()).hasSize(3); } @@ -186,14 +186,14 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { ConfigurationMetadata metadata = project.compile(); assertThat(metadata).has(Metadata.withGroup("management.endpoint.specific").fromSource(SpecificEndpoint.class)); assertThat(metadata).has(enabledFlag("specific", true)); - assertThat(metadata).has(access("specific", Access.UNRESTRICTED)); + assertThat(metadata).has(access("specific", TestAccess.UNRESTRICTED)); assertThat(metadata).has(cacheTtl("specific")); assertThat(metadata.getItems()).hasSize(4); project.replaceText(SpecificEndpoint.class, "enableByDefault = true", "enableByDefault = false"); metadata = project.compile(); assertThat(metadata).has(Metadata.withGroup("management.endpoint.specific").fromSource(SpecificEndpoint.class)); assertThat(metadata).has(enabledFlag("specific", false)); - assertThat(metadata).has(access("specific", Access.NONE)); + assertThat(metadata).has(access("specific", TestAccess.NONE)); assertThat(metadata).has(cacheTtl("specific")); assertThat(metadata.getItems()).hasSize(4); } @@ -203,7 +203,7 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { ConfigurationMetadata metadata = compile(SimpleEndpoint.class, SimpleEndpoint2.class); assertThat(metadata).has(Metadata.withGroup("management.endpoint.simple").fromSource(SimpleEndpoint.class)); assertThat(metadata).has(enabledFlag("simple", "simple", true)); - assertThat(metadata).has(defaultAccess("simple", "simple", Access.UNRESTRICTED)); + assertThat(metadata).has(defaultAccess("simple", "simple", TestAccess.UNRESTRICTED)); assertThat(metadata).has(cacheTtl("simple")); assertThat(metadata.getItems()).hasSize(4); } @@ -228,12 +228,12 @@ class EndpointMetadataGenerationTests extends AbstractMetadataGenerationTests { .withDeprecation(null, "management.endpoint.%s.access".formatted(endpointSuffix), "3.4.0"); } - private Metadata.MetadataItemCondition access(String endpointId, Access defaultValue) { + private Metadata.MetadataItemCondition access(String endpointId, TestAccess defaultValue) { return defaultAccess(endpointId, endpointId, defaultValue); } private Metadata.MetadataItemCondition defaultAccess(String endpointId, String endpointSuffix, - Access defaultValue) { + TestAccess defaultValue) { return Metadata.withAccess("management.endpoint." + endpointSuffix + ".access") .withDefaultValue(defaultValue.name().toLowerCase(Locale.ENGLISH)) .withDescription("Permitted level of access for the %s endpoint.".formatted(endpointId)); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/IncrementalBuildMetadataGenerationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/IncrementalBuildMetadataGenerationTests.java index 026c2fa8874..d219863da51 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/IncrementalBuildMetadataGenerationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/IncrementalBuildMetadataGenerationTests.java @@ -66,8 +66,8 @@ class IncrementalBuildMetadataGenerationTests extends AbstractMetadataGeneration ConfigurationMetadata metadata = project.compile(); assertThat(metadata).has(Metadata.withProperty("foo.counter").withDefaultValue(0)); assertThat(metadata).has(Metadata.withProperty("bar.counter").withDefaultValue(0)); - project.replaceText(BarProperties.class, "@ConfigurationProperties", "//@ConfigurationProperties"); - project.replaceText(FooProperties.class, "@ConfigurationProperties", "//@ConfigurationProperties"); + project.replaceText(BarProperties.class, "@TestConfigurationProperties", "//@TestConfigurationProperties"); + project.replaceText(FooProperties.class, "@TestConfigurationProperties", "//@TestConfigurationProperties"); metadata = project.compile(); assertThat(metadata).isNull(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java index 404b5a80a1c..3a045965624 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java @@ -29,8 +29,8 @@ import org.springframework.boot.configurationprocessor.metadata.ConfigurationMet import org.springframework.boot.configurationprocessor.metadata.JsonMarshaller; import org.springframework.boot.configurationprocessor.test.CompiledMetadataReader; import org.springframework.boot.configurationprocessor.test.TestConfigurationMetadataAnnotationProcessor; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.NestedConfigurationProperty; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestNestedConfigurationProperty; import org.springframework.core.test.tools.ResourceFile; import org.springframework.core.test.tools.SourceFile; import org.springframework.core.test.tools.SourceFiles; @@ -50,8 +50,8 @@ import org.springframework.util.FileCopyUtils; */ public class TestProject { - private static final Class[] ALWAYS_INCLUDE = { ConfigurationProperties.class, - NestedConfigurationProperty.class }; + private static final Class[] ALWAYS_INCLUDE = { TestConfigurationProperties.class, + TestNestedConfigurationProperty.class }; private SourceFiles sources; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/fieldvalues/AbstractFieldValuesProcessorTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/fieldvalues/AbstractFieldValuesProcessorTests.java index 5c3381d0d8b..100784570d6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/fieldvalues/AbstractFieldValuesProcessorTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/fieldvalues/AbstractFieldValuesProcessorTests.java @@ -116,7 +116,7 @@ public abstract class AbstractFieldValuesProcessorTests { assertThat(values.get("memberSelectInt")).isNull(); } - @SupportedAnnotationTypes({ "org.springframework.boot.configurationsample.ConfigurationProperties" }) + @SupportedAnnotationTypes({ "org.springframework.boot.configurationsample.TestConfigurationProperties" }) @SupportedSourceVersion(SourceVersion.RELEASE_6) private final class TestProcessor extends AbstractProcessor { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/Metadata.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/Metadata.java index 61db18bd11c..85ad41e788c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/Metadata.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/Metadata.java @@ -25,7 +25,7 @@ import org.assertj.core.api.Condition; import org.hamcrest.collection.IsMapContaining; import org.springframework.boot.configurationprocessor.metadata.ItemMetadata.ItemType; -import org.springframework.boot.configurationsample.Access; +import org.springframework.boot.configurationsample.TestAccess; import org.springframework.util.ObjectUtils; /** @@ -68,7 +68,7 @@ public final class Metadata { } public static Metadata.MetadataItemCondition withAccess(String key) { - return withProperty(key).ofType(Access.class); + return withProperty(key).ofType(TestAccess.class); } public static MetadataHintCondition withHint(String name) { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/test/TestConfigurationMetadataAnnotationProcessor.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/test/TestConfigurationMetadataAnnotationProcessor.java index 7906111b24b..f9ada3b6af9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/test/TestConfigurationMetadataAnnotationProcessor.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/test/TestConfigurationMetadataAnnotationProcessor.java @@ -46,35 +46,35 @@ import org.springframework.boot.configurationprocessor.ConfigurationMetadataAnno @SupportedSourceVersion(SourceVersion.RELEASE_6) public class TestConfigurationMetadataAnnotationProcessor extends ConfigurationMetadataAnnotationProcessor { - public static final String CONFIGURATION_PROPERTIES_ANNOTATION = "org.springframework.boot.configurationsample.ConfigurationProperties"; + public static final String CONFIGURATION_PROPERTIES_ANNOTATION = "org.springframework.boot.configurationsample.TestConfigurationProperties"; - public static final String NESTED_CONFIGURATION_PROPERTY_ANNOTATION = "org.springframework.boot.configurationsample.NestedConfigurationProperty"; + public static final String NESTED_CONFIGURATION_PROPERTY_ANNOTATION = "org.springframework.boot.configurationsample.TestNestedConfigurationProperty"; - public static final String DEPRECATED_CONFIGURATION_PROPERTY_ANNOTATION = "org.springframework.boot.configurationsample.DeprecatedConfigurationProperty"; + public static final String DEPRECATED_CONFIGURATION_PROPERTY_ANNOTATION = "org.springframework.boot.configurationsample.TestDeprecatedConfigurationProperty"; - public static final String CONSTRUCTOR_BINDING_ANNOTATION = "org.springframework.boot.configurationsample.ConstructorBinding"; + public static final String CONSTRUCTOR_BINDING_ANNOTATION = "org.springframework.boot.configurationsample.TestConstructorBinding"; - public static final String AUTOWIRED_ANNOTATION = "org.springframework.boot.configurationsample.Autowired"; + public static final String AUTOWIRED_ANNOTATION = "org.springframework.boot.configurationsample.TestAutowired"; - public static final String DEFAULT_VALUE_ANNOTATION = "org.springframework.boot.configurationsample.DefaultValue"; + public static final String DEFAULT_VALUE_ANNOTATION = "org.springframework.boot.configurationsample.TestDefaultValue"; - public static final String CONTROLLER_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.ControllerEndpoint"; + public static final String CONTROLLER_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.TestControllerEndpoint"; - public static final String ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.Endpoint"; + public static final String ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.TestEndpoint"; - public static final String JMX_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.JmxEndpoint"; + public static final String JMX_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.TestJmxEndpoint"; - public static final String REST_CONTROLLER_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.RestControllerEndpoint"; + public static final String REST_CONTROLLER_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.TestRestControllerEndpoint"; - public static final String SERVLET_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.ServletEndpoint"; + public static final String SERVLET_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.TestServletEndpoint"; - public static final String WEB_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.WebEndpoint"; + public static final String WEB_ENDPOINT_ANNOTATION = "org.springframework.boot.configurationsample.TestWebEndpoint"; - public static final String READ_OPERATION_ANNOTATION = "org.springframework.boot.configurationsample.ReadOperation"; + public static final String READ_OPERATION_ANNOTATION = "org.springframework.boot.configurationsample.TestReadOperation"; - public static final String NAME_ANNOTATION = "org.springframework.boot.configurationsample.Name"; + public static final String NAME_ANNOTATION = "org.springframework.boot.configurationsample.TestName"; - public static final String ENDPOINT_ACCESS_ENUM = "org.springframework.boot.configurationsample.Access"; + public static final String ENDPOINT_ACCESS_ENUM = "org.springframework.boot.configurationsample.TestAccess"; public TestConfigurationMetadataAnnotationProcessor() { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/Access.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestAccess.java similarity index 83% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/Access.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestAccess.java index 02f36b7306d..5e2d93b3389 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/Access.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestAccess.java @@ -17,11 +17,12 @@ package org.springframework.boot.configurationsample; /** - * Permitted level of access to an endpoint. + * Alternative to Spring Boot's {@code @Access} for testing (removes the need for a + * dependency on the real annotation). * * @author Andy Wilkinson */ -public enum Access { +public enum TestAccess { NONE, diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/Autowired.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestAutowired.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/Autowired.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestAutowired.java index 32e10b882a4..d657a9a4dfe 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/Autowired.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestAutowired.java @@ -31,6 +31,6 @@ import java.lang.annotation.Target; @Target({ ElementType.TYPE, ElementType.CONSTRUCTOR }) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface Autowired { +public @interface TestAutowired { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ConfigurationProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestConfigurationProperties.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ConfigurationProperties.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestConfigurationProperties.java index a5fdfd21848..97cc9b59e24 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ConfigurationProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestConfigurationProperties.java @@ -32,7 +32,7 @@ import java.lang.annotation.Target; @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface ConfigurationProperties { +public @interface TestConfigurationProperties { String value() default ""; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ConstructorBinding.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestConstructorBinding.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ConstructorBinding.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestConstructorBinding.java index 3e2fe6f3739..295e2c0f3b9 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ConstructorBinding.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestConstructorBinding.java @@ -31,6 +31,6 @@ import java.lang.annotation.Target; @Target({ ElementType.CONSTRUCTOR, ElementType.ANNOTATION_TYPE }) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface ConstructorBinding { +public @interface TestConstructorBinding { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ControllerEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestControllerEndpoint.java similarity index 92% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ControllerEndpoint.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestControllerEndpoint.java index efe013f8210..ded9be59e7b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ControllerEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestControllerEndpoint.java @@ -31,13 +31,13 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface ControllerEndpoint { +public @interface TestControllerEndpoint { String id() default ""; @Deprecated boolean enableByDefault() default true; - Access defaultAccess() default Access.UNRESTRICTED; + TestAccess defaultAccess() default TestAccess.UNRESTRICTED; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/DefaultValue.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestDefaultValue.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/DefaultValue.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestDefaultValue.java index cda223c3c0d..070349b6a8f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/DefaultValue.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestDefaultValue.java @@ -32,7 +32,7 @@ import java.lang.annotation.Target; @Target({ ElementType.PARAMETER, ElementType.RECORD_COMPONENT }) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface DefaultValue { +public @interface TestDefaultValue { String[] value() default {}; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/DeprecatedConfigurationProperty.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestDeprecatedConfigurationProperty.java similarity index 75% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/DeprecatedConfigurationProperty.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestDeprecatedConfigurationProperty.java index 336aae5dc72..4ff780d4607 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/DeprecatedConfigurationProperty.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestDeprecatedConfigurationProperty.java @@ -23,20 +23,15 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Indicates that a getter in a {@link ConfigurationProperties @ConfigurationProperties} - * object is deprecated. This annotation has no bearing on the actual binding processes, - * but it is used by the {@code spring-boot-configuration-processor} to add deprecation - * meta-data. - *

- * This annotation must be used on the getter of the deprecated element. + * Alternative to Spring Boot's {@code @DeprecatedConfigurationProperty} for testing + * (removes the need for a dependency on the real annotation). * * @author Phillip Webb - * @since 1.3.0 */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface DeprecatedConfigurationProperty { +public @interface TestDeprecatedConfigurationProperty { /** * The reason for the deprecation. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/Endpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestEndpoint.java similarity index 92% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/Endpoint.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestEndpoint.java index a00de8a68c2..85f2e836e8c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/Endpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestEndpoint.java @@ -31,13 +31,13 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface Endpoint { +public @interface TestEndpoint { String id() default ""; @Deprecated boolean enableByDefault() default true; - Access defaultAccess() default Access.UNRESTRICTED; + TestAccess defaultAccess() default TestAccess.UNRESTRICTED; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/JmxEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestJmxEndpoint.java similarity index 92% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/JmxEndpoint.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestJmxEndpoint.java index b04ce532c85..032a0f1758a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/JmxEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestJmxEndpoint.java @@ -31,13 +31,13 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface JmxEndpoint { +public @interface TestJmxEndpoint { String id() default ""; @Deprecated boolean enableByDefault() default true; - Access defaultAccess() default Access.UNRESTRICTED; + TestAccess defaultAccess() default TestAccess.UNRESTRICTED; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/Name.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestName.java similarity index 97% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/Name.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestName.java index 8e574f9993a..02b6796d7e6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/Name.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestName.java @@ -31,7 +31,7 @@ import java.lang.annotation.Target; @Target({ ElementType.PARAMETER, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface Name { +public @interface TestName { String value(); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/NestedConfigurationProperty.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestNestedConfigurationProperty.java similarity index 95% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/NestedConfigurationProperty.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestNestedConfigurationProperty.java index 39d9ee2a258..a478ecf3dbe 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/NestedConfigurationProperty.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestNestedConfigurationProperty.java @@ -33,6 +33,6 @@ import java.lang.annotation.Target; @Target({ ElementType.FIELD, ElementType.RECORD_COMPONENT, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface NestedConfigurationProperty { +public @interface TestNestedConfigurationProperty { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ReadOperation.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestReadOperation.java similarity index 96% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ReadOperation.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestReadOperation.java index 350827a79f4..0639321d64d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ReadOperation.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestReadOperation.java @@ -31,7 +31,7 @@ import java.lang.annotation.Target; @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface ReadOperation { +public @interface TestReadOperation { String[] produces() default {}; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/RestControllerEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestRestControllerEndpoint.java similarity index 91% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/RestControllerEndpoint.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestRestControllerEndpoint.java index f180ee93661..59dc81518b6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/RestControllerEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestRestControllerEndpoint.java @@ -31,13 +31,13 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface RestControllerEndpoint { +public @interface TestRestControllerEndpoint { String id() default ""; @Deprecated boolean enableByDefault() default true; - Access defaultAccess() default Access.UNRESTRICTED; + TestAccess defaultAccess() default TestAccess.UNRESTRICTED; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ServletEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestServletEndpoint.java similarity index 92% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ServletEndpoint.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestServletEndpoint.java index c3ad0b8f070..7ae50e4f561 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/ServletEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestServletEndpoint.java @@ -31,13 +31,13 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface ServletEndpoint { +public @interface TestServletEndpoint { String id() default ""; @Deprecated boolean enableByDefault() default true; - Access defaultAccess() default Access.UNRESTRICTED; + TestAccess defaultAccess() default TestAccess.UNRESTRICTED; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/WebEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestWebEndpoint.java similarity index 92% rename from spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/WebEndpoint.java rename to spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestWebEndpoint.java index edea0ba997c..99572f65462 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/WebEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/TestWebEndpoint.java @@ -31,13 +31,13 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface WebEndpoint { +public @interface TestWebEndpoint { String id() default ""; @Deprecated boolean enableByDefault() default true; - Access defaultAccess() default Access.UNRESTRICTED; + TestAccess defaultAccess() default TestAccess.UNRESTRICTED; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/deprecation/Dbcp2Configuration.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/deprecation/Dbcp2Configuration.java index 0f33e0e906c..7da43b62cdd 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/deprecation/Dbcp2Configuration.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/deprecation/Dbcp2Configuration.java @@ -18,7 +18,7 @@ package org.springframework.boot.configurationsample.deprecation; import org.apache.commons.dbcp2.BasicDataSource; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Test configuration for DBCP2 {@link BasicDataSource}. @@ -27,7 +27,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; */ public class Dbcp2Configuration { - @ConfigurationProperties(prefix = "spring.datasource.dbcp2") + @TestConfigurationProperties(prefix = "spring.datasource.dbcp2") BasicDataSource basicDataSource() { return new BasicDataSource(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/CamelCaseEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/CamelCaseEndpoint.java index 81a0dccf2b5..d9188209bea 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/CamelCaseEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/CamelCaseEndpoint.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.endpoint; -import org.springframework.boot.configurationsample.Endpoint; +import org.springframework.boot.configurationsample.TestEndpoint; /** * An endpoint with an upper camel case id. * * @author Stephane Nicoll */ -@Endpoint(id = "PascalCase") +@TestEndpoint(id = "PascalCase") public class CamelCaseEndpoint { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/CustomPropertiesEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/CustomPropertiesEndpoint.java index ace5d9e94b8..5a24e238e6d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/CustomPropertiesEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/CustomPropertiesEndpoint.java @@ -16,22 +16,22 @@ package org.springframework.boot.configurationsample.endpoint; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.Endpoint; -import org.springframework.boot.configurationsample.ReadOperation; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestEndpoint; +import org.springframework.boot.configurationsample.TestReadOperation; /** * An endpoint with additional custom properties. * * @author Stephane Nicoll */ -@Endpoint(id = "customprops") -@ConfigurationProperties("management.endpoint.customprops") +@TestEndpoint(id = "customprops") +@TestConfigurationProperties("management.endpoint.customprops") public class CustomPropertiesEndpoint { private String name = "test"; - @ReadOperation + @TestReadOperation public String getName() { return this.name; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/DisabledEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/DisabledEndpoint.java index 500cb134895..a42b288624c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/DisabledEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/DisabledEndpoint.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.endpoint; -import org.springframework.boot.configurationsample.Endpoint; +import org.springframework.boot.configurationsample.TestEndpoint; /** * An endpoint that is disabled unless configured explicitly. * * @author Stephane Nicoll */ -@Endpoint(id = "disabled", enableByDefault = false) +@TestEndpoint(id = "disabled", enableByDefault = false) public class DisabledEndpoint { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/EnabledEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/EnabledEndpoint.java index 17952591793..e4721d0fea5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/EnabledEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/EnabledEndpoint.java @@ -16,22 +16,22 @@ package org.springframework.boot.configurationsample.endpoint; -import org.springframework.boot.configurationsample.Endpoint; -import org.springframework.boot.configurationsample.ReadOperation; +import org.springframework.boot.configurationsample.TestEndpoint; +import org.springframework.boot.configurationsample.TestReadOperation; /** * An endpoint that is enabled unless configured explicitly. * * @author Stephane Nicoll */ -@Endpoint(id = "enabled") +@TestEndpoint(id = "enabled") public class EnabledEndpoint { public String someMethod() { return "not a read operation"; } - @ReadOperation + @TestReadOperation public String retrieve(String parameter, Integer anotherParameter) { return "not a main read operation"; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/NoAccessEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/NoAccessEndpoint.java index 319f754acf7..54f30666b30 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/NoAccessEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/NoAccessEndpoint.java @@ -16,15 +16,15 @@ package org.springframework.boot.configurationsample.endpoint; -import org.springframework.boot.configurationsample.Access; -import org.springframework.boot.configurationsample.Endpoint; +import org.springframework.boot.configurationsample.TestAccess; +import org.springframework.boot.configurationsample.TestEndpoint; /** * An endpoint with no permitted access unless configured explicitly. * * @author Andy Wilkinson */ -@Endpoint(id = "noaccess", defaultAccess = Access.NONE) +@TestEndpoint(id = "noaccess", defaultAccess = TestAccess.NONE) public class NoAccessEndpoint { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/ReadOnlyAccessEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/ReadOnlyAccessEndpoint.java index c98c8ef1a01..c3849912418 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/ReadOnlyAccessEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/ReadOnlyAccessEndpoint.java @@ -16,15 +16,15 @@ package org.springframework.boot.configurationsample.endpoint; -import org.springframework.boot.configurationsample.Access; -import org.springframework.boot.configurationsample.Endpoint; +import org.springframework.boot.configurationsample.TestAccess; +import org.springframework.boot.configurationsample.TestEndpoint; /** * An endpoint with read-only access unless configured explicitly. * * @author Andy Wilkinson */ -@Endpoint(id = "readonlyaccess", defaultAccess = Access.READ_ONLY) +@TestEndpoint(id = "readonlyaccess", defaultAccess = TestAccess.READ_ONLY) public class ReadOnlyAccessEndpoint { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SimpleEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SimpleEndpoint.java index 25114cd15b9..ce5a6576f8b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SimpleEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SimpleEndpoint.java @@ -16,18 +16,18 @@ package org.springframework.boot.configurationsample.endpoint; -import org.springframework.boot.configurationsample.Endpoint; -import org.springframework.boot.configurationsample.ReadOperation; +import org.springframework.boot.configurationsample.TestEndpoint; +import org.springframework.boot.configurationsample.TestReadOperation; /** * A simple endpoint with no default override. * * @author Stephane Nicoll */ -@Endpoint(id = "simple") +@TestEndpoint(id = "simple") public class SimpleEndpoint { - @ReadOperation + @TestReadOperation public String invoke() { return "test"; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SimpleEndpoint2.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SimpleEndpoint2.java index e19948eb524..bf39cd5a832 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SimpleEndpoint2.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SimpleEndpoint2.java @@ -16,18 +16,18 @@ package org.springframework.boot.configurationsample.endpoint; -import org.springframework.boot.configurationsample.Endpoint; -import org.springframework.boot.configurationsample.ReadOperation; +import org.springframework.boot.configurationsample.TestEndpoint; +import org.springframework.boot.configurationsample.TestReadOperation; /** * A simple endpoint with no default override, with the same id as {@link SimpleEndpoint}. * * @author Moritz Halbritter */ -@Endpoint(id = "simple") +@TestEndpoint(id = "simple") public class SimpleEndpoint2 { - @ReadOperation + @TestReadOperation public String invoke() { return "test"; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SimpleEndpoint3.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SimpleEndpoint3.java index f2849094b62..f591fbc944a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SimpleEndpoint3.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SimpleEndpoint3.java @@ -16,8 +16,8 @@ package org.springframework.boot.configurationsample.endpoint; -import org.springframework.boot.configurationsample.Endpoint; -import org.springframework.boot.configurationsample.ReadOperation; +import org.springframework.boot.configurationsample.TestEndpoint; +import org.springframework.boot.configurationsample.TestReadOperation; /** * A simple endpoint with no default override, with the same id as {@link SimpleEndpoint}, @@ -25,10 +25,10 @@ import org.springframework.boot.configurationsample.ReadOperation; * * @author Moritz Halbritter */ -@Endpoint(id = "simple", enableByDefault = false) +@TestEndpoint(id = "simple", enableByDefault = false) public class SimpleEndpoint3 { - @ReadOperation + @TestReadOperation public String invoke() { return "test"; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SpecificEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SpecificEndpoint.java index 00e38c962db..1a9e9414957 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SpecificEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/SpecificEndpoint.java @@ -16,8 +16,8 @@ package org.springframework.boot.configurationsample.endpoint; -import org.springframework.boot.configurationsample.ReadOperation; -import org.springframework.boot.configurationsample.WebEndpoint; +import org.springframework.boot.configurationsample.TestReadOperation; +import org.springframework.boot.configurationsample.TestWebEndpoint; import org.springframework.lang.Nullable; /** @@ -26,10 +26,10 @@ import org.springframework.lang.Nullable; * * @author Stephane Nicoll */ -@WebEndpoint(id = "specific", enableByDefault = true) +@TestWebEndpoint(id = "specific", enableByDefault = true) public class SpecificEndpoint { - @ReadOperation + @TestReadOperation String invoke(@Nullable String param) { return "test"; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/UnrestrictedAccessEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/UnrestrictedAccessEndpoint.java index 058171525c3..3715c7a1851 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/UnrestrictedAccessEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/UnrestrictedAccessEndpoint.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.endpoint; -import org.springframework.boot.configurationsample.Endpoint; +import org.springframework.boot.configurationsample.TestEndpoint; /** * An endpoint with unrestricted access unless configured explicitly. * * @author Andy Wilkinson */ -@Endpoint(id = "unrestrictedaccess") +@TestEndpoint(id = "unrestrictedaccess") public class UnrestrictedAccessEndpoint { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/incremental/IncrementalEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/incremental/IncrementalEndpoint.java index 6ea6e25c7e3..bc7c1afa37e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/incremental/IncrementalEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/incremental/IncrementalEndpoint.java @@ -16,8 +16,8 @@ package org.springframework.boot.configurationsample.endpoint.incremental; -import org.springframework.boot.configurationsample.Endpoint; -import org.springframework.boot.configurationsample.ReadOperation; +import org.springframework.boot.configurationsample.TestEndpoint; +import org.springframework.boot.configurationsample.TestReadOperation; import org.springframework.lang.Nullable; /** @@ -25,10 +25,10 @@ import org.springframework.lang.Nullable; * * @author Stephane Nicoll */ -@Endpoint(id = "incremental") +@TestEndpoint(id = "incremental") public class IncrementalEndpoint { - @ReadOperation + @TestReadOperation public String invoke(@Nullable String param) { return "test"; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/incremental/IncrementalSpecificEndpoint.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/incremental/IncrementalSpecificEndpoint.java index 3e679b8922d..8503ec9b9e0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/incremental/IncrementalSpecificEndpoint.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/incremental/IncrementalSpecificEndpoint.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.endpoint.incremental; -import org.springframework.boot.configurationsample.JmxEndpoint; +import org.springframework.boot.configurationsample.TestJmxEndpoint; /** * A meta-annotated endpoint. @@ -24,7 +24,7 @@ import org.springframework.boot.configurationsample.JmxEndpoint; * @author Stephane Nicoll * @author Andy Wilkinson */ -@JmxEndpoint(id = "incremental") +@TestJmxEndpoint(id = "incremental") public class IncrementalSpecificEndpoint { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/fieldvalues/FieldValues.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/fieldvalues/FieldValues.java index 22e39ea59d1..5f182588cd6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/fieldvalues/FieldValues.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/fieldvalues/FieldValues.java @@ -22,7 +22,7 @@ import java.time.Duration; import java.time.Period; import java.time.temporal.ChronoUnit; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; import org.springframework.util.MimeType; import org.springframework.util.unit.DataSize; @@ -33,7 +33,7 @@ import org.springframework.util.unit.DataSize; * @author Stephane Nicoll */ @SuppressWarnings("unused") -@ConfigurationProperties +@TestConfigurationProperties public class FieldValues { private static final String STRING_CONST = "c"; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/ComplexGenericProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/ComplexGenericProperties.java index 8deb7f9848e..6a600302831 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/ComplexGenericProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/ComplexGenericProperties.java @@ -16,18 +16,18 @@ package org.springframework.boot.configurationsample.generic; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.NestedConfigurationProperty; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestNestedConfigurationProperty; /** * More advanced generic setup. * * @author Stephane Nicoll */ -@ConfigurationProperties("generic") +@TestConfigurationProperties("generic") public class ComplexGenericProperties { - @NestedConfigurationProperty + @TestNestedConfigurationProperty private final UpperBoundGenericPojo test = new UpperBoundGenericPojo<>(); public UpperBoundGenericPojo getTest() { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/ConcreteBuilderProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/ConcreteBuilderProperties.java index df1e3f4ed1b..0f015abcb23 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/ConcreteBuilderProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/ConcreteBuilderProperties.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.generic; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Builder pattern with a resolved generic * * @author Stephane Nicoll */ -@ConfigurationProperties("builder") +@TestConfigurationProperties("builder") public class ConcreteBuilderProperties extends GenericBuilderProperties { private String description; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/GenericConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/GenericConfig.java index 262f0317275..88ad7c697e5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/GenericConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/GenericConfig.java @@ -19,8 +19,8 @@ package org.springframework.boot.configurationsample.generic; import java.util.HashMap; import java.util.Map; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.NestedConfigurationProperty; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestNestedConfigurationProperty; /** * Demonstrate that only relevant generics are stored in the metadata. @@ -28,7 +28,7 @@ import org.springframework.boot.configurationsample.NestedConfigurationProperty; * @param the type of the config * @author Stephane Nicoll */ -@ConfigurationProperties("generic") +@TestConfigurationProperties("generic") public class GenericConfig { private final Foo foo = new Foo(); @@ -41,7 +41,7 @@ public class GenericConfig { private String name; - @NestedConfigurationProperty + @TestNestedConfigurationProperty private final Bar bar = new Bar<>(); private final Map> stringToBar = new HashMap<>(); @@ -74,7 +74,7 @@ public class GenericConfig { private String name; - @NestedConfigurationProperty + @TestNestedConfigurationProperty private final Biz biz = new Biz<>(); public String getName() { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/SimpleGenericProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/SimpleGenericProperties.java index feb49a1c25b..4350ce1540b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/SimpleGenericProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/SimpleGenericProperties.java @@ -18,14 +18,14 @@ package org.springframework.boot.configurationsample.generic; import java.time.Duration; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Simple properties with resolved generic information. * * @author Stephane Nicoll */ -@ConfigurationProperties("generic") +@TestConfigurationProperties("generic") public class SimpleGenericProperties extends AbstractIntermediateGenericProperties { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UnresolvedGenericProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UnresolvedGenericProperties.java index ac9f32c08ad..3aefd996590 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UnresolvedGenericProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UnresolvedGenericProperties.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.generic; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Properties with unresolved generic information. @@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * @param mapping value type * @author Stephane Nicoll */ -@ConfigurationProperties("generic") +@TestConfigurationProperties("generic") public class UnresolvedGenericProperties extends AbstractGenericProperties { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/WildcardConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/WildcardConfig.java index 980b1d47f64..baaa0d58efb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/WildcardConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/WildcardConfig.java @@ -19,14 +19,14 @@ package org.springframework.boot.configurationsample.generic; import java.util.List; import java.util.Map; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Demonstrate properties with a wildcard type. * * @author Stephane Nicoll */ -@ConfigurationProperties("wildcard") +@TestConfigurationProperties("wildcard") public class WildcardConfig { private Map stringToNumber; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/DeducedImmutableClassProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/DeducedImmutableClassProperties.java index 75c88ae3b0e..fb69d0f8a93 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/DeducedImmutableClassProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/DeducedImmutableClassProperties.java @@ -16,20 +16,20 @@ package org.springframework.boot.configurationsample.immutable; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.DefaultValue; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestDefaultValue; /** * Inner properties, in immutable format. * * @author Phillip Webb */ -@ConfigurationProperties("test") +@TestConfigurationProperties("test") public class DeducedImmutableClassProperties { private final Nested nested; - public DeducedImmutableClassProperties(@DefaultValue Nested nested) { + public DeducedImmutableClassProperties(@TestDefaultValue Nested nested) { this.nested = nested; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableCollectionProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableCollectionProperties.java index b880a7a8b1b..7ecb360eb0e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableCollectionProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableCollectionProperties.java @@ -19,7 +19,7 @@ package org.springframework.boot.configurationsample.immutable; import java.time.Duration; import java.util.List; -import org.springframework.boot.configurationsample.DefaultValue; +import org.springframework.boot.configurationsample.TestDefaultValue; /** * Simple immutable properties with collections types and defaults. @@ -35,8 +35,8 @@ public class ImmutableCollectionProperties { private final List durations; - public ImmutableCollectionProperties(List names, @DefaultValue({ "true", "false" }) List flags, - @DefaultValue({ "10s", "1m", "1h" }) List durations) { + public ImmutableCollectionProperties(List names, @TestDefaultValue({ "true", "false" }) List flags, + @TestDefaultValue({ "10s", "1m", "1h" }) List durations) { this.names = names; this.flags = flags; this.durations = durations; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableDeducedConstructorBindingProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableDeducedConstructorBindingProperties.java index 3d735136d1d..2d4fc90aa51 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableDeducedConstructorBindingProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableDeducedConstructorBindingProperties.java @@ -16,13 +16,13 @@ package org.springframework.boot.configurationsample.immutable; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.DefaultValue; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestDefaultValue; /** * @author Madhura Bhave */ -@ConfigurationProperties("immutable") +@TestConfigurationProperties("immutable") public class ImmutableDeducedConstructorBindingProperties { /** @@ -35,7 +35,7 @@ public class ImmutableDeducedConstructorBindingProperties { */ private final boolean flag; - public ImmutableDeducedConstructorBindingProperties(@DefaultValue("boot") String theName, boolean flag) { + public ImmutableDeducedConstructorBindingProperties(@TestDefaultValue("boot") String theName, boolean flag) { this.theName = theName; this.flag = flag; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableInnerClassProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableInnerClassProperties.java index 351ff981147..ba4e6a647f4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableInnerClassProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableInnerClassProperties.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.immutable; -import org.springframework.boot.configurationsample.NestedConfigurationProperty; +import org.springframework.boot.configurationsample.TestNestedConfigurationProperty; import org.springframework.boot.configurationsample.specific.SimplePojo; /** @@ -30,7 +30,7 @@ public class ImmutableInnerClassProperties { private Foo second; - @NestedConfigurationProperty + @TestNestedConfigurationProperty private final SimplePojo third; private final Fourth fourth; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableMultiConstructorProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableMultiConstructorProperties.java index b291470435f..126193d39f5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableMultiConstructorProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableMultiConstructorProperties.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.immutable; -import org.springframework.boot.configurationsample.ConstructorBinding; +import org.springframework.boot.configurationsample.TestConstructorBinding; /** * Simple immutable properties with several constructors. @@ -37,7 +37,7 @@ public class ImmutableMultiConstructorProperties { this(name, null); } - @ConstructorBinding + @TestConstructorBinding public ImmutableMultiConstructorProperties(String name, String description) { this.name = name; this.description = description; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutablePrimitiveWithDefaultsProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutablePrimitiveWithDefaultsProperties.java index 39c4890a1e7..7645bc5fd81 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutablePrimitiveWithDefaultsProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutablePrimitiveWithDefaultsProperties.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.immutable; -import org.springframework.boot.configurationsample.DefaultValue; +import org.springframework.boot.configurationsample.TestDefaultValue; /** * Simple immutable properties with primitive types and defaults. @@ -42,10 +42,11 @@ public class ImmutablePrimitiveWithDefaultsProperties { private final double ratio; - public ImmutablePrimitiveWithDefaultsProperties(@DefaultValue("true") boolean flag, @DefaultValue("120") byte octet, - @DefaultValue("a") char letter, @DefaultValue("1000") short number, @DefaultValue("42") int counter, - @DefaultValue("2000") long value, @DefaultValue("0.5") float percentage, - @DefaultValue("42.42") double ratio) { + public ImmutablePrimitiveWithDefaultsProperties(@TestDefaultValue("true") boolean flag, + @TestDefaultValue("120") byte octet, @TestDefaultValue("a") char letter, + @TestDefaultValue("1000") short number, @TestDefaultValue("42") int counter, + @TestDefaultValue("2000") long value, @TestDefaultValue("0.5") float percentage, + @TestDefaultValue("42.42") double ratio) { this.flag = flag; this.octet = octet; this.letter = letter; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutablePrimitiveWrapperWithDefaultsProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutablePrimitiveWrapperWithDefaultsProperties.java index 05c061308e3..7223e9d7f96 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutablePrimitiveWrapperWithDefaultsProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutablePrimitiveWrapperWithDefaultsProperties.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.immutable; -import org.springframework.boot.configurationsample.DefaultValue; +import org.springframework.boot.configurationsample.TestDefaultValue; /** * Simple immutable properties with primitive wrapper types and defaults. @@ -42,10 +42,11 @@ public class ImmutablePrimitiveWrapperWithDefaultsProperties { private final Double ratio; - public ImmutablePrimitiveWrapperWithDefaultsProperties(@DefaultValue("true") Boolean flag, - @DefaultValue("120") Byte octet, @DefaultValue("a") Character letter, @DefaultValue("1000") Short number, - @DefaultValue("42") Integer counter, @DefaultValue("2000") Long value, - @DefaultValue("0.5") Float percentage, @DefaultValue("42.42") Double ratio) { + public ImmutablePrimitiveWrapperWithDefaultsProperties(@TestDefaultValue("true") Boolean flag, + @TestDefaultValue("120") Byte octet, @TestDefaultValue("a") Character letter, + @TestDefaultValue("1000") Short number, @TestDefaultValue("42") Integer counter, + @TestDefaultValue("2000") Long value, @TestDefaultValue("0.5") Float percentage, + @TestDefaultValue("42.42") Double ratio) { this.flag = flag; this.octet = octet; this.letter = letter; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableSimpleProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableSimpleProperties.java index 53f30f57a30..d1a1c684f2f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableSimpleProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/ImmutableSimpleProperties.java @@ -18,16 +18,16 @@ package org.springframework.boot.configurationsample.immutable; import java.util.Comparator; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.ConstructorBinding; -import org.springframework.boot.configurationsample.DefaultValue; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestConstructorBinding; +import org.springframework.boot.configurationsample.TestDefaultValue; /** * Simple properties, in immutable format. * * @author Stephane Nicoll */ -@ConfigurationProperties("immutable") +@TestConfigurationProperties("immutable") public class ImmutableSimpleProperties { /** @@ -48,8 +48,8 @@ public class ImmutableSimpleProperties { @SuppressWarnings("unused") private final Long counter; - @ConstructorBinding - public ImmutableSimpleProperties(@DefaultValue("boot") String theName, boolean flag, Comparator comparator, + @TestConstructorBinding + public ImmutableSimpleProperties(@TestDefaultValue("boot") String theName, boolean flag, Comparator comparator, Long counter) { this.theName = theName; this.flag = flag; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/BarProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/BarProperties.java index caeddff6505..a35a4b8d88d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/BarProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/BarProperties.java @@ -16,9 +16,9 @@ package org.springframework.boot.configurationsample.incremental; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; -@ConfigurationProperties("bar") +@TestConfigurationProperties("bar") public class BarProperties { private String name; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/FooProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/FooProperties.java index 3d2d63fbcc0..a4a4ad0c7dc 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/FooProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/FooProperties.java @@ -16,9 +16,9 @@ package org.springframework.boot.configurationsample.incremental; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; -@ConfigurationProperties("foo") +@TestConfigurationProperties("foo") public class FooProperties { private String name; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/RenamedBarProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/RenamedBarProperties.java index 5d2735f1b8f..6a6bc2dce1c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/RenamedBarProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/incremental/RenamedBarProperties.java @@ -16,9 +16,9 @@ package org.springframework.boot.configurationsample.incremental; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; -@ConfigurationProperties("bar") +@TestConfigurationProperties("bar") public class RenamedBarProperties { private String name; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/ChildPropertiesConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/ChildPropertiesConfig.java index b3bb08d77d1..e17f8f8a46b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/ChildPropertiesConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/ChildPropertiesConfig.java @@ -16,11 +16,11 @@ package org.springframework.boot.configurationsample.inheritance; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; public class ChildPropertiesConfig { - @ConfigurationProperties(prefix = "inheritance") + @TestConfigurationProperties(prefix = "inheritance") public ChildProperties childConfig() { return new ChildProperties(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/OverrideChildPropertiesConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/OverrideChildPropertiesConfig.java index ccaca167088..d22dd4ce545 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/OverrideChildPropertiesConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/inheritance/OverrideChildPropertiesConfig.java @@ -16,11 +16,11 @@ package org.springframework.boot.configurationsample.inheritance; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; public class OverrideChildPropertiesConfig { - @ConfigurationProperties(prefix = "inheritance") + @TestConfigurationProperties(prefix = "inheritance") public OverrideChildProperties overrideChildProperties() { return new OverrideChildProperties(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDataProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDataProperties.java index 09adc209403..f04a79e14aa 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDataProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDataProperties.java @@ -21,7 +21,7 @@ import lombok.Data; import lombok.Getter; import lombok.Setter; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Configuration properties using Lombok @Data on element level and overwriting behaviour @@ -30,7 +30,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * @author Jonas Keßler */ @Data -@ConfigurationProperties(prefix = "accesslevel.overwrite.data") +@TestConfigurationProperties(prefix = "accesslevel.overwrite.data") @SuppressWarnings("unused") public class LombokAccessLevelOverwriteDataProperties { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDefaultProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDefaultProperties.java index 3fe4456047c..302cb0f295a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDefaultProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDefaultProperties.java @@ -20,7 +20,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Configuration properties using lombok @Getter and @Setter without explicitly defining @@ -30,7 +30,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; */ @Getter @Setter -@ConfigurationProperties(prefix = "accesslevel.overwrite.default") +@TestConfigurationProperties(prefix = "accesslevel.overwrite.default") public class LombokAccessLevelOverwriteDefaultProperties { @SuppressWarnings("unused") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteExplicitProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteExplicitProperties.java index b3eece75b26..3aff52d38e7 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteExplicitProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteExplicitProperties.java @@ -20,7 +20,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Configuration properties using lombok @Getter and @Setter with explicitly defining @@ -30,7 +30,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; */ @Getter(AccessLevel.PUBLIC) @Setter(AccessLevel.PUBLIC) -@ConfigurationProperties(prefix = "accesslevel.overwrite.explicit") +@TestConfigurationProperties(prefix = "accesslevel.overwrite.explicit") @SuppressWarnings("unused") public class LombokAccessLevelOverwriteExplicitProperties { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelProperties.java index a3bf1d83aba..58c3443b22c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelProperties.java @@ -20,14 +20,14 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Configuration properties without lombok annotations at element level. * * @author Jonas Keßler */ -@ConfigurationProperties(prefix = "accesslevel") +@TestConfigurationProperties(prefix = "accesslevel") public class LombokAccessLevelProperties { @Getter(AccessLevel.PUBLIC) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDefaultValueProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDefaultValueProperties.java index 68ca8b9dfd6..d5c6632f47f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDefaultValueProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDefaultValueProperties.java @@ -18,7 +18,7 @@ package org.springframework.boot.configurationsample.lombok; import lombok.Data; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Configuration properties with default values. @@ -26,7 +26,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * @author Stephane Nicoll */ @Data -@ConfigurationProperties("default") +@TestConfigurationProperties("default") @SuppressWarnings("unused") public class LombokDefaultValueProperties { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDeprecatedProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDeprecatedProperties.java index 4faf862d726..ad2ef3b2580 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDeprecatedProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDeprecatedProperties.java @@ -19,7 +19,7 @@ package org.springframework.boot.configurationsample.lombok; import lombok.Getter; import lombok.Setter; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Deprecated configuration properties. @@ -29,7 +29,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; */ @Getter @Setter -@ConfigurationProperties(prefix = "deprecated") +@TestConfigurationProperties(prefix = "deprecated") @Deprecated @SuppressWarnings("unused") public class LombokDeprecatedProperties { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDeprecatedSingleProperty.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDeprecatedSingleProperty.java index 947ad5da33e..7915a550e6a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDeprecatedSingleProperty.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDeprecatedSingleProperty.java @@ -18,7 +18,7 @@ package org.springframework.boot.configurationsample.lombok; import lombok.Data; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Configuration properties with a single deprecated element. @@ -26,7 +26,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * @author Stephane Nicoll */ @Data -@ConfigurationProperties("singledeprecated") +@TestConfigurationProperties("singledeprecated") @SuppressWarnings("unused") public class LombokDeprecatedSingleProperty { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java index 7197e66f242..6ff88633ebf 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java @@ -22,14 +22,14 @@ import java.util.List; import lombok.Getter; import lombok.Setter; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Configuration properties using lombok @Getter/@Setter at field level. * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "explicit") +@TestConfigurationProperties(prefix = "explicit") public class LombokExplicitProperties { @Getter diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassProperties.java index c9024c260a3..6895832351d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassProperties.java @@ -18,8 +18,8 @@ package org.springframework.boot.configurationsample.lombok; import lombok.Data; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.NestedConfigurationProperty; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestNestedConfigurationProperty; /** * Demonstrate the auto-detection of inner config classes using Lombok. @@ -27,7 +27,7 @@ import org.springframework.boot.configurationsample.NestedConfigurationProperty; * @author Stephane Nicoll */ @Data -@ConfigurationProperties(prefix = "config") +@TestConfigurationProperties(prefix = "config") @SuppressWarnings("unused") public class LombokInnerClassProperties { @@ -35,7 +35,7 @@ public class LombokInnerClassProperties { private Foo second = new Foo(); - @NestedConfigurationProperty + @TestNestedConfigurationProperty private final SimpleLombokPojo third = new SimpleLombokPojo(); private Fourth fourth; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassWithGetterProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassWithGetterProperties.java index aeb25276ddc..50d9d8d9298 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassWithGetterProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokInnerClassWithGetterProperties.java @@ -18,10 +18,10 @@ package org.springframework.boot.configurationsample.lombok; import lombok.Data; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; @Data -@ConfigurationProperties(prefix = "config") +@TestConfigurationProperties(prefix = "config") @SuppressWarnings("unused") public class LombokInnerClassWithGetterProperties { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleDataProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleDataProperties.java index d52f39f2617..efbdb013782 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleDataProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleDataProperties.java @@ -21,7 +21,7 @@ import java.util.List; import lombok.Data; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Configuration properties using lombok @Data. @@ -29,7 +29,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * @author Stephane Nicoll */ @Data -@ConfigurationProperties(prefix = "data") +@TestConfigurationProperties(prefix = "data") @SuppressWarnings("unused") public class LombokSimpleDataProperties { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleProperties.java index b2b24fcb352..ef90fd4db16 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleProperties.java @@ -22,7 +22,7 @@ import java.util.List; import lombok.Getter; import lombok.Setter; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Configuration properties using lombok @Getter/@Setter at class level. @@ -31,7 +31,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; */ @Getter @Setter -@ConfigurationProperties(prefix = "simple") +@TestConfigurationProperties(prefix = "simple") @SuppressWarnings("unused") public class LombokSimpleProperties { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleValueProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleValueProperties.java index acda7254369..6239a06aff0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleValueProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleValueProperties.java @@ -21,7 +21,7 @@ import java.util.List; import lombok.Value; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Configuration properties using Lombok {@code @Value}. @@ -29,7 +29,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * @author Mark Jeffrey */ @Value -@ConfigurationProperties(prefix = "value") +@TestConfigurationProperties(prefix = "value") @SuppressWarnings("unused") public class LombokSimpleValueProperties { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedClassMethodConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedClassMethodConfig.java index 434bfc95bc0..8e9886e4bee 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedClassMethodConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedClassMethodConfig.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.method; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample for testing method configuration with deprecated class. @@ -27,7 +27,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; @Deprecated public class DeprecatedClassMethodConfig { - @ConfigurationProperties(prefix = "foo") + @TestConfigurationProperties(prefix = "foo") public Foo foo() { return new Foo(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java index ecfdff2f07f..0cbcceb974f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.method; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample for testing deprecated method configuration. @@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; */ public class DeprecatedMethodConfig { - @ConfigurationProperties(prefix = "foo") + @TestConfigurationProperties(prefix = "foo") @Deprecated public Foo foo() { return new Foo(); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/EmptyTypeMethodConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/EmptyTypeMethodConfig.java index 488531b2ea3..2a116aad102 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/EmptyTypeMethodConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/EmptyTypeMethodConfig.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.method; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample for testing method configuration. * * @author Stephane Nicoll */ -@ConfigurationProperties("something") +@TestConfigurationProperties("something") public class EmptyTypeMethodConfig { private String name; @@ -36,7 +36,7 @@ public class EmptyTypeMethodConfig { this.name = name; } - @ConfigurationProperties("something") + @TestConfigurationProperties("something") public Foo foo() { return new Foo(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/InvalidMethodConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/InvalidMethodConfig.java index bfb78576c33..508087a8601 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/InvalidMethodConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/InvalidMethodConfig.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.method; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample for testing invalid method configuration. * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "something") +@TestConfigurationProperties(prefix = "something") public class InvalidMethodConfig { private String name; @@ -36,7 +36,7 @@ public class InvalidMethodConfig { this.name = name; } - @ConfigurationProperties(prefix = "invalid") + @TestConfigurationProperties(prefix = "invalid") InvalidMethodConfig foo() { return new InvalidMethodConfig(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/MethodAndClassConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/MethodAndClassConfig.java index 74fc1d72a20..922a5bf1489 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/MethodAndClassConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/MethodAndClassConfig.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.method; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample for testing mixed method and class configuration. * * @author Stephane Nicoll */ -@ConfigurationProperties("conflict") +@TestConfigurationProperties("conflict") public class MethodAndClassConfig { private String value; @@ -36,7 +36,7 @@ public class MethodAndClassConfig { this.value = value; } - @ConfigurationProperties(prefix = "conflict") + @TestConfigurationProperties(prefix = "conflict") public Foo foo() { return new Foo(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/NestedPropertiesMethod.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/NestedPropertiesMethod.java index 915703f2e93..be1061caed3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/NestedPropertiesMethod.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/NestedPropertiesMethod.java @@ -16,10 +16,10 @@ package org.springframework.boot.configurationsample.method; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.NestedConfigurationProperty; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestNestedConfigurationProperty; -@ConfigurationProperties("method-nested") +@TestConfigurationProperties("method-nested") public class NestedPropertiesMethod { private String myProperty; @@ -36,7 +36,7 @@ public class NestedPropertiesMethod { this.myProperty = myProperty; } - @NestedConfigurationProperty + @TestNestedConfigurationProperty public NestedProperty getNested() { return this.nested; } @@ -59,7 +59,7 @@ public class NestedPropertiesMethod { this.myInnerProperty = myInnerProperty; } - @NestedConfigurationProperty + @TestNestedConfigurationProperty public NestedProperty getNested() { return this.nested; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/PackagePrivateMethodConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/PackagePrivateMethodConfig.java index 73286aac53a..1efcdb67ed2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/PackagePrivateMethodConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/PackagePrivateMethodConfig.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.method; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample for testing package-private method configuration. @@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; */ public class PackagePrivateMethodConfig { - @ConfigurationProperties(prefix = "foo") + @TestConfigurationProperties(prefix = "foo") Foo foo() { return new Foo(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/PrivateMethodConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/PrivateMethodConfig.java index 0cc1fded26e..ae004f9f959 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/PrivateMethodConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/PrivateMethodConfig.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.method; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample for testing private method configuration. @@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; */ public class PrivateMethodConfig { - @ConfigurationProperties(prefix = "foo") + @TestConfigurationProperties(prefix = "foo") private Foo foo() { return new Foo(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/ProtectedMethodConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/ProtectedMethodConfig.java index 845d3b6fbd6..e9c090ef813 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/ProtectedMethodConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/ProtectedMethodConfig.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.method; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample for testing protected method configuration. @@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; */ public class ProtectedMethodConfig { - @ConfigurationProperties(prefix = "foo") + @TestConfigurationProperties(prefix = "foo") protected Foo foo() { return new Foo(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/PublicMethodConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/PublicMethodConfig.java index a55c77b2959..69af19909d6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/PublicMethodConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/PublicMethodConfig.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.method; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample for testing public method configuration. @@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; */ public class PublicMethodConfig { - @ConfigurationProperties(prefix = "foo") + @TestConfigurationProperties(prefix = "foo") public Foo foo() { return new Foo(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/SingleConstructorMethodConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/SingleConstructorMethodConfig.java index 6f0a4495ffd..50762c3de4e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/SingleConstructorMethodConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/SingleConstructorMethodConfig.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.method; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample for testing method configuration that uses a constructor that should not be @@ -27,7 +27,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; @SuppressWarnings("unused") public class SingleConstructorMethodConfig { - @ConfigurationProperties(prefix = "foo") + @TestConfigurationProperties(prefix = "foo") public Foo foo() { return new Foo(new Object()); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/ConstructorParameterNameAnnotationProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/ConstructorParameterNameAnnotationProperties.java index cc966345f91..4e61cc20233 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/ConstructorParameterNameAnnotationProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/ConstructorParameterNameAnnotationProperties.java @@ -16,9 +16,9 @@ package org.springframework.boot.configurationsample.name; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.DefaultValue; -import org.springframework.boot.configurationsample.Name; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestDefaultValue; +import org.springframework.boot.configurationsample.TestName; /** * Constructor properties making use of {@code @Name}. @@ -26,7 +26,7 @@ import org.springframework.boot.configurationsample.Name; * @author Phillip Webb * @author Stephane Nicoll */ -@ConfigurationProperties("named") +@TestConfigurationProperties("named") public class ConstructorParameterNameAnnotationProperties { /** @@ -39,8 +39,8 @@ public class ConstructorParameterNameAnnotationProperties { */ private final boolean defaultValue; - public ConstructorParameterNameAnnotationProperties(@Name("import") String imports, - @Name("default") @DefaultValue("true") boolean defaultValue) { + public ConstructorParameterNameAnnotationProperties(@TestName("import") String imports, + @TestName("default") @TestDefaultValue("true") boolean defaultValue) { this.imports = imports; this.defaultValue = defaultValue; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/JavaBeanNameAnnotationProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/JavaBeanNameAnnotationProperties.java index 2e5b850df08..c874c6e3dbc 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/JavaBeanNameAnnotationProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/JavaBeanNameAnnotationProperties.java @@ -16,8 +16,8 @@ package org.springframework.boot.configurationsample.name; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.Name; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestName; /** * Java bean properties making use of {@code @Name}. @@ -25,19 +25,19 @@ import org.springframework.boot.configurationsample.Name; * @author Andy Wilkinson * @author Stephane Nicoll */ -@ConfigurationProperties("named") +@TestConfigurationProperties("named") public class JavaBeanNameAnnotationProperties { /** * Imports to apply. */ - @Name("import") + @TestName("import") private String imports; /** * Whether default mode is enabled. */ - @Name("default") + @TestName("default") private boolean defaultValue = true; public String getImports() { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/LombokNameAnnotationProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/LombokNameAnnotationProperties.java index a469852f221..ce98aefaa6c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/LombokNameAnnotationProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/LombokNameAnnotationProperties.java @@ -19,8 +19,8 @@ package org.springframework.boot.configurationsample.name; import lombok.Getter; import lombok.Setter; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.Name; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestName; /** * Lombok properties making use of {@code @Name}. @@ -29,19 +29,19 @@ import org.springframework.boot.configurationsample.Name; */ @Getter @Setter -@ConfigurationProperties("named") +@TestConfigurationProperties("named") public class LombokNameAnnotationProperties { /** * Imports to apply. */ - @Name("import") + @TestName("import") private String imports; /** * Whether default mode is enabled. */ - @Name("default") + @TestName("default") private boolean defaultValue = true; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/RecordComponentNameAnnotationProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/RecordComponentNameAnnotationProperties.java index d5fb3936e5f..486597557de 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/RecordComponentNameAnnotationProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/name/RecordComponentNameAnnotationProperties.java @@ -16,9 +16,9 @@ package org.springframework.boot.configurationsample.name; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.DefaultValue; -import org.springframework.boot.configurationsample.Name; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestDefaultValue; +import org.springframework.boot.configurationsample.TestName; /** * Record properties making use of {@code @Name}. @@ -28,8 +28,8 @@ import org.springframework.boot.configurationsample.Name; * @author Andy Wilkinson * @author Stephane Nicoll */ -@ConfigurationProperties("named") -public record RecordComponentNameAnnotationProperties(@Name("import") String imports, - @Name("default") @DefaultValue("true") boolean defaultValue) { +@TestConfigurationProperties("named") +public record RecordComponentNameAnnotationProperties(@TestName("import") String imports, + @TestName("default") @TestDefaultValue("true") boolean defaultValue) { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/record/ExampleRecord.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/record/ExampleRecord.java index c004f431678..7e15a958263 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/record/ExampleRecord.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/record/ExampleRecord.java @@ -16,7 +16,8 @@ package org.springframework.boot.configurationsample.record; -import org.springframework.boot.configurationsample.Name; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestName; /** * Example Record Javadoc sample @@ -30,7 +31,7 @@ import org.springframework.boot.configurationsample.Name; * @since 1.0.0 * @author Pavel Anisimov */ -@org.springframework.boot.configurationsample.ConfigurationProperties("record.descriptions") +@TestConfigurationProperties("record.descriptions") public record ExampleRecord(String someString, Integer someInteger, Boolean someBoolean, Long someLong, - @Name("named.record.component") String namedComponent, Byte someByte) { + @TestName("named.record.component") String namedComponent, Byte someByte) { } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/record/NestedPropertiesRecord.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/record/NestedPropertiesRecord.java index 3329dd75a85..2a2890a3ec5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/record/NestedPropertiesRecord.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/record/NestedPropertiesRecord.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.record; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.NestedConfigurationProperty; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestNestedConfigurationProperty; -@ConfigurationProperties("record-nested") -public record NestedPropertiesRecord(String myProperty, @NestedConfigurationProperty NestedRecord nested, +@TestConfigurationProperties("record-nested") +public record NestedPropertiesRecord(String myProperty, @TestNestedConfigurationProperty NestedRecord nested, InnerPropertiesRecord inner) { - public record InnerPropertiesRecord(String myInnerProperty, @NestedConfigurationProperty NestedRecord nested) { + public record InnerPropertiesRecord(String myInnerProperty, @TestNestedConfigurationProperty NestedRecord nested) { } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/record/RecordWithGetter.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/record/RecordWithGetter.java index 61aa4919643..cbdec0b37d8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/record/RecordWithGetter.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/record/RecordWithGetter.java @@ -16,9 +16,9 @@ package org.springframework.boot.configurationsample.record; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; -@ConfigurationProperties("record-with-getter") +@TestConfigurationProperties("record-with-getter") public record RecordWithGetter(String alpha) { public String getBravo() { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/recursive/RecursiveProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/recursive/RecursiveProperties.java index 01af486bf8f..5bb8d182cfe 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/recursive/RecursiveProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/recursive/RecursiveProperties.java @@ -16,9 +16,9 @@ package org.springframework.boot.configurationsample.recursive; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; -@ConfigurationProperties("prefix") +@TestConfigurationProperties("prefix") public class RecursiveProperties { private RecursiveProperties recursive; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/AutowiredProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/AutowiredProperties.java index 2ec623add0f..37ed6f90daf 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/AutowiredProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/AutowiredProperties.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.simple; -import org.springframework.boot.configurationsample.Autowired; +import org.springframework.boot.configurationsample.TestAutowired; /** * Properties with autowired constructor. @@ -30,7 +30,7 @@ public class AutowiredProperties { */ private String theName; - @Autowired + @TestAutowired public AutowiredProperties(String theName) { this.theName = theName; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java index 9d8681e50dc..3acedcc8bbb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.simple; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Class with nested configuration properties. @@ -39,7 +39,7 @@ public class ClassWithNestedProperties { } - @ConfigurationProperties(prefix = "nestedChildProps") + @TestConfigurationProperties(prefix = "nestedChildProps") public static class NestedChildClass extends NestedParentClass { private int childClassProperty = 20; 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 index bbba0c7e365..229d32280c3 100644 --- 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 @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.simple; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Configuration properties with a single deprecated element. * * @author Andy Wilkinson */ -@ConfigurationProperties("singlefielddeprecated") +@TestConfigurationProperties("singlefielddeprecated") public class DeprecatedFieldSingleProperty { @Deprecated diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedProperties.java index fe5ce94788d..b5393c20c9e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedProperties.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.simple; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Deprecated configuration properties. @@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * @deprecated deprecated */ @Deprecated -@ConfigurationProperties(prefix = "deprecated") +@TestConfigurationProperties(prefix = "deprecated") public class DeprecatedProperties { private String name; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedRecord.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedRecord.java index 45405feb9c6..27ac5574bb8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedRecord.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedRecord.java @@ -16,9 +16,9 @@ package org.springframework.boot.configurationsample.simple; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.DeprecatedConfigurationProperty; -import org.springframework.boot.configurationsample.Name; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestDeprecatedConfigurationProperty; +import org.springframework.boot.configurationsample.TestName; /** * Configuration properties as record with deprecated property. @@ -28,17 +28,17 @@ import org.springframework.boot.configurationsample.Name; * @param charlie charlie property, named, deprecated * @author Moritz Halbritter */ -@ConfigurationProperties("deprecated-record") -public record DeprecatedRecord(String alpha, String bravo, @Name("named.charlie") String charlie) { +@TestConfigurationProperties("deprecated-record") +public record DeprecatedRecord(String alpha, String bravo, @TestName("named.charlie") String charlie) { @Deprecated - @DeprecatedConfigurationProperty(reason = "some-reason") + @TestDeprecatedConfigurationProperty(reason = "some-reason") public String alpha() { return this.alpha; } @Deprecated - @DeprecatedConfigurationProperty(reason = "another-reason") + @TestDeprecatedConfigurationProperty(reason = "another-reason") public String charlie() { return this.charlie; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedSingleProperty.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedSingleProperty.java index 50beaede9de..3c60e8143a5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedSingleProperty.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedSingleProperty.java @@ -16,21 +16,21 @@ package org.springframework.boot.configurationsample.simple; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.DeprecatedConfigurationProperty; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestDeprecatedConfigurationProperty; /** * Configuration properties with a single deprecated element. * * @author Phillip Webb */ -@ConfigurationProperties("singledeprecated") +@TestConfigurationProperties("singledeprecated") public class DeprecatedSingleProperty { private String newName; @Deprecated - @DeprecatedConfigurationProperty(reason = "renamed", replacement = "singledeprecated.new-name", since = "1.2.3") + @TestDeprecatedConfigurationProperty(reason = "renamed", replacement = "singledeprecated.new-name", since = "1.2.3") public String getName() { return getNewName(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DescriptionProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DescriptionProperties.java index 8ec9e3037a1..e211792c77a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DescriptionProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DescriptionProperties.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.simple; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Configuration properties with various description styles. * * @author Stephane Nicoll */ -@ConfigurationProperties("description") +@TestConfigurationProperties("description") public class DescriptionProperties { /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/HierarchicalProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/HierarchicalProperties.java index c4dc6872f95..80defef4a2c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/HierarchicalProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/HierarchicalProperties.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.simple; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Configuration properties with inherited values. * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "hierarchical") +@TestConfigurationProperties(prefix = "hierarchical") public class HierarchicalProperties extends HierarchicalPropertiesParent { /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/InnerClassWithPrivateConstructor.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/InnerClassWithPrivateConstructor.java index 4adb5b3e34d..52fb13548ac 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/InnerClassWithPrivateConstructor.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/InnerClassWithPrivateConstructor.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.simple; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Nested properties with a private constructor. * * @author Phillip Webb */ -@ConfigurationProperties(prefix = "config") +@TestConfigurationProperties(prefix = "config") public class InnerClassWithPrivateConstructor { private Nested nested = new Nested("whatever"); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleArrayProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleArrayProperties.java index be74792bc7e..65757075a9a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleArrayProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleArrayProperties.java @@ -18,14 +18,14 @@ package org.springframework.boot.configurationsample.simple; import java.util.Map; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Properties with array. * * @author Stephane Nicoll */ -@ConfigurationProperties("array") +@TestConfigurationProperties("array") public class SimpleArrayProperties { private int[] primitive; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleCollectionProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleCollectionProperties.java index cbbe539b9e5..bf160615735 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleCollectionProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleCollectionProperties.java @@ -23,14 +23,14 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Properties with collections. * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "collection") +@TestConfigurationProperties(prefix = "collection") public class SimpleCollectionProperties { private Map integersToNames; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimplePrefixValueProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimplePrefixValueProperties.java index 136d7727ed7..f6d079e8515 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimplePrefixValueProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimplePrefixValueProperties.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.simple; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Properties with a simple prefix. * * @author Stephane Nicoll */ -@ConfigurationProperties("simple") +@TestConfigurationProperties("simple") public class SimplePrefixValueProperties { private String name; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleProperties.java index 9958ec01bd6..d892768ee10 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleProperties.java @@ -19,14 +19,14 @@ package org.springframework.boot.configurationsample.simple; import java.beans.FeatureDescriptor; import java.util.Comparator; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Simple properties. * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "simple") +@TestConfigurationProperties(prefix = "simple") public class SimpleProperties { /** diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleTypeProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleTypeProperties.java index 9f059486fa2..755cd273d7d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleTypeProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleTypeProperties.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.simple; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Expose simple types to make sure these are detected properly. * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "simple.type") +@TestConfigurationProperties(prefix = "simple.type") public class SimpleTypeProperties { private String myString; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/AnnotatedGetter.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/AnnotatedGetter.java index 84e3baf6808..98f30046bbf 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/AnnotatedGetter.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/AnnotatedGetter.java @@ -18,7 +18,7 @@ package org.springframework.boot.configurationsample.specific; import jakarta.validation.constraints.NotEmpty; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * An annotated getter with {@code NotEmpty} that triggers a different class type in the @@ -26,7 +26,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * * @author Stephane Nicoll */ -@ConfigurationProperties("specific") +@TestConfigurationProperties("specific") public class AnnotatedGetter { private String name; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BoxingPojo.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BoxingPojo.java index 0267b22a2ee..1671b3a570d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BoxingPojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BoxingPojo.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Demonstrate the use of boxing/unboxing. Even if the type does not strictly match, it @@ -24,7 +24,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * * @author Stephane Nicoll */ -@ConfigurationProperties("boxing") +@TestConfigurationProperties("boxing") public class BoxingPojo { private boolean flag; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BuilderPojo.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BuilderPojo.java index 0a5353ccbe4..027327cbe0b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BuilderPojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BuilderPojo.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample with builder style setters. * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "builder") +@TestConfigurationProperties(prefix = "builder") public class BuilderPojo { private String name; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/DeprecatedLessPreciseTypePojo.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/DeprecatedLessPreciseTypePojo.java index 182ee17a702..adf07a28d28 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/DeprecatedLessPreciseTypePojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/DeprecatedLessPreciseTypePojo.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Demonstrate that deprecating accessor with not the same type is not taken into account @@ -24,7 +24,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * * @author Stephane Nicoll */ -@ConfigurationProperties("not.deprecated") +@TestConfigurationProperties("not.deprecated") public class DeprecatedLessPreciseTypePojo { private boolean flag; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/DeprecatedUnrelatedMethodPojo.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/DeprecatedUnrelatedMethodPojo.java index a56e01d4acf..58b88b96563 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/DeprecatedUnrelatedMethodPojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/DeprecatedUnrelatedMethodPojo.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Demonstrate that an unrelated setter is not taken into account to detect the deprecated @@ -24,7 +24,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * * @author Stephane Nicoll */ -@ConfigurationProperties("not.deprecated") +@TestConfigurationProperties("not.deprecated") public class DeprecatedUnrelatedMethodPojo { private Integer counter; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/DoubleRegistrationProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/DoubleRegistrationProperties.java index 15524b93fe5..33f3e12da5e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/DoubleRegistrationProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/DoubleRegistrationProperties.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Test that the same type can be registered several times if the prefix is different. @@ -25,12 +25,12 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; */ public class DoubleRegistrationProperties { - @ConfigurationProperties("one") + @TestConfigurationProperties("one") public SimplePojo one() { return new SimplePojo(); } - @ConfigurationProperties("two") + @TestConfigurationProperties("two") public SimplePojo two() { return new SimplePojo(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/EmptyDefaultValueProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/EmptyDefaultValueProperties.java index ecb328c17c6..5d355713742 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/EmptyDefaultValueProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/EmptyDefaultValueProperties.java @@ -16,22 +16,22 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.ConstructorBinding; -import org.springframework.boot.configurationsample.DefaultValue; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestConstructorBinding; +import org.springframework.boot.configurationsample.TestDefaultValue; /** * Demonstrates that an empty default value on a property leads to no default value. * * @author Stephane Nicoll */ -@ConfigurationProperties("test") +@TestConfigurationProperties("test") public class EmptyDefaultValueProperties { private final String name; - @ConstructorBinding - public EmptyDefaultValueProperties(@DefaultValue String name) { + @TestConstructorBinding + public EmptyDefaultValueProperties(@TestDefaultValue String name) { this.name = name; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/EnumValuesPojo.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/EnumValuesPojo.java index e6d98d98c6a..b3b6ca6113a 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/EnumValuesPojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/EnumValuesPojo.java @@ -19,14 +19,14 @@ package org.springframework.boot.configurationsample.specific; import java.time.temporal.ChronoField; import java.time.temporal.ChronoUnit; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample config for enum and default values. * * @author Stephane Nicoll */ -@ConfigurationProperties("test") +@TestConfigurationProperties("test") public class EnumValuesPojo { private ChronoUnit seconds = ChronoUnit.SECONDS; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/ExcludedTypesPojo.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/ExcludedTypesPojo.java index 432fc8b95de..b67cb793ab4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/ExcludedTypesPojo.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/ExcludedTypesPojo.java @@ -21,7 +21,7 @@ import java.io.Writer; import javax.sql.DataSource; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample config with types that should not be added to the meta-data as we have no way to @@ -29,7 +29,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "excluded") +@TestConfigurationProperties(prefix = "excluded") public class ExcludedTypesPojo { private String name; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassAnnotatedGetterConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassAnnotatedGetterConfig.java index 389f99bd7ef..79fa45ddb65 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassAnnotatedGetterConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassAnnotatedGetterConfig.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Demonstrate that a method that exposes a root group within an annotated class is @@ -24,7 +24,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; * * @author Stephane Nicoll */ -@ConfigurationProperties("specific") +@TestConfigurationProperties("specific") public class InnerClassAnnotatedGetterConfig { private String value; @@ -37,7 +37,7 @@ public class InnerClassAnnotatedGetterConfig { this.value = value; } - @ConfigurationProperties("foo") + @TestConfigurationProperties("foo") public Foo getFoo() { return new Foo(); } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassHierarchicalProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassHierarchicalProperties.java index 681ea2ec40b..e2e0a9fa465 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassHierarchicalProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassHierarchicalProperties.java @@ -16,16 +16,17 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.NestedConfigurationProperty; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestNestedConfigurationProperty; /** * Demonstrate inner classes end up in metadata regardless of position in hierarchy and - * without the use of {@link NestedConfigurationProperty @NestedConfigurationProperty}. + * without the use of + * {@link TestNestedConfigurationProperty @NestedConfigurationProperty}. * * @author Madhura Bhave */ -@ConfigurationProperties(prefix = "config") +@TestConfigurationProperties(prefix = "config") public class InnerClassHierarchicalProperties { private Foo foo; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java index 84b8e9f02e4..224c20b6dbe 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java @@ -16,22 +16,22 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.NestedConfigurationProperty; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestNestedConfigurationProperty; /** * Demonstrate the auto-detection of inner config classes. * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "config") +@TestConfigurationProperties(prefix = "config") public class InnerClassProperties { private final Foo first = new Foo(); private Foo second = new Foo(); - @NestedConfigurationProperty + @TestNestedConfigurationProperty private final SimplePojo third = new SimplePojo(); private Fourth fourth; @@ -62,7 +62,7 @@ public class InnerClassProperties { this.fourth = fourth; } - @NestedConfigurationProperty + @TestNestedConfigurationProperty public DeprecatedSimplePojo getFifth() { return this.fifth; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassRootConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassRootConfig.java index b08ae055f42..d9b29905b62 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassRootConfig.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassRootConfig.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Sample with a simple inner class config. @@ -25,7 +25,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; */ public class InnerClassRootConfig { - @ConfigurationProperties(prefix = "config") + @TestConfigurationProperties(prefix = "config") public static class Config { private String name; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidAccessorProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidAccessorProperties.java index 4bd13371234..b13d9b04145 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidAccessorProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidAccessorProperties.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Demonstrates that invalid accessors are ignored. * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "config") +@TestConfigurationProperties(prefix = "config") public class InvalidAccessorProperties { private String name; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDefaultValueCharacterProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDefaultValueCharacterProperties.java index 62686c69374..e841834a1e2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDefaultValueCharacterProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDefaultValueCharacterProperties.java @@ -16,22 +16,22 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.ConstructorBinding; -import org.springframework.boot.configurationsample.DefaultValue; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestConstructorBinding; +import org.springframework.boot.configurationsample.TestDefaultValue; /** * Demonstrates that an invalid default character value leads to a compilation failure. * * @author Stephane Nicoll */ -@ConfigurationProperties("test") +@TestConfigurationProperties("test") public class InvalidDefaultValueCharacterProperties { private final char letter; - @ConstructorBinding - public InvalidDefaultValueCharacterProperties(@DefaultValue("bad") char letter) { + @TestConstructorBinding + public InvalidDefaultValueCharacterProperties(@TestDefaultValue("bad") char letter) { this.letter = letter; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDefaultValueFloatingPointProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDefaultValueFloatingPointProperties.java index 5ceebb18743..4e26e65d97c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDefaultValueFloatingPointProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDefaultValueFloatingPointProperties.java @@ -16,8 +16,8 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.DefaultValue; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestDefaultValue; /** * Demonstrates that an invalid default floating point value leads to a compilation @@ -25,12 +25,12 @@ import org.springframework.boot.configurationsample.DefaultValue; * * @author Stephane Nicoll */ -@ConfigurationProperties("test") +@TestConfigurationProperties("test") public class InvalidDefaultValueFloatingPointProperties { private final Double ratio; - public InvalidDefaultValueFloatingPointProperties(@DefaultValue("55.55.33") Double ratio) { + public InvalidDefaultValueFloatingPointProperties(@TestDefaultValue("55.55.33") Double ratio) { this.ratio = ratio; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDefaultValueNumberProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDefaultValueNumberProperties.java index 6517ef47120..7acbcf52c14 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDefaultValueNumberProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDefaultValueNumberProperties.java @@ -16,20 +16,20 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; -import org.springframework.boot.configurationsample.DefaultValue; +import org.springframework.boot.configurationsample.TestConfigurationProperties; +import org.springframework.boot.configurationsample.TestDefaultValue; /** * Demonstrates that an invalid default number value leads to a compilation failure. * * @author Stephane Nicoll */ -@ConfigurationProperties("test") +@TestConfigurationProperties("test") public class InvalidDefaultValueNumberProperties { private final int counter; - public InvalidDefaultValueNumberProperties(@DefaultValue("invalid") int counter) { + public InvalidDefaultValueNumberProperties(@TestDefaultValue("invalid") int counter) { this.counter = counter; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java index 52db7438dce..7e8a5eca31e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InvalidDoubleRegistrationProperties.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * Test that compilation fails if the same type is registered twice with the same prefix. @@ -25,12 +25,12 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; */ public class InvalidDoubleRegistrationProperties { - @ConfigurationProperties("foo") + @TestConfigurationProperties("foo") public Foo foo() { return new Foo(); } - @ConfigurationProperties("foo") + @TestConfigurationProperties("foo") public static class Foo { private String name; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/SimpleConflictingProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/SimpleConflictingProperties.java index 346056c2f5c..2af7b5a709f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/SimpleConflictingProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/SimpleConflictingProperties.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; import org.springframework.boot.configurationsample.simple.SimpleProperties; /** @@ -24,7 +24,7 @@ import org.springframework.boot.configurationsample.simple.SimpleProperties; * * @author Stephane Nicoll */ -@ConfigurationProperties("simple") +@TestConfigurationProperties("simple") public class SimpleConflictingProperties { private String flag = "hello"; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/StaticAccessor.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/StaticAccessor.java index e2be77faeba..798b4bf72fc 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/StaticAccessor.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/StaticAccessor.java @@ -16,14 +16,14 @@ package org.springframework.boot.configurationsample.specific; -import org.springframework.boot.configurationsample.ConfigurationProperties; +import org.springframework.boot.configurationsample.TestConfigurationProperties; /** * A property that is exposed by static accessors. * * @author Stephane Nicoll */ -@ConfigurationProperties("specific") +@TestConfigurationProperties("specific") public class StaticAccessor { private static String name;