From ed9793a0740b8716be12fdcf3e71244effcbd8a7 Mon Sep 17 00:00:00 2001 From: Niklas Teschner Date: Fri, 14 Jul 2023 08:16:10 +0200 Subject: [PATCH] #205 #206 refactor backend Signed-off-by: Niklas Teschner --- .../de/amos/apachepulsarui/controller/CacheController.java | 1 + .../amos/apachepulsarui/controller/ClusterController.java | 1 + .../amos/apachepulsarui/controller/MessageController.java | 1 + .../amos/apachepulsarui/controller/NamespaceController.java | 5 +---- .../main/java/de/amos/apachepulsarui/dto/ConsumerDto.java | 3 +-- .../java/de/amos/apachepulsarui/dto/NamespaceDetailDto.java | 3 --- .../main/java/de/amos/apachepulsarui/dto/NamespaceDto.java | 3 +-- .../main/java/de/amos/apachepulsarui/dto/ProducerDto.java | 2 +- .../java/de/amos/apachepulsarui/dto/SubscriptionDto.java | 2 +- .../java/de/amos/apachepulsarui/dto/TenantDetailDto.java | 4 +--- .../src/main/java/de/amos/apachepulsarui/dto/TenantDto.java | 1 + .../java/de/amos/apachepulsarui/dto/TopicDetailDto.java | 2 +- .../main/java/de/amos/apachepulsarui/dto/TopicStatsDto.java | 6 ------ .../java/de/amos/apachepulsarui/service/ClusterService.java | 4 +++- .../java/de/amos/apachepulsarui/service/TenantService.java | 4 +++- 15 files changed, 17 insertions(+), 25 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 index 74a042b5..f87270b5 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/controller/CacheController.java +++ b/backend/src/main/java/de/amos/apachepulsarui/controller/CacheController.java @@ -23,4 +23,5 @@ public ResponseEntity 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 index 990589e6..4bb8f43a 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/controller/ClusterController.java +++ b/backend/src/main/java/de/amos/apachepulsarui/controller/ClusterController.java @@ -27,4 +27,5 @@ public ResponseEntity getClusterDetails(@RequestParam String c public ResponseEntity 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 index d482616a..11f46973 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/controller/MessageController.java +++ b/backend/src/main/java/de/amos/apachepulsarui/controller/MessageController.java @@ -36,4 +36,5 @@ public ResponseEntity getMessages(@RequestParam String topic, Set 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 index f5e632b0..c770bc95 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/controller/NamespaceController.java +++ b/backend/src/main/java/de/amos/apachepulsarui/controller/NamespaceController.java @@ -48,14 +48,11 @@ private ResponseEntity wrapInEntity(List namespaceD return new ResponseEntity<>(new NamespacesDto(namespaceDtos), HttpStatus.OK); } - private List getAllForNamespaces(List namespaces) { - return namespaceService.getAllForNamespaces(namespaces); - } - private List getAllForTenants(List tenants) { if (tenants.isEmpty()) { tenants = tenantService.getAllNames(); } return namespaceService.getAllForTenants(tenants); } + } diff --git a/backend/src/main/java/de/amos/apachepulsarui/dto/ConsumerDto.java b/backend/src/main/java/de/amos/apachepulsarui/dto/ConsumerDto.java index b5bff107..0b56b70a 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/dto/ConsumerDto.java +++ b/backend/src/main/java/de/amos/apachepulsarui/dto/ConsumerDto.java @@ -46,8 +46,7 @@ public static ConsumerDto create(TopicStats topicStats, String consumer) { private static ConsumerStats getConsumerStatsByTopic(TopicStats topicStats, String consumer) { - return topicStats.getSubscriptions() - .values().stream() + return topicStats.getSubscriptions().values().stream() .flatMap(subscriptionStats -> subscriptionStats.getConsumers().stream()) .filter(c -> c.getConsumerName().equals(consumer)) .findFirst() diff --git a/backend/src/main/java/de/amos/apachepulsarui/dto/NamespaceDetailDto.java b/backend/src/main/java/de/amos/apachepulsarui/dto/NamespaceDetailDto.java index 2fc441a0..c7110f74 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/dto/NamespaceDetailDto.java +++ b/backend/src/main/java/de/amos/apachepulsarui/dto/NamespaceDetailDto.java @@ -34,9 +34,6 @@ public void setTopics(List topics) { this.topics = topics; } - /** - * @return An unmodifiable copy of the topics of this namespace. - */ public List getTopics() { return List.copyOf(topics); } diff --git a/backend/src/main/java/de/amos/apachepulsarui/dto/NamespaceDto.java b/backend/src/main/java/de/amos/apachepulsarui/dto/NamespaceDto.java index 2b10c4c9..1d32ded7 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/dto/NamespaceDto.java +++ b/backend/src/main/java/de/amos/apachepulsarui/dto/NamespaceDto.java @@ -15,9 +15,7 @@ public class NamespaceDto { private String id; - private String tenant; - private long numberOfTopics; public static NamespaceDto fromString(String namespaceId) { @@ -26,4 +24,5 @@ public static NamespaceDto fromString(String namespaceId) { namespaceDto.setTenant(NamespaceName.get(namespaceId).getTenant()); return namespaceDto; } + } diff --git a/backend/src/main/java/de/amos/apachepulsarui/dto/ProducerDto.java b/backend/src/main/java/de/amos/apachepulsarui/dto/ProducerDto.java index 24096502..d34fbf10 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/dto/ProducerDto.java +++ b/backend/src/main/java/de/amos/apachepulsarui/dto/ProducerDto.java @@ -41,6 +41,6 @@ private static PublisherStats getPublisherStats(TopicStats topicStats, String pr .filter(ps -> Objects.equals(ps.getProducerName(), producer)) .findFirst() .orElseThrow(() -> new RuntimeException("No PublisherStats found for " + producer)); - } + } diff --git a/backend/src/main/java/de/amos/apachepulsarui/dto/SubscriptionDto.java b/backend/src/main/java/de/amos/apachepulsarui/dto/SubscriptionDto.java index 025d634c..d89d222a 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/dto/SubscriptionDto.java +++ b/backend/src/main/java/de/amos/apachepulsarui/dto/SubscriptionDto.java @@ -61,6 +61,6 @@ private static List getConsumers(SubscriptionStats subscriptionStats) { .stream() .map(ConsumerStats::getConsumerName) .toList(); - } + } diff --git a/backend/src/main/java/de/amos/apachepulsarui/dto/TenantDetailDto.java b/backend/src/main/java/de/amos/apachepulsarui/dto/TenantDetailDto.java index 91239d4e..47670593 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/dto/TenantDetailDto.java +++ b/backend/src/main/java/de/amos/apachepulsarui/dto/TenantDetailDto.java @@ -18,9 +18,7 @@ public class TenantDetailDto { private String name; private List namespaces; private TenantInfo tenantInfo; - /** - * @return An unmodifiable copy of the namespaces of this tenant. - */ + public List getNamespaces() { return List.copyOf(namespaces); } diff --git a/backend/src/main/java/de/amos/apachepulsarui/dto/TenantDto.java b/backend/src/main/java/de/amos/apachepulsarui/dto/TenantDto.java index 3c71ab1b..537d539c 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/dto/TenantDto.java +++ b/backend/src/main/java/de/amos/apachepulsarui/dto/TenantDto.java @@ -24,4 +24,5 @@ public static TenantDto create(TenantInfo tenantInfo, String name) { .tenantInfo(tenantInfo) .build(); } + } diff --git a/backend/src/main/java/de/amos/apachepulsarui/dto/TopicDetailDto.java b/backend/src/main/java/de/amos/apachepulsarui/dto/TopicDetailDto.java index db15cb44..cc856084 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/dto/TopicDetailDto.java +++ b/backend/src/main/java/de/amos/apachepulsarui/dto/TopicDetailDto.java @@ -54,7 +54,7 @@ public static TopicDetailDto create( .toList(); topicDetailDto.setSchemaInfos(schemaInfosSorted); } - return topicDetailDto; } + } diff --git a/backend/src/main/java/de/amos/apachepulsarui/dto/TopicStatsDto.java b/backend/src/main/java/de/amos/apachepulsarui/dto/TopicStatsDto.java index 5755e406..ae81e749 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/dto/TopicStatsDto.java +++ b/backend/src/main/java/de/amos/apachepulsarui/dto/TopicStatsDto.java @@ -43,7 +43,6 @@ public static TopicStatsDto createTopicStatsDto(TopicStats topicStats) { .averageMessageSize(topicStats.getAverageMsgSize()) .storageSize(topicStats.getStorageSize()) .build(); - } private static List getProducers(TopicStats topicStats) { @@ -53,9 +52,4 @@ private static List getProducers(TopicStats topicStats) { .toList(); } - - - - - } diff --git a/backend/src/main/java/de/amos/apachepulsarui/service/ClusterService.java b/backend/src/main/java/de/amos/apachepulsarui/service/ClusterService.java index 77a499f7..90c87d7e 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/service/ClusterService.java +++ b/backend/src/main/java/de/amos/apachepulsarui/service/ClusterService.java @@ -90,7 +90,9 @@ private List getTenantsAllowedForCluster(String clusterName) throws Puls private ClusterDto enrichWithCardDetails(ClusterDto clusterDto) { List tenants = getTenantsAllowedForCluster(clusterDto.getName()); - long numberOfNamespaces = tenants.stream().mapToLong(t -> namespaceService.getAllOfTenant(t).size()).sum(); + 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/TenantService.java b/backend/src/main/java/de/amos/apachepulsarui/service/TenantService.java index dbaf517d..9447bf80 100644 --- a/backend/src/main/java/de/amos/apachepulsarui/service/TenantService.java +++ b/backend/src/main/java/de/amos/apachepulsarui/service/TenantService.java @@ -74,7 +74,9 @@ private TenantInfo getTenantInfo(String tenantName) { private TenantDto enrichWithCardDetails(TenantDto tenantDto) { try { List namespaces = pulsarAdmin.namespaces().getNamespaces(tenantDto.getName()); - long numberOfTopics = namespaces.stream().mapToLong(n -> topicService.getAllForNamespace(n).size()).sum(); + long numberOfTopics = namespaces.stream() + .mapToLong(n -> topicService.getAllForNamespace(n).size()) + .sum(); tenantDto.setNumberOfTopics(numberOfTopics); tenantDto.setNumberOfNamespaces(namespaces.size()); return tenantDto;