root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixed SPR issue reference and aligned exception messages 

Issue: SPR-11592
This commit is contained in:
Juergen Hoeller 2014-03-26 00:31:38 +01:00
parent 9fc13e1d23
commit 90512f036b
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java vendored
View File

@ -103,7 +103,7 @@ public abstract class CacheAspectSupport implements InitializingBean {
* @param cacheOperationSources must not be {@code null}
*/
public void setCacheOperationSources(CacheOperationSource... cacheOperationSources) {
Assert.notEmpty(cacheOperationSources);
Assert.notEmpty(cacheOperationSources, "At least 1 CacheOperationSource needs to be specified");
this.cacheOperationSource = (cacheOperationSources.length > 1 ?
new CompositeCacheOperationSource(cacheOperationSources) : cacheOperationSources[0]);
}
@ -131,8 +131,8 @@ public abstract class CacheAspectSupport implements InitializingBean {
}
public void afterPropertiesSet() {
Assert.state(this.cacheManager != null, "'cacheManager' is required");
Assert.state(this.cacheOperationSource != null, "The 'cacheOperationSources' property is required: " +
Assert.state(this.cacheManager != null, "Property 'cacheManager' is required");
Assert.state(this.cacheOperationSource != null, "Property 'cacheOperationSources' is required: " +
"If there are no cacheable methods, then don't use a cache aspect.");
this.initialized = true;
}
@ -157,7 +157,9 @@ public abstract class CacheAspectSupport implements InitializingBean {
Collection<Cache> caches = new ArrayList<Cache>(cacheNames.size());
for (String cacheName : cacheNames) {
Cache cache = this.cacheManager.getCache(cacheName);
Assert.notNull(cache, "Cannot find cache named '" + cacheName + "' for " + operation);
if (cache == null) {
throw new IllegalArgumentException("Cannot find cache named '" + cacheName + "' for " + operation);
}
caches.add(cache);
}
return caches;

21
spring-context/src/test/java/org/springframework/cache/CacheReproTests.java vendored
View File

@ -66,9 +66,9 @@ public class CacheReproTests {
}
@Test
public void spr11595GetSimple() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Spr11595Config.class);
Spr11595Service bean = context.getBean(Spr11595Service.class);
public void spr11592GetSimple() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Spr11592Config.class);
Spr11592Service bean = context.getBean(Spr11592Service.class);
Cache cache = context.getBean("cache", Cache.class);
String key = "1";
@ -83,9 +83,9 @@ public class CacheReproTests {
}
@Test
public void spr11595GetNeverCache(){
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Spr11595Config.class);
Spr11595Service bean = context.getBean(Spr11595Service.class);
public void spr11592GetNeverCache(){
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Spr11592Config.class);
Spr11592Service bean = context.getBean(Spr11592Service.class);
Cache cache = context.getBean("cache", Cache.class);
String key = "1";
@ -179,7 +179,7 @@ public class CacheReproTests {
@Configuration
@EnableCaching
public static class Spr11595Config {
public static class Spr11592Config {
@Bean
public CacheManager cacheManager() {
@ -195,14 +195,13 @@ public class CacheReproTests {
}
@Bean
public Spr11595Service service() {
return new Spr11595Service();
public Spr11592Service service() {
return new Spr11592Service();
}
}
public static class Spr11595Service {
public static class Spr11592Service {
@Cacheable("cache")
public Object getSimple(String key) {