From 5964d160a1cef0812c48eb065e68fd18616cba30 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 4 Dec 2014 11:51:18 -0700 Subject: [PATCH] remove deprecated @EnableEurekaClient and replace with @EnableDiscoveryClient fixes gh-85 --- ...ntConfigServiceBootstrapConfiguration.java | 4 +- .../netflix/eureka/EnableEurekaClient.java | 37 ------------------- .../zuul/SampleZuulProxyApplication.java | 4 +- .../server/EurekaServerConfiguration.java | 4 +- 4 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EnableEurekaClient.java diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceBootstrapConfiguration.java index 7034aa2dc..8bff7d167 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceBootstrapConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceBootstrapConfiguration.java @@ -20,9 +20,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.config.client.ConfigClientProperties; import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator; -import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration; import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Configuration; @@ -44,7 +44,7 @@ import com.netflix.discovery.DiscoveryClient; @ConditionalOnClass({ DiscoveryClient.class, ConfigServicePropertySourceLocator.class }) @ConditionalOnExpression("${spring.cloud.config.discovery.enabled:false}") @Configuration -@EnableEurekaClient +@EnableDiscoveryClient @Import(EurekaClientAutoConfiguration.class) @Slf4j public class DiscoveryClientConfigServiceBootstrapConfiguration implements diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EnableEurekaClient.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EnableEurekaClient.java deleted file mode 100644 index ca6b5357e..000000000 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EnableEurekaClient.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2013-2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.cloud.netflix.eureka; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.springframework.context.annotation.Import; - -/** - * @author Dave Syer - * - */ -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Import(EurekaDiscoveryClientConfiguration.class) -@Deprecated -public @interface EnableEurekaClient { - -} diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/SampleZuulProxyApplication.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/SampleZuulProxyApplication.java index a27300d41..c3302eda9 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/SampleZuulProxyApplication.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/SampleZuulProxyApplication.java @@ -2,7 +2,7 @@ package org.springframework.cloud.netflix.zuul; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.netflix.eureka.EnableEurekaClient; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.annotation.Bean; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -13,7 +13,7 @@ import com.netflix.zuul.ZuulFilter; @SpringBootApplication @RestController @EnableZuulProxy -@EnableEurekaClient +@EnableDiscoveryClient public class SampleZuulProxyApplication { @RequestMapping("/testing123") diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfiguration.java index f9eb38e07..f2daa4dfb 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfiguration.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerConfiguration.java @@ -4,7 +4,7 @@ import javax.servlet.Filter; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.embedded.FilterRegistrationBean; -import org.springframework.cloud.netflix.eureka.EnableEurekaClient; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.netflix.eureka.EurekaServerConfigBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -22,7 +22,7 @@ import com.sun.jersey.spi.container.servlet.ServletContainer; */ @Configuration @Import(EurekaServerInitializerConfiguration.class) -@EnableEurekaClient +@EnableDiscoveryClient public class EurekaServerConfiguration extends WebMvcConfigurerAdapter { @Bean