SonarQube fixes

Author: germanosin

api/src/main/java/io/kafbat/ui/service/KafkaClusterFactory.java

@@ -249,9 +249,4 @@ private ReactiveFailover<KsqlApiClient> ksqlClient(ClustersProperties.Cluster cl
   private List<String> parseUrlList(String url) {
     return Stream.of(url.split(",")).map(String::trim).filter(s -> !s.isBlank()).toList();
   }
-
-  private boolean metricsConfigured(ClustersProperties.Cluster clusterProperties) {
-    return clusterProperties.getMetrics() != null;
-  }
-
 }

api/src/main/java/io/kafbat/ui/service/KafkaConnectService.java

@@ -33,7 +33,6 @@
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Flux;

api/src/main/java/io/kafbat/ui/service/metrics/SummarizedMetrics.java

@@ -21,6 +21,10 @@
 import java.util.stream.Stream;
 import lombok.RequiredArgsConstructor;
 
+/**
+ * Will be replaced in the next versions.
+ * @deprecated Since 1.4.0
+ **/
 @Deprecated(forRemoval = true, since = "1.4.0") //used for api backward-compatibility
 @RequiredArgsConstructor
 public class SummarizedMetrics {

api/src/main/java/io/kafbat/ui/service/metrics/scrape/ScrapedClusterState.java

@@ -14,6 +14,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import lombok.Builder;
 import lombok.RequiredArgsConstructor;
@@ -123,41 +124,41 @@ public static Mono<ScrapedClusterState> scrape(ClusterDescription clusterDescrip
             create(
                 clusterDescription,
                 phase1.getT1(),
-                phase1.getT3(),
-                phase1.getT4(),
-                phase2.getT1(),
-                phase2.getT2(),
+                topicStateMap(phase1.getT1(), phase1.getT3(), phase1.getT4(), phase2.getT1(), phase2.getT2()),
                 phase2.getT3(),
                 phase2.getT4()
             )));
   }
 
+  private static Map<String, TopicState> topicStateMap(
+      InternalLogDirStats segmentStats,
+      Map<String, TopicDescription> topicDescriptions,
+      Map<String, List<ConfigEntry>> topicConfigs,
+      Map<TopicPartition, Long> latestOffsets,
+      Map<TopicPartition, Long> earliestOffsets) {
+
+    return topicDescriptions.entrySet().stream().map(entry -> new TopicState(
+        entry.getKey(),
+        entry.getValue(),
+        topicConfigs.getOrDefault(entry.getKey(), List.of()),
+        filterTopic(entry.getKey(), earliestOffsets),
+        filterTopic(entry.getKey(), latestOffsets),
+        segmentStats.getTopicStats().get(entry.getKey()),
+        Optional.ofNullable(segmentStats.getPartitionsStats())
+            .map(topicForFilter -> filterTopic(entry.getKey(), topicForFilter))
+            .orElse(null)
+    )).collect(Collectors.toMap(
+        TopicState::name,
+        Function.identity()
+    ));
+  }
+
   private static ScrapedClusterState create(ClusterDescription clusterDescription,
                                             InternalLogDirStats segmentStats,
-                                            Map<String, TopicDescription> topicDescriptions,
-                                            Map<String, List<ConfigEntry>> topicConfigs,
-                                            Map<TopicPartition, Long> latestOffsets,
-                                            Map<TopicPartition, Long> earliestOffsets,
+                                            Map<String, TopicState> topicStates,
                                             Map<String, ConsumerGroupDescription> consumerDescriptions,
                                             Table<String, TopicPartition, Long> consumerOffsets) {
 
-
-    Map<String, TopicState> topicStates = new HashMap<>();
-    topicDescriptions.forEach((name, desc) ->
-        topicStates.put(
-            name,
-            new TopicState(
-                name,
-                desc,
-                topicConfigs.getOrDefault(name, List.of()),
-                filterTopic(name, earliestOffsets),
-                filterTopic(name, latestOffsets),
-                segmentStats.getTopicStats().get(name),
-                Optional.ofNullable(segmentStats.getPartitionsStats())
-                    .map(topicForFilter -> filterTopic(name, topicForFilter))
-                    .orElse(null)
-            )));
-
     Map<String, ConsumerGroupState> consumerGroupsStates = new HashMap<>();
     consumerDescriptions.forEach((name, desc) ->
         consumerGroupsStates.put(

api/src/main/java/io/kafbat/ui/service/metrics/scrape/inferred/InferredMetricsScraper.java

@@ -226,7 +226,7 @@ private static void fillConsumerGroupsMetrics(MetricsRegistry registry, ScrapedC
                     "Current Approximate Lag of a ConsumerGroup at Topic/Partition",
                     List.of("consumergroup", TOPIC_TAG, PARTITION_TAG),
                     List.of(groupName, tp.topic(), String.valueOf(tp.partition())),
-                    endOffset - committedOffset //TODO: check +-1
+                    endOffset - committedOffset
                 ));
 
       });

api/src/main/java/io/kafbat/ui/service/metrics/scrape/jmx/JmxMetricsFormatter.java

@@ -21,9 +21,12 @@ public class JmxMetricsFormatter {
       "([^,=:\\*\\?]+)=(\"(?:\\\\.|[^\\\\\"])*\"|[^,=:\"]*)"
   );
 
+  private JmxMetricsFormatter() {
+  }
+
   public static List<RawMetric> constructMetricsList(ObjectName jmxMetric,
-                                              MBeanAttributeInfo[] attributes,
-                                              Object[] attrValues) {
+                                                     MBeanAttributeInfo[] attributes,
+                                                     Object[] attrValues) {
     String domain = fixIllegalChars(jmxMetric.getDomain());
     LinkedHashMap<String, String> labels = getLabelsMap(jmxMetric);
     String firstLabel = labels.keySet().iterator().next();

api/src/main/java/io/kafbat/ui/service/metrics/scrape/prometheus/PrometheusTextFormatParser.java

@@ -43,7 +43,7 @@ public class PrometheusTextFormatParser {
           + "(?:\\{([^}]*)\\})?"                     // Optional labels (content in group 2)
           + "\\s+"
           + "(-?(?:Inf|NaN|(?:\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)))" // Value (group 3)
-          + "(?:\\s+([0-9]+))?$");                 // Group 4: Optional timestamp
+          + "(?:\\s+(\\d+))?$");                 // Group 4: Optional timestamp
 
 
   private static final Pattern HELP_PATTERN =