From 44b38d7a965afa8de36cb946487cc29f90c695c4 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 9 Sep 2015 10:40:04 +0100 Subject: [PATCH] SWitch oauth2 load balancer support on --- .../cloud/cli/compiler/BaseStreamCompilerAutoConfiguration.java | 1 + ...on.java => OAuth2LoadBalancedCompilerAutoConfiguration.java} | 2 +- ....springframework.boot.cli.compiler.CompilerAutoConfiguration | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) rename spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/{OAuth2SsoCompilerAutoConfiguration.java => OAuth2LoadBalancedCompilerAutoConfiguration.java} (93%) diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/BaseStreamCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/BaseStreamCompilerAutoConfiguration.java index 9b32964..176db70 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/BaseStreamCompilerAutoConfiguration.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/BaseStreamCompilerAutoConfiguration.java @@ -62,6 +62,7 @@ public abstract class BaseStreamCompilerAutoConfiguration extends CompilerAutoCo public void applyImports(ImportCustomizer imports) throws CompilationFailedException { this.integration.applyImports(imports); imports.addImports("org.springframework.boot.groovy.cloud.EnableBinding"); + imports.addImport("IntegrationMessageSource", "org.springframework.integration.core.MessageSource"); imports.addStarImports("org.springframework.cloud.stream.annotation", "org.springframework.cloud.stream.messaging"); } diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/OAuth2SsoCompilerAutoConfiguration.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/OAuth2LoadBalancedCompilerAutoConfiguration.java similarity index 93% rename from spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/OAuth2SsoCompilerAutoConfiguration.java rename to spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/OAuth2LoadBalancedCompilerAutoConfiguration.java index 665a693..32308db 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/OAuth2SsoCompilerAutoConfiguration.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/OAuth2LoadBalancedCompilerAutoConfiguration.java @@ -24,7 +24,7 @@ import org.springframework.boot.cli.compiler.DependencyCustomizer; * @author Dave Syer * */ -public class OAuth2SsoCompilerAutoConfiguration extends CompilerAutoConfiguration { +public class OAuth2LoadBalancedCompilerAutoConfiguration extends CompilerAutoConfiguration { @Override public boolean matches(ClassNode classNode) { diff --git a/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration b/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration index 4df4140..1c2eb57 100644 --- a/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration +++ b/spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration @@ -4,6 +4,7 @@ org.springframework.cloud.cli.compiler.EurekaClientCompilerAutoConfiguration org.springframework.cloud.cli.compiler.EurekaServerCompilerAutoConfiguration org.springframework.cloud.cli.compiler.HystrixCompilerAutoConfiguration org.springframework.cloud.cli.compiler.HystrixDashboardCompilerAutoConfiguration +org.springframework.cloud.cli.compiler.OAuth2LoadBalancedCompilerAutoConfiguration org.springframework.cloud.cli.compiler.RibbonClientCompilerAutoConfiguration org.springframework.cloud.cli.compiler.StreamKafkaCompilerAutoConfiguration org.springframework.cloud.cli.compiler.StreamRabbitCompilerAutoConfiguration