Move zuul to its own module. (#2332)

fixes gh-2298
spring-cloud · Sep 29, 2017 · a2d8f06 · a2d8f06
1 parent 91808bb
commit a2d8f06
Show file tree

Hide file tree

Showing 137 changed files with 605 additions and 221 deletions.
diff --git a/pom.xml b/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>

diff --git a/...rc/main/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpRequest.java b/...rc/main/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpRequest.java
@@ -26,7 +26,7 @@
 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

diff --git a/...re/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonRequest.java b/...re/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;

diff --git a/...e/src/main/java/org/springframework/cloud/netflix/ribbon/support/ContextAwareRequest.java b/...e/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

diff --git a/.../ResettableServletInputStreamWrapper.java → .../ResettableServletInputStreamWrapper.java b/.../ResettableServletInputStreamWrapper.java → .../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;

diff --git a/...l/filters/route/RibbonCommandContext.java → .../ribbon/support/RibbonCommandContext.java b/...l/filters/route/RibbonCommandContext.java → .../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 MultiValueMap<String, String> getParams() {
 
 	public InputStream getRequestEntity() {
 		if (requestEntity == null) {
-			return requestEntity;
+			return null;
 		}
 
 		try {

diff --git a/spring-cloud-netflix-core/src/main/resources/META-INF/spring.factories b/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.ribbon.RibbonAutoConfiguration
-org.springframework.cloud.netflix.zuul.ZuulServerAutoConfiguration,\
-org.springframework.cloud.netflix.zuul.ZuulProxyAutoConfiguration
 
 org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker=\
 org.springframework.cloud.netflix.hystrix.HystrixCircuitBreakerConfiguration

diff --git a/...ng-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/AdhocTestSuite.java b/...ng-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/AdhocTestSuite.java
@@ -21,17 +21,13 @@
 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,
+@SuiteClasses({})
-		RibbonCommandCauseFallbackPropagationTest.class })
 @Ignore
 public class AdhocTestSuite {
 

diff --git a/...st/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpRequestTests.java b/...st/java/org/springframework/cloud/netflix/ribbon/apache/RibbonApacheHttpRequestTests.java
@@ -39,8 +39,8 @@
 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;
 

diff --git a/...c/test/java/org/springframework/cloud/netflix/ribbon/okhttp/OkHttpRibbonRequestTests.java b/...c/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;

diff --git a/.../test/java/org/springframework/cloud/netflix/ribbon/support/ContextAwareRequestTests.java b/.../test/java/org/springframework/cloud/netflix/ribbon/support/ContextAwareRequestTests.java
@@ -22,10 +22,10 @@
 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;

diff --git a/...lters/route/RibbonCommandContextTest.java → ...bon/support/RibbonCommandContextTest.java b/...lters/route/RibbonCommandContextTest.java → ...bon/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;
+package org.springframework.cloud.netflix.ribbon.support;
-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;
 
 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
  */