Skip to content

Commit 8ed71b3

Browse files
vpavicwilkinsona
vpavic
authored and
wilkinsona
committed
Start building against Spring Session Corn-M3 snapshots
See gh-17278
1 parent c29cdfa commit 8ed71b3

File tree

9 files changed

+25
-31
lines changed

9 files changed

+25
-31
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void customize(SessionProperties sessionProperties,
5858
setMaxInactiveIntervalInSeconds((int) timeout.getSeconds());
5959
}
6060
setSessionMapName(hazelcastSessionProperties.getMapName());
61-
setHazelcastFlushMode(hazelcastSessionProperties.getFlushMode());
61+
setFlushMode(hazelcastSessionProperties.getFlushMode());
6262
}
6363

6464
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
1717
package org.springframework.boot.autoconfigure.session;
1818

1919
import org.springframework.boot.context.properties.ConfigurationProperties;
20-
import org.springframework.session.hazelcast.HazelcastFlushMode;
20+
import org.springframework.session.FlushMode;
2121

2222
/**
2323
* Configuration properties for Hazelcast backed Spring Session.
@@ -36,7 +36,7 @@ public class HazelcastSessionProperties {
3636
/**
3737
* Sessions flush mode.
3838
*/
39-
private HazelcastFlushMode flushMode = HazelcastFlushMode.ON_SAVE;
39+
private FlushMode flushMode = FlushMode.ON_SAVE;
4040

4141
public String getMapName() {
4242
return this.mapName;
@@ -46,11 +46,11 @@ public void setMapName(String mapName) {
4646
this.mapName = mapName;
4747
}
4848

49-
public HazelcastFlushMode getFlushMode() {
49+
public FlushMode getFlushMode() {
5050
return this.flushMode;
5151
}
5252

53-
public void setFlushMode(HazelcastFlushMode flushMode) {
53+
public void setFlushMode(FlushMode flushMode) {
5454
this.flushMode = flushMode;
5555
}
5656

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public void customize(SessionProperties sessionProperties, RedisSessionPropertie
5353
setMaxInactiveIntervalInSeconds((int) timeout.getSeconds());
5454
}
5555
setRedisNamespace(redisSessionProperties.getNamespace());
56-
setRedisFlushMode(redisSessionProperties.getFlushMode());
5756
}
5857

5958
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void customize(SessionProperties sessionProperties, RedisSessionPropertie
7474
setMaxInactiveIntervalInSeconds((int) timeout.getSeconds());
7575
}
7676
setRedisNamespace(redisSessionProperties.getNamespace());
77-
setRedisFlushMode(redisSessionProperties.getFlushMode());
77+
setFlushMode(redisSessionProperties.getFlushMode());
7878
setCleanupCron(redisSessionProperties.getCleanupCron());
7979
}
8080

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.springframework.boot.autoconfigure.session;
1818

1919
import org.springframework.boot.context.properties.ConfigurationProperties;
20-
import org.springframework.session.data.redis.RedisFlushMode;
20+
import org.springframework.session.FlushMode;
2121

2222
/**
2323
* Configuration properties for Redis backed Spring Session.
@@ -38,7 +38,7 @@ public class RedisSessionProperties {
3838
/**
3939
* Sessions flush mode.
4040
*/
41-
private RedisFlushMode flushMode = RedisFlushMode.ON_SAVE;
41+
private FlushMode flushMode = FlushMode.ON_SAVE;
4242

4343
/**
4444
* The configure action to apply when no user defined ConfigureRedisAction bean is
@@ -59,11 +59,11 @@ public void setNamespace(String namespace) {
5959
this.namespace = namespace;
6060
}
6161

62-
public RedisFlushMode getFlushMode() {
62+
public FlushMode getFlushMode() {
6363
return this.flushMode;
6464
}
6565

66-
public void setFlushMode(RedisFlushMode flushMode) {
66+
public void setFlushMode(FlushMode flushMode) {
6767
this.flushMode = flushMode;
6868
}
6969

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

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

3231
import static org.assertj.core.api.Assertions.assertThat;
3332

@@ -48,34 +47,31 @@ void defaultConfig() {
4847
this.contextRunner.withPropertyValues("spring.session.store-type=redis")
4948
.withConfiguration(
5049
AutoConfigurations.of(RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class))
51-
.run(validateSpringSessionUsesRedis("spring:session:", RedisFlushMode.ON_SAVE));
50+
.run(validateSpringSessionUsesRedis("spring:session:"));
5251
}
5352

5453
@Test
5554
void defaultConfigWithUniqueStoreImplementation() {
5655
this.contextRunner.withClassLoader(new FilteredClassLoader(ReactiveMongoOperationsSessionRepository.class))
5756
.withConfiguration(
5857
AutoConfigurations.of(RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class))
59-
.run(validateSpringSessionUsesRedis("spring:session:", RedisFlushMode.ON_SAVE));
58+
.run(validateSpringSessionUsesRedis("spring:session:"));
6059
}
6160

6261
@Test
6362
void redisSessionStoreWithCustomizations() {
6463
this.contextRunner
6564
.withConfiguration(
6665
AutoConfigurations.of(RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class))
67-
.withPropertyValues("spring.session.store-type=redis", "spring.session.redis.namespace=foo",
68-
"spring.session.redis.flush-mode=immediate")
69-
.run(validateSpringSessionUsesRedis("foo:", RedisFlushMode.IMMEDIATE));
66+
.withPropertyValues("spring.session.store-type=redis", "spring.session.redis.namespace=foo")
67+
.run(validateSpringSessionUsesRedis("foo:"));
7068
}
7169

72-
private ContextConsumer<AssertableReactiveWebApplicationContext> validateSpringSessionUsesRedis(String namespace,
73-
RedisFlushMode flushMode) {
70+
private ContextConsumer<AssertableReactiveWebApplicationContext> validateSpringSessionUsesRedis(String namespace) {
7471
return (context) -> {
7572
ReactiveRedisOperationsSessionRepository repository = validateSessionRepository(context,
7673
ReactiveRedisOperationsSessionRepository.class);
7774
assertThat(repository).hasFieldOrPropertyWithValue("namespace", namespace);
78-
assertThat(repository).hasFieldOrPropertyWithValue("redisFlushMode", flushMode);
7975
};
8076
}
8177

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
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.FlushMode;
2930
import org.springframework.session.data.mongo.MongoOperationsSessionRepository;
3031
import org.springframework.session.data.redis.RedisOperationsSessionRepository;
31-
import org.springframework.session.hazelcast.HazelcastFlushMode;
3232
import org.springframework.session.hazelcast.HazelcastSessionRepository;
3333
import org.springframework.session.jdbc.JdbcOperationsSessionRepository;
3434

@@ -84,8 +84,7 @@ void customFlushMode() {
8484
"spring.session.hazelcast.flush-mode=immediate").run((context) -> {
8585
HazelcastSessionRepository repository = validateSessionRepository(context,
8686
HazelcastSessionRepository.class);
87-
assertThat(repository).hasFieldOrPropertyWithValue("hazelcastFlushMode",
88-
HazelcastFlushMode.IMMEDIATE);
87+
assertThat(repository).hasFieldOrPropertyWithValue("flushMode", FlushMode.IMMEDIATE);
8988
});
9089
}
9190

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import org.springframework.boot.testsupport.testcontainers.RedisContainer;
3333
import org.springframework.data.redis.connection.RedisConnection;
3434
import org.springframework.data.redis.connection.RedisConnectionFactory;
35+
import org.springframework.session.FlushMode;
3536
import org.springframework.session.data.mongo.MongoOperationsSessionRepository;
36-
import org.springframework.session.data.redis.RedisFlushMode;
3737
import org.springframework.session.data.redis.RedisOperationsSessionRepository;
3838
import org.springframework.session.data.redis.config.ConfigureNotifyKeyspaceEventsAction;
3939
import org.springframework.session.data.redis.config.ConfigureRedisAction;
@@ -64,7 +64,7 @@ void defaultConfig() {
6464
.withPropertyValues("spring.session.store-type=redis",
6565
"spring.redis.port=" + redis.getFirstMappedPort())
6666
.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
67-
.run(validateSpringSessionUsesRedis("spring:session:event:0:created:", RedisFlushMode.ON_SAVE,
67+
.run(validateSpringSessionUsesRedis("spring:session:event:0:created:", FlushMode.ON_SAVE,
6868
"0 * * * * *"));
6969
}
7070

@@ -75,7 +75,7 @@ void defaultConfigWithUniqueStoreImplementation() {
7575
JdbcOperationsSessionRepository.class, MongoOperationsSessionRepository.class))
7676
.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
7777
.withPropertyValues("spring.redis.port=" + redis.getFirstMappedPort())
78-
.run(validateSpringSessionUsesRedis("spring:session:event:0:created:", RedisFlushMode.ON_SAVE,
78+
.run(validateSpringSessionUsesRedis("spring:session:event:0:created:", FlushMode.ON_SAVE,
7979
"0 * * * * *"));
8080
}
8181

@@ -85,7 +85,7 @@ void redisSessionStoreWithCustomizations() {
8585
.withPropertyValues("spring.session.store-type=redis", "spring.session.redis.namespace=foo",
8686
"spring.session.redis.flush-mode=immediate", "spring.session.redis.cleanup-cron=0 0 12 * * *",
8787
"spring.redis.port=" + redis.getFirstMappedPort())
88-
.run(validateSpringSessionUsesRedis("foo:event:0:created:", RedisFlushMode.IMMEDIATE, "0 0 12 * * *"));
88+
.run(validateSpringSessionUsesRedis("foo:event:0:created:", FlushMode.IMMEDIATE, "0 0 12 * * *"));
8989
}
9090

9191
@Test
@@ -116,12 +116,12 @@ void redisSessionWithCustomConfigureRedisActionBean() {
116116
}
117117

118118
private ContextConsumer<AssertableWebApplicationContext> validateSpringSessionUsesRedis(
119-
String sessionCreatedChannelPrefix, RedisFlushMode flushMode, String cleanupCron) {
119+
String sessionCreatedChannelPrefix, FlushMode flushMode, String cleanupCron) {
120120
return (context) -> {
121121
RedisOperationsSessionRepository repository = validateSessionRepository(context,
122122
RedisOperationsSessionRepository.class);
123123
assertThat(repository.getSessionCreatedChannelPrefix()).isEqualTo(sessionCreatedChannelPrefix);
124-
assertThat(repository).hasFieldOrPropertyWithValue("redisFlushMode", flushMode);
124+
assertThat(repository).hasFieldOrPropertyWithValue("flushMode", flushMode);
125125
SpringBootRedisHttpSessionConfiguration configuration = context
126126
.getBean(SpringBootRedisHttpSessionConfiguration.class);
127127
assertThat(configuration).hasFieldOrPropertyWithValue("cleanupCron", cleanupCron);

‎spring-boot-project/spring-boot-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
<spring-restdocs.version>2.0.3.RELEASE</spring-restdocs.version>
192192
<spring-retry.version>1.2.4.RELEASE</spring-retry.version>
193193
<spring-security.version>5.2.0.BUILD-SNAPSHOT</spring-security.version>
194-
<spring-session-bom.version>Corn-M2</spring-session-bom.version>
194+
<spring-session-bom.version>Corn-BUILD-SNAPSHOT</spring-session-bom.version>
195195
<spring-ws.version>3.0.7.RELEASE</spring-ws.version>
196196
<sqlite-jdbc.version>3.27.2</sqlite-jdbc.version>
197197
<statsd-client.version>3.1.0</statsd-client.version>

0 commit comments

Comments
 (0)