Move zuul to its own module. (#2332)

fixes gh-2298

pom.xml

@@ -132,6 +132,7 @@
 		<module>spring-cloud-netflix-turbine</module>
 		<module>spring-cloud-netflix-turbine-stream</module>
 		<module>spring-cloud-netflix-sidecar</module>
+		<module>spring-cloud-netflix-zuul</module>
 		<module>spring-cloud-starter-netflix</module>
 		<module>docs</module>
 	</modules>

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpRequest.java

@@ -26,7 +26,7 @@ import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.methods.RequestBuilder;
 import org.apache.http.entity.BasicHttpEntity;
 import org.springframework.cloud.netflix.ribbon.support.ContextAwareRequest;
-import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
 
 /**
  * @author Christian Lohmann

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonRequest.java

@@ -16,15 +16,15 @@
 
 package org.springframework.cloud.netflix.ribbon.okhttp;
 
-import static org.springframework.cloud.netflix.ribbon.support.RibbonRequestCustomizer.Runner.customize;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.util.List;
 
 import org.springframework.cloud.netflix.ribbon.support.ContextAwareRequest;
-import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
+
+import static org.springframework.cloud.netflix.ribbon.support.RibbonRequestCustomizer.Runner.customize;
 
 import okhttp3.Headers;
 import okhttp3.HttpUrl;

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/support/ContextAwareRequest.java

@@ -17,14 +17,14 @@
 
 package org.springframework.cloud.netflix.ribbon.support;
 
-import com.netflix.client.ClientRequest;
+import java.net.URI;
+
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpRequest;
-import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
 import org.springframework.util.MultiValueMap;
 
-import java.net.URI;
+import com.netflix.client.ClientRequest;
 
 /**
  * @author Spencer Gibb

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/support/ResettableServletInputStreamWrapper.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.netflix.zuul.filters.support;
+package org.springframework.cloud.netflix.ribbon.support;
 
 import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/support/RibbonCommandContext.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2017 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
+ *     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,
@@ -14,10 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.netflix.zuul.filters.route;
+package org.springframework.cloud.netflix.ribbon.support;
 
-import org.springframework.cloud.netflix.ribbon.support.RibbonRequestCustomizer;
-import org.springframework.cloud.netflix.zuul.filters.support.ResettableServletInputStreamWrapper;
 import org.springframework.util.Assert;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.ReflectionUtils;
@@ -129,7 +127,7 @@ public class RibbonCommandContext {
 
 	public InputStream getRequestEntity() {
 		if (requestEntity == null) {
-			return requestEntity;
+			return null;
 		}
 
 		try {

spring-cloud-netflix-core/src/main/resources/META-INF/spring.factories

@@ -5,9 +5,7 @@ org.springframework.cloud.netflix.feign.encoding.FeignAcceptGzipEncodingAutoConf
 org.springframework.cloud.netflix.feign.encoding.FeignContentGzipEncodingAutoConfiguration,\
 org.springframework.cloud.netflix.hystrix.HystrixAutoConfiguration,\
 org.springframework.cloud.netflix.hystrix.security.HystrixSecurityAutoConfiguration,\
-org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration,\
-org.springframework.cloud.netflix.zuul.ZuulServerAutoConfiguration,\
-org.springframework.cloud.netflix.zuul.ZuulProxyAutoConfiguration
+org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration
 
 org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker=\
 org.springframework.cloud.netflix.hystrix.HystrixCircuitBreakerConfiguration

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/AdhocTestSuite.java

@@ -21,17 +21,13 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import org.springframework.cloud.netflix.zuul.filters.route.support.RibbonCommandCauseFallbackPropagationTest;
-import org.springframework.cloud.netflix.zuul.filters.route.support.RibbonCommandHystrixThreadPoolKeyTests;
-
 /**
  * A test suite for probing weird ordering problems in the tests.
  *
  * @author Dave Syer
  */
 @RunWith(Suite.class)
-@SuiteClasses({ RibbonCommandHystrixThreadPoolKeyTests.class,
-		RibbonCommandCauseFallbackPropagationTest.class })
+@SuiteClasses({})
 @Ignore
 public class AdhocTestSuite {
 

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpRequestTests.java

@@ -39,8 +39,8 @@ import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.methods.RequestBuilder;
 import org.junit.Test;
 import org.springframework.cloud.netflix.feign.encoding.HttpEncoding;
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
 import org.springframework.cloud.netflix.ribbon.support.RibbonRequestCustomizer;
-import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.StreamUtils;
 

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonRequestTests.java

@@ -17,24 +17,23 @@
 
 package org.springframework.cloud.netflix.ribbon.okhttp;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.startsWith;
-import static org.junit.Assert.assertThat;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 
 import org.junit.Test;
-import org.springframework.cloud.netflix.feign.encoding.HttpEncoding;
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
 import org.springframework.cloud.netflix.ribbon.support.RibbonRequestCustomizer;
-import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
 import org.springframework.util.LinkedMultiValueMap;
 
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.startsWith;
+import static org.junit.Assert.assertThat;
+
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okio.Buffer;

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/support/ContextAwareRequestTests.java

@@ -22,10 +22,10 @@ package org.springframework.cloud.netflix.ribbon.support;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.util.LinkedMultiValueMap;

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/support/RibbonCommandContextTest.java

@@ -1,21 +1,38 @@
-package org.springframework.cloud.netflix.zuul.filters.route;
+/*
+ * Copyright 2013-2017 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.
+ */
 
-import com.google.common.collect.Lists;
-import okhttp3.Request;
-import org.junit.Test;
-import org.springframework.cloud.netflix.ribbon.support.RibbonRequestCustomizer;
-import org.springframework.cloud.netflix.zuul.filters.support.ResettableServletInputStreamWrapper;
-import org.springframework.http.HttpMethod;
-import org.springframework.util.LinkedMultiValueMap;
+package org.springframework.cloud.netflix.ribbon.support;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.junit.Test;
+import org.springframework.http.HttpMethod;
+import org.springframework.util.LinkedMultiValueMap;
+
+import com.google.common.collect.Lists;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
+import okhttp3.Request;
+
+
 /**
  * @author Andre Dörnbrack
  */

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

@@ -17,13 +17,10 @@
 
 package org.springframework.cloud.netflix.test;
 
-import feign.Client;
-import feign.httpclient.ApacheHttpClient;
-
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
+
 import org.apache.http.Header;
 import org.apache.http.StatusLine;
 import org.apache.http.client.HttpClient;
@@ -35,11 +32,12 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.message.BasicHeader;
-import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockingDetails;
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
@@ -49,33 +47,28 @@ import org.springframework.cloud.commons.httpclient.DefaultApacheHttpClientFacto
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.cloud.netflix.feign.ribbon.LoadBalancerFeignClient;
-import org.springframework.cloud.netflix.ribbon.apache.RibbonLoadBalancingHttpClient;
-import org.springframework.cloud.netflix.ribbon.support.RibbonRequestCustomizer;
-import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
-import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
-import org.springframework.cloud.netflix.zuul.filters.route.SimpleHostRoutingFilter;
-import org.springframework.cloud.netflix.zuul.filters.route.apache.HttpClientRibbonCommand;
-import org.springframework.cloud.netflix.zuul.filters.route.apache.HttpClientRibbonCommandFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.ReflectionUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockingDetails;
 
+import feign.Client;
+import feign.httpclient.ApacheHttpClient;
+
 /**
  * @author Ryan Baxter
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = ApacheHttpClientConfigurationTestApp.class, value = {"feign.okhttp.enabled: false",
+@SpringBootTest(properties =
+		{"feign.okhttp.enabled: false",
 		"ribbon.eureka.enabled = false"})
 @DirtiesContext
 public class ApacheHttpClientConfigurationTests {
@@ -86,28 +79,15 @@ public class ApacheHttpClientConfigurationTests {
 	@Autowired
 	ApacheHttpClientFactory httpClientFactory;
 
-	@Autowired
-	SimpleHostRoutingFilter simpleHostRoutingFilter;
-
 	@Autowired
 	LoadBalancerFeignClient feignClient;
 
-	@Autowired
-	HttpClientRibbonCommandFactory httpClientRibbonCommandFactory;
-
 	@Test
 	public void testFactories() {
-		Assertions.assertThat(connectionManagerFactory).isInstanceOf(ApacheHttpClientConnectionManagerFactory.class);
-		Assertions.assertThat(connectionManagerFactory).isInstanceOf(ApacheHttpClientConfigurationTestApp.MyApacheHttpClientConnectionManagerFactory.class);
-		Assertions.assertThat(httpClientFactory).isInstanceOf(ApacheHttpClientFactory.class);
-		Assertions.assertThat(httpClientFactory).isInstanceOf(ApacheHttpClientConfigurationTestApp.MyApacheHttpClientFactory.class);
-	}
-
-	@Test
-	public void testHttpClientSimpleHostRoutingFilter() {
-		CloseableHttpClient httpClient = getField(simpleHostRoutingFilter, "httpClient");
-		MockingDetails httpClientDetails = mockingDetails(httpClient);
-		assertTrue(httpClientDetails.isMock());
+		assertThat(connectionManagerFactory).isInstanceOf(ApacheHttpClientConnectionManagerFactory.class);
+		assertThat(connectionManagerFactory).isInstanceOf(ApacheHttpClientConfigurationTestApp.MyApacheHttpClientConnectionManagerFactory.class);
+		assertThat(httpClientFactory).isInstanceOf(ApacheHttpClientFactory.class);
+		assertThat(httpClientFactory).isInstanceOf(ApacheHttpClientConfigurationTestApp.MyApacheHttpClientFactory.class);
 	}
 
 	@Test
@@ -120,83 +100,64 @@ public class ApacheHttpClientConfigurationTests {
 		assertTrue(httpClientDetails.isMock());
 	}
 
-	@Test
-	public void testRibbonLoadBalancingHttpClient() {
-		RibbonCommandContext context = new RibbonCommandContext("foo"," GET", "http://localhost",
-				false, new LinkedMultiValueMap<String, String>(), new LinkedMultiValueMap<String, String>(),
-				null, new ArrayList<RibbonRequestCustomizer>(), 0l);
-		HttpClientRibbonCommand command = httpClientRibbonCommandFactory.create(context);
-		RibbonLoadBalancingHttpClient ribbonClient = command.getClient();
-		CloseableHttpClient httpClient = getField(ribbonClient, "delegate");
-		MockingDetails httpClientDetails = mockingDetails(httpClient);
-		assertTrue(httpClientDetails.isMock());
-	}
-
 	protected <T> T getField(Object target, String name) {
 		Field field = ReflectionUtils.findField(target.getClass(), name);
 		ReflectionUtils.makeAccessible(field);
 		Object value = ReflectionUtils.getField(field, target);
 		return (T)value;
 	}
-}
 
-@Configuration
-@EnableAutoConfiguration
-@RestController
-@EnableFeignClients(clients = {ApacheHttpClientConfigurationTestApp.FooClient.class})
-@EnableZuulProxy
-class ApacheHttpClientConfigurationTestApp {
+	@SpringBootConfiguration
+	@EnableAutoConfiguration
+	@EnableFeignClients(clients = {ApacheHttpClientConfigurationTestApp.FooClient.class})
+	static class ApacheHttpClientConfigurationTestApp {
 
-	@RequestMapping
-	public String index() {
-		return "hello";
-	}
-
-	static class MyApacheHttpClientConnectionManagerFactory extends DefaultApacheHttpClientConnectionManagerFactory {
-		@Override
-		public HttpClientConnectionManager newConnectionManager(boolean disableSslValidation, int maxTotalConnections, int maxConnectionsPerRoute, long timeToLive, TimeUnit timeUnit, RegistryBuilder registry) {
-			return mock(PoolingHttpClientConnectionManager.class);
-		}
-	}
-
-	static class MyApacheHttpClientFactory extends DefaultApacheHttpClientFactory {
-		@Override
-		public HttpClientBuilder createBuilder() {
-			CloseableHttpClient client =  mock(CloseableHttpClient.class);
-			CloseableHttpResponse response = mock(CloseableHttpResponse.class);
-			StatusLine statusLine = mock(StatusLine.class);
-			doReturn(200).when(statusLine).getStatusCode();
-			doReturn(statusLine).when(response).getStatusLine();
-			Header[] headers = new BasicHeader[0];
-			doReturn(headers).when(response).getAllHeaders();
-			try {
-				doReturn(response).when(client).execute(any(HttpUriRequest.class));
-			} catch (IOException e) {
-				e.printStackTrace();
+		static class MyApacheHttpClientConnectionManagerFactory extends DefaultApacheHttpClientConnectionManagerFactory {
+			@Override
+			public HttpClientConnectionManager newConnectionManager(boolean disableSslValidation, int maxTotalConnections, int maxConnectionsPerRoute, long timeToLive, TimeUnit timeUnit, RegistryBuilder registry) {
+				return mock(PoolingHttpClientConnectionManager.class);
 			}
-			HttpClientBuilder builder = mock(HttpClientBuilder.class);
-			doReturn(client).when(builder).build();
-			return builder;
 		}
+
+		static class MyApacheHttpClientFactory extends DefaultApacheHttpClientFactory {
+			@Override
+			public HttpClientBuilder createBuilder() {
+				CloseableHttpClient client =  mock(CloseableHttpClient.class);
+				CloseableHttpResponse response = mock(CloseableHttpResponse.class);
+				StatusLine statusLine = mock(StatusLine.class);
+				doReturn(200).when(statusLine).getStatusCode();
+				Mockito.doReturn(statusLine).when(response).getStatusLine();
+				Header[] headers = new BasicHeader[0];
+				doReturn(headers).when(response).getAllHeaders();
+				try {
+					Mockito.doReturn(response).when(client).execute(any(HttpUriRequest.class));
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+				HttpClientBuilder builder = mock(HttpClientBuilder.class);
+				Mockito.doReturn(client).when(builder).build();
+				return builder;
+			}
+		}
+
+		@Configuration
+		static class MyConfig {
+
+			@Bean
+			public ApacheHttpClientFactory apacheHttpClientFactory() {
+																		   return new MyApacheHttpClientFactory();
+																												  }
+
+			@Bean
+			public ApacheHttpClientConnectionManagerFactory connectionManagerFactory() {
+				return new MyApacheHttpClientConnectionManagerFactory();
+			}
+
+		}
+
+		@FeignClient(name="foo", serviceId = "foo")
+		interface FooClient {}
 	}
 
-	@Configuration
-	static class MyConfig {
-
-		@Bean
-		public ApacheHttpClientFactory apacheHttpClientFactory() {
-			return new MyApacheHttpClientFactory();
-		}
-
-		@Bean
-		public ApacheHttpClientConnectionManagerFactory connectionManagerFactory() {
-			return new MyApacheHttpClientConnectionManagerFactory();
-		}
-
-	}
-
-	@FeignClient(name="foo", serviceId = "foo")
-	static interface FooClient {}
 }
 
-

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

@@ -17,14 +17,14 @@
 
 package org.springframework.cloud.netflix.test;
 
-import feign.Client;
-import okhttp3.ConnectionPool;
-import okhttp3.OkHttpClient;
-import org.assertj.core.api.Assertions;
+import java.lang.reflect.Field;
+import java.util.concurrent.TimeUnit;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockingDetails;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.commons.httpclient.DefaultOkHttpClientConnectionPoolFactory;
@@ -33,34 +33,25 @@ import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFa
 import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.cloud.netflix.feign.ribbon.LoadBalancerFeignClient;
-import org.springframework.cloud.netflix.ribbon.okhttp.OkHttpLoadBalancingClient;
-import org.springframework.cloud.netflix.ribbon.support.RibbonRequestCustomizer;
-import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
-import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
-import org.springframework.cloud.netflix.zuul.filters.route.okhttp.OkHttpRibbonCommand;
-import org.springframework.cloud.netflix.zuul.filters.route.okhttp.OkHttpRibbonCommandFactory;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.ReflectionUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockingDetails;
 
+import feign.Client;
+import okhttp3.ConnectionPool;
+import okhttp3.OkHttpClient;
+
 /**
  * @author Ryan Baxter
  */
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = OkHttpClientConfigurationTestApp.class, value = {"feign.okhttp.enabled: true",
+@SpringBootTest(properties = {"feign.okhttp.enabled: true",
 		"spring.cloud.httpclientfactories.ok.enabled: true", "ribbon.eureka.enabled = false", "ribbon.okhttp.enabled: true",
 		"feign.okhttp.enabled: true", "ribbon.httpclient.enabled: false", "feign.httpclient.enabled: false"})
 @DirtiesContext
@@ -75,15 +66,12 @@ public class OkHttpClientConfigurationTests {
 	@Autowired
 	LoadBalancerFeignClient feignClient;
 
-	@Autowired
-	OkHttpRibbonCommandFactory okHttpRibbonCommandFactory;
-
 	@Test
 	public void testFactories() {
-		Assertions.assertThat(connectionPoolFactory).isInstanceOf(OkHttpClientConnectionPoolFactory.class);
-		Assertions.assertThat(connectionPoolFactory).isInstanceOf(OkHttpClientConfigurationTestApp.MyOkHttpClientConnectionPoolFactory.class);
-		Assertions.assertThat(okHttpClientFactory).isInstanceOf(OkHttpClientFactory.class);
-		Assertions.assertThat(okHttpClientFactory).isInstanceOf(OkHttpClientConfigurationTestApp.MyOkHttpClientFactory.class);
+		assertThat(connectionPoolFactory).isInstanceOf(OkHttpClientConnectionPoolFactory.class);
+		assertThat(connectionPoolFactory).isInstanceOf(TestConfig.MyOkHttpClientConnectionPoolFactory.class);
+		assertThat(okHttpClientFactory).isInstanceOf(OkHttpClientFactory.class);
+		assertThat(okHttpClientFactory).isInstanceOf(TestConfig.MyOkHttpClientFactory.class);
 	}
 
 	@Test
@@ -96,49 +84,27 @@ public class OkHttpClientConfigurationTests {
 		assertTrue(httpClientDetails.isMock());
 	}
 
-	@Test
-	public void testOkHttpLoadBalancingHttpClient() {
-		RibbonCommandContext context = new RibbonCommandContext("foo"," GET", "http://localhost",
-				false, new LinkedMultiValueMap<String, String>(), new LinkedMultiValueMap<String, String>(),
-				null, new ArrayList<RibbonRequestCustomizer>(), 0l);
-		OkHttpRibbonCommand command = okHttpRibbonCommandFactory.create(context);
-		OkHttpLoadBalancingClient ribbonClient = command.getClient();
-		OkHttpClient httpClient = getField(ribbonClient, "delegate");
-		MockingDetails httpClientDetails = mockingDetails(httpClient);
-		assertTrue(httpClientDetails.isMock());
-	}
-
 	protected <T> T getField(Object target, String name) {
 		Field field = ReflectionUtils.findField(target.getClass(), name);
 		ReflectionUtils.makeAccessible(field);
 		Object value = ReflectionUtils.getField(field, target);
 		return (T)value;
 	}
-}
 
-@Configuration
-@EnableAutoConfiguration
-@RestController
-@EnableZuulProxy
-class OkHttpClientConfigurationTestApp {
+	@SpringBootConfiguration
+	@EnableAutoConfiguration
+	static class TestConfig {
 
-	@RequestMapping
-	public String index() {
-		return "hello";
-	}
-
-	static class MyOkHttpClientConnectionPoolFactory extends DefaultOkHttpClientConnectionPoolFactory {
-		@Override
-		public ConnectionPool create(int maxIdleConnections, long keepAliveDuration, TimeUnit timeUnit) {
-			return new ConnectionPool();
+		static class MyOkHttpClientConnectionPoolFactory extends DefaultOkHttpClientConnectionPoolFactory {
+			@Override
+			public ConnectionPool create(int maxIdleConnections, long keepAliveDuration, TimeUnit timeUnit) {
+				return new ConnectionPool();
+			}
 		}
-	}
 
-	static class MyOkHttpClientFactory extends DefaultOkHttpClientFactory {
-	}
+		static class MyOkHttpClientFactory extends DefaultOkHttpClientFactory {
+		}
 
-	@Configuration
-	static class MyConfig {
 		@Bean
 		public OkHttpClientConnectionPoolFactory connectionPoolFactory() {
 			return new MyOkHttpClientConnectionPoolFactory();
@@ -146,16 +112,15 @@ class OkHttpClientConfigurationTestApp {
 
 		@Bean
 		public OkHttpClientFactory clientFactory() {
-			return new MyOkHttpClientFactory();
-		}
+												 return new MyOkHttpClientFactory();
+																					}
 
 		@Bean
 		public OkHttpClient client() {
-			return mock(OkHttpClient.class);
-		}
-
+											   return mock(OkHttpClient.class);
+																			   }
 	}
 
 	@FeignClient(name="foo", serviceId = "foo")
-	static interface FooClient {}
+	interface FooClient {}
 }

spring-cloud-netflix-core/src/test/resources/application.yml

@@ -40,16 +40,6 @@ management:
 endpoints:
   health:
     sensitive: false
-zuul:
-  #prefix: /api
-  #strip-prefix: true
-  routes:
-    test: 
-      serviceId: testclient
-      path: /testing123/**
-    stores:
-      url: http://localhost:8081
-      path: /stores/**
 hystrix:
   shareSecurityContext: true
 feignClient:

spring-cloud-netflix-dependencies/pom.xml

@@ -125,6 +125,11 @@
 				<artifactId>spring-cloud-netflix-turbine-stream</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-netflix-zuul</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.netflix.netflix-commons</groupId>
 				<artifactId>netflix-commons-util</artifactId>

spring-cloud-netflix-sidecar/pom.xml

@@ -29,6 +29,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-context</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-zuul</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>

spring-cloud-netflix-zuul/pom.xml

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>spring-cloud-netflix</artifactId>
+        <groupId>org.springframework.cloud</groupId>
+        <version>2.0.0.BUILD-SNAPSHOT</version>
+        <relativePath>..</relativePath> <!-- lookup parent from repository -->
+    </parent>
+
+
+    <artifactId>spring-cloud-netflix-zuul</artifactId>
+    <packaging>jar</packaging>
+    <name>Spring Cloud Netflix Zuul</name>
+    <description>Spring Cloud Netflix Zuul</description>
+    <properties>
+        <main.basedir>${basedir}/..</main.basedir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-netflix-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-commons</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-context</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.netflix.zuul</groupId>
+            <artifactId>zuul-core</artifactId>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <artifactId>groovy-all</artifactId>
+                    <groupId>org.codehaus.groovy</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>mockito-all</artifactId>
+                    <groupId>org.mockito</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.netflix.netflix-commons</groupId>
+            <artifactId>netflix-commons-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-test-support</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommand.java

@@ -20,6 +20,8 @@ package org.springframework.cloud.netflix.zuul.filters.route;
 import java.io.InputStream;
 import java.net.URI;
 import java.util.List;
+
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
 import org.springframework.cloud.netflix.zuul.filters.ZuulProperties;
 import org.springframework.cloud.netflix.zuul.filters.route.support.AbstractRibbonCommand;
 import org.springframework.http.HttpMethod;
@@ -40,7 +42,7 @@ import static org.springframework.cloud.netflix.ribbon.support.RibbonRequestCust
 public class RestClientRibbonCommand extends AbstractRibbonCommand<RestClient, HttpRequest, HttpResponse> {
 
 	public RestClientRibbonCommand(String commandKey, RestClient client,
-			RibbonCommandContext context, ZuulProperties zuulProperties) {
+								   RibbonCommandContext context, ZuulProperties zuulProperties) {
 		super(commandKey, client, context, zuulProperties);
 	}
 

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RestClientRibbonCommandFactory.java

@@ -21,6 +21,7 @@ import java.util.Collections;
 import java.util.Set;
 
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
 import org.springframework.cloud.netflix.zuul.filters.ZuulProperties;
 import org.springframework.cloud.netflix.zuul.filters.route.support.AbstractRibbonCommandFactory;
 

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonCommandFactory.java

@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.netflix.zuul.filters.route;
 
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
+
 /**
  * @author Spencer Gibb
  */

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java

@@ -22,10 +22,10 @@ import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
 import org.springframework.cloud.netflix.ribbon.support.RibbonRequestCustomizer;
 import org.springframework.cloud.netflix.zuul.filters.ProxyRequestHelper;
 import org.springframework.cloud.netflix.zuul.util.ZuulRuntimeException;

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/apache/HttpClientRibbonCommand.java

@@ -21,7 +21,7 @@ import org.springframework.cloud.netflix.ribbon.apache.RibbonApacheHttpRequest;
 import org.springframework.cloud.netflix.ribbon.apache.RibbonApacheHttpResponse;
 import org.springframework.cloud.netflix.ribbon.apache.RibbonLoadBalancingHttpClient;
 import org.springframework.cloud.netflix.zuul.filters.ZuulProperties;
-import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
 import org.springframework.cloud.netflix.zuul.filters.route.ZuulFallbackProvider;
 import org.springframework.cloud.netflix.zuul.filters.route.support.AbstractRibbonCommand;
 import com.netflix.client.config.IClientConfig;

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/apache/HttpClientRibbonCommandFactory.java

@@ -23,7 +23,7 @@ import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.cloud.netflix.ribbon.apache.RibbonLoadBalancingHttpClient;
 import org.springframework.cloud.netflix.zuul.filters.ZuulProperties;
 import org.springframework.cloud.netflix.zuul.filters.route.support.AbstractRibbonCommandFactory;
-import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
 import org.springframework.cloud.netflix.zuul.filters.route.ZuulFallbackProvider;
 
 /**

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/okhttp/OkHttpRibbonCommand.java

@@ -21,7 +21,7 @@ import org.springframework.cloud.netflix.ribbon.okhttp.OkHttpLoadBalancingClient
 import org.springframework.cloud.netflix.ribbon.okhttp.OkHttpRibbonRequest;
 import org.springframework.cloud.netflix.ribbon.okhttp.OkHttpRibbonResponse;
 import org.springframework.cloud.netflix.zuul.filters.ZuulProperties;
-import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
 import org.springframework.cloud.netflix.zuul.filters.route.ZuulFallbackProvider;
 import org.springframework.cloud.netflix.zuul.filters.route.support.AbstractRibbonCommand;
 import com.netflix.client.config.IClientConfig;

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/okhttp/OkHttpRibbonCommandFactory.java

@@ -22,7 +22,7 @@ import java.util.Set;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.cloud.netflix.ribbon.okhttp.OkHttpLoadBalancingClient;
 import org.springframework.cloud.netflix.zuul.filters.ZuulProperties;
-import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
 import org.springframework.cloud.netflix.zuul.filters.route.ZuulFallbackProvider;
 import org.springframework.cloud.netflix.zuul.filters.route.support.AbstractRibbonCommandFactory;
 

spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/support/AbstractRibbonCommand.java

@@ -21,7 +21,7 @@ import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
 import org.springframework.cloud.netflix.ribbon.RibbonHttpResponse;
 import org.springframework.cloud.netflix.zuul.filters.ZuulProperties;
 import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommand;
-import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
 import org.springframework.cloud.netflix.zuul.filters.route.ZuulFallbackProvider;
 import org.springframework.cloud.netflix.zuul.filters.route.FallbackProvider;
 import org.springframework.http.client.ClientHttpResponse;

spring-cloud-netflix-zuul/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springframework.cloud.netflix.zuul.ZuulServerAutoConfiguration,\
+org.springframework.cloud.netflix.zuul.ZuulProxyAutoConfiguration

spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/test/TestAutoConfiguration.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2013-2017 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.netflix.test;
+
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
+import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClientAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+
+/**
+ * @author Spencer Gibb
+ */
+@Configuration
+@Import({NoopDiscoveryClientAutoConfiguration.class})
+@AutoConfigureBefore(SecurityAutoConfiguration.class)
+public class TestAutoConfiguration {
+
+	@Configuration
+	@Order(Ordered.HIGHEST_PRECEDENCE)
+	protected static class TestSecurityConfiguration extends WebSecurityConfigurerAdapter {
+
+
+		TestSecurityConfiguration() {
+			super(true);
+		}
+
+
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			// super.configure(http);
+			http.antMatcher("/proxy-username")
+					.httpBasic()
+					.and()
+					.authorizeRequests().antMatchers("/**").permitAll();
+		}
+
+	}
+}

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

@@ -0,0 +1,135 @@
+/*
+ * Copyright 2013-2017 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.netflix.test;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+
+import org.apache.http.Header;
+import org.apache.http.StatusLine;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.message.BasicHeader;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockingDetails;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
+import org.springframework.cloud.commons.httpclient.DefaultApacheHttpClientFactory;
+import org.springframework.cloud.netflix.ribbon.apache.RibbonLoadBalancingHttpClient;
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
+import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
+import org.springframework.cloud.netflix.zuul.filters.route.SimpleHostRoutingFilter;
+import org.springframework.cloud.netflix.zuul.filters.route.apache.HttpClientRibbonCommand;
+import org.springframework.cloud.netflix.zuul.filters.route.apache.HttpClientRibbonCommandFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.ReflectionUtils;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockingDetails;
+
+/**
+ * @author Ryan Baxter
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(properties = {
+		"ribbon.eureka.enabled = false"})
+@DirtiesContext
+public class ZuulApacheHttpClientConfigurationTests {
+
+	@Autowired
+	SimpleHostRoutingFilter simpleHostRoutingFilter;
+
+	@Autowired
+	HttpClientRibbonCommandFactory httpClientRibbonCommandFactory;
+
+
+	@Test
+	public void testHttpClientSimpleHostRoutingFilter() {
+		CloseableHttpClient httpClient = getField(simpleHostRoutingFilter, "httpClient");
+		MockingDetails httpClientDetails = mockingDetails(httpClient);
+		assertTrue(httpClientDetails.isMock());
+	}
+
+	@Test
+	public void testRibbonLoadBalancingHttpClient() {
+		RibbonCommandContext context = new RibbonCommandContext("foo"," GET", "http://localhost",
+				false, new LinkedMultiValueMap<>(), new LinkedMultiValueMap<>(),
+				null, new ArrayList<>(), 0l);
+		HttpClientRibbonCommand command = httpClientRibbonCommandFactory.create(context);
+		RibbonLoadBalancingHttpClient ribbonClient = command.getClient();
+		CloseableHttpClient httpClient = getField(ribbonClient, "delegate");
+		MockingDetails httpClientDetails = mockingDetails(httpClient);
+		assertTrue(httpClientDetails.isMock());
+	}
+
+	@SuppressWarnings("unchecked")
+	protected <T> T getField(Object target, String name) {
+		Field field = ReflectionUtils.findField(target.getClass(), name);
+		ReflectionUtils.makeAccessible(field);
+		Object value = ReflectionUtils.getField(field, target);
+		return (T)value;
+	}
+
+	@SpringBootConfiguration
+	@EnableAutoConfiguration
+	@EnableZuulProxy
+	static class TestConfig {
+
+		static class MyApacheHttpClientFactory extends DefaultApacheHttpClientFactory {
+			@Override
+			public HttpClientBuilder createBuilder() {
+				CloseableHttpClient client =  mock(CloseableHttpClient.class);
+				CloseableHttpResponse response = mock(CloseableHttpResponse.class);
+				StatusLine statusLine = mock(StatusLine.class);
+				doReturn(200).when(statusLine).getStatusCode();
+				Mockito.doReturn(statusLine).when(response).getStatusLine();
+				Header[] headers = new BasicHeader[0];
+				doReturn(headers).when(response).getAllHeaders();
+				try {
+					Mockito.doReturn(response).when(client).execute(any(HttpUriRequest.class));
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+				HttpClientBuilder builder = mock(HttpClientBuilder.class);
+				Mockito.doReturn(client).when(builder).build();
+				return builder;
+			}
+		}
+
+		@Bean
+		public ApacheHttpClientFactory apacheHttpClientFactory() {
+																		   return new MyApacheHttpClientFactory();
+																												  }
+	}
+
+}
+

spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/test/ZuulOkHttpClientConfigurationTests.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright 2013-2017 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.netflix.test;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockingDetails;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
+import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
+import org.springframework.cloud.netflix.ribbon.okhttp.OkHttpLoadBalancingClient;
+import org.springframework.cloud.netflix.ribbon.support.RibbonCommandContext;
+import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
+import org.springframework.cloud.netflix.zuul.filters.route.okhttp.OkHttpRibbonCommand;
+import org.springframework.cloud.netflix.zuul.filters.route.okhttp.OkHttpRibbonCommandFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.ReflectionUtils;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockingDetails;
+
+import okhttp3.OkHttpClient;
+
+/**
+ * @author Ryan Baxter
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(properties = {
+		"spring.cloud.httpclientfactories.ok.enabled: true",
+		"ribbon.eureka.enabled = false", "ribbon.okhttp.enabled: true",
+		"ribbon.httpclient.enabled: false" })
+@DirtiesContext
+public class ZuulOkHttpClientConfigurationTests {
+
+	@Autowired
+	OkHttpClientFactory okHttpClientFactory;
+
+	@Autowired
+	OkHttpClientConnectionPoolFactory connectionPoolFactory;
+
+	@Autowired
+	OkHttpRibbonCommandFactory okHttpRibbonCommandFactory;
+
+	@Test
+	public void testOkHttpLoadBalancingHttpClient() {
+		RibbonCommandContext context = new RibbonCommandContext("foo", " GET",
+				"http://localhost", false, new LinkedMultiValueMap<>(),
+				new LinkedMultiValueMap<>(), null,
+				new ArrayList<>(), 0l);
+		OkHttpRibbonCommand command = okHttpRibbonCommandFactory.create(context);
+		OkHttpLoadBalancingClient ribbonClient = command.getClient();
+		OkHttpClient httpClient = getField(ribbonClient, "delegate");
+		MockingDetails httpClientDetails = mockingDetails(httpClient);
+		assertTrue(httpClientDetails.isMock());
+	}
+
+	protected <T> T getField(Object target, String name) {
+		Field field = ReflectionUtils.findField(target.getClass(), name);
+		ReflectionUtils.makeAccessible(field);
+		Object value = ReflectionUtils.getField(field, target);
+		return (T) value;
+	}
+
+	@SpringBootConfiguration
+	@EnableAutoConfiguration
+	@EnableZuulProxy
+	static class TestConfig {
+		@Bean
+		public OkHttpClient client() {
+			return mock(OkHttpClient.class);
+		}
+
+	}
+}

spring-cloud-netflix-zuul/src/test/java/org/springframework/cloud/netflix/zuul/filters/ZuulPropertiesTests.java

@@ -19,11 +19,13 @@ package org.springframework.cloud.netflix.zuul.filters;
 import java.util.Arrays;
 import java.util.Collections;
 
+import org.assertj.core.api.Assertions;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.cloud.netflix.zuul.filters.ZuulProperties.ZuulRoute;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -48,9 +50,9 @@ public class ZuulPropertiesTests {
 
 	@Test
 	public void defaultIgnoredHeaders() {
-		assertTrue(this.zuul.isIgnoreSecurityHeaders());
-		assertTrue(this.zuul.getIgnoredHeaders()
-				.containsAll(ZuulProperties.SECURITY_HEADERS));
+		assertThat(this.zuul.isIgnoreSecurityHeaders()).isTrue();
+		assertThat(this.zuul.getIgnoredHeaders())
+				.containsAll(ZuulProperties.SECURITY_HEADERS);
 	}
 
 	@Test