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

Adds CircuitBreakerFilterFunctions.CircuitBreakerConfig.setStatusCodes(String...)

Browse Source
This commit is contained in:
sgibb
2023-12-01 13:34:58 -05:00
parent 0562da5a3e
commit efce014258
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/filter/CircuitBreakerFilterFunctions.java
View File

@@ -22,6 +22,7 @@ import java.net.URI;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.concurrent.TimeoutException;
import java.util.function.Consumer;
@@ -149,9 +150,11 @@ public abstract class CircuitBreakerFilterFunctions {
setFallbackUri(URI.create(fallbackUri));
return this;
}
public CircuitBreakerConfig setFallbackUri(URI fallbackUri) {
if (fallbackUri != null) {
Assert.isTrue(fallbackUri.getScheme().equalsIgnoreCase("forward"), () -> "Scheme must be forward, but is " + fallbackUri.getScheme());
Assert.isTrue(fallbackUri.getScheme().equalsIgnoreCase("forward"),
() -> "Scheme must be forward, but is " + fallbackUri.getScheme());
fallbackPath = fallbackUri.getPath();
}
else {
@@ -169,6 +172,10 @@ public abstract class CircuitBreakerFilterFunctions {
return statusCodes;
}
public CircuitBreakerConfig setStatusCodes(String... statusCodes) {
return setStatusCodes(new LinkedHashSet<>(Arrays.asList(statusCodes)));
}
public CircuitBreakerConfig setStatusCodes(Set<String> statusCodes) {
this.statusCodes = statusCodes;
return this;

3
spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/ServerMvcIntegrationTests.java
View File

@@ -279,8 +279,6 @@ public class ServerMvcIntegrationTests {
// @formatter:on
}
@Test
public void retryWorks() {
restClient.get().uri("/retry?key=get").exchange().expectStatus().isOk().expectBody(String.class).isEqualTo("3");
@@ -776,6 +774,7 @@ public class ServerMvcIntegrationTests {
return route(path("/anything/circuitbreakernofallback"), http())
.filter(new HttpbinUriResolver())
.filter(circuitBreaker("mycb3"))
//.filter(circuitBreaker(config -> config.setId("myCircuitBreaker").setFallbackUri("forward:/inCaseOfFailureUseThis").setStatusCodes("500", "NOT_FOUND")))
.filter(setPath("/delay/5"))
.withAttribute(MvcUtils.GATEWAY_ROUTE_ID_ATTR, "testcircuitbreakernofallback");
// @formatter:on