SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adds HystrixCommands.fallback(Function<Throwable, Publisher<T>>)

Browse Source 
fixes gh-3210
This commit is contained in:
Spencer Gibb
2018-10-05 17:17:56 -04:00
parent 8125edd772
commit e814cdabb6
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCommands.java
View File

@@ -48,7 +48,7 @@ public class HystrixCommands {
private final Publisher<T> publisher;
private String commandName;
private String groupName;
private Publisher<T> fallback;
private Function<Throwable, Publisher<T>> fallback;
private Setter setter;
private HystrixCommandProperties.Setter commandProperties;
private boolean eager = false;
@@ -69,6 +69,11 @@ public class HystrixCommands {
}
public PublisherBuilder<T> fallback(Publisher<T> fallback) {
this.fallback = throwable -> fallback;
return this;
}
public PublisherBuilder<T> fallback(Function<Throwable, Publisher<T>> fallback) {
this.fallback = fallback;
return this;
}
@@ -166,10 +171,10 @@ public class HystrixCommands {
private static class PublisherHystrixCommand<T> extends HystrixObservableCommand<T> {
private Publisher<T> publisher;
private Publisher<T> fallback;
private Function<Throwable, Publisher<T>> fallback;
protected PublisherHystrixCommand(Setter setter, Publisher<T> publisher,
Publisher<T> fallback) {
Function<Throwable, Publisher<T>> fallback) {
super(setter);
this.publisher = publisher;
this.fallback = fallback;
@@ -183,7 +188,8 @@ public class HystrixCommands {
@Override
protected Observable<T> resumeWithFallback() {
if (this.fallback != null) {
return RxReactiveStreams.toObservable(this.fallback);
Publisher<T> fallbackPublisher = fallback.apply(getExecutionException());
return RxReactiveStreams.toObservable(fallbackPublisher);
}
return super.resumeWithFallback();
}

15
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/HystrixCommandsTests.java
View File

@@ -66,6 +66,21 @@ public class HystrixCommandsTests {
.verifyComplete();
}
@Test
public void monoFallbackWithExceptionWorks() {
StepVerifier.create(HystrixCommands.from(Mono.<String>error(new IllegalStateException()))
.commandName("failcmd")
.fallback(throwable -> {
if (throwable instanceof IllegalStateException) {
return Mono.just("specificfallback");
}
return Mono.just("genericfallback");
})
.toMono())
.expectNext("specificfallback")
.verifyComplete();
}
@Test
public void fluxWorks() {
StepVerifier.create(HystrixCommands.from( Flux.just("1", "2"))