Deprecate KTU.senderProps()

Author: garyrussell

spring-kafka-test/src/main/java/org/springframework/kafka/test/utils/KafkaTestUtils.java

@@ -82,7 +82,7 @@ public static Map<String, Object> consumerProps(String group, String autoCommit,
 	 * @return the properties.
 	 */
 	public static Map<String, Object> producerProps(EmbeddedKafkaBroker embeddedKafka) {
-		return senderProps(embeddedKafka.getBrokersAsString());
+		return producerProps(embeddedKafka.getBrokersAsString());
 	}
 
 
@@ -109,8 +109,9 @@ public static Map<String, Object> consumerProps(String brokers, String group, St
 	 * Set up test properties for an {@code <Integer, String>} producer.
 	 * @param brokers the bootstrapServers property.
 	 * @return the properties.
+	 * @since 2.3.5
 	 */
-	public static Map<String, Object> senderProps(String brokers) {
+	public static Map<String, Object> producerProps(String brokers) {
 		Map<String, Object> props = new HashMap<>();
 		props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, brokers);
 		props.put(ProducerConfig.RETRIES_CONFIG, 0);
@@ -122,6 +123,17 @@ public static Map<String, Object> senderProps(String brokers) {
 		return props;
 	}
 
+	/**
+	 * Set up test properties for an {@code <Integer, String>} producer.
+	 * @param brokers the bootstrapServers property.
+	 * @return the properties.
+	 * @deprecated in favor of {@link #producerProps(String)}.
+	 */
+	@Deprecated
+	public static Map<String, Object> senderProps(String brokers) {
+		return producerProps(brokers);
+	}
+
 	/**
 	 * Poll the consumer, expecting a single record for the specified topic.
 	 * @param consumer the consumer.

spring-kafka/src/test/java/org/springframework/kafka/core/reactive/ReactiveKafkaProducerTemplateIntegrationTests.java

@@ -109,7 +109,7 @@ public void setUp() {
 
 	private SenderOptions<Integer, String> setupSenderOptionsWithDefaultTopic() {
 		Map<String, Object> senderProps =
-				KafkaTestUtils.senderProps(EmbeddedKafkaCondition.getBroker().getBrokersAsString());
+				KafkaTestUtils.producerProps(EmbeddedKafkaCondition.getBroker().getBrokersAsString());
 		return SenderOptions.create(senderProps);
 	}
 

spring-kafka/src/test/java/org/springframework/kafka/core/reactive/ReactiveKafkaProducerTemplateTransactionIntegrationTests.java

@@ -97,7 +97,7 @@ public void setUp() {
 
 	private SenderOptions<Integer, String> setupSenderOptionsWithDefaultTopic() {
 		Map<String, Object> senderProps =
-				KafkaTestUtils.senderProps(EmbeddedKafkaCondition.getBroker().getBrokersAsString());
+				KafkaTestUtils.producerProps(EmbeddedKafkaCondition.getBroker().getBrokersAsString());
 		SenderOptions<Integer, String> senderOptions = SenderOptions.create(senderProps);
 		senderOptions = senderOptions
 				.producerProperty(ProducerConfig.TRANSACTIONAL_ID_CONFIG, "reactive.transaction")

spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsBranchTests.java

@@ -134,7 +134,7 @@ public ProducerFactory<Integer, String> producerFactory() {
 
 		@Bean
 		public Map<String, Object> producerConfigs() {
-			return KafkaTestUtils.senderProps(this.brokerAddresses);
+			return KafkaTestUtils.producerProps(this.brokerAddresses);
 		}
 
 		@Bean

spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsJsonSerializationTests.java

@@ -191,7 +191,7 @@ public static class Config {
 
 		@Bean
 		public Map<String, Object> producerConfigs() {
-			Map<String, Object> senderProps = KafkaTestUtils.senderProps(this.brokerAddresses);
+			Map<String, Object> 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;

spring-kafka/src/test/java/org/springframework/kafka/streams/KafkaStreamsTests.java

@@ -181,7 +181,7 @@ public ProducerFactory<Integer, String> producerFactory() {
 
 		@Bean
 		public Map<String, Object> producerConfigs() {
-			return KafkaTestUtils.senderProps(this.brokerAddresses);
+			return KafkaTestUtils.producerProps(this.brokerAddresses);
 		}
 
 		@Bean

spring-kafka/src/test/java/org/springframework/kafka/streams/RecoveringDeserializationExceptionHandlerTests.java

@@ -169,7 +169,7 @@ public ProducerFactory<byte[], byte[]> producerFactory() {
 
 		@Bean
 		public Map<String, Object> producerConfigs() {
-			Map<String, Object> senderProps = KafkaTestUtils.senderProps(this.brokerAddresses);
+			Map<String, Object> 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;