issues/1911. rename method. Avoid some duplications

provectus · Jun 14, 2022 · 73e054d · 73e054d
1 parent ada26e0
commit 73e054d
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/response/ResponseParser.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/response/ResponseParser.java
@@ -13,15 +13,14 @@
 import java.util.stream.Collectors;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 
-@SuppressWarnings("squid:S1192")
 public class ResponseParser {
 
   private ResponseParser() {
   }
 
   public static Optional<KsqlApiClient.KsqlResponseTable> parseSelectResponse(JsonNode jsonNode) {
     // in response, we're getting either header record or row data
-    if (arrayFieldNonEmpty(jsonNode, "header")) {
+    if (isArrayFieldNonEmpty(jsonNode, "header")) {
       return Optional.of(
           KsqlApiClient.KsqlResponseTable.builder()
               .header("Schema")
@@ -32,7 +31,7 @@ public static Optional<KsqlApiClient.KsqlResponseTable> parseSelectResponse(Json
               )
               .build());
     }
-    if (arrayFieldNonEmpty(jsonNode, "row")) {
+    if (isArrayFieldNonEmpty(jsonNode, "row")) {
       return Optional.of(
           KsqlApiClient.KsqlResponseTable.builder()
               .header("Row")
@@ -150,12 +149,15 @@ private static List<KsqlApiClient.KsqlResponseTable> parseArray(
 
   private static List<KsqlApiClient.KsqlResponseTable> parseProperties(JsonNode jsonNode) {
     var tables = new ArrayList<KsqlApiClient.KsqlResponseTable>();
-    if (arrayFieldNonEmpty(jsonNode, "properties")) {
-      tables.add(DynamicParser.parseArray("properties", jsonNode.get("properties")));
+    final var properties = "properties";
+    final var overwrittenProperties = "overwrittenProperties";
+    if (isArrayFieldNonEmpty(jsonNode, properties)) {
+      tables.add(DynamicParser.parseArray(properties,
+          jsonNode.get(properties)));
     }
-    if (arrayFieldNonEmpty(jsonNode, "overwrittenProperties")) {
-      tables.add(DynamicParser.parseArray("overwrittenProperties",
-          jsonNode.get("overwrittenProperties")));
+    if (isArrayFieldNonEmpty(jsonNode, overwrittenProperties)) {
+      tables.add(DynamicParser.parseArray(overwrittenProperties,
+          jsonNode.get(overwrittenProperties)));
     }
     return tables;
   }
@@ -164,7 +166,7 @@ private static List<KsqlApiClient.KsqlResponseTable> parseUnknownResponse(JsonNo
     return List.of(DynamicParser.parseObject("Ksql Response", jsonNode));
   }
 
-  private static boolean arrayFieldNonEmpty(JsonNode json, String field) {
+  private static boolean isArrayFieldNonEmpty(JsonNode json, String field) {
     return json.hasNonNull(field) && !json.get(field).isEmpty();
   }