BE: Chore: Clean up api tests (#1604)

wernerdv · web-flow · commit 3c93cb0845fc · 2026-01-03T16:45:48.000+07:00
diff --git a/api/src/test/java/io/kafbat/ui/KafkaConnectServiceTests.java b/api/src/test/java/io/kafbat/ui/KafkaConnectServiceTests.java
@@ -13,7 +13,6 @@
 import io.kafbat.ui.model.ConnectorStateDTO;
 import io.kafbat.ui.model.ConnectorStatusDTO;
 import io.kafbat.ui.model.ConnectorTypeDTO;
-import io.kafbat.ui.model.FullConnectorInfoDTO;
 import io.kafbat.ui.model.InternalTopic;
 import io.kafbat.ui.model.KafkaCluster;
 import io.kafbat.ui.model.NewConnectorDTO;
@@ -62,7 +61,7 @@ void setUp() {
     KafkaCluster kafkaCluster = clustersStorage.getClusterByName(LOCAL).get();
 
     InternalTopic block = topicsService.getTopicDetails(kafkaCluster, topicName)
-        .onErrorResume(t -> Mono.empty()).block();
+        .onErrorResume(_ -> Mono.empty()).block();
     if (block == null) {
       topicsService.createTopic(kafkaCluster,
           new TopicCreationDTO()
diff --git a/api/src/test/java/io/kafbat/ui/config/auth/OAuthTestSupport.java b/api/src/test/java/io/kafbat/ui/config/auth/OAuthTestSupport.java
@@ -17,7 +17,6 @@
 import java.util.Map;
 import lombok.Getter;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.security.oauth2.resource.OAuth2ResourceServerProperties;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -175,24 +174,6 @@ public static OAuthProperties createOAuthProperties() {
     return props;
   }
 
-  public static OAuthProperties createOAuthPropertiesWithJwt() {
-    OAuthProperties props = createOAuthProperties();
-    OAuth2ResourceServerProperties rs = new OAuth2ResourceServerProperties();
-    rs.getJwt().setJwkSetUri(oauthBaseUrl() + JWKS_PATH);
-    when(props.getResourceServer()).thenReturn(rs);
-    return props;
-  }
-
-  public static OAuthProperties createOAuthPropertiesWithOpaqueToken() {
-    OAuthProperties props = createOAuthProperties();
-    OAuth2ResourceServerProperties rs = new OAuth2ResourceServerProperties();
-    rs.getOpaquetoken().setIntrospectionUri(oauthBaseUrl() + INTROSPECT_PATH);
-    rs.getOpaquetoken().setClientId(CLIENT_ID);
-    rs.getOpaquetoken().setClientSecret(CLIENT_SECRET);
-    when(props.getResourceServer()).thenReturn(rs);
-    return props;
-  }
-
   /**
    * Initializer that starts WireMock servers WITH proxy enabled.
    */
diff --git a/api/src/test/java/io/kafbat/ui/config/auth/OAuthWithProxyTest.java b/api/src/test/java/io/kafbat/ui/config/auth/OAuthWithProxyTest.java
@@ -7,21 +7,12 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static io.kafbat.ui.config.auth.OAuthTestSupport.INTROSPECT_PATH;
-import static io.kafbat.ui.config.auth.OAuthTestSupport.JWKS_PATH;
 import static io.kafbat.ui.config.auth.OAuthTestSupport.TOKEN_PATH;
 import static io.kafbat.ui.config.auth.OAuthTestSupport.USERINFO_PATH;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.nimbusds.jose.JWSAlgorithm;
-import com.nimbusds.jose.JWSHeader;
-import com.nimbusds.jose.crypto.RSASSASigner;
-import com.nimbusds.jose.jwk.JWKSet;
-import com.nimbusds.jwt.JWTClaimsSet;
-import com.nimbusds.jwt.SignedJWT;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.Date;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -39,8 +30,6 @@
 import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
 import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse;
 import org.springframework.security.oauth2.core.user.OAuth2User;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
-import org.springframework.security.oauth2.server.resource.introspection.ReactiveOpaqueTokenIntrospector;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/api/src/test/java/io/kafbat/ui/config/auth/OAuthWithoutProxyTest.java b/api/src/test/java/io/kafbat/ui/config/auth/OAuthWithoutProxyTest.java
@@ -7,21 +7,12 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
-import static io.kafbat.ui.config.auth.OAuthTestSupport.INTROSPECT_PATH;
-import static io.kafbat.ui.config.auth.OAuthTestSupport.JWKS_PATH;
 import static io.kafbat.ui.config.auth.OAuthTestSupport.TOKEN_PATH;
 import static io.kafbat.ui.config.auth.OAuthTestSupport.USERINFO_PATH;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.nimbusds.jose.JWSAlgorithm;
-import com.nimbusds.jose.JWSHeader;
-import com.nimbusds.jose.crypto.RSASSASigner;
-import com.nimbusds.jose.jwk.JWKSet;
-import com.nimbusds.jwt.JWTClaimsSet;
-import com.nimbusds.jwt.SignedJWT;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.Date;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -39,8 +30,6 @@
 import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
 import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse;
 import org.springframework.security.oauth2.core.user.OAuth2User;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
-import org.springframework.security.oauth2.server.resource.introspection.ReactiveOpaqueTokenIntrospector;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/api/src/test/java/io/kafbat/ui/controller/PrometheusExposeControllerTest.java b/api/src/test/java/io/kafbat/ui/controller/PrometheusExposeControllerTest.java
@@ -1,11 +1,8 @@
 package io.kafbat.ui.controller;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import io.kafbat.ui.AbstractIntegrationTest;
 import io.kafbat.ui.service.ClustersStatisticsScheduler;
 import io.prometheus.metrics.expositionformats.PrometheusTextFormatWriter;
-import java.io.IOException;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -18,7 +15,7 @@ class PrometheusExposeControllerTest extends AbstractIntegrationTest {
   private ClustersStatisticsScheduler scheduler;
 
   @Test
-  void testGetMetrics() throws IOException {
+  void testGetMetrics() {
 
     scheduler.updateStatistics();
 
diff --git a/api/src/test/java/io/kafbat/ui/emitter/CursorTest.java b/api/src/test/java/io/kafbat/ui/emitter/CursorTest.java
@@ -123,7 +123,7 @@ private BackwardEmitter createBackwardEmitter(ConsumerPosition position) {
         position,
         PAGE_SIZE,
         createRecordsDeserializer(),
-        m -> true,
+        _ -> true,
         PollingSettings.createDefault(),
         createCursor(position)
     );
@@ -159,14 +159,14 @@ private ForwardEmitter createForwardEmitter(ConsumerPosition position) {
         position,
         PAGE_SIZE,
         createRecordsDeserializer(),
-        m -> true,
+        _ -> true,
         PollingSettings.createDefault(),
         createCursor(position)
     );
   }
 
   private Cursor.Tracking createCursor(ConsumerPosition position) {
-    return cursorsStorage.createNewCursor(createRecordsDeserializer(), position, m -> true, PAGE_SIZE);
+    return cursorsStorage.createNewCursor(createRecordsDeserializer(), position, _ -> true, PAGE_SIZE);
   }
 
   private EnhancedConsumer createConsumer() {
diff --git a/api/src/test/java/io/kafbat/ui/model/PartitionDistributionStatsTest.java b/api/src/test/java/io/kafbat/ui/model/PartitionDistributionStatsTest.java
@@ -2,11 +2,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.kafbat.ui.service.ReactiveAdminClient;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import org.apache.kafka.clients.admin.TopicDescription;
 import org.apache.kafka.common.Node;
 import org.apache.kafka.common.TopicPartitionInfo;
diff --git a/api/src/test/java/io/kafbat/ui/service/ConsumerGroupServiceTest.java b/api/src/test/java/io/kafbat/ui/service/ConsumerGroupServiceTest.java
@@ -19,7 +19,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.apache.kafka.clients.admin.ConsumerGroupDescription;
@@ -32,7 +31,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.mapstruct.Mapping;
 import org.mockito.Mockito;
 import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
diff --git a/api/src/test/java/io/kafbat/ui/service/OffsetsResetServiceTest.java b/api/src/test/java/io/kafbat/ui/service/OffsetsResetServiceTest.java
@@ -190,7 +190,7 @@ private void sendMsgsToPartition(Map<Integer, Integer> msgsCountForPartitions) {
         msgsCountForPartitions.entrySet().stream()
             .flatMap(e ->
                 IntStream.range(0, e.getValue())
-                    .mapToObj(i -> new ProducerRecord<>(topic, e.getKey(), bytes, bytes))));
+                    .mapToObj(_ -> new ProducerRecord<>(topic, e.getKey(), bytes, bytes))));
   }
 
   private void send(Stream<ProducerRecord<Bytes, Bytes>> toSend) {
diff --git a/api/src/test/java/io/kafbat/ui/service/ReactiveAdminClientTest.java b/api/src/test/java/io/kafbat/ui/service/ReactiveAdminClientTest.java
@@ -183,7 +183,7 @@ void filterPartitionsWithLeaderCheckThrowExceptionIfThereIsSomePartitionsWithout
                 List.of(
                     new TopicPartitionInfo(0, new Node(1, "n1", 9092), List.of(), List.of()))
             )),
-        p -> true,
+        _ -> true,
         // setting failOnNoLeader flag
         true
     );
diff --git a/api/src/test/java/io/kafbat/ui/service/RecordEmitterTest.java b/api/src/test/java/io/kafbat/ui/service/RecordEmitterTest.java
@@ -62,7 +62,7 @@ class RecordEmitterTest extends AbstractIntegrationTest {
   static final List<Record> SENT_RECORDS = new ArrayList<>();
   static final ConsumerRecordDeserializer RECORD_DESERIALIZER = createRecordsDeserializer();
   static final Cursor.Tracking CURSOR_MOCK = Mockito.mock(Cursor.Tracking.class);
-  static final Predicate<TopicMessageDTO> NOOP_FILTER = m -> true;
+  static final Predicate<TopicMessageDTO> NOOP_FILTER = _ -> true;
 
   @BeforeAll
   static void generateMsgs() throws Exception {
@@ -330,7 +330,7 @@ private void expectEmitter(Consumer<FluxSink<TopicMessageEventDTO>> emitter, Lis
             .expectNextCount(expectedValues.size())
             .expectRecordedMatches(r -> r.containsAll(expectedValues))
             .consumeRecordedWith(r -> log.info("Collected collection: {}", r)),
-        v -> {
+        _ -> {
         }
     );
   }
diff --git a/api/src/test/java/io/kafbat/ui/service/TopicsServicePaginationTest.java b/api/src/test/java/io/kafbat/ui/service/TopicsServicePaginationTest.java
@@ -134,7 +134,7 @@ private void init(Map<String, InternalTopic> topicsInCache) {
   private TopicDescription toTopicDescription(InternalTopic t) {
     return new TopicDescription(
         t.getName(), t.isInternal(),
-        t.getPartitions().values().stream().map(p -> toTopicPartitionInfo(p)).toList()
+        t.getPartitions().values().stream().map(this::toTopicPartitionInfo).toList()
     );
   }
 
diff --git a/api/src/test/java/io/kafbat/ui/service/index/ConsumerGroupsFilterTest.java b/api/src/test/java/io/kafbat/ui/service/index/ConsumerGroupsFilterTest.java
@@ -2,7 +2,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.kafbat.ui.model.InternalConsumerGroup;
 import java.util.List;
 import java.util.Map;
 import org.apache.kafka.clients.admin.ConsumerGroupListing;
diff --git a/api/src/test/java/io/kafbat/ui/service/integration/odd/TopicsExporterTest.java b/api/src/test/java/io/kafbat/ui/service/integration/odd/TopicsExporterTest.java
@@ -48,7 +48,7 @@ class TopicsExporterTest {
   @BeforeEach
   void init() {
     var statisticsCacheMock = mock(StatisticsCache.class);
-    when(statisticsCacheMock.get(cluster)).thenAnswer(invocationOnMock -> stats);
+    when(statisticsCacheMock.get(cluster)).thenAnswer(_ -> stats);
 
     topicsExporter = new TopicsExporter(
         topic -> !topic.startsWith("_"),
@@ -155,7 +155,7 @@ void doesExportTopicData() {
           assertThat(entityList.getItems())
               .hasSize(1);
 
-          DataEntity topicEntity = entityList.getItems().get(0);
+          DataEntity topicEntity = entityList.getItems().getFirst();
           assertThat(topicEntity.getName()).isNotEmpty();
           assertThat(topicEntity.getOddrn())
               .isEqualTo("//kafka/cluster/localhost:19092,localhost:9092/topics/testTopic");
diff --git a/api/src/test/java/io/kafbat/ui/service/ksql/KsqlApiClientTest.java b/api/src/test/java/io/kafbat/ui/service/ksql/KsqlApiClientTest.java
@@ -81,9 +81,9 @@ private void assertLastKsqTutorialQueryResult(KsqlApiClient client) {
           assertThat(header.getValues()).isNull();
         })
         .assertNext(row -> {
-          var distance = (DoubleNode) row.getValues().get(0).get(0);
-          var riders = (ArrayNode) row.getValues().get(0).get(1);
-          var count = (IntNode) row.getValues().get(0).get(2);
+          var distance = (DoubleNode) row.getValues().getFirst().getFirst();
+          var riders = (ArrayNode) row.getValues().getFirst().get(1);
+          var count = (IntNode) row.getValues().getFirst().get(2);
 
           assertThat(distance).isEqualTo(new DoubleNode(0D));
           assertThat(riders).isEqualTo(new ArrayNode(JsonNodeFactory.instance)
@@ -93,9 +93,9 @@ private void assertLastKsqTutorialQueryResult(KsqlApiClient client) {
           assertThat(count).isEqualTo(new IntNode(3));
         })
         .assertNext(row -> {
-          var distance = (DoubleNode) row.getValues().get(0).get(0);
-          var riders = (ArrayNode) row.getValues().get(0).get(1);
-          var count = (IntNode) row.getValues().get(0).get(2);
+          var distance = (DoubleNode) row.getValues().getFirst().getFirst();
+          var riders = (ArrayNode) row.getValues().getFirst().get(1);
+          var count = (IntNode) row.getValues().getFirst().get(2);
 
           assertThat(distance).isEqualTo(new DoubleNode(10D));
           assertThat(riders).isEqualTo(new ArrayNode(JsonNodeFactory.instance)
diff --git a/api/src/test/java/io/kafbat/ui/service/ksql/KsqlServiceV2Test.java b/api/src/test/java/io/kafbat/ui/service/ksql/KsqlServiceV2Test.java
@@ -100,7 +100,7 @@ void listTablesReturnsAllKsqlTables() {
   private static KafkaCluster cluster() {
     return KafkaCluster.builder()
         .ksqlClient(ReactiveFailover.create(
-            List.of(ksqlClient()), th -> true, "", ReactiveFailover.DEFAULT_RETRY_GRACE_PERIOD_MS))
+            List.of(ksqlClient()), _ -> true, "", ReactiveFailover.DEFAULT_RETRY_GRACE_PERIOD_MS))
         .build();
   }
 
diff --git a/api/src/test/java/io/kafbat/ui/service/masking/policies/MaskTest.java b/api/src/test/java/io/kafbat/ui/service/masking/policies/MaskTest.java
@@ -43,7 +43,7 @@ private static Stream<Arguments> testApplyToJsonContainer() {
             parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"Xxxxnnn-\"}}")
         ),
         Arguments.of(
-            (FieldsSelector) (fieldName -> true),
+            (FieldsSelector) (_ -> true),
             parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"Bond777!\"}}"),
             parse("{ \"outer\": { \"f1\": \"Xxxxx\", \"name\": \"Xxxxnnn-\"}}")
         )
@@ -57,7 +57,7 @@ private static Stream<Arguments> testApplyToJsonContainer() {
       "null, xxxx"
   })
   void testApplyToString(String original, String expected) {
-    Mask policy = new Mask(fieldName -> true, PATTERN);
+    Mask policy = new Mask(_ -> true, PATTERN);
     assertThat(policy.applyToString(original)).isEqualTo(expected);
   }
 
diff --git a/api/src/test/java/io/kafbat/ui/service/masking/policies/RemoveTest.java b/api/src/test/java/io/kafbat/ui/service/masking/policies/RemoveTest.java
@@ -42,12 +42,12 @@ private static Stream<Arguments> testApplyToJsonContainer() {
             parse("{ \"outer\": { \"f1\": \"James\"}}")
         ),
         Arguments.of(
-            (FieldsSelector) (fieldName -> true),
+            (FieldsSelector) (_ -> true),
             parse("{ \"outer\": { \"f1\": \"v1\", \"f2\": \"v2\", \"inner\" : {\"if1\": \"iv1\"}}}"),
             parse("{}")
         ),
         Arguments.of(
-            (FieldsSelector) (fieldName -> true),
+            (FieldsSelector) (_ -> true),
             parse("[{ \"f1\": 123}, { \"f2\": \"1.2\"} ]"),
             parse("[{}, {}]")
         )
@@ -66,7 +66,7 @@ private static JsonNode parse(String str) {
       "null, null"
   })
   void testApplyToString(String original, String expected) {
-    var policy = new Remove(fieldName -> true);
+    var policy = new Remove(_ -> true);
     assertThat(policy.applyToString(original)).isEqualTo(expected);
   }
 }
diff --git a/api/src/test/java/io/kafbat/ui/service/masking/policies/ReplaceTest.java b/api/src/test/java/io/kafbat/ui/service/masking/policies/ReplaceTest.java
@@ -43,7 +43,7 @@ private static Stream<Arguments> testApplyToJsonContainer() {
             parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"***\"}}")
         ),
         Arguments.of(
-            (FieldsSelector) (fieldName -> true),
+            (FieldsSelector) (_ -> true),
             parse("{ \"outer\": { \"f1\": \"v1\", \"f2\": \"v2\", \"inner\" : {\"if1\": \"iv1\"}}}"),
             parse("{ \"outer\": { \"f1\": \"***\", \"f2\": \"***\", \"inner\" : {\"if1\": \"***\"}}}}")
         )
@@ -62,7 +62,7 @@ private static JsonNode parse(String str) {
       "null, ***"
   })
   void testApplyToString(String original, String expected) {
-    var policy = new Replace(fieldName -> true, REPLACEMENT_STRING);
+    var policy = new Replace(_ -> true, REPLACEMENT_STRING);
     assertThat(policy.applyToString(original)).isEqualTo(expected);
   }
 }
diff --git a/api/src/test/java/io/kafbat/ui/service/metrics/MetricsUtils.java b/api/src/test/java/io/kafbat/ui/service/metrics/MetricsUtils.java
@@ -6,7 +6,6 @@
 import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.MetricMetadata;
 import io.prometheus.metrics.model.snapshots.MetricSnapshot;
-import java.util.Map;
 import java.util.Optional;
 
 public class MetricsUtils {
diff --git a/api/src/test/java/io/kafbat/ui/service/rbac/RbacConnectorPermissionsTest.java b/api/src/test/java/io/kafbat/ui/service/rbac/RbacConnectorPermissionsTest.java
@@ -14,8 +14,6 @@
 import io.kafbat.ui.model.rbac.permission.ConnectorAction;
 import io.kafbat.ui.model.rbac.provider.Provider;
 import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -43,7 +41,6 @@ class RbacConnectorPermissionsTest {
   public static final String CLUSTER_NAME = "local";
   public static final String CONNECT_NAME = "kafka-connect";
   public static final String CONNECTOR_NAME = "my-connector";
-  public static final String ANOTHER_CONNECTOR_NAME = "another-connector";
 
   private AccessControlService accessControlService;
 
diff --git a/etc/checkstyle/checkstyle.xml b/etc/checkstyle/checkstyle.xml
@@ -191,7 +191,7 @@
                      value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="LambdaParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <property name="format" value="^(_|[a-z]([a-z0-9][a-zA-Z0-9]*)?)$"/>
             <message key="name.invalidPattern"
                      value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ private void sendMsgsToPartition(Map<Integer, Integer> msgsCountForPartitions) {`
`190`	`190`	`msgsCountForPartitions.entrySet().stream()`
`191`	`191`	`.flatMap(e ->`
`192`	`192`	`IntStream.range(0, e.getValue())`
`193`		`- .mapToObj(i -> new ProducerRecord<>(topic, e.getKey(), bytes, bytes))));`
	`193`	`+ .mapToObj(_ -> new ProducerRecord<>(topic, e.getKey(), bytes, bytes))));`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`private void send(Stream<ProducerRecord<Bytes, Bytes>> toSend) {`