diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/ApiversionProperties.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/ApiversionProperties.java index 08f0d086a1a..913416a2bd4 100644 --- a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/ApiversionProperties.java +++ b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/ApiversionProperties.java @@ -18,7 +18,6 @@ package org.springframework.boot.http.client.autoconfigure; import org.jspecify.annotations.Nullable; -import org.springframework.boot.context.properties.ConfigurationPropertiesSource; import org.springframework.boot.context.properties.bind.Name; /** @@ -27,7 +26,6 @@ import org.springframework.boot.context.properties.bind.Name; * @author Phillip Webb * @since 4.0.0 */ -@ConfigurationPropertiesSource public class ApiversionProperties { /** @@ -53,7 +51,6 @@ public class ApiversionProperties { return this.insert; } - @ConfigurationPropertiesSource public static class Insert { /** diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientProperties.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientProperties.java index 451e8b3f5e9..02ae015053f 100644 --- a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientProperties.java +++ b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientProperties.java @@ -22,7 +22,6 @@ import java.util.Map; import org.jspecify.annotations.Nullable; -import org.springframework.boot.context.properties.ConfigurationPropertiesSource; import org.springframework.boot.context.properties.NestedConfigurationProperty; /** @@ -34,7 +33,6 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; * @author Phillip Webb * @since 4.0.0 */ -@ConfigurationPropertiesSource public class HttpClientProperties extends HttpClientSettingsProperties { /** diff --git a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientSettingsProperties.java b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientSettingsProperties.java index 6835ddc050f..888feef654f 100644 --- a/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientSettingsProperties.java +++ b/module/spring-boot-http-client/src/main/java/org/springframework/boot/http/client/autoconfigure/HttpClientSettingsProperties.java @@ -20,7 +20,6 @@ import java.time.Duration; import org.jspecify.annotations.Nullable; -import org.springframework.boot.context.properties.ConfigurationPropertiesSource; import org.springframework.boot.http.client.HttpClientSettings; import org.springframework.boot.http.client.HttpRedirects; @@ -31,7 +30,6 @@ import org.springframework.boot.http.client.HttpRedirects; * @since 4.0.0 * @see HttpClientSettings */ -@ConfigurationPropertiesSource public abstract class HttpClientSettingsProperties { /** @@ -85,7 +83,6 @@ public abstract class HttpClientSettingsProperties { /** * SSL configuration. */ - @ConfigurationPropertiesSource public static class Ssl { /** diff --git a/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/properties/PushRegistryProperties.java b/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/properties/PushRegistryProperties.java index 30160caa142..653a6644a35 100644 --- a/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/properties/PushRegistryProperties.java +++ b/module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/properties/PushRegistryProperties.java @@ -18,8 +18,6 @@ package org.springframework.boot.micrometer.metrics.autoconfigure.export.propert import java.time.Duration; -import org.springframework.boot.context.properties.ConfigurationPropertiesSource; - /** * Base class for properties that configure a metrics registry that pushes aggregated * metrics on a regular interval. @@ -29,7 +27,6 @@ import org.springframework.boot.context.properties.ConfigurationPropertiesSource * @author Stephane Nicoll * @since 4.0.0 */ -@ConfigurationPropertiesSource public abstract class PushRegistryProperties { /** diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Compression.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Compression.java index 76a530ce6d1..9d2f287e2db 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Compression.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Compression.java @@ -18,7 +18,6 @@ package org.springframework.boot.web.server; import org.jspecify.annotations.Nullable; -import org.springframework.boot.context.properties.ConfigurationPropertiesSource; import org.springframework.util.unit.DataSize; /** @@ -29,7 +28,6 @@ import org.springframework.util.unit.DataSize; * @author Stephane Nicoll * @since 2.0.0 */ -@ConfigurationPropertiesSource public class Compression { /** diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Cookie.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Cookie.java index 8214f5cb770..69b16370f07 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Cookie.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Cookie.java @@ -21,7 +21,6 @@ import java.time.temporal.ChronoUnit; import org.jspecify.annotations.Nullable; -import org.springframework.boot.context.properties.ConfigurationPropertiesSource; import org.springframework.boot.convert.DurationUnit; /** @@ -33,7 +32,6 @@ import org.springframework.boot.convert.DurationUnit; * @author Weix Sun * @since 2.6.0 */ -@ConfigurationPropertiesSource public class Cookie { /** diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Http2.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Http2.java index 0500198daee..50aa9a7c4ea 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Http2.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/Http2.java @@ -16,15 +16,12 @@ package org.springframework.boot.web.server; -import org.springframework.boot.context.properties.ConfigurationPropertiesSource; - /** * Simple server-independent abstraction for HTTP/2 configuration. * * @author Brian Clozel * @since 2.0.0 */ -@ConfigurationPropertiesSource public class Http2 { /** diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/Jsp.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/Jsp.java index 7d0ea8aa870..ceda49d2f23 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/Jsp.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/Jsp.java @@ -19,8 +19,6 @@ package org.springframework.boot.web.server.servlet; import java.util.HashMap; import java.util.Map; -import org.springframework.boot.context.properties.ConfigurationPropertiesSource; - /** * Configuration for the server's JSP servlet. * @@ -28,7 +26,6 @@ import org.springframework.boot.context.properties.ConfigurationPropertiesSource * @author Stephane Nicoll * @since 4.0.0 */ -@ConfigurationPropertiesSource public class Jsp { /** diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/Session.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/Session.java index 889cf9c3e50..3066276f595 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/Session.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/Session.java @@ -23,7 +23,6 @@ import java.util.Set; import org.jspecify.annotations.Nullable; -import org.springframework.boot.context.properties.ConfigurationPropertiesSource; import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.boot.convert.DurationUnit; import org.springframework.boot.web.server.Cookie; @@ -34,7 +33,6 @@ import org.springframework.boot.web.server.Cookie; * @author Andy Wilkinson * @since 4.0.0 */ -@ConfigurationPropertiesSource public class Session { /**