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

spring-context-support/src/test/java/org/springframework/cache/jcache/config/AbstractJCacheAnnotationTests.java

@@ -18,6 +18,7 @@ package org.springframework.cache.jcache.config;
 
 import static org.junit.Assert.*;
 
+import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.junit.Before;
@@ -103,6 +104,28 @@ public abstract class AbstractJCacheAnnotationTests {
 		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")
 	@Test
 	public void cacheExceptionRewriteCallStack() {

spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheableService.java

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

spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/AnnotatedJCacheableService.java

@@ -16,6 +16,7 @@
 
 package org.springframework.cache.jcache.interceptor;
 
+import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 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.TestableCacheResolverFactory;
 
-
 /**
  * Repository sample with a @CacheDefaults annotation
  *
@@ -64,6 +64,13 @@ public class AnnotatedJCacheableService implements JCacheableService<Long> {
 		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
 	@CacheResult(skipGet = true)
 	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 + ")");
+		}
+	}
+
 }