remove partitionInfoList from TopicVo again and inject it where needed

obsidiandynamics · May 17, 2021 · a160e93 · a160e93
1 parent 04e5395
commit a160e93
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 32 deletions.
diff --git a/src/main/java/kafdrop/model/TopicVO.java b/src/main/java/kafdrop/model/TopicVO.java
@@ -28,8 +28,6 @@ public final class TopicVO implements Comparable<TopicVO> {
 
   private Map<Integer, TopicPartitionVO> partitions = new TreeMap<>();
 
-  private List<PartitionInfo> partitionInfoList = new ArrayList<>();
-
   private Map<String, String> config = Collections.emptyMap();
 
   public TopicVO(String name) {
@@ -56,14 +54,6 @@ public void setPartitions(Map<Integer, TopicPartitionVO> partitions) {
     this.partitions = partitions;
   }
 
-  public List<PartitionInfo> getPartitionInfoList() {
-    return this.partitionInfoList;
-  }
-
-  public void setPartitionInfoList(List<PartitionInfo> partitionInfoList) {
-    this.partitionInfoList = partitionInfoList;
-  }
-
   public Optional<TopicPartitionVO> getPartition(int partitionId) {
     return Optional.ofNullable(partitions.get(partitionId));
   }

diff --git a/src/main/java/kafdrop/service/KafkaHighLevelConsumer.java b/src/main/java/kafdrop/service/KafkaHighLevelConsumer.java
@@ -54,17 +54,17 @@ private void initializeClient() {
     }
   }
 
-  synchronized void setAllPartitionSizes(List<TopicVO> topics) {
+  synchronized void setAllPartitionSizes(Map<String, List<PartitionInfo>> topicsMap, List<TopicVO> topics) {
     initializeClient();
 
     Map<TopicVO, List<TopicPartition>> allTopics = topics.stream().map(topicVO -> {
-              List<TopicPartition> topicPartitions = topicVO.getPartitionInfoList().stream()
-                      .map(partitionInfo -> {
-                        return new TopicPartition(partitionInfo.topic(), partitionInfo.partition());
-                      }).collect(Collectors.toList());
+      List<TopicPartition> topicPartitions = topicsMap.get(topicVO.getName()).stream()
+        .map(partitionInfo -> {
+          return new TopicPartition(partitionInfo.topic(), partitionInfo.partition());
+        }).collect(Collectors.toList());
 
-              return Pair.of(topicVO, topicPartitions);
-            }
+        return Pair.of(topicVO, topicPartitions);
+      }
     ).collect(Collectors.toMap(Pair::getKey, Pair::getValue));
 
     List<TopicPartition> allTopicPartitions = allTopics.values().stream().flatMap(Collection::stream)
@@ -206,21 +206,24 @@ private static String deserialize(MessageDeserializer deserializer, byte[] bytes
     return bytes != null ? deserializer.deserializeMessage(ByteBuffer.wrap(bytes)) : "empty";
   }
 
-  synchronized Map<String, TopicVO> getTopicInfos(String[] topics) {
+  synchronized Map<String, List<PartitionInfo>> getAllTopic() {
     initializeClient();
 
-    final Map<String, List<PartitionInfo>> topicsMap;
-    topicsMap = kafkaConsumer.listTopics();
+    return kafkaConsumer.listTopics();
+  }
+
+  synchronized Map<String, TopicVO> getTopicInfos(Map<String, List<PartitionInfo>> allTopicsMap, String[] topics) {
+    initializeClient();
 
-    final var topicSet = topicsMap.keySet();
+    final var topicSet = allTopicsMap.keySet();
     if (topics.length == 0) {
       topics = Arrays.copyOf(topicSet.toArray(), topicSet.size(), String[].class);
     }
     final var topicVos = new HashMap<String, TopicVO>(topics.length, 1f);
 
     for (var topic : topics) {
       if (topicSet.contains(topic)) {
-        topicVos.put(topic, getTopicInfo(topic, topicsMap.get(topic)));
+        topicVos.put(topic, getTopicInfo(topic, allTopicsMap.get(topic)));
       }
     }
 
@@ -229,7 +232,6 @@ synchronized Map<String, TopicVO> getTopicInfos(String[] topics) {
 
   private TopicVO getTopicInfo(String topic, List<PartitionInfo> partitionInfoList) {
     final var topicVo = new TopicVO(topic);
-    topicVo.setPartitionInfoList(partitionInfoList);
     final var partitions = new TreeMap<Integer, TopicPartitionVO>();
 
     for (var partitionInfo : partitionInfoList) {

diff --git a/src/main/java/kafdrop/service/KafkaMonitorImpl.java b/src/main/java/kafdrop/service/KafkaMonitorImpl.java
@@ -99,7 +99,7 @@ public ClusterSummaryVO getClusterSummary(Collection<TopicVO> topics) {
 
   @Override
   public List<TopicVO> getTopics() {
-    final var topicVos = getTopicMetadata().values().stream()
+    final var topicVos = getTopicMetadata(highLevelConsumer.getAllTopic()).values().stream()
         .sorted(Comparator.comparing(TopicVO::getName))
         .collect(Collectors.toList());
 
@@ -108,22 +108,28 @@ public List<TopicVO> getTopics() {
 
   @Override
   public List<TopicVO> getTopicsWithOffsets() {
-    final var topicVos = getTopics();
+    Map<String, List<PartitionInfo>> topicsMap = highLevelConsumer.getAllTopic();
 
-    setTopicPartitionSizes(topicVos);
+    final var topicVos = getTopicMetadata(topicsMap).values().stream()
+            .sorted(Comparator.comparing(TopicVO::getName))
+            .collect(Collectors.toList());
+
+    setTopicPartitionSizes(topicsMap, topicVos);
 
     return topicVos;
   }
 
   @Override
   public Optional<TopicVO> getTopic(String topic) {
-    final var topicVo = Optional.ofNullable(getTopicMetadata(topic).get(topic));
-    topicVo.ifPresent(vo -> setTopicPartitionSizes(Collections.singletonList(vo)));
+    Map<String, List<PartitionInfo>> topicsMap = highLevelConsumer.getAllTopic();
+
+    final var topicVo = Optional.ofNullable(getTopicMetadata(topicsMap, topic).get(topic));
+    topicVo.ifPresent(vo -> setTopicPartitionSizes(topicsMap, Collections.singletonList(vo)));
     return topicVo;
   }
 
-  private Map<String, TopicVO> getTopicMetadata(String... topics) {
-    final var topicInfos = highLevelConsumer.getTopicInfos(topics);
+  private Map<String, TopicVO> getTopicMetadata(Map<String, List<PartitionInfo>> allTopicsMap, String... topics) {
+    final var topicInfos = highLevelConsumer.getTopicInfos(allTopicsMap, topics);
     final var retrievedTopicNames = topicInfos.keySet();
     final var topicConfigs = highLevelAdminClient.describeTopicConfigs(retrievedTopicNames);
 
@@ -198,8 +204,8 @@ private static Map<String, String> headersToMap(Headers headers) {
     return map;
   }
 
-  private void setTopicPartitionSizes(List<TopicVO> topics) {
-    highLevelConsumer.setAllPartitionSizes(topics);
+  private void setTopicPartitionSizes(Map<String, List<PartitionInfo>> topicsMap, List<TopicVO> topics) {
+    highLevelConsumer.setAllPartitionSizes(topicsMap, topics);
   }
 
   @Override