formatting

spring-cloud · Apr 5, 2021 · 6466f73 · 6466f73
1 parent 24d7514
commit 6466f73
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 27 deletions.
diff --git a/...server/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java b/...server/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java
@@ -115,8 +115,7 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
 			ArrayList<String> updatedProtocols = new ArrayList<>();
 			for (int i = 0; i < protocols.size(); i++) {
 				String protocol = protocols.get(i);
-				updatedProtocols.addAll(
-						Arrays.asList(StringUtils.tokenizeToStringArray(protocol, ",")));
+				updatedProtocols.addAll(Arrays.asList(StringUtils.tokenizeToStringArray(protocol, ",")));
 			}
 			protocols = updatedProtocols;
 		}

diff --git a/...ringframework/cloud/gateway/filter/factory/RewriteResponseHeaderGatewayFilterFactory.java b/...ringframework/cloud/gateway/filter/factory/RewriteResponseHeaderGatewayFilterFactory.java
@@ -85,8 +85,7 @@ protected void rewriteHeaders(ServerWebExchange exchange, Config config) {
 	protected List<String> rewriteHeaders(Config config, List<String> headers) {
 		ArrayList<String> rewrittenHeaders = new ArrayList<>();
 		for (int i = 0; i < headers.size(); i++) {
-			String rewriten = rewrite(headers.get(i), config.getRegexp(),
-					config.getReplacement());
+			String rewriten = rewrite(headers.get(i), config.getRegexp(), config.getReplacement());
 			rewrittenHeaders.add(rewriten);
 		}
 		return rewrittenHeaders;

diff --git a/...ava/org/springframework/cloud/gateway/filter/factory/StripPrefixGatewayFilterFactory.java b/...ava/org/springframework/cloud/gateway/filter/factory/StripPrefixGatewayFilterFactory.java
@@ -79,8 +79,7 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
 					newPath.append('/');
 				}
 
-				ServerHttpRequest newRequest = request.mutate().path(newPath.toString())
-						.build();
+				ServerHttpRequest newRequest = request.mutate().path(newPath.toString()).build();
 
 				exchange.getAttributes().put(GATEWAY_REQUEST_URL_ATTR, newRequest.getURI());
 

diff --git a/...ver/src/main/java/org/springframework/cloud/gateway/filter/headers/HttpHeadersFilter.java b/...ver/src/main/java/org/springframework/cloud/gateway/filter/headers/HttpHeadersFilter.java
@@ -28,8 +28,8 @@ static HttpHeaders filterRequest(List<HttpHeadersFilter> filters, ServerWebExcha
 		return filter(filters, headers, exchange, Type.REQUEST);
 	}
 
-	static HttpHeaders filter(List<HttpHeadersFilter> filters, HttpHeaders input,
-			ServerWebExchange exchange, Type type) {
+	static HttpHeaders filter(List<HttpHeadersFilter> filters, HttpHeaders input, ServerWebExchange exchange,
+			Type type) {
 		if (filters != null) {
 			HttpHeaders filtered = input;
 			for (int i = 0; i < filters.size(); i++) {

diff --git a/...n/java/org/springframework/cloud/gateway/handler/predicate/HostRoutePredicateFactory.java b/...n/java/org/springframework/cloud/gateway/handler/predicate/HostRoutePredicateFactory.java
@@ -70,8 +70,7 @@ public boolean test(ServerWebExchange exchange) {
 				}
 
 				if (match != null) {
-					Map<String, String> variables = pathMatcher
-							.extractUriTemplateVariables(match, host);
+					Map<String, String> variables = pathMatcher.extractUriTemplateVariables(match, host);
 					ServerWebExchangeUtils.putUriTemplateVariables(exchange, variables);
 					return true;
 				}

diff --git a/...r/src/test/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilterTests.java b/...r/src/test/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilterTests.java
@@ -49,11 +49,9 @@ public class WebsocketRoutingFilterTests {
 	@Test
 	@SuppressWarnings("unchecked")
 	public void testProtocolParsing() {
-		ObjectProvider<List<HttpHeadersFilter>> headersFilters = mock(
-				ObjectProvider.class);
-		WebsocketRoutingFilter filter = new WebsocketRoutingFilter(
-				mock(WebSocketClient.class), mock(WebSocketService.class),
-				headersFilters);
+		ObjectProvider<List<HttpHeadersFilter>> headersFilters = mock(ObjectProvider.class);
+		WebsocketRoutingFilter filter = new WebsocketRoutingFilter(mock(WebSocketClient.class),
+				mock(WebSocketService.class), headersFilters);
 
 		HttpHeaders headers = new HttpHeaders();
 		headers.put(SEC_WEBSOCKET_PROTOCOL, Arrays.asList(" p1,p2", "p3 , p4 "));

diff --git a/...ringframework/cloud/gateway/filter/factory/RetryGatewayFilterFactoryIntegrationTests.java b/...ringframework/cloud/gateway/filter/factory/RetryGatewayFilterFactoryIntegrationTests.java
@@ -185,9 +185,8 @@ public void retryFilterLoadBalancedWithMultipleServers() {
 
 	@Test
 	public void retryFilterSeries() {
-		testClient.get().uri("/retry?key=series&failStatus=404")
-				.header(HttpHeaders.HOST, "www.retryseries.org").exchange().expectStatus()
-				.isOk().expectBody(String.class).isEqualTo("3");
+		testClient.get().uri("/retry?key=series&failStatus=404").header(HttpHeaders.HOST, "www.retryseries.org")
+				.exchange().expectStatus().isOk().expectBody(String.class).isEqualTo("3");
 	}
 
 	@Test
@@ -262,8 +261,7 @@ public ResponseEntity<String> retry(@RequestParam("key") String key,
 				if (failStatus != null) {
 					httpStatus = HttpStatus.resolve(failStatus);
 				}
-				return ResponseEntity.status(httpStatus).header("X-Retry-Count", body)
-						.body("temporarily broken");
+				return ResponseEntity.status(httpStatus).header("X-Retry-Count", body).body("temporarily broken");
 			}
 			return ResponseEntity.status(HttpStatus.OK).header("X-Retry-Count", body).body(body);
 		}
@@ -277,14 +275,13 @@ public RouteLocator hystrixRouteLocator(RouteLocatorBuilder builder) {
 			return builder.routes().route("retry_java",
 					r -> r.host("**.retryjava.org")
 							.filters(f -> f.prefixPath("/httpbin")
-									.retry(config -> config.setRetries(2)
-											.setMethods(HttpMethod.POST, HttpMethod.GET)))
-							.uri(uri))
-					.route("retry_series", r -> r.host("**.retryseries.org")
-							.filters(f -> f.prefixPath("/httpbin")
-									.retry(config -> config.setRetries(2)
-											.setSeries(HttpStatus.Series.CLIENT_ERROR)))
+									.retry(config -> config.setRetries(2).setMethods(HttpMethod.POST, HttpMethod.GET)))
 							.uri(uri))
+					.route("retry_series",
+							r -> r.host("**.retryseries.org")
+									.filters(f -> f.prefixPath("/httpbin").retry(
+											config -> config.setRetries(2).setSeries(HttpStatus.Series.CLIENT_ERROR)))
+									.uri(uri))
 					.route("retry_only_get",
 							r -> r.host("**.retry-only-get.org")
 									.filters(f -> f.prefixPath("/httpbin")