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

Merge branch '6.1.x'

Browse Source
This commit is contained in:
Simon Baslé
2024-09-30 10:19:36 +02:00
parent d79258ac73 e32a2f339d
commit 854f6ffd39
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1155,7 +1155,8 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
.onErrorResume(RuntimeException.class, ex -> {
try {
getErrorHandler().handleCacheGetError((RuntimeException) ex, cache, key);
return evaluate(null, invoker, method, contexts);
Object e = evaluate(null, invoker, method, contexts);
return (e != null ? e : Flux.error((RuntimeException) ex));
}
catch (RuntimeException exception) {
return Flux.error(exception);
@@ -1169,7 +1170,8 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
.onErrorResume(RuntimeException.class, ex -> {
try {
getErrorHandler().handleCacheGetError((RuntimeException) ex, cache, key);
return evaluate(null, invoker, method, contexts);
Object e = evaluate(null, invoker, method, contexts);
return (e != null ? e : Mono.error((RuntimeException) ex));
}
catch (RuntimeException exception) {
return Mono.error(exception);

32
spring-context/src/test/java/org/springframework/cache/annotation/ReactiveCachingTests.java vendored
View File

@@ -26,6 +26,7 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager;
@@ -145,6 +146,23 @@ class ReactiveCachingTests {
assertThat(r1).as("cacheFlux blockFirst").isEqualTo(2L);
}
@Test
void cacheErrorHandlerWithLoggingCacheErrorHandlerAndMethodError() {
AnnotationConfigApplicationContext ctx =
new AnnotationConfigApplicationContext(ExceptionCacheManager.class, ReactiveFailureCacheableService.class, ErrorHandlerCachingConfiguration.class);
ReactiveCacheableService service = ctx.getBean(ReactiveCacheableService.class);
Object key = new Object();
StepVerifier.create(service.cacheMono(key))
.expectErrorMessage("mono service error")
.verify();
key = new Object();
StepVerifier.create(service.cacheFlux(key))
.expectErrorMessage("flux service error")
.verify();
}
@Test
void cacheErrorHandlerWithSimpleCacheErrorHandler() {
AnnotationConfigApplicationContext ctx =
@@ -214,6 +232,20 @@ class ReactiveCachingTests {
}
}
@CacheConfig(cacheNames = "first")
static class ReactiveFailureCacheableService extends ReactiveCacheableService {
@Cacheable
Mono<Long> cacheMono(Object arg) {
return Mono.error(new IllegalStateException("mono service error"));
}
@Cacheable
Flux<Long> cacheFlux(Object arg) {
return Flux.error(new IllegalStateException("flux service error"));
}
}
@Configuration(proxyBeanMethods = false)
@EnableCaching