From 02c5670dda349a55435b71afde3106a7a053d4c5 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 2 Sep 2014 19:36:20 +0100 Subject: [PATCH] Make hystrix dashboard embeddable finally --- .../cloud/cli/compiler/HystrixCompilerAutoConfiguration.java | 4 ++-- .../compiler/HystrixDashboardCompilerAutoConfiguration.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 2cf8675..61b288c 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 @@ -36,14 +36,14 @@ public class HystrixCompilerAutoConfiguration extends CompilerAutoConfiguration @Override public void applyDependencies(DependencyCustomizer dependencies) { dependencies.ifAnyMissingClasses( - "org.springframework.cloud.netflix.hystrix.annotations.EnableHystrix") + "org.springframework.cloud.netflix.hystrix.EnableHystrix") .add("spring-cloud-starter-hystrix"); } @Override public void applyImports(ImportCustomizer imports) throws CompilationFailedException { imports.addImports( - "org.springframework.cloud.netflix.hystrix.annotations.EnableHystrix", + "org.springframework.cloud.netflix.hystrix.EnableHystrix", "com.netflix.hystrix.contrib.javanica.annotation.HystrixCollapser", "com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand"); } diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixDashboardCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixDashboardCompilerAutoConfiguration.java index e1631c3..eed521d 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixDashboardCompilerAutoConfiguration.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/HystrixDashboardCompilerAutoConfiguration.java @@ -36,14 +36,14 @@ public class HystrixDashboardCompilerAutoConfiguration extends CompilerAutoConfi @Override public void applyDependencies(DependencyCustomizer dependencies) { dependencies.ifAnyMissingClasses( - "org.springframework.cloud.netflix.hystrix.annotations.EnableHystrixDashboard") + "org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard") .add("spring-cloud-starter-hystrix-dashboard"); } @Override public void applyImports(ImportCustomizer imports) throws CompilationFailedException { imports.addImports( - "org.springframework.cloud.netflix.hystrix.annotations.EnableHystrixDashboard"); + "org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard"); } }