Merge branch '2.0.x'

spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteDefinitionLocator.java

@@ -19,6 +19,7 @@ package org.springframework.cloud.gateway.discovery;
 
 import java.net.URI;
 import java.util.Map;
+import java.util.function.Predicate;
 
 import reactor.core.publisher.Flux;
 
@@ -35,7 +36,6 @@ import org.springframework.expression.spel.support.SimpleEvaluationContext;
 import org.springframework.util.StringUtils;
 
 /**
- * TODO: developer configuration, in zuul, this was opt out, should be opt in
  * TODO: change to RouteLocator? use java dsl
  * @author Spencer Gibb
  */
@@ -44,6 +44,7 @@ public class DiscoveryClientRouteDefinitionLocator implements RouteDefinitionLoc
 	private final DiscoveryClient discoveryClient;
 	private final DiscoveryLocatorProperties properties;
 	private final String routeIdPrefix;
+	private final SimpleEvaluationContext evalCtxt;
 
 	public DiscoveryClientRouteDefinitionLocator(DiscoveryClient discoveryClient, DiscoveryLocatorProperties properties) {
 		this.discoveryClient = discoveryClient;
@@ -53,30 +54,37 @@ public class DiscoveryClientRouteDefinitionLocator implements RouteDefinitionLoc
 		} else {
 			this.routeIdPrefix = this.discoveryClient.getClass().getSimpleName() + "_";
 		}
+		evalCtxt = SimpleEvaluationContext
+				.forReadOnlyDataBinding()
+				.withInstanceMethods()
+				.build();
 	}
 
 	@Override
 	public Flux<RouteDefinition> getRouteDefinitions() {
-		SimpleEvaluationContext evalCtxt = SimpleEvaluationContext
-				.forReadOnlyDataBinding()
-				.withInstanceMethods()
-				.build();
 
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression includeExpr = parser.parseExpression(properties.getIncludeExpression());
 		Expression urlExpr = parser.parseExpression(properties.getUrlExpression());
 
+		Predicate<ServiceInstance> includePredicate;
+		if (properties.getIncludeExpression() == null || "true".equalsIgnoreCase(properties.getIncludeExpression())) {
+			includePredicate = instance -> true;
+		} else {
+			includePredicate = instance -> {
+				Boolean include = includeExpr.getValue(evalCtxt, instance, Boolean.class);
+				if (include == null) {
+					return false;
+				}
+				return include;
+			};
+		}
+
 		return Flux.fromIterable(discoveryClient.getServices())
 				.map(discoveryClient::getInstances)
 				.filter(instances -> !instances.isEmpty())
 				.map(instances -> instances.get(0))
-				.filter(instance -> {
-					Boolean include = includeExpr.getValue(evalCtxt, instance, Boolean.class);
-					if (include == null) {
-						return false;
-					}
-					return include;
-				})
+				.filter(includePredicate)
 				.map(instance -> {
 					String serviceId = instance.getServiceId();
 

spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/NettyRoutingFilter.java

@@ -151,7 +151,7 @@ public class NettyRoutingFilter implements GlobalFilter, Ordered {
 				});
 
 		if (properties.getResponseTimeout() != null) {
-			responseFlux.timeout(properties.getResponseTimeout(),
+			responseFlux = responseFlux.timeout(properties.getResponseTimeout(),
 					Mono.error(new TimeoutException("Response took longer than timeout: " +
 							properties.getResponseTimeout())));
 		}

spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/NettyRoutingFilterIntegrationTests.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2013-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.springframework.cloud.gateway.filter;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.gateway.test.BaseWebClientTests;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(properties = "spring.cloud.gateway.httpclient.response-timeout=3s", webEnvironment = RANDOM_PORT)
+@DirtiesContext
+@SuppressWarnings("unchecked")
+public class NettyRoutingFilterIntegrationTests extends BaseWebClientTests {
+
+	@Test
+	public void responseTimeoutWorks() {
+		testClient.get()
+				.uri("/delay/5")
+				.exchange()
+				.expectStatus().is5xxServerError()
+				.expectBody(Map.class)
+				.consumeWith(result -> {
+					Map body = result.getResponseBody();
+					assertThat(body).containsEntry("message", "Response took longer than timeout: PT3S");
+				});
+	}
+
+	@EnableAutoConfiguration
+	@SpringBootConfiguration
+	@Import(DefaultTestConfig.class)
+	public static class TestConfig {
+	}
+
+}