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
17aad4f0
Commit
17aad4f0
authored
Mar 12, 2017
by
Vedran Pavic
Committed by
Stephane Nicoll
Mar 15, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve `RedisSessionConfiguration` conditions
Closes gh-8582
parent
f72e0c08
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
RedisSessionConfiguration.java
...boot/autoconfigure/session/RedisSessionConfiguration.java
+5
-2
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java
View file @
17aad4f0
/*
/*
* Copyright 2012-201
6
the original author or authors.
* Copyright 2012-201
7
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
...
@@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.context.annotation.Conditional
;
import
org.springframework.context.annotation.Conditional
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
...
@@ -38,10 +39,12 @@ import org.springframework.session.data.redis.config.annotation.web.http.RedisHt
...
@@ -38,10 +39,12 @@ import org.springframework.session.data.redis.config.annotation.web.http.RedisHt
* @author Tommy Ludwig
* @author Tommy Ludwig
* @author Eddú Meléndez
* @author Eddú Meléndez
* @author Stephane Nicoll
* @author Stephane Nicoll
* @author Vedran Pavic
*/
*/
@Configuration
@Configuration
@ConditionalOnClass
(
RedisTemplate
.
class
)
@ConditionalOnMissingBean
(
SessionRepository
.
class
)
@ConditionalOnMissingBean
(
SessionRepository
.
class
)
@ConditionalOnBean
(
{
RedisTemplate
.
class
,
RedisConnectionFactory
.
class
}
)
@ConditionalOnBean
(
RedisConnectionFactory
.
class
)
@Conditional
(
SessionCondition
.
class
)
@Conditional
(
SessionCondition
.
class
)
class
RedisSessionConfiguration
{
class
RedisSessionConfiguration
{
...
...
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