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
c2a29997
Commit
c2a29997
authored
Jan 29, 2018
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use proper classloader for value serialization
Closes gh-11822
parent
9edcd25c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
3 deletions
+10
-3
RedisCacheConfiguration.java
...ork/boot/autoconfigure/cache/RedisCacheConfiguration.java
+10
-3
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/RedisCacheConfiguration.java
View file @
c2a29997
...
...
@@ -29,9 +29,12 @@ import org.springframework.cache.CacheManager;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Conditional
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.core.io.ResourceLoader
;
import
org.springframework.data.redis.cache.RedisCacheManager
;
import
org.springframework.data.redis.cache.RedisCacheManager.RedisCacheManagerBuilder
;
import
org.springframework.data.redis.connection.RedisConnectionFactory
;
import
org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
;
import
org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair
;
/**
* Redis cache configuration.
...
...
@@ -63,9 +66,10 @@ class RedisCacheConfiguration {
}
@Bean
public
RedisCacheManager
cacheManager
(
RedisConnectionFactory
redisConnectionFactory
)
{
public
RedisCacheManager
cacheManager
(
RedisConnectionFactory
redisConnectionFactory
,
ResourceLoader
resourceLoader
)
{
RedisCacheManagerBuilder
builder
=
RedisCacheManager
.
builder
(
redisConnectionFactory
).
cacheDefaults
(
determineConfiguration
());
.
builder
(
redisConnectionFactory
).
cacheDefaults
(
determineConfiguration
(
resourceLoader
.
getClassLoader
()
));
List
<
String
>
cacheNames
=
this
.
cacheProperties
.
getCacheNames
();
if
(!
cacheNames
.
isEmpty
())
{
builder
.
initialCacheNames
(
new
LinkedHashSet
<>(
cacheNames
));
...
...
@@ -73,13 +77,16 @@ class RedisCacheConfiguration {
return
this
.
customizerInvoker
.
customize
(
builder
.
build
());
}
private
org
.
springframework
.
data
.
redis
.
cache
.
RedisCacheConfiguration
determineConfiguration
()
{
private
org
.
springframework
.
data
.
redis
.
cache
.
RedisCacheConfiguration
determineConfiguration
(
ClassLoader
classLoader
)
{
if
(
this
.
redisCacheConfiguration
!=
null
)
{
return
this
.
redisCacheConfiguration
;
}
Redis
redisProperties
=
this
.
cacheProperties
.
getRedis
();
org
.
springframework
.
data
.
redis
.
cache
.
RedisCacheConfiguration
config
=
org
.
springframework
.
data
.
redis
.
cache
.
RedisCacheConfiguration
.
defaultCacheConfig
();
config
=
config
.
serializeValuesWith
(
SerializationPair
.
fromSerializer
(
new
JdkSerializationRedisSerializer
(
classLoader
)));
if
(
redisProperties
.
getTimeToLive
()
!=
null
)
{
config
=
config
.
entryTtl
(
redisProperties
.
getTimeToLive
());
}
...
...
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