diff --git a/buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureCheck.java b/buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureCheck.java index d1d830d60e68..668a4271db62 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureCheck.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitectureCheck.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2024 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,6 +39,7 @@ import com.tngtech.archunit.core.domain.JavaParameter; import com.tngtech.archunit.core.domain.JavaType; import com.tngtech.archunit.core.domain.properties.CanBeAnnotated; +import com.tngtech.archunit.core.domain.properties.HasAnnotations; import com.tngtech.archunit.core.domain.properties.HasName; import com.tngtech.archunit.core.domain.properties.HasOwner.Predicates.With; import com.tngtech.archunit.core.domain.properties.HasParameterTypes; @@ -95,7 +96,9 @@ public ArchitectureCheck() { noClassesShouldLoadResourcesUsingResourceUtils(), noClassesShouldCallStringToUpperCaseWithoutLocale(), noClassesShouldCallStringToLowerCaseWithoutLocale(), conditionalOnMissingBeanShouldNotSpecifyOnlyATypeThatIsTheSameAsMethodReturnType(), - enumSourceShouldNotSpecifyOnlyATypeThatIsTheSameAsMethodParameterType()); + enumSourceShouldNotSpecifyOnlyATypeThatIsTheSameAsMethodParameterType(), + classLevelConfigurationPropertiesShouldNotSpecifyOnlyPrefixAttribute(), + methodLevelConfigurationPropertiesShouldNotSpecifyOnlyPrefixAttribute()); getRules().addAll(getProhibitObjectsRequireNonNull() .map((prohibit) -> prohibit ? noClassesShouldCallObjectsRequireNonNull() : Collections.emptyList())); getRuleDescriptions().set(getRules().map((rules) -> rules.stream().map(ArchRule::getDescription).toList())); @@ -329,6 +332,39 @@ public void check(JavaMethod item, ConditionEvents events) { }; } + private ArchRule classLevelConfigurationPropertiesShouldNotSpecifyOnlyPrefixAttribute() { + return ArchRuleDefinition.classes() + .that() + .areAnnotatedWith("org.springframework.boot.context.properties.ConfigurationProperties") + .should(notSpecifyOnlyPrefixAttributeOfConfigurationProperties()) + .allowEmptyShould(true); + } + + private ArchRule methodLevelConfigurationPropertiesShouldNotSpecifyOnlyPrefixAttribute() { + return ArchRuleDefinition.methods() + .that() + .areAnnotatedWith("org.springframework.boot.context.properties.ConfigurationProperties") + .should(notSpecifyOnlyPrefixAttributeOfConfigurationProperties()) + .allowEmptyShould(true); + } + + private ArchCondition> notSpecifyOnlyPrefixAttributeOfConfigurationProperties() { + return new ArchCondition<>("not specify only prefix attribute of @ConfigurationProperties") { + + @Override + public void check(HasAnnotations item, ConditionEvents events) { + JavaAnnotation configurationProperties = item + .getAnnotationOfType("org.springframework.boot.context.properties.ConfigurationProperties"); + Map properties = configurationProperties.getProperties(); + if (properties.size() == 1 && properties.containsKey("prefix")) { + events.add(SimpleConditionEvent.violated(item, configurationProperties.getDescription() + + " should specify implicit 'value' attribute other than explicit 'prefix' attribute")); + } + } + + }; + } + public void setClasses(FileCollection classes) { this.classes = classes; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/CorsEndpointProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/CorsEndpointProperties.java index 287b70f921f9..ebbed192743f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/CorsEndpointProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/CorsEndpointProperties.java @@ -33,7 +33,7 @@ * @author Andy Wilkinson * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.endpoints.web.cors") +@ConfigurationProperties("management.endpoints.web.cors") public class CorsEndpointProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointProperties.java index 5201b917676a..2982e7958d7f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointProperties.java @@ -32,7 +32,7 @@ * @author Phillip Webb * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.endpoints.web") +@ConfigurationProperties("management.endpoints.web") public class WebEndpointProperties { private final Exposure exposure = new Exposure(); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorProperties.java index 5efe2583e7f0..50a51a1d442c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorProperties.java @@ -25,7 +25,7 @@ * @author Julio Gomez * @since 2.4.0 */ -@ConfigurationProperties(prefix = "management.health.db") +@ConfigurationProperties("management.health.db") public class DataSourceHealthIndicatorProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointProperties.java index a13b0858f998..b0fb8cfc9f7c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointProperties.java @@ -27,7 +27,7 @@ * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.endpoint.logfile") +@ConfigurationProperties("management.endpoint.logfile") public class LogFileWebEndpointProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsProperties.java index 90367e5e24d2..16d2df133605 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsProperties.java @@ -28,7 +28,7 @@ * @author Stephane Nicoll * @since 2.1.0 */ -@ConfigurationProperties(prefix = "management.appoptics.metrics.export") +@ConfigurationProperties("management.appoptics.metrics.export") public class AppOpticsProperties extends StepRegistryProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasProperties.java index 1d476f0790ad..1e5d12ccc786 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/atlas/AtlasProperties.java @@ -28,7 +28,7 @@ * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.atlas.metrics.export") +@ConfigurationProperties("management.atlas.metrics.export") public class AtlasProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogProperties.java index b60f60d49465..a7628555436e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/datadog/DatadogProperties.java @@ -27,7 +27,7 @@ * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.datadog.metrics.export") +@ConfigurationProperties("management.datadog.metrics.export") public class DatadogProperties extends StepRegistryProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceProperties.java index 189ef09a86b5..494e2d5aafc3 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatraceProperties.java @@ -29,7 +29,7 @@ * @author Georg Pirklbauer * @since 2.1.0 */ -@ConfigurationProperties(prefix = "management.dynatrace.metrics.export") +@ConfigurationProperties("management.dynatrace.metrics.export") public class DynatraceProperties extends StepRegistryProperties { private final V1 v1 = new V1(); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticProperties.java index d26b143b0063..141e7004acf4 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/elastic/ElasticProperties.java @@ -26,7 +26,7 @@ * @author Andy Wilkinson * @since 2.1.0 */ -@ConfigurationProperties(prefix = "management.elastic.metrics.export") +@ConfigurationProperties("management.elastic.metrics.export") public class ElasticProperties extends StepRegistryProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaProperties.java index 92bc9cb36487..aa3e87fa1c86 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/ganglia/GangliaProperties.java @@ -31,7 +31,7 @@ * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.ganglia.metrics.export") +@ConfigurationProperties("management.ganglia.metrics.export") public class GangliaProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteProperties.java index 47ed9e7ef82d..f95223f04bae 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteProperties.java @@ -32,7 +32,7 @@ * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.graphite.metrics.export") +@ConfigurationProperties("management.graphite.metrics.export") public class GraphiteProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioProperties.java index a65930330e51..33097ea8999b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/humio/HumioProperties.java @@ -30,7 +30,7 @@ * @author Andy Wilkinson * @since 2.1.0 */ -@ConfigurationProperties(prefix = "management.humio.metrics.export") +@ConfigurationProperties("management.humio.metrics.export") public class HumioProperties extends StepRegistryProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxProperties.java index 8cfb61c8d6a8..44d73bf5aaa9 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/influx/InfluxProperties.java @@ -30,7 +30,7 @@ * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.influx.metrics.export") +@ConfigurationProperties("management.influx.metrics.export") public class InfluxProperties extends StepRegistryProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxProperties.java index 3e3d19db8c0e..9c893846f59b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/jmx/JmxProperties.java @@ -28,7 +28,7 @@ * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.jmx.metrics.export") +@ConfigurationProperties("management.jmx.metrics.export") public class JmxProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosProperties.java index 2206ad973d60..1cfd245820d8 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/kairos/KairosProperties.java @@ -26,7 +26,7 @@ * @author Stephane Nicoll * @since 2.1.0 */ -@ConfigurationProperties(prefix = "management.kairos.metrics.export") +@ConfigurationProperties("management.kairos.metrics.export") public class KairosProperties extends StepRegistryProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicProperties.java index 965bc5b17a64..be87e4c38a6d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/newrelic/NewRelicProperties.java @@ -31,7 +31,7 @@ * @author Neil Powell * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.newrelic.metrics.export") +@ConfigurationProperties("management.newrelic.metrics.export") public class NewRelicProperties extends StepRegistryProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsProperties.java index 257a8ce3ef0e..d44b6c07ec69 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsProperties.java @@ -34,7 +34,7 @@ * @author Jonatan Ivanov * @since 3.4.0 */ -@ConfigurationProperties(prefix = "management.otlp.metrics.export") +@ConfigurationProperties("management.otlp.metrics.export") public class OtlpMetricsProperties extends StepRegistryProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusProperties.java index f467a24833a5..1887d2237c5c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusProperties.java @@ -31,7 +31,7 @@ * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.prometheus.metrics.export") +@ConfigurationProperties("management.prometheus.metrics.export") public class PrometheusProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxProperties.java index 0b9555b9aecb..ad13f20b32c7 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxProperties.java @@ -30,7 +30,7 @@ * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.signalfx.metrics.export") +@ConfigurationProperties("management.signalfx.metrics.export") public class SignalFxProperties extends StepRegistryProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleProperties.java index 26715be4997f..e33e6705a964 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/simple/SimpleProperties.java @@ -31,7 +31,7 @@ * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.simple.metrics.export") +@ConfigurationProperties("management.simple.metrics.export") public class SimpleProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/stackdriver/StackdriverProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/stackdriver/StackdriverProperties.java index 4557f3f5390c..178a1e7a1f85 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/stackdriver/StackdriverProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/stackdriver/StackdriverProperties.java @@ -29,7 +29,7 @@ * @author Stephane Nicoll * @since 2.3.0 */ -@ConfigurationProperties(prefix = "management.stackdriver.metrics.export") +@ConfigurationProperties("management.stackdriver.metrics.export") public class StackdriverProperties extends StepRegistryProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdProperties.java index ca6ba6cf6146..2f7f61f98d6f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/statsd/StatsdProperties.java @@ -31,7 +31,7 @@ * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.statsd.metrics.export") +@ConfigurationProperties("management.statsd.metrics.export") public class StatsdProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryProperties.java index 4c973ecf578b..c5fc86bf960a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryProperties.java @@ -27,7 +27,7 @@ * @author Moritz Halbritter * @since 3.2.0 */ -@ConfigurationProperties(prefix = "management.opentelemetry") +@ConfigurationProperties("management.opentelemetry") public class OpenTelemetryProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/ssl/SslHealthIndicatorProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/ssl/SslHealthIndicatorProperties.java index eb897d70eb09..7e89e0db3622 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/ssl/SslHealthIndicatorProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/ssl/SslHealthIndicatorProperties.java @@ -27,7 +27,7 @@ * @author Jonatan Ivanov * @since 3.4.0 */ -@ConfigurationProperties(prefix = "management.health.ssl") +@ConfigurationProperties("management.health.ssl") public class SslHealthIndicatorProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorProperties.java index 1a98b24302a5..a7e7dfaa0a9c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorProperties.java @@ -30,7 +30,7 @@ * @author Stephane Nicoll * @since 1.2.0 */ -@ConfigurationProperties(prefix = "management.health.diskspace") +@ConfigurationProperties("management.health.diskspace") public class DiskSpaceHealthIndicatorProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/wavefront/WavefrontProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/wavefront/WavefrontProperties.java index ce313c3360d1..b48684a0069b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/wavefront/WavefrontProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/wavefront/WavefrontProperties.java @@ -39,7 +39,7 @@ * @author Glenn Oppegard * @since 3.0.0 */ -@ConfigurationProperties(prefix = "management.wavefront") +@ConfigurationProperties("management.wavefront") public class WavefrontProperties { /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesProperties.java index b4eb1c1df3fc..c33e8f7acb1d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesProperties.java @@ -32,7 +32,7 @@ * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationProperties(prefix = "management.httpexchanges") +@ConfigurationProperties("management.httpexchanges") public class HttpExchangesProperties { private final Recording recording = new Recording(); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfigurationTests.java index bcbf8dc752ba..6eec659b5a99 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfigurationTests.java @@ -216,7 +216,7 @@ void runWhenDataSourceHasNullRoutingKeyShouldProduceUnnamedComposedIndicator() { static class DataSourceConfig { @Bean - @ConfigurationProperties(prefix = "spring.datasource.test") + @ConfigurationProperties("spring.datasource.test") DataSource testDataSource() { return DataSourceBuilder.create() .type(org.apache.tomcat.jdbc.pool.DataSource.class) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/sbom/SbomProperties.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/sbom/SbomProperties.java index 5d883a83de70..7d35f05bbe1e 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/sbom/SbomProperties.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/sbom/SbomProperties.java @@ -28,7 +28,7 @@ * @author Moritz Halbritter * @since 3.3.0 */ -@ConfigurationProperties(prefix = "management.endpoint.sbom") +@ConfigurationProperties("management.endpoint.sbom") public class SbomProperties { /** diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointFilteringTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointFilteringTests.java index 16d2026a7e82..3cfeb2e7df90 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointFilteringTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointFilteringTests.java @@ -163,13 +163,13 @@ ConfigurationPropertiesReportEndpoint endpoint() { static class BaseConfiguration { @Bean - @ConfigurationProperties(prefix = "foo.primary") + @ConfigurationProperties("foo.primary") Foo primaryFoo() { return new Foo(); } @Bean - @ConfigurationProperties(prefix = "foo.secondary") + @ConfigurationProperties("foo.secondary") Foo secondaryFoo() { return new Foo(); } @@ -190,7 +190,7 @@ public void setName(String name) { } - @ConfigurationProperties(prefix = "only.bar") + @ConfigurationProperties("only.bar") public static class Bar { private String name = "123456"; diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java index 1abf27582253..cedb498d17c4 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java @@ -89,13 +89,13 @@ ConfigurationPropertiesReportEndpoint endpoint() { } @Bean - @ConfigurationProperties(prefix = "first") + @ConfigurationProperties("first") Foo foo() { return new Foo(); } @Bean - @ConfigurationProperties(prefix = "other") + @ConfigurationProperties("other") Foo other() { return new Foo(); } @@ -112,7 +112,7 @@ ConfigurationPropertiesReportEndpoint endpoint() { } @Bean - @ConfigurationProperties(prefix = "other") + @ConfigurationProperties("other") Bar bar() { return new Bar(); } @@ -133,7 +133,7 @@ public void setName(String name) { } - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") public static class Bar { private String name = "654321"; diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointParentTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointParentTests.java index 1c4ae533f94e..87ee7f9a302c 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointParentTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointParentTests.java @@ -111,7 +111,7 @@ ConfigurationPropertiesReportEndpoint endpoint() { } @Bean - @ConfigurationProperties(prefix = "other") + @ConfigurationProperties("other") OtherProperties otherProperties() { return new OtherProperties(); } @@ -122,7 +122,7 @@ static class OtherProperties { } - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class TestProperties { private String myTestProperty = "654321"; diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointSerializationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointSerializationTests.java index 3acea77a8b68..83e32fa8faf6 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointSerializationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointSerializationTests.java @@ -329,7 +329,7 @@ ConfigurationPropertiesReportEndpoint endpoint() { static class FooConfig { @Bean - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("foo") Foo foo() { return new Foo(); } @@ -341,7 +341,7 @@ Foo foo() { static class SelfReferentialConfig { @Bean - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("foo") SelfReferential foo() { return new SelfReferential(); } @@ -353,7 +353,7 @@ SelfReferential foo() { static class MetadataCycleConfig { @Bean - @ConfigurationProperties(prefix = "bar") + @ConfigurationProperties("bar") SelfReferential foo() { return new SelfReferential(); } @@ -365,7 +365,7 @@ SelfReferential foo() { static class MapConfig { @Bean - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("foo") MapHolder foo() { return new MapHolder(); } @@ -377,7 +377,7 @@ MapHolder foo() { static class ListConfig { @Bean - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("foo") ListHolder foo() { return new ListHolder(); } @@ -389,7 +389,7 @@ ListHolder foo() { static class MetadataMapConfig { @Bean - @ConfigurationProperties(prefix = "spam") + @ConfigurationProperties("spam") MapHolder foo() { return new MapHolder(); } @@ -401,7 +401,7 @@ MapHolder foo() { static class AddressedConfig { @Bean - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("foo") Addressed foo() { return new Addressed(); } @@ -413,7 +413,7 @@ Addressed foo() { static class InitializedMapAndListPropertiesConfig { @Bean - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("foo") InitializedMapAndListProperties foo() { return new InitializedMapAndListProperties(); } @@ -569,7 +569,7 @@ static class CycleConfig { @Bean // gh-11037 - @ConfigurationProperties(prefix = "cycle") + @ConfigurationProperties("cycle") Cycle cycle() { return new Cycle(); } @@ -586,7 +586,7 @@ ConfigurationPropertiesReportEndpoint endpoint() { } @Bean - @ConfigurationProperties(prefix = "test.datasource") + @ConfigurationProperties("test.datasource") HikariDataSource hikariDataSource() { return new HikariDataSource(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java index 8180021e5f88..49cfe2a58c7a 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java @@ -457,7 +457,7 @@ static class TestPropertiesConfiguration { } - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") public static class TestProperties { private String dbPassword = "123456"; @@ -524,7 +524,7 @@ static class ImmutablePropertiesConfiguration { } - @ConfigurationProperties(prefix = "immutable") + @ConfigurationProperties("immutable") public static class ImmutableProperties { private final String dbPassword; @@ -574,7 +574,7 @@ static class MultiConstructorPropertiesConfiguration { } - @ConfigurationProperties(prefix = "multiconstructor") + @ConfigurationProperties("multiconstructor") public static class MultiConstructorProperties { private final String name; @@ -613,7 +613,7 @@ String hello() { } - @ConfigurationProperties(prefix = "autowired") + @ConfigurationProperties("autowired") public static class AutowiredProperties { private final String name; diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointWebIntegrationTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointWebIntegrationTests.java index 504a0496838a..bc393d536564 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointWebIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointWebIntegrationTests.java @@ -116,13 +116,13 @@ ConfigurationPropertiesReportEndpointWebExtension endpointWebExtension( } @Bean - @ConfigurationProperties(prefix = "com.foo") + @ConfigurationProperties("com.foo") Foo fooDotCom() { return new Foo(); } @Bean - @ConfigurationProperties(prefix = "com.bar") + @ConfigurationProperties("com.bar") Bar barDotCom() { return new Bar(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ValidatedConstructorBindingProperties.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ValidatedConstructorBindingProperties.java index a2f5a40ca189..0a17c0d73674 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ValidatedConstructorBindingProperties.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ValidatedConstructorBindingProperties.java @@ -26,7 +26,7 @@ * @author Madhura Bhave */ @Validated -@ConfigurationProperties(prefix = "validated") +@ConfigurationProperties("validated") public class ValidatedConstructorBindingProperties { private final String name; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java index 1510e9adbed7..c43149a4ba18 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java @@ -51,7 +51,7 @@ * @author Yanming Zhou * @since 1.0.0 */ -@ConfigurationProperties(prefix = "spring.rabbitmq") +@ConfigurationProperties("spring.rabbitmq") public class RabbitProperties { private static final int DEFAULT_PORT = 5672; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java index c308b01614ef..4442ad49b10e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java @@ -29,7 +29,7 @@ * @author Mukul Kumar Chaundhyan * @since 1.2.0 */ -@ConfigurationProperties(prefix = "spring.batch") +@ConfigurationProperties("spring.batch") public class BatchProperties { private final Job job = new Job(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java index 6ce79076deb5..aee56be51515 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java @@ -32,7 +32,7 @@ * @author Ryon Day * @since 1.3.0 */ -@ConfigurationProperties(prefix = "spring.cache") +@ConfigurationProperties("spring.cache") public class CacheProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java index f2f8cae7e39c..5ad70efe5b20 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java @@ -34,7 +34,7 @@ * @author Scott Frederick * @since 1.3.0 */ -@ConfigurationProperties(prefix = "spring.cassandra") +@ConfigurationProperties("spring.cassandra") public class CassandraProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/codec/CodecProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/codec/CodecProperties.java index 3686d39c369e..8c0e74bf5178 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/codec/CodecProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/codec/CodecProperties.java @@ -25,7 +25,7 @@ * @author Brian Clozel * @since 2.2.1 */ -@ConfigurationProperties(prefix = "spring.codec") +@ConfigurationProperties("spring.codec") public class CodecProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/LifecycleProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/LifecycleProperties.java index 49c706a8c223..ccdb2cd47314 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/LifecycleProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/LifecycleProperties.java @@ -26,7 +26,7 @@ * @author Andy Wilkinson * @since 2.3.0 */ -@ConfigurationProperties(prefix = "spring.lifecycle") +@ConfigurationProperties("spring.lifecycle") public class LifecycleProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceProperties.java index 0495e285fd4f..ab52048c0dfe 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceProperties.java @@ -35,7 +35,7 @@ * @author Misagh Moayyed * @since 2.0.0 */ -@ConfigurationProperties(prefix = "spring.messages") +@ConfigurationProperties("spring.messages") public class MessageSourceProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java index 2f4d2e8a0d05..34923a4ef8bd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java @@ -32,7 +32,7 @@ * @author Scott Frederick * @since 1.4.0 */ -@ConfigurationProperties(prefix = "spring.couchbase") +@ConfigurationProperties("spring.couchbase") public class CouchbaseProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataProperties.java index 359beeafaaca..b84753aec23a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataProperties.java @@ -24,7 +24,7 @@ * @author Stephane Nicoll * @since 1.4.0 */ -@ConfigurationProperties(prefix = "spring.data.couchbase") +@ConfigurationProperties("spring.data.couchbase") public class CouchbaseDataProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDataProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDataProperties.java index bc2f8a95b71c..0882f8614bc4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDataProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDataProperties.java @@ -24,7 +24,7 @@ * @author Jens Schauder * @since 3.3.0 */ -@ConfigurationProperties(prefix = "spring.data.jdbc") +@ConfigurationProperties("spring.data.jdbc") public class JdbcDataProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataProperties.java index ea1c19052472..fee7a644098b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataProperties.java @@ -24,7 +24,7 @@ * @author Michael J. Simons * @since 2.4.0 */ -@ConfigurationProperties(prefix = "spring.data.neo4j") +@ConfigurationProperties("spring.data.neo4j") public class Neo4jDataProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java index 27b0f54a4b76..e642a668935f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java @@ -33,7 +33,7 @@ * @author Scott Frederick * @since 1.0.0 */ -@ConfigurationProperties(prefix = "spring.data.redis") +@ConfigurationProperties("spring.data.redis") public class RedisProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java index ce4397ab10be..a653184da8fa 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java @@ -28,7 +28,7 @@ * @author Stephane Nicoll * @since 1.3.0 */ -@ConfigurationProperties(prefix = "spring.data.rest") +@ConfigurationProperties("spring.data.rest") public class RepositoryRestProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java index 60c812d9fa40..2e40bbcaea32 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java @@ -40,7 +40,7 @@ * @author Chris Bono * @since 1.1.0 */ -@ConfigurationProperties(prefix = "spring.flyway") +@ConfigurationProperties("spring.flyway") public class FlywayProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerProperties.java index e25c7da057e4..6bf8320bd62e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerProperties.java @@ -29,7 +29,7 @@ * @author Andy Wilkinson * @since 1.1.0 */ -@ConfigurationProperties(prefix = "spring.freemarker") +@ConfigurationProperties("spring.freemarker") public class FreeMarkerProperties extends AbstractTemplateViewResolverProperties { public static final String DEFAULT_TEMPLATE_LOADER_PATH = "classpath:/templates/"; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlCorsProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlCorsProperties.java index ee9dbc1896a0..47bba2250793 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlCorsProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlCorsProperties.java @@ -34,7 +34,7 @@ * @author Brian Clozel * @since 2.7.0 */ -@ConfigurationProperties(prefix = "spring.graphql.cors") +@ConfigurationProperties("spring.graphql.cors") public class GraphQlCorsProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlProperties.java index eee2986ddcfc..3a161fe4544b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/GraphQlProperties.java @@ -28,7 +28,7 @@ * @author Brian Clozel * @since 2.7.0 */ -@ConfigurationProperties(prefix = "spring.graphql") +@ConfigurationProperties("spring.graphql") public class GraphQlProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java index 87f0130e97cc..a8bd8c88ee95 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java @@ -109,7 +109,7 @@ private boolean isUsingGroovyAllJar() { @Bean @ConditionalOnMissingBean(GroovyMarkupConfig.class) - @ConfigurationProperties(prefix = "spring.groovy.template.configuration") + @ConfigurationProperties("spring.groovy.template.configuration") public GroovyMarkupConfigurer groovyMarkupConfigurer(ObjectProvider templateEngine) { GroovyMarkupConfigurer configurer = new GroovyMarkupConfigurer(); configurer.setResourceLoaderPath(this.properties.getResourceLoaderPath()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonProperties.java index 1d0e50ca006f..a75cd862d135 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/gson/GsonProperties.java @@ -29,7 +29,7 @@ * @author Ivan Golovko * @since 2.0.0 */ -@ConfigurationProperties(prefix = "spring.gson") +@ConfigurationProperties("spring.gson") public class GsonProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java index 09dba6b7b56b..62ec31e28f02 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java @@ -27,7 +27,7 @@ * @author Stephane Nicoll * @since 1.3.0 */ -@ConfigurationProperties(prefix = "spring.h2.console") +@ConfigurationProperties("spring.h2.console") public class H2ConsoleProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HateoasProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HateoasProperties.java index a1a17215501e..6686aca93a1f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HateoasProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HateoasProperties.java @@ -25,7 +25,7 @@ * @author Andy Wilkinson * @since 1.2.1 */ -@ConfigurationProperties(prefix = "spring.hateoas") +@ConfigurationProperties("spring.hateoas") public class HateoasProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastProperties.java index 4f88720d5b83..98687ca86a84 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastProperties.java @@ -26,7 +26,7 @@ * @author Stephane Nicoll * @since 1.3.0 */ -@ConfigurationProperties(prefix = "spring.hazelcast") +@ConfigurationProperties("spring.hazelcast") public class HazelcastProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoProperties.java index ad533bc58815..e3bf5e41de4a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoProperties.java @@ -29,7 +29,7 @@ * @author Stephane Nicoll * @since 1.4.0 */ -@ConfigurationProperties(prefix = "spring.info") +@ConfigurationProperties("spring.info") public class ProjectInfoProperties { private final Build build = new Build(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java index 5b7d2bbf764d..50f427f6e098 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationProperties.java @@ -32,7 +32,7 @@ * @author Artem Bilan * @since 2.0.0 */ -@ConfigurationProperties(prefix = "spring.integration") +@ConfigurationProperties("spring.integration") public class IntegrationProperties { private final Channel channel = new Channel(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java index 46162768d4f5..f661db2db9e2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java @@ -43,7 +43,7 @@ * @author Eddú Meléndez * @since 1.2.0 */ -@ConfigurationProperties(prefix = "spring.jackson") +@ConfigurationProperties("spring.jackson") public class JacksonProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java index 1cebf37cd5e0..b441ae964065 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java @@ -77,7 +77,7 @@ static TomcatJdbcConnectionDetailsBeanPostProcessor tomcatJdbcConnectionDetailsB } @Bean - @ConfigurationProperties(prefix = "spring.datasource.tomcat") + @ConfigurationProperties("spring.datasource.tomcat") org.apache.tomcat.jdbc.pool.DataSource dataSource(DataSourceProperties properties, JdbcConnectionDetails connectionDetails) { Class dataSourceType = org.apache.tomcat.jdbc.pool.DataSource.class; @@ -112,7 +112,7 @@ static HikariJdbcConnectionDetailsBeanPostProcessor jdbcConnectionDetailsHikariB } @Bean - @ConfigurationProperties(prefix = "spring.datasource.hikari") + @ConfigurationProperties("spring.datasource.hikari") HikariDataSource dataSource(DataSourceProperties properties, JdbcConnectionDetails connectionDetails) { HikariDataSource dataSource = createDataSource(connectionDetails, HikariDataSource.class, properties.getClassLoader()); @@ -141,7 +141,7 @@ static Dbcp2JdbcConnectionDetailsBeanPostProcessor dbcp2JdbcConnectionDetailsBea } @Bean - @ConfigurationProperties(prefix = "spring.datasource.dbcp2") + @ConfigurationProperties("spring.datasource.dbcp2") org.apache.commons.dbcp2.BasicDataSource dataSource(DataSourceProperties properties, JdbcConnectionDetails connectionDetails) { Class dataSourceType = org.apache.commons.dbcp2.BasicDataSource.class; @@ -167,7 +167,7 @@ static OracleUcpJdbcConnectionDetailsBeanPostProcessor oracleUcpJdbcConnectionDe } @Bean - @ConfigurationProperties(prefix = "spring.datasource.oracleucp") + @ConfigurationProperties("spring.datasource.oracleucp") PoolDataSourceImpl dataSource(DataSourceProperties properties, JdbcConnectionDetails connectionDetails) throws SQLException { PoolDataSourceImpl dataSource = createDataSource(connectionDetails, PoolDataSourceImpl.class, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java index 1504b86b83ef..9e83c3150565 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java @@ -44,7 +44,7 @@ * @author Scott Frederick * @since 1.1.0 */ -@ConfigurationProperties(prefix = "spring.datasource") +@ConfigurationProperties("spring.datasource") public class DataSourceProperties implements BeanClassLoaderAware, InitializingBean { private ClassLoader classLoader; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcProperties.java index 0e0d3560ec56..fda0be5fbc54 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcProperties.java @@ -29,7 +29,7 @@ * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationProperties(prefix = "spring.jdbc") +@ConfigurationProperties("spring.jdbc") public class JdbcProperties { private final Template template = new Template(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java index c69cf2d53009..5c4470c871ef 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java @@ -29,7 +29,7 @@ * @author Stephane Nicoll * @since 1.2.0 */ -@ConfigurationProperties(prefix = "spring.jersey") +@ConfigurationProperties("spring.jersey") public class JerseyProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java index 126ffd065f31..4397c58f313d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java @@ -31,7 +31,7 @@ * @author Vedran Pavic * @since 1.0.0 */ -@ConfigurationProperties(prefix = "spring.jms") +@ConfigurationProperties("spring.jms") public class JmsProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java index dc4bb98a2b61..ce8ec3cd7c80 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java @@ -34,7 +34,7 @@ * @author Eddú Meléndez * @since 3.1.0 */ -@ConfigurationProperties(prefix = "spring.activemq") +@ConfigurationProperties("spring.activemq") public class ActiveMQProperties { private static final String DEFAULT_EMBEDDED_BROKER_URL = "vm://localhost?broker.persistent=false"; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisProperties.java index 5341b5ab710a..738e9eb8c7e6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisProperties.java @@ -35,7 +35,7 @@ * @author Justin Bertram * @since 1.3.0 */ -@ConfigurationProperties(prefix = "spring.artemis") +@ConfigurationProperties("spring.artemis") public class ArtemisProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxProperties.java index 57b10a74ff5b..db8124795268 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxProperties.java @@ -25,7 +25,7 @@ * @author Scott Frederick * @since 2.7.0 */ -@ConfigurationProperties(prefix = "spring.jmx") +@ConfigurationProperties("spring.jmx") public class JmxProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqProperties.java index ccf73e8ea2fb..66d7910e9d3d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqProperties.java @@ -29,7 +29,7 @@ * @author Michael Simons * @since 1.3.0 */ -@ConfigurationProperties(prefix = "spring.jooq") +@ConfigurationProperties("spring.jooq") public class JooqProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java index 90133fab101f..869df46ffed2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java @@ -62,7 +62,7 @@ * @author Scott Frederick * @since 1.5.0 */ -@ConfigurationProperties(prefix = "spring.kafka") +@ConfigurationProperties("spring.kafka") public class KafkaProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java index dfbeb72350fc..2db8c69fcfae 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java @@ -31,7 +31,7 @@ * @author Eddú Meléndez * @since 1.5.0 */ -@ConfigurationProperties(prefix = "spring.ldap") +@ConfigurationProperties("spring.ldap") public class LdapProperties { private static final int DEFAULT_PORT = 389; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java index 7018b92d7393..fd27b9915092 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java @@ -31,7 +31,7 @@ * @author Mathieu Ouellet * @since 1.5.0 */ -@ConfigurationProperties(prefix = "spring.ldap.embedded") +@ConfigurationProperties("spring.ldap.embedded") public class EmbeddedLdapProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java index 2b2e182998a2..ec053ad83ebd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java @@ -31,7 +31,7 @@ * @author Eddú Meléndez * @since 1.2.0 */ -@ConfigurationProperties(prefix = "spring.mail") +@ConfigurationProperties("spring.mail") public class MailProperties { private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java index 768d52c5b740..bd026d99a714 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java @@ -38,7 +38,7 @@ * @author Safeer Ansari * @since 1.0.0 */ -@ConfigurationProperties(prefix = "spring.data.mongodb") +@ConfigurationProperties("spring.data.mongodb") public class MongoProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheProperties.java index 0298dee69c4d..d1c44d457f65 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheProperties.java @@ -30,7 +30,7 @@ * @author Dave Syer * @since 1.2.2 */ -@ConfigurationProperties(prefix = "spring.mustache") +@ConfigurationProperties("spring.mustache") public class MustacheProperties { private static final MimeType DEFAULT_CONTENT_TYPE = MimeType.valueOf("text/html"); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/neo4j/Neo4jProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/neo4j/Neo4jProperties.java index 5b856a52e975..18246b5e0a95 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/neo4j/Neo4jProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/neo4j/Neo4jProperties.java @@ -29,7 +29,7 @@ * @author Stephane Nicoll * @since 2.4.0 */ -@ConfigurationProperties(prefix = "spring.neo4j") +@ConfigurationProperties("spring.neo4j") public class Neo4jProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/netty/NettyProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/netty/NettyProperties.java index de058a102ab0..3d29f7bd6c7b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/netty/NettyProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/netty/NettyProperties.java @@ -26,7 +26,7 @@ * @author Brian Clozel * @since 2.5.0 */ -@ConfigurationProperties(prefix = "spring.netty") +@ConfigurationProperties("spring.netty") public class NettyProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java index 9a208af28e7e..71f5db1dcd6c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java @@ -34,7 +34,7 @@ * @author Madhura Bhave * @since 1.1.0 */ -@ConfigurationProperties(prefix = "spring.jpa") +@ConfigurationProperties("spring.jpa") public class JpaProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcProperties.java index e07b1dd0a06c..5250a8e1d9bf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/R2dbcProperties.java @@ -34,7 +34,7 @@ * @author Rodolpho S. Couto * @since 2.3.0 */ -@ConfigurationProperties(prefix = "spring.r2dbc") +@ConfigurationProperties("spring.r2dbc") public class R2dbcProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorProperties.java index c82da8b52389..60632dc37fe4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/ReactorProperties.java @@ -24,7 +24,7 @@ * @author Brian Clozel * @since 3.2.0 */ -@ConfigurationProperties(prefix = "spring.reactor") +@ConfigurationProperties("spring.reactor") public class ReactorProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyProperties.java index 4f085113c510..64c1274bd3d3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/reactor/netty/ReactorNettyProperties.java @@ -26,7 +26,7 @@ * @author Moritz Halbritter * @since 2.7.9 */ -@ConfigurationProperties(prefix = "spring.reactor.netty") +@ConfigurationProperties("spring.reactor.netty") public class ReactorNettyProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java index 504044c9eb98..7bddf0edbfe2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java @@ -36,7 +36,7 @@ * @author Madhura Bhave * @since 1.0.0 */ -@ConfigurationProperties(prefix = "spring.security") +@ConfigurationProperties("spring.security") public class SecurityProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java index 48a30efc8cdc..4fbe59540ceb 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientProperties.java @@ -34,7 +34,7 @@ * @author Moritz Halbritter * @since 2.0.0 */ -@ConfigurationProperties(prefix = "spring.security.oauth2.client") +@ConfigurationProperties("spring.security.oauth2.client") public class OAuth2ClientProperties implements InitializingBean { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java index ff57def944a7..48f1e2eca581 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/OAuth2ResourceServerProperties.java @@ -37,7 +37,7 @@ * @author Yan Kardziyaka * @since 2.1.0 */ -@ConfigurationProperties(prefix = "spring.security.oauth2.resourceserver") +@ConfigurationProperties("spring.security.oauth2.resourceserver") public class OAuth2ResourceServerProperties { private final Jwt jwt = new Jwt(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/server/servlet/OAuth2AuthorizationServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/server/servlet/OAuth2AuthorizationServerProperties.java index fd7ceba3c338..9edc75d73d50 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/server/servlet/OAuth2AuthorizationServerProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/server/servlet/OAuth2AuthorizationServerProperties.java @@ -34,7 +34,7 @@ * @author Steve Riesenberg * @since 3.1.0 */ -@ConfigurationProperties(prefix = "spring.security.oauth2.authorizationserver") +@ConfigurationProperties("spring.security.oauth2.authorizationserver") public class OAuth2AuthorizationServerProperties implements InitializingBean { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridProperties.java index 705978a46a62..6d6a3974d6ae 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridProperties.java @@ -25,7 +25,7 @@ * @author Andy Wilkinson * @since 1.3.0 */ -@ConfigurationProperties(prefix = "spring.sendgrid") +@ConfigurationProperties("spring.sendgrid") public class SendGridProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionProperties.java index 9cb4814c8671..0fa35becb379 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionProperties.java @@ -26,7 +26,7 @@ * @author Vedran Pavic * @since 2.0.0 */ -@ConfigurationProperties(prefix = "spring.session.hazelcast") +@ConfigurationProperties("spring.session.hazelcast") public class HazelcastSessionProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionProperties.java index 80fedbdf1100..22737a6c1509 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionProperties.java @@ -27,7 +27,7 @@ * @author Vedran Pavic * @since 2.0.0 */ -@ConfigurationProperties(prefix = "spring.session.jdbc") +@ConfigurationProperties("spring.session.jdbc") public class JdbcSessionProperties { private static final String DEFAULT_SCHEMA_LOCATION = "classpath:org/springframework/" diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionProperties.java index e1c844beb01f..25f75c438586 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionProperties.java @@ -24,7 +24,7 @@ * @author Andy Wilkinson * @since 2.0.0 */ -@ConfigurationProperties(prefix = "spring.session.mongodb") +@ConfigurationProperties("spring.session.mongodb") public class MongoSessionProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionProperties.java index 93f16dc5ca1f..3276829c9030 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionProperties.java @@ -26,7 +26,7 @@ * @author Vedran Pavic * @since 2.0.0 */ -@ConfigurationProperties(prefix = "spring.session.redis") +@ConfigurationProperties("spring.session.redis") public class RedisSessionProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java index 962621274655..d4ebce0fc5fe 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java @@ -36,7 +36,7 @@ * @author Vedran Pavic * @since 1.4.0 */ -@ConfigurationProperties(prefix = "spring.session") +@ConfigurationProperties("spring.session") public class SessionProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ssl/SslProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ssl/SslProperties.java index a755a871b8d7..db267a7f9fad 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ssl/SslProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ssl/SslProperties.java @@ -29,7 +29,7 @@ * @author Moritz Halbritter * @since 3.1.0 */ -@ConfigurationProperties(prefix = "spring.ssl") +@ConfigurationProperties("spring.ssl") public class SslProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafProperties.java index b1d32a5a2c25..067228b3260c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafProperties.java @@ -34,7 +34,7 @@ * @author Kazuki Shimizu * @since 1.2.0 */ -@ConfigurationProperties(prefix = "spring.thymeleaf") +@ConfigurationProperties("spring.thymeleaf") public class ThymeleafProperties { private static final Charset DEFAULT_ENCODING = StandardCharsets.UTF_8; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionProperties.java index a9170ee0cd78..943bd0d37f94 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionProperties.java @@ -31,7 +31,7 @@ * @author Phillip Webb * @since 1.5.0 */ -@ConfigurationProperties(prefix = "spring.transaction") +@ConfigurationProperties("spring.transaction") public class TransactionProperties implements TransactionManagerCustomizer { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveMultipartProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveMultipartProperties.java index 01b4e005a2eb..b861c1a2c121 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveMultipartProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveMultipartProperties.java @@ -32,7 +32,7 @@ * @author Chris Bono * @since 2.6.0 */ -@ConfigurationProperties(prefix = "spring.webflux.multipart") +@ConfigurationProperties("spring.webflux.multipart") public class ReactiveMultipartProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java index 618b5164f919..7929a33c3c72 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java @@ -26,7 +26,7 @@ * @author Vedran Pavic * @since 2.0.0 */ -@ConfigurationProperties(prefix = "spring.webflux") +@ConfigurationProperties("spring.webflux") public class WebFluxProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java index f3a66982991e..6d4b76e647a5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java @@ -36,7 +36,7 @@ * @author Vedran Pavic * @since 2.0.0 */ -@ConfigurationProperties(prefix = "spring.mvc") +@ConfigurationProperties("spring.mvc") public class WebMvcProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java index ab473fab16ee..649c4fd80978 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java @@ -29,7 +29,7 @@ * @author Stephane Nicoll * @since 1.4.0 */ -@ConfigurationProperties(prefix = "spring.webservices") +@ConfigurationProperties("spring.webservices") public class WebServicesProperties { /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java index fc4ef5e00238..2cda823142f8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java @@ -141,7 +141,7 @@ void usesCustomJdbcConnectionDetailsWhenDefined() { static class TomcatDataSourceConfiguration { @Bean - @ConfigurationProperties(prefix = "spring.datasource.tomcat") + @ConfigurationProperties("spring.datasource.tomcat") DataSource dataSource() { return DataSourceBuilder.create().type(org.apache.tomcat.jdbc.pool.DataSource.class).build(); } diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java index 2471f19136d1..3e461d8a72dd 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java @@ -32,7 +32,7 @@ * @author Stephane Nicoll * @since 1.3.0 */ -@ConfigurationProperties(prefix = "spring.devtools") +@ConfigurationProperties("spring.devtools") public class DevToolsProperties { private final Restart restart = new Restart(); diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyMessagingProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyMessagingProperties.java index e03d8b131d1d..a9942816b26b 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyMessagingProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyMessagingProperties.java @@ -22,7 +22,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties(prefix = "my.messaging") +@ConfigurationProperties("my.messaging") public class MyMessagingProperties { private List addresses = new ArrayList<>(Arrays.asList("a", "b")); diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.java index fdc5f258768a..b6a5f27c4a76 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.java @@ -18,7 +18,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties(prefix = "my.server") +@ConfigurationProperties("my.server") public class MyServerProperties { /** diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.java index 67a35712c632..217c149897a7 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/appendix/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.java @@ -18,7 +18,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties(prefix = "my.server") +@ConfigurationProperties("my.server") public class MyServerProperties { private String name; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/MyPersonProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/MyPersonProperties.java index 74fb9d6bd55f..0bc059e2bd16 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/MyPersonProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/MyPersonProperties.java @@ -18,7 +18,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties(prefix = "my.main-project.person") +@ConfigurationProperties("my.main-project.person") public class MyPersonProperties { private String firstName; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/mapsfromenvironmentvariables/MyMapsProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/mapsfromenvironmentvariables/MyMapsProperties.java index 7abc11edb290..ac3ad3b0f7ac 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/mapsfromenvironmentvariables/MyMapsProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/mapsfromenvironmentvariables/MyMapsProperties.java @@ -21,7 +21,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties(prefix = "my.props") +@ConfigurationProperties("my.props") public class MyMapsProperties { private final Map values = new HashMap<>(); diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/thirdpartyconfiguration/ThirdPartyConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/thirdpartyconfiguration/ThirdPartyConfiguration.java index b63271555683..a3c72ccc760c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/thirdpartyconfiguration/ThirdPartyConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/thirdpartyconfiguration/ThirdPartyConfiguration.java @@ -24,7 +24,7 @@ public class ThirdPartyConfiguration { @Bean - @ConfigurationProperties(prefix = "another") + @ConfigurationProperties("another") public AnotherComponent anotherComponent() { return new AnotherComponent(); } diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/custom/MyDataSourceConfiguration.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/custom/MyDataSourceConfiguration.java index 72104f971ab3..019ffb1db991 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/custom/MyDataSourceConfiguration.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/custom/MyDataSourceConfiguration.java @@ -24,7 +24,7 @@ public class MyDataSourceConfiguration { @Bean - @ConfigurationProperties(prefix = "app.datasource") + @ConfigurationProperties("app.datasource") public SomeDataSource dataSource() { return new SomeDataSource(); } diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyProperties.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyProperties.java index e0b25257b01f..b4e8b03f06bc 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyProperties.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyProperties.java @@ -19,7 +19,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; -@ConfigurationProperties(prefix = "my.properties") +@ConfigurationProperties("my.properties") public class MyProperties { private String name; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyPropertiesCtor.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyPropertiesCtor.java index 861947e1f697..a0943c387d2f 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyPropertiesCtor.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyPropertiesCtor.java @@ -19,7 +19,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; -@ConfigurationProperties(prefix = "my.properties") +@ConfigurationProperties("my.properties") public class MyPropertiesCtor { private final String name; diff --git a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyPropertiesRecord.java b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyPropertiesRecord.java index 8322d7d83af0..df953fdd024e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyPropertiesRecord.java +++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyPropertiesRecord.java @@ -19,7 +19,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; -@ConfigurationProperties(prefix = "my.properties") +@ConfigurationProperties("my.properties") public record MyPropertiesRecord(String name, @NestedConfigurationProperty Nested nested) { } diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyMessagingProperties.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyMessagingProperties.kt index a87d99e960d0..c074a8362775 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyMessagingProperties.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyMessagingProperties.kt @@ -19,7 +19,7 @@ package org.springframework.boot.docs.configurationmetadata.annotationprocessor. import org.springframework.boot.context.properties.ConfigurationProperties import java.util.Arrays -@ConfigurationProperties(prefix = "my.messaging") +@ConfigurationProperties("my.messaging") class MyMessagingProperties( val addresses: List = ArrayList(Arrays.asList("a", "b")), diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.kt index 11b8cf82b1f9..27f4382bcb9d 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/MyServerProperties.kt @@ -18,7 +18,7 @@ package org.springframework.boot.docs.configurationmetadata.annotationprocessor. import org.springframework.boot.context.properties.ConfigurationProperties -@ConfigurationProperties(prefix = "my.server") +@ConfigurationProperties("my.server") class MyServerProperties( /** diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.kt index d2119679086b..9e7c1fad0592 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/configurationmetadata/annotationprocessor/automaticmetadatageneration/nestedproperties/MyServerProperties.kt @@ -18,7 +18,7 @@ package org.springframework.boot.docs.configurationmetadata.annotationprocessor. import org.springframework.boot.context.properties.ConfigurationProperties -@ConfigurationProperties(prefix = "my.server") +@ConfigurationProperties("my.server") class MyServerProperties( var name: String, var host: Host) { diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/MyPersonProperties.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/MyPersonProperties.kt index 6be11c0365ff..b903654dc8ab 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/MyPersonProperties.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/MyPersonProperties.kt @@ -18,7 +18,7 @@ package org.springframework.boot.docs.features.externalconfig.typesafeconfigurat import org.springframework.boot.context.properties.ConfigurationProperties -@ConfigurationProperties(prefix = "my.main-project.person") +@ConfigurationProperties("my.main-project.person") class MyPersonProperties { var firstName: String? = null diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/mapsfromenvironmentvariables/MyMapsProperties.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/mapsfromenvironmentvariables/MyMapsProperties.kt index f58251e968cb..d537175b8142 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/mapsfromenvironmentvariables/MyMapsProperties.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/relaxedbinding/mapsfromenvironmentvariables/MyMapsProperties.kt @@ -2,7 +2,7 @@ package org.springframework.boot.docs.features.externalconfig.typesafeconfigurat import org.springframework.boot.context.properties.ConfigurationProperties -@ConfigurationProperties(prefix = "my.props") +@ConfigurationProperties("my.props") class MyMapsProperties { val values: Map = HashMap() diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/thirdpartyconfiguration/ThirdPartyConfiguration.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/thirdpartyconfiguration/ThirdPartyConfiguration.kt index ae4039cd62c9..6949f4a1e504 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/thirdpartyconfiguration/ThirdPartyConfiguration.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/externalconfig/typesafeconfigurationproperties/thirdpartyconfiguration/ThirdPartyConfiguration.kt @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Configuration class ThirdPartyConfiguration { @Bean - @ConfigurationProperties(prefix = "another") + @ConfigurationProperties("another") fun anotherComponent(): AnotherComponent = AnotherComponent() } diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/custom/MyDataSourceConfiguration.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/custom/MyDataSourceConfiguration.kt index da7e2d11fa37..2e5159736ce0 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/custom/MyDataSourceConfiguration.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/dataaccess/configurecustomdatasource/custom/MyDataSourceConfiguration.kt @@ -24,7 +24,7 @@ import org.springframework.context.annotation.Configuration class MyDataSourceConfiguration { @Bean - @ConfigurationProperties(prefix = "app.datasource") + @ConfigurationProperties("app.datasource") fun dataSource(): SomeDataSource { return SomeDataSource() } diff --git a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyPropertiesKotlin.kt b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyPropertiesKotlin.kt index f094e0bf742a..78a9acd1ac0e 100644 --- a/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyPropertiesKotlin.kt +++ b/spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/packaging/nativeimage/advanced/nestedconfigurationproperties/MyPropertiesKotlin.kt @@ -19,7 +19,7 @@ package org.springframework.boot.docs.packaging.nativeimage.advanced.nestedconfi import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.NestedConfigurationProperty -@ConfigurationProperties(prefix = "my.properties") +@ConfigurationProperties("my.properties") data class MyPropertiesKotlin( val name: String, @NestedConfigurationProperty val nested: Nested diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientAutoConfiguration.java index 279397ceed01..e85b226aaa7c 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/reactive/WebTestClientAutoConfiguration.java @@ -67,7 +67,7 @@ public WebTestClient webTestClient(ApplicationContext applicationContext, } @Bean - @ConfigurationProperties(prefix = "spring.test.webtestclient") + @ConfigurationProperties("spring.test.webtestclient") public SpringBootWebTestClientBuilderCustomizer springBootWebTestClientBuilderCustomizer( ObjectProvider codecCustomizers) { return new SpringBootWebTestClientBuilderCustomizer(codecCustomizers.orderedStream().toList()); diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcConfiguration.java index 2ee2b145cc61..1aa66b13edab 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcConfiguration.java @@ -60,7 +60,7 @@ DefaultMockMvcBuilder mockMvcBuilder(List customizers) } @Bean - @ConfigurationProperties(prefix = "spring.test.mockmvc") + @ConfigurationProperties("spring.test.mockmvc") SpringBootMockMvcBuilderCustomizer springBootMockMvcBuilderCustomizer() { return new SpringBootMockMvcBuilderCustomizer(this.context); } 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 556fd05531a4..0a93d856c3c9 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 @@ -27,7 +27,7 @@ */ public class Dbcp2Configuration { - @ConfigurationProperties(prefix = "spring.datasource.dbcp2") + @ConfigurationProperties("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/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 3ff388df6e13..f3ee4c33a153 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 @@ -20,7 +20,7 @@ public class ChildPropertiesConfig { - @ConfigurationProperties(prefix = "inheritance") + @ConfigurationProperties("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 324d12c2a4dc..542fa5f9dc64 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 @@ -20,7 +20,7 @@ public class OverrideChildPropertiesConfig { - @ConfigurationProperties(prefix = "inheritance") + @ConfigurationProperties("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 51a5251b9a66..8cca3135b896 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 @@ -30,7 +30,7 @@ * @author Jonas Keßler */ @Data -@ConfigurationProperties(prefix = "accesslevel.overwrite.data") +@ConfigurationProperties("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 f8c9d235620c..17bd5aba6728 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 @@ -30,7 +30,7 @@ */ @Getter @Setter -@ConfigurationProperties(prefix = "accesslevel.overwrite.default") +@ConfigurationProperties("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 5acb43ed5718..22959419c415 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 @@ -30,7 +30,7 @@ */ @Getter(AccessLevel.PUBLIC) @Setter(AccessLevel.PUBLIC) -@ConfigurationProperties(prefix = "accesslevel.overwrite.explicit") +@ConfigurationProperties("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 ebf13fa4d7bc..08734370a028 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 @@ -27,7 +27,7 @@ * * @author Jonas Keßler */ -@ConfigurationProperties(prefix = "accesslevel") +@ConfigurationProperties("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/LombokDeprecatedProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokDeprecatedProperties.java index d621d716d565..217e6dd4158d 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 @@ -29,7 +29,7 @@ */ @Getter @Setter -@ConfigurationProperties(prefix = "deprecated") +@ConfigurationProperties("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/LombokExplicitProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java index 21db60670d6b..154d00a37d17 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 @@ -29,7 +29,7 @@ * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "explicit") +@ConfigurationProperties("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 551ba6ab5872..de470ee87d83 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 @@ -27,7 +27,7 @@ * @author Stephane Nicoll */ @Data -@ConfigurationProperties(prefix = "config") +@ConfigurationProperties("config") @SuppressWarnings("unused") public class LombokInnerClassProperties { 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 f494646886e0..5be71dfc21da 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 @@ -21,7 +21,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; @Data -@ConfigurationProperties(prefix = "config") +@ConfigurationProperties("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 574e08c6a6c3..9516126fdaa0 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 @@ -29,7 +29,7 @@ * @author Stephane Nicoll */ @Data -@ConfigurationProperties(prefix = "data") +@ConfigurationProperties("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 64a0e3799a87..2ca4b7c902d4 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 @@ -31,7 +31,7 @@ */ @Getter @Setter -@ConfigurationProperties(prefix = "simple") +@ConfigurationProperties("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 022e5b413e43..c3d7b4b6b95d 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 @@ -29,7 +29,7 @@ * @author Mark Jeffrey */ @Value -@ConfigurationProperties(prefix = "value") +@ConfigurationProperties("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 7a32353563b0..d61b021fd77d 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 @@ -27,7 +27,7 @@ @Deprecated public class DeprecatedClassMethodConfig { - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("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 e8e3de581efb..dccfd8a2a771 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 @@ -25,7 +25,7 @@ */ public class DeprecatedMethodConfig { - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("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/InvalidMethodConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/InvalidMethodConfig.java index 7b9e106cec81..d7ce16d0495f 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 @@ -23,7 +23,7 @@ * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "something") +@ConfigurationProperties("something") public class InvalidMethodConfig { private String name; @@ -36,7 +36,7 @@ public void setName(String name) { this.name = name; } - @ConfigurationProperties(prefix = "invalid") + @ConfigurationProperties("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 ca028eb7a7a7..033ad6357dd2 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 @@ -36,7 +36,7 @@ public void setValue(String value) { this.value = value; } - @ConfigurationProperties(prefix = "conflict") + @ConfigurationProperties("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/PackagePrivateMethodConfig.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/PackagePrivateMethodConfig.java index b1dbd565c09a..e3d290d66e61 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 @@ -25,7 +25,7 @@ */ public class PackagePrivateMethodConfig { - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("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 44f033bf8091..a10041609862 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 @@ -25,7 +25,7 @@ */ public class PrivateMethodConfig { - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("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 6d5f3c409002..d26c76cb4e4e 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 @@ -25,7 +25,7 @@ */ public class ProtectedMethodConfig { - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("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 677ffbb33561..f76a8ae4f03b 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 @@ -25,7 +25,7 @@ */ public class PublicMethodConfig { - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("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 7bea9f880b30..aa394007446e 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 @@ -27,7 +27,7 @@ @SuppressWarnings("unused") public class SingleConstructorMethodConfig { - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("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/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 ed9ab56bdf2a..6b1b6ac34177 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 @@ -39,7 +39,7 @@ public void setParentClassProperty(int parentClassProperty) { } - @ConfigurationProperties(prefix = "nestedChildProps") + @ConfigurationProperties("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/DeprecatedProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/DeprecatedProperties.java index d29acb0a348c..28cba7be1b0a 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 @@ -25,7 +25,7 @@ * @deprecated deprecated */ @Deprecated -@ConfigurationProperties(prefix = "deprecated") +@ConfigurationProperties("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/HierarchicalProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/HierarchicalProperties.java index cbd0ff27be98..af1c6a9513d8 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 @@ -23,7 +23,7 @@ * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "hierarchical") +@ConfigurationProperties("hierarchical") public class HierarchicalProperties extends HierarchicalPropertiesParent { private String third = "three"; 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 474d7691b63d..338ed5d60642 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 @@ -23,7 +23,7 @@ * * @author Phillip Webb */ -@ConfigurationProperties(prefix = "config") +@ConfigurationProperties("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/SimpleCollectionProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleCollectionProperties.java index 019ba7f956b3..d03d61cbbe6c 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 @@ -30,7 +30,7 @@ * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "collection") +@ConfigurationProperties("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/SimpleProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleProperties.java index 43d672796074..a79b0ee4259b 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 @@ -26,7 +26,7 @@ * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "simple") +@ConfigurationProperties("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 ef9ab15d8021..1c1c3e498306 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 @@ -23,7 +23,7 @@ * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "simple.type") +@ConfigurationProperties("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/BuilderPojo.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/BuilderPojo.java index b42aa524a0fd..627c883eb95f 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 @@ -23,7 +23,7 @@ * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "builder") +@ConfigurationProperties("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/ExcludedTypesPojo.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/ExcludedTypesPojo.java index 2942c9287bca..0dc2538e9a34 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 @@ -29,7 +29,7 @@ * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "excluded") +@ConfigurationProperties("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/InnerClassHierarchicalProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassHierarchicalProperties.java index ab1c61ef8394..299837d7397f 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 @@ -25,7 +25,7 @@ * * @author Madhura Bhave */ -@ConfigurationProperties(prefix = "config") +@ConfigurationProperties("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 049371b45fd7..d15357be0686 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 @@ -24,7 +24,7 @@ * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "config") +@ConfigurationProperties("config") public class InnerClassProperties { private final Foo first = new Foo(); 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 d8cf493bd307..707c8a19739e 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 @@ -25,7 +25,7 @@ */ public class InnerClassRootConfig { - @ConfigurationProperties(prefix = "config") + @ConfigurationProperties("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 de7cdf2a82f3..9e77133ca0b0 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 @@ -23,7 +23,7 @@ * * @author Stephane Nicoll */ -@ConfigurationProperties(prefix = "config") +@ConfigurationProperties("config") public class InvalidAccessorProperties { private String name; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanFactoryInitializationAotProcessorTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanFactoryInitializationAotProcessorTests.java index 984cfaf4542d..619c224a1db1 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanFactoryInitializationAotProcessorTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanFactoryInitializationAotProcessorTests.java @@ -180,7 +180,7 @@ String getValue() { static class PossibleConstructorBindingPropertiesBeanMethodConfiguration { @Bean - @ConfigurationProperties(prefix = "bean-method") + @ConfigurationProperties("bean-method") PossibleConstructorBindingProperties possibleConstructorBindingProperties() { return new PossibleConstructorBindingProperties("alpha"); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrarTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrarTests.java index 374a7a013417..24a26ee75ea3 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrarTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanRegistrarTests.java @@ -141,24 +141,24 @@ private Consumer hasBindMethodAttribute(BindMethod bindMethod) { }; } - @ConfigurationProperties(prefix = "beancp") + @ConfigurationProperties("beancp") static class BeanConfigurationProperties { } - @ConfigurationProperties(prefix = "beancp") + @ConfigurationProperties("beancp") @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) static class ScopedBeanConfigurationProperties { } - @ConfigurationProperties(prefix = "beancp") + @ConfigurationProperties("beancp") @Scope(scopeName = ConfigurableBeanFactory.SCOPE_PROTOTYPE, proxyMode = ScopedProxyMode.TARGET_CLASS) static class ProxyScopedBeanConfigurationProperties { } - @ConfigurationProperties(prefix = "beancp") + @ConfigurationProperties("beancp") @Primary static class PrimaryConfigurationProperties { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanTests.java index 7e361c87471b..f5b5f21e410a 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBeanTests.java @@ -363,12 +363,12 @@ static class NonAnnotatedComponent { } @Component("annotatedComponent") - @ConfigurationProperties(prefix = "prefix") + @ConfigurationProperties("prefix") static class AnnotatedComponent { } - @ConfigurationProperties(prefix = "prefix") + @ConfigurationProperties("prefix") static class AnnotatedBean { } @@ -402,7 +402,7 @@ static class ValidatedBean { static class NonAnnotatedBeanConfiguration { @Bean - @ConfigurationProperties(prefix = "prefix") + @ConfigurationProperties("prefix") NonAnnotatedBean nonAnnotatedBean() { return new NonAnnotatedBean(); } @@ -434,7 +434,7 @@ AnnotatedGenericBean annotatedGenericBean() { static class AnnotatedBeanConfiguration { @Bean - @ConfigurationProperties(prefix = "factory") + @ConfigurationProperties("factory") AnnotatedBean annotatedBean() { return new AnnotatedBean(); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java index 26539664f11b..4ccc8a894e8d 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java @@ -1422,7 +1422,7 @@ static class MultiplePrefixPropertiesDeclaredAsAnnotationValueConfiguration { static class PrefixedPropertiesReplacedOnBeanMethodConfiguration { @Bean - @ConfigurationProperties(prefix = "spam") + @ConfigurationProperties("spam") PrefixProperties prefixProperties() { return new PrefixProperties(); } @@ -1541,7 +1541,7 @@ static class PrototypeBeanProperties extends PrototypeBean { } @EnableConfigurationProperties - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class PropertiesWithResource { private Resource resource; @@ -1830,12 +1830,12 @@ long getBar() { } - @ConfigurationProperties(prefix = "spring.foo") + @ConfigurationProperties("spring.foo") static class PrefixProperties extends BasicProperties { } - @ConfigurationProperties(prefix = "spring.bar") + @ConfigurationProperties("spring.bar") static class AnotherPrefixProperties extends BasicProperties { } @@ -1967,7 +1967,7 @@ void setFoo(String foo) { } - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") @Validated static class WithPropertyPlaceholderValueProperties { @@ -1985,7 +1985,7 @@ String getValue() { } @EnableConfigurationProperties - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class WithEnumProperties { private FooEnum theValue; @@ -2033,7 +2033,7 @@ void setChars(char[] chars) { } @EnableConfigurationProperties - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class WithRelaxedNamesProperties { private String fooBar; @@ -2060,7 +2060,7 @@ void setBarBAZ(String barBAZ) { @Validated @EnableConfigurationProperties - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class WithMapProperties { private Map map; @@ -2076,7 +2076,7 @@ void setMap(Map map) { } @EnableConfigurationProperties - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class WithComplexMapProperties { private Map> map; @@ -2092,7 +2092,7 @@ void setMap(Map> map) { } @EnableConfigurationProperties - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class WithIntegerMapProperties { private Map> map; @@ -2134,7 +2134,7 @@ void setFoo(int foo) { } @EnableConfigurationProperties - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class PersonProperties { private Person person; @@ -2150,7 +2150,7 @@ void setPerson(Person person) { } @EnableConfigurationProperties - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class PersonAndAlienProperties { private Person person; @@ -2176,7 +2176,7 @@ void setAlien(Alien alien) { } @EnableConfigurationProperties - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class PersonAndAliensProperties { private Person person; @@ -2202,7 +2202,7 @@ void setAliens(List aliens) { } @EnableConfigurationProperties - @ConfigurationProperties(prefix = "sample") + @ConfigurationProperties("sample") static class MapWithNumericKeyProperties { private final Map properties = new LinkedHashMap<>(); @@ -2270,7 +2270,7 @@ String getFoo() { } @EnableConfigurationProperties - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class WithSetterThatThrowsValidationExceptionProperties { private String foo; @@ -2288,7 +2288,7 @@ void setFoo(String foo) { } - @ConfigurationProperties(prefix = "custom") + @ConfigurationProperties("custom") static class WithCustomValidatorProperties { private String foo; @@ -2304,7 +2304,7 @@ void setFoo(String foo) { } @EnableConfigurationProperties - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class ListOfGenericClassProperties { private List> list; @@ -2320,7 +2320,7 @@ void setList(List> list) { } @EnableConfigurationProperties - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class FileProperties { private File file; @@ -2336,7 +2336,7 @@ void setFile(File file) { } @EnableConfigurationProperties - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class DataSizeProperties { private DataSize size; @@ -2362,7 +2362,7 @@ void setAnotherSize(DataSize anotherSize) { } - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class OtherInjectedProperties { final DataSizeProperties dataSizeProperties; @@ -2379,7 +2379,7 @@ static class OtherInjectPropertiesConfiguration { } - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") @Validated static class ConstructorParameterProperties { @@ -2403,7 +2403,7 @@ int getBar() { } - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class ConstructorParameterEmptyDefaultValueProperties { private final Set set; @@ -2441,7 +2441,7 @@ Optional getOptional() { } - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class ConstructorParameterWithUnitProperties { private final Duration duration; @@ -2473,7 +2473,7 @@ Period getPeriod() { } - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class ConstructorParameterWithFormatProperties { private final Duration duration; @@ -2497,7 +2497,7 @@ Period getPeriod() { } - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") @Validated static class ConstructorParameterValidatedProperties { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesRegistrarTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesRegistrarTests.java index 63e9167534d9..cd3d4dc37a07 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesRegistrarTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesRegistrarTests.java @@ -130,12 +130,12 @@ static class EmptyConfiguration { } - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("foo") static class FooProperties { } - @ConfigurationProperties(prefix = "bar") + @ConfigurationProperties("bar") static class BarProperties { BarProperties(String foo) { @@ -143,7 +143,7 @@ static class BarProperties { } - @ConfigurationProperties(prefix = "bing") + @ConfigurationProperties("bing") static class BingProperties { BingProperties() { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/WithPublicStringConstructorProperties.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/WithPublicStringConstructorProperties.java index 3592389ff2af..70f7947fbf85 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/WithPublicStringConstructorProperties.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/WithPublicStringConstructorProperties.java @@ -22,7 +22,7 @@ * * @author Madhura Bhave */ -@ConfigurationProperties(prefix = "test") +@ConfigurationProperties("test") public class WithPublicStringConstructorProperties { private String a; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/combined/c/CombinedConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/combined/c/CombinedConfiguration.java index 1ebef95ed452..9bcab3294334 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/combined/c/CombinedConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/combined/c/CombinedConfiguration.java @@ -25,7 +25,7 @@ public class CombinedConfiguration { @Component - @ConfigurationProperties(prefix = "b") + @ConfigurationProperties("b") static class MyProperties { } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/combined/d/OtherCombinedConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/combined/d/OtherCombinedConfiguration.java index f39a4546bb57..62096f6dd868 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/combined/d/OtherCombinedConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/combined/d/OtherCombinedConfiguration.java @@ -25,7 +25,7 @@ public class OtherCombinedConfiguration { @RestController - @ConfigurationProperties(prefix = "c") + @ConfigurationProperties("c") static class MyControllerProperties { } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/ConfigurationPropertiesScanConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/ConfigurationPropertiesScanConfiguration.java index 5bf5b742b89f..9cbe971a7057 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/ConfigurationPropertiesScanConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/ConfigurationPropertiesScanConfiguration.java @@ -41,12 +41,12 @@ public static class DifferentPackageConfiguration { } - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("foo") static class FooProperties { } - @ConfigurationProperties(prefix = "bar") + @ConfigurationProperties("bar") static class BarProperties { BarProperties(String foo) { @@ -54,7 +54,7 @@ static class BarProperties { } - @ConfigurationProperties(prefix = "bing") + @ConfigurationProperties("bing") static class BingProperties { BingProperties() { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/a/AScanConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/a/AScanConfiguration.java index bb66987cfdda..f5262235e78c 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/a/AScanConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/a/AScanConfiguration.java @@ -28,19 +28,19 @@ */ public class AScanConfiguration { - @ConfigurationProperties(prefix = "a") + @ConfigurationProperties("a") static class AProperties { } @Profile("test") - @ConfigurationProperties(prefix = "profile") + @ConfigurationProperties("profile") static class MyProfileProperties { } @Conditional(TestResourceCondition.class) - @ConfigurationProperties(prefix = "resource") + @ConfigurationProperties("resource") static class MyResourceProperties { } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/b/BScanConfiguration.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/b/BScanConfiguration.java index f3d0c6f39f71..5710f690ae4a 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/b/BScanConfiguration.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/scan/valid/b/BScanConfiguration.java @@ -28,7 +28,7 @@ public interface BProperties { } - @ConfigurationProperties(prefix = "b.first") + @ConfigurationProperties("b.first") public static class BFirstProperties implements BProperties { private final String name; @@ -43,7 +43,7 @@ public String getName() { } - @ConfigurationProperties(prefix = "b.second") + @ConfigurationProperties("b.second") public static class BSecondProperties implements BProperties { private int number; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/io/ProtocolResolverApplicationContextInitializerIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/io/ProtocolResolverApplicationContextInitializerIntegrationTests.java index 25acae6d031c..d49270827f60 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/io/ProtocolResolverApplicationContextInitializerIntegrationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/io/ProtocolResolverApplicationContextInitializerIntegrationTests.java @@ -59,7 +59,7 @@ static class TestConfiguration { } - @ConfigurationProperties(prefix = "test") + @ConfigurationProperties("test") static class TestProperties { Resource resource; diff --git a/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/KotlinConfigurationPropertiesBeanRegistrarTests.kt b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/KotlinConfigurationPropertiesBeanRegistrarTests.kt index 4b941250bc49..6998f68f46f7 100644 --- a/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/KotlinConfigurationPropertiesBeanRegistrarTests.kt +++ b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/KotlinConfigurationPropertiesBeanRegistrarTests.kt @@ -51,13 +51,13 @@ class KotlinConfigurationPropertiesBeanRegistrarTests { assertThat(beanDefinition.getAttribute(BindMethod::class.java.name)).isEqualTo(BindMethod.JAVA_BEAN) } - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("foo") class FooProperties - @ConfigurationProperties(prefix = "bar") + @ConfigurationProperties("bar") class BarProperties(val name: String?, val counter: Int = 42) - @ConfigurationProperties(prefix = "bing") + @ConfigurationProperties("bing") class BingProperties { constructor() diff --git a/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/KotlinConfigurationPropertiesTests.kt b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/KotlinConfigurationPropertiesTests.kt index 14594577ac25..6744fe01805e 100644 --- a/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/KotlinConfigurationPropertiesTests.kt +++ b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/KotlinConfigurationPropertiesTests.kt @@ -87,7 +87,7 @@ class KotlinConfigurationPropertiesTests { assertThat(this.context.getBean(MutableDataClassProperties::class.java).prop).isEqualTo("alpha") } - @ConfigurationProperties(prefix = "foo") + @ConfigurationProperties("foo") class BingProperties(@Suppress("UNUSED_PARAMETER") bar: String) @EnableConfigurationProperties @@ -122,7 +122,7 @@ class KotlinConfigurationPropertiesTests { @Import(MutableDataClassProperties::class) class MutableDataClassPropertiesImporter - @ConfigurationProperties(prefix = "mutable") + @ConfigurationProperties("mutable") data class MutableDataClassProperties( var prop: String = "" ) @@ -130,7 +130,7 @@ class KotlinConfigurationPropertiesTests { @EnableConfigurationProperties(RenamedProperties::class) class EnableRenamedProperties - @ConfigurationProperties(prefix = "renamed") + @ConfigurationProperties("renamed") class RenamedProperties{ @Name("var") var bar: String = "" diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SampleProperties.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SampleProperties.java index 72e2dc8ea34f..5800cdaa31f7 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SampleProperties.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/src/main/java/smoketest/propertyvalidation/SampleProperties.java @@ -19,7 +19,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.validation.annotation.Validated; -@ConfigurationProperties(prefix = "sample") +@ConfigurationProperties("sample") @Validated public class SampleProperties { diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/SampleConfigurationProperties.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/SampleConfigurationProperties.java index 5782a3281f99..30498640c0f2 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/SampleConfigurationProperties.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-simple/src/main/java/smoketest/simple/SampleConfigurationProperties.java @@ -22,7 +22,7 @@ import org.springframework.validation.annotation.Validated; @Validated -@ConfigurationProperties(prefix = "sample") +@ConfigurationProperties("sample") public final class SampleConfigurationProperties { @NotNull