Merge branch 'issues/729' of https://github.com/zambrinf/kafka-ui into issues/729

Author: zambrinf

.github/workflows/frontend_tests.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v4.0.2
         with:
-          node-version: "18.17.1"
+          node-version: "22.12.0"
           cache: "pnpm"
           cache-dependency-path: "./frontend/pnpm-lock.yaml"
 

api/src/main/java/io/kafbat/ui/model/BrokerMetrics.java

@@ -1,6 +1,5 @@
 package io.kafbat.ui.model;
 
-import io.kafbat.ui.model.MetricDTO;
 import java.util.List;
 import lombok.Builder;
 import lombok.Data;

api/src/main/java/io/kafbat/ui/model/CleanupPolicy.java

@@ -20,18 +20,10 @@ public enum CleanupPolicy {
     this.policies = policies;
   }
 
-  public String getPolicy() {
-    return policies.get(0);
-  }
-
   public static CleanupPolicy fromString(String string) {
     return Arrays.stream(CleanupPolicy.values())
-        .filter(v ->
-            v.policies.stream().anyMatch(
-                s -> s.equals(string.replace(" ", "")
-                )
-            )
-        ).findFirst()
+        .filter(v -> v.policies.stream().anyMatch(s -> s.equals(string.replace(" ", ""))))
+        .findFirst()
         .orElse(UNKNOWN);
   }
 }

api/src/main/java/io/kafbat/ui/model/InternalBrokerConfig.java

@@ -1,6 +1,5 @@
 package io.kafbat.ui.model;
 
-
 import java.util.List;
 import lombok.Builder;
 import lombok.Data;
@@ -17,13 +16,13 @@ public class InternalBrokerConfig {
   private final List<ConfigEntry.ConfigSynonym> synonyms;
 
   public static InternalBrokerConfig from(ConfigEntry configEntry, boolean readOnlyCluster) {
-    InternalBrokerConfig.InternalBrokerConfigBuilder builder = InternalBrokerConfig.builder()
+    return InternalBrokerConfig.builder()
         .name(configEntry.name())
         .value(configEntry.value())
         .source(configEntry.source())
         .isReadOnly(readOnlyCluster || configEntry.isReadOnly())
         .isSensitive(configEntry.isSensitive())
-        .synonyms(configEntry.synonyms());
-    return builder.build();
+        .synonyms(configEntry.synonyms())
+        .build();
   }
 }

api/src/main/java/io/kafbat/ui/model/InternalClusterMetrics.java

@@ -1,15 +1,12 @@
 package io.kafbat.ui.model;
 
-import io.kafbat.ui.model.MetricDTO;
-import io.kafbat.ui.model.ServerStatusDTO;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
 import lombok.Builder;
 import lombok.Data;
 
-
 @Data
 @Builder(toBuilder = true)
 public class InternalClusterMetrics {

api/src/main/java/io/kafbat/ui/model/InternalClusterState.java

@@ -1,9 +1,6 @@
 package io.kafbat.ui.model;
 
 import com.google.common.base.Throwables;
-import io.kafbat.ui.model.BrokerDiskUsageDTO;
-import io.kafbat.ui.model.MetricsCollectionErrorDTO;
-import io.kafbat.ui.model.ServerStatusDTO;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;

api/src/main/java/io/kafbat/ui/model/InternalPartition.java

@@ -20,5 +20,4 @@ public class InternalPartition {
   private final Long segmentSize;
   private final Integer segmentCount;
 
-
 }

api/src/main/java/io/kafbat/ui/model/InternalPartitionsOffsets.java

@@ -7,7 +7,6 @@
 import lombok.Value;
 import org.apache.kafka.common.TopicPartition;
 
-
 public class InternalPartitionsOffsets {
 
   @Value

api/src/main/java/io/kafbat/ui/model/InternalSegmentSizeDto.java

@@ -1,6 +1,5 @@
 package io.kafbat.ui.model;
 
-import io.kafbat.ui.config.ClustersProperties;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
@@ -16,8 +15,6 @@
 @Builder(toBuilder = true)
 public class InternalTopic {
 
-  ClustersProperties clustersProperties;
-
   // from TopicDescription
   private final String name;
   private final boolean internal;