From 8106314a6a5b6f61109b3d1a217a92ee60b72d09 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 29 Aug 2014 13:34:37 +0100 Subject: [PATCH] Update package names --- .../netflix/archaius/ArchaiusAutoConfiguration.java | 2 +- .../archaius/ConfigurableEnvironmentConfiguration.java | 2 +- .../netflix/endpoint/HystrixStreamEndpoint.java | 2 +- .../netflix/endpoint/ServletWrappingEndpoint.java | 2 +- .../netflix/eureka/EnableEurekaClient.java | 2 +- .../netflix/eureka/EurekaClientConfigBean.java | 2 +- .../netflix/eureka/EurekaClientConfiguration.java | 2 +- .../netflix/eureka/EurekaInstanceConfigBean.java | 2 +- .../netflix/eureka/EurekaServerAutoConfiguration.java | 10 +++++----- .../netflix/eureka/EurekaServerConfigBean.java | 2 +- .../eureka/advice/PiggybackMethodInterceptor.java | 2 +- .../eureka/event/EurekaInstanceCanceledEvent.java | 2 +- .../eureka/event/EurekaInstanceRegisteredEvent.java | 2 +- .../eureka/event/EurekaInstanceRenewedEvent.java | 2 +- .../eureka/event/EurekaRegistryAvailableEvent.java | 2 +- .../netflix/eureka/event/EurekaServerStartedEvent.java | 2 +- .../eureka/event/LeaseManagerMessageBroker.java | 2 +- .../netflix/feign/FeignAutoConfiguration.java | 4 ++-- .../{platform => cloud}/netflix/feign/FeignBase.java | 2 +- .../netflix/feign/FeignConfigurer.java | 4 ++-- .../netflix/feign/SpringDecoder.java | 2 +- .../netflix/feign/SpringEncoder.java | 2 +- .../netflix/feign/SpringMvcContract.java | 2 +- .../netflix/hystrix/HystrixConfiguration.java | 6 +++--- .../netflix/hystrix/HystrixConfigurationSelector.java | 4 ++-- .../netflix/hystrix/HystrixConfigurer.java | 2 +- .../netflix/hystrix/annotations/EnableHystrix.java | 4 ++-- .../netflix/zuul/EnableZuulProxy.java | 4 ++-- .../netflix/zuul/FilterInitializer.java | 2 +- .../netflix/zuul/RibbonCommand.java | 2 +- .../{platform => cloud}/netflix/zuul/Routes.java | 2 +- .../{platform => cloud}/netflix/zuul/SpringFilter.java | 2 +- .../netflix/zuul/ZuulProxyConfiguration.java | 10 +++++----- .../netflix/zuul/ZuulProxyProperties.java | 2 +- .../netflix/zuul/filters/post/SendResponseFilter.java | 2 +- .../netflix/zuul/filters/pre/DebugFilter.java | 2 +- .../netflix/zuul/filters/pre/PreDecorationFilter.java | 6 +++--- .../zuul/filters/route/RibbonRoutingFilter.java | 6 +++--- .../zuul/filters/route/SimpleHostRoutingFilter.java | 2 +- .../src/main/resources/META-INF/spring.factories | 6 +++--- .../netflix/eureka/EurekaClientConfigBeanTests.java | 2 +- .../netflix/eureka/sample/Application.java | 2 +- .../netflix/eureka/sample/ApplicationTests.java | 2 +- .../netflix/zuul/sample/Application.java | 6 +++--- .../netflix/zuul/sample/ApplicationTests.java | 2 +- .../netflix/hystrix/Application.java | 0 .../netflix/hystrix/stream/MockStreamServlet.java | 0 .../netflix/hystrix/stream/ProxyStreamServlet.java | 0 .../src/main/resources/META-INF/spring.factories | 10 +++++----- .../netflix/hystrix/stream/hystrix.stream | 0 .../netflix/turbine/Application.java | 0 .../netflix/turbine/EurekaInstanceDiscovery.java | 0 .../netflix/turbine/SpringAggregatorFactory.java | 0 .../netflix/turbine/SpringClusterMonitor.java | 0 .../src/main/resources/META-INF/spring.factories | 10 +++++----- .../{platform => cloud}/netflix/zuul/Application.java | 4 ++-- .../netflix/zuul/FilterIntializer.java | 0 .../netflix/zuul/ZuulController.java | 0 .../netflix/zuul/ZuulProperties.java | 0 .../util/AbstractServletWrappingController.java | 0 .../src/main/resources/META-INF/spring.factories | 10 +++++----- .../resources/filters/pre/PreDecorationFilter.groovy | 4 ++-- .../main/resources/filters/route/RibbonRequest.groovy | 4 ++-- 63 files changed, 89 insertions(+), 89 deletions(-) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/archaius/ArchaiusAutoConfiguration.java (98%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/archaius/ConfigurableEnvironmentConfiguration.java (98%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/endpoint/HystrixStreamEndpoint.java (86%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/endpoint/ServletWrappingEndpoint.java (97%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/eureka/EnableEurekaClient.java (95%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/eureka/EurekaClientConfigBean.java (98%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/eureka/EurekaClientConfiguration.java (98%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/eureka/EurekaInstanceConfigBean.java (98%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/eureka/EurekaServerAutoConfiguration.java (92%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/eureka/EurekaServerConfigBean.java (98%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/eureka/advice/PiggybackMethodInterceptor.java (96%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/eureka/event/EurekaInstanceCanceledEvent.java (91%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/eureka/event/EurekaInstanceRegisteredEvent.java (92%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/eureka/event/EurekaInstanceRenewedEvent.java (92%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/eureka/event/EurekaRegistryAvailableEvent.java (94%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/eureka/event/EurekaServerStartedEvent.java (94%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/eureka/event/LeaseManagerMessageBroker.java (97%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/feign/FeignAutoConfiguration.java (85%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/feign/FeignBase.java (98%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/feign/FeignConfigurer.java (93%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/feign/SpringDecoder.java (97%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/feign/SpringEncoder.java (98%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/feign/SpringMvcContract.java (98%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/hystrix/HystrixConfiguration.java (90%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/hystrix/HystrixConfigurationSelector.java (88%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/hystrix/HystrixConfigurer.java (59%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/hystrix/annotations/EnableHystrix.java (92%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/zuul/EnableZuulProxy.java (70%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/zuul/FilterInitializer.java (97%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/zuul/RibbonCommand.java (98%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/zuul/Routes.java (98%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/zuul/SpringFilter.java (96%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/zuul/ZuulProxyConfiguration.java (86%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/zuul/ZuulProxyProperties.java (83%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/zuul/filters/post/SendResponseFilter.java (98%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/zuul/filters/pre/DebugFilter.java (95%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/zuul/filters/pre/PreDecorationFilter.java (91%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/zuul/filters/route/RibbonRoutingFilter.java (97%) rename spring-cloud-netflix-core/src/main/java/org/springframework/{platform => cloud}/netflix/zuul/filters/route/SimpleHostRoutingFilter.java (99%) rename spring-cloud-netflix-core/src/test/java/org/springframework/{platform => cloud}/netflix/eureka/EurekaClientConfigBeanTests.java (98%) rename spring-cloud-netflix-core/src/test/java/org/springframework/{platform => cloud}/netflix/eureka/sample/Application.java (91%) rename spring-cloud-netflix-core/src/test/java/org/springframework/{platform => cloud}/netflix/eureka/sample/ApplicationTests.java (90%) rename spring-cloud-netflix-core/src/test/java/org/springframework/{platform => cloud}/netflix/zuul/sample/Application.java (80%) rename spring-cloud-netflix-core/src/test/java/org/springframework/{platform => cloud}/netflix/zuul/sample/ApplicationTests.java (90%) rename spring-cloud-netflix-hystrix/src/main/java/io/spring/{platform => cloud}/netflix/hystrix/Application.java (100%) rename spring-cloud-netflix-hystrix/src/main/java/io/spring/{platform => cloud}/netflix/hystrix/stream/MockStreamServlet.java (100%) rename spring-cloud-netflix-hystrix/src/main/java/io/spring/{platform => cloud}/netflix/hystrix/stream/ProxyStreamServlet.java (100%) rename spring-cloud-netflix-hystrix/src/main/resources/io/spring/{platform => cloud}/netflix/hystrix/stream/hystrix.stream (100%) rename spring-cloud-netflix-turbine/src/main/java/io/spring/{platform => cloud}/netflix/turbine/Application.java (100%) rename spring-cloud-netflix-turbine/src/main/java/io/spring/{platform => cloud}/netflix/turbine/EurekaInstanceDiscovery.java (100%) rename spring-cloud-netflix-turbine/src/main/java/io/spring/{platform => cloud}/netflix/turbine/SpringAggregatorFactory.java (100%) rename spring-cloud-netflix-turbine/src/main/java/io/spring/{platform => cloud}/netflix/turbine/SpringClusterMonitor.java (100%) rename spring-cloud-netflix-zuul/src/main/java/io/spring/{platform => cloud}/netflix/zuul/Application.java (93%) rename spring-cloud-netflix-zuul/src/main/java/io/spring/{platform => cloud}/netflix/zuul/FilterIntializer.java (100%) rename spring-cloud-netflix-zuul/src/main/java/io/spring/{platform => cloud}/netflix/zuul/ZuulController.java (100%) rename spring-cloud-netflix-zuul/src/main/java/io/spring/{platform => cloud}/netflix/zuul/ZuulProperties.java (100%) rename spring-cloud-netflix-zuul/src/main/java/io/spring/{platform => cloud}/util/AbstractServletWrappingController.java (100%) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/archaius/ArchaiusAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java similarity index 98% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/archaius/ArchaiusAutoConfiguration.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java index 3e601c7f..65690663 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/archaius/ArchaiusAutoConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.archaius; +package org.springframework.cloud.netflix.archaius; import com.netflix.config.ConcurrentCompositeConfiguration; import com.netflix.config.ConfigurationManager; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/archaius/ConfigurableEnvironmentConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ConfigurableEnvironmentConfiguration.java similarity index 98% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/archaius/ConfigurableEnvironmentConfiguration.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ConfigurableEnvironmentConfiguration.java index 0e46ab5d..44bbfdab 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/archaius/ConfigurableEnvironmentConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ConfigurableEnvironmentConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.archaius; +package org.springframework.cloud.netflix.archaius; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/endpoint/HystrixStreamEndpoint.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/endpoint/HystrixStreamEndpoint.java similarity index 86% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/endpoint/HystrixStreamEndpoint.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/endpoint/HystrixStreamEndpoint.java index ffa57b09..ac279c91 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/endpoint/HystrixStreamEndpoint.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/endpoint/HystrixStreamEndpoint.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.endpoint; +package org.springframework.cloud.netflix.endpoint; import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsStreamServlet; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/endpoint/ServletWrappingEndpoint.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/endpoint/ServletWrappingEndpoint.java similarity index 97% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/endpoint/ServletWrappingEndpoint.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/endpoint/ServletWrappingEndpoint.java index 24bd0dca..f2ac2f45 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/endpoint/ServletWrappingEndpoint.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/endpoint/ServletWrappingEndpoint.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.endpoint; +package org.springframework.cloud.netflix.endpoint; import org.springframework.beans.BeansException; import org.springframework.beans.factory.InitializingBean; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EnableEurekaClient.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EnableEurekaClient.java similarity index 95% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EnableEurekaClient.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EnableEurekaClient.java index 2131b178..f89b39fe 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EnableEurekaClient.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EnableEurekaClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.platform.netflix.eureka; +package org.springframework.cloud.netflix.eureka; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfigBean.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java similarity index 98% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfigBean.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java index 58300738..569f6cc3 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfigBean.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.platform.netflix.eureka; +package org.springframework.cloud.netflix.eureka; import java.util.ArrayList; import java.util.Arrays; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java similarity index 98% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfiguration.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java index 734623fa..d6e413ac 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.platform.netflix.eureka; +package org.springframework.cloud.netflix.eureka; import javax.annotation.PreDestroy; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaInstanceConfigBean.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java similarity index 98% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaInstanceConfigBean.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java index 43622b08..040b4f58 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaInstanceConfigBean.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.platform.netflix.eureka; +package org.springframework.cloud.netflix.eureka; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaServerAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaServerAutoConfiguration.java similarity index 92% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaServerAutoConfiguration.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaServerAutoConfiguration.java index 45cca721..6603037c 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaServerAutoConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaServerAutoConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.platform.netflix.eureka; +package org.springframework.cloud.netflix.eureka; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; @@ -31,10 +31,10 @@ import org.springframework.context.SmartLifecycle; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; -import org.springframework.platform.netflix.eureka.advice.PiggybackMethodInterceptor; -import org.springframework.platform.netflix.eureka.event.EurekaRegistryAvailableEvent; -import org.springframework.platform.netflix.eureka.event.EurekaServerStartedEvent; -import org.springframework.platform.netflix.eureka.event.LeaseManagerMessageBroker; +import org.springframework.cloud.netflix.eureka.advice.PiggybackMethodInterceptor; +import org.springframework.cloud.netflix.eureka.event.EurekaRegistryAvailableEvent; +import org.springframework.cloud.netflix.eureka.event.EurekaServerStartedEvent; +import org.springframework.cloud.netflix.eureka.event.LeaseManagerMessageBroker; import org.springframework.util.ReflectionUtils; import org.springframework.web.context.ServletContextAware; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaServerConfigBean.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaServerConfigBean.java similarity index 98% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaServerConfigBean.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaServerConfigBean.java index 95e7708e..e4594712 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/EurekaServerConfigBean.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaServerConfigBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.platform.netflix.eureka; +package org.springframework.cloud.netflix.eureka; import java.util.HashMap; import java.util.Map; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/advice/PiggybackMethodInterceptor.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/advice/PiggybackMethodInterceptor.java similarity index 96% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/advice/PiggybackMethodInterceptor.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/advice/PiggybackMethodInterceptor.java index 239c6168..65a4a078 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/advice/PiggybackMethodInterceptor.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/advice/PiggybackMethodInterceptor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.platform.netflix.eureka.advice; +package org.springframework.cloud.netflix.eureka.advice; import java.lang.reflect.Method; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceCanceledEvent.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceCanceledEvent.java similarity index 91% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceCanceledEvent.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceCanceledEvent.java index 76cc86d7..254f30b9 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceCanceledEvent.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceCanceledEvent.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.eureka.event; +package org.springframework.cloud.netflix.eureka.event; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRegisteredEvent.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceRegisteredEvent.java similarity index 92% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRegisteredEvent.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceRegisteredEvent.java index a07156b0..61affd75 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRegisteredEvent.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceRegisteredEvent.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.eureka.event; +package org.springframework.cloud.netflix.eureka.event; import com.netflix.appinfo.InstanceInfo; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRenewedEvent.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceRenewedEvent.java similarity index 92% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRenewedEvent.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceRenewedEvent.java index 90967c61..e7dae21b 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaInstanceRenewedEvent.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaInstanceRenewedEvent.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.eureka.event; +package org.springframework.cloud.netflix.eureka.event; import com.netflix.appinfo.InstanceInfo; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaRegistryAvailableEvent.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaRegistryAvailableEvent.java similarity index 94% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaRegistryAvailableEvent.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaRegistryAvailableEvent.java index 38d87243..a41599ea 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaRegistryAvailableEvent.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaRegistryAvailableEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.platform.netflix.eureka.event; +package org.springframework.cloud.netflix.eureka.event; import org.springframework.context.ApplicationEvent; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaServerStartedEvent.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaServerStartedEvent.java similarity index 94% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaServerStartedEvent.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaServerStartedEvent.java index ddfa3f70..0cec6c4f 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/EurekaServerStartedEvent.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/EurekaServerStartedEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.platform.netflix.eureka.event; +package org.springframework.cloud.netflix.eureka.event; import org.springframework.context.ApplicationEvent; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/LeaseManagerMessageBroker.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/LeaseManagerMessageBroker.java similarity index 97% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/LeaseManagerMessageBroker.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/LeaseManagerMessageBroker.java index 16351e67..8e44da89 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/eureka/event/LeaseManagerMessageBroker.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/event/LeaseManagerMessageBroker.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.eureka.event; +package org.springframework.cloud.netflix.eureka.event; import static com.google.common.collect.Iterables.tryFind; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/FeignAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java similarity index 85% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/FeignAutoConfiguration.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java index f7aa1496..20a7d645 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/FeignAutoConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java @@ -1,11 +1,11 @@ -package org.springframework.platform.netflix.feign; +package org.springframework.cloud.netflix.feign; import feign.Contract; import feign.Logger; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.platform.netflix.archaius.ArchaiusAutoConfiguration; +import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration; /** * Created by sgibb on 7/3/14. diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/FeignBase.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignBase.java similarity index 98% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/FeignBase.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignBase.java index f80e274d..b2127587 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/FeignBase.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignBase.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.feign; +package org.springframework.cloud.netflix.feign; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/FeignConfigurer.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfigurer.java similarity index 93% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/FeignConfigurer.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfigurer.java index 943e7918..6ed017c7 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/FeignConfigurer.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignConfigurer.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.feign; +package org.springframework.cloud.netflix.feign; import com.netflix.config.ConfigurationManager; import com.netflix.niws.loadbalancer.DiscoveryEnabledNIWSServerList; @@ -10,7 +10,7 @@ import feign.codec.Encoder; import feign.ribbon.LoadBalancingTarget; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; -import org.springframework.platform.netflix.archaius.ConfigurableEnvironmentConfiguration; +import org.springframework.cloud.netflix.archaius.ConfigurableEnvironmentConfiguration; import java.net.URI; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/SpringDecoder.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/SpringDecoder.java similarity index 97% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/SpringDecoder.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/SpringDecoder.java index 81aa51a7..bc876cb6 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/SpringDecoder.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/SpringDecoder.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.feign; +package org.springframework.cloud.netflix.feign; import java.io.IOException; import java.io.InputStream; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/SpringEncoder.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/SpringEncoder.java similarity index 98% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/SpringEncoder.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/SpringEncoder.java index 6c52bc68..387a6458 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/SpringEncoder.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/SpringEncoder.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.feign; +package org.springframework.cloud.netflix.feign; import com.google.common.base.Charsets; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/SpringMvcContract.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/SpringMvcContract.java similarity index 98% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/SpringMvcContract.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/SpringMvcContract.java index c26c8d2c..b653fbe5 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/feign/SpringMvcContract.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/SpringMvcContract.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.feign; +package org.springframework.cloud.netflix.feign; import static feign.Util.checkState; import static feign.Util.emptyToNull; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/hystrix/HystrixConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfiguration.java similarity index 90% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/hystrix/HystrixConfiguration.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfiguration.java index 6a5a734d..84bebf5a 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/hystrix/HystrixConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.hystrix; +package org.springframework.cloud.netflix.hystrix; import com.netflix.hystrix.contrib.javanica.aop.aspectj.HystrixCommandAspect; import org.springframework.beans.factory.annotation.Autowired; @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportAware; import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.type.AnnotationMetadata; -import org.springframework.platform.netflix.hystrix.annotations.EnableHystrix; -import org.springframework.platform.netflix.endpoint.HystrixStreamEndpoint; +import org.springframework.cloud.netflix.hystrix.annotations.EnableHystrix; +import org.springframework.cloud.netflix.endpoint.HystrixStreamEndpoint; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/hystrix/HystrixConfigurationSelector.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurationSelector.java similarity index 88% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/hystrix/HystrixConfigurationSelector.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurationSelector.java index 8c7f28db..d86a4091 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/hystrix/HystrixConfigurationSelector.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurationSelector.java @@ -1,9 +1,9 @@ -package org.springframework.platform.netflix.hystrix; +package org.springframework.cloud.netflix.hystrix; import org.springframework.context.annotation.AdviceMode; import org.springframework.context.annotation.AdviceModeImportSelector; import org.springframework.context.annotation.AutoProxyRegistrar; -import org.springframework.platform.netflix.hystrix.annotations.EnableHystrix; +import org.springframework.cloud.netflix.hystrix.annotations.EnableHystrix; /** * Created by sgibb on 6/19/14. diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/hystrix/HystrixConfigurer.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurer.java similarity index 59% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/hystrix/HystrixConfigurer.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurer.java index 0d88838d..1b890d34 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/hystrix/HystrixConfigurer.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurer.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.hystrix; +package org.springframework.cloud.netflix.hystrix; /** * Created by sgibb on 6/19/14. diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/hystrix/annotations/EnableHystrix.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/annotations/EnableHystrix.java similarity index 92% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/hystrix/annotations/EnableHystrix.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/annotations/EnableHystrix.java index af13a4a0..76ee727c 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/hystrix/annotations/EnableHystrix.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/annotations/EnableHystrix.java @@ -1,9 +1,9 @@ -package org.springframework.platform.netflix.hystrix.annotations; +package org.springframework.cloud.netflix.hystrix.annotations; import org.springframework.context.annotation.AdviceMode; import org.springframework.context.annotation.Import; import org.springframework.core.Ordered; -import org.springframework.platform.netflix.hystrix.HystrixConfigurationSelector; +import org.springframework.cloud.netflix.hystrix.HystrixConfigurationSelector; import java.lang.annotation.*; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/EnableZuulProxy.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/EnableZuulProxy.java similarity index 70% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/EnableZuulProxy.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/EnableZuulProxy.java index ac52598e..fecce76f 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/EnableZuulProxy.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/EnableZuulProxy.java @@ -1,9 +1,9 @@ -package org.springframework.platform.netflix.zuul; +package org.springframework.cloud.netflix.zuul; import java.lang.annotation.*; import org.springframework.context.annotation.Import; -import org.springframework.platform.netflix.eureka.EnableEurekaClient; +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; /** * @author Spencer Gibb diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/FilterInitializer.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/FilterInitializer.java similarity index 97% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/FilterInitializer.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/FilterInitializer.java index 2619988b..4d4f5ee7 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/FilterInitializer.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/FilterInitializer.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.zuul; +package org.springframework.cloud.netflix.zuul; import java.util.Map; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/RibbonCommand.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/RibbonCommand.java similarity index 98% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/RibbonCommand.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/RibbonCommand.java index 1d30d43a..bc0fdd2b 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/RibbonCommand.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/RibbonCommand.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.zuul; +package org.springframework.cloud.netflix.zuul; import com.netflix.client.http.HttpRequest; import com.netflix.client.http.HttpResponse; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/Routes.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/Routes.java similarity index 98% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/Routes.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/Routes.java index 9028b6f1..13095ad3 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/Routes.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/Routes.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.zuul; +package org.springframework.cloud.netflix.zuul; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/SpringFilter.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/SpringFilter.java similarity index 96% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/SpringFilter.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/SpringFilter.java index bba3a258..bb9fd30f 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/SpringFilter.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/SpringFilter.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.zuul; +package org.springframework.cloud.netflix.zuul; import com.netflix.zuul.ZuulFilter; import org.springframework.web.context.WebApplicationContext; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyConfiguration.java similarity index 86% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyConfiguration.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyConfiguration.java index 184afd47..0f9c1de0 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.zuul; +package org.springframework.cloud.netflix.zuul; import java.util.ArrayList; import java.util.Collection; @@ -12,10 +12,10 @@ import org.springframework.boot.context.embedded.ServletRegistrationBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.platform.netflix.zuul.filters.post.SendResponseFilter; -import org.springframework.platform.netflix.zuul.filters.pre.DebugFilter; -import org.springframework.platform.netflix.zuul.filters.pre.PreDecorationFilter; -import org.springframework.platform.netflix.zuul.filters.route.RibbonRoutingFilter; +import org.springframework.cloud.netflix.zuul.filters.post.SendResponseFilter; +import org.springframework.cloud.netflix.zuul.filters.pre.DebugFilter; +import org.springframework.cloud.netflix.zuul.filters.pre.PreDecorationFilter; +import org.springframework.cloud.netflix.zuul.filters.route.RibbonRoutingFilter; import com.netflix.zuul.context.ContextLifecycleFilter; import com.netflix.zuul.http.ZuulServlet; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyProperties.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyProperties.java similarity index 83% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyProperties.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyProperties.java index 9f62b76a..f7cfc06d 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/ZuulProxyProperties.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyProperties.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.zuul; +package org.springframework.cloud.netflix.zuul; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/post/SendResponseFilter.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilter.java similarity index 98% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/post/SendResponseFilter.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilter.java index 53fa6f9f..541d47f7 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/post/SendResponseFilter.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilter.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.zuul.filters.post; +package org.springframework.cloud.netflix.zuul.filters.post; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/pre/DebugFilter.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/DebugFilter.java similarity index 95% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/pre/DebugFilter.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/DebugFilter.java index 74f05ef1..1a68867c 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/pre/DebugFilter.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/DebugFilter.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.zuul.filters.pre; +package org.springframework.cloud.netflix.zuul.filters.pre; import com.netflix.config.DynamicBooleanProperty; import com.netflix.config.DynamicPropertyFactory; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/pre/PreDecorationFilter.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/PreDecorationFilter.java similarity index 91% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/pre/PreDecorationFilter.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/PreDecorationFilter.java index c2e1bdaf..5368a2f0 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/pre/PreDecorationFilter.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/PreDecorationFilter.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.zuul.filters.pre; +package org.springframework.cloud.netflix.zuul.filters.pre; import com.google.common.base.Optional; import com.google.common.base.Predicate; @@ -8,8 +8,8 @@ import com.netflix.zuul.context.RequestContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.platform.netflix.zuul.Routes; -import org.springframework.platform.netflix.zuul.ZuulProxyProperties; +import org.springframework.cloud.netflix.zuul.Routes; +import org.springframework.cloud.netflix.zuul.ZuulProxyProperties; import javax.annotation.Nullable; import java.util.LinkedHashMap; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/route/RibbonRoutingFilter.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java similarity index 97% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/route/RibbonRoutingFilter.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java index b2843aa7..0cf9fd18 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/route/RibbonRoutingFilter.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java @@ -1,6 +1,6 @@ -package org.springframework.platform.netflix.zuul.filters.route; +package org.springframework.cloud.netflix.zuul.filters.route; -import static org.springframework.platform.netflix.feign.FeignConfigurer.setServiceListClassAndVIP; +import static org.springframework.cloud.netflix.feign.FeignConfigurer.setServiceListClassAndVIP; import java.io.IOException; import java.io.InputStream; @@ -18,7 +18,7 @@ import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.actuate.trace.TraceRepository; -import org.springframework.platform.netflix.zuul.RibbonCommand; +import org.springframework.cloud.netflix.zuul.RibbonCommand; import org.springframework.util.StringUtils; import com.netflix.client.ClientException; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/route/SimpleHostRoutingFilter.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilter.java similarity index 99% rename from spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/route/SimpleHostRoutingFilter.java rename to spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilter.java index 3fc107b1..29290ea6 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/platform/netflix/zuul/filters/route/SimpleHostRoutingFilter.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilter.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.zuul.filters.route; +package org.springframework.cloud.netflix.zuul.filters.route; import com.google.common.base.Optional; import com.google.common.base.Predicate; 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 index 5c2bf6ef..87299295 100644 --- a/spring-cloud-netflix-core/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-netflix-core/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.platform.netflix.archaius.ArchaiusAutoConfiguration,\ -org.springframework.platform.netflix.eureka.EurekaServerAutoConfiguration,\ -org.springframework.platform.netflix.feign.FeignAutoConfiguration \ No newline at end of file +org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration,\ +org.springframework.cloud.netflix.eureka.EurekaServerAutoConfiguration,\ +org.springframework.cloud.netflix.feign.FeignAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/eureka/EurekaClientConfigBeanTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java similarity index 98% rename from spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/eureka/EurekaClientConfigBeanTests.java rename to spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java index ee5d2f4d..6491a7ad 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/eureka/EurekaClientConfigBeanTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBeanTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.platform.netflix.eureka; +package org.springframework.cloud.netflix.eureka; import static org.junit.Assert.assertEquals; diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/eureka/sample/Application.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/sample/Application.java similarity index 91% rename from spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/eureka/sample/Application.java rename to spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/sample/Application.java index 1914616b..86606312 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/eureka/sample/Application.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/sample/Application.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.eureka.sample; +package org.springframework.cloud.netflix.eureka.sample; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/eureka/sample/ApplicationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/sample/ApplicationTests.java similarity index 90% rename from spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/eureka/sample/ApplicationTests.java rename to spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/sample/ApplicationTests.java index 30c28edd..a7b0f7ba 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/eureka/sample/ApplicationTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/eureka/sample/ApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.eureka.sample; +package org.springframework.cloud.netflix.eureka.sample; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/zuul/sample/Application.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/sample/Application.java similarity index 80% rename from spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/zuul/sample/Application.java rename to spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/sample/Application.java index 322c1b6a..40363afe 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/zuul/sample/Application.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/sample/Application.java @@ -1,11 +1,11 @@ -package org.springframework.platform.netflix.zuul.sample; +package org.springframework.cloud.netflix.zuul.sample; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.platform.netflix.eureka.EnableEurekaClient; -import org.springframework.platform.netflix.zuul.EnableZuulProxy; +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; +import org.springframework.cloud.netflix.zuul.EnableZuulProxy; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/zuul/sample/ApplicationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/sample/ApplicationTests.java similarity index 90% rename from spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/zuul/sample/ApplicationTests.java rename to spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/sample/ApplicationTests.java index 81d29905..e1e56c9d 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/platform/netflix/zuul/sample/ApplicationTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/sample/ApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.platform.netflix.zuul.sample; +package org.springframework.cloud.netflix.zuul.sample; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-cloud-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/Application.java b/spring-cloud-netflix-hystrix/src/main/java/io/spring/cloud/netflix/hystrix/Application.java similarity index 100% rename from spring-cloud-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/Application.java rename to spring-cloud-netflix-hystrix/src/main/java/io/spring/cloud/netflix/hystrix/Application.java diff --git a/spring-cloud-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/stream/MockStreamServlet.java b/spring-cloud-netflix-hystrix/src/main/java/io/spring/cloud/netflix/hystrix/stream/MockStreamServlet.java similarity index 100% rename from spring-cloud-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/stream/MockStreamServlet.java rename to spring-cloud-netflix-hystrix/src/main/java/io/spring/cloud/netflix/hystrix/stream/MockStreamServlet.java diff --git a/spring-cloud-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/stream/ProxyStreamServlet.java b/spring-cloud-netflix-hystrix/src/main/java/io/spring/cloud/netflix/hystrix/stream/ProxyStreamServlet.java similarity index 100% rename from spring-cloud-netflix-hystrix/src/main/java/io/spring/platform/netflix/hystrix/stream/ProxyStreamServlet.java rename to spring-cloud-netflix-hystrix/src/main/java/io/spring/cloud/netflix/hystrix/stream/ProxyStreamServlet.java diff --git a/spring-cloud-netflix-hystrix/src/main/resources/META-INF/spring.factories b/spring-cloud-netflix-hystrix/src/main/resources/META-INF/spring.factories index 87096b50..28c1089f 100644 --- a/spring-cloud-netflix-hystrix/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-netflix-hystrix/src/main/resources/META-INF/spring.factories @@ -1,8 +1,8 @@ #org.springframework.context.ApplicationListener=\ -#org.springframework.platform.netflix.eureka.EurekaStartingListener,\ -#org.springframework.platform.netflix.eureka.EurekaUpListener,\ -#org.springframework.platform.netflix.eureka.EurekaOutOfServiceListener +#org.springframework.cloud.netflix.eureka.EurekaStartingListener,\ +#org.springframework.cloud.netflix.eureka.EurekaUpListener,\ +#org.springframework.cloud.netflix.eureka.EurekaOutOfServiceListener #org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -#org.springframework.platform.netflix.archaius.ArchaiusAutoConfiguration,\ -#org.springframework.platform.netflix.feign.FeignAutoConfiguration +#org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration,\ +#org.springframework.cloud.netflix.feign.FeignAutoConfiguration diff --git a/spring-cloud-netflix-hystrix/src/main/resources/io/spring/platform/netflix/hystrix/stream/hystrix.stream b/spring-cloud-netflix-hystrix/src/main/resources/io/spring/cloud/netflix/hystrix/stream/hystrix.stream similarity index 100% rename from spring-cloud-netflix-hystrix/src/main/resources/io/spring/platform/netflix/hystrix/stream/hystrix.stream rename to spring-cloud-netflix-hystrix/src/main/resources/io/spring/cloud/netflix/hystrix/stream/hystrix.stream diff --git a/spring-cloud-netflix-turbine/src/main/java/io/spring/platform/netflix/turbine/Application.java b/spring-cloud-netflix-turbine/src/main/java/io/spring/cloud/netflix/turbine/Application.java similarity index 100% rename from spring-cloud-netflix-turbine/src/main/java/io/spring/platform/netflix/turbine/Application.java rename to spring-cloud-netflix-turbine/src/main/java/io/spring/cloud/netflix/turbine/Application.java diff --git a/spring-cloud-netflix-turbine/src/main/java/io/spring/platform/netflix/turbine/EurekaInstanceDiscovery.java b/spring-cloud-netflix-turbine/src/main/java/io/spring/cloud/netflix/turbine/EurekaInstanceDiscovery.java similarity index 100% rename from spring-cloud-netflix-turbine/src/main/java/io/spring/platform/netflix/turbine/EurekaInstanceDiscovery.java rename to spring-cloud-netflix-turbine/src/main/java/io/spring/cloud/netflix/turbine/EurekaInstanceDiscovery.java diff --git a/spring-cloud-netflix-turbine/src/main/java/io/spring/platform/netflix/turbine/SpringAggregatorFactory.java b/spring-cloud-netflix-turbine/src/main/java/io/spring/cloud/netflix/turbine/SpringAggregatorFactory.java similarity index 100% rename from spring-cloud-netflix-turbine/src/main/java/io/spring/platform/netflix/turbine/SpringAggregatorFactory.java rename to spring-cloud-netflix-turbine/src/main/java/io/spring/cloud/netflix/turbine/SpringAggregatorFactory.java diff --git a/spring-cloud-netflix-turbine/src/main/java/io/spring/platform/netflix/turbine/SpringClusterMonitor.java b/spring-cloud-netflix-turbine/src/main/java/io/spring/cloud/netflix/turbine/SpringClusterMonitor.java similarity index 100% rename from spring-cloud-netflix-turbine/src/main/java/io/spring/platform/netflix/turbine/SpringClusterMonitor.java rename to spring-cloud-netflix-turbine/src/main/java/io/spring/cloud/netflix/turbine/SpringClusterMonitor.java diff --git a/spring-cloud-netflix-turbine/src/main/resources/META-INF/spring.factories b/spring-cloud-netflix-turbine/src/main/resources/META-INF/spring.factories index 87096b50..28c1089f 100644 --- a/spring-cloud-netflix-turbine/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-netflix-turbine/src/main/resources/META-INF/spring.factories @@ -1,8 +1,8 @@ #org.springframework.context.ApplicationListener=\ -#org.springframework.platform.netflix.eureka.EurekaStartingListener,\ -#org.springframework.platform.netflix.eureka.EurekaUpListener,\ -#org.springframework.platform.netflix.eureka.EurekaOutOfServiceListener +#org.springframework.cloud.netflix.eureka.EurekaStartingListener,\ +#org.springframework.cloud.netflix.eureka.EurekaUpListener,\ +#org.springframework.cloud.netflix.eureka.EurekaOutOfServiceListener #org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -#org.springframework.platform.netflix.archaius.ArchaiusAutoConfiguration,\ -#org.springframework.platform.netflix.feign.FeignAutoConfiguration +#org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration,\ +#org.springframework.cloud.netflix.feign.FeignAutoConfiguration diff --git a/spring-cloud-netflix-zuul/src/main/java/io/spring/platform/netflix/zuul/Application.java b/spring-cloud-netflix-zuul/src/main/java/io/spring/cloud/netflix/zuul/Application.java similarity index 93% rename from spring-cloud-netflix-zuul/src/main/java/io/spring/platform/netflix/zuul/Application.java rename to spring-cloud-netflix-zuul/src/main/java/io/spring/cloud/netflix/zuul/Application.java index 46f5c6c7..a4ccd007 100644 --- a/spring-cloud-netflix-zuul/src/main/java/io/spring/platform/netflix/zuul/Application.java +++ b/spring-cloud-netflix-zuul/src/main/java/io/spring/cloud/netflix/zuul/Application.java @@ -7,8 +7,8 @@ import org.springframework.boot.context.embedded.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.platform.netflix.endpoint.HystrixStreamEndpoint; -import org.springframework.platform.netflix.zuul.Routes; +import org.springframework.cloud.netflix.endpoint.HystrixStreamEndpoint; +import org.springframework.cloud.netflix.zuul.Routes; import org.springframework.scheduling.annotation.EnableScheduling; import java.util.ArrayList; diff --git a/spring-cloud-netflix-zuul/src/main/java/io/spring/platform/netflix/zuul/FilterIntializer.java b/spring-cloud-netflix-zuul/src/main/java/io/spring/cloud/netflix/zuul/FilterIntializer.java similarity index 100% rename from spring-cloud-netflix-zuul/src/main/java/io/spring/platform/netflix/zuul/FilterIntializer.java rename to spring-cloud-netflix-zuul/src/main/java/io/spring/cloud/netflix/zuul/FilterIntializer.java diff --git a/spring-cloud-netflix-zuul/src/main/java/io/spring/platform/netflix/zuul/ZuulController.java b/spring-cloud-netflix-zuul/src/main/java/io/spring/cloud/netflix/zuul/ZuulController.java similarity index 100% rename from spring-cloud-netflix-zuul/src/main/java/io/spring/platform/netflix/zuul/ZuulController.java rename to spring-cloud-netflix-zuul/src/main/java/io/spring/cloud/netflix/zuul/ZuulController.java diff --git a/spring-cloud-netflix-zuul/src/main/java/io/spring/platform/netflix/zuul/ZuulProperties.java b/spring-cloud-netflix-zuul/src/main/java/io/spring/cloud/netflix/zuul/ZuulProperties.java similarity index 100% rename from spring-cloud-netflix-zuul/src/main/java/io/spring/platform/netflix/zuul/ZuulProperties.java rename to spring-cloud-netflix-zuul/src/main/java/io/spring/cloud/netflix/zuul/ZuulProperties.java diff --git a/spring-cloud-netflix-zuul/src/main/java/io/spring/platform/util/AbstractServletWrappingController.java b/spring-cloud-netflix-zuul/src/main/java/io/spring/cloud/util/AbstractServletWrappingController.java similarity index 100% rename from spring-cloud-netflix-zuul/src/main/java/io/spring/platform/util/AbstractServletWrappingController.java rename to spring-cloud-netflix-zuul/src/main/java/io/spring/cloud/util/AbstractServletWrappingController.java diff --git a/spring-cloud-netflix-zuul/src/main/resources/META-INF/spring.factories b/spring-cloud-netflix-zuul/src/main/resources/META-INF/spring.factories index 87096b50..28c1089f 100644 --- a/spring-cloud-netflix-zuul/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-netflix-zuul/src/main/resources/META-INF/spring.factories @@ -1,8 +1,8 @@ #org.springframework.context.ApplicationListener=\ -#org.springframework.platform.netflix.eureka.EurekaStartingListener,\ -#org.springframework.platform.netflix.eureka.EurekaUpListener,\ -#org.springframework.platform.netflix.eureka.EurekaOutOfServiceListener +#org.springframework.cloud.netflix.eureka.EurekaStartingListener,\ +#org.springframework.cloud.netflix.eureka.EurekaUpListener,\ +#org.springframework.cloud.netflix.eureka.EurekaOutOfServiceListener #org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -#org.springframework.platform.netflix.archaius.ArchaiusAutoConfiguration,\ -#org.springframework.platform.netflix.feign.FeignAutoConfiguration +#org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration,\ +#org.springframework.cloud.netflix.feign.FeignAutoConfiguration diff --git a/spring-cloud-netflix-zuul/src/main/resources/filters/pre/PreDecorationFilter.groovy b/spring-cloud-netflix-zuul/src/main/resources/filters/pre/PreDecorationFilter.groovy index ed905eab..c273aa61 100644 --- a/spring-cloud-netflix-zuul/src/main/resources/filters/pre/PreDecorationFilter.groovy +++ b/spring-cloud-netflix-zuul/src/main/resources/filters/pre/PreDecorationFilter.groovy @@ -3,8 +3,8 @@ package filters.pre import com.netflix.zuul.context.RequestContext import org.slf4j.Logger import org.slf4j.LoggerFactory -import org.springframework.platform.netflix.zuul.Routes -import org.springframework.platform.netflix.zuul.SpringFilter +import org.springframework.cloud.netflix.zuul.Routes +import org.springframework.cloud.netflix.zuul.SpringFilter class PreDecorationFilter extends SpringFilter { private static Logger LOG = LoggerFactory.getLogger(PreDecorationFilter.class); diff --git a/spring-cloud-netflix-zuul/src/main/resources/filters/route/RibbonRequest.groovy b/spring-cloud-netflix-zuul/src/main/resources/filters/route/RibbonRequest.groovy index 7509d029..e712a3cd 100644 --- a/spring-cloud-netflix-zuul/src/main/resources/filters/route/RibbonRequest.groovy +++ b/spring-cloud-netflix-zuul/src/main/resources/filters/route/RibbonRequest.groovy @@ -15,14 +15,14 @@ import com.netflix.zuul.util.HTTPRequestUtils import com.sun.jersey.core.util.MultivaluedMapImpl import org.slf4j.Logger import org.slf4j.LoggerFactory -import org.springframework.platform.netflix.zuul.RibbonCommand +import org.springframework.cloud.netflix.zuul.RibbonCommand import javax.servlet.http.HttpServletRequest import javax.ws.rs.core.MultivaluedMap import java.util.zip.GZIPInputStream import static HttpRequest.Verb -import static org.springframework.platform.netflix.feign.FeignConfigurer.setServiceListClassAndVIP +import static org.springframework.cloud.netflix.feign.FeignConfigurer.setServiceListClassAndVIP class RibbonRequest extends ZuulFilter {