瀏覽代碼

Dublicate lines in ClusterService moved to updateCluster method

Roman Nedzvetskiy 5 年之前
父節點
當前提交
6ebabede67
共有 1 個文件被更改,包括 12 次插入13 次删除
  1. 12 13
      kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/service/ClusterService.java

+ 12 - 13
kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/service/ClusterService.java

@@ -60,25 +60,16 @@ public class ClusterService {
 
     public Mono<Topic> createTopic(String name, Mono<TopicFormData> topicFormData) {
         return clustersStorage.getClusterByName(name).map(
-                cluster -> kafkaService.createTopic(cluster, topicFormData)
-                .flatMap(t -> kafkaService.getUpdatedCluster(cluster)
-                    .map(c -> {
-                        clustersStorage.setKafkaCluster(name, c);
-                        return t;
-                    })
-                )
-        ).orElse(Mono.empty()).map(clusterMapper::toTopic);
+                    cluster -> kafkaService.createTopic(cluster, topicFormData)
+                    .flatMap(t -> updateCluster(t, name, cluster)))
+                .orElse(Mono.empty()).map(clusterMapper::toTopic);
     }
 
     @SneakyThrows
     public Mono<ResponseEntity<Topic>> updateTopic(String clusterName, String topicName, Mono<TopicFormData> topicFormData) {
         return clustersStorage.getClusterByName(clusterName).map(cl ->
                     topicFormData.flatMap(t -> kafkaService.updateTopic(cl, topicName, t))
-                            .flatMap(t -> kafkaService.getUpdatedCluster(cl)
-                                    .map(c -> {
-                                        clustersStorage.setKafkaCluster(clusterName, c);
-                                        return t;
-                                    })
+                            .flatMap(t -> updateCluster(t, clusterName, cl)
                     .map(ResponseEntity::ok)))
                 .orElse(Mono.empty());
     }
@@ -89,4 +80,12 @@ public class ClusterService {
                     .map(kafkaService::getConsumerGroups)
                     .orElse(Mono.empty());
     }
+
+    private <T> Mono<T> updateCluster (T topic, String clusterName, KafkaCluster cluster) {
+        return kafkaService.getUpdatedCluster(cluster)
+                .map(c -> {
+                    clustersStorage.setKafkaCluster(clusterName, c);
+                    return topic;
+                });
+    }
 }