diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java index e1e9ce50..8fcf1288 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilter.java @@ -123,11 +123,9 @@ public class WebsocketRoutingFilter implements GlobalFilter, Ordered { HttpHeaders filtered = new HttpHeaders(); filtered.addAll(headers); filtered.remove(HttpHeaders.HOST); - boolean preserveHost = exchange - .getAttributeOrDefault(PRESERVE_HOST_HEADER_ATTRIBUTE, false); + boolean preserveHost = exchange.getAttributeOrDefault(PRESERVE_HOST_HEADER_ATTRIBUTE, false); if (preserveHost) { - String host = exchange.getRequest().getHeaders() - .getFirst(HttpHeaders.HOST); + String host = exchange.getRequest().getHeaders().getFirst(HttpHeaders.HOST); filtered.add(HttpHeaders.HOST, host); } return filtered; diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilterTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilterTests.java index 08ff7c0c..0fef8dac 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilterTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/WebsocketRoutingFilterTests.java @@ -77,21 +77,17 @@ public class WebsocketRoutingFilterTests { @SuppressWarnings("unchecked") private void assertDefaultHeadersFilters(boolean preserveHostHeader) { - ObjectProvider> headersFilters = mock( - ObjectProvider.class); + ObjectProvider> headersFilters = mock(ObjectProvider.class); when(headersFilters.getIfAvailable(any())).thenReturn(new ArrayList<>()); - WebsocketRoutingFilter filter = new WebsocketRoutingFilter( - mock(WebSocketClient.class), mock(WebSocketService.class), - headersFilters); + WebsocketRoutingFilter filter = new WebsocketRoutingFilter(mock(WebSocketClient.class), + mock(WebSocketService.class), headersFilters); List filters = filter.getHeadersFilters(); - MockServerHttpRequest request = MockServerHttpRequest.get("ws://not-matters-that") - .header(HOST, "MyHost").header("Sec-Websocket-Something", "someval") - .header("x-foo", "bar").build(); + MockServerHttpRequest request = MockServerHttpRequest.get("ws://not-matters-that").header(HOST, "MyHost") + .header("Sec-Websocket-Something", "someval").header("x-foo", "bar").build(); MockServerWebExchange exchange = MockServerWebExchange.from(request); exchange.getAttributes().put(PRESERVE_HOST_HEADER_ATTRIBUTE, preserveHostHeader); HttpHeaders httpHeaders = HttpHeadersFilter.filterRequest(filters, exchange); - assertThat(httpHeaders).doesNotContainKeys("Sec-Websocket-Something") - .containsKey("x-foo"); + assertThat(httpHeaders).doesNotContainKeys("Sec-Websocket-Something").containsKey("x-foo"); if (preserveHostHeader) { assertThat(httpHeaders).containsKey(HOST); }