From bc4cc434feef4cdccabb45f0ed591ea6ac2d005e Mon Sep 17 00:00:00 2001 From: Bae Jihong Date: Sun, 15 Feb 2026 22:54:48 +0900 Subject: [PATCH] Refactor code to remove compiler warnings - replace setTrustResolver with setAuthorizationManagerFactory in MethodSecurityExpressionRootTests - resolve raw type warning in ExpressionBasedMessageSecurityMetadataSourceFactoryTests Closes gh-18412 Signed-off-by: Bae Jihong --- .../expression/method/MethodSecurityExpressionRootTests.java | 5 ++++- ...essionBasedMessageSecurityMetadataSourceFactoryTests.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/access/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java b/access/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java index a908236c99..24ba64d177 100644 --- a/access/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java +++ b/access/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java @@ -27,6 +27,7 @@ import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.security.access.PermissionEvaluator; import org.springframework.security.access.expression.ExpressionUtils; import org.springframework.security.authentication.AuthenticationTrustResolver; +import org.springframework.security.authorization.DefaultAuthorizationManagerFactory; import org.springframework.security.core.Authentication; import static org.mockito.ArgumentMatchers.any; @@ -58,7 +59,9 @@ public class MethodSecurityExpressionRootTests { this.ctx = new StandardEvaluationContext(); this.ctx.setRootObject(this.root); this.trustResolver = mock(AuthenticationTrustResolver.class); - this.root.setTrustResolver(this.trustResolver); + DefaultAuthorizationManagerFactory authorizationManagerFactory = new DefaultAuthorizationManagerFactory<>(); + authorizationManagerFactory.setTrustResolver(this.trustResolver); + this.root.setAuthorizationManagerFactory(authorizationManagerFactory); } @Test diff --git a/access/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java b/access/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java index b52ffe1099..fcaa562e96 100644 --- a/access/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java +++ b/access/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java @@ -58,7 +58,7 @@ public class ExpressionBasedMessageSecurityMetadataSourceFactoryTests { MessageSecurityMetadataSource source; - MessageSecurityExpressionRoot rootObject; + MessageSecurityExpressionRoot rootObject; @BeforeEach public void setup() { @@ -69,7 +69,7 @@ public class ExpressionBasedMessageSecurityMetadataSourceFactoryTests { this.matcherToExpression.put(this.matcher2, this.expression2); this.source = ExpressionBasedMessageSecurityMetadataSourceFactory .createExpressionMessageMetadataSource(this.matcherToExpression); - this.rootObject = new MessageSecurityExpressionRoot(this.authentication, this.message); + this.rootObject = new MessageSecurityExpressionRoot<>(this.authentication, this.message); } @Test