polishing

This commit fixes the handling of cached exceptions in the JSR-107
advisor. Such exceptions are now properly propagated instead of being
wrapped in a RuntimeException.

Issue: SPR-9616
This commit is contained in:
Stephane Nicoll 2014-04-08 17:03:31 +02:00
parent 0bdece700f
commit 3cda355e7f
6 changed files with 82 additions and 14 deletions

View File

@ -67,10 +67,8 @@ public aspect JCacheCacheAspect extends JCacheAspectSupport {
return execute(aspectJInvoker, thisJoinPoint.getTarget(), method, thisJoinPoint.getArgs()); return execute(aspectJInvoker, thisJoinPoint.getTarget(), method, thisJoinPoint.getArgs());
} }
catch (CacheOperationInvoker.ThrowableWrapper th) { catch (CacheOperationInvoker.ThrowableWrapper th) {
if (th.getOriginal() instanceof RuntimeException) { AnyThrow.throwUnchecked(th.getOriginal());
throw (RuntimeException) th.getOriginal(); return null; // never reached
}
throw th; // Lose original checked exception
} }
} }
@ -109,4 +107,17 @@ public aspect JCacheCacheAspect extends JCacheAspectSupport {
private pointcut executionOfCacheRemoveAllMethod() : private pointcut executionOfCacheRemoveAllMethod() :
execution(@CacheRemoveAll * *(..)); execution(@CacheRemoveAll * *(..));
private static class AnyThrow {
private static void throwUnchecked(Throwable e) {
AnyThrow.<RuntimeException>throwAny(e);
}
@SuppressWarnings("unchecked")
private static <E extends Throwable> void throwAny(Throwable e) throws E {
throw (E)e;
}
}
} }

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cache.jcache.config.aspectj; package org.springframework.cache.aspectj;
import org.springframework.cache.jcache.config.AbstractJCacheAnnotationTests; import org.springframework.cache.jcache.config.AbstractJCacheAnnotationTests;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;

View File

@ -16,6 +16,10 @@
package org.springframework.cache.config; package org.springframework.cache.config;
import java.io.IOException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
import javax.cache.annotation.CacheDefaults; import javax.cache.annotation.CacheDefaults;
import javax.cache.annotation.CacheKey; import javax.cache.annotation.CacheKey;
import javax.cache.annotation.CachePut; import javax.cache.annotation.CachePut;
@ -23,8 +27,6 @@ import javax.cache.annotation.CacheRemove;
import javax.cache.annotation.CacheRemoveAll; import javax.cache.annotation.CacheRemoveAll;
import javax.cache.annotation.CacheResult; import javax.cache.annotation.CacheResult;
import javax.cache.annotation.CacheValue; import javax.cache.annotation.CacheValue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
import org.springframework.cache.Cache; import org.springframework.cache.Cache;
import org.springframework.cache.jcache.config.JCacheableService; import org.springframework.cache.jcache.config.JCacheableService;
@ -64,6 +66,13 @@ public class AnnotatedJCacheableService implements JCacheableService<Long> {
return 0L; // Never reached return 0L; // Never reached
} }
@Override
@CacheResult(exceptionCacheName = "exception", nonCachedExceptions = NullPointerException.class)
public Long cacheWithCheckedException(@CacheKey String id, boolean matchFilter) throws IOException {
throwCheckedException(matchFilter);
return 0L; // Never reached
}
@Override @Override
@CacheResult(skipGet = true) @CacheResult(skipGet = true)
public Long cacheAlwaysInvoke(String id) { public Long cacheAlwaysInvoke(String id) {
@ -177,12 +186,6 @@ public class AnnotatedJCacheableService implements JCacheableService<Long> {
public void noAnnotation() { public void noAnnotation() {
} }
@CacheRemove
@CacheRemoveAll
public void multiAnnotations() {
}
@Override @Override
public long exceptionInvocations() { public long exceptionInvocations() {
return exceptionCounter.get(); return exceptionCounter.get();
@ -198,4 +201,14 @@ public class AnnotatedJCacheableService implements JCacheableService<Long> {
} }
} }
private void throwCheckedException(boolean matchFilter) throws IOException {
long count = exceptionCounter.getAndIncrement();
if (matchFilter) {
throw new IOException("Expected exception (" + count + ")");
}
else {
throw new NullPointerException("Expected exception (" + count + ")");
}
}
} }

View File

@ -18,6 +18,7 @@ package org.springframework.cache.jcache.config;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import java.io.IOException;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.junit.Before; import org.junit.Before;
@ -103,6 +104,28 @@ public abstract class AbstractJCacheAnnotationTests {
assertNull(cache.get(key)); assertNull(cache.get(key));
} }
@Test
public void cacheCheckedException() {
String keyItem = name.getMethodName();
Cache cache = getCache(EXCEPTION_CACHE);
Object key = createKey(keyItem);
assertNull(cache.get(key));
try {
service.cacheWithCheckedException(keyItem, true);
fail("Should have thrown an exception");
}
catch (IOException e) {
// This is what we expect
}
Cache.ValueWrapper result = cache.get(key);
assertNotNull(result);
assertEquals(IOException.class, result.get().getClass());
}
@SuppressWarnings("ThrowableResultOfMethodCallIgnored") @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
@Test @Test
public void cacheExceptionRewriteCallStack() { public void cacheExceptionRewriteCallStack() {

View File

@ -16,6 +16,8 @@
package org.springframework.cache.jcache.config; package org.springframework.cache.jcache.config;
import java.io.IOException;
/** /**
* @author Stephane Nicoll * @author Stephane Nicoll
*/ */
@ -25,6 +27,8 @@ public interface JCacheableService<T> {
T cacheWithException(String id, boolean matchFilter); T cacheWithException(String id, boolean matchFilter);
T cacheWithCheckedException(String id, boolean matchFilter) throws IOException;
T cacheAlwaysInvoke(String id); T cacheAlwaysInvoke(String id);
T cacheWithPartialKey(String id, boolean notUsed); T cacheWithPartialKey(String id, boolean notUsed);

View File

@ -16,6 +16,7 @@
package org.springframework.cache.jcache.interceptor; package org.springframework.cache.jcache.interceptor;
import java.io.IOException;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
@ -32,7 +33,6 @@ import org.springframework.cache.jcache.config.JCacheableService;
import org.springframework.cache.jcache.support.TestableCacheKeyGenerator; import org.springframework.cache.jcache.support.TestableCacheKeyGenerator;
import org.springframework.cache.jcache.support.TestableCacheResolverFactory; import org.springframework.cache.jcache.support.TestableCacheResolverFactory;
/** /**
* Repository sample with a @CacheDefaults annotation * Repository sample with a @CacheDefaults annotation
* *
@ -64,6 +64,13 @@ public class AnnotatedJCacheableService implements JCacheableService<Long> {
return 0L; // Never reached return 0L; // Never reached
} }
@Override
@CacheResult(exceptionCacheName = "exception", nonCachedExceptions = NullPointerException.class)
public Long cacheWithCheckedException(@CacheKey String id, boolean matchFilter) throws IOException {
throwCheckedException(matchFilter);
return 0L; // Never reached
}
@Override @Override
@CacheResult(skipGet = true) @CacheResult(skipGet = true)
public Long cacheAlwaysInvoke(String id) { public Long cacheAlwaysInvoke(String id) {
@ -192,4 +199,14 @@ public class AnnotatedJCacheableService implements JCacheableService<Long> {
} }
} }
private void throwCheckedException(boolean matchFilter) throws IOException {
long count = exceptionCounter.getAndIncrement();
if (matchFilter) {
throw new IOException("Expected exception (" + count + ")");
}
else {
throw new NullPointerException("Expected exception (" + count + ")");
}
}
} }