From e326722c55253f97df1e53d7c1af4e987844c7a9 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 10 Dec 2019 10:28:16 -0500 Subject: [PATCH] Deprecate KTU.senderProps() --- .../kafka/test/utils/KafkaTestUtils.java | 16 ++++++++++++++-- ...iveKafkaProducerTemplateIntegrationTests.java | 2 +- ...ducerTemplateTransactionIntegrationTests.java | 2 +- .../kafka/streams/KafkaStreamsBranchTests.java | 2 +- .../KafkaStreamsJsonSerializationTests.java | 2 +- .../kafka/streams/KafkaStreamsTests.java | 2 +- ...ringDeserializationExceptionHandlerTests.java | 2 +- 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/spring-kafka-test/src/main/java/org/springframework/kafka/test/utils/KafkaTestUtils.java b/spring-kafka-test/src/main/java/org/springframework/kafka/test/utils/KafkaTestUtils.java index 88202912..b46e79a3 100644 --- a/spring-kafka-test/src/main/java/org/springframework/kafka/test/utils/KafkaTestUtils.java +++ b/spring-kafka-test/src/main/java/org/springframework/kafka/test/utils/KafkaTestUtils.java @@ -82,7 +82,7 @@ public final class KafkaTestUtils { * @return the properties. */ public static Map producerProps(EmbeddedKafkaBroker embeddedKafka) { - return senderProps(embeddedKafka.getBrokersAsString()); + return producerProps(embeddedKafka.getBrokersAsString()); } @@ -109,8 +109,9 @@ public final class KafkaTestUtils { * Set up test properties for an {@code } producer. * @param brokers the bootstrapServers property. * @return the properties. + * @since 2.3.5 */ - public static Map senderProps(String brokers) { + public static Map producerProps(String brokers) { Map props = new HashMap<>(); props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, brokers); props.put(ProducerConfig.RETRIES_CONFIG, 0); @@ -122,6 +123,17 @@ public final class KafkaTestUtils { return props; } + /** + * Set up test properties for an {@code } producer. + * @param brokers the bootstrapServers property. + * @return the properties. + * @deprecated in favor of {@link #producerProps(String)}. + */ + @Deprecated + public static Map senderProps(String brokers) { + return producerProps(brokers); + } + /** * Poll the consumer, expecting a single record for the specified topic. * @param consumer the consumer. diff --git a/spring-kafka/src/test/java/org/springframework/kafka/core/reactive/ReactiveKafkaProducerTemplateIntegrationTests.java b/spring-kafka/src/test/java/org/springframework/kafka/core/reactive/ReactiveKafkaProducerTemplateIntegrationTests.java index ce149417..286aaee8 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/core/reactive/ReactiveKafkaProducerTemplateIntegrationTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/core/reactive/ReactiveKafkaProducerTemplateIntegrationTests.java @@ -109,7 +109,7 @@ public class ReactiveKafkaProducerTemplateIntegrationTests { private SenderOptions setupSenderOptionsWithDefaultTopic() { Map senderProps = - KafkaTestUtils.senderProps(EmbeddedKafkaCondition.getBroker().getBrokersAsString()); + KafkaTestUtils.producerProps(EmbeddedKafkaCondition.getBroker().getBrokersAsString()); return SenderOptions.create(senderProps); } diff --git a/spring-kafka/src/test/java/org/springframework/kafka/core/reactive/ReactiveKafkaProducerTemplateTransactionIntegrationTests.java b/spring-kafka/src/test/java/org/springframework/kafka/core/reactive/ReactiveKafkaProducerTemplateTransactionIntegrationTests.java index b0d27aad..a7375136 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/core/reactive/ReactiveKafkaProducerTemplateTransactionIntegrationTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/core/reactive/ReactiveKafkaProducerTemplateTransactionIntegrationTests.java @@ -97,7 +97,7 @@ public class ReactiveKafkaProducerTemplateTransactionIntegrationTests { private SenderOptions setupSenderOptionsWithDefaultTopic() { Map senderProps = - KafkaTestUtils.senderProps(EmbeddedKafkaCondition.getBroker().getBrokersAsString()); + KafkaTestUtils.producerProps(EmbeddedKafkaCondition.getBroker().getBrokersAsString()); SenderOptions senderOptions = SenderOptions.create(senderProps); senderOptions = senderOptions .producerProperty(ProducerConfig.TRANSACTIONAL_ID_CONFIG, "reactive.transaction") diff --git a/spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsBranchTests.java b/spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsBranchTests.java index 62215a93..c145d29c 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsBranchTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsBranchTests.java @@ -134,7 +134,7 @@ public class KafkaStreamsBranchTests { @Bean public Map producerConfigs() { - return KafkaTestUtils.senderProps(this.brokerAddresses); + return KafkaTestUtils.producerProps(this.brokerAddresses); } @Bean diff --git a/spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsJsonSerializationTests.java b/spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsJsonSerializationTests.java index b7ab00e0..46112bfe 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsJsonSerializationTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsJsonSerializationTests.java @@ -191,7 +191,7 @@ public class KafkaStreamsJsonSerializationTests { @Bean public Map producerConfigs() { - Map senderProps = KafkaTestUtils.senderProps(this.brokerAddresses); + Map senderProps = KafkaTestUtils.producerProps(this.brokerAddresses); senderProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, JsonSerializer.class); senderProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, JsonSerializer.class); return senderProps; diff --git a/spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsTests.java b/spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsTests.java index fc4bdc5c..5e3392f1 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsTests.java @@ -181,7 +181,7 @@ public class KafkaStreamsTests { @Bean public Map producerConfigs() { - return KafkaTestUtils.senderProps(this.brokerAddresses); + return KafkaTestUtils.producerProps(this.brokerAddresses); } @Bean diff --git a/spring-kafka/src/test/java/org/springframework/kafka/streams/RecoveringDeserializationExceptionHandlerTests.java b/spring-kafka/src/test/java/org/springframework/kafka/streams/RecoveringDeserializationExceptionHandlerTests.java index cdb0ad27..f2d68e7c 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/streams/RecoveringDeserializationExceptionHandlerTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/streams/RecoveringDeserializationExceptionHandlerTests.java @@ -169,7 +169,7 @@ public class RecoveringDeserializationExceptionHandlerTests { @Bean public Map producerConfigs() { - Map senderProps = KafkaTestUtils.senderProps(this.brokerAddresses); + Map senderProps = KafkaTestUtils.producerProps(this.brokerAddresses); senderProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class); senderProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class); return senderProps;