From 05e12efb84459086748c14616a33be6d52951fee Mon Sep 17 00:00:00 2001 From: David Turanski Date: Wed, 12 Aug 2015 14:48:07 -0400 Subject: [PATCH] replaced CodecConfiguration with spring.factories add new line --- ...afkaMessageChannelBinderConfiguration.java | 48 +++++++++---------- ...bbitMessageChannelBinderConfiguration.java | 3 -- ...edisMessageChannelBinderConfiguration.java | 3 -- .../config/codec/CodecConfiguration.java | 34 ------------- .../main/resources/META-INF/spring.factories | 2 + 5 files changed, 25 insertions(+), 65 deletions(-) delete mode 100644 spring-cloud-stream-codec/src/main/java/org/springframework/cloud/stream/config/codec/CodecConfiguration.java create mode 100644 spring-cloud-stream-codec/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaMessageChannelBinderConfiguration.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaMessageChannelBinderConfiguration.java index 3c609219e..f9690b412 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaMessageChannelBinderConfiguration.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaMessageChannelBinderConfiguration.java @@ -19,10 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.stream.binder.kafka.KafkaMessageChannelBinder; -import org.springframework.cloud.stream.config.codec.CodecConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.integration.codec.Codec; import org.springframework.integration.kafka.support.ZookeeperConnect; @@ -30,50 +28,49 @@ import org.springframework.integration.kafka.support.ZookeeperConnect; * @author David Turanski */ @Configuration -@Import(CodecConfiguration.class) @EnableConfigurationProperties(KafkaBinderConfigurationProperties.class) @ConfigurationProperties(prefix = "spring.cloud.stream.binder.kafka") public class KafkaMessageChannelBinderConfiguration { - + private String zkAddress; - - private String brokers; - + + private String brokers; + private KafkaMessageChannelBinder.Mode mode; - + private String offsetStoreTopic; - + private int offsetStoreSegmentSize; - + private int offsetStoreRetentionTime; - + private int offsetStoreRequiredAcks; - + private int offsetStoreMaxFetchSize; - + private int offsetStoreBatchBytes; - + private int offsetStoreBatchTime; - + private int offsetUpdateTimeWindow; - + private int offsetUpdateCount; - + private int offsetUpdateShutdownTimeout; - + @Autowired private Codec codec; - + @Autowired private KafkaBinderConfigurationProperties kafkaBinderConfigurationProperties; - + @Bean ZookeeperConnect zookeeperConnect() { ZookeeperConnect zookeeperConnect = new ZookeeperConnect(); zookeeperConnect.setZkConnect(zkAddress); - return zookeeperConnect; + return zookeeperConnect; } - + @Bean KafkaMessageChannelBinder kafkaMessageChannelBinder() { KafkaMessageChannelBinder kafkaMessageChannelBinder = new KafkaMessageChannelBinder(zookeeperConnect(), @@ -90,7 +87,7 @@ public class KafkaMessageChannelBinderConfiguration { kafkaMessageChannelBinder.setOffsetUpdateTimeWindow(offsetUpdateTimeWindow); kafkaMessageChannelBinder.setOffsetUpdateCount(offsetUpdateCount); kafkaMessageChannelBinder.setOffsetUpdateShutdownTimeout(offsetUpdateShutdownTimeout); - + kafkaMessageChannelBinder.setDefaultAutoCommitEnabled(kafkaBinderConfigurationProperties.isAutoCommitEnabled()); kafkaMessageChannelBinder.setDefaultBatchSize(kafkaBinderConfigurationProperties.getBatchSize()); kafkaMessageChannelBinder.setDefaultBatchTimeout(kafkaBinderConfigurationProperties.getBatchTimeout()); @@ -101,9 +98,10 @@ public class KafkaMessageChannelBinderConfiguration { kafkaMessageChannelBinder.setDefaultMinPartitionCount(kafkaBinderConfigurationProperties .getMinPartitionCount()); kafkaMessageChannelBinder.setDefaultQueueSize(kafkaBinderConfigurationProperties.getQueueSize()); - kafkaMessageChannelBinder.setDefaultReplicationFactor(kafkaBinderConfigurationProperties.getReplicationFactor()); + kafkaMessageChannelBinder.setDefaultReplicationFactor(kafkaBinderConfigurationProperties + .getReplicationFactor()); kafkaMessageChannelBinder.setDefaultRequiredAcks(kafkaBinderConfigurationProperties.getRequiredAcks()); - + return kafkaMessageChannelBinder; } diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitMessageChannelBinderConfiguration.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitMessageChannelBinderConfiguration.java index d02b8b666..84669ba83 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitMessageChannelBinderConfiguration.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitMessageChannelBinderConfiguration.java @@ -27,14 +27,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.stream.binder.rabbit.ConnectionFactorySettings; import org.springframework.cloud.stream.binder.rabbit.RabbitMessageChannelBinder; -import org.springframework.cloud.stream.config.codec.CodecConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.integration.codec.Codec; @Configuration -@Import(CodecConfiguration.class) @EnableConfigurationProperties({RabbitBinderConfigurationProperties.class}) public class RabbitMessageChannelBinderConfiguration { diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/main/java/org/springframework/cloud/stream/binder/redis/config/RedisMessageChannelBinderConfiguration.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/main/java/org/springframework/cloud/stream/binder/redis/config/RedisMessageChannelBinderConfiguration.java index 624132448..6aaf219e2 100644 --- a/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/main/java/org/springframework/cloud/stream/binder/redis/config/RedisMessageChannelBinderConfiguration.java +++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-redis/src/main/java/org/springframework/cloud/stream/binder/redis/config/RedisMessageChannelBinderConfiguration.java @@ -19,10 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.stream.binder.redis.RedisMessageChannelBinder; -import org.springframework.cloud.stream.config.codec.CodecConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.integration.codec.Codec; @@ -30,7 +28,6 @@ import org.springframework.integration.codec.Codec; * @author David Turanski */ @Configuration -@Import(CodecConfiguration.class) @EnableConfigurationProperties(RedisBinderConfigurationProperties.class) @ConfigurationProperties(prefix = "spring.cloud.stream.binder.redis") public class RedisMessageChannelBinderConfiguration { diff --git a/spring-cloud-stream-codec/src/main/java/org/springframework/cloud/stream/config/codec/CodecConfiguration.java b/spring-cloud-stream-codec/src/main/java/org/springframework/cloud/stream/config/codec/CodecConfiguration.java deleted file mode 100644 index 03cdf7231..000000000 --- a/spring-cloud-stream-codec/src/main/java/org/springframework/cloud/stream/config/codec/CodecConfiguration.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 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.stream.config.codec; - -import org.springframework.cloud.stream.config.codec.kryo.KryoCodecAutoConfiguration; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -/** - * Generic {@link org.springframework.integration.codec.Codec} configuration imported by the - * Binder configuration. This is the default configuration for - * Kryo. To provide an alternate Codec implementation, - * remove this configuration from the classpath and replace this class to resolve the Binder configuration - * reference. - * - * @author David Turanski - */ -@Configuration -@Import(KryoCodecAutoConfiguration.class) -public class CodecConfiguration { -} diff --git a/spring-cloud-stream-codec/src/main/resources/META-INF/spring.factories b/spring-cloud-stream-codec/src/main/resources/META-INF/spring.factories new file mode 100644 index 000000000..bb62d5a5d --- /dev/null +++ b/spring-cloud-stream-codec/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration:\ +org.springframework.cloud.stream.config.codec.kryo.KryoCodecAutoConfiguration