[ImgBot] Optimize images

docs/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-gateway</artifactId>
-		<version>3.0.3</version>
+		<version>3.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-gateway-docs</artifactId>
 	<packaging>jar</packaging>

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-gateway</artifactId>
-	<version>3.0.3</version>
+	<version>3.0.4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Cloud Gateway</name>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.3</version>
+		<version>3.0.4-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -54,8 +54,8 @@
 		<blockhound.version>1.0.6.RELEASE</blockhound.version>
 		<java.version>1.8</java.version>
 		<junit-pioneer.version>1.0.0</junit-pioneer.version>
-		<spring-cloud-circuitbreaker.version>2.0.2</spring-cloud-circuitbreaker.version>
-		<spring-cloud-commons.version>3.0.3</spring-cloud-commons.version>
+		<spring-cloud-circuitbreaker.version>2.0.3-SNAPSHOT</spring-cloud-circuitbreaker.version>
+		<spring-cloud-commons.version>3.0.4-SNAPSHOT</spring-cloud-commons.version>
 		<testcontainers.version>1.15.1</testcontainers.version>
 	</properties>
 

spring-cloud-gateway-dependencies/pom.xml

@@ -6,12 +6,12 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.0.3</version>
+		<version>3.0.4-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<artifactId>spring-cloud-gateway-dependencies</artifactId>
-	<version>3.0.3</version>
+	<version>3.0.4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>spring-cloud-gateway-dependencies</name>

spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml

@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-gateway-integration-tests</artifactId>
-		<version>3.0.3</version>
+		<version>3.0.4-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 

spring-cloud-gateway-integration-tests/pom.xml

@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-gateway</artifactId>
-		<version>3.0.3</version>
+		<version>3.0.4-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 

spring-cloud-gateway-mvc/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-gateway</artifactId>
-		<version>3.0.3</version>
+		<version>3.0.4-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 

spring-cloud-gateway-sample/pom.xml

@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-gateway</artifactId>
-		<version>3.0.3</version>
+		<version>3.0.4-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 

spring-cloud-gateway-server/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-gateway</artifactId>
-		<version>3.0.3</version>
+		<version>3.0.4-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-gateway-server</artifactId>

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/SpringCloudCircuitBreakerFilterFactory.java

@@ -98,15 +98,16 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
 				return cb.run(chain.filter(exchange).doOnSuccess(v -> {
 					if (statuses.contains(exchange.getResponse().getStatusCode())) {
 						HttpStatus status = exchange.getResponse().getStatusCode();
-						exchange.getResponse().setStatusCode(null);
-						reset(exchange);
 						throw new CircuitBreakerStatusCodeException(status);
 					}
 				}), t -> {
 					if (config.getFallbackUri() == null) {
 						return Mono.error(t);
 					}
 
+					exchange.getResponse().setStatusCode(null);
+					reset(exchange);
+
 					// TODO: copied from RouteToRequestUrlFilter
 					URI uri = exchange.getRequest().getURI();
 					// TODO: assume always?
@@ -121,7 +122,7 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
 
 					ServerHttpRequest request = exchange.getRequest().mutate().uri(requestUrl).build();
 					return getDispatcherHandler().handle(exchange.mutate().request(request).build());
-				}).onErrorResume(t -> handleErrorWithoutFallback(t));
+				}).onErrorResume(t -> handleErrorWithoutFallback(t, config.isResumeWithoutError()));
 			}
 
 			@Override
@@ -132,7 +133,7 @@ public String toString() {
 		};
 	}
 
-	protected abstract Mono<Void> handleErrorWithoutFallback(Throwable t);
+	protected abstract Mono<Void> handleErrorWithoutFallback(Throwable t, boolean resumeWithoutError);
 
 	private void addExceptionDetails(Throwable t, ServerWebExchange exchange) {
 		ofNullable(t).ifPresent(
@@ -154,6 +155,8 @@ public static class Config implements HasRouteId {
 
 		private Set<String> statusCodes = new HashSet<>();
 
+		private boolean resumeWithoutError = false;
+
 		@Override
 		public void setRouteId(String routeId) {
 			this.routeId = routeId;
@@ -206,6 +209,14 @@ public Config addStatusCode(String statusCode) {
 			return this;
 		}
 
+		public boolean isResumeWithoutError() {
+			return resumeWithoutError;
+		}
+
+		public void setResumeWithoutError(boolean resumeWithoutError) {
+			this.resumeWithoutError = resumeWithoutError;
+		}
+
 	}
 
 	public class CircuitBreakerStatusCodeException extends HttpStatusCodeException {

spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/SpringCloudCircuitBreakerResilience4JFilterFactory.java

@@ -38,13 +38,16 @@ public SpringCloudCircuitBreakerResilience4JFilterFactory(
 	}
 
 	@Override
-	protected Mono<Void> handleErrorWithoutFallback(Throwable t) {
+	protected Mono<Void> handleErrorWithoutFallback(Throwable t, boolean resumeWithoutError) {
 		if (java.util.concurrent.TimeoutException.class.isInstance(t)) {
 			return Mono.error(new ResponseStatusException(HttpStatus.GATEWAY_TIMEOUT, t.getMessage(), t));
 		}
 		if (CallNotPermittedException.class.isInstance(t)) {
 			return Mono.error(new ServiceUnavailableException());
 		}
+		if (resumeWithoutError) {
+			return Mono.empty();
+		}
 		return Mono.error(t);
 	}
 

spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/SpringCloudCircuitBreakerFilterFactoryTests.java

@@ -103,4 +103,17 @@ public void filterStatusCodeFallback() {
 				.isOk().expectHeader().valueEquals(ROUTE_ID_HEADER, "circuitbreaker_fallback_test_statuscode");
 	}
 
+	@Test
+	public void filterStatusCodeResumeWithoutError() {
+		testClient.get().uri("/status/500").header("Host", "www.circuitbreakerresumewithouterror.org").exchange()
+				.expectStatus().isEqualTo(500);
+
+		testClient.get().uri("/status/404").header("Host", "www.circuitbreakerresumewithouterror.org").exchange()
+				.expectStatus().isEqualTo(404);
+
+		testClient.get().uri("/status/200").header("Host", "www.circuitbreakerresumewithouterror.org").exchange()
+				.expectStatus().isOk().expectHeader()
+				.valueEquals(ROUTE_ID_HEADER, "circuitbreaker_resume_without_error");
+	}
+
 }

spring-cloud-gateway-server/src/test/resources/application.yml

@@ -109,6 +109,20 @@ spring:
                 - "NOT_FOUND"
               fallbackUri: forward:/statusCodeFallbackController
 
+        # =====================================
+      - id: circuitbreaker_resume_without_error
+        uri: ${test.uri}
+        predicates:
+          - Host=**.circuitbreakerresumewithouterror.org
+        filters:
+          - name: CircuitBreaker
+            args:
+              name: resumewithouterror
+              statusCodes:
+                - 500
+                - "NOT_FOUND"
+              resume-without-error: true
+
         # =====================================
       - id: change_uri_test
         uri: ${test.uri}

spring-cloud-gateway-webflux/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-gateway</artifactId>
-		<version>3.0.3</version>
+		<version>3.0.4-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 

spring-cloud-starter-gateway/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-gateway</artifactId>
-		<version>3.0.3</version>
+		<version>3.0.4-SNAPSHOT</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-starter-gateway</artifactId>