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

Rename default to testCache in Cache related tests

Browse Source 
This simply renames the default cache from "default" to "testCache" as
this might be a reserved names for third party cache providers.
This commit is contained in:
Stephane Nicoll
2014-07-16 17:22:24 +02:00
parent bbfc31b11f
commit 35226695eb
16 changed files with 126 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml vendored
View File

@@ -27,7 +27,7 @@
<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
<property name="caches">
<set>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="testCache"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="primary"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="secondary"/>
</set>
@@ -47,7 +47,7 @@
<bean id="customCacheManager" class="org.springframework.cache.support.SimpleCacheManager">
<property name="caches">
<set>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="testCache"/>
</set>
</property>
</bean>

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

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

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

@@ -13,7 +13,7 @@
<property name="caches">
<set>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean"
p:name="default"/>
p:name="testCache"/>
</set>
</property>
</bean>

4
spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml vendored
View File

@@ -17,7 +17,7 @@
<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
<property name="caches">
<set>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="testCache"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="primary"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="secondary"/>
</set>
@@ -39,7 +39,7 @@
<bean id="customCacheManager" class="org.springframework.cache.support.SimpleCacheManager">
<property name="caches">
<set>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="testCache"/>
</set>
</property>
</bean>

2
spring-context/src/test/resources/org/springframework/cache/config/cache-advice-invalid.xml vendored
View File

@@ -7,7 +7,7 @@
<import resource="cache-advice.xml"/>
<cache:advice id="cacheAdviceInvalid" cache-manager="cacheManager">
<cache:caching cache="default">
<cache:caching cache="testCache">
<cache:cacheable method="someFakeMethod" key="#root.methodName" key-generator="unknownBeanName"/>
</cache:caching>
</cache:advice>

38
spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml vendored
View File

@@ -8,7 +8,7 @@
http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
<cache:advice id="cacheAdviceInterface" cache-manager="cacheManager">
<cache:caching cache="default">
<cache:caching cache="testCache">
<cache:cacheable method="cache"/>
<cache:cacheable method="conditional" condition="#classField == 3"/>
<cache:cacheable method="unless" unless="#result > 10"/>
@@ -20,17 +20,17 @@
<cache:cacheable method="unknownCustomKeyGenerator" key-generator="unknownBeanName"/>
<cache:cacheable method="customCacheManager" cache-manager="customCacheManager"/>
<cache:cacheable method="unknownCustomCacheManager" cache-manager="unknownBeanName"/>
<cache:cacheable method="nullValue" cache="default"/>
<cache:cacheable method="nullValue" cache="testCache"/>
</cache:caching>
<cache:caching>
<cache:cache-evict method="invalidate" cache="default"/>
<cache:cache-evict method="evict" key="#p0" cache="default"/>
<cache:cache-evict method="evictWithException" cache="default"/>
<cache:cache-evict method="evictEarly" cache="default" before-invocation="true"/>
<cache:cache-evict method="invalidateEarly" key="#p0" cache="default" before-invocation="true"/>
<cache:cache-evict method="evictAll" cache="default" all-entries="true"/>
<cache:cache-evict method="invalidate" cache="testCache"/>
<cache:cache-evict method="evict" key="#p0" cache="testCache"/>
<cache:cache-evict method="evictWithException" cache="testCache"/>
<cache:cache-evict method="evictEarly" cache="testCache" before-invocation="true"/>
<cache:cache-evict method="invalidateEarly" key="#p0" cache="testCache" before-invocation="true"/>
<cache:cache-evict method="evictAll" cache="testCache" all-entries="true"/>
</cache:caching>
<cache:caching cache="default">
<cache:caching cache="testCache">
<cache:cache-put method="update"/>
<cache:cache-put method="conditionalUpdate" condition="#arg.equals(3)"/>
</cache:caching>
@@ -55,7 +55,7 @@
</cache:advice>
<cache:advice id="cacheAdviceClass" cache-manager="cacheManager" key-generator="keyGenerator">
<cache:caching cache="default">
<cache:caching cache="testCache">
<cache:cacheable method="key" key="#p0"/>
<cache:cacheable method="varArgsKey"/>
<cache:cacheable method="nam*" key="#root.methodName + #root.caches[0].name"/>
@@ -66,14 +66,14 @@
<cache:cacheable method="null*"/>
</cache:caching>
<cache:caching>
<cache:cache-evict method="invalidate" cache="default"/>
<cache:cache-evict method="evict" key="#p0" cache="default"/>
<cache:cache-evict method="evictWithException" cache="default"/>
<cache:cache-evict method="evictEarly" cache="default" before-invocation="true"/>
<cache:cache-evict method="invalidateEarly" key="#p0" cache="default" before-invocation="true"/>
<cache:cache-evict method="evictAll" cache="default" all-entries="true"/>
<cache:cache-evict method="invalidate" cache="testCache"/>
<cache:cache-evict method="evict" key="#p0" cache="testCache"/>
<cache:cache-evict method="evictWithException" cache="testCache"/>
<cache:cache-evict method="evictEarly" cache="testCache" before-invocation="true"/>
<cache:cache-evict method="invalidateEarly" key="#p0" cache="testCache" before-invocation="true"/>
<cache:cache-evict method="evictAll" cache="testCache" all-entries="true"/>
</cache:caching>
<cache:caching cache="default">
<cache:caching cache="testCache">
<cache:cache-put method="update"/>
<cache:cache-put method="conditionalUpdate" condition="#arg.equals(3)"/>
</cache:caching>
@@ -102,7 +102,7 @@
<bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
<property name="caches">
<set>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="testCache"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="primary"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="secondary"/>
</set>
@@ -116,7 +116,7 @@
<bean id="customCacheManager" class="org.springframework.cache.support.SimpleCacheManager">
<property name="caches">
<set>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="default"/>
<bean class="org.springframework.cache.concurrent.ConcurrentMapCacheFactoryBean" p:name="testCache"/>
</set>
</property>
</bean>