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

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Spencer Gibb
2019-07-22 13:57:07 -04:00
parent 608891bbb0 19494b2c7d
commit fde48889bf
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/ForwardRoutingFilter.java
View File

@@ -29,7 +29,6 @@ import org.springframework.web.server.ServerWebExchange;
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR;
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.isAlreadyRouted;
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.setAlreadyRouted;
public class ForwardRoutingFilter implements GlobalFilter, Ordered {
@@ -66,7 +65,6 @@ public class ForwardRoutingFilter implements GlobalFilter, Ordered {
if (isAlreadyRouted(exchange) || !"forward".equals(scheme)) {
return chain.filter(exchange);
}
setAlreadyRouted(exchange);
// TODO: translate url?

5
spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/ForwardRoutingFilterTests.java
View File

@@ -94,8 +94,7 @@ public class ForwardRoutingFilterTests {
verifyNoMoreInteractions(chain);
verify(dispatcherHandler).handle(exchange);
assertThat(exchange.getAttributes().get(GATEWAY_ALREADY_ROUTED_ATTR))
.isEqualTo(true);
assertThat(exchange.getAttributes().get(GATEWAY_ALREADY_ROUTED_ATTR)).isNull();
}
@Test
@@ -112,6 +111,8 @@ public class ForwardRoutingFilterTests {
verify(dispatcherHandler).handle(captor.capture());
assertThat(exchange.getAttributes().get(GATEWAY_ALREADY_ROUTED_ATTR)).isNull();
ServerWebExchange webExchange = captor.getValue();
URI forwardedUrl = webExchange.getRequiredAttribute(GATEWAY_REQUEST_URL_ATTR);