diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java index 12b41b5c42..d2d13450ec 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java @@ -22,7 +22,9 @@ import java.util.LinkedHashMap; import java.util.List; import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.authorization.AuthorizationManager; import org.springframework.security.config.annotation.web.AbstractRequestMatcherRegistry; +import org.springframework.security.core.annotation.SecurityAnnotationScanner; import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.util.Assert; @@ -36,7 +38,14 @@ import org.springframework.util.Assert; * @see ChannelSecurityConfigurer * @see UrlAuthorizationConfigurer * @see ExpressionUrlAuthorizationConfigurer + * @deprecated In modern Spring Security APIs, each API manages its own configuration + * context. As such there is no direct replacement for this interface. In the case of + * method security, please see {@link SecurityAnnotationScanner} and + * {@link AuthorizationManager}. In the case of channel security, please see + * {@code HttpsRedirectFilter}. In the case of web security, please see + * {@link AuthorizationManager}. */ +@Deprecated public abstract class AbstractConfigAttributeRequestMatcherRegistry extends AbstractRequestMatcherRegistry { private List urlMappings = new ArrayList<>(); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java index ceec4c1201..81246109ce 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java @@ -151,6 +151,7 @@ public abstract class AbstractInterceptUrlConfigurer, T> extends AbstractConfigAttributeRequestMatcherRegistry { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java index 599c9703d9..f398049c34 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java @@ -202,6 +202,7 @@ public final class ExpressionUrlAuthorizationConfigurer.AbstractInterceptUrlRegistry { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java index 88e45080ef..7bfbbacb4b 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java @@ -203,6 +203,7 @@ public final class UrlAuthorizationConfigurer> return authorities; } + @Deprecated public final class StandardInterceptUrlRegistry extends UrlAuthorizationConfigurer.AbstractInterceptUrlRegistry { diff --git a/core/src/main/java/org/springframework/security/access/ConfigAttribute.java b/core/src/main/java/org/springframework/security/access/ConfigAttribute.java index b1708a6e3c..d413cca993 100644 --- a/core/src/main/java/org/springframework/security/access/ConfigAttribute.java +++ b/core/src/main/java/org/springframework/security/access/ConfigAttribute.java @@ -19,6 +19,8 @@ package org.springframework.security.access; import java.io.Serializable; import org.springframework.security.access.intercept.RunAsManager; +import org.springframework.security.authorization.AuthorizationManager; +import org.springframework.security.core.annotation.SecurityAnnotationScanner; /** * Stores a security system related configuration attribute. @@ -35,7 +37,14 @@ import org.springframework.security.access.intercept.RunAsManager; * target. * * @author Ben Alex + * @deprecated In modern Spring Security APIs, each API manages its own configuration + * context. As such there is no direct replacement for this interface. In the case of + * method security, please see {@link SecurityAnnotationScanner} and + * {@link AuthorizationManager}. In the case of channel security, please see + * {@code HttpsRedirectFilter}. In the case of web security, please see + * {@link AuthorizationManager}. */ +@Deprecated public interface ConfigAttribute extends Serializable { /** diff --git a/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionConfigAttribute.java b/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionConfigAttribute.java index b967de5e38..4cd1ed4421 100644 --- a/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionConfigAttribute.java +++ b/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionConfigAttribute.java @@ -19,6 +19,7 @@ package org.springframework.security.web.access.expression; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.security.access.ConfigAttribute; +import org.springframework.security.authorization.AuthorizationManager; import org.springframework.security.web.FilterInvocation; /** @@ -26,7 +27,11 @@ import org.springframework.security.web.FilterInvocation; * * @author Luke Taylor * @since 3.0 + * @deprecated In modern Spring Security APIs, each API manages its own configuration + * context. As such there is no direct replacement for this interface. Please see + * {@link AuthorizationManager}. */ +@Deprecated class WebExpressionConfigAttribute implements ConfigAttribute, EvaluationContextPostProcessor { private final Expression authorizeExpression;