Fix warnings

Author: germanosin

api/build.gradle

@@ -33,6 +33,7 @@ dependencies {
 
     implementation libs.apache.avro
     implementation libs.apache.commons
+    implementation libs.apache.commons.text
     implementation libs.apache.commons.pool2
     implementation libs.apache.datasketches
 

api/src/main/java/io/kafbat/ui/client/RetryingKafkaConnectClient.java

@@ -1,5 +1,7 @@
 package io.kafbat.ui.client;
 
+import static org.apache.commons.lang3.Strings.CI;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.kafbat.ui.config.ClustersProperties;
 import io.kafbat.ui.connect.ApiClient;
@@ -22,7 +24,6 @@
 import java.util.Objects;
 import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.unit.DataSize;
 import org.springframework.web.client.RestClientException;
@@ -58,7 +59,7 @@ private static Retry conflictCodeRetry() {
 
       if (e instanceof WebClientResponseException.InternalServerError exception) {
         final var errorMessage = getMessage(exception);
-        return StringUtils.equals(errorMessage,
+        return CI.equals(errorMessage,
             // From https://github.com/apache/kafka/blob/dfc07e0e0c6e737a56a5402644265f634402b864/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/distributed/DistributedHerder.java#L2340
             "Request cannot be completed because a rebalance is expected");
       }

api/src/main/java/io/kafbat/ui/controller/MessagesController.java

@@ -75,7 +75,7 @@ public Mono<ResponseEntity<SmartFilterTestExecutionResultDTO>> executeSmartFilte
         .map(ResponseEntity::ok);
   }
 
-  @Deprecated
+  @Deprecated(forRemoval = true, since = "1.1.0")
   @Override
   public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(String clusterName,
                                                                            String topicName,

api/src/main/java/io/kafbat/ui/controller/SchemasController.java

@@ -1,5 +1,7 @@
 package io.kafbat.ui.controller;
 
+import static org.apache.commons.lang3.Strings.CI;
+
 import io.kafbat.ui.api.SchemasApi;
 import io.kafbat.ui.exception.ValidationException;
 import io.kafbat.ui.mapper.KafkaSrMapper;
@@ -222,7 +224,7 @@ public Mono<ResponseEntity<SchemaSubjectsResponseDTO>> getSchemas(String cluster
           int subjectToSkip = ((pageNum != null && pageNum > 0 ? pageNum : 1) - 1) * pageSize;
           List<String> filteredSubjects = subjects
               .stream()
-              .filter(subj -> search == null || StringUtils.containsIgnoreCase(subj, search))
+              .filter(subj -> search == null || CI.contains(subj, search))
               .sorted().toList();
           var totalPages = (filteredSubjects.size() / pageSize)
               + (filteredSubjects.size() % pageSize == 0 ? 0 : 1);

api/src/main/java/io/kafbat/ui/controller/TopicsController.java

@@ -7,6 +7,7 @@
 import static io.kafbat.ui.model.rbac.permission.TopicAction.EDIT;
 import static io.kafbat.ui.model.rbac.permission.TopicAction.VIEW;
 import static java.util.stream.Collectors.toList;
+import static org.apache.commons.lang3.Strings.CI;
 
 import io.kafbat.ui.api.TopicsApi;
 import io.kafbat.ui.mapper.ClusterMapper;
@@ -190,7 +191,7 @@ public Mono<ResponseEntity<TopicsResponseDTO>> getTopics(String clusterName,
           List<InternalTopic> filtered = topics.stream()
               .filter(topic -> !topic.isInternal()
                   || showInternal != null && showInternal)
-              .filter(topic -> search == null || StringUtils.containsIgnoreCase(topic.getName(), search))
+              .filter(topic -> search == null || CI.contains(topic.getName(), search))
               .sorted(comparator)
               .toList();
           var totalPages = (filtered.size() / pageSize)

api/src/main/java/io/kafbat/ui/emitter/MessageFilters.java

@@ -1,6 +1,7 @@
 package io.kafbat.ui.emitter;
 
 import static java.util.Collections.emptyMap;
+import static org.apache.commons.lang3.Strings.CS;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -35,7 +36,6 @@
 import javax.annotation.Nullable;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 
 @Slf4j
 @UtilityClass
@@ -55,8 +55,8 @@ public static Predicate<TopicMessageDTO> noop() {
   }
 
   public static Predicate<TopicMessageDTO> containsStringFilter(String string) {
-    return msg -> StringUtils.contains(msg.getKey(), string)
-        || StringUtils.contains(msg.getValue(), string) || headersContains(msg, string);
+    return msg -> CS.contains(msg.getKey(), string)
+        || CS.contains(msg.getValue(), string) || headersContains(msg, string);
   }
 
   private static boolean headersContains(TopicMessageDTO msg, String searchString) {
@@ -67,7 +67,7 @@ private static boolean headersContains(TopicMessageDTO msg, String searchString)
     }
 
     for (final var entry : headers.entrySet()) {
-      if (StringUtils.contains(entry.getKey(), searchString) || StringUtils.contains(entry.getValue(), searchString)) {
+      if (CS.contains(entry.getKey(), searchString) || CS.contains(entry.getValue(), searchString)) {
         return true;
       }
     }

api/src/main/java/io/kafbat/ui/emitter/OffsetsInfo.java

@@ -83,7 +83,7 @@ boolean assignedPartitionsFullyPolled() {
   long summaryOffsetsRange() {
     MutableLong cnt = new MutableLong();
     nonEmptyPartitions.forEach(tp -> cnt.add(endOffsets.get(tp) - beginOffsets.get(tp)));
-    return cnt.getValue();
+    return cnt.get().longValue();
   }
 
   public Set<TopicPartition> allTargetPartitions() {

api/src/main/java/io/kafbat/ui/emitter/SeekOperations.java

@@ -55,7 +55,7 @@ public long summaryOffsetsRange() {
   public long offsetsProcessedFromSeek() {
     MutableLong count = new MutableLong();
     offsetsForSeek.forEach((tp, initialOffset) -> count.add(consumer.position(tp) - initialOffset));
-    return count.getValue();
+    return count.get().longValue();
   }
 
   // Get offsets to seek to. NOTE: offsets do not contain empty partitions offsets

api/src/main/java/io/kafbat/ui/mapper/ClusterMapper.java

@@ -61,7 +61,6 @@ public interface ClusterMapper {
   @Mapping(target = "zooKeeperStatus", ignore = true)
   ClusterStatsDTO toClusterStats(InternalClusterState clusterState);
 
-  @Deprecated
   default ClusterMetricsDTO toClusterMetrics(Metrics metrics) {
     return new ClusterMetricsDTO()
         .items(convert(new SummarizedMetrics(metrics).asStream()).toList());

api/src/main/java/io/kafbat/ui/mapper/DynamicConfigMapper.java

@@ -1,15 +1,18 @@
 package io.kafbat.ui.mapper;
 
+import io.kafbat.ui.config.ClustersProperties;
 import io.kafbat.ui.model.ActionDTO;
 import io.kafbat.ui.model.ApplicationConfigPropertiesAuthOauth2ResourceServerDTO;
 import io.kafbat.ui.model.ApplicationConfigPropertiesAuthOauth2ResourceServerJwtDTO;
 import io.kafbat.ui.model.ApplicationConfigPropertiesAuthOauth2ResourceServerOpaquetokenDTO;
 import io.kafbat.ui.model.ApplicationConfigPropertiesDTO;
+import io.kafbat.ui.model.ApplicationConfigPropertiesKafkaClustersInnerDTO;
 import io.kafbat.ui.model.ApplicationConfigPropertiesRbacRolesInnerPermissionsInnerDTO;
 import io.kafbat.ui.model.rbac.Permission;
 import io.kafbat.ui.util.DynamicConfigOperations;
 import java.util.Optional;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 import org.springframework.boot.autoconfigure.security.oauth2.resource.OAuth2ResourceServerProperties;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
@@ -19,12 +22,16 @@ public interface DynamicConfigMapper {
 
   DynamicConfigOperations.PropertiesStructure fromDto(ApplicationConfigPropertiesDTO dto);
 
+  @Mapping(target = "kafka.clusters[].metrics.store", ignore = true)
   ApplicationConfigPropertiesDTO toDto(DynamicConfigOperations.PropertiesStructure propertiesStructure);
 
   default String map(Resource resource) {
     return resource.getFilename();
   }
 
+  @Mapping(source = "metrics.store", target = "metrics.store", ignore = true)
+  ApplicationConfigPropertiesKafkaClustersInnerDTO map(ClustersProperties.Cluster cluster);
+
   default Permission map(ApplicationConfigPropertiesRbacRolesInnerPermissionsInnerDTO perm) {
     Permission permission = new Permission();
     permission.setResource(perm.getResource().getValue());