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

Fix compilation errors due to changes in commons

Browse Source
This commit is contained in:
Ryan Baxter
2018-02-02 07:47:57 -05:00
parent 24dfd4ae76
commit 07411bba40
5 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/ApacheHttpClientConfigurationTests.java
View File

@@ -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() {

9
spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/test/OkHttpClientConfigurationTests.java
View File

@@ -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() {

8
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/CustomHostRoutingFilterTests.java
View File

@@ -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);
}
}
}

3
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilterTests.java
View File

@@ -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(); }

10
spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/test/ZuulApacheHttpClientConfigurationTests.java
View File

@@ -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);
}
}
}