BE: Cleanup in controller package

kafbat · Jul 26, 2024 · d8cb677 · d8cb677
1 parent 8c70126
commit d8cb677
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 29 deletions.
diff --git a/api/src/main/java/io/kafbat/ui/controller/AccessController.java b/api/src/main/java/io/kafbat/ui/controller/AccessController.java
@@ -60,16 +60,17 @@ private List<UserPermissionDTO> mapPermissions(List<Permission> permissions, Lis
     return permissions
         .stream()
         .map(permission -> {
-          UserPermissionDTO dto = new UserPermissionDTO();
-          dto.setClusters(clusters);
-          dto.setResource(ResourceTypeDTO.fromValue(permission.getResource().toString().toUpperCase()));
+          UserPermissionDTO dto = new UserPermissionDTO(
+              clusters,
+              ResourceTypeDTO.fromValue(permission.getResource().toString().toUpperCase()),
+              permission.getParsedActions()
+                  .stream()
+                  .map(p -> p.name().toUpperCase())
+                  .map(this::mapAction)
+                  .filter(Objects::nonNull)
+                  .toList()
+          );
           dto.setValue(permission.getValue());
-          dto.setActions(permission.getParsedActions()
-              .stream()
-              .map(p -> p.name().toUpperCase())
-              .map(this::mapAction)
-              .filter(Objects::nonNull)
-              .toList());
           return dto;
         })
         .toList();

diff --git a/api/src/main/java/io/kafbat/ui/controller/ApplicationConfigController.java b/api/src/main/java/io/kafbat/ui/controller/ApplicationConfigController.java
@@ -109,7 +109,7 @@ public Mono<ResponseEntity<UploadedFileInfoDTO>> uploadConfigRelatedFile(Flux<Pa
         .then(fileFlux.single())
         .flatMap(file ->
             dynamicConfigOperations.uploadConfigRelatedFile((FilePart) file)
-                .map(path -> new UploadedFileInfoDTO().location(path.toString()))
+                .map(path -> new UploadedFileInfoDTO(path.toString()))
                 .map(ResponseEntity::ok))
         .doOnEach(sig -> audit(context, sig));
   }

diff --git a/api/src/main/java/io/kafbat/ui/controller/KsqlController.java b/api/src/main/java/io/kafbat/ui/controller/KsqlController.java
@@ -41,18 +41,18 @@ public Mono<ResponseEntity<KsqlCommandV2ResponseDTO>> executeKsql(String cluster
                   .operationParams(command)
                   .build();
               return validateAccess(context).thenReturn(
-                      new KsqlCommandV2ResponseDTO().pipeId(
-                          ksqlServiceV2.registerCommand(
-                              getCluster(clusterName),
-                              command.getKsql(),
-                              Optional.ofNullable(command.getStreamsProperties()).orElse(Map.of()))))
+                      new KsqlCommandV2ResponseDTO(ksqlServiceV2.registerCommand(
+                          getCluster(clusterName),
+                          command.getKsql(),
+                          Optional.ofNullable(command.getStreamsProperties()).orElse(Map.of()))))
                   .doOnEach(sig -> audit(context, sig));
             }
         )
         .map(ResponseEntity::ok);
   }
 
   @Override
+  @SuppressWarnings("unchecked")
   public Mono<ResponseEntity<Flux<KsqlResponseDTO>>> openKsqlResponsePipe(String clusterName,
                                                                           String pipeId,
                                                                           ServerWebExchange exchange) {

diff --git a/api/src/main/java/io/kafbat/ui/controller/SchemasController.java b/api/src/main/java/io/kafbat/ui/controller/SchemasController.java
@@ -160,7 +160,7 @@ public Mono<ResponseEntity<Flux<SchemaSubjectDTO>>> getAllVersionsBySubject(
   public Mono<ResponseEntity<CompatibilityLevelDTO>> getGlobalSchemaCompatibilityLevel(
       String clusterName, ServerWebExchange exchange) {
     return schemaRegistryService.getGlobalSchemaCompatibilityLevel(getCluster(clusterName))
-        .map(c -> new CompatibilityLevelDTO().compatibility(kafkaSrMapper.toDto(c)))
+        .map(c -> new CompatibilityLevelDTO(kafkaSrMapper.toDto(c)))
         .map(ResponseEntity::ok)
         .defaultIfEmpty(ResponseEntity.notFound().build());
   }

diff --git a/api/src/main/java/io/kafbat/ui/controller/TopicsController.java b/api/src/main/java/io/kafbat/ui/controller/TopicsController.java
@@ -350,18 +350,12 @@ private Comparator<InternalTopic> getComparatorForTopic(
     if (orderBy == null) {
       return defaultComparator;
     }
-    switch (orderBy) {
-      case TOTAL_PARTITIONS:
-        return Comparator.comparing(InternalTopic::getPartitionCount);
-      case OUT_OF_SYNC_REPLICAS:
-        return Comparator.comparing(t -> t.getReplicas() - t.getInSyncReplicas());
-      case REPLICATION_FACTOR:
-        return Comparator.comparing(InternalTopic::getReplicationFactor);
-      case SIZE:
-        return Comparator.comparing(InternalTopic::getSegmentSize);
-      case NAME:
-      default:
-        return defaultComparator;
-    }
+    return switch (orderBy) {
+      case TOTAL_PARTITIONS -> Comparator.comparing(InternalTopic::getPartitionCount);
+      case OUT_OF_SYNC_REPLICAS -> Comparator.comparing(t -> t.getReplicas() - t.getInSyncReplicas());
+      case REPLICATION_FACTOR -> Comparator.comparing(InternalTopic::getReplicationFactor);
+      case SIZE -> Comparator.comparing(InternalTopic::getSegmentSize);
+      default -> defaultComparator;
+    };
   }
 }