#205 #206 refactor backend

Signed-off-by: Niklas Teschner <[email protected]>
amosproj · Jul 14, 2023 · b9053db · b9053db
1 parent 2031cbc
commit b9053db
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 78 deletions.
diff --git a/backend/src/main/java/de/amos/apachepulsarui/controller/CacheController.java b/backend/src/main/java/de/amos/apachepulsarui/controller/CacheController.java
@@ -23,5 +23,4 @@ public ResponseEntity<Void> flush() {
                 .forEach(cache -> Objects.requireNonNull(cacheManager.getCache(cache)).clear());
         return new ResponseEntity<>(HttpStatus.OK);
     }
-
 }
diff --git a/backend/src/main/java/de/amos/apachepulsarui/controller/ClusterController.java b/backend/src/main/java/de/amos/apachepulsarui/controller/ClusterController.java
@@ -27,5 +27,4 @@ public ResponseEntity<ClusterDetailDto> getClusterDetails(@RequestParam String c
     public ResponseEntity<ClustersDto> getAll() {
         return new ResponseEntity<>(new ClustersDto(clusterService.getAllNames()), HttpStatus.OK);
     }
-
 }
diff --git a/backend/src/main/java/de/amos/apachepulsarui/controller/MessageController.java b/backend/src/main/java/de/amos/apachepulsarui/controller/MessageController.java
@@ -36,5 +36,4 @@ public ResponseEntity<MessagesDto> getMessages(@RequestParam String topic,
         Set<MessageDto> messageDtos = messageService.getLatestMessagesFiltered(topic, numMessages, producers, subscriptions);
         return new ResponseEntity<>(new MessagesDto(messageDtos), HttpStatus.OK);
     }
-
 }
diff --git a/backend/src/main/java/de/amos/apachepulsarui/controller/NamespaceController.java b/backend/src/main/java/de/amos/apachepulsarui/controller/NamespaceController.java
@@ -33,7 +33,7 @@ public class NamespaceController {
     public ResponseEntity<NamespacesDto> getAll(@RequestParam(required = false, defaultValue = "") List<String> tenants,
                                                 @RequestParam(required = false, defaultValue = "") List<String> namespaces) {
         if (!namespaces.isEmpty()) {
-            return wrapInEntity(getAllForNamespaces(namespaces));
+            return wrapInEntity(namespaceService.getAllForNamespaces(namespaces));
         } else {
             return wrapInEntity(getAllForTenants(tenants));
         }

diff --git a/backend/src/main/java/de/amos/apachepulsarui/service/ClusterService.java b/backend/src/main/java/de/amos/apachepulsarui/service/ClusterService.java
@@ -26,8 +26,8 @@ public class ClusterService {
     @Cacheable("cluster.allNames")
     public List<ClusterDto> getAllNames() {
         try {
-            return pulsarAdmin.clusters().getClusters()
-                    .stream().map(ClusterDto::create)
+            return pulsarAdmin.clusters().getClusters().stream()
+                    .map(ClusterDto::create)
                     .map(this::enrichWithCardDetails)
                     .toList();
         } catch (PulsarAdminException e) {
@@ -41,7 +41,6 @@ public ClusterDetailDto getClusterDetails(String clusterName) {
         ClusterData clusterData = getClusterData(clusterName);
         List<String> activeBrokers = getActiveBrokers(clusterName);
         List<String> tenantsAllowedForCluster = getTenantsAllowedForCluster(clusterName);
-
         return ClusterDetailDto.builder()
                 .name(clusterName)
                 .serviceUrl(clusterData.getServiceUrl())
@@ -90,9 +89,9 @@ private List<String> getTenantsAllowedForCluster(String clusterName) throws Puls
     }
 
     private ClusterDto enrichWithCardDetails(ClusterDto clusterDto) {
-        List<String> tenats = getTenantsAllowedForCluster(clusterDto.getName());
-        long numberOfNamespaces = tenats.stream().mapToLong(t -> namespaceService.getAllOfTenant(t).size()).sum();
-        clusterDto.setNumberOfTenants(tenats.size());
+        List<String> tenants = getTenantsAllowedForCluster(clusterDto.getName());
+        long numberOfNamespaces = tenants.stream().mapToLong(t -> namespaceService.getAllOfTenant(t).size()).sum();
+        clusterDto.setNumberOfTenants(tenants.size());
         clusterDto.setNumberOfNamespaces(numberOfNamespaces);
         return clusterDto;
     }

diff --git a/backend/src/main/java/de/amos/apachepulsarui/service/MessageService.java b/backend/src/main/java/de/amos/apachepulsarui/service/MessageService.java
@@ -14,15 +14,9 @@
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.api.Message;
 import org.apache.pulsar.common.api.proto.CommandSubscribe;
-import org.apache.pulsar.common.naming.TopicName;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -39,15 +33,13 @@ public Set<MessageDto> getLatestMessagesFiltered(String topic, Integer numMessag
         if (!subscriptions.isEmpty()) {
             messageDtos = filterBySubscription(messageDtos, numMessages, topic, subscriptions);
         }
-
         return messageDtos;
     }
 
     private Set<MessageDto> filterBySubscription(Set<MessageDto> messageDtos, Integer numMessages, String topic, List<String> subscriptions) {
         List<String> messageIds = subscriptions.stream()
                 .flatMap(s -> peekMessageIds(topic, s, numMessages).stream())
                 .toList();
-
         return messageDtos.stream()
                 .filter(m -> messageIds.contains(m.getMessageId()))
                 .collect(Collectors.toCollection(LinkedHashSet::new));
@@ -57,15 +49,15 @@ private List<String> peekMessageIds(String topic, String subscription, Integer n
         try {
             if (pulsarAdmin.topics().getSubscriptions(topic).contains(subscription)) {
                 return pulsarAdmin.topics().peekMessages(topic, subscription, numMessages).stream()
-                        .map(m -> m.getMessageId().toString()).toList();
+                        .map(m -> m.getMessageId().toString())
+                        .toList();
             }
             return Collections.emptyList();
         } catch (PulsarAdminException e) {
             throw new PulsarApiException(String.format("Could not get Messages for subscription %s", subscription), e);
         }
     }
 
-
     private Set<MessageDto> filterByProducers(Set<MessageDto> messageDtos, List<String> producers) {
         return messageDtos.stream()
                 .filter(m -> producers.contains(m.getProducer()))
@@ -107,8 +99,4 @@ private String getSchemaIfExists(String topic) {
             return "";
         }
     }
-
-    public boolean inValidTopicName(MessageDto messageDto) {
-        return !TopicName.isValid(messageDto.getTopic());
-    }
 }
diff --git a/backend/src/main/java/de/amos/apachepulsarui/service/NamespaceService.java b/backend/src/main/java/de/amos/apachepulsarui/service/NamespaceService.java
@@ -65,7 +65,6 @@ private NamespaceDetailDto enrichWithNamespaceData(NamespaceDetailDto namespace)
         try {
 
             Namespaces namespaces = pulsarAdmin.namespaces();
-
             namespace.setBundlesData(namespaces.getBundles(namespace.getId()));
             namespace.setMessagesTTL(namespaces.getNamespaceMessageTTL(namespace.getId()));
             namespace.setRetentionPolicies(namespaces.getRetention(namespace.getId()));

diff --git a/backend/src/main/java/de/amos/apachepulsarui/service/TenantService.java b/backend/src/main/java/de/amos/apachepulsarui/service/TenantService.java
@@ -63,7 +63,6 @@ public TenantDetailDto getTenantDetails(String tenantName) {
                 .build();
     }
 
-
     private TenantInfo getTenantInfo(String tenantName) {
         try {
             return pulsarAdmin.tenants().getTenantInfo(tenantName);
@@ -72,7 +71,6 @@ private TenantInfo getTenantInfo(String tenantName) {
         }
     }
 
-
     private TenantDto enrichWithCardDetails(TenantDto tenantDto) {
         try {
             List<String> namespaces = pulsarAdmin.namespaces().getNamespaces(tenantDto.getName());

diff --git a/backend/src/test/java/de/amos/apachepulsarui/service/MessageServiceTest.java b/backend/src/test/java/de/amos/apachepulsarui/service/MessageServiceTest.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,5 +23,4 @@ public ResponseEntity<Void> flush() { @@
                     .forEach(cache -> Objects.requireNonNull(cacheManager.getCache(cache)).clear());
             return new ResponseEntity<>(HttpStatus.OK);
         }
     }