diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java index 482bc29af7..f592b34481 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java @@ -3137,7 +3137,9 @@ public ChannelSecurityConfigurer.ChannelRequestMatcherRegistry req * the {@link ChannelSecurityConfigurer.ChannelRequestMatcherRegistry} * @return the {@link HttpSecurity} for further customizations * @throws Exception + * @deprecated Use {@link #redirectToHttps} */ + @Deprecated public HttpSecurity requiresChannel( Customizer.ChannelRequestMatcherRegistry> requiresChannelCustomizer) throws Exception { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java index 07c49323b8..b5e7f93e87 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java @@ -78,7 +78,9 @@ * @author Rob Winch * @author Onur Kagan Ozcan * @since 3.2 + * @deprecated please use {@link HttpsRedirectConfigurer} instead */ +@Deprecated public final class ChannelSecurityConfigurer> extends AbstractHttpConfigurer, H> { @@ -147,6 +149,10 @@ private ChannelRequestMatcherRegistry addAttribute(String attribute, List { @@ -215,6 +221,10 @@ public H and() { } + /** + * @deprecated no replacement planned + */ + @Deprecated public class RequiresChannelUrl { protected List requestMatchers; diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt index bd1b6e0bc0..a0e3b48ca2 100644 --- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt +++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/HttpSecurityDsl.kt @@ -527,7 +527,9 @@ class HttpSecurityDsl(private val http: HttpSecurity, private val init: HttpSecu * @param requiresChannelConfiguration custom configuration that specifies * channel security * @see [RequiresChannelDsl] + * @deprecated please use [redirectToHttps] instead */ + @Deprecated(message="since 6.5 use redirectToHttps instead") fun requiresChannel(requiresChannelConfiguration: RequiresChannelDsl.() -> Unit) { val requiresChannelCustomizer = RequiresChannelDsl().apply(requiresChannelConfiguration).get() this.http.requiresChannel(requiresChannelCustomizer)