GH-1485: Fix new Sonar issue

spring-projects · May 14, 2020 · c97c34c · c97c34c
1 parent 61dea04
commit c97c34c
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/.../src/main/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainer.java b/.../src/main/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainer.java
@@ -179,14 +179,8 @@ protected void doStart() {
 			setRunning(true);
 
 			for (int i = 0; i < this.concurrency; i++) {
-				KafkaMessageListenerContainer<K, V> container;
-				if (topicPartitions == null) {
-					container = new KafkaMessageListenerContainer<>(this, this.consumerFactory, containerProperties);
-				}
-				else {
-					container = new KafkaMessageListenerContainer<>(this, this.consumerFactory,
-							containerProperties, partitionSubset(containerProperties, i));
-				}
+				KafkaMessageListenerContainer<K, V> container =
+						constructContainer(containerProperties, topicPartitions, i);
 				String beanName = getBeanName();
 				container.setBeanName((beanName != null ? beanName : "consumer") + "-" + i);
 				container.setApplicationContext(getApplicationContext());
@@ -213,6 +207,19 @@ protected void doStart() {
 		}
 	}
 
+	private KafkaMessageListenerContainer<K, V> constructContainer(ContainerProperties containerProperties,
+			TopicPartitionOffset[] topicPartitions, int i) {
+		KafkaMessageListenerContainer<K, V> container;
+		if (topicPartitions == null) {
+			container = new KafkaMessageListenerContainer<>(this, this.consumerFactory, containerProperties);
+		}
+		else {
+			container = new KafkaMessageListenerContainer<>(this, this.consumerFactory,
+					containerProperties, partitionSubset(containerProperties, i));
+		}
+		return container;
+	}
+
 	private TopicPartitionOffset[] partitionSubset(ContainerProperties containerProperties, int i) {
 		TopicPartitionOffset[] topicPartitions = containerProperties.getTopicPartitions();
 		if (this.concurrency == 1) {