From 58633e4a8992004ea501d6e86fdd1a95c595847c Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Thu, 16 Dec 2010 21:25:12 +0000 Subject: [PATCH] SPR-7308 + update AJ caching test --- .../cache/config/AnnotatedClassCacheableService.java | 6 +++--- .../cache/config/DefaultCacheableService.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/org.springframework.aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java b/org.springframework.aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java index 46db113e9f..431fada220 100644 --- a/org.springframework.aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java +++ b/org.springframework.aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java @@ -24,7 +24,7 @@ import org.springframework.cache.annotation.Cacheable; /** * @author Costin Leau */ -@Cacheable +@Cacheable("default") public class AnnotatedClassCacheableService implements CacheableService { private AtomicLong counter = new AtomicLong(); @@ -37,11 +37,11 @@ public class AnnotatedClassCacheableService implements CacheableService { return null; } - @CacheEvict + @CacheEvict("default") public void invalidate(Object arg1) { } - @Cacheable(key = "#p0") + @Cacheable(value = "default", key = "#p0") public Object key(Object arg1, Object arg2) { return counter.getAndIncrement(); } diff --git a/org.springframework.aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/org.springframework.aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java index f5baac7780..5a1e149057 100644 --- a/org.springframework.aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java +++ b/org.springframework.aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java @@ -31,21 +31,21 @@ public class DefaultCacheableService implements CacheableService { private AtomicLong counter = new AtomicLong(); - @Cacheable + @Cacheable("default") public Long cache(Object arg1) { return counter.getAndIncrement(); } - @CacheEvict + @CacheEvict("default") public void invalidate(Object arg1) { } - @Cacheable(condition = "#classField == 3") + @Cacheable(value = "default", condition = "#classField == 3") public Long conditional(int classField) { return counter.getAndIncrement(); } - @Cacheable(key = "#p0") + @Cacheable(value = "default", key = "#p0") public Long key(Object arg1, Object arg2) { return counter.getAndIncrement(); }