Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
48080165
Commit
48080165
authored
Oct 01, 2019
by
Vedran Pavic
Committed by
Andy Wilkinson
Oct 01, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Align with Spring Session MongoDB deprecations
See gh-18470
parent
6a5f608f
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
20 additions
and
20 deletions
+20
-20
MongoReactiveSessionConfiguration.java
...oconfigure/session/MongoReactiveSessionConfiguration.java
+2
-2
MongoSessionConfiguration.java
...boot/autoconfigure/session/MongoSessionConfiguration.java
+2
-2
SessionAutoConfiguration.java
.../boot/autoconfigure/session/SessionAutoConfiguration.java
+2
-2
ReactiveSessionAutoConfigurationMongoTests.java
...e/session/ReactiveSessionAutoConfigurationMongoTests.java
+3
-3
ReactiveSessionAutoConfigurationRedisTests.java
...e/session/ReactiveSessionAutoConfigurationRedisTests.java
+2
-2
SessionAutoConfigurationHazelcastTests.java
...igure/session/SessionAutoConfigurationHazelcastTests.java
+2
-2
SessionAutoConfigurationJdbcTests.java
...oconfigure/session/SessionAutoConfigurationJdbcTests.java
+2
-2
SessionAutoConfigurationMongoTests.java
...configure/session/SessionAutoConfigurationMongoTests.java
+3
-3
SessionAutoConfigurationRedisTests.java
...configure/session/SessionAutoConfigurationRedisTests.java
+2
-2
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoReactiveSessionConfiguration.java
View file @
48080165
...
...
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Conditional;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.data.mongodb.core.ReactiveMongoOperations
;
import
org.springframework.session.ReactiveSessionRepository
;
import
org.springframework.session.data.mongo.ReactiveMongo
Operations
SessionRepository
;
import
org.springframework.session.data.mongo.ReactiveMongoSessionRepository
;
import
org.springframework.session.data.mongo.config.annotation.web.reactive.ReactiveMongoWebSessionConfiguration
;
/**
...
...
@@ -36,7 +36,7 @@ import org.springframework.session.data.mongo.config.annotation.web.reactive.Rea
* @author Andy Wilkinson
*/
@Configuration
(
proxyBeanMethods
=
false
)
@ConditionalOnClass
({
ReactiveMongoOperations
.
class
,
ReactiveMongo
Operations
SessionRepository
.
class
})
@ConditionalOnClass
({
ReactiveMongoOperations
.
class
,
ReactiveMongoSessionRepository
.
class
})
@ConditionalOnMissingBean
(
ReactiveSessionRepository
.
class
)
@ConditionalOnBean
(
ReactiveMongoOperations
.
class
)
@Conditional
(
ReactiveSessionCondition
.
class
)
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionConfiguration.java
View file @
48080165
...
...
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Conditional;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.data.mongodb.core.MongoOperations
;
import
org.springframework.session.SessionRepository
;
import
org.springframework.session.data.mongo.Mongo
Operations
SessionRepository
;
import
org.springframework.session.data.mongo.Mongo
Indexed
SessionRepository
;
import
org.springframework.session.data.mongo.config.annotation.web.http.MongoHttpSessionConfiguration
;
/**
...
...
@@ -37,7 +37,7 @@ import org.springframework.session.data.mongo.config.annotation.web.http.MongoHt
* @author Stephane Nicoll
*/
@Configuration
(
proxyBeanMethods
=
false
)
@ConditionalOnClass
({
MongoOperations
.
class
,
Mongo
Operations
SessionRepository
.
class
})
@ConditionalOnClass
({
MongoOperations
.
class
,
Mongo
Indexed
SessionRepository
.
class
})
@ConditionalOnMissingBean
(
SessionRepository
.
class
)
@ConditionalOnBean
(
MongoOperations
.
class
)
@Conditional
(
ServletSessionCondition
.
class
)
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java
View file @
48080165
...
...
@@ -266,7 +266,7 @@ public class SessionAutoConfiguration {
super
(
applicationContext
,
sessionProperties
,
Arrays
.
asList
(
"org.springframework.session.hazelcast.HazelcastIndexedSessionRepository"
,
"org.springframework.session.jdbc.JdbcIndexedSessionRepository"
,
"org.springframework.session.data.mongo.Mongo
Operations
SessionRepository"
,
"org.springframework.session.data.mongo.Mongo
Indexed
SessionRepository"
,
"org.springframework.session.data.redis.RedisIndexedSessionRepository"
));
}
...
...
@@ -283,7 +283,7 @@ public class SessionAutoConfiguration {
SessionProperties
sessionProperties
)
{
super
(
applicationContext
,
sessionProperties
,
Arrays
.
asList
(
"org.springframework.session.data.redis.ReactiveRedisSessionRepository"
,
"org.springframework.session.data.mongo.ReactiveMongo
Operations
SessionRepository"
));
"org.springframework.session.data.mongo.ReactiveMongoSessionRepository"
));
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationMongoTests.java
View file @
48080165
...
...
@@ -28,7 +28,7 @@ import org.springframework.boot.test.context.FilteredClassLoader;
import
org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext
;
import
org.springframework.boot.test.context.runner.ContextConsumer
;
import
org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner
;
import
org.springframework.session.data.mongo.ReactiveMongo
Operations
SessionRepository
;
import
org.springframework.session.data.mongo.ReactiveMongoSessionRepository
;
import
org.springframework.session.data.redis.ReactiveRedisSessionRepository
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
...
...
@@ -74,8 +74,8 @@ class ReactiveSessionAutoConfigurationMongoTests extends AbstractSessionAutoConf
private
ContextConsumer
<
AssertableReactiveWebApplicationContext
>
validateSpringSessionUsesMongo
(
String
collectionName
)
{
return
(
context
)
->
{
ReactiveMongo
Operations
SessionRepository
repository
=
validateSessionRepository
(
context
,
ReactiveMongo
Operations
SessionRepository
.
class
);
ReactiveMongoSessionRepository
repository
=
validateSessionRepository
(
context
,
ReactiveMongoSessionRepository
.
class
);
assertThat
(
repository
.
getCollectionName
()).
isEqualTo
(
collectionName
);
};
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/ReactiveSessionAutoConfigurationRedisTests.java
View file @
48080165
...
...
@@ -26,7 +26,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.SaveMode
;
import
org.springframework.session.data.mongo.ReactiveMongo
Operations
SessionRepository
;
import
org.springframework.session.data.mongo.ReactiveMongoSessionRepository
;
import
org.springframework.session.data.redis.ReactiveRedisSessionRepository
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
...
...
@@ -53,7 +53,7 @@ class ReactiveSessionAutoConfigurationRedisTests extends AbstractSessionAutoConf
@Test
void
defaultConfigWithUniqueStoreImplementation
()
{
this
.
contextRunner
.
withClassLoader
(
new
FilteredClassLoader
(
ReactiveMongo
Operations
SessionRepository
.
class
))
this
.
contextRunner
.
withClassLoader
(
new
FilteredClassLoader
(
ReactiveMongoSessionRepository
.
class
))
.
withConfiguration
(
AutoConfigurations
.
of
(
RedisAutoConfiguration
.
class
,
RedisReactiveAutoConfiguration
.
class
))
.
run
(
validateSpringSessionUsesRedis
(
"spring:session:"
,
SaveMode
.
ON_SET_ATTRIBUTE
));
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationHazelcastTests.java
View file @
48080165
...
...
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Bean;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.session.FlushMode
;
import
org.springframework.session.SaveMode
;
import
org.springframework.session.data.mongo.Mongo
Operations
SessionRepository
;
import
org.springframework.session.data.mongo.Mongo
Indexed
SessionRepository
;
import
org.springframework.session.data.redis.RedisIndexedSessionRepository
;
import
org.springframework.session.hazelcast.HazelcastIndexedSessionRepository
;
import
org.springframework.session.jdbc.JdbcIndexedSessionRepository
;
...
...
@@ -59,7 +59,7 @@ class SessionAutoConfigurationHazelcastTests extends AbstractSessionAutoConfigur
void
defaultConfigWithUniqueStoreImplementation
()
{
this
.
contextRunner
.
withClassLoader
(
new
FilteredClassLoader
(
JdbcIndexedSessionRepository
.
class
,
RedisIndexedSessionRepository
.
class
,
Mongo
Operations
SessionRepository
.
class
))
RedisIndexedSessionRepository
.
class
,
Mongo
Indexed
SessionRepository
.
class
))
.
run
(
this
::
validateDefaultConfig
);
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationJdbcTests.java
View file @
48080165
...
...
@@ -32,7 +32,7 @@ import org.springframework.jdbc.BadSqlGrammarException;
import
org.springframework.jdbc.core.JdbcOperations
;
import
org.springframework.session.FlushMode
;
import
org.springframework.session.SaveMode
;
import
org.springframework.session.data.mongo.Mongo
Operations
SessionRepository
;
import
org.springframework.session.data.mongo.Mongo
Indexed
SessionRepository
;
import
org.springframework.session.data.redis.RedisIndexedSessionRepository
;
import
org.springframework.session.hazelcast.HazelcastIndexedSessionRepository
;
import
org.springframework.session.jdbc.JdbcIndexedSessionRepository
;
...
...
@@ -63,7 +63,7 @@ class SessionAutoConfigurationJdbcTests extends AbstractSessionAutoConfiguration
void
defaultConfigWithUniqueStoreImplementation
()
{
this
.
contextRunner
.
withClassLoader
(
new
FilteredClassLoader
(
HazelcastIndexedSessionRepository
.
class
,
Mongo
Operations
SessionRepository
.
class
,
RedisIndexedSessionRepository
.
class
))
Mongo
Indexed
SessionRepository
.
class
,
RedisIndexedSessionRepository
.
class
))
.
run
(
this
::
validateDefaultConfig
);
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java
View file @
48080165
...
...
@@ -26,7 +26,7 @@ import org.springframework.boot.test.context.FilteredClassLoader;
import
org.springframework.boot.test.context.assertj.AssertableWebApplicationContext
;
import
org.springframework.boot.test.context.runner.ContextConsumer
;
import
org.springframework.boot.test.context.runner.WebApplicationContextRunner
;
import
org.springframework.session.data.mongo.Mongo
Operations
SessionRepository
;
import
org.springframework.session.data.mongo.Mongo
Indexed
SessionRepository
;
import
org.springframework.session.data.redis.RedisIndexedSessionRepository
;
import
org.springframework.session.hazelcast.HazelcastIndexedSessionRepository
;
import
org.springframework.session.jdbc.JdbcIndexedSessionRepository
;
...
...
@@ -72,8 +72,8 @@ class SessionAutoConfigurationMongoTests extends AbstractSessionAutoConfiguratio
private
ContextConsumer
<
AssertableWebApplicationContext
>
validateSpringSessionUsesMongo
(
String
collectionName
)
{
return
(
context
)
->
{
Mongo
Operations
SessionRepository
repository
=
validateSessionRepository
(
context
,
Mongo
Operations
SessionRepository
.
class
);
Mongo
Indexed
SessionRepository
repository
=
validateSessionRepository
(
context
,
Mongo
Indexed
SessionRepository
.
class
);
assertThat
(
repository
).
hasFieldOrPropertyWithValue
(
"collectionName"
,
collectionName
);
};
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java
View file @
48080165
...
...
@@ -35,7 +35,7 @@ import org.springframework.data.redis.connection.RedisConnection;
import
org.springframework.data.redis.connection.RedisConnectionFactory
;
import
org.springframework.session.FlushMode
;
import
org.springframework.session.SaveMode
;
import
org.springframework.session.data.mongo.Mongo
Operations
SessionRepository
;
import
org.springframework.session.data.mongo.Mongo
Indexed
SessionRepository
;
import
org.springframework.session.data.redis.RedisIndexedSessionRepository
;
import
org.springframework.session.data.redis.config.ConfigureNotifyKeyspaceEventsAction
;
import
org.springframework.session.data.redis.config.ConfigureRedisAction
;
...
...
@@ -75,7 +75,7 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
void
defaultConfigWithUniqueStoreImplementation
()
{
this
.
contextRunner
.
withClassLoader
(
new
FilteredClassLoader
(
HazelcastIndexedSessionRepository
.
class
,
JdbcIndexedSessionRepository
.
class
,
Mongo
Operations
SessionRepository
.
class
))
JdbcIndexedSessionRepository
.
class
,
Mongo
Indexed
SessionRepository
.
class
))
.
withConfiguration
(
AutoConfigurations
.
of
(
RedisAutoConfiguration
.
class
))
.
withPropertyValues
(
"spring.redis.port="
+
redis
.
getFirstMappedPort
())
.
run
(
validateSpringSessionUsesRedis
(
"spring:session:event:0:created:"
,
FlushMode
.
ON_SAVE
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment