Fix New Sonar Issues

Author: garyrussell

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

@@ -23,7 +23,6 @@
 
 import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
 import org.apache.kafka.clients.consumer.OffsetCommitCallback;
-import org.apache.kafka.common.errors.AuthenticationException;
 
 import org.springframework.kafka.support.LogIfLevelEnabled;
 import org.springframework.kafka.support.TopicPartitionOffset;
@@ -360,9 +359,11 @@ public Duration getAuthorizationExceptionRetryInterval() {
 	}
 
 	/**
-	 * Set the interval between retries after and {@link AuthenticationException} or
-	 * {@code AuthorizationException} is thrown by {@code KafkaConsumer}. By default the
-	 * field is null and retries are disabled. In such case the container will be stopped.
+	 * Set the interval between retries after and
+	 * {@link org.apache.kafka.common.errors.AuthenticationException} or
+	 * {@code org.apache.kafka.common.errors.AuthorizationException} is thrown by
+	 * {@code KafkaConsumer}. By default the field is null and retries are disabled. In
+	 * such case the container will be stopped.
 	 *
 	 * The interval must be less than {@code max.poll.interval.ms} consumer property.
 	 *
@@ -385,9 +386,11 @@ public Duration getAuthExceptionRetryInterval() {
 	}
 
 	/**
-	 * Set the interval between retries after and {@link AuthenticationException} or
-	 * {@code AuthorizationException} is thrown by {@code KafkaConsumer}. By default the
-	 * field is null and retries are disabled. In such case the container will be stopped.
+	 * Set the interval between retries after and
+	 * {@link org.apache.kafka.common.errors.AuthenticationException} or
+	 * {@code org.apache.kafka.common.errors.AuthorizationException} is thrown by
+	 * {@code KafkaConsumer}. By default the field is null and retries are disabled. In
+	 * such case the container will be stopped.
 	 *
 	 * The interval must be less than {@code max.poll.interval.ms} consumer property.
 	 *

spring-kafka/src/main/java/org/springframework/kafka/retrytopic/DeadLetterPublishingRecovererFactory.java

@@ -194,10 +194,10 @@ private int getAttempts(ConsumerRecord<?, ?> consumerRecord) {
 		Header header = consumerRecord.headers().lastHeader(RetryTopicHeaders.DEFAULT_HEADER_ATTEMPTS);
 		if (header != null) {
 			byte[] value = header.value();
-			if (value.length == 1) { // backwards compatibility
+			if (value.length == Byte.BYTES) { // backwards compatibility
 				return value[0];
 			}
-			else if (value.length == 4) {
+			else if (value.length == Integer.BYTES) {
 				return ByteBuffer.wrap(value).getInt();
 			}
 			else {
@@ -213,7 +213,7 @@ private Headers addHeaders(ConsumerRecord<?, ?> consumerRecord, Exception e, int
 		byte[] originalTimestampHeader = getOriginalTimestampHeaderBytes(consumerRecord);
 		headers.add(RetryTopicHeaders.DEFAULT_HEADER_ORIGINAL_TIMESTAMP, originalTimestampHeader);
 		headers.add(RetryTopicHeaders.DEFAULT_HEADER_ATTEMPTS,
-				ByteBuffer.wrap(new byte[4]).putInt(attempts + 1).array());
+				ByteBuffer.wrap(new byte[Integer.BYTES]).putInt(attempts + 1).array());
 		headers.add(RetryTopicHeaders.DEFAULT_HEADER_BACKOFF_TIMESTAMP,
 				BigInteger.valueOf(getNextExecutionTimestamp(consumerRecord, e, originalTimestampHeader))
 						.toByteArray());

spring-kafka/src/test/java/org/springframework/kafka/retrytopic/DeadLetterPublishingRecovererFactoryTests.java

@@ -162,7 +162,7 @@ void shouldIncreaseAttemptsInLegacyHeader() {
 		ProducerRecord producerRecord = producerRecordCaptor.getValue();
 		Header attemptsHeader = producerRecord.headers().lastHeader(RetryTopicHeaders.DEFAULT_HEADER_ATTEMPTS);
 		assertThat(attemptsHeader).isNotNull();
-		assertThat(attemptsHeader.value().length).isEqualTo(4); // handled a legacy one byte header ok
+		assertThat(attemptsHeader.value().length).isEqualTo(Integer.BYTES); // handled a legacy one byte header ok
 		assertThat(ByteBuffer.wrap(attemptsHeader.value()).getInt()).isEqualTo(128);
 	}
 
@@ -195,7 +195,7 @@ void shouldIncreaseAttemptsInNewHeader() {
 		ProducerRecord producerRecord = producerRecordCaptor.getValue();
 		Header attemptsHeader = producerRecord.headers().lastHeader(RetryTopicHeaders.DEFAULT_HEADER_ATTEMPTS);
 		assertThat(attemptsHeader).isNotNull();
-		assertThat(attemptsHeader.value().length).isEqualTo(4);
+		assertThat(attemptsHeader.value().length).isEqualTo(Integer.BYTES);
 		assertThat(ByteBuffer.wrap(attemptsHeader.value()).getInt()).isEqualTo(128);
 	}