From a7562ad9503a3b42321a60095e910b06e4af26b3 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Mon, 20 Mar 2023 07:35:23 -0600 Subject: [PATCH] Update io.spring.javaformat to 0.0.38 Closes gh-12891 --- ...ddFilterTest.java => HttpSecurityDeferAddFilterTests.java} | 2 +- ...Test.java => ReactiveOAuth2ClientImportSelectorTests.java} | 2 +- ...oviderTest.java => PostInvocationAdviceProviderTests.java} | 2 +- gradle.properties | 2 +- ...DeviceAuthorizationResponseHttpMessageConverterTests.java} | 2 +- ...nTest.java => Saml2AuthenticationExceptionMixinTests.java} | 2 +- ...dlersTest.java => SecurityMockMvcResultHandlersTests.java} | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) rename config/src/test/java/org/springframework/security/config/annotation/web/builders/{HttpSecurityDeferAddFilterTest.java => HttpSecurityDeferAddFilterTests.java} (99%) rename config/src/test/java/org/springframework/security/config/annotation/web/reactive/{ReactiveOAuth2ClientImportSelectorTest.java => ReactiveOAuth2ClientImportSelectorTests.java} (99%) rename core/src/test/java/org/springframework/security/access/prepost/{PostInvocationAdviceProviderTest.java => PostInvocationAdviceProviderTests.java} (97%) rename oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/http/converter/{OAuth2DeviceAuthorizationResponseHttpMessageConverterTest.java => OAuth2DeviceAuthorizationResponseHttpMessageConverterTests.java} (99%) rename saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/jackson2/{Saml2AuthenticationExceptionMixinTest.java => Saml2AuthenticationExceptionMixinTests.java} (97%) rename test/src/test/java/org/springframework/security/test/web/servlet/response/{SecurityMockMvcResultHandlersTest.java => SecurityMockMvcResultHandlersTests.java} (98%) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/builders/HttpSecurityDeferAddFilterTest.java b/config/src/test/java/org/springframework/security/config/annotation/web/builders/HttpSecurityDeferAddFilterTests.java similarity index 99% rename from config/src/test/java/org/springframework/security/config/annotation/web/builders/HttpSecurityDeferAddFilterTest.java rename to config/src/test/java/org/springframework/security/config/annotation/web/builders/HttpSecurityDeferAddFilterTests.java index 9ec47531b5..be386974d6 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/builders/HttpSecurityDeferAddFilterTest.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/builders/HttpSecurityDeferAddFilterTests.java @@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @ExtendWith(SpringTestContextExtension.class) -public class HttpSecurityDeferAddFilterTest { +public class HttpSecurityDeferAddFilterTests { public final SpringTestContext spring = new SpringTestContext(this); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/reactive/ReactiveOAuth2ClientImportSelectorTest.java b/config/src/test/java/org/springframework/security/config/annotation/web/reactive/ReactiveOAuth2ClientImportSelectorTests.java similarity index 99% rename from config/src/test/java/org/springframework/security/config/annotation/web/reactive/ReactiveOAuth2ClientImportSelectorTest.java rename to config/src/test/java/org/springframework/security/config/annotation/web/reactive/ReactiveOAuth2ClientImportSelectorTests.java index fbe9a8ba1c..81c604ee55 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/reactive/ReactiveOAuth2ClientImportSelectorTest.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/reactive/ReactiveOAuth2ClientImportSelectorTests.java @@ -53,7 +53,7 @@ import static org.mockito.Mockito.verifyNoInteractions; * @author Alavudin Kuttikkattil */ @ExtendWith(SpringTestContextExtension.class) -public class ReactiveOAuth2ClientImportSelectorTest { +public class ReactiveOAuth2ClientImportSelectorTests { public final SpringTestContext spring = new SpringTestContext(this); diff --git a/core/src/test/java/org/springframework/security/access/prepost/PostInvocationAdviceProviderTest.java b/core/src/test/java/org/springframework/security/access/prepost/PostInvocationAdviceProviderTests.java similarity index 97% rename from core/src/test/java/org/springframework/security/access/prepost/PostInvocationAdviceProviderTest.java rename to core/src/test/java/org/springframework/security/access/prepost/PostInvocationAdviceProviderTests.java index 2502890e08..90d25285fb 100644 --- a/core/src/test/java/org/springframework/security/access/prepost/PostInvocationAdviceProviderTest.java +++ b/core/src/test/java/org/springframework/security/access/prepost/PostInvocationAdviceProviderTests.java @@ -29,7 +29,7 @@ import org.springframework.security.access.intercept.aspectj.MethodInvocationAda import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(MockitoExtension.class) -public class PostInvocationAdviceProviderTest { +public class PostInvocationAdviceProviderTests { @Mock private PostInvocationAuthorizationAdvice authorizationAdvice; diff --git a/gradle.properties b/gradle.properties index 8c2ca4ce47..fe5a3219cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ aspectjVersion=1.9.9.1 reactorVersion=2022.0.5 -springJavaformatVersion=0.0.35 +springJavaformatVersion=0.0.38 springBootVersion=2.4.2 springFrameworkVersion=6.0.0 micrometerVersion=1.10.5 diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/http/converter/OAuth2DeviceAuthorizationResponseHttpMessageConverterTest.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/http/converter/OAuth2DeviceAuthorizationResponseHttpMessageConverterTests.java similarity index 99% rename from oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/http/converter/OAuth2DeviceAuthorizationResponseHttpMessageConverterTest.java rename to oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/http/converter/OAuth2DeviceAuthorizationResponseHttpMessageConverterTests.java index 7742f6dc63..7e4632d6a9 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/http/converter/OAuth2DeviceAuthorizationResponseHttpMessageConverterTest.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/http/converter/OAuth2DeviceAuthorizationResponseHttpMessageConverterTests.java @@ -44,7 +44,7 @@ import static org.mockito.Mockito.mock; * * @author Steve Riesenberg */ -public class OAuth2DeviceAuthorizationResponseHttpMessageConverterTest { +public class OAuth2DeviceAuthorizationResponseHttpMessageConverterTests { private OAuth2DeviceAuthorizationResponseHttpMessageConverter messageConverter; diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/jackson2/Saml2AuthenticationExceptionMixinTest.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/jackson2/Saml2AuthenticationExceptionMixinTests.java similarity index 97% rename from saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/jackson2/Saml2AuthenticationExceptionMixinTest.java rename to saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/jackson2/Saml2AuthenticationExceptionMixinTests.java index b6c2b22711..8f9533a966 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/jackson2/Saml2AuthenticationExceptionMixinTest.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/jackson2/Saml2AuthenticationExceptionMixinTests.java @@ -27,7 +27,7 @@ import org.springframework.security.saml2.provider.service.authentication.Saml2A import static org.assertj.core.api.Assertions.assertThat; -class Saml2AuthenticationExceptionMixinTest { +class Saml2AuthenticationExceptionMixinTests { private ObjectMapper mapper; diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultHandlersTest.java b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultHandlersTests.java similarity index 98% rename from test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultHandlersTest.java rename to test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultHandlersTests.java index 570ee185aa..c229c3067b 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultHandlersTest.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultHandlersTests.java @@ -43,9 +43,9 @@ import static org.springframework.security.test.web.servlet.setup.SecurityMockMv import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = SecurityMockMvcResultHandlersTest.Config.class) +@ContextConfiguration(classes = SecurityMockMvcResultHandlersTests.Config.class) @WebAppConfiguration -public class SecurityMockMvcResultHandlersTest { +public class SecurityMockMvcResultHandlersTests { @Autowired private WebApplicationContext context;