GH-2164: Remove More Dead Code

Author: garyrussell

spring-kafka/src/main/java/org/springframework/kafka/core/DefaultKafkaProducerFactory.java

@@ -437,7 +437,6 @@ public void setMaxAge(Duration maxAge) {
 	 *  properties applied
 	 */
 	@Override
-	@SuppressWarnings("deprecation")
 	public ProducerFactory<K, V> copyWithConfigurationOverride(Map<String, Object> overrideProperties) {
 		Map<String, Object> producerProperties = new HashMap<>(getConfigurationProperties());
 		producerProperties.putAll(overrideProperties);
@@ -447,7 +446,6 @@ public ProducerFactory<K, V> copyWithConfigurationOverride(Map<String, Object> o
 						getKeySerializerSupplier(),
 						getValueSerializerSupplier());
 		newFactory.setPhysicalCloseTimeout((int) getPhysicalCloseTimeout().getSeconds());
-		newFactory.setProducerPerConsumerPartition(isProducerPerConsumerPartition());
 		newFactory.setProducerPerThread(isProducerPerThread());
 		for (ProducerPostProcessor<K, V> templatePostProcessor : getPostProcessors()) {
 			newFactory.addPostProcessor(templatePostProcessor);

spring-kafka/src/main/java/org/springframework/kafka/core/KafkaTemplate.java

@@ -59,7 +59,6 @@
 import org.springframework.kafka.support.ProducerListener;
 import org.springframework.kafka.support.SendResult;
 import org.springframework.kafka.support.TopicPartitionOffset;
-import org.springframework.kafka.support.TransactionSupport;
 import org.springframework.kafka.support.converter.MessagingMessageConverter;
 import org.springframework.kafka.support.converter.RecordMessageConverter;
 import org.springframework.kafka.support.micrometer.MicrometerHolder;
@@ -496,14 +495,6 @@ public <T> T executeInTransaction(OperationsCallback<K, V, T> callback) {
 		Assert.state(this.transactional, "Producer factory does not support transactions");
 		Producer<K, V> producer = this.producers.get();
 		Assert.state(producer == null, "Nested calls to 'executeInTransaction' are not allowed");
-		String transactionIdSuffix;
-		if (this.producerFactory.isProducerPerConsumerPartition()) {
-			transactionIdSuffix = TransactionSupport.getTransactionIdSuffix();
-			TransactionSupport.clearTransactionIdSuffix();
-		}
-		else {
-			transactionIdSuffix = null;
-		}
 
 		producer = this.producerFactory.createProducer(this.transactionIdPrefix);
 
@@ -534,9 +525,6 @@ public <T> T executeInTransaction(OperationsCallback<K, V, T> callback) {
 			throw e;
 		}
 		finally {
-			if (transactionIdSuffix != null) {
-				TransactionSupport.setTransactionIdSuffix(transactionIdSuffix);
-			}
 			this.producers.remove();
 			closeProducer(producer, false);
 		}

spring-kafka/src/main/java/org/springframework/kafka/core/ProducerFactory.java

@@ -92,7 +92,11 @@ default void closeProducerFor(String transactionIdSuffix) {
 	 * Return the producerPerConsumerPartition.
 	 * @return the producerPerConsumerPartition.
 	 * @since 1.3.8
+	 * @deprecated no longer necessary because
+	 * {@code org.springframework.kafka.listener.ContainerProperties.EOSMode#V1} is no
+	 * longer supported.
 	 */
+	@Deprecated
 	default boolean isProducerPerConsumerPartition() {
 		return false;
 	}

spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java

@@ -76,7 +76,6 @@
 import org.springframework.kafka.KafkaException;
 import org.springframework.kafka.core.ConsumerFactory;
 import org.springframework.kafka.core.KafkaResourceHolder;
-import org.springframework.kafka.core.ProducerFactory;
 import org.springframework.kafka.event.ConsumerFailedToStartEvent;
 import org.springframework.kafka.event.ConsumerPartitionPausedEvent;
 import org.springframework.kafka.event.ConsumerPartitionResumedEvent;
@@ -102,7 +101,6 @@
 import org.springframework.kafka.support.LogIfLevelEnabled;
 import org.springframework.kafka.support.TopicPartitionOffset;
 import org.springframework.kafka.support.TopicPartitionOffset.SeekPosition;
-import org.springframework.kafka.support.TransactionSupport;
 import org.springframework.kafka.support.micrometer.MicrometerHolder;
 import org.springframework.kafka.support.serializer.DeserializationException;
 import org.springframework.kafka.support.serializer.ErrorHandlingDeserializer;
@@ -738,8 +736,6 @@ private final class ListenerConsumer implements SchedulingAwareRunnable, Consume
 
 		private Producer<?, ?> producer;
 
-		private boolean producerPerConsumerPartition;
-
 		private boolean commitRecovered;
 
 		private boolean wasIdle;
@@ -1022,10 +1018,6 @@ boolean isPartitionPaused(TopicPartition topicPartition) {
 
 		@Nullable
 		private TransactionTemplate determineTransactionTemplate() {
-			if (this.kafkaTxManager != null) {
-				this.producerPerConsumerPartition =
-						this.kafkaTxManager.getProducerFactory().isProducerPerConsumerPartition();
-			}
 			if (this.transactionManager != null) {
 				TransactionTemplate template = new TransactionTemplate(this.transactionManager);
 				TransactionDefinition definition = this.containerProperties.getTransactionDefinition();
@@ -1740,9 +1732,6 @@ private void wrapUp(@Nullable Throwable throwable) {
 						// No-op. Continue process
 					}
 				}
-				else {
-					closeProducers(partitions);
-				}
 			}
 			else {
 				this.logger.error("Fatal consumer exception; stopping container");
@@ -1995,11 +1984,6 @@ private void invokeBatchListenerInTx(final ConsumerRecords<K, V> records,
 				@Nullable final List<ConsumerRecord<K, V>> recordList) {
 
 			try {
-				if (this.subBatchPerPartition && this.producerPerConsumerPartition) {
-					ConsumerRecord<K, V> record = recordList == null ? records.iterator().next() : recordList.get(0);
-					TransactionSupport
-							.setTransactionIdSuffix(zombieFenceTxIdSuffix(record.topic(), record.partition())); // NOSONAR
-				}
 				this.transactionTemplate.execute(new TransactionCallbackWithoutResult() {
 
 					@Override
@@ -2028,11 +2012,6 @@ public void doInTransactionWithoutResult(TransactionStatus s) {
 				this.logger.error(e, "Transaction rolled back");
 				batchRollback(records, recordList, e);
 			}
-			finally {
-				if (this.subBatchPerPartition && this.producerPerConsumerPartition) {
-					TransactionSupport.clearTransactionIdSuffix();
-				}
-			}
 		}
 
 		private void batchRollback(final ConsumerRecords<K, V> records,
@@ -2327,11 +2306,6 @@ private void invokeRecordListenerInTx(final ConsumerRecords<K, V> records) {
 					this.logger.error(ex, "Transaction rolled back");
 					recordAfterRollback(iterator, record, ex);
 				}
-				finally {
-					if (this.producerPerConsumerPartition) {
-						TransactionSupport.clearTransactionIdSuffix();
-					}
-				}
 				if (this.commonRecordInterceptor != null) {
 					this.commonRecordInterceptor.afterRecord(record, this.consumer);
 				}
@@ -2344,10 +2318,6 @@ private void invokeRecordListenerInTx(final ConsumerRecords<K, V> records) {
 		}
 
 		private void invokeInTransaction(Iterator<ConsumerRecord<K, V>> iterator, final ConsumerRecord<K, V> record) {
-			if (this.producerPerConsumerPartition) {
-				TransactionSupport
-						.setTransactionIdSuffix(zombieFenceTxIdSuffix(record.topic(), record.partition()));
-			}
 			this.transactionTemplate.execute(new TransactionCallbackWithoutResult() {
 
 				@Override
@@ -3109,25 +3079,6 @@ public String toString() {
 					+ "\n]";
 		}
 
-		private void closeProducers(@Nullable Collection<TopicPartition> partitions) {
-			if (partitions != null) {
-				ProducerFactory<?, ?> producerFactory = this.kafkaTxManager.getProducerFactory();
-				partitions.forEach(tp -> {
-					try {
-						producerFactory.closeProducerFor(zombieFenceTxIdSuffix(tp.topic(), tp.partition()));
-					}
-					catch (Exception e) {
-						this.logger.error(e, () -> "Failed to close producer with transaction id suffix: "
-								+ zombieFenceTxIdSuffix(tp.topic(), tp.partition()));
-					}
-				});
-			}
-		}
-
-		private String zombieFenceTxIdSuffix(String topic, int partition) {
-			return this.consumerGroupId + "." + topic + "." + partition;
-		}
-
 		private final class ConsumerAcknowledgment implements Acknowledgment {
 
 			private final ConsumerRecord<K, V> record;
@@ -3246,47 +3197,40 @@ private class ListenerConsumerRebalanceListener implements ConsumerRebalanceList
 
 			@Override
 			public void onPartitionsRevoked(Collection<TopicPartition> partitions) {
+				if (this.consumerAwareListener != null) {
+					this.consumerAwareListener.onPartitionsRevokedBeforeCommit(ListenerConsumer.this.consumer,
+							partitions);
+				}
+				else {
+					this.userListener.onPartitionsRevoked(partitions);
+				}
 				try {
-					if (this.consumerAwareListener != null) {
-						this.consumerAwareListener.onPartitionsRevokedBeforeCommit(ListenerConsumer.this.consumer,
-								partitions);
-					}
-					else {
-						this.userListener.onPartitionsRevoked(partitions);
-					}
-					try {
-						// Wait until now to commit, in case the user listener added acks
-						commitPendingAcks();
-						fixTxOffsetsIfNeeded();
-					}
-					catch (Exception e) {
-						ListenerConsumer.this.logger.error(e, () -> "Fatal commit error after revocation "
-								+ partitions);
-					}
-					if (this.consumerAwareListener != null) {
-						this.consumerAwareListener.onPartitionsRevokedAfterCommit(ListenerConsumer.this.consumer,
-								partitions);
-					}
-					if (ListenerConsumer.this.consumerSeekAwareListener != null) {
-						ListenerConsumer.this.consumerSeekAwareListener.onPartitionsRevoked(partitions);
-					}
-					if (ListenerConsumer.this.assignedPartitions != null) {
-						ListenerConsumer.this.assignedPartitions.removeAll(partitions);
-					}
-					ListenerConsumer.this.pausedForNack.removeAll(partitions);
-					partitions.forEach(tp -> ListenerConsumer.this.lastCommits.remove(tp));
-					synchronized (ListenerConsumer.this) {
-						if (ListenerConsumer.this.offsetsInThisBatch != null) {
-							partitions.forEach(tp -> {
-								ListenerConsumer.this.offsetsInThisBatch.remove(tp);
-								ListenerConsumer.this.deferredOffsets.remove(tp);
-							});
-						}
-					}
+					// Wait until now to commit, in case the user listener added acks
+					commitPendingAcks();
+					fixTxOffsetsIfNeeded();
 				}
-				finally {
-					if (ListenerConsumer.this.kafkaTxManager != null) {
-						closeProducers(partitions);
+				catch (Exception e) {
+					ListenerConsumer.this.logger.error(e, () -> "Fatal commit error after revocation "
+							+ partitions);
+				}
+				if (this.consumerAwareListener != null) {
+					this.consumerAwareListener.onPartitionsRevokedAfterCommit(ListenerConsumer.this.consumer,
+							partitions);
+				}
+				if (ListenerConsumer.this.consumerSeekAwareListener != null) {
+					ListenerConsumer.this.consumerSeekAwareListener.onPartitionsRevoked(partitions);
+				}
+				if (ListenerConsumer.this.assignedPartitions != null) {
+					ListenerConsumer.this.assignedPartitions.removeAll(partitions);
+				}
+				ListenerConsumer.this.pausedForNack.removeAll(partitions);
+				partitions.forEach(tp -> ListenerConsumer.this.lastCommits.remove(tp));
+				synchronized (ListenerConsumer.this) {
+					if (ListenerConsumer.this.offsetsInThisBatch != null) {
+						partitions.forEach(tp -> {
+							ListenerConsumer.this.offsetsInThisBatch.remove(tp);
+							ListenerConsumer.this.deferredOffsets.remove(tp);
+						});
 					}
 				}
 			}
@@ -3349,33 +3293,25 @@ private void commitCurrentOffsets(Map<TopicPartition, OffsetAndMetadata> offsets
 				if (ListenerConsumer.this.transactionTemplate != null
 						&& ListenerConsumer.this.kafkaTxManager != null
 						&& !AssignmentCommitOption.LATEST_ONLY_NO_TX.equals(ListenerConsumer.this.autoCommitOption)) {
-					try {
-						offsetsToCommit.forEach((partition, offsetAndMetadata) -> {
-							if (ListenerConsumer.this.producerPerConsumerPartition) {
-								TransactionSupport.setTransactionIdSuffix(
-									zombieFenceTxIdSuffix(partition.topic(), partition.partition()));
-							}
-							ListenerConsumer.this.transactionTemplate
-									.execute(new TransactionCallbackWithoutResult() {
-
-										@Override
-										protected void doInTransactionWithoutResult(TransactionStatus status) {
-											KafkaResourceHolder<?, ?> holder =
-													(KafkaResourceHolder<?, ?>) TransactionSynchronizationManager
-															.getResource(ListenerConsumer.this.kafkaTxManager
-																	.getProducerFactory());
-											if (holder != null) {
-												doSendOffsets(holder.getProducer(),
-															Collections.singletonMap(partition, offsetAndMetadata));
-											}
+
+					offsetsToCommit.forEach((partition, offsetAndMetadata) -> {
+						ListenerConsumer.this.transactionTemplate
+								.execute(new TransactionCallbackWithoutResult() {
+
+									@Override
+									protected void doInTransactionWithoutResult(TransactionStatus status) {
+										KafkaResourceHolder<?, ?> holder =
+												(KafkaResourceHolder<?, ?>) TransactionSynchronizationManager
+														.getResource(ListenerConsumer.this.kafkaTxManager
+																.getProducerFactory());
+										if (holder != null) {
+											doSendOffsets(holder.getProducer(),
+														Collections.singletonMap(partition, offsetAndMetadata));
 										}
+									}
 
-									});
-						});
-					}
-					finally {
-						TransactionSupport.clearTransactionIdSuffix();
-					}
+								});
+					});
 				}
 				else {
 					ContainerProperties containerProps = KafkaMessageListenerContainer.this.getContainerProperties();

spring-kafka/src/main/java/org/springframework/kafka/support/TransactionSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2022 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.
@@ -21,8 +21,10 @@
  *
  * @author Gary Russell
  * @since 1.3.7
+ * @deprecated No longer used.
  *
  */
+@Deprecated
 public final class TransactionSupport {
 
 	private static final ThreadLocal<String> transactionIdSuffix = new ThreadLocal<>(); // NOSONAR

spring-kafka/src/test/java/org/springframework/kafka/core/DefaultKafkaProducerFactoryTests.java

@@ -54,7 +54,6 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.ContextStoppedEvent;
 import org.springframework.kafka.core.ProducerFactory.Listener;
-import org.springframework.kafka.support.TransactionSupport;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
 import org.springframework.kafka.transaction.KafkaTransactionManager;
 import org.springframework.transaction.CannotCreateTransactionException;
@@ -367,7 +366,6 @@ public void producerRemoved(String id, Producer producer) {
 		assertThat(adds).hasSize(2);
 		assertThat(removals).hasSize(2);
 
-		TransactionSupport.setTransactionIdSuffix("xx");
 		pf.createProducer("tx").close();
 		assertThat(adds).hasSize(3);
 		assertThat(removals).hasSize(2);
@@ -387,7 +385,6 @@ public void producerRemoved(String id, Producer producer) {
 		pf.reset();
 		assertThat(adds).hasSize(4);
 		assertThat(removals).hasSize(4);
-		TransactionSupport.clearTransactionIdSuffix();
 
 		pf.setProducerPerThread(true);
 		pf.createProducer().close();

spring-kafka/src/test/java/org/springframework/kafka/core/KafkaTemplateTests.java

@@ -516,7 +516,6 @@ void testConfigOverridesWithDefaultKafkaProducerFactory() {
 		assertThat(template.getProducerFactory().getConfigurationProperties()
 				.get(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG)).isEqualTo(StringSerializer.class);
 		assertThat(template.getProducerFactory().getPhysicalCloseTimeout()).isEqualTo(Duration.ofSeconds(6));
-		assertThat(template.getProducerFactory().isProducerPerConsumerPartition()).isFalse();
 		assertThat(template.getProducerFactory().isProducerPerThread()).isTrue();
 		assertThat(template.isTransactional()).isTrue();
 		assertThat(template.getProducerFactory().getListeners()).isEqualTo(pf.getListeners());