Fix new Sonar smells

Author: artembilan

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

@@ -540,8 +540,6 @@ private final class ListenerConsumer implements SchedulingAwareRunnable, Consume
 
 		private int nackIndex;
 
-		private Object sample;
-
 		private volatile boolean consumerPaused;
 
 		private volatile long lastPoll = System.currentTimeMillis();
@@ -618,17 +616,7 @@ else if (listener instanceof MessageListener) {
 				this.containerProperties.setSyncCommitTimeout(this.syncCommitTimeout);
 			}
 			this.maxPollInterval = obtainMaxPollInterval(consumerProperties);
-			MicrometerHolder holder = null;
-			try {
-				if (MICROMETER_PRESENT && this.containerProperties.isMicrometerEnabled()) {
-					holder = new MicrometerHolder(getApplicationContext(), getBeanName(),
-							this.containerProperties.getMicrometerTags());
-				}
-			}
-			catch (@SuppressWarnings("unused") IllegalStateException ex) {
-				// NOSONAR - no micrometer or meter registry
-			}
-			this.micrometerHolder = holder;
+			this.micrometerHolder = obtainMicrometerHolder();
 		}
 
 		private long obtainMaxPollInterval(Properties consumerProperties) {
@@ -793,6 +781,21 @@ protected ErrorHandler determineErrorHandler(GenericErrorHandler<?> errHandler)
 					: this.transactionManager != null ? null : new LoggingErrorHandler();
 		}
 
+		@Nullable
+		private MicrometerHolder obtainMicrometerHolder() {
+			MicrometerHolder holder = null;
+			try {
+				if (MICROMETER_PRESENT && this.containerProperties.isMicrometerEnabled()) {
+					holder = new MicrometerHolder(getApplicationContext(), getBeanName(),
+							this.containerProperties.getMicrometerTags());
+				}
+			}
+			catch (@SuppressWarnings("unused") IllegalStateException ex) {
+				// NOSONAR - no micrometer or meter registry
+			}
+			return holder;
+		}
+
 		private void seekPartitions(Collection<TopicPartition> partitions, boolean idle) {
 			this.consumerSeekAwareListener.registerSeekCallback(this);
 			Map<TopicPartition, Long> current = new HashMap<>();
@@ -1196,19 +1199,13 @@ private List<ConsumerRecord<K, V>> createRecordList(final ConsumerRecords<K, V>
 		private RuntimeException doInvokeBatchListener(final ConsumerRecords<K, V> records,
 				List<ConsumerRecord<K, V>> recordList, @SuppressWarnings(RAW_TYPES) Producer producer) {
 
+			Object sample = startMicrometerSample();
 			try {
-				if (this.micrometerHolder != null) {
-					this.sample = this.micrometerHolder.start();
-				}
 				invokeBatchOnMessage(records, recordList, producer);
-				if (this.sample != null) {
-					this.micrometerHolder.success(this.sample);
-				}
+				successTimer(sample);
 			}
 			catch (RuntimeException e) {
-				if (this.sample != null) {
-					this.micrometerHolder.failure(this.sample);
-				}
+				failureTimer(sample);
 				if (this.containerProperties.isAckOnError() && !this.autoCommit && producer == null) {
 					this.acks.addAll(getHighestOffsetRecords(records));
 				}
@@ -1233,6 +1230,26 @@ private RuntimeException doInvokeBatchListener(final ConsumerRecords<K, V> recor
 			return null;
 		}
 
+		@Nullable
+		private Object startMicrometerSample() {
+			if (this.micrometerHolder != null) {
+				return this.micrometerHolder.start();
+			}
+			return null;
+		}
+
+		private void successTimer(@Nullable Object sample) {
+			if (sample != null) {
+				this.micrometerHolder.success(sample);
+			}
+		}
+
+		private void failureTimer(@Nullable Object sample) {
+			if (sample != null) {
+				this.micrometerHolder.failure(sample);
+			}
+		}
+
 		private void invokeBatchOnMessage(final ConsumerRecords<K, V> records, // NOSONAR - Cyclomatic Complexity
 				List<ConsumerRecord<K, V>> recordList, @SuppressWarnings(RAW_TYPES) Producer producer) throws InterruptedException {
 
@@ -1453,19 +1470,14 @@ private RuntimeException doInvokeRecordListener(final ConsumerRecord<K, V> recor
 				@SuppressWarnings(RAW_TYPES) Producer producer,
 				Iterator<ConsumerRecord<K, V>> iterator) {
 
+			Object sample = startMicrometerSample();
+
 			try {
-				if (this.micrometerHolder != null) {
-					this.sample = this.micrometerHolder.start();
-				}
 				invokeOnMessage(record, producer);
-				if (this.sample != null) {
-					this.micrometerHolder.success(this.sample);
-				}
+				successTimer(sample);
 			}
 			catch (RuntimeException e) {
-				if (this.sample != null) {
-					this.micrometerHolder.failure(this.sample);
-				}
+				failureTimer(sample);
 				if (this.containerProperties.isAckOnError() && !this.autoCommit && producer == null) {
 					ackCurrent(record);
 				}