From c14a749e840d5f5f3e9236dee1e17a5ae4688c78 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 24 Jun 2019 13:30:19 -0400 Subject: [PATCH 1/2] Fixes scm url --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f3e7fafc..8105f92c 100644 --- a/pom.xml +++ b/pom.xml @@ -19,12 +19,12 @@ - https://github.com/spring-cloud-incubator/spring-cloud-gateway + https://github.com/spring-cloud/spring-cloud-gateway - scm:git:git://github.com/spring-cloud-incubator/spring-cloud-gateway.git + scm:git:git://github.com/spring-cloud/spring-cloud-gateway.git - scm:git:ssh://git@github.com/spring-cloud-incubator/spring-cloud-gateway.git + scm:git:ssh://git@github.com/spring-cloud/spring-cloud-gateway.git HEAD From 7471a41fdee0f955ae5c629aea60af96cf0d55c3 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 3 Jul 2019 13:41:55 -0400 Subject: [PATCH 2/2] Renames httpClient bean to gatewayHttpClient. fixes gh-1134 --- .../cloud/gateway/config/GatewayAutoConfiguration.java | 2 +- .../cloud/gateway/config/GatewayAutoConfigurationTests.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java index e848a5fd..15423c35 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java @@ -516,7 +516,7 @@ public class GatewayAutoConfiguration { @Bean @ConditionalOnMissingBean - public HttpClient httpClient(HttpClientProperties properties) { + public HttpClient gatewayHttpClient(HttpClientProperties properties) { // configure pool resources HttpClientProperties.Pool pool = properties.getPool(); diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/config/GatewayAutoConfigurationTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/config/GatewayAutoConfigurationTests.java index 9df89ac2..e33c70d4 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/config/GatewayAutoConfigurationTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/config/GatewayAutoConfigurationTests.java @@ -55,6 +55,7 @@ public class GatewayAutoConfigurationTests { GatewayAutoConfiguration.class)) .withPropertyValues("debug=true").run(context -> { assertThat(context).hasSingleBean(HttpClient.class); + assertThat(context).hasBean("gatewayHttpClient"); HttpClient httpClient = context.getBean(HttpClient.class); /* * FIXME: 2.1.0 HttpClientOptions options = httpClient.options();