Update package names

This commit is contained in:
Dave Syer
2014-08-29 13:34:37 +01:00
parent d23149a493
commit 8106314a6a
63 changed files with 89 additions and 89 deletions

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
package org.springframework.platform.netflix.endpoint;
package org.springframework.cloud.netflix.endpoint;
import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsStreamServlet;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
package org.springframework.platform.netflix.eureka.event;
package org.springframework.cloud.netflix.eureka.event;
import lombok.Data;
import lombok.EqualsAndHashCode;

View File

@@ -1,4 +1,4 @@
package org.springframework.platform.netflix.eureka.event;
package org.springframework.cloud.netflix.eureka.event;
import com.netflix.appinfo.InstanceInfo;

View File

@@ -1,4 +1,4 @@
package org.springframework.platform.netflix.eureka.event;
package org.springframework.cloud.netflix.eureka.event;
import com.netflix.appinfo.InstanceInfo;

View File

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

View File

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

View File

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

View File

@@ -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.

View File

@@ -1,4 +1,4 @@
package org.springframework.platform.netflix.feign;
package org.springframework.cloud.netflix.feign;
import java.util.ArrayList;
import java.util.Collection;

View File

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

View File

@@ -1,4 +1,4 @@
package org.springframework.platform.netflix.feign;
package org.springframework.cloud.netflix.feign;
import java.io.IOException;
import java.io.InputStream;

View File

@@ -1,4 +1,4 @@
package org.springframework.platform.netflix.feign;
package org.springframework.cloud.netflix.feign;
import com.google.common.base.Charsets;

View File

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

View File

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

View File

@@ -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.

View File

@@ -1,4 +1,4 @@
package org.springframework.platform.netflix.hystrix;
package org.springframework.cloud.netflix.hystrix;
/**
* Created by sgibb on 6/19/14.

View File

@@ -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.*;

View File

@@ -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

View File

@@ -1,4 +1,4 @@
package org.springframework.platform.netflix.zuul;
package org.springframework.cloud.netflix.zuul;
import java.util.Map;

View File

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

View File

@@ -1,4 +1,4 @@
package org.springframework.platform.netflix.zuul;
package org.springframework.cloud.netflix.zuul;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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
org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration,\
org.springframework.cloud.netflix.eureka.EurekaServerAutoConfiguration,\
org.springframework.cloud.netflix.feign.FeignAutoConfiguration

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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

View File

@@ -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

View File

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

View File

@@ -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

View File

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

View File

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