Skip to content

Commit f78c957

Browse files
snicollsnicoll
committed
Start building against Spring Session Corn snapshots
See gh-18257
1 parent 8d9e447 commit f78c957

14 files changed

+59
-59
lines changed

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/HazelcastSessionConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.springframework.context.annotation.Conditional;
2929
import org.springframework.context.annotation.Configuration;
3030
import org.springframework.session.SessionRepository;
31-
import org.springframework.session.hazelcast.HazelcastSessionRepository;
31+
import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository;
3232
import org.springframework.session.hazelcast.config.annotation.web.http.HazelcastHttpSessionConfiguration;
3333

3434
/**
@@ -40,7 +40,7 @@
4040
* @author Vedran Pavic
4141
*/
4242
@Configuration(proxyBeanMethods = false)
43-
@ConditionalOnClass(HazelcastSessionRepository.class)
43+
@ConditionalOnClass(HazelcastIndexedSessionRepository.class)
4444
@ConditionalOnMissingBean(SessionRepository.class)
4545
@ConditionalOnBean(HazelcastInstance.class)
4646
@Conditional(ServletSessionCondition.class)

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/JdbcSessionConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.springframework.core.io.ResourceLoader;
3232
import org.springframework.jdbc.core.JdbcTemplate;
3333
import org.springframework.session.SessionRepository;
34-
import org.springframework.session.jdbc.JdbcOperationsSessionRepository;
34+
import org.springframework.session.jdbc.JdbcIndexedSessionRepository;
3535
import org.springframework.session.jdbc.config.annotation.web.http.JdbcHttpSessionConfiguration;
3636

3737
/**
@@ -42,7 +42,7 @@
4242
* @author Vedran Pavic
4343
*/
4444
@Configuration(proxyBeanMethods = false)
45-
@ConditionalOnClass({ JdbcTemplate.class, JdbcOperationsSessionRepository.class })
45+
@ConditionalOnClass({ JdbcTemplate.class, JdbcIndexedSessionRepository.class })
4646
@ConditionalOnMissingBean(SessionRepository.class)
4747
@ConditionalOnBean(DataSource.class)
4848
@Conditional(ServletSessionCondition.class)

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.springframework.context.annotation.Configuration;
2828
import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
2929
import org.springframework.session.ReactiveSessionRepository;
30-
import org.springframework.session.data.redis.ReactiveRedisOperationsSessionRepository;
30+
import org.springframework.session.data.redis.ReactiveRedisSessionRepository;
3131
import org.springframework.session.data.redis.config.annotation.web.server.RedisWebSessionConfiguration;
3232

3333
/**
@@ -36,7 +36,7 @@
3636
* @author Andy Wilkinson
3737
*/
3838
@Configuration(proxyBeanMethods = false)
39-
@ConditionalOnClass({ ReactiveRedisConnectionFactory.class, ReactiveRedisOperationsSessionRepository.class })
39+
@ConditionalOnClass({ ReactiveRedisConnectionFactory.class, ReactiveRedisSessionRepository.class })
4040
@ConditionalOnMissingBean(ReactiveSessionRepository.class)
4141
@ConditionalOnBean(ReactiveRedisConnectionFactory.class)
4242
@Conditional(ReactiveSessionCondition.class)

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.data.redis.connection.RedisConnectionFactory;
3030
import org.springframework.data.redis.core.RedisTemplate;
3131
import org.springframework.session.SessionRepository;
32-
import org.springframework.session.data.redis.RedisOperationsSessionRepository;
32+
import org.springframework.session.data.redis.RedisIndexedSessionRepository;
3333
import org.springframework.session.data.redis.config.ConfigureNotifyKeyspaceEventsAction;
3434
import org.springframework.session.data.redis.config.ConfigureRedisAction;
3535
import org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration;
@@ -44,7 +44,7 @@
4444
* @author Vedran Pavic
4545
*/
4646
@Configuration(proxyBeanMethods = false)
47-
@ConditionalOnClass({ RedisTemplate.class, RedisOperationsSessionRepository.class })
47+
@ConditionalOnClass({ RedisTemplate.class, RedisIndexedSessionRepository.class })
4848
@ConditionalOnMissingBean(SessionRepository.class)
4949
@ConditionalOnBean(RedisConnectionFactory.class)
5050
@Conditional(ServletSessionCondition.class)

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ static class ServletSessionRepositoryImplementationValidator
264264
ServletSessionRepositoryImplementationValidator(ApplicationContext applicationContext,
265265
SessionProperties sessionProperties) {
266266
super(applicationContext, sessionProperties,
267-
Arrays.asList("org.springframework.session.hazelcast.HazelcastSessionRepository",
268-
"org.springframework.session.jdbc.JdbcOperationsSessionRepository",
267+
Arrays.asList("org.springframework.session.hazelcast.HazelcastIndexedSessionRepository",
268+
"org.springframework.session.jdbc.JdbcIndexedSessionRepository",
269269
"org.springframework.session.data.mongo.MongoOperationsSessionRepository",
270-
"org.springframework.session.data.redis.RedisOperationsSessionRepository"));
270+
"org.springframework.session.data.redis.RedisIndexedSessionRepository"));
271271
}
272272

273273
}
@@ -282,7 +282,7 @@ static class ReactiveSessionRepositoryImplementationValidator
282282
ReactiveSessionRepositoryImplementationValidator(ApplicationContext applicationContext,
283283
SessionProperties sessionProperties) {
284284
super(applicationContext, sessionProperties,
285-
Arrays.asList("org.springframework.session.data.redis.ReactiveRedisOperationsSessionRepository",
285+
Arrays.asList("org.springframework.session.data.redis.ReactiveRedisSessionRepository",
286286
"org.springframework.session.data.mongo.ReactiveMongoOperationsSessionRepository"));
287287
}
288288

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/NonUniqueSessionRepositoryFailureAnalyzerTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.springframework.boot.diagnostics.FailureAnalyzer;
2525
import org.springframework.boot.diagnostics.LoggingFailureAnalysisReporter;
2626
import org.springframework.session.SessionRepository;
27-
import org.springframework.session.hazelcast.HazelcastSessionRepository;
28-
import org.springframework.session.jdbc.JdbcOperationsSessionRepository;
27+
import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository;
28+
import org.springframework.session.jdbc.JdbcIndexedSessionRepository;
2929

3030
import static org.assertj.core.api.Assertions.assertThat;
3131

@@ -41,10 +41,10 @@ class NonUniqueSessionRepositoryFailureAnalyzerTests {
4141
@Test
4242
void failureAnalysisWithMultipleCandidates() {
4343
FailureAnalysis analysis = analyzeFailure(
44-
createFailure(JdbcOperationsSessionRepository.class, HazelcastSessionRepository.class));
44+
createFailure(JdbcIndexedSessionRepository.class, HazelcastIndexedSessionRepository.class));
4545
assertThat(analysis).isNotNull();
46-
assertThat(analysis.getDescription()).contains(JdbcOperationsSessionRepository.class.getName(),
47-
HazelcastSessionRepository.class.getName());
46+
assertThat(analysis.getDescription()).contains(JdbcIndexedSessionRepository.class.getName(),
47+
HazelcastIndexedSessionRepository.class.getName());
4848
assertThat(analysis.getAction()).contains("spring.session.store-type");
4949
}
5050

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.boot.test.context.runner.ContextConsumer;
3030
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
3131
import org.springframework.session.data.mongo.ReactiveMongoOperationsSessionRepository;
32-
import org.springframework.session.data.redis.ReactiveRedisOperationsSessionRepository;
32+
import org.springframework.session.data.redis.ReactiveRedisSessionRepository;
3333

3434
import static org.assertj.core.api.Assertions.assertThat;
3535

@@ -54,7 +54,7 @@ void defaultConfig() {
5454

5555
@Test
5656
void defaultConfigWithUniqueStoreImplementation() {
57-
this.contextRunner.withClassLoader(new FilteredClassLoader(ReactiveRedisOperationsSessionRepository.class))
57+
this.contextRunner.withClassLoader(new FilteredClassLoader(ReactiveRedisSessionRepository.class))
5858
.withConfiguration(AutoConfigurations.of(EmbeddedMongoAutoConfiguration.class,
5959
MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
6060
MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class))

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationRedisTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
2828
import org.springframework.session.SaveMode;
2929
import org.springframework.session.data.mongo.ReactiveMongoOperationsSessionRepository;
30-
import org.springframework.session.data.redis.ReactiveRedisOperationsSessionRepository;
30+
import org.springframework.session.data.redis.ReactiveRedisSessionRepository;
3131

3232
import static org.assertj.core.api.Assertions.assertThat;
3333

@@ -72,8 +72,8 @@ void redisSessionStoreWithCustomizations() {
7272
private ContextConsumer<AssertableReactiveWebApplicationContext> validateSpringSessionUsesRedis(String namespace,
7373
SaveMode saveMode) {
7474
return (context) -> {
75-
ReactiveRedisOperationsSessionRepository repository = validateSessionRepository(context,
76-
ReactiveRedisOperationsSessionRepository.class);
75+
ReactiveRedisSessionRepository repository = validateSessionRepository(context,
76+
ReactiveRedisSessionRepository.class);
7777
assertThat(repository).hasFieldOrPropertyWithValue("namespace", namespace);
7878
assertThat(repository).hasFieldOrPropertyWithValue("saveMode", saveMode);
7979
};

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
import org.springframework.session.FlushMode;
3030
import org.springframework.session.SaveMode;
3131
import org.springframework.session.data.mongo.MongoOperationsSessionRepository;
32-
import org.springframework.session.data.redis.RedisOperationsSessionRepository;
33-
import org.springframework.session.hazelcast.HazelcastSessionRepository;
34-
import org.springframework.session.jdbc.JdbcOperationsSessionRepository;
32+
import org.springframework.session.data.redis.RedisIndexedSessionRepository;
33+
import org.springframework.session.hazelcast.HazelcastIndexedSessionRepository;
34+
import org.springframework.session.jdbc.JdbcIndexedSessionRepository;
3535

3636
import static org.assertj.core.api.Assertions.assertThat;
3737
import static org.mockito.BDDMockito.given;
@@ -58,13 +58,13 @@ void defaultConfig() {
5858
@Test
5959
void defaultConfigWithUniqueStoreImplementation() {
6060
this.contextRunner
61-
.withClassLoader(new FilteredClassLoader(JdbcOperationsSessionRepository.class,
62-
RedisOperationsSessionRepository.class, MongoOperationsSessionRepository.class))
61+
.withClassLoader(new FilteredClassLoader(JdbcIndexedSessionRepository.class,
62+
RedisIndexedSessionRepository.class, MongoOperationsSessionRepository.class))
6363
.run(this::validateDefaultConfig);
6464
}
6565

6666
private void validateDefaultConfig(AssertableWebApplicationContext context) {
67-
validateSessionRepository(context, HazelcastSessionRepository.class);
67+
validateSessionRepository(context, HazelcastIndexedSessionRepository.class);
6868
HazelcastInstance hazelcastInstance = context.getBean(HazelcastInstance.class);
6969
verify(hazelcastInstance, times(1)).getMap("spring:session:sessions");
7070
}
@@ -73,7 +73,7 @@ private void validateDefaultConfig(AssertableWebApplicationContext context) {
7373
void customMapName() {
7474
this.contextRunner.withPropertyValues("spring.session.store-type=hazelcast",
7575
"spring.session.hazelcast.map-name=foo:bar:biz").run((context) -> {
76-
validateSessionRepository(context, HazelcastSessionRepository.class);
76+
validateSessionRepository(context, HazelcastIndexedSessionRepository.class);
7777
HazelcastInstance hazelcastInstance = context.getBean(HazelcastInstance.class);
7878
verify(hazelcastInstance, times(1)).getMap("foo:bar:biz");
7979
});
@@ -83,8 +83,8 @@ void customMapName() {
8383
void customFlushMode() {
8484
this.contextRunner.withPropertyValues("spring.session.store-type=hazelcast",
8585
"spring.session.hazelcast.flush-mode=immediate").run((context) -> {
86-
HazelcastSessionRepository repository = validateSessionRepository(context,
87-
HazelcastSessionRepository.class);
86+
HazelcastIndexedSessionRepository repository = validateSessionRepository(context,
87+
HazelcastIndexedSessionRepository.class);
8888
assertThat(repository).hasFieldOrPropertyWithValue("flushMode", FlushMode.IMMEDIATE);
8989
});
9090
}
@@ -93,8 +93,8 @@ void customFlushMode() {
9393
void customSaveMode() {
9494
this.contextRunner.withPropertyValues("spring.session.store-type=hazelcast",
9595
"spring.session.hazelcast.save-mode=on-get-attribute").run((context) -> {
96-
HazelcastSessionRepository repository = validateSessionRepository(context,
97-
HazelcastSessionRepository.class);
96+
HazelcastIndexedSessionRepository repository = validateSessionRepository(context,
97+
HazelcastIndexedSessionRepository.class);
9898
assertThat(repository).hasFieldOrPropertyWithValue("saveMode", SaveMode.ON_GET_ATTRIBUTE);
9999
});
100100
}

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
2727
import org.springframework.context.annotation.Bean;
2828
import org.springframework.context.annotation.Configuration;
29-
import org.springframework.session.jdbc.JdbcOperationsSessionRepository;
29+
import org.springframework.session.jdbc.JdbcIndexedSessionRepository;
3030

3131
import static org.assertj.core.api.Assertions.assertThat;
3232
import static org.mockito.BDDMockito.given;
@@ -72,7 +72,7 @@ void severalCandidatesWithWrongSessionStore() {
7272
void severalCandidatesWithValidSessionStore() {
7373
this.contextRunner.withUserConfiguration(HazelcastConfiguration.class)
7474
.withPropertyValues("spring.session.store-type=jdbc")
75-
.run((context) -> validateSessionRepository(context, JdbcOperationsSessionRepository.class));
75+
.run((context) -> validateSessionRepository(context, JdbcIndexedSessionRepository.class));
7676
}
7777

7878
@Configuration(proxyBeanMethods = false)

0 commit comments

Comments
 (0)