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

revised cache abstraction

Browse Source 
- removed generics from Cache/CacheManager (they add no value since it's an SPI not API)
+ update docs and tests
+ renamed ConcurrentCacheFactoryBean to ConcurrentMapCacheFactoryBean
This commit is contained in:
Costin Leau
2011-05-18 18:34:41 +00:00
parent dadd0f57ee
commit b39673aa79
19 changed files with 63 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.context/src/test/java/org/springframework/cache/config/AbstractAnnotationTest.java vendored
View File

@@ -133,7 +133,7 @@ public abstract class AbstractAnnotationTest {
Object key = new Object();
Object r1 = service.name(key);
assertSame(r1, service.name(key));
Cache<Object, Object> cache = cm.getCache("default");
Cache cache = cm.getCache("default");
// assert the method name is used
assertNotNull(cache.get(keyName));
}
@@ -142,7 +142,7 @@ public abstract class AbstractAnnotationTest {
Object key = new Object();
Object r1 = service.rootVars(key);
assertSame(r1, service.rootVars(key));
Cache<Object, Object> cache = cm.getCache("default");
Cache cache = cm.getCache("default");
// assert the method name is used
String expectedKey = "rootVarsrootVars" + AopProxyUtils.ultimateTargetClass(service) + service;
assertNotNull(cache.get(expectedKey));

2
org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml vendored
View File

@@ -29,7 +29,7 @@
<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
<property name="caches">
<set>
<bean class="org.springframework.cache.concurrent.ConcurrentCacheFactoryBean" p:name="default"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
</set>
</property>
</bean>

2
org.springframework.context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml vendored
View File

@@ -16,7 +16,7 @@
<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
<property name="caches">
<set>
<bean class="org.springframework.cache.concurrent.ConcurrentCacheFactoryBean" p:name="default"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
</set>
</property>
</bean>