From 07411bba40a2caf06b864116fbaf524fb4299820 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 2 Feb 2018 07:47:57 -0500 Subject: [PATCH] Fix compilation errors due to changes in commons --- .../test/ApacheHttpClientConfigurationTests.java | 10 +++++++--- .../netflix/test/OkHttpClientConfigurationTests.java | 9 ++++++--- .../zuul/filters/CustomHostRoutingFilterTests.java | 8 ++++++-- .../filters/route/SimpleHostRoutingFilterTests.java | 3 ++- .../test/ZuulApacheHttpClientConfigurationTests.java | 10 +++++++--- 5 files changed, 28 insertions(+), 12 deletions(-) diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/ApacheHttpClientConfigurationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/ApacheHttpClientConfigurationTests.java index f2e4f335..c84aa21b 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/ApacheHttpClientConfigurationTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/ApacheHttpClientConfigurationTests.java @@ -120,6 +120,10 @@ public class ApacheHttpClientConfigurationTests { } static class MyApacheHttpClientFactory extends DefaultApacheHttpClientFactory { + public MyApacheHttpClientFactory(HttpClientBuilder builder) { + super(builder); + } + @Override public HttpClientBuilder createBuilder() { CloseableHttpClient client = mock(CloseableHttpClient.class); @@ -144,9 +148,9 @@ public class ApacheHttpClientConfigurationTests { static class MyConfig { @Bean - public ApacheHttpClientFactory apacheHttpClientFactory() { - return new MyApacheHttpClientFactory(); - } + public ApacheHttpClientFactory apacheHttpClientFactory(HttpClientBuilder builder) { + return new MyApacheHttpClientFactory(builder); + } @Bean public ApacheHttpClientConnectionManagerFactory connectionManagerFactory() { diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/OkHttpClientConfigurationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/OkHttpClientConfigurationTests.java index 912eb9b5..49a47d4d 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/OkHttpClientConfigurationTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/OkHttpClientConfigurationTests.java @@ -103,6 +103,9 @@ public class OkHttpClientConfigurationTests { } static class MyOkHttpClientFactory extends DefaultOkHttpClientFactory { + public MyOkHttpClientFactory(OkHttpClient.Builder builder) { + super(builder); + } } @Bean @@ -111,9 +114,9 @@ public class OkHttpClientConfigurationTests { } @Bean - public OkHttpClientFactory clientFactory() { - return new MyOkHttpClientFactory(); - } + public OkHttpClientFactory clientFactory(OkHttpClient.Builder builder) { + return new MyOkHttpClientFactory(builder); + } @Bean public OkHttpClient client() { diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/CustomHostRoutingFilterTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/CustomHostRoutingFilterTests.java index 17246191..d7a8250d 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/CustomHostRoutingFilterTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/CustomHostRoutingFilterTests.java @@ -24,6 +24,7 @@ import org.apache.http.client.config.CookieSpecs; import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.client.BasicCookieStore; import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClients; import org.junit.After; import org.junit.Before; @@ -216,8 +217,8 @@ class SampleCustomZuulProxyApplication { protected static class CustomZuulProxyConfig { @Bean - public ApacheHttpClientFactory customHttpClientFactory() { - return new CustomApacheHttpClientFactory(); + public ApacheHttpClientFactory customHttpClientFactory(HttpClientBuilder builder) { + return new CustomApacheHttpClientFactory(builder); } @Bean @@ -250,6 +251,9 @@ class SampleCustomZuulProxyApplication { private class CustomApacheHttpClientFactory extends DefaultApacheHttpClientFactory { + public CustomApacheHttpClientFactory(HttpClientBuilder builder) { + super(builder); + } } } diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilterTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilterTests.java index 5666903b..339c622a 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilterTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilterTests.java @@ -42,6 +42,7 @@ import org.apache.http.client.methods.Configurable; import org.apache.http.client.methods.HttpPatch; import org.apache.http.entity.InputStreamEntity; import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.assertj.core.api.Assertions; import org.junit.After; @@ -338,7 +339,7 @@ public class SimpleHostRoutingFilterTests { } @Bean - ApacheHttpClientFactory clientFactory() {return new DefaultApacheHttpClientFactory(); } + ApacheHttpClientFactory clientFactory() {return new DefaultApacheHttpClientFactory(HttpClientBuilder.create()); } @Bean ApacheHttpClientConnectionManagerFactory connectionManagerFactory() { return new DefaultApacheHttpClientConnectionManagerFactory(); } diff --git a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/ZuulApacheHttpClientConfigurationTests.java b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/ZuulApacheHttpClientConfigurationTests.java index c12ef692..9f477ebe 100644 --- a/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/ZuulApacheHttpClientConfigurationTests.java +++ b/spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/ZuulApacheHttpClientConfigurationTests.java @@ -104,6 +104,10 @@ public class ZuulApacheHttpClientConfigurationTests { static class TestConfig { static class MyApacheHttpClientFactory extends DefaultApacheHttpClientFactory { + public MyApacheHttpClientFactory(HttpClientBuilder builder) { + super(builder); + } + @Override public HttpClientBuilder createBuilder() { CloseableHttpClient client = mock(CloseableHttpClient.class); @@ -125,9 +129,9 @@ public class ZuulApacheHttpClientConfigurationTests { } @Bean - public ApacheHttpClientFactory apacheHttpClientFactory() { - return new MyApacheHttpClientFactory(); - } + public ApacheHttpClientFactory apacheHttpClientFactory(HttpClientBuilder builder) { + return new MyApacheHttpClientFactory(builder); + } } }