From 7ffe9070e3957f5097e8bb76289275a456c61dd8 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Thu, 4 Feb 2016 08:55:07 -0500 Subject: [PATCH] removed more lattice references --- .../kafka-binder-lattice.properties | 25 ------------------- .../RabbitServiceAutoConfiguration.java | 5 ++-- .../config/RedisServiceAutoConfiguration.java | 4 ++- 3 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/resources/META-INF/spring-cloud-stream/kafka-binder-lattice.properties diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/resources/META-INF/spring-cloud-stream/kafka-binder-lattice.properties b/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/resources/META-INF/spring-cloud-stream/kafka-binder-lattice.properties deleted file mode 100644 index 963496210..000000000 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/resources/META-INF/spring-cloud-stream/kafka-binder-lattice.properties +++ /dev/null @@ -1,25 +0,0 @@ -spring.cloud.stream.binder.kafka.brokers=kafka.192.168.11.11.xip.io -spring.cloud.stream.binder.kafka.defaultBrokerPort=9092 -spring.cloud.stream.binder.kafka.zkNodes=kafka.192.168.11.11.xip.io -spring.cloud.stream.binder.kafka.defaultZkPort=2181 -spring.cloud.stream.binder.kafka.mode=embeddedHeaders -spring.cloud.stream.binder.kafka.offsetStoreTopic=SpringXdOffsets -spring.cloud.stream.binder.kafka.offsetStoreSegmentSize=25000000 -spring.cloud.stream.binder.kafka.offsetStoreRetentionTime=60000 -spring.cloud.stream.binder.kafka.offsetStoreRequiredAcks=1 -spring.cloud.stream.binder.kafka.offsetStoreMaxFetchSize=1048576 -spring.cloud.stream.binder.kafka.offsetStoreBatchBytes=16384 -spring.cloud.stream.binder.kafka.offsetStoreBatchTime=1000 -spring.cloud.stream.binder.kafka.offsetUpdateTimeWindow=10000 -spring.cloud.stream.binder.kafka.offsetUpdateCount=0 -spring.cloud.stream.binder.kafka.offsetUpdateShutdownTimeout=2000 -spring.cloud.stream.binder.kafka.default.batchSize=16384 -spring.cloud.stream.binder.kafka.default.batchTimeout=0 -spring.cloud.stream.binder.kafka.default.requiredAcks=1 -spring.cloud.stream.binder.kafka.default.replicationFactor=1 -spring.cloud.stream.binder.kafka.default.concurrency=1 -spring.cloud.stream.binder.kafka.default.compressionCodec=none -spring.cloud.stream.binder.kafka.default.autoCommitEnabled=true -spring.cloud.stream.binder.kafka.default.fetchSize=1048576 -spring.cloud.stream.binder.kafka.default.minPartitionCount=1 -spring.cloud.stream.binder.kafka.default.queueSize=8192 diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java index 6803e8a60..c0385be7c 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitServiceAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.PropertySource; /** - * Bind to services, either locally or in a Lattice environment. + * Bind to services, either locally or in a cloud environment. * * @author Mark Fisher * @author Dave Syer @@ -49,10 +49,12 @@ import org.springframework.context.annotation.PropertySource; @AutoConfigureBefore({CloudAutoConfiguration.class, RabbitAutoConfiguration.class}) @PropertySource("classpath:/META-INF/spring-cloud-stream/rabbit-binder.properties") public class RabbitServiceAutoConfiguration { + @Configuration @Profile("cloud") @ConditionalOnClass(Cloud.class) protected static class CloudConfig { + @Bean public Cloud cloud() { return new CloudFactory().getCloud(); @@ -69,7 +71,6 @@ public class RabbitServiceAutoConfiguration { @Profile("!cloud") @Import(RabbitAutoConfiguration.class) protected static class NoCloudConfig { - } @Bean diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/main/java/org/springframework/cloud/stream/binder/redis/config/RedisServiceAutoConfiguration.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/main/java/org/springframework/cloud/stream/binder/redis/config/RedisServiceAutoConfiguration.java index 2be9a1093..56ca0d27a 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/main/java/org/springframework/cloud/stream/binder/redis/config/RedisServiceAutoConfiguration.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/main/java/org/springframework/cloud/stream/binder/redis/config/RedisServiceAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.PropertySource; import org.springframework.data.redis.connection.RedisConnectionFactory; /** - * Bind to services, either locally or in a Lattice environment. + * Bind to services, either locally or in a cloud environment. * * @author Mark Fisher * @author Dave Syer @@ -52,10 +52,12 @@ public class RedisServiceAutoConfiguration { @ConditionalOnClass(Cloud.class) @Profile("cloud") protected static class CloudConfig { + @Bean public Cloud cloud() { return new CloudFactory().getCloud(); } + @Bean @ConditionalOnMissingBean(RedisConnectionFactory.class) RedisConnectionFactory redisConnectionFactory(Cloud cloud) {