Merge branch 'main' into issues/477

wernerdv · web-flow · commit 1c609989ca6a · 2024-08-08T01:32:37.000+05:00
diff --git a/.github/workflows/e2e-run.yml b/.github/workflows/e2e-run.yml
@@ -103,8 +103,8 @@ jobs:
         run: |
           mkdir -p ./e2e-tests/target/selenoid-results/video
           mkdir -p ./e2e-tests/target/selenoid-results/logs
-          docker-compose -f ./e2e-tests/selenoid/selenoid-ci.yaml up -d
-          docker-compose -f ./documentation/compose/e2e-tests.yaml up -d
+          docker compose -f ./e2e-tests/selenoid/selenoid-ci.yaml up -d
+          docker compose -f ./documentation/compose/e2e-tests.yaml up -d
 
       - name: Dump Docker logs on failure
         if: failure()
diff --git a/api/src/main/java/io/kafbat/ui/controller/AccessController.java b/api/src/main/java/io/kafbat/ui/controller/AccessController.java
@@ -45,33 +45,34 @@ public Mono<ResponseEntity<AuthenticationInfoDTO>> getUserAuthInfo(ServerWebExch
         .map(SecurityContext::getAuthentication)
         .map(Principal::getName);
 
+    var builder = AuthenticationInfoDTO.builder()
+        .rbacEnabled(accessControlService.isRbacEnabled());
+
     return userName
         .zipWith(permissions)
-        .map(data -> {
-          var dto = new AuthenticationInfoDTO(accessControlService.isRbacEnabled());
-          dto.setUserInfo(new UserInfoDTO(data.getT1(), data.getT2()));
-          return dto;
-        })
-        .switchIfEmpty(Mono.just(new AuthenticationInfoDTO(accessControlService.isRbacEnabled())))
+        .map(data -> (AuthenticationInfoDTO) builder
+            .userInfo(new UserInfoDTO(data.getT1(), data.getT2()))
+            .build()
+        )
+        .switchIfEmpty(Mono.just(builder.build()))
         .map(ResponseEntity::ok);
   }
 
   private List<UserPermissionDTO> mapPermissions(List<Permission> permissions, List<String> clusters) {
     return permissions
         .stream()
-        .map(permission -> {
-          UserPermissionDTO dto = new UserPermissionDTO();
-          dto.setClusters(clusters);
-          dto.setResource(ResourceTypeDTO.fromValue(permission.getResource().toString().toUpperCase()));
-          dto.setValue(permission.getValue());
-          dto.setActions(permission.getParsedActions()
-              .stream()
-              .map(p -> p.name().toUpperCase())
-              .map(this::mapAction)
-              .filter(Objects::nonNull)
-              .toList());
-          return dto;
-        })
+        .map(permission -> (UserPermissionDTO) UserPermissionDTO.builder()
+            .clusters(clusters)
+            .resource(ResourceTypeDTO.fromValue(permission.getResource().toString().toUpperCase()))
+            .value(permission.getValue())
+            .actions(permission.getParsedActions()
+                .stream()
+                .map(p -> p.name().toUpperCase())
+                .map(this::mapAction)
+                .filter(Objects::nonNull)
+                .toList())
+            .build()
+        )
         .toList();
   }
 
diff --git a/api/src/main/java/io/kafbat/ui/controller/KsqlController.java b/api/src/main/java/io/kafbat/ui/controller/KsqlController.java
@@ -53,6 +53,7 @@ public Mono<ResponseEntity<KsqlCommandV2ResponseDTO>> executeKsql(String cluster
   }
 
   @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/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;
+    };
   }
 }
diff --git a/api/src/test/java/io/kafbat/ui/emitter/MessageFiltersTest.java b/api/src/test/java/io/kafbat/ui/emitter/MessageFiltersTest.java
@@ -199,6 +199,10 @@ void testBase64DecodingWorks() {
   }
 
   private TopicMessageDTO msg() {
-    return new TopicMessageDTO(1, -1L, OffsetDateTime.now());
+    return TopicMessageDTO.builder()
+        .partition(1)
+        .offset(-1L)
+        .timestamp(OffsetDateTime.now())
+        .build();
   }
 }
diff --git a/contract/pom.xml b/contract/pom.xml
@@ -46,6 +46,11 @@
                     <artifactId>javax.annotation-api</artifactId>
                     <version>1.3.2</version>
                 </dependency>
+                <dependency>
+                    <groupId>org.projectlombok</groupId>
+                    <artifactId>lombok</artifactId>
+                    <version>${org.projectlombok.version}</version>
+                </dependency>
             </dependencies>
 
             <build>
@@ -100,6 +105,12 @@
                                         <useTags>true</useTags>
                                         <useSpringBoot3>true</useSpringBoot3>
                                         <dateLibrary>java8</dateLibrary>
+                                        <generatedConstructorWithRequiredArgs>false</generatedConstructorWithRequiredArgs>
+                                        <additionalModelTypeAnnotations>
+                                            @lombok.experimental.SuperBuilder
+                                            @lombok.NoArgsConstructor
+                                            @lombok.AllArgsConstructor
+                                        </additionalModelTypeAnnotations>
                                     </configOptions>
                                 </configuration>
                             </execution>

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ public Mono<ResponseEntity<KsqlCommandV2ResponseDTO>> executeKsql(String cluster`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
	`56`	`+ @SuppressWarnings("unchecked")`
`56`	`57`	`public Mono<ResponseEntity<Flux<KsqlResponseDTO>>> openKsqlResponsePipe(String clusterName,`
`57`	`58`	`String pipeId,`
`58`	`59`	`ServerWebExchange exchange) {`
Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,10 @@ void testBase64DecodingWorks() {`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`private TopicMessageDTO msg() {`
`202`		`- return new TopicMessageDTO(1, -1L, OffsetDateTime.now());`
	`202`	`+ return TopicMessageDTO.builder()`
	`203`	`+ .partition(1)`
	`204`	`+ .offset(-1L)`
	`205`	`+ .timestamp(OffsetDateTime.now())`
	`206`	`+ .build();`
`203`	`207`	`}`
`204`	`208`	`}`