From f78c9574d8058a3ac8203ce3d649a59b96266581 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 27 Sep 2019 16:20:50 +0200 Subject: [PATCH] Start building against Spring Session Corn snapshots See gh-18257 --- .../HazelcastSessionConfiguration.java | 4 ++-- .../session/JdbcSessionConfiguration.java | 4 ++-- .../RedisReactiveSessionConfiguration.java | 4 ++-- .../session/RedisSessionConfiguration.java | 4 ++-- .../session/SessionAutoConfiguration.java | 8 +++---- ...SessionRepositoryFailureAnalyzerTests.java | 10 ++++----- ...iveSessionAutoConfigurationMongoTests.java | 4 ++-- ...iveSessionAutoConfigurationRedisTests.java | 6 ++--- ...essionAutoConfigurationHazelcastTests.java | 22 +++++++++---------- ...sionAutoConfigurationIntegrationTests.java | 4 ++-- .../SessionAutoConfigurationJdbcTests.java | 22 +++++++++---------- .../SessionAutoConfigurationMongoTests.java | 10 ++++----- .../SessionAutoConfigurationRedisTests.java | 14 ++++++------ .../spring-boot-dependencies/pom.xml | 2 +- 14 files changed, 59 insertions(+), 59 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java index 4b28512436..ea0493aca7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java @@ -28,7 +28,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.session.SessionRepository; -import org.springframework.session.hazelcast.HazelcastSessionRepository; +import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository; import org.springframework.session.hazelcast.config.annotation.web.http.HazelcastHttpSessionConfiguration; /** @@ -40,7 +40,7 @@ import org.springframework.session.hazelcast.config.annotation.web.http.Hazelcas * @author Vedran Pavic */ @Configuration(proxyBeanMethods = false) -@ConditionalOnClass(HazelcastSessionRepository.class) +@ConditionalOnClass(HazelcastIndexedSessionRepository.class) @ConditionalOnMissingBean(SessionRepository.class) @ConditionalOnBean(HazelcastInstance.class) @Conditional(ServletSessionCondition.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java index 6aab0a6bda..855d57ca0d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.io.ResourceLoader; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.session.SessionRepository; -import org.springframework.session.jdbc.JdbcOperationsSessionRepository; +import org.springframework.session.jdbc.JdbcIndexedSessionRepository; import org.springframework.session.jdbc.config.annotation.web.http.JdbcHttpSessionConfiguration; /** @@ -42,7 +42,7 @@ import org.springframework.session.jdbc.config.annotation.web.http.JdbcHttpSessi * @author Vedran Pavic */ @Configuration(proxyBeanMethods = false) -@ConditionalOnClass({ JdbcTemplate.class, JdbcOperationsSessionRepository.class }) +@ConditionalOnClass({ JdbcTemplate.class, JdbcIndexedSessionRepository.class }) @ConditionalOnMissingBean(SessionRepository.class) @ConditionalOnBean(DataSource.class) @Conditional(ServletSessionCondition.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java index 6470bef404..31be3bd28e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java @@ -27,7 +27,7 @@ import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory; import org.springframework.session.ReactiveSessionRepository; -import org.springframework.session.data.redis.ReactiveRedisOperationsSessionRepository; +import org.springframework.session.data.redis.ReactiveRedisSessionRepository; import org.springframework.session.data.redis.config.annotation.web.server.RedisWebSessionConfiguration; /** @@ -36,7 +36,7 @@ import org.springframework.session.data.redis.config.annotation.web.server.Redis * @author Andy Wilkinson */ @Configuration(proxyBeanMethods = false) -@ConditionalOnClass({ ReactiveRedisConnectionFactory.class, ReactiveRedisOperationsSessionRepository.class }) +@ConditionalOnClass({ ReactiveRedisConnectionFactory.class, ReactiveRedisSessionRepository.class }) @ConditionalOnMissingBean(ReactiveSessionRepository.class) @ConditionalOnBean(ReactiveRedisConnectionFactory.class) @Conditional(ReactiveSessionCondition.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java index 71fcdcb03f..9f73dbc73a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.session.SessionRepository; -import org.springframework.session.data.redis.RedisOperationsSessionRepository; +import org.springframework.session.data.redis.RedisIndexedSessionRepository; import org.springframework.session.data.redis.config.ConfigureNotifyKeyspaceEventsAction; import org.springframework.session.data.redis.config.ConfigureRedisAction; import org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration; @@ -44,7 +44,7 @@ import org.springframework.session.data.redis.config.annotation.web.http.RedisHt * @author Vedran Pavic */ @Configuration(proxyBeanMethods = false) -@ConditionalOnClass({ RedisTemplate.class, RedisOperationsSessionRepository.class }) +@ConditionalOnClass({ RedisTemplate.class, RedisIndexedSessionRepository.class }) @ConditionalOnMissingBean(SessionRepository.class) @ConditionalOnBean(RedisConnectionFactory.class) @Conditional(ServletSessionCondition.class) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java index d02ab8998a..91b6cea627 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java @@ -264,10 +264,10 @@ public class SessionAutoConfiguration { ServletSessionRepositoryImplementationValidator(ApplicationContext applicationContext, SessionProperties sessionProperties) { super(applicationContext, sessionProperties, - Arrays.asList("org.springframework.session.hazelcast.HazelcastSessionRepository", - "org.springframework.session.jdbc.JdbcOperationsSessionRepository", + Arrays.asList("org.springframework.session.hazelcast.HazelcastIndexedSessionRepository", + "org.springframework.session.jdbc.JdbcIndexedSessionRepository", "org.springframework.session.data.mongo.MongoOperationsSessionRepository", - "org.springframework.session.data.redis.RedisOperationsSessionRepository")); + "org.springframework.session.data.redis.RedisIndexedSessionRepository")); } } @@ -282,7 +282,7 @@ public class SessionAutoConfiguration { ReactiveSessionRepositoryImplementationValidator(ApplicationContext applicationContext, SessionProperties sessionProperties) { super(applicationContext, sessionProperties, - Arrays.asList("org.springframework.session.data.redis.ReactiveRedisOperationsSessionRepository", + Arrays.asList("org.springframework.session.data.redis.ReactiveRedisSessionRepository", "org.springframework.session.data.mongo.ReactiveMongoOperationsSessionRepository")); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/NonUniqueSessionRepositoryFailureAnalyzerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/NonUniqueSessionRepositoryFailureAnalyzerTests.java index 5efd0a3bc4..52b3e16d82 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/NonUniqueSessionRepositoryFailureAnalyzerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/NonUniqueSessionRepositoryFailureAnalyzerTests.java @@ -24,8 +24,8 @@ import org.springframework.boot.diagnostics.FailureAnalysis; import org.springframework.boot.diagnostics.FailureAnalyzer; import org.springframework.boot.diagnostics.LoggingFailureAnalysisReporter; import org.springframework.session.SessionRepository; -import org.springframework.session.hazelcast.HazelcastSessionRepository; -import org.springframework.session.jdbc.JdbcOperationsSessionRepository; +import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository; +import org.springframework.session.jdbc.JdbcIndexedSessionRepository; import static org.assertj.core.api.Assertions.assertThat; @@ -41,10 +41,10 @@ class NonUniqueSessionRepositoryFailureAnalyzerTests { @Test void failureAnalysisWithMultipleCandidates() { FailureAnalysis analysis = analyzeFailure( - createFailure(JdbcOperationsSessionRepository.class, HazelcastSessionRepository.class)); + createFailure(JdbcIndexedSessionRepository.class, HazelcastIndexedSessionRepository.class)); assertThat(analysis).isNotNull(); - assertThat(analysis.getDescription()).contains(JdbcOperationsSessionRepository.class.getName(), - HazelcastSessionRepository.class.getName()); + assertThat(analysis.getDescription()).contains(JdbcIndexedSessionRepository.class.getName(), + HazelcastIndexedSessionRepository.class.getName()); assertThat(analysis.getAction()).contains("spring.session.store-type"); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java index a4185aedfc..5b1a1db0d6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java @@ -29,7 +29,7 @@ import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplic import org.springframework.boot.test.context.runner.ContextConsumer; import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner; import org.springframework.session.data.mongo.ReactiveMongoOperationsSessionRepository; -import org.springframework.session.data.redis.ReactiveRedisOperationsSessionRepository; +import org.springframework.session.data.redis.ReactiveRedisSessionRepository; import static org.assertj.core.api.Assertions.assertThat; @@ -54,7 +54,7 @@ class ReactiveSessionAutoConfigurationMongoTests extends AbstractSessionAutoConf @Test void defaultConfigWithUniqueStoreImplementation() { - this.contextRunner.withClassLoader(new FilteredClassLoader(ReactiveRedisOperationsSessionRepository.class)) + this.contextRunner.withClassLoader(new FilteredClassLoader(ReactiveRedisSessionRepository.class)) .withConfiguration(AutoConfigurations.of(EmbeddedMongoAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class, MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class)) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationRedisTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationRedisTests.java index 04ae02e767..172b3b0cad 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationRedisTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationRedisTests.java @@ -27,7 +27,7 @@ import org.springframework.boot.test.context.runner.ContextConsumer; import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner; import org.springframework.session.SaveMode; import org.springframework.session.data.mongo.ReactiveMongoOperationsSessionRepository; -import org.springframework.session.data.redis.ReactiveRedisOperationsSessionRepository; +import org.springframework.session.data.redis.ReactiveRedisSessionRepository; import static org.assertj.core.api.Assertions.assertThat; @@ -72,8 +72,8 @@ class ReactiveSessionAutoConfigurationRedisTests extends AbstractSessionAutoConf private ContextConsumer validateSpringSessionUsesRedis(String namespace, SaveMode saveMode) { return (context) -> { - ReactiveRedisOperationsSessionRepository repository = validateSessionRepository(context, - ReactiveRedisOperationsSessionRepository.class); + ReactiveRedisSessionRepository repository = validateSessionRepository(context, + ReactiveRedisSessionRepository.class); assertThat(repository).hasFieldOrPropertyWithValue("namespace", namespace); assertThat(repository).hasFieldOrPropertyWithValue("saveMode", saveMode); }; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java index 980de4f6f2..ebb358f3d4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java @@ -29,9 +29,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.session.FlushMode; import org.springframework.session.SaveMode; import org.springframework.session.data.mongo.MongoOperationsSessionRepository; -import org.springframework.session.data.redis.RedisOperationsSessionRepository; -import org.springframework.session.hazelcast.HazelcastSessionRepository; -import org.springframework.session.jdbc.JdbcOperationsSessionRepository; +import org.springframework.session.data.redis.RedisIndexedSessionRepository; +import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository; +import org.springframework.session.jdbc.JdbcIndexedSessionRepository; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; @@ -58,13 +58,13 @@ class SessionAutoConfigurationHazelcastTests extends AbstractSessionAutoConfigur @Test void defaultConfigWithUniqueStoreImplementation() { this.contextRunner - .withClassLoader(new FilteredClassLoader(JdbcOperationsSessionRepository.class, - RedisOperationsSessionRepository.class, MongoOperationsSessionRepository.class)) + .withClassLoader(new FilteredClassLoader(JdbcIndexedSessionRepository.class, + RedisIndexedSessionRepository.class, MongoOperationsSessionRepository.class)) .run(this::validateDefaultConfig); } private void validateDefaultConfig(AssertableWebApplicationContext context) { - validateSessionRepository(context, HazelcastSessionRepository.class); + validateSessionRepository(context, HazelcastIndexedSessionRepository.class); HazelcastInstance hazelcastInstance = context.getBean(HazelcastInstance.class); verify(hazelcastInstance, times(1)).getMap("spring:session:sessions"); } @@ -73,7 +73,7 @@ class SessionAutoConfigurationHazelcastTests extends AbstractSessionAutoConfigur void customMapName() { this.contextRunner.withPropertyValues("spring.session.store-type=hazelcast", "spring.session.hazelcast.map-name=foo:bar:biz").run((context) -> { - validateSessionRepository(context, HazelcastSessionRepository.class); + validateSessionRepository(context, HazelcastIndexedSessionRepository.class); HazelcastInstance hazelcastInstance = context.getBean(HazelcastInstance.class); verify(hazelcastInstance, times(1)).getMap("foo:bar:biz"); }); @@ -83,8 +83,8 @@ class SessionAutoConfigurationHazelcastTests extends AbstractSessionAutoConfigur void customFlushMode() { this.contextRunner.withPropertyValues("spring.session.store-type=hazelcast", "spring.session.hazelcast.flush-mode=immediate").run((context) -> { - HazelcastSessionRepository repository = validateSessionRepository(context, - HazelcastSessionRepository.class); + HazelcastIndexedSessionRepository repository = validateSessionRepository(context, + HazelcastIndexedSessionRepository.class); assertThat(repository).hasFieldOrPropertyWithValue("flushMode", FlushMode.IMMEDIATE); }); } @@ -93,8 +93,8 @@ class SessionAutoConfigurationHazelcastTests extends AbstractSessionAutoConfigur void customSaveMode() { this.contextRunner.withPropertyValues("spring.session.store-type=hazelcast", "spring.session.hazelcast.save-mode=on-get-attribute").run((context) -> { - HazelcastSessionRepository repository = validateSessionRepository(context, - HazelcastSessionRepository.class); + HazelcastIndexedSessionRepository repository = validateSessionRepository(context, + HazelcastIndexedSessionRepository.class); assertThat(repository).hasFieldOrPropertyWithValue("saveMode", SaveMode.ON_GET_ATTRIBUTE); }); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationIntegrationTests.java index ef0c30f2e9..d4d1287b86 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationIntegrationTests.java @@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerA import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.session.jdbc.JdbcOperationsSessionRepository; +import org.springframework.session.jdbc.JdbcIndexedSessionRepository; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; @@ -72,7 +72,7 @@ class SessionAutoConfigurationIntegrationTests extends AbstractSessionAutoConfig void severalCandidatesWithValidSessionStore() { this.contextRunner.withUserConfiguration(HazelcastConfiguration.class) .withPropertyValues("spring.session.store-type=jdbc") - .run((context) -> validateSessionRepository(context, JdbcOperationsSessionRepository.class)); + .run((context) -> validateSessionRepository(context, JdbcIndexedSessionRepository.class)); } @Configuration(proxyBeanMethods = false) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationJdbcTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationJdbcTests.java index 53573870b7..fa2f1f25b3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationJdbcTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationJdbcTests.java @@ -33,9 +33,9 @@ import org.springframework.jdbc.core.JdbcOperations; import org.springframework.session.FlushMode; import org.springframework.session.SaveMode; import org.springframework.session.data.mongo.MongoOperationsSessionRepository; -import org.springframework.session.data.redis.RedisOperationsSessionRepository; -import org.springframework.session.hazelcast.HazelcastSessionRepository; -import org.springframework.session.jdbc.JdbcOperationsSessionRepository; +import org.springframework.session.data.redis.RedisIndexedSessionRepository; +import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository; +import org.springframework.session.jdbc.JdbcIndexedSessionRepository; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -62,14 +62,14 @@ class SessionAutoConfigurationJdbcTests extends AbstractSessionAutoConfiguration @Test void defaultConfigWithUniqueStoreImplementation() { this.contextRunner - .withClassLoader(new FilteredClassLoader(HazelcastSessionRepository.class, - MongoOperationsSessionRepository.class, RedisOperationsSessionRepository.class)) + .withClassLoader(new FilteredClassLoader(HazelcastIndexedSessionRepository.class, + MongoOperationsSessionRepository.class, RedisIndexedSessionRepository.class)) .run(this::validateDefaultConfig); } private void validateDefaultConfig(AssertableWebApplicationContext context) { - JdbcOperationsSessionRepository repository = validateSessionRepository(context, - JdbcOperationsSessionRepository.class); + JdbcIndexedSessionRepository repository = validateSessionRepository(context, + JdbcIndexedSessionRepository.class); assertThat(repository).hasFieldOrPropertyWithValue("tableName", "SPRING_SESSION"); assertThat(context.getBean(JdbcSessionProperties.class).getInitializeSchema()) .isEqualTo(DataSourceInitializationMode.EMBEDDED); @@ -94,8 +94,8 @@ class SessionAutoConfigurationJdbcTests extends AbstractSessionAutoConfiguration this.contextRunner .withPropertyValues("spring.session.store-type=jdbc", "spring.session.jdbc.initialize-schema=never") .run((context) -> { - JdbcOperationsSessionRepository repository = validateSessionRepository(context, - JdbcOperationsSessionRepository.class); + JdbcIndexedSessionRepository repository = validateSessionRepository(context, + JdbcIndexedSessionRepository.class); assertThat(repository).hasFieldOrPropertyWithValue("tableName", "SPRING_SESSION"); assertThat(context.getBean(JdbcSessionProperties.class).getInitializeSchema()) .isEqualTo(DataSourceInitializationMode.NEVER); @@ -110,8 +110,8 @@ class SessionAutoConfigurationJdbcTests extends AbstractSessionAutoConfiguration .withPropertyValues("spring.session.store-type=jdbc", "spring.session.jdbc.table-name=FOO_BAR", "spring.session.jdbc.schema=classpath:session/custom-schema-h2.sql") .run((context) -> { - JdbcOperationsSessionRepository repository = validateSessionRepository(context, - JdbcOperationsSessionRepository.class); + JdbcIndexedSessionRepository repository = validateSessionRepository(context, + JdbcIndexedSessionRepository.class); assertThat(repository).hasFieldOrPropertyWithValue("tableName", "FOO_BAR"); assertThat(context.getBean(JdbcSessionProperties.class).getInitializeSchema()) .isEqualTo(DataSourceInitializationMode.EMBEDDED); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java index f0e168406c..5cef01ee21 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java @@ -27,9 +27,9 @@ import org.springframework.boot.test.context.assertj.AssertableWebApplicationCon import org.springframework.boot.test.context.runner.ContextConsumer; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.session.data.mongo.MongoOperationsSessionRepository; -import org.springframework.session.data.redis.RedisOperationsSessionRepository; -import org.springframework.session.hazelcast.HazelcastSessionRepository; -import org.springframework.session.jdbc.JdbcOperationsSessionRepository; +import org.springframework.session.data.redis.RedisIndexedSessionRepository; +import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository; +import org.springframework.session.jdbc.JdbcIndexedSessionRepository; import static org.assertj.core.api.Assertions.assertThat; @@ -54,8 +54,8 @@ class SessionAutoConfigurationMongoTests extends AbstractSessionAutoConfiguratio @Test void defaultConfigWithUniqueStoreImplementation() { this.contextRunner - .withClassLoader(new FilteredClassLoader(HazelcastSessionRepository.class, - JdbcOperationsSessionRepository.class, RedisOperationsSessionRepository.class)) + .withClassLoader(new FilteredClassLoader(HazelcastIndexedSessionRepository.class, + JdbcIndexedSessionRepository.class, RedisIndexedSessionRepository.class)) .withConfiguration(AutoConfigurations.of(EmbeddedMongoAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class)) .run(validateSpringSessionUsesMongo("sessions")); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java index 7d88a63943..631061f988 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java @@ -36,11 +36,11 @@ import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.session.FlushMode; import org.springframework.session.SaveMode; import org.springframework.session.data.mongo.MongoOperationsSessionRepository; -import org.springframework.session.data.redis.RedisOperationsSessionRepository; +import org.springframework.session.data.redis.RedisIndexedSessionRepository; import org.springframework.session.data.redis.config.ConfigureNotifyKeyspaceEventsAction; import org.springframework.session.data.redis.config.ConfigureRedisAction; -import org.springframework.session.hazelcast.HazelcastSessionRepository; -import org.springframework.session.jdbc.JdbcOperationsSessionRepository; +import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository; +import org.springframework.session.jdbc.JdbcIndexedSessionRepository; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; @@ -74,8 +74,8 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio @Test void defaultConfigWithUniqueStoreImplementation() { this.contextRunner - .withClassLoader(new FilteredClassLoader(HazelcastSessionRepository.class, - JdbcOperationsSessionRepository.class, MongoOperationsSessionRepository.class)) + .withClassLoader(new FilteredClassLoader(HazelcastIndexedSessionRepository.class, + JdbcIndexedSessionRepository.class, MongoOperationsSessionRepository.class)) .withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class)) .withPropertyValues("spring.redis.port=" + redis.getFirstMappedPort()) .run(validateSpringSessionUsesRedis("spring:session:event:0:created:", FlushMode.ON_SAVE, @@ -123,8 +123,8 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio private ContextConsumer validateSpringSessionUsesRedis( String sessionCreatedChannelPrefix, FlushMode flushMode, SaveMode saveMode, String cleanupCron) { return (context) -> { - RedisOperationsSessionRepository repository = validateSessionRepository(context, - RedisOperationsSessionRepository.class); + RedisIndexedSessionRepository repository = validateSessionRepository(context, + RedisIndexedSessionRepository.class); assertThat(repository.getSessionCreatedChannelPrefix()).isEqualTo(sessionCreatedChannelPrefix); assertThat(repository).hasFieldOrPropertyWithValue("flushMode", flushMode); SpringBootRedisHttpSessionConfiguration configuration = context diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 2ffa8c7890..2307c71b40 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -197,7 +197,7 @@ 2.0.3.RELEASE 1.2.4.RELEASE 5.2.0.BUILD-SNAPSHOT - Corn-M4 + Corn-BUILD-SNAPSHOT 3.0.8.BUILD-SNAPSHOT 3.28.0 ${jakarta-mail.version}