From c9b3fa7fb0eb227d9bbba99ee0c6b8c9c59e8000 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 4 Dec 2014 14:20:13 -0700 Subject: [PATCH] use @EnableDiscoveryClient and @EnableCircuitBreaker --- .../cli/compiler/EurekaClientCompilerAutoConfiguration.java | 6 +++--- .../cli/compiler/EurekaServerCompilerAutoConfiguration.java | 2 +- .../cli/compiler/HystrixCompilerAutoConfiguration.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaClientCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaClientCompilerAutoConfiguration.java index c87dc7f..49f53f8 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaClientCompilerAutoConfiguration.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaClientCompilerAutoConfiguration.java @@ -30,20 +30,20 @@ public class EurekaClientCompilerAutoConfiguration extends CompilerAutoConfigura @Override public boolean matches(ClassNode classNode) { - return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableEurekaClient"); + return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableDiscoveryClient"); } @Override public void applyDependencies(DependencyCustomizer dependencies) { dependencies.ifAnyMissingClasses( - "org.springframework.cloud.netflix.eureka.EnableEurekaClient").add( + "org.springframework.cloud.netflix.eureka.EnableDiscoveryClient").add( "spring-cloud-starter-eureka"); } @Override public void applyImports(ImportCustomizer imports) throws CompilationFailedException { imports.addImports( - "org.springframework.cloud.netflix.eureka.EnableEurekaClient", + "org.springframework.cloud.client.discovery.EnableDiscoveryClient", "org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean", "org.springframework.cloud.netflix.eureka.EurekaClientConfigBean", "com.netflix.discovery.DiscoveryClient", diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaServerCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaServerCompilerAutoConfiguration.java index 148d56f..6849994 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaServerCompilerAutoConfiguration.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/EurekaServerCompilerAutoConfiguration.java @@ -43,7 +43,7 @@ public class EurekaServerCompilerAutoConfiguration extends CompilerAutoConfigura @Override public void applyImports(ImportCustomizer imports) throws CompilationFailedException { imports.addImports("org.springframework.cloud.netflix.eureka.server.EnableEurekaServer", - "org.springframework.cloud.netflix.eureka.EnableEurekaClient", + "org.springframework.cloud.client.discovery.EnableDiscoveryClient", "org.springframework.cloud.netflix.eureka.EurekaServerConfigBean", "org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean", "org.springframework.cloud.netflix.eureka.EurekaClientConfigBean", diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java index 61b288c..fb4c458 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixCompilerAutoConfiguration.java @@ -30,20 +30,20 @@ public class HystrixCompilerAutoConfiguration extends CompilerAutoConfiguration @Override public boolean matches(ClassNode classNode) { - return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableHystrix"); + return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableCircuitBreaker"); } @Override public void applyDependencies(DependencyCustomizer dependencies) { dependencies.ifAnyMissingClasses( - "org.springframework.cloud.netflix.hystrix.EnableHystrix") + "org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker") .add("spring-cloud-starter-hystrix"); } @Override public void applyImports(ImportCustomizer imports) throws CompilationFailedException { imports.addImports( - "org.springframework.cloud.netflix.hystrix.EnableHystrix", + "org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker", "com.netflix.hystrix.contrib.javanica.annotation.HystrixCollapser", "com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand"); }