From fc4695057545b2ce82f73abc1e4691fa6b2914df Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 30 Jun 2017 14:26:52 +0100 Subject: [PATCH] Rename packages --- .../gateway => gateway/mvc}/ProxyExchange.java | 2 +- .../mvc}/config/ProxyExchangeArgumentResolver.java | 4 ++-- .../mvc}/config/ProxyProperties.java | 4 ++-- .../mvc}/config/ProxyResponseAutoConfiguration.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 4 ++-- .../mvc}/ProductionConfigurationTests.java | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) rename spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/{function/gateway => gateway/mvc}/ProxyExchange.java (99%) rename spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/{function/gateway => gateway/mvc}/config/ProxyExchangeArgumentResolver.java (95%) rename spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/{function/gateway => gateway/mvc}/config/ProxyProperties.java (93%) rename spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/{function/gateway => gateway/mvc}/config/ProxyResponseAutoConfiguration.java (96%) rename spring-cloud-gateway-mvc/src/test/java/org/springframework/cloud/{function/web/gateway => gateway/mvc}/ProductionConfigurationTests.java (97%) diff --git a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/function/gateway/ProxyExchange.java b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java similarity index 99% rename from spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/function/gateway/ProxyExchange.java rename to spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java index a8764f7e..ff67f9e5 100644 --- a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/function/gateway/ProxyExchange.java +++ b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.function.gateway; +package org.springframework.cloud.gateway.mvc; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/function/gateway/config/ProxyExchangeArgumentResolver.java b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyExchangeArgumentResolver.java similarity index 95% rename from spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/function/gateway/config/ProxyExchangeArgumentResolver.java rename to spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyExchangeArgumentResolver.java index bc9e143b..e665b100 100644 --- a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/function/gateway/config/ProxyExchangeArgumentResolver.java +++ b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyExchangeArgumentResolver.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.cloud.function.gateway.config; +package org.springframework.cloud.gateway.mvc.config; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Set; -import org.springframework.cloud.function.gateway.ProxyExchange; +import org.springframework.cloud.gateway.mvc.ProxyExchange; import org.springframework.core.MethodParameter; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.support.WebDataBinderFactory; diff --git a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/function/gateway/config/ProxyProperties.java b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyProperties.java similarity index 93% rename from spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/function/gateway/config/ProxyProperties.java rename to spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyProperties.java index 01419f35..5fad5f66 100644 --- a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/function/gateway/config/ProxyProperties.java +++ b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyProperties.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.cloud.function.gateway.config; +package org.springframework.cloud.gateway.mvc.config; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.function.gateway.ProxyExchange; +import org.springframework.cloud.gateway.mvc.ProxyExchange; import org.springframework.http.HttpHeaders; /** diff --git a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/function/gateway/config/ProxyResponseAutoConfiguration.java b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyResponseAutoConfiguration.java similarity index 96% rename from spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/function/gateway/config/ProxyResponseAutoConfiguration.java rename to spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyResponseAutoConfiguration.java index ddfd0767..e8a25b3a 100644 --- a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/function/gateway/config/ProxyResponseAutoConfiguration.java +++ b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/config/ProxyResponseAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.function.gateway.config; +package org.springframework.cloud.gateway.mvc.config; import java.io.IOException; import java.util.List; @@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.client.RestTemplateBuilder; -import org.springframework.cloud.function.gateway.ProxyExchange; +import org.springframework.cloud.gateway.mvc.ProxyExchange; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-gateway-mvc/src/main/resources/META-INF/spring.factories b/spring-cloud-gateway-mvc/src/main/resources/META-INF/spring.factories index 8a98f933..ae9e0fda 100644 --- a/spring-cloud-gateway-mvc/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-gateway-mvc/src/main/resources/META-INF/spring.factories @@ -1,5 +1,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.function.gateway.config.ProxyResponseAutoConfiguration +org.springframework.cloud.gateway.mvc.config.ProxyResponseAutoConfiguration org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureWebMvc=\ -org.springframework.cloud.function.gateway.config.ProxyResponseAutoConfiguration +org.springframework.cloud.gateway.mvc.config.ProxyResponseAutoConfiguration diff --git a/spring-cloud-gateway-mvc/src/test/java/org/springframework/cloud/function/web/gateway/ProductionConfigurationTests.java b/spring-cloud-gateway-mvc/src/test/java/org/springframework/cloud/gateway/mvc/ProductionConfigurationTests.java similarity index 97% rename from spring-cloud-gateway-mvc/src/test/java/org/springframework/cloud/function/web/gateway/ProductionConfigurationTests.java rename to spring-cloud-gateway-mvc/src/test/java/org/springframework/cloud/gateway/mvc/ProductionConfigurationTests.java index ec277292..bfa6394a 100644 --- a/spring-cloud-gateway-mvc/src/test/java/org/springframework/cloud/function/web/gateway/ProductionConfigurationTests.java +++ b/spring-cloud-gateway-mvc/src/test/java/org/springframework/cloud/gateway/mvc/ProductionConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.function.web.gateway; +package org.springframework.cloud.gateway.mvc; import java.net.URI; import java.util.Arrays; @@ -34,10 +34,10 @@ import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.cloud.function.gateway.ProxyExchange; -import org.springframework.cloud.function.web.gateway.ProductionConfigurationTests.TestApplication; -import org.springframework.cloud.function.web.gateway.ProductionConfigurationTests.TestApplication.Bar; -import org.springframework.cloud.function.web.gateway.ProductionConfigurationTests.TestApplication.Foo; +import org.springframework.cloud.gateway.mvc.ProxyExchange; +import org.springframework.cloud.gateway.mvc.ProductionConfigurationTests.TestApplication; +import org.springframework.cloud.gateway.mvc.ProductionConfigurationTests.TestApplication.Bar; +import org.springframework.cloud.gateway.mvc.ProductionConfigurationTests.TestApplication.Foo; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus;