Merge pull request #196 from amosproj/sprint-11

Sprint 11

Author: JulianTS

.gitattributes

@@ -2,3 +2,6 @@
 demodata/setup-topology/setup-topology.sh eol=lf
 demodata/setup-topology/setup-topology-local.sh eol=lf
 demodata/setup-topology/setup-topology-aws.sh eol=lf
+/frontend/** eol=lf
+*.png eol=auto
+*.jpg eol=auto

backend/src/main/java/de/amos/apachepulsarui/controller/TenantController.java

@@ -6,7 +6,7 @@
 
 package de.amos.apachepulsarui.controller;
 
-import de.amos.apachepulsarui.dto.TenantDetailsDto;
+import de.amos.apachepulsarui.dto.TenantDetailDto;
 import de.amos.apachepulsarui.dto.TenantsDto;
 import de.amos.apachepulsarui.service.TenantService;
 import lombok.RequiredArgsConstructor;
@@ -27,7 +27,7 @@ public class TenantController {
     private final TenantService tenantService;
 
     @GetMapping()
-    public ResponseEntity<TenantDetailsDto> getTenantDetails(@RequestParam String tenantName) {
+    public ResponseEntity<TenantDetailDto> getTenantDetails(@RequestParam String tenantName) {
         return new ResponseEntity<>(tenantService.getTenantDetails(tenantName), HttpStatus.OK);
     }
 

backend/src/main/java/de/amos/apachepulsarui/dto/ClusterDetailDto.java

@@ -22,9 +22,6 @@ public class ClusterDetailDto {
 
 	private List<String> brokers;
 
-	@Setter(AccessLevel.PRIVATE)
-	private int amountOfTenants;
-
 	@Setter(AccessLevel.PRIVATE)
 	private int amountOfBrokers;
 

backend/src/main/java/de/amos/apachepulsarui/dto/ClusterDto.java

@@ -16,7 +16,8 @@ public class ClusterDto {
 
     private long numberOfTenants;
 
-    private long numberOfNamespces;
+    private long numberOfNamespaces;
+    
     public static ClusterDto create(String name) {
         return ClusterDto.builder().name(name).build();
     }

backend/src/main/java/de/amos/apachepulsarui/dto/NamespaceDetailDto.java

@@ -8,7 +8,6 @@
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 import org.apache.pulsar.common.policies.data.BundlesData;
 import org.apache.pulsar.common.policies.data.RetentionPolicies;
 
@@ -24,9 +23,6 @@ public class NamespaceDetailDto {
 
 	private String tenant;
 
-	@Setter(AccessLevel.PRIVATE)
-	private int amountOfTopics = 0;
-
 	private BundlesData bundlesData;
 
 	private Integer messagesTTL;
@@ -41,7 +37,6 @@ public static NamespaceDetailDto fromString(String namespaceId) {
 
 	public void setTopics(List<String> topics) {
 		this.topics = topics;
-		this.amountOfTopics = topics.size();
 	}
 
 	/**

backend/src/main/java/de/amos/apachepulsarui/dto/TenantDetailsDto.java renamed to backend/src/main/java/de/amos/apachepulsarui/dto/TenantDetailDto.java

@@ -5,25 +5,20 @@
 
 package de.amos.apachepulsarui.dto;
 
-import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Data;
-import lombok.Setter;
 import org.apache.pulsar.common.policies.data.TenantInfo;
 
 import java.util.List;
 
 @Data
 @Builder
-public class TenantDetailsDto {
+public class TenantDetailDto {
 
     private String name;
 
     private List<String> namespaces;
 
-	@Setter(AccessLevel.PRIVATE)
-	private int amountOfNamespaces;
-
     private TenantInfo tenantInfo;
 
 	/**

backend/src/main/java/de/amos/apachepulsarui/service/ClusterService.java

@@ -49,7 +49,6 @@ public ClusterDetailDto getClusterDetails(String clusterName) {
                 .brokers(activeBrokers)
                 .amountOfBrokers(activeBrokers.size())
                 .tenants(tenantsAllowedForCluster)
-                .amountOfTenants(tenantsAllowedForCluster.size())
                 .build();
     }
 
@@ -94,7 +93,7 @@ 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());
-        clusterDto.setNumberOfNamespces(numberOfNamespaces);
+        clusterDto.setNumberOfNamespaces(numberOfNamespaces);
         return clusterDto;
     }
 

backend/src/main/java/de/amos/apachepulsarui/service/TenantService.java

@@ -1,6 +1,6 @@
 package de.amos.apachepulsarui.service;
 
-import de.amos.apachepulsarui.dto.TenantDetailsDto;
+import de.amos.apachepulsarui.dto.TenantDetailDto;
 import de.amos.apachepulsarui.dto.TenantDto;
 import de.amos.apachepulsarui.exception.PulsarApiException;
 import lombok.RequiredArgsConstructor;
@@ -54,13 +54,12 @@ public List<TenantDto> getAllFiltered(List<String> tenants) throws PulsarApiExce
     }
 
     @Cacheable("tenant.detail")
-    public TenantDetailsDto getTenantDetails(String tenantName) {
+    public TenantDetailDto getTenantDetails(String tenantName) {
         List<String> namespacesOfTenant = namespaceService.getAllOfTenant(tenantName);
-        return TenantDetailsDto.builder()
+        return TenantDetailDto.builder()
                 .name(tenantName)
                 .tenantInfo(getTenantInfo(tenantName))
                 .namespaces(namespacesOfTenant)
-                .amountOfNamespaces(namespacesOfTenant.size())
                 .build();
     }
 

backend/src/test/java/de/amos/apachepulsarui/controller/NamespaceControllerTest.java

@@ -102,7 +102,6 @@ void getNamespaceDetails_returnsNamespace() throws Exception {
         mockMvc.perform(get("/namespace?name=tenantX/namespace1"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.id", equalTo(namespace.getId())))
-                .andExpect(jsonPath("$.amountOfTopics", equalTo(namespace.getAmountOfTopics())))
                 .andExpect(jsonPath("$.topics", equalTo(namespace.getTopics())));
     }
 

backend/src/test/java/de/amos/apachepulsarui/service/NamespaceServiceIntegrationTest.java

@@ -78,7 +78,6 @@ void getNamespaceDetails_returnsNamespaces() throws PulsarAdminException {
 
         Assertions.assertThat(namespace.getId()).isEqualTo("tenant1/namespace1");
         Assertions.assertThat(namespace.getTopics()).contains("persistent://tenant1/namespace1/testTopic");
-        Assertions.assertThat(namespace.getAmountOfTopics()).isEqualTo(1);
     }
 
     private void createTenant(String tenant) throws PulsarAdminException {