From 1043cb115ec39af24944df45b57b71eb8eeb7f60 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Thu, 14 Dec 2017 01:31:44 +0900 Subject: [PATCH] Introduce an intermediate variable for topicNameToTopic.get(n) --- .../org/springframework/kafka/core/KafkaAdmin.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaAdmin.java b/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaAdmin.java index 9ffe58d4..792dc1bd 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaAdmin.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/core/KafkaAdmin.java @@ -193,23 +193,24 @@ public class KafkaAdmin implements ApplicationContextAware, SmartInitializingSin List topicsToAdd = new ArrayList<>(); Map topicsToModify = new HashMap<>(); topicInfo.values().forEach((n, f) -> { + NewTopic topic = topicNameToTopic.get(n); try { TopicDescription topicDescription = f.get(this.operationTimeout, TimeUnit.SECONDS); - if (topicNameToTopic.get(n).numPartitions() < topicDescription.partitions().size()) { + if (topic.numPartitions() < topicDescription.partitions().size()) { if (logger.isInfoEnabled()) { logger.info(String.format( "Topic '%s' exists but has a different partition count: %d not %d", n, - topicDescription.partitions().size(), topicNameToTopic.get(n).numPartitions())); + topicDescription.partitions().size(), topic.numPartitions())); } } - else if (topicNameToTopic.get(n).numPartitions() > topicDescription.partitions().size()) { + else if (topic.numPartitions() > topicDescription.partitions().size()) { if (logger.isInfoEnabled()) { logger.info(String.format( "Topic '%s' exists but has a different partition count: %d not %d, increasing " + "if the broker supports it", n, - topicDescription.partitions().size(), topicNameToTopic.get(n).numPartitions())); + topicDescription.partitions().size(), topic.numPartitions())); } - topicsToModify.put(n, NewPartitions.increaseTo(topicNameToTopic.get(n).numPartitions())); + topicsToModify.put(n, NewPartitions.increaseTo(topic.numPartitions())); } } catch (InterruptedException e) { @@ -219,7 +220,7 @@ public class KafkaAdmin implements ApplicationContextAware, SmartInitializingSin throw new KafkaException("Timed out waiting to get existing topics", e); } catch (ExecutionException e) { - topicsToAdd.add(topicNameToTopic.get(n)); + topicsToAdd.add(topic); } }); if (topicsToAdd.size() > 0) {