Merge 927f55ed80 into 9095a1bffd

2 days ago · c33bc200d8
2 changed files with 4 additions and 0 deletions
--- a/access/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java
+++ b/access/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java
@ -32,7 +32,9 @@ import org.springframework.security.web.FilterInvocation;
				@@ -32,7 +32,9 @@ import org.springframework.security.web.FilterInvocation;
 * @author Eddú Meléndez
 * @author Steve Riesenberg
 * @since 3.0
+ * @deprecated in favor of {@link DefaultHttpSecurityExpressionHandler}
 */
+@Deprecated(since = "7.0.0")
 public class DefaultWebSecurityExpressionHandler extends AbstractSecurityExpressionHandler<FilterInvocation>
 		implements SecurityExpressionHandler<FilterInvocation> {

--- a/web/src/main/java/org/springframework/security/web/access/expression/FilterInvocationExpressionRoot.java
+++ b/web/src/main/java/org/springframework/security/web/access/expression/FilterInvocationExpressionRoot.java
@ -28,7 +28,9 @@ import org.springframework.security.web.util.matcher.IpAddressMatcher;
				@@ -28,7 +28,9 @@ import org.springframework.security.web.util.matcher.IpAddressMatcher;
 /**
 * @author Steve Riesenberg
 * @since 7.0
+ * @deprecated in favor of {@link WebSecurityExpressionRoot}
 */
+@Deprecated(since = "7.0.0")
 final class FilterInvocationExpressionRoot extends SecurityExpressionRoot<FilterInvocation> {

 	/**