Merge branch '3.3.x'

spring-projects · Aug 21, 2024 · 54cfc8a · 54cfc8a
2 parents 4fbd3ee + d816bb1
commit 54cfc8a
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 23 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ com-zaxxer-HikariCP = "com.zaxxer:HikariCP:5.1.0"
 edu-umd-cs-mtc-multithreadedtc = "edu.umd.cs.mtc:multithreadedtc:1.01"
 io-lettuce-lettuce-core = "io.lettuce:lettuce-core:6.3.2.RELEASE"
 io-projectreactor-reactor-bom = "io.projectreactor:reactor-bom:2023.0.9"
-io-spring-javaformat-spring-javaformat-checkstyle = "io.spring.javaformat:spring-javaformat-checkstyle:0.0.42"
+io-spring-javaformat-spring-javaformat-checkstyle = "io.spring.javaformat:spring-javaformat-checkstyle:0.0.43"
 io-spring-nohttp-nohttp-checkstyle = "io.spring.nohttp:nohttp-checkstyle:0.0.11"
 jakarta-servlet-jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:6.0.0"
 jakarta-servlet-jsp-jstl-jakarta-servlet-jsp-jstl-api = "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.1"

diff --git a/...a/org/springframework/session/data/mongo/MongoDbDeleteJacksonSessionVerificationTest.java b/...a/org/springframework/session/data/mongo/MongoDbDeleteJacksonSessionVerificationTest.java
@@ -57,7 +57,7 @@
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
-public class MongoDbDeleteJacksonSessionVerificationTest {
+class MongoDbDeleteJacksonSessionVerificationTest {
 
 	@Autowired
 	ApplicationContext ctx;

diff --git a/...ation-test/java/org/springframework/session/data/mongo/MongoDbLogoutVerificationTest.java b/...ation-test/java/org/springframework/session/data/mongo/MongoDbLogoutVerificationTest.java
@@ -57,7 +57,7 @@
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
-public class MongoDbLogoutVerificationTest {
+class MongoDbLogoutVerificationTest {
 
 	@Autowired
 	ApplicationContext ctx;

diff --git a/...gration-test/java/org/springframework/session/data/mongo/MongoRepositoryJacksonITest.java b/...gration-test/java/org/springframework/session/data/mongo/MongoRepositoryJacksonITest.java
@@ -40,7 +40,7 @@
  * @author Greg Turnquist
  */
 @ContextConfiguration
-public class MongoRepositoryJacksonITest extends AbstractMongoRepositoryITest {
+class MongoRepositoryJacksonITest extends AbstractMongoRepositoryITest {
 
 	@Test
 	void findByCustomIndex() throws Exception {

diff --git a/...est/java/org/springframework/session/data/mongo/MongoRepositoryJdkSerializationITest.java b/...est/java/org/springframework/session/data/mongo/MongoRepositoryJdkSerializationITest.java
@@ -38,7 +38,7 @@
  * @author Greg Turnquist
  */
 @ContextConfiguration
-public class MongoRepositoryJdkSerializationITest extends AbstractMongoRepositoryITest {
+class MongoRepositoryJdkSerializationITest extends AbstractMongoRepositoryITest {
 
 	@Test
 	void findByDeletedSecurityPrincipalNameReload() throws Exception {

diff --git a/...c/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTests.java b/...c/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTests.java
@@ -35,7 +35,7 @@
  * @author Jakub Kubrynski
  * @author Greg Turnquist
  */
-public class JacksonMongoSessionConverterTests extends AbstractMongoSessionConverterTests {
+class JacksonMongoSessionConverterTests extends AbstractMongoSessionConverterTests {
 
 	JacksonMongoSessionConverter mongoSessionConverter = new JacksonMongoSessionConverter();
 

diff --git a/...b/src/test/java/org/springframework/session/data/mongo/JdkMongoSessionConverterTests.java b/...b/src/test/java/org/springframework/session/data/mongo/JdkMongoSessionConverterTests.java
@@ -30,7 +30,7 @@
  * @author Rob Winch
  * @author Greg Turnquist
  */
-public class JdkMongoSessionConverterTests extends AbstractMongoSessionConverterTests {
+class JdkMongoSessionConverterTests extends AbstractMongoSessionConverterTests {
 
 	Duration inactiveInterval = Duration.ofMinutes(30);
 

diff --git a/.../test/java/org/springframework/session/data/mongo/MongoIndexedSessionRepositoryTests.java b/.../test/java/org/springframework/session/data/mongo/MongoIndexedSessionRepositoryTests.java
@@ -53,7 +53,7 @@
  * @author Greg Turnquist
  */
 @ExtendWith(MockitoExtension.class)
-public class MongoIndexedSessionRepositoryTests {
+class MongoIndexedSessionRepositoryTests {
 
 	@Mock
 	private AbstractMongoSessionConverter converter;

diff --git a/...-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoSessionTests.java b/...-data-mongodb/src/test/java/org/springframework/session/data/mongo/MongoSessionTests.java
@@ -27,7 +27,7 @@
  * @author Rob Winch
  * @author Greg Turnquist
  */
-public class MongoSessionTests {
+class MongoSessionTests {
 
 	@Test
 	void isExpiredWhenIntervalNegativeThenFalse() {

diff --git a/...test/java/org/springframework/session/data/mongo/ReactiveMongoSessionRepositoryTests.java b/...test/java/org/springframework/session/data/mongo/ReactiveMongoSessionRepositoryTests.java
@@ -56,7 +56,7 @@
  * @author Greg Turnquist
  */
 @ExtendWith(MockitoExtension.class)
-public class ReactiveMongoSessionRepositoryTests {
+class ReactiveMongoSessionRepositoryTests {
 
 	@Mock
 	private AbstractMongoSessionConverter converter;

diff --git a/...ork/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTests.java b/...ork/session/data/mongo/config/annotation/web/http/MongoHttpSessionConfigurationTests.java
@@ -54,7 +54,7 @@
  * @author Eddú Meléndez
  * @author Vedran Pavic
  */
-public class MongoHttpSessionConfigurationTests {
+class MongoHttpSessionConfigurationTests {
 
 	private static final String COLLECTION_NAME = "testSessions";
 

diff --git a/.../data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTests.java b/.../data/mongo/config/annotation/web/reactive/ReactiveMongoWebSessionConfigurationTests.java
@@ -61,7 +61,7 @@
  * @author Greg Turnquist
  * @author Vedran Pavic
  */
-public class ReactiveMongoWebSessionConfigurationTests {
+class ReactiveMongoWebSessionConfigurationTests {
 
 	private AnnotationConfigApplicationContext context;
 

diff --git a/...annotation/web/http/RedisHttpSessionConfigurationClassPathXmlApplicationContextTests.java b/...annotation/web/http/RedisHttpSessionConfigurationClassPathXmlApplicationContextTests.java
@@ -41,7 +41,7 @@
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
-public class RedisHttpSessionConfigurationClassPathXmlApplicationContextTests {
+class RedisHttpSessionConfigurationClassPathXmlApplicationContextTests {
 
 	// gh-318
 	@Test

diff --git a/...a/redis/config/annotation/web/http/RedisHttpSessionConfigurationXmlCustomExpireTests.java b/...a/redis/config/annotation/web/http/RedisHttpSessionConfigurationXmlCustomExpireTests.java
@@ -38,7 +38,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
 @WebAppConfiguration
-public class RedisHttpSessionConfigurationXmlCustomExpireTests {
+class RedisHttpSessionConfigurationXmlCustomExpireTests {
 
 	@Test
 	void contextLoads() {

diff --git a/.../session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationXmlTests.java b/.../session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationXmlTests.java
@@ -38,7 +38,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
 @WebAppConfiguration
-public class RedisHttpSessionConfigurationXmlTests {
+class RedisHttpSessionConfigurationXmlTests {
 
 	@Test
 	void contextLoads() {

diff --git a/...les/ROOT/examples/java/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests.java b/...les/ROOT/examples/java/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests.java
@@ -41,7 +41,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
 @WebAppConfiguration
-public class HttpSessionConfigurationNoOpConfigureRedisActionXmlTests {
+class HttpSessionConfigurationNoOpConfigureRedisActionXmlTests {
 
 	@Autowired
 	SessionRepositoryFilter<? extends Session> filter;

diff --git a/spring-session-docs/modules/ROOT/examples/java/docs/IndexDocTests.java b/spring-session-docs/modules/ROOT/examples/java/docs/IndexDocTests.java
@@ -64,11 +64,11 @@ void repositoryDemo() {
 	}
 
 	// tag::repository-demo[]
-	public class RepositoryDemo<S extends Session> {
+	class RepositoryDemo<S extends Session> {
 
 		private SessionRepository<S> repository; // <1>
 
-		public void demo() {
+		void demo() {
 			S toSave = this.repository.createSession(); // <2>
 
 			// <3>
@@ -98,11 +98,11 @@ void expireRepositoryDemo() {
 	}
 
 	// tag::expire-repository-demo[]
-	public class ExpiringRepositoryDemo<S extends Session> {
+	class ExpiringRepositoryDemo<S extends Session> {
 
 		private SessionRepository<S> repository; // <1>
 
-		public void demo() {
+		void demo() {
 			S toSave = this.repository.createSession(); // <2>
 			// ...
 			toSave.setMaxInactiveInterval(Duration.ofSeconds(30)); // <3>

diff --git a/...-session-sample-boot-jdbc-json-attribute/src/test/java/sample/JdbcJsonAttributeTests.java b/...-session-sample-boot-jdbc-json-attribute/src/test/java/sample/JdbcJsonAttributeTests.java
@@ -27,7 +27,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
 @Import(TestContainersConfig.class)
-public class JdbcJsonAttributeTests {
+class JdbcJsonAttributeTests {
 
 	@Autowired
 	MockMvc mvc;

diff --git a/...b-reactive/src/test/java/org/springframework/session/mongodb/examples/AttributeTests.java b/...b-reactive/src/test/java/org/springframework/session/mongodb/examples/AttributeTests.java
@@ -37,7 +37,7 @@
  * @author Yanming Zhou
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class AttributeTests {
+class AttributeTests {
 
 	@LocalServerPort
 	int port;

diff --git a/...odb-traditional/src/test/java/org/springframework/session/mongodb/examples/BootTests.java b/...odb-traditional/src/test/java/org/springframework/session/mongodb/examples/BootTests.java
@@ -42,7 +42,7 @@
  */
 @AutoConfigureMockMvc
 @SpringBootTest
-public class BootTests {
+class BootTests {
 
 	@Autowired
 	private MockMvc mockMvc;