From 1cac1305c4851f264866040a16396043d1c3765f Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Thu, 19 Oct 2023 10:56:29 -0300 Subject: [PATCH] Fix checkstyle issues Issue gh-2528 --- .../io/spring/gradle/convention/CheckstylePlugin.groovy | 3 ++- etc/checkstyle/checkstyle.xml | 4 +++- .../annotation/web/http/SpringHttpSessionConfiguration.java | 1 - .../web/authentication/SpringSessionRememberMeServices.java | 1 - .../session/web/http/DefaultCookieSerializer.java | 1 - .../springframework/session/web/http/HttpSessionAdapter.java | 1 - .../session/web/http/SessionRepositoryFilter.java | 1 - .../EnableSpringHttpSessionCustomCookieSerializerTests.java | 1 - .../web/http/SpringHttpSessionConfigurationTests.java | 1 - ...Test.java => SpringSessionBackedSessionRegistryTests.java} | 2 +- .../authentication/SpringSessionRememberMeServicesTests.java | 1 - .../session/web/http/CookieHttpSessionIdResolverTests.java | 1 - .../session/web/http/DefaultCookieSerializerTests.java | 1 - .../session/web/http/OnCommittedResponseWrapperTests.java | 1 - .../session/web/http/OncePerRequestFilterTests.java | 1 - .../web/http/SessionEventHttpSessionListenerAdapterTests.java | 1 - .../session/web/http/SessionRepositoryFilterTests.java | 1 - .../server/SessionRepositoryMessageInterceptorTests.java | 1 - ...erterTest.java => AbstractMongoSessionConverterTests.java} | 2 +- ...verterTest.java => JacksonMongoSessionConverterTests.java} | 2 +- ...nConverterTest.java => JdkMongoSessionConverterTests.java} | 2 +- ...itoryTest.java => MongoIndexedSessionRepositoryTests.java} | 2 +- .../mongo/{MongoSessionTest.java => MongoSessionTests.java} | 2 +- ...toryTest.java => ReactiveMongoSessionRepositoryTests.java} | 2 +- ...ationTest.java => MongoHttpSessionConfigurationTests.java} | 2 +- ...st.java => ReactiveMongoWebSessionConfigurationTests.java} | 2 +- .../docs/security/RememberMeSecurityConfigurationTests.java | 1 - .../security/RememberMeSecurityConfigurationXmlTests.java | 1 - ...ocessorTest.java => SessionUpdateEntryProcessorTests.java} | 2 +- 29 files changed, 15 insertions(+), 29 deletions(-) rename spring-session-core/src/test/java/org/springframework/session/security/{SpringSessionBackedSessionRegistryTest.java => SpringSessionBackedSessionRegistryTests.java} (99%) rename spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/{AbstractMongoSessionConverterTest.java => AbstractMongoSessionConverterTests.java} (98%) rename spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/{JacksonMongoSessionConverterTest.java => JacksonMongoSessionConverterTests.java} (97%) rename spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/{JdkMongoSessionConverterTest.java => JdkMongoSessionConverterTests.java} (95%) rename spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/{MongoIndexedSessionRepositoryTest.java => MongoIndexedSessionRepositoryTests.java} (99%) rename spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/{MongoSessionTest.java => MongoSessionTests.java} (97%) rename spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/{ReactiveMongoSessionRepositoryTest.java => ReactiveMongoSessionRepositoryTests.java} (99%) rename spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/{MongoHttpSessionConfigurationTest.java => MongoHttpSessionConfigurationTests.java} (99%) rename spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/{ReactiveMongoWebSessionConfigurationTest.java => ReactiveMongoWebSessionConfigurationTests.java} (99%) rename spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/{SessionUpdateEntryProcessorTest.java => SessionUpdateEntryProcessorTests.java} (99%) diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy index cc990092..da16ebbb 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/CheckstylePlugin.groovy @@ -36,7 +36,8 @@ class CheckstylePlugin implements Plugin { .named("libs") project.plugins.withType(JavaPlugin) { def checkstyleDir = project.rootProject.file(CHECKSTYLE_DIR) - if (checkstyleDir.exists() && checkstyleDir.directory) { + boolean isSampleProject = project.name.contains('sample') + if (checkstyleDir.exists() && checkstyleDir.directory && !isSampleProject) { project.getPluginManager().apply('checkstyle') project.dependencies.add('checkstyle', versionCatalog.findLibrary('io-spring-javaformat-spring-javaformat-checkstyle').get()) project.dependencies.add('checkstyle', versionCatalog.findLibrary('io-spring-nohttp-nohttp-checkstyle').get()) diff --git a/etc/checkstyle/checkstyle.xml b/etc/checkstyle/checkstyle.xml index ac5c5aeb..e508c417 100644 --- a/etc/checkstyle/checkstyle.xml +++ b/etc/checkstyle/checkstyle.xml @@ -6,7 +6,9 @@ - + + + diff --git a/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java index a7adf7ac..b684ec33 100644 --- a/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java +++ b/spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java @@ -22,7 +22,6 @@ import java.util.List; import jakarta.servlet.ServletContext; import jakarta.servlet.SessionCookieConfig; import jakarta.servlet.http.HttpSessionListener; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-session-core/src/main/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServices.java b/spring-session-core/src/main/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServices.java index 69f7c726..8c8eebbb 100644 --- a/spring-session-core/src/main/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServices.java +++ b/spring-session-core/src/main/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServices.java @@ -19,7 +19,6 @@ package org.springframework.session.security.web.authentication; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java b/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java index f38bc988..6c97919c 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java @@ -31,7 +31,6 @@ import java.util.regex.Pattern; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java b/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java index f6ab4d7a..792a73c9 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java @@ -24,7 +24,6 @@ import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.HttpSessionBindingEvent; import jakarta.servlet.http.HttpSessionBindingListener; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java index 46af1c4d..46f17e53 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java @@ -30,7 +30,6 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java b/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java index 8178f101..2c9f9397 100644 --- a/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java @@ -23,7 +23,6 @@ import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfigurationTests.java b/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfigurationTests.java index b4f3865f..c9b8abd1 100644 --- a/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfigurationTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfigurationTests.java @@ -19,7 +19,6 @@ package org.springframework.session.config.annotation.web.http; import java.util.concurrent.ConcurrentHashMap; import jakarta.servlet.ServletContext; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java b/spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTests.java similarity index 99% rename from spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java rename to spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTests.java index 427746cc..aaac09f4 100644 --- a/spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java +++ b/spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTests.java @@ -50,7 +50,7 @@ import static org.mockito.Mockito.withSettings; * Tests for {@link SpringSessionBackedSessionRegistry}. */ @ExtendWith(MockitoExtension.class) -class SpringSessionBackedSessionRegistryTest { +class SpringSessionBackedSessionRegistryTests { private static final String SESSION_ID = "sessionId"; diff --git a/spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java b/spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java index a0f20252..44eb949c 100644 --- a/spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java @@ -19,7 +19,6 @@ package org.springframework.session.security.web.authentication; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; - import org.junit.jupiter.api.Test; import org.springframework.security.core.Authentication; diff --git a/spring-session-core/src/test/java/org/springframework/session/web/http/CookieHttpSessionIdResolverTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/CookieHttpSessionIdResolverTests.java index da98e553..dfef4934 100644 --- a/spring-session-core/src/test/java/org/springframework/session/web/http/CookieHttpSessionIdResolverTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/web/http/CookieHttpSessionIdResolverTests.java @@ -20,7 +20,6 @@ import java.util.Base64; import java.util.Collections; import jakarta.servlet.http.Cookie; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/spring-session-core/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java index 2272db8c..358b884c 100644 --- a/spring-session-core/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java @@ -24,7 +24,6 @@ import java.time.format.DateTimeFormatter; import java.util.Base64; import jakarta.servlet.http.Cookie; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/spring-session-core/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java index 953e0551..3f8d9b03 100644 --- a/spring-session-core/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java @@ -23,7 +23,6 @@ import java.util.Locale; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletResponse; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-session-core/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java index 1294a650..4beaa670 100644 --- a/spring-session-core/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java @@ -26,7 +26,6 @@ import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java index 35993bc4..188dd351 100644 --- a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java @@ -22,7 +22,6 @@ import java.util.Collections; import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpSessionEvent; import jakarta.servlet.http.HttpSessionListener; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java index b29f1978..b7f53386 100644 --- a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java @@ -39,7 +39,6 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.HttpSessionBindingEvent; import jakarta.servlet.http.HttpSessionBindingListener; - import org.assertj.core.data.Offset; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java b/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java index baf72fc3..bb9e8c19 100644 --- a/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import jakarta.servlet.http.HttpSession; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/AbstractMongoSessionConverterTest.java b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/AbstractMongoSessionConverterTests.java similarity index 98% rename from spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/AbstractMongoSessionConverterTest.java rename to spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/AbstractMongoSessionConverterTests.java index 7fa2bcbf..d8637c36 100644 --- a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/AbstractMongoSessionConverterTest.java +++ b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/AbstractMongoSessionConverterTests.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Greg Turnquist */ -public abstract class AbstractMongoSessionConverterTest { +public abstract class AbstractMongoSessionConverterTests { abstract AbstractMongoSessionConverter getMongoSessionConverter(); diff --git a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTest.java b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTests.java similarity index 97% rename from spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTest.java rename to spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTests.java index bf96b479..a47cb2d5 100644 --- a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTest.java +++ b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTests.java @@ -35,7 +35,7 @@ import org.springframework.util.ReflectionUtils; * @author Jakub Kubrynski * @author Greg Turnquist */ -public class JacksonMongoSessionConverterTest extends AbstractMongoSessionConverterTest { +public class JacksonMongoSessionConverterTests extends AbstractMongoSessionConverterTests { JacksonMongoSessionConverter mongoSessionConverter = new JacksonMongoSessionConverter(); diff --git a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JdkMongoSessionConverterTest.java b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JdkMongoSessionConverterTests.java similarity index 95% rename from spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JdkMongoSessionConverterTest.java rename to spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JdkMongoSessionConverterTests.java index 746adacd..52c369f5 100644 --- a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JdkMongoSessionConverterTest.java +++ b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/JdkMongoSessionConverterTests.java @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException * @author Rob Winch * @author Greg Turnquist */ -public class JdkMongoSessionConverterTest extends AbstractMongoSessionConverterTest { +public class JdkMongoSessionConverterTests extends AbstractMongoSessionConverterTests { Duration inactiveInterval = Duration.ofMinutes(30); diff --git a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoIndexedSessionRepositoryTest.java b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoIndexedSessionRepositoryTests.java similarity index 99% rename from spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoIndexedSessionRepositoryTest.java rename to spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoIndexedSessionRepositoryTests.java index 9c25d47b..a2d1b9e9 100644 --- a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoIndexedSessionRepositoryTest.java +++ b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoIndexedSessionRepositoryTests.java @@ -51,7 +51,7 @@ import static org.mockito.BDDMockito.verify; * @author Greg Turnquist */ @ExtendWith(MockitoExtension.class) -public class MongoIndexedSessionRepositoryTest { +public class MongoIndexedSessionRepositoryTests { @Mock private AbstractMongoSessionConverter converter; diff --git a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoSessionTest.java b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoSessionTests.java similarity index 97% rename from spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoSessionTest.java rename to spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoSessionTests.java index ccc53313..d26c98a0 100644 --- a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoSessionTest.java +++ b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoSessionTests.java @@ -27,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Rob Winch * @author Greg Turnquist */ -public class MongoSessionTest { +public class MongoSessionTests { @Test void isExpiredWhenIntervalNegativeThenFalse() { diff --git a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/ReactiveMongoSessionRepositoryTest.java b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/ReactiveMongoSessionRepositoryTests.java similarity index 99% rename from spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/ReactiveMongoSessionRepositoryTest.java rename to spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/ReactiveMongoSessionRepositoryTests.java index 51fce8ce..2b619243 100644 --- a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/ReactiveMongoSessionRepositoryTest.java +++ b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/ReactiveMongoSessionRepositoryTests.java @@ -55,7 +55,7 @@ import static org.mockito.BDDMockito.verify; * @author Greg Turnquist */ @ExtendWith(MockitoExtension.class) -public class ReactiveMongoSessionRepositoryTest { +public class ReactiveMongoSessionRepositoryTests { @Mock private AbstractMongoSessionConverter converter; diff --git a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTests.java similarity index 99% rename from spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java rename to spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTests.java index a10655ab..d6e2604a 100644 --- a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTest.java +++ b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTests.java @@ -52,7 +52,7 @@ import static org.mockito.BDDMockito.mock; * @author Eddú Meléndez * @author Vedran Pavic */ -public class MongoHttpSessionConfigurationTest { +public class MongoHttpSessionConfigurationTests { private static final String COLLECTION_NAME = "testSessions"; diff --git a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTests.java similarity index 99% rename from spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java rename to spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTests.java index 6ed70d35..62791ec5 100644 --- a/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTest.java +++ b/spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTests.java @@ -59,7 +59,7 @@ import static org.mockito.BDDMockito.verify; * @author Greg Turnquist * @author Vedran Pavic */ -public class ReactiveMongoWebSessionConfigurationTest { +public class ReactiveMongoWebSessionConfigurationTests { private AnnotationConfigApplicationContext context; diff --git a/spring-session-docs/modules/ROOT/examples/java/docs/security/RememberMeSecurityConfigurationTests.java b/spring-session-docs/modules/ROOT/examples/java/docs/security/RememberMeSecurityConfigurationTests.java index f59afe07..7baa9fc0 100644 --- a/spring-session-docs/modules/ROOT/examples/java/docs/security/RememberMeSecurityConfigurationTests.java +++ b/spring-session-docs/modules/ROOT/examples/java/docs/security/RememberMeSecurityConfigurationTests.java @@ -20,7 +20,6 @@ import java.time.Duration; import java.util.Base64; import jakarta.servlet.http.Cookie; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-session-docs/modules/ROOT/examples/java/docs/security/RememberMeSecurityConfigurationXmlTests.java b/spring-session-docs/modules/ROOT/examples/java/docs/security/RememberMeSecurityConfigurationXmlTests.java index 4977b3aa..764f97fd 100644 --- a/spring-session-docs/modules/ROOT/examples/java/docs/security/RememberMeSecurityConfigurationXmlTests.java +++ b/spring-session-docs/modules/ROOT/examples/java/docs/security/RememberMeSecurityConfigurationXmlTests.java @@ -20,7 +20,6 @@ import java.time.Duration; import java.util.Base64; import jakarta.servlet.http.Cookie; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/SessionUpdateEntryProcessorTest.java b/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/SessionUpdateEntryProcessorTests.java similarity index 99% rename from spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/SessionUpdateEntryProcessorTest.java rename to spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/SessionUpdateEntryProcessorTests.java index 72e811e1..54530ae2 100644 --- a/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/SessionUpdateEntryProcessorTest.java +++ b/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/SessionUpdateEntryProcessorTests.java @@ -32,7 +32,7 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -class SessionUpdateEntryProcessorTest { +class SessionUpdateEntryProcessorTests { private SessionUpdateEntryProcessor processor;