apply spotless

Signed-off-by: xinyual <xinyual@amazon.com>

Author: xinyual

integ-test/build.gradle

@@ -448,8 +448,8 @@ integTest {
 
     dependsOn ':opensearch-sql-plugin:bundlePlugin'
     if(getOSFamilyType() != "windows") {
-        //dependsOn startPrometheus
-        //finalizedBy stopPrometheus
+        dependsOn startPrometheus
+        finalizedBy stopPrometheus
     }
 
     // enable calcite codegen in IT

opensearch/src/main/java/org/opensearch/sql/opensearch/request/system/OpenSearchDescribeIndexRequest.java

@@ -109,31 +109,6 @@ public Map<String, OpenSearchDataType> getFieldTypes() {
     return fieldTypes;
   }
 
-  private void mergeObjectAndArrayInsideMap(
-      Map<String, OpenSearchDataType> target, Map<String, OpenSearchDataType> source) {
-    for (Map.Entry<String, OpenSearchDataType> entry : source.entrySet()) {
-      String key = entry.getKey();
-      OpenSearchDataType value = entry.getValue();
-
-      if (target.containsKey(key) && checkWhetherToMerge(value, target.get(key))) {
-        OpenSearchDataType merged = target.get(key);
-        mergeObjectAndArrayInsideMap(merged.getProperties(), value.getProperties());
-        target.put(key, merged);
-      } else {
-        target.put(key, value);
-      }
-    }
-  }
-
-  private Boolean checkWhetherToMerge(OpenSearchDataType first, OpenSearchDataType second) {
-    if (first.getExprCoreType() == second.getExprCoreType()
-        && (first.getExprCoreType() == ExprCoreType.STRUCT
-            || first.getExprCoreType() == ExprCoreType.ARRAY)) {
-      return true;
-    }
-    return false;
-  }
-
   /**
    * Get the minimum of the max result windows of the indices.
    *
@@ -185,6 +160,46 @@ private String clusterName(Map<String, String> meta) {
     return meta.getOrDefault(META_CLUSTER_NAME, DEFAULT_TABLE_CAT);
   }
 
+  /**
+   * The function accept two map and merge them. It will merge object/nested DataType if they're
+   * under same key
+   *
+   * @param target The target map we will merge into
+   * @param source The candidate map
+   */
+  private void mergeObjectAndArrayInsideMap(
+      Map<String, OpenSearchDataType> target, Map<String, OpenSearchDataType> source) {
+    for (Map.Entry<String, OpenSearchDataType> entry : source.entrySet()) {
+      String key = entry.getKey();
+      OpenSearchDataType value = entry.getValue();
+
+      if (target.containsKey(key) && checkWhetherToMerge(value, target.get(key))) {
+        OpenSearchDataType merged = target.get(key);
+        mergeObjectAndArrayInsideMap(merged.getProperties(), value.getProperties());
+        target.put(key, merged);
+      } else {
+        target.put(key, value);
+      }
+    }
+  }
+
+  /**
+   * The function check whether the two DataType need to be merged if they are under same key.
+   * currently we only merge nested and object
+   *
+   * @param first the
+   * @param second
+   * @return
+   */
+  private Boolean checkWhetherToMerge(OpenSearchDataType first, OpenSearchDataType second) {
+    if (first.getExprCoreType() == second.getExprCoreType()
+        && (first.getExprCoreType() == ExprCoreType.STRUCT
+            || first.getExprCoreType() == ExprCoreType.ARRAY)) {
+      return true;
+    }
+    return false;
+  }
+
   @Override
   public String toString() {
     return "OpenSearchDescribeIndexRequest{indexName='" + indexName + "\'}";