From 9b108df1dc86e934f32659341bb341b3e73582a4 Mon Sep 17 00:00:00 2001 From: Bae Jihong Date: Sun, 8 Feb 2026 17:57:42 +0900 Subject: [PATCH] Add @SuppressWarnings(deprecation) on tests - add on tests for deprecated class - add on tests for specific deprecated function Closes gh-18412 Signed-off-by: Bae Jihong --- .../AuthenticationCredentialsNotFoundEventTests.java | 1 + .../security/access/AuthorizationFailureEventTests.java | 1 + .../security/access/AuthorizedEventTests.java | 1 + .../security/access/SecurityConfigTests.java | 1 + .../Jsr250MethodSecurityMetadataSourceTests.java | 1 + .../security/access/annotation/Jsr250VoterTests.java | 1 + .../SecuredAnnotationSecurityMetadataSourceTests.java | 1 + .../DefaultMethodSecurityExpressionHandlerTests.java | 4 +++- .../method/ExpressionBasedPreInvocationAdviceTests.java | 1 + .../expression/method/MethodExpressionVoterTests.java | 2 +- .../PrePostAnnotationSecurityMetadataSourceTests.java | 1 + .../intercept/AbstractSecurityInterceptorTests.java | 1 + .../intercept/AfterInvocationProviderManagerTests.java | 2 +- .../access/intercept/InterceptorStatusTokenTests.java | 1 + .../security/access/intercept/NullRunAsManagerTests.java | 1 + .../intercept/RunAsImplAuthenticationProviderTests.java | 1 + .../security/access/intercept/RunAsManagerImplTests.java | 1 + .../security/access/intercept/RunAsUserTokenTests.java | 1 + .../aopalliance/MethodSecurityInterceptorTests.java | 2 +- .../MethodSecurityMetadataSourceAdvisorTests.java | 1 + .../aspectj/AspectJMethodSecurityInterceptorTests.java | 1 + .../MapBasedMethodSecurityMetadataSourceTests.java | 1 + .../method/MethodInvocationPrivilegeEvaluatorTests.java | 1 + .../DelegatingMethodSecurityMetadataSourceTests.java | 2 +- .../prepost/PostInvocationAdviceProviderTests.java | 1 + .../PreInvocationAuthorizationAdviceVoterTests.java | 1 + .../access/vote/AbstractAccessDecisionManagerTests.java | 2 +- .../security/access/vote/AbstractAclVoterTests.java | 1 + .../security/access/vote/AffirmativeBasedTests.java | 1 + .../security/access/vote/AuthenticatedVoterTests.java | 1 + .../security/access/vote/ConsensusBasedTests.java | 1 + .../security/access/vote/DenyAgainVoter.java | 1 + .../springframework/security/access/vote/DenyVoter.java | 1 + .../security/access/vote/RoleHierarchyVoterTests.java | 1 + .../security/access/vote/RoleVoterTests.java | 1 + .../security/access/vote/UnanimousBasedTests.java | 1 + ...yAfterInvocationCollectionFilteringProviderTests.java | 2 +- .../AclEntryAfterInvocationProviderTests.java | 2 +- ...onBasedMessageSecurityMetadataSourceFactoryTests.java | 1 + .../MessageExpressionConfigAttributeTests.java | 1 + .../access/expression/MessageExpressionVoterTests.java | 9 +++++++++ .../intercept/ChannelSecurityInterceptorTests.java | 1 + .../DefaultMessageSecurityMetadataSourceTests.java | 1 + .../DefaultWebInvocationPrivilegeEvaluatorTests.java | 1 + .../access/channel/ChannelDecisionManagerImplTests.java | 2 +- .../web/access/channel/ChannelProcessingFilterTests.java | 1 + .../access/channel/InsecureChannelProcessorTests.java | 1 + .../web/access/channel/RetryWithHttpEntryPointTests.java | 1 + .../access/channel/RetryWithHttpsEntryPointTests.java | 1 + .../web/access/channel/SecureChannelProcessorTests.java | 1 + .../DefaultWebSecurityExpressionHandlerTests.java | 2 ++ ...BasedFilterInvocationSecurityMetadataSourceTests.java | 1 + .../web/access/expression/WebExpressionVoterTests.java | 2 +- ...faultFilterInvocationSecurityMetadataSourceTests.java | 1 + .../access/intercept/FilterSecurityInterceptorTests.java | 1 + 55 files changed, 66 insertions(+), 10 deletions(-) diff --git a/access/src/test/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEventTests.java b/access/src/test/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEventTests.java index ee11ef2321..8dfbbf9f42 100644 --- a/access/src/test/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEventTests.java +++ b/access/src/test/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEventTests.java @@ -29,6 +29,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class AuthenticationCredentialsNotFoundEventTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java b/access/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java index 519eae87cc..80a7ce620c 100644 --- a/access/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java +++ b/access/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java @@ -32,6 +32,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class AuthorizationFailureEventTests { private final UsernamePasswordAuthenticationToken foo = UsernamePasswordAuthenticationToken.unauthenticated("foo", diff --git a/access/src/test/java/org/springframework/security/access/AuthorizedEventTests.java b/access/src/test/java/org/springframework/security/access/AuthorizedEventTests.java index c5655ec282..f008c0e330 100644 --- a/access/src/test/java/org/springframework/security/access/AuthorizedEventTests.java +++ b/access/src/test/java/org/springframework/security/access/AuthorizedEventTests.java @@ -29,6 +29,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class AuthorizedEventTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/SecurityConfigTests.java b/access/src/test/java/org/springframework/security/access/SecurityConfigTests.java index 469ce214bd..fafb372c57 100644 --- a/access/src/test/java/org/springframework/security/access/SecurityConfigTests.java +++ b/access/src/test/java/org/springframework/security/access/SecurityConfigTests.java @@ -27,6 +27,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class SecurityConfigTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java b/access/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java index 957d92e5f7..f2a537ad64 100644 --- a/access/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java +++ b/access/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java @@ -32,6 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Luke Taylor * @author Ben Alex */ +@SuppressWarnings("deprecation") public class Jsr250MethodSecurityMetadataSourceTests { Jsr250MethodSecurityMetadataSource mds; diff --git a/access/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java b/access/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java index eba794053d..40a9e14311 100644 --- a/access/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java +++ b/access/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java @@ -31,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Luke Taylor */ +@SuppressWarnings("deprecation") public class Jsr250VoterTests { // SEC-1443 diff --git a/access/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java b/access/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java index e4b5235f16..c1a0ce29b0 100644 --- a/access/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java +++ b/access/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java @@ -46,6 +46,7 @@ import static org.assertj.core.api.Assertions.fail; * @author Ben Alex * @author Luke Taylor */ +@SuppressWarnings("deprecation") public class SecuredAnnotationSecurityMetadataSourceTests { private SecuredAnnotationSecurityMetadataSource mds = new SecuredAnnotationSecurityMetadataSource(); diff --git a/access/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java b/access/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java index e91ccb36db..617f1ca619 100644 --- a/access/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java +++ b/access/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java @@ -79,11 +79,13 @@ public class DefaultMethodSecurityExpressionHandlerTests { } @Test + @SuppressWarnings("deprecation") public void setTrustResolverNull() { assertThatIllegalArgumentException().isThrownBy(() -> this.handler.setTrustResolver(null)); } @Test + @SuppressWarnings("deprecation") public void createEvaluationContextCustomTrustResolver() { setupMocks(); this.handler.setTrustResolver(this.trustResolver); @@ -175,7 +177,7 @@ public class DefaultMethodSecurityExpressionHandlerTests { @Test public void createEvaluationContextSupplierAuthentication() { setupMocks(); - Supplier mockAuthenticationSupplier = mock(Supplier.class); + Supplier mockAuthenticationSupplier = mock(); given(mockAuthenticationSupplier.get()).willReturn(this.authentication); EvaluationContext context = this.handler.createEvaluationContext(mockAuthenticationSupplier, this.methodInvocation); diff --git a/access/src/test/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdviceTests.java b/access/src/test/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdviceTests.java index aa781eded8..4f4cdeec17 100644 --- a/access/src/test/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdviceTests.java +++ b/access/src/test/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdviceTests.java @@ -39,6 +39,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * @since 5.2 */ @ExtendWith(MockitoExtension.class) +@SuppressWarnings("deprecation") public class ExpressionBasedPreInvocationAdviceTests { @Mock diff --git a/access/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java b/access/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java index 0f488e2fdb..977d33ed25 100644 --- a/access/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java +++ b/access/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java @@ -34,7 +34,7 @@ import org.springframework.security.util.SimpleMethodInvocation; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -@SuppressWarnings("unchecked") +@SuppressWarnings({ "unchecked", "deprecation" }) public class MethodExpressionVoterTests { private TestingAuthenticationToken joe = new TestingAuthenticationToken("joe", "joespass", "ROLE_blah"); diff --git a/access/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java b/access/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java index d25e9b75fa..26eb275c27 100644 --- a/access/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java +++ b/access/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java @@ -44,6 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Luke Taylor * @since 3.0 */ +@SuppressWarnings("deprecation") public class PrePostAnnotationSecurityMetadataSourceTests { private PrePostAnnotationSecurityMetadataSource mds = new PrePostAnnotationSecurityMetadataSource( diff --git a/access/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java b/access/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java index 84f38584f6..a4c0b3a694 100644 --- a/access/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java +++ b/access/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java @@ -32,6 +32,7 @@ import static org.mockito.Mockito.mock; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class AbstractSecurityInterceptorTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java b/access/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java index aba3efe718..796883891e 100644 --- a/access/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java +++ b/access/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * * @author Ben Alex */ -@SuppressWarnings("unchecked") +@SuppressWarnings({ "unchecked", "deprecation" }) public class AfterInvocationProviderManagerTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java b/access/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java index f1a6f1f60c..149c15488e 100644 --- a/access/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java +++ b/access/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java @@ -34,6 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class InterceptorStatusTokenTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java b/access/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java index 8ec6d3514f..c671ab3584 100644 --- a/access/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java +++ b/access/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java @@ -27,6 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class NullRunAsManagerTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java b/access/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java index 91a616415b..2b4b4d0606 100644 --- a/access/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java +++ b/access/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java @@ -31,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException /** * Tests {@link RunAsImplAuthenticationProvider}. */ +@SuppressWarnings("deprecation") public class RunAsImplAuthenticationProviderTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java b/access/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java index 16dc6a5c77..1fdecee443 100644 --- a/access/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java +++ b/access/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java @@ -34,6 +34,7 @@ import static org.assertj.core.api.Assertions.fail; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class RunAsManagerImplTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java b/access/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java index 35c1cde5ea..b5febccded 100644 --- a/access/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java +++ b/access/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java @@ -29,6 +29,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class RunAsUserTokenTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java b/access/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java index 9b0ca1577d..4959eaeaaa 100644 --- a/access/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java +++ b/access/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java @@ -65,7 +65,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; * @author Ben Alex * @author Rob Winch */ -@SuppressWarnings("unchecked") +@SuppressWarnings({ "unchecked", "deprecation" }) public class MethodSecurityInterceptorTests { private TestingAuthenticationToken token; diff --git a/access/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java b/access/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java index b8e314e423..245f013d1d 100644 --- a/access/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java +++ b/access/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java @@ -33,6 +33,7 @@ import static org.mockito.Mockito.mock; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class MethodSecurityMetadataSourceAdvisorTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java b/access/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java index 0c80f07e77..97490f4c9e 100644 --- a/access/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java +++ b/access/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java @@ -62,6 +62,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; * @author Luke Taylor * @author Rob Winch */ +@SuppressWarnings("deprecation") public class AspectJMethodSecurityInterceptorTests { private TestingAuthenticationToken token; diff --git a/access/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java b/access/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java index dc2e1dff60..47e12d9117 100644 --- a/access/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java +++ b/access/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java @@ -34,6 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Luke Taylor * @since 2.0.4 */ +@SuppressWarnings("deprecation") public class MapBasedMethodSecurityMetadataSourceTests { private final List ROLE_A = SecurityConfig.createList("ROLE_A"); diff --git a/access/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java b/access/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java index 4780a8cc44..0b180e5170 100644 --- a/access/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java +++ b/access/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java @@ -49,6 +49,7 @@ import static org.mockito.Mockito.mock; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class MethodInvocationPrivilegeEvaluatorTests { private TestingAuthenticationToken token; diff --git a/access/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java b/access/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java index 82451764d0..b8b6f623d0 100644 --- a/access/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java +++ b/access/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.mock; /** * @author Luke Taylor */ -@SuppressWarnings({ "unchecked" }) +@SuppressWarnings({ "unchecked", "deprecation" }) public class DelegatingMethodSecurityMetadataSourceTests { DelegatingMethodSecurityMetadataSource mds; diff --git a/access/src/test/java/org/springframework/security/access/prepost/PostInvocationAdviceProviderTests.java b/access/src/test/java/org/springframework/security/access/prepost/PostInvocationAdviceProviderTests.java index c7d13b84af..6d229381d6 100644 --- a/access/src/test/java/org/springframework/security/access/prepost/PostInvocationAdviceProviderTests.java +++ b/access/src/test/java/org/springframework/security/access/prepost/PostInvocationAdviceProviderTests.java @@ -29,6 +29,7 @@ import org.springframework.security.access.intercept.aspectj.MethodInvocationAda import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(MockitoExtension.class) +@SuppressWarnings("deprecation") public class PostInvocationAdviceProviderTests { @Mock diff --git a/access/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java b/access/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java index 26e34dd938..798442b502 100644 --- a/access/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java +++ b/access/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java @@ -29,6 +29,7 @@ import org.springframework.security.access.intercept.aspectj.MethodInvocationAda import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(MockitoExtension.class) +@SuppressWarnings("deprecation") public class PreInvocationAuthorizationAdviceVoterTests { @Mock diff --git a/access/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java b/access/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java index 2858384015..3ae495bcf3 100644 --- a/access/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java +++ b/access/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * * @author Ben Alex */ -@SuppressWarnings("unchecked") +@SuppressWarnings({ "unchecked", "deprecation" }) public class AbstractAccessDecisionManagerTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java b/access/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java index a4d5ab09a1..b867f433a5 100644 --- a/access/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java +++ b/access/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java @@ -31,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Luke Taylor */ +@SuppressWarnings("deprecation") public class AbstractAclVoterTests { private AbstractAclVoter voter = new AbstractAclVoter() { diff --git a/access/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java b/access/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java index 74a7c779d1..b36179c6d2 100644 --- a/access/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java +++ b/access/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java @@ -40,6 +40,7 @@ import static org.mockito.Mockito.mock; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class AffirmativeBasedTests { private final List attrs = new ArrayList<>(); diff --git a/access/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java b/access/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java index 9c153dbf6f..b4da9c128e 100644 --- a/access/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java +++ b/access/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java @@ -37,6 +37,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class AuthenticatedVoterTests { private Authentication createAnonymous() { diff --git a/access/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java b/access/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java index 18cd2f834e..b5d9e6eb9c 100644 --- a/access/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java +++ b/access/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java @@ -35,6 +35,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class ConsensusBasedTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java b/access/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java index 9fcfc7fb3a..293bb49980 100644 --- a/access/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java +++ b/access/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java @@ -32,6 +32,7 @@ import org.springframework.security.core.Authentication; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class DenyAgainVoter implements AccessDecisionVoter { @Override diff --git a/access/src/test/java/org/springframework/security/access/vote/DenyVoter.java b/access/src/test/java/org/springframework/security/access/vote/DenyVoter.java index 6408c9a570..8c786d2753 100644 --- a/access/src/test/java/org/springframework/security/access/vote/DenyVoter.java +++ b/access/src/test/java/org/springframework/security/access/vote/DenyVoter.java @@ -34,6 +34,7 @@ import org.springframework.security.core.Authentication; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class DenyVoter implements AccessDecisionVoter { @Override diff --git a/access/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java b/access/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java index 4e2fd6f974..9f1e36d7c0 100644 --- a/access/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java +++ b/access/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java @@ -25,6 +25,7 @@ import org.springframework.security.authentication.TestingAuthenticationToken; import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("deprecation") public class RoleHierarchyVoterTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/vote/RoleVoterTests.java b/access/src/test/java/org/springframework/security/access/vote/RoleVoterTests.java index f67b91a0c6..daefd921f5 100644 --- a/access/src/test/java/org/springframework/security/access/vote/RoleVoterTests.java +++ b/access/src/test/java/org/springframework/security/access/vote/RoleVoterTests.java @@ -28,6 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Luke Taylor */ +@SuppressWarnings("deprecation") public class RoleVoterTests { @Test diff --git a/access/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java b/access/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java index 8674cf11a9..a39f610bc2 100644 --- a/access/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java +++ b/access/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java @@ -35,6 +35,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class UnanimousBasedTests { private UnanimousBased makeDecisionManager() { diff --git a/access/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java b/access/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java index ce44f41694..154e1c003f 100644 --- a/access/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java +++ b/access/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java @@ -44,7 +44,7 @@ import static org.mockito.Mockito.verify; /** * @author Luke Taylor */ -@SuppressWarnings({ "unchecked" }) +@SuppressWarnings({ "unchecked", "deprecation" }) public class AclEntryAfterInvocationCollectionFilteringProviderTests { @Test diff --git a/access/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java b/access/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java index 8aec2c102a..07d283728d 100644 --- a/access/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java +++ b/access/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java @@ -48,7 +48,7 @@ import static org.mockito.Mockito.verify; /** * @author Luke Taylor */ -@SuppressWarnings({ "unchecked" }) +@SuppressWarnings({ "unchecked", "deprecation" }) public class AclEntryAfterInvocationProviderTests { @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 acb8695cf3..b52ffe1099 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 @@ -35,6 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; @ExtendWith(MockitoExtension.class) +@SuppressWarnings("deprecation") public class ExpressionBasedMessageSecurityMetadataSourceFactoryTests { @Mock diff --git a/access/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java b/access/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java index cdc083ebda..c1c8c11e2e 100644 --- a/access/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java +++ b/access/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java @@ -37,6 +37,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @ExtendWith(MockitoExtension.class) +@SuppressWarnings("deprecation") public class MessageExpressionConfigAttributeTests { @Mock diff --git a/access/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java b/access/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java index 624927a42e..202a0a2612 100644 --- a/access/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java +++ b/access/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java @@ -44,6 +44,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @ExtendWith(MockitoExtension.class) +@SuppressWarnings("deprecation") public class MessageExpressionVoterTests { @Mock @@ -76,6 +77,7 @@ public class MessageExpressionVoterTests { } @Test + @SuppressWarnings("unchecked") public void voteGranted() { given(this.expression.getValue(any(EvaluationContext.class), eq(Boolean.class))).willReturn(true); given(this.matcher.matcher(any())).willCallRealMethod(); @@ -84,6 +86,7 @@ public class MessageExpressionVoterTests { } @Test + @SuppressWarnings("unchecked") public void voteDenied() { given(this.expression.getValue(any(EvaluationContext.class), eq(Boolean.class))).willReturn(false); given(this.matcher.matcher(any())).willCallRealMethod(); @@ -92,6 +95,7 @@ public class MessageExpressionVoterTests { } @Test + @SuppressWarnings("unchecked") public void voteAbstain() { this.attributes = Arrays.asList(new SecurityConfig("ROLE_USER")); assertThat(this.voter.vote(this.authentication, this.message, this.attributes)) @@ -99,11 +103,13 @@ public class MessageExpressionVoterTests { } @Test + @SuppressWarnings("unchecked") public void supportsObjectClassFalse() { assertThat(this.voter.supports(Object.class)).isFalse(); } @Test + @SuppressWarnings("unchecked") public void supportsMessageClassTrue() { assertThat(this.voter.supports(Message.class)).isTrue(); } @@ -119,11 +125,13 @@ public class MessageExpressionVoterTests { } @Test + @SuppressWarnings("unchecked") public void setExpressionHandlerNull() { assertThatIllegalArgumentException().isThrownBy(() -> this.voter.setExpressionHandler(null)); } @Test + @SuppressWarnings("unchecked") public void customExpressionHandler() { this.voter.setExpressionHandler(this.expressionHandler); given(this.expressionHandler.createEvaluationContext(this.authentication, this.message)) @@ -136,6 +144,7 @@ public class MessageExpressionVoterTests { } @Test + @SuppressWarnings("unchecked") public void postProcessEvaluationContext() { final MessageExpressionConfigAttribute configAttribute = mock(MessageExpressionConfigAttribute.class); this.voter.setExpressionHandler(this.expressionHandler); diff --git a/access/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java b/access/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java index c584e0ac02..906b24ff13 100644 --- a/access/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java +++ b/access/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java @@ -47,6 +47,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.willThrow; @ExtendWith(MockitoExtension.class) +@SuppressWarnings("deprecation") public class ChannelSecurityInterceptorTests { @Mock diff --git a/access/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java b/access/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java index 686ee46515..46e8f90a2a 100644 --- a/access/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java +++ b/access/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java @@ -36,6 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; @ExtendWith(MockitoExtension.class) +@SuppressWarnings("deprecation") public class DefaultMessageSecurityMetadataSourceTests { @Mock diff --git a/access/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java b/access/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java index 3dd7f12d8e..f8f98fb96e 100644 --- a/access/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java +++ b/access/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java @@ -43,6 +43,7 @@ import org.springframework.security.web.access.intercept.FilterSecurityIntercept * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class DefaultWebInvocationPrivilegeEvaluatorTests { private AccessDecisionManager adm; diff --git a/access/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java b/access/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java index e550801303..b04dd792fd 100644 --- a/access/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java +++ b/access/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.mock; * * @author Ben Alex */ -@SuppressWarnings("unchecked") +@SuppressWarnings({ "unchecked", "deprecation" }) public class ChannelDecisionManagerImplTests { @Test diff --git a/access/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java b/access/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java index d486d36189..25cd5c830c 100644 --- a/access/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java +++ b/access/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java @@ -39,6 +39,7 @@ import static org.mockito.Mockito.mock; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class ChannelProcessingFilterTests { @Test diff --git a/access/src/test/java/org/springframework/security/web/access/channel/InsecureChannelProcessorTests.java b/access/src/test/java/org/springframework/security/web/access/channel/InsecureChannelProcessorTests.java index 6b4f1d8bae..14a6726e69 100644 --- a/access/src/test/java/org/springframework/security/web/access/channel/InsecureChannelProcessorTests.java +++ b/access/src/test/java/org/springframework/security/web/access/channel/InsecureChannelProcessorTests.java @@ -35,6 +35,7 @@ import static org.mockito.Mockito.mock; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class InsecureChannelProcessorTests { @Test diff --git a/access/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java b/access/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java index ce995e6bdc..bfdcc4df64 100644 --- a/access/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java +++ b/access/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java @@ -36,6 +36,7 @@ import static org.mockito.Mockito.mock; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class RetryWithHttpEntryPointTests { @Test diff --git a/access/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java b/access/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java index ccf627ed42..7a2106e413 100644 --- a/access/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java +++ b/access/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java @@ -33,6 +33,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class RetryWithHttpsEntryPointTests { @Test diff --git a/access/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java b/access/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java index f67d0ae7b3..8640cfd526 100644 --- a/access/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java +++ b/access/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java @@ -35,6 +35,7 @@ import static org.mockito.Mockito.mock; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class SecureChannelProcessorTests { @Test diff --git a/access/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java b/access/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java index 361812397a..c92bc50881 100644 --- a/access/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java +++ b/access/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java @@ -78,11 +78,13 @@ public class DefaultWebSecurityExpressionHandlerTests { } @Test + @SuppressWarnings("deprecation") public void setTrustResolverNull() { assertThatIllegalArgumentException().isThrownBy(() -> this.handler.setTrustResolver(null)); } @Test + @SuppressWarnings("deprecation") public void createEvaluationContextCustomTrustResolver() { this.handler.setTrustResolver(this.trustResolver); Expression expression = this.handler.getExpressionParser().parseExpression("anonymous"); diff --git a/access/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java b/access/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java index 509e32f6c6..60395ecc7c 100644 --- a/access/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java +++ b/access/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java @@ -33,6 +33,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException /** * @author Luke Taylor */ +@SuppressWarnings("deprecation") public class ExpressionBasedFilterInvocationSecurityMetadataSourceTests { @Test diff --git a/access/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java b/access/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java index 206f3c4b42..ef9417937e 100644 --- a/access/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java +++ b/access/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java @@ -41,7 +41,7 @@ import static org.mockito.Mockito.mock; /** * @author Luke Taylor */ -@SuppressWarnings({ "unchecked" }) +@SuppressWarnings({ "unchecked", "deprecation" }) public class WebExpressionVoterTests { private Authentication user = new TestingAuthenticationToken("user", "pass", "X"); diff --git a/access/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java b/access/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java index 3de762fd5e..57f7a8a03e 100644 --- a/access/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java +++ b/access/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java @@ -40,6 +40,7 @@ import static org.mockito.Mockito.mock; * * @author Ben Alex */ +@SuppressWarnings("deprecation") public class DefaultFilterInvocationSecurityMetadataSourceTests { private DefaultFilterInvocationSecurityMetadataSource fids; diff --git a/access/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java b/access/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java index 5194c38325..84b25e77dd 100644 --- a/access/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java +++ b/access/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java @@ -62,6 +62,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; * @author Luke Taylor * @author Rob Winch */ +@SuppressWarnings("deprecation") public class FilterSecurityInterceptorTests { private AuthenticationManager am;