Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgraded to JCache 1.0 RC1

Browse Source 
Also completing 4.0's consistency efforts between Spring's cache adapters.
This commit is contained in:
Juergen Hoeller
2013-12-20 01:28:16 +01:00
parent b1460742c3
commit a884cde18c
10 changed files with 82 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java vendored
View File

@@ -87,16 +87,16 @@ public class ConcurrentMapCache implements Cache {
@Override
public String getName() {
public final String getName() {
return this.name;
}
@Override
public ConcurrentMap<Object, Object> getNativeCache() {
public final ConcurrentMap<Object, Object> getNativeCache() {
return this.store;
}
public boolean isAllowNullValues() {
public final boolean isAllowNullValues() {
return this.allowNullValues;
}

23
spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java vendored
View File

@@ -47,6 +47,8 @@ public class ConcurrentMapCacheManager implements CacheManager {
private boolean dynamic = true;
private boolean allowNullValues = true;
/**
* Construct a dynamic ConcurrentMapCacheManager,
@@ -78,6 +80,25 @@ public class ConcurrentMapCacheManager implements CacheManager {
}
}
/**
* Specify whether to accept and convert {@code null} values for all caches
* in this cache manager.
* <p>Default is "true", despite ConcurrentHashMap itself not supporting {@code null}
* values. An internal holder object will be used to store user-level {@code null}s.
*/
public void setAllowNullValues(boolean allowNullValues) {
this.allowNullValues = allowNullValues;
}
/**
* Return whether this cache manager accepts and converts {@code null} values
* for all of its caches.
*/
public boolean isAllowNullValues() {
return this.allowNullValues;
}
@Override
public Collection<String> getCacheNames() {
return Collections.unmodifiableSet(this.cacheMap.keySet());
@@ -104,7 +125,7 @@ public class ConcurrentMapCacheManager implements CacheManager {
* @return the ConcurrentMapCache (or a decorator thereof)
*/
protected Cache createConcurrentMapCache(String name) {
return new ConcurrentMapCache(name);
return new ConcurrentMapCache(name, isAllowNullValues());
}
}