Address Sonar Issues

Author: garyrussell

spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerEndpoint.java

@@ -49,7 +49,6 @@
 import org.springframework.kafka.support.TopicPartitionOffset;
 import org.springframework.kafka.support.converter.MessageConverter;
 import org.springframework.lang.Nullable;
-import org.springframework.retry.RecoveryCallback;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -94,10 +93,6 @@ public abstract class AbstractKafkaListenerEndpoint<K, V>
 
 	private boolean ackDiscarded;
 
-	private RecoveryCallback<? extends Object> recoveryCallback;
-
-	private boolean statefulRetry;
-
 	private Boolean batchListener;
 
 	private KafkaTemplate<?, ?> replyTemplate;

spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/ConvertingMessageListener.java

@@ -55,9 +55,11 @@
 public class ConvertingMessageListener<V> implements DelegatingMessageListener<MessageListener>, AcknowledgingConsumerAwareMessageListener<Object, Object> {
 
 	private final MessageListener delegate;
+
 	private final Class<V> desiredValueType;
 
 	private MessageConverter messageConverter;
+
 	private KafkaHeaderMapper headerMapper;
 
 	/**
@@ -121,9 +123,8 @@ else if (this.delegate instanceof AcknowledgingMessageListener) {
 	}
 
 	private ConsumerRecord convertConsumerRecord(ConsumerRecord receivedRecord) {
-		Map<String, Object> headerMap = null;
+		Map<String, Object> headerMap = new HashMap<>();
 		if (this.headerMapper != null) {
-			headerMap = new HashMap<>();
 			this.headerMapper.toHeaders(receivedRecord.headers(), headerMap);
 		}
 

spring-kafka/src/main/java/org/springframework/kafka/requestreply/RequestReplyFuture.java

@@ -37,8 +37,6 @@ public class RequestReplyFuture<K, V, R> extends CompletableFuture<ConsumerRecor
 
 	private volatile CompletableFuture<SendResult<K, V>> sendFuture;
 
-	private CompletableFuture<SendResult<K, V>> completableSendFuture;
-
 	protected void setSendFuture(CompletableFuture<SendResult<K, V>> sendFuture) {
 		this.sendFuture = sendFuture;
 	}