SpringCloud/spring-cloud-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove references to redis binder

Browse Source
This commit is contained in:
Dave Syer
2016-04-18 16:43:56 +01:00
parent e3d4df790a
commit fe37df26f8
7 changed files with 8 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-cli-integration-tests/src/main/resources/META-INF/services/org.springframework.boot.cli.command.CommandFactory
View File

@@ -1 +0,0 @@
org.springframework.cloud.cli.command.CloudCommandFactory

12
spring-cloud-cli-integration-tests/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration
View File

@@ -1,12 +0,0 @@
org.springframework.cloud.cli.compiler.SpringCloudCompilerAutoConfiguration
org.springframework.cloud.cli.compiler.ConfigServerCompilerAutoConfiguration
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
org.springframework.cloud.cli.compiler.StreamRedisCompilerAutoConfiguration
org.springframework.cloud.cli.compiler.ZuulCompilerAutoConfiguration

1
spring-cloud-cli-integration-tests/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.SpringBootAstTransformation
View File

@@ -1 +0,0 @@
org.springframework.cloud.cli.compiler.SpringCloudBomAstTransformation

6
spring-cloud-cli/src/main/java/org/springframework/boot/groovy/cloud/EnableBinding.java
View File

@@ -35,8 +35,8 @@ import org.springframework.core.annotation.AliasFor;
@org.springframework.cloud.stream.annotation.EnableBinding
public @interface EnableBinding {
@AliasFor(annotation=org.springframework.cloud.stream.annotation.EnableBinding.class, attribute="value")
Class<?>[]value() default {};
@AliasFor(annotation = org.springframework.cloud.stream.annotation.EnableBinding.class, attribute = "value")
Class<?>[] value() default {};
String transport() default "redis";
String transport() default "rabbit";
}

8
spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/BaseStreamCompilerAutoConfiguration.java
View File

@@ -30,7 +30,8 @@ import org.springframework.util.SystemPropertyUtils;
* @author Dave Syer
*
*/
public abstract class BaseStreamCompilerAutoConfiguration extends CompilerAutoConfiguration {
public abstract class BaseStreamCompilerAutoConfiguration
extends CompilerAutoConfiguration {
private SpringIntegrationCompilerAutoConfiguration integration = new SpringIntegrationCompilerAutoConfiguration();
@@ -48,7 +49,7 @@ public abstract class BaseStreamCompilerAutoConfiguration extends CompilerAutoCo
if (PatternMatchUtils.simpleMatch(annotation,
annotationNode.getClassNode().getName())) {
Expression expression = annotationNode.getMembers().get("transport");
String transport = expression == null ? "redis" : expression.getText();
String transport = expression == null ? "rabbit" : expression.getText();
if (transport != null) {
transport = SystemPropertyUtils.resolvePlaceholders(transport);
}
@@ -62,7 +63,8 @@ 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.addImport("IntegrationMessageSource",
"org.springframework.integration.core.MessageSource");
imports.addStarImports("org.springframework.cloud.stream.annotation",
"org.springframework.cloud.stream.messaging");
}

39
spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/StreamRedisCompilerAutoConfiguration.java
View File

@@ -1,39 +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.cli.compiler;
import org.springframework.boot.cli.compiler.DependencyCustomizer;
/**
* @author Dave Syer
*
*/
public class StreamRedisCompilerAutoConfiguration
extends BaseStreamCompilerAutoConfiguration {
@Override
protected String getTransport() {
return "redis";
}
@Override
public void applyDependencies(DependencyCustomizer dependencies) {
dependencies
.ifAnyMissingClasses(
"org.springframework.cloud.stream.binder.redis.config.RedisServiceAutoConfiguration")
.add("spring-cloud-starter-stream-redis");
}
}

1
spring-cloud-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration
View File

@@ -8,5 +8,4 @@ org.springframework.cloud.cli.compiler.OAuth2LoadBalancedCompilerAutoConfigurati
org.springframework.cloud.cli.compiler.RibbonClientCompilerAutoConfiguration
org.springframework.cloud.cli.compiler.StreamKafkaCompilerAutoConfiguration
org.springframework.cloud.cli.compiler.StreamRabbitCompilerAutoConfiguration
org.springframework.cloud.cli.compiler.StreamRedisCompilerAutoConfiguration
org.springframework.cloud.cli.compiler.ZuulCompilerAutoConfiguration