From 9174d03be32f013f647be7387678ca063065234d Mon Sep 17 00:00:00 2001
From: Mitchell Gale <Mitchell.Gale@improving.com>
Date: Wed, 2 Aug 2023 10:23:05 -0700
Subject: [PATCH 1/9] GJF part 4

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---
 build.gradle                                  |   15 +-
 core/build.gradle                             |    3 +
 .../opensearch/sql/DataSourceSchemaName.java  |    1 -
 .../sql/ast/AbstractNodeVisitor.java          |    6 +-
 .../java/org/opensearch/sql/ast/Node.java     |    5 +-
 .../org/opensearch/sql/ast/dsl/AstDSL.java    |   16 +-
 .../sql/ast/expression/AggregateFunction.java |    2 +-
 .../opensearch/sql/ast/expression/Alias.java  |   21 +-
 .../sql/ast/expression/AllFields.java         |    8 +-
 .../opensearch/sql/ast/expression/And.java    |    5 +-
 .../sql/ast/expression/Argument.java          |    5 +-
 .../sql/ast/expression/AttributeList.java     |    8 +-
 .../sql/ast/expression/Between.java           |    4 +-
 .../opensearch/sql/ast/expression/Case.java   |   18 +-
 .../opensearch/sql/ast/expression/Cast.java   |   19 +-
 .../sql/ast/expression/Compare.java           |    1 -
 .../sql/ast/expression/DataType.java          |    9 +-
 .../sql/ast/expression/EqualTo.java           |   11 +-
 .../opensearch/sql/ast/expression/Field.java  |    9 +-
 .../sql/ast/expression/Function.java          |    2 +-
 .../sql/ast/expression/HighlightFunction.java |    4 +-
 .../org/opensearch/sql/ast/expression/In.java |    8 +-
 .../sql/ast/expression/Interval.java          |    1 -
 .../sql/ast/expression/IntervalUnit.java      |    7 +-
 .../opensearch/sql/ast/expression/Let.java    |    5 +-
 .../sql/ast/expression/Literal.java           |    6 +-
 .../opensearch/sql/ast/expression/Map.java    |    5 +-
 .../ast/expression/NestedAllTupleFields.java  |    9 +-
 .../opensearch/sql/ast/expression/Not.java    |    5 +-
 .../org/opensearch/sql/ast/expression/Or.java |    5 +-
 .../sql/ast/expression/ParseMethod.java       |    4 +-
 .../sql/ast/expression/QualifiedName.java     |   16 +-
 .../ast/expression/RelevanceFieldList.java    |   12 +-
 .../sql/ast/expression/ScoreFunction.java     |    4 +-
 .../opensearch/sql/ast/expression/Span.java   |    6 +-
 .../sql/ast/expression/SpanUnit.java          |    5 +-
 .../ast/expression/UnresolvedArgument.java    |    5 +-
 .../ast/expression/UnresolvedAttribute.java   |    6 +-
 .../ast/expression/UnresolvedExpression.java  |    1 -
 .../opensearch/sql/ast/expression/When.java   |   14 +-
 .../sql/ast/expression/WindowFunction.java    |    2 -
 .../opensearch/sql/ast/expression/Xor.java    |    5 +-
 .../opensearch/sql/ast/statement/Explain.java |    4 +-
 .../opensearch/sql/ast/statement/Query.java   |    4 +-
 .../sql/ast/statement/Statement.java          |    4 +-
 .../java/org/opensearch/sql/ast/tree/AD.java  |    1 -
 .../opensearch/sql/ast/tree/Aggregation.java  |   31 +-
 .../opensearch/sql/ast/tree/CloseCursor.java  |    9 +-
 .../org/opensearch/sql/ast/tree/Dedupe.java   |    5 +-
 .../org/opensearch/sql/ast/tree/Eval.java     |    5 +-
 .../opensearch/sql/ast/tree/FetchCursor.java  |    8 +-
 .../org/opensearch/sql/ast/tree/Filter.java   |    5 +-
 .../org/opensearch/sql/ast/tree/Head.java     |    5 +-
 .../org/opensearch/sql/ast/tree/Kmeans.java   |    1 -
 .../org/opensearch/sql/ast/tree/Limit.java    |    2 -
 .../java/org/opensearch/sql/ast/tree/ML.java  |    9 +-
 .../org/opensearch/sql/ast/tree/Paginate.java |    8 +-
 .../org/opensearch/sql/ast/tree/Parse.java    |   25 +-
 .../org/opensearch/sql/ast/tree/Project.java  |   12 +-
 .../org/opensearch/sql/ast/tree/RareTopN.java |    6 +-
 .../org/opensearch/sql/ast/tree/Relation.java |   22 +-
 .../sql/ast/tree/RelationSubquery.java        |    9 +-
 .../org/opensearch/sql/ast/tree/Rename.java   |    1 -
 .../org/opensearch/sql/ast/tree/Sort.java     |   18 +-
 .../sql/ast/tree/TableFunction.java           |   10 +-
 .../sql/ast/tree/UnresolvedPlan.java          |    5 +-
 .../org/opensearch/sql/ast/tree/Values.java   |    6 +-
 .../sql/analysis/AnalysisContextTest.java     |    1 -
 .../opensearch/sql/analysis/AnalyzerTest.java | 1363 ++++++++---------
 .../sql/analysis/AnalyzerTestBase.java        |  101 +-
 .../sql/analysis/ExpressionAnalyzerTest.java  |  665 ++++----
 .../ExpressionReferenceOptimizerTest.java     |   85 +-
 .../analysis/NamedExpressionAnalyzerTest.java |   13 +-
 .../sql/analysis/QualifierAnalyzerTest.java   |   47 +-
 .../sql/analysis/SelectAnalyzeTest.java       |   43 +-
 .../SelectExpressionAnalyzerTest.java         |   39 +-
 .../sql/analysis/TypeEnvironmentTest.java     |   26 +-
 .../WindowExpressionAnalyzerTest.java         |   45 +-
 ...ourceSchemaIdentifierNameResolverTest.java |   13 +-
 .../sql/analysis/symbol/SymbolTableTest.java  |   25 +-
 .../sql/ast/expression/CastTest.java          |    2 -
 .../sql/ast/expression/QualifiedNameTest.java |    2 -
 .../org/opensearch/sql/config/TestConfig.java |   66 +-
 .../sql/data/model/DateTimeValueTest.java     |   82 +-
 .../sql/data/model/ExprBooleanValueTest.java  |    9 +-
 .../data/model/ExprCollectionValueTest.java   |    6 +-
 .../sql/data/model/ExprIntervalValueTest.java |    9 +-
 .../sql/data/model/ExprMissingValueTest.java  |    7 +-
 .../sql/data/model/ExprNullValueTest.java     |    6 +-
 .../sql/data/model/ExprNumberValueTest.java   |    6 +-
 .../sql/data/model/ExprStringValueTest.java   |    8 +-
 .../sql/data/model/ExprTupleValueTest.java    |    5 +-
 .../sql/data/model/ExprValueCompareTest.java  |  248 +--
 .../sql/data/model/ExprValueUtilsTest.java    |  218 +--
 .../sql/data/type/ExprTypeTest.java           |    1 -
 .../sql/data/utils/ExprValueOrderingTest.java |    7 +-
 .../NullsFirstExprValueOrderingTest.java      |    1 -
 .../utils/NullsLastExprValueOrderingTest.java |    1 -
 .../utils/ReverseExprValueOrderingTest.java   |    1 -
 99 files changed, 1691 insertions(+), 1978 deletions(-)

diff --git a/build.gradle b/build.gradle
index ff29eb7687..7c444c331b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -83,10 +83,15 @@ repositories {
 // Spotless checks will be added as PRs are applied to resolve each style issue is approved.
 spotless {
     java {
-//        target fileTree('.') {
-//            include '**/*.java', 'src/*/java/**/*.java'
-//            exclude '**/build/**', '**/build-*/**'
-//        }
+        target fileTree('.') {
+            include 'core/src/main/java/org/opensearch/sql/ast/*.java',
+                    'core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java',
+                    'core/src/test/java/org/opensearch/sql/ast/*.java',
+                    'core/src/test/java/org/opensearch/sql/data/*.java',
+                    'core/src/test/java/org/opensearch/sql/config/*.java',
+                    'core/src/test/java/org/opensearch/sql/analysis/*.java'
+            exclude '**/build/**', '**/build-*/**'
+        }
 //        importOrder()
 //        licenseHeader("/*\n" +
 //                " * Copyright OpenSearch Contributors\n" +
@@ -95,7 +100,7 @@ spotless {
 //        removeUnusedImports()
 //        trimTrailingWhitespace()
 //        endWithNewline()
-//        googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
+        googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
     }
 }
 
diff --git a/core/build.gradle b/core/build.gradle
index 8205638138..cb603419d2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -34,6 +34,9 @@ repositories {
     mavenCentral()
 }
 
+checkstyleTest.ignoreFailures = true
+checkstyleMain.ignoreFailures = true
+
 pitest {
     targetClasses = ['org.opensearch.sql.*']
     pitestVersion = '1.9.0'
diff --git a/core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java b/core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java
index 47988097c3..9c9dfa0772 100644
--- a/core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java
+++ b/core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java
@@ -17,5 +17,4 @@ public class DataSourceSchemaName {
   private final String dataSourceName;
 
   private final String schemaName;
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java b/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java
index f02bc07ccc..973b10310b 100644
--- a/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java
+++ b/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast;
 
 import org.opensearch.sql.ast.expression.AggregateFunction;
@@ -62,9 +61,7 @@
 import org.opensearch.sql.ast.tree.TableFunction;
 import org.opensearch.sql.ast.tree.Values;
 
-/**
- * AST nodes visitor Defines the traverse path.
- */
+/** AST nodes visitor Defines the traverse path. */
 public abstract class AbstractNodeVisitor<T, C> {
 
   public T visit(Node node, C context) {
@@ -73,6 +70,7 @@ public T visit(Node node, C context) {
 
   /**
    * Visit child node.
+   *
    * @param node {@link Node}
    * @param context Context
    * @return Return Type.
diff --git a/core/src/main/java/org/opensearch/sql/ast/Node.java b/core/src/main/java/org/opensearch/sql/ast/Node.java
index f3147eeb43..faaf51f221 100644
--- a/core/src/main/java/org/opensearch/sql/ast/Node.java
+++ b/core/src/main/java/org/opensearch/sql/ast/Node.java
@@ -3,16 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast;
 
 import java.util.List;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-/**
- * AST node.
- */
+/** AST node. */
 @EqualsAndHashCode
 @ToString
 public abstract class Node {
diff --git a/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java b/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
index d5f10fcfd4..ec6b0632dd 100644
--- a/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
+++ b/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
@@ -249,10 +249,10 @@ public static Function function(String funcName, UnresolvedExpression... funcArg
   }
 
   /**
-   * CASE
-   *     WHEN search_condition THEN result_expr
-   *     [WHEN search_condition THEN result_expr] ...
-   *     [ELSE result_expr]
+   * CASE<br>
+   *     WHEN search_condition THEN result_expr<br>
+   *     [WHEN search_condition THEN result_expr] ...<br>
+   *     [ELSE result_expr]<br>
    * END
    */
   public UnresolvedExpression caseWhen(UnresolvedExpression elseClause,
@@ -261,10 +261,10 @@ public UnresolvedExpression caseWhen(UnresolvedExpression elseClause,
   }
 
   /**
-   * CASE case_value_expr
-   *     WHEN compare_expr THEN result_expr
-   *     [WHEN compare_expr THEN result_expr] ...
-   *     [ELSE result_expr]
+   * CASE case_value_expr<br>
+   *     WHEN compare_expr THEN result_expr<br>
+   *     [WHEN compare_expr THEN result_expr] ...<br>
+   *     [ELSE result_expr]<br>
    * END
    */
   public UnresolvedExpression caseWhen(UnresolvedExpression caseValueExpr,
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/AggregateFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/AggregateFunction.java
index e8f730d7e9..2144338a35 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/AggregateFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/AggregateFunction.java
@@ -17,7 +17,7 @@
 import org.opensearch.sql.common.utils.StringUtils;
 
 /**
- * Expression node of aggregate functions.
+ * Expression node of aggregate functions.<br>
  * Params include aggregate function name (AVG, SUM, MAX etc.) and the field to aggregate.
  */
 @Getter
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Alias.java b/core/src/main/java/org/opensearch/sql/ast/expression/Alias.java
index 4183b19a3e..7b3078629b 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Alias.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Alias.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import lombok.AllArgsConstructor;
@@ -14,10 +13,10 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Alias abstraction that associate an unnamed expression with a name and an optional alias.
- * The name and alias information preserved is useful for semantic analysis and response
- * formatting eventually. This can avoid restoring the info in toString() method which is
- * inaccurate because original info is already lost.
+ * Alias abstraction that associate an unnamed expression with a name and an optional alias. The
+ * name and alias information preserved is useful for semantic analysis and response formatting
+ * eventually. This can avoid restoring the info in toString() method which is inaccurate because
+ * original info is already lost.
  */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
@@ -26,19 +25,13 @@
 @ToString
 public class Alias extends UnresolvedExpression {
 
-  /**
-   * Original field name.
-   */
+  /** Original field name. */
   private final String name;
 
-  /**
-   * Expression aliased.
-   */
+  /** Expression aliased. */
   private final UnresolvedExpression delegated;
 
-  /**
-   * Optional field alias.
-   */
+  /** Optional field alias. */
   private String alias;
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/AllFields.java b/core/src/main/java/org/opensearch/sql/ast/expression/AllFields.java
index 1f5d919817..b9b90ea24a 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/AllFields.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/AllFields.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Collections;
@@ -13,16 +12,13 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * Represent the All fields which is been used in SELECT *.
- */
+/** Represent the All fields which is been used in SELECT *. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 public class AllFields extends UnresolvedExpression {
   public static final AllFields INSTANCE = new AllFields();
 
-  private AllFields() {
-  }
+  private AllFields() {}
 
   public static AllFields of() {
     return INSTANCE;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/And.java b/core/src/main/java/org/opensearch/sql/ast/expression/And.java
index 8d8c48f3b2..565f1eb4ab 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/And.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/And.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of logic AND.
- */
+/** Expression node of logic AND. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Argument.java b/core/src/main/java/org/opensearch/sql/ast/expression/Argument.java
index f054710a32..4c2a485ea7 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Argument.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Argument.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Argument.
- */
+/** Argument. */
 @Getter
 @ToString
 @RequiredArgsConstructor
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/AttributeList.java b/core/src/main/java/org/opensearch/sql/ast/expression/AttributeList.java
index 7e1fdb1516..d137a83957 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/AttributeList.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/AttributeList.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -14,15 +13,12 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node that includes a list of Expression nodes.
- */
+/** Expression node that includes a list of Expression nodes. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @AllArgsConstructor
 public class AttributeList extends UnresolvedExpression {
-  @Getter
-  private List<UnresolvedExpression> attrList;
+  @Getter private List<UnresolvedExpression> attrList;
 
   @Override
   public List<UnresolvedExpression> getChild() {
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Between.java b/core/src/main/java/org/opensearch/sql/ast/expression/Between.java
index 886c9a9282..e13c3fb187 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Between.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Between.java
@@ -12,9 +12,7 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * Unresolved expression for BETWEEN.
- */
+/** Unresolved expression for BETWEEN. */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class Between extends UnresolvedExpression {
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Case.java b/core/src/main/java/org/opensearch/sql/ast/expression/Case.java
index 81c74f3ea4..583bd0de97 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Case.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Case.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -15,29 +14,23 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * AST node that represents CASE clause similar as Switch statement in programming language.
- */
+/** AST node that represents CASE clause similar as Switch statement in programming language. */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @Getter
 @ToString
 public class Case extends UnresolvedExpression {
 
-  /**
-   * Value to be compared by WHEN statements. Null in the case of CASE WHEN conditions.
-   */
+  /** Value to be compared by WHEN statements. Null in the case of CASE WHEN conditions. */
   private final UnresolvedExpression caseValue;
 
   /**
-   * Expression list that represents WHEN statements. Each is a mapping from condition
-   * to its result.
+   * Expression list that represents WHEN statements. Each is a mapping from condition to its
+   * result.
    */
   private final List<When> whenClauses;
 
-  /**
-   * Expression that represents ELSE statement result.
-   */
+  /** Expression that represents ELSE statement result. */
   private final UnresolvedExpression elseClause;
 
   @Override
@@ -58,5 +51,4 @@ public List<? extends Node> getChild() {
   public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
     return nodeVisitor.visitCase(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java b/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java
index 9121dbd87c..2019346fb5 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import static org.opensearch.sql.expression.function.BuiltinFunctionName.CAST_TO_BOOLEAN;
@@ -33,9 +32,7 @@
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.function.FunctionName;
 
-/**
- * AST node that represents Cast clause.
- */
+/** AST node that represents Cast clause. */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @Getter
@@ -59,19 +56,16 @@ public class Cast extends UnresolvedExpression {
           .put("datetime", CAST_TO_DATETIME.getName())
           .build();
 
-  /**
-   * The source expression cast from.
-   */
+  /** The source expression cast from. */
   private final UnresolvedExpression expression;
 
-  /**
-   * Expression that represents name of the target type.
-   */
+  /** Expression that represents name of the target type. */
   private final UnresolvedExpression convertedType;
 
   /**
    * Check if the given function name is a cast function or not.
-   * @param name  function name
+   *
+   * @param name function name
    * @return true if cast function, otherwise false.
    */
   public static boolean isCastFunction(FunctionName name) {
@@ -80,7 +74,8 @@ public static boolean isCastFunction(FunctionName name) {
 
   /**
    * Get the cast function name for a given target data type.
-   * @param targetType  target data type
+   *
+   * @param targetType target data type
    * @return cast function name corresponding
    */
   public static FunctionName getCastFunctionName(ExprType targetType) {
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Compare.java b/core/src/main/java/org/opensearch/sql/ast/expression/Compare.java
index 25cf3e0f73..8ba6ba5116 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Compare.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Compare.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/DataType.java b/core/src/main/java/org/opensearch/sql/ast/expression/DataType.java
index 8755a15177..0b9add8f55 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/DataType.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/DataType.java
@@ -3,17 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.data.type.ExprCoreType;
 
-/**
- * The DataType defintion in AST.
- * Question, could we use {@link ExprCoreType} directly in AST?
- */
+/** The DataType defintion in AST. Question, could we use {@link ExprCoreType} directly in AST? */
 @RequiredArgsConstructor
 public enum DataType {
   TYPE_ERROR(ExprCoreType.UNKNOWN),
@@ -32,6 +28,5 @@ public enum DataType {
   TIMESTAMP(ExprCoreType.TIMESTAMP),
   INTERVAL(ExprCoreType.INTERVAL);
 
-  @Getter
-  private final ExprCoreType coreType;
+  @Getter private final ExprCoreType coreType;
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/EqualTo.java b/core/src/main/java/org/opensearch/sql/ast/expression/EqualTo.java
index 806f897abf..344f3c5164 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/EqualTo.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/EqualTo.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,17 +13,13 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of binary operator or comparison relation EQUAL.
- */
+/** Expression node of binary operator or comparison relation EQUAL. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @AllArgsConstructor
 public class EqualTo extends UnresolvedExpression {
-  @Getter
-  private UnresolvedExpression left;
-  @Getter
-  private UnresolvedExpression right;
+  @Getter private UnresolvedExpression left;
+  @Getter private UnresolvedExpression right;
 
   @Override
   public List<UnresolvedExpression> getChild() {
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Field.java b/core/src/main/java/org/opensearch/sql/ast/expression/Field.java
index 9a8109fbe3..0a2d726ad4 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Field.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Field.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -23,16 +22,12 @@ public class Field extends UnresolvedExpression {
 
   private final List<Argument> fieldArgs;
 
-  /**
-   * Constructor of Field.
-   */
+  /** Constructor of Field. */
   public Field(UnresolvedExpression field) {
     this(field, Collections.emptyList());
   }
 
-  /**
-   * Constructor of Field.
-   */
+  /** Constructor of Field. */
   public Field(UnresolvedExpression field, List<Argument> fieldArgs) {
     this.field = field;
     this.fieldArgs = fieldArgs;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Function.java b/core/src/main/java/org/opensearch/sql/ast/expression/Function.java
index c712d860f4..1dbeae6ff8 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Function.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Function.java
@@ -16,7 +16,7 @@
 
 
 /**
- * Expression node of scalar function.
+ * Expression node of scalar function.<br>
  * Params include function name (@funcName) and function arguments (@funcArgs)
  */
 @Getter
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java
index 0d4e57a78c..128d9327e8 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java
@@ -13,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of Highlight function.
- */
+/** Expression node of Highlight function. */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @Getter
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/In.java b/core/src/main/java/org/opensearch/sql/ast/expression/In.java
index 9ce1c124cb..38c1b91b43 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/In.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/In.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -15,10 +14,9 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Expression node of one-to-many mapping relation IN.
- * Params include the field expression and/or wildcard field expression,
- * nested field expression (@field).
- * And the values that the field is mapped to (@valueList).
+ * Expression node of one-to-many mapping relation IN. Params include the field expression and/or
+ * wildcard field expression, nested field expression (@field). And the values that the field is
+ * mapped to (@valueList).
  */
 @Getter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Interval.java b/core/src/main/java/org/opensearch/sql/ast/expression/Interval.java
index 84b6ba02d1..c26f829f48 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Interval.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Interval.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Collections;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java b/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java
index 2a86c89cf6..19e1b07e39 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -13,7 +12,7 @@
 
 @Getter
 @RequiredArgsConstructor
-public enum  IntervalUnit {
+public enum IntervalUnit {
   UNKNOWN,
 
   MICROSECOND,
@@ -44,9 +43,7 @@ public enum  IntervalUnit {
     INTERVAL_UNITS = builder.add(IntervalUnit.values()).build();
   }
 
-  /**
-   * Util method to get interval unit given the unit name.
-   */
+  /** Util method to get interval unit given the unit name. */
   public static IntervalUnit of(String unit) {
     return INTERVAL_UNITS.stream()
         .filter(v -> unit.equalsIgnoreCase(v.name()))
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Let.java b/core/src/main/java/org/opensearch/sql/ast/expression/Let.java
index cea2a091e5..2f63a25f10 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Let.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Let.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Represent the assign operation. e.g. velocity = distance/speed.
- */
+/** Represent the assign operation. e.g. velocity = distance/speed. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Literal.java b/core/src/main/java/org/opensearch/sql/ast/expression/Literal.java
index 3ff360dbf0..80c877dd97 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Literal.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Literal.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -14,9 +13,8 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Expression node of literal type
- * Params include literal value (@value) and
- * literal data type (@type) which can be selected from {@link DataType}.
+ * Expression node of literal type Params include literal value (@value) and literal data type
+ * (@type) which can be selected from {@link DataType}.
  */
 @Getter
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Map.java b/core/src/main/java/org/opensearch/sql/ast/expression/Map.java
index 45e98f127f..73d8d77261 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Map.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Map.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of one-to-one mapping relation.
- */
+/** Expression node of one-to-one mapping relation. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/NestedAllTupleFields.java b/core/src/main/java/org/opensearch/sql/ast/expression/NestedAllTupleFields.java
index adf2025e6c..be89dd9f19 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/NestedAllTupleFields.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/NestedAllTupleFields.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Collections;
@@ -11,18 +10,14 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * Represents all tuple fields used in nested function.
- */
+/** Represents all tuple fields used in nested function. */
 @RequiredArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 public class NestedAllTupleFields extends UnresolvedExpression {
-  @Getter
-  private final String path;
+  @Getter private final String path;
 
   @Override
   public List<? extends Node> getChild() {
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Not.java b/core/src/main/java/org/opensearch/sql/ast/expression/Not.java
index 2926c7e5cd..423cb088ef 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Not.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Not.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of the logic NOT.
- */
+/** Expression node of the logic NOT. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Or.java b/core/src/main/java/org/opensearch/sql/ast/expression/Or.java
index b0dabb6e4e..cc59170d31 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Or.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Or.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of the logic OR.
- */
+/** Expression node of the logic OR. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/ParseMethod.java b/core/src/main/java/org/opensearch/sql/ast/expression/ParseMethod.java
index 83a46323e6..7a2587c5f0 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/ParseMethod.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/ParseMethod.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import lombok.Getter;
@@ -15,6 +14,5 @@ public enum ParseMethod {
   GROK("grok"),
   PATTERNS("patterns");
 
-  @Getter
-  private final String name;
+  @Getter private final String name;
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/QualifiedName.java b/core/src/main/java/org/opensearch/sql/ast/expression/QualifiedName.java
index 8b16119dc0..36e046a45a 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/QualifiedName.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/QualifiedName.java
@@ -82,14 +82,14 @@ public Optional<String> first() {
 
   /**
    * Get rest parts of the qualified name. Assume that there must be remaining parts
-   * so caller is responsible for the check (first() or size() must be called first).
-   * For example:
-   * {@code
-   *   QualifiedName name = ...
-   *   Optional<String> first = name.first();
-   *   if (first.isPresent()) {
-   *     name.rest() ...
-   *   }
+   * so caller is responsible for the check (first() or size() must be called first).<br>
+   * For example:<br>
+   * {@code<br>
+   *  &ensp; QualifiedName name = ...<br>
+   *  &ensp; Optional<String> first = name.first();<br>
+   *  &ensp; if (first.isPresent()) {<br>
+   *  &emsp;   name.rest() ...<br>
+   *  &ensp; }<br>
    * }
    * @return  rest part(s)
    */
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java b/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java
index 3166fe45c3..a9e26a611f 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.List;
@@ -13,14 +12,11 @@
 import lombok.Getter;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node that includes a list of RelevanceField nodes.
- */
+/** Expression node that includes a list of RelevanceField nodes. */
 @EqualsAndHashCode(callSuper = false)
 @AllArgsConstructor
 public class RelevanceFieldList extends UnresolvedExpression {
-  @Getter
-  private java.util.Map<String, Float> fieldList;
+  @Getter private java.util.Map<String, Float> fieldList;
 
   @Override
   public List<UnresolvedExpression> getChild() {
@@ -34,9 +30,7 @@ public <R, C> R accept(AbstractNodeVisitor<R, C> nodeVisitor, C context) {
 
   @Override
   public String toString() {
-    return fieldList
-        .entrySet()
-        .stream()
+    return fieldList.entrySet().stream()
         .map(e -> String.format("\"%s\" ^ %s", e.getKey(), e.getValue()))
         .collect(Collectors.joining(", "));
   }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/ScoreFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/ScoreFunction.java
index 1b73f9bd95..26d784dd8c 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/ScoreFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/ScoreFunction.java
@@ -13,8 +13,8 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Expression node of Score function.
- * Score takes a relevance-search expression as an argument and returns it
+ * Expression node of Score function. Score takes a relevance-search expression as an argument and
+ * returns it
  */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Span.java b/core/src/main/java/org/opensearch/sql/ast/expression/Span.java
index e57205c19c..edd309b22d 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Span.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Span.java
@@ -13,10 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Span expression node.
- * Params include field expression and the span value.
- */
+/** Span expression node. Params include field expression and the span value. */
 @Getter
 @EqualsAndHashCode(callSuper = false)
 @RequiredArgsConstructor
@@ -35,5 +32,4 @@ public List<UnresolvedExpression> getChild() {
   public <R, C> R accept(AbstractNodeVisitor<R, C> nodeVisitor, C context) {
     return nodeVisitor.visitSpan(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java b/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java
index f1f3fb19d4..5252781edb 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java
@@ -42,9 +42,7 @@ public enum SpanUnit {
     SPAN_UNITS = builder.add(SpanUnit.values()).build();
   }
 
-  /**
-   * Util method to get span unit given the unit name.
-   */
+  /** Util method to get span unit given the unit name. */
   public static SpanUnit of(String unit) {
     switch (unit) {
       case "":
@@ -64,5 +62,4 @@ public static SpanUnit of(String unit) {
   public static String getName(SpanUnit unit) {
     return unit.name;
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedArgument.java b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedArgument.java
index e4def038ed..2c6eee46e9 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedArgument.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedArgument.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -13,9 +12,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Argument.
- */
+/** Argument. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedAttribute.java b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedAttribute.java
index f4bc88853f..e1754cbf76 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedAttribute.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedAttribute.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -15,9 +14,8 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Expression node, representing the syntax that is not resolved to
- * any other expression nodes yet but non-negligible
- * This expression is often created as the index name, field name etc.
+ * Expression node, representing the syntax that is not resolved to any other expression nodes yet
+ * but non-negligible This expression is often created as the index name, field name etc.
  */
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedExpression.java b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedExpression.java
index ee3922f797..9b2d530b7f 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedExpression.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedExpression.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import lombok.EqualsAndHashCode;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/When.java b/core/src/main/java/org/opensearch/sql/ast/expression/When.java
index a52870b408..db747592e5 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/When.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/When.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -15,23 +14,17 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * AST node that represents WHEN clause.
- */
+/** AST node that represents WHEN clause. */
 @EqualsAndHashCode(callSuper = false)
 @Getter
 @RequiredArgsConstructor
 @ToString
 public class When extends UnresolvedExpression {
 
-  /**
-   * WHEN condition, either a search condition or compare value if case value present.
-   */
+  /** WHEN condition, either a search condition or compare value if case value present. */
   private final UnresolvedExpression condition;
 
-  /**
-   * Result to return if condition matched.
-   */
+  /** Result to return if condition matched. */
   private final UnresolvedExpression result;
 
   @Override
@@ -43,5 +36,4 @@ public List<? extends Node> getChild() {
   public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
     return nodeVisitor.visitWhen(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/WindowFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/WindowFunction.java
index 9a7535e1fe..47f5265765 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/WindowFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/WindowFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -42,5 +41,4 @@ public List<? extends Node> getChild() {
   public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
     return nodeVisitor.visitWindowFunction(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Xor.java b/core/src/main/java/org/opensearch/sql/ast/expression/Xor.java
index 731feccd33..40db015fd7 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Xor.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Xor.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Expression node of the logic XOR.
- */
+/** Expression node of the logic XOR. */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/statement/Explain.java b/core/src/main/java/org/opensearch/sql/ast/statement/Explain.java
index 1e364d69fd..5ee260c130 100644
--- a/core/src/main/java/org/opensearch/sql/ast/statement/Explain.java
+++ b/core/src/main/java/org/opensearch/sql/ast/statement/Explain.java
@@ -12,9 +12,7 @@
 import lombok.EqualsAndHashCode;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Explain Statement.
- */
+/** Explain Statement. */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class Explain extends Statement {
diff --git a/core/src/main/java/org/opensearch/sql/ast/statement/Query.java b/core/src/main/java/org/opensearch/sql/ast/statement/Query.java
index 82efdde4dd..6366451b72 100644
--- a/core/src/main/java/org/opensearch/sql/ast/statement/Query.java
+++ b/core/src/main/java/org/opensearch/sql/ast/statement/Query.java
@@ -16,9 +16,7 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 
-/**
- * Query Statement.
- */
+/** Query Statement. */
 @Getter
 @Setter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/statement/Statement.java b/core/src/main/java/org/opensearch/sql/ast/statement/Statement.java
index e32a8dbfd8..d90071a0ca 100644
--- a/core/src/main/java/org/opensearch/sql/ast/statement/Statement.java
+++ b/core/src/main/java/org/opensearch/sql/ast/statement/Statement.java
@@ -11,9 +11,7 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * Statement is the high interface of core engine.
- */
+/** Statement is the high interface of core engine. */
 public abstract class Statement extends Node {
   @Override
   public <R, C> R accept(AbstractNodeVisitor<R, C> visitor, C context) {
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/AD.java b/core/src/main/java/org/opensearch/sql/ast/tree/AD.java
index e9aee25c23..0e1cc33db9 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/AD.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/AD.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Aggregation.java b/core/src/main/java/org/opensearch/sql/ast/tree/Aggregation.java
index e9fa26e981..f098d0ec53 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Aggregation.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Aggregation.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -17,9 +16,7 @@
 import org.opensearch.sql.ast.expression.Argument;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * Logical plan node of Aggregation, the interface for building aggregation actions in queries.
- */
+/** Logical plan node of Aggregation, the interface for building aggregation actions in queries. */
 @Getter
 @Setter
 @ToString
@@ -32,23 +29,21 @@ public class Aggregation extends UnresolvedPlan {
   private List<Argument> argExprList;
   private UnresolvedPlan child;
 
-  /**
-   * Aggregation Constructor without span and argument.
-   */
-  public Aggregation(List<UnresolvedExpression> aggExprList,
-                     List<UnresolvedExpression> sortExprList,
-                     List<UnresolvedExpression> groupExprList) {
+  /** Aggregation Constructor without span and argument. */
+  public Aggregation(
+      List<UnresolvedExpression> aggExprList,
+      List<UnresolvedExpression> sortExprList,
+      List<UnresolvedExpression> groupExprList) {
     this(aggExprList, sortExprList, groupExprList, null, Collections.emptyList());
   }
 
-  /**
-   * Aggregation Constructor.
-   */
-  public Aggregation(List<UnresolvedExpression> aggExprList,
-                     List<UnresolvedExpression> sortExprList,
-                     List<UnresolvedExpression> groupExprList,
-                     UnresolvedExpression span,
-                     List<Argument> argExprList) {
+  /** Aggregation Constructor. */
+  public Aggregation(
+      List<UnresolvedExpression> aggExprList,
+      List<UnresolvedExpression> sortExprList,
+      List<UnresolvedExpression> groupExprList,
+      UnresolvedExpression span,
+      List<Argument> argExprList) {
     this.aggExprList = aggExprList;
     this.sortExprList = sortExprList;
     this.groupExprList = groupExprList;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java b/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java
index cf82c2b070..832b79d34a 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java
@@ -9,15 +9,10 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * AST node to represent close cursor operation.
- * Actually a wrapper to the AST.
- */
+/** AST node to represent close cursor operation. Actually a wrapper to the AST. */
 public class CloseCursor extends UnresolvedPlan {
 
-  /**
-   * An instance of {@link FetchCursor}.
-   */
+  /** An instance of {@link FetchCursor}. */
   private UnresolvedPlan cursor;
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Dedupe.java b/core/src/main/java/org/opensearch/sql/ast/tree/Dedupe.java
index 6514d65a04..3173f42f9c 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Dedupe.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Dedupe.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -18,9 +17,7 @@
 import org.opensearch.sql.ast.expression.Argument;
 import org.opensearch.sql.ast.expression.Field;
 
-/**
- * AST node represent Dedupe operation.
- */
+/** AST node represent Dedupe operation. */
 @Getter
 @Setter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Eval.java b/core/src/main/java/org/opensearch/sql/ast/tree/Eval.java
index 184f2ac497..ecceabd757 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Eval.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Eval.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -16,9 +15,7 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.expression.Let;
 
-/**
- * AST node represent Eval operation.
- */
+/** AST node represent Eval operation. */
 @Getter
 @Setter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java b/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java
index aa327c295b..e34127c9d3 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java
@@ -10,15 +10,11 @@
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * An unresolved plan that represents fetching the next
- * batch in paginationed plan.
- */
+/** An unresolved plan that represents fetching the next batch in paginationed plan. */
 @RequiredArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 public class FetchCursor extends UnresolvedPlan {
-  @Getter
-  final String cursor;
+  @Getter final String cursor;
 
   @Override
   public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Filter.java b/core/src/main/java/org/opensearch/sql/ast/tree/Filter.java
index 8128078930..6c57275db9 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Filter.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Filter.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -14,9 +13,7 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * Logical plan node of Filter, the interface for building filters in queries.
- */
+/** Logical plan node of Filter, the interface for building filters in queries. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @Getter
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Head.java b/core/src/main/java/org/opensearch/sql/ast/tree/Head.java
index 8590c212ad..bf6b2caed1 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Head.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Head.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -16,9 +15,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * AST node represent Head operation.
- */
+/** AST node represent Head operation. */
 @Getter
 @Setter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Kmeans.java b/core/src/main/java/org/opensearch/sql/ast/tree/Kmeans.java
index 5d2e32c28b..ed03efed8a 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Kmeans.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Kmeans.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Limit.java b/core/src/main/java/org/opensearch/sql/ast/tree/Limit.java
index f9b8a8feab..9290776172 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Limit.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Limit.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -38,5 +37,4 @@ public List<UnresolvedPlan> getChild() {
   public <T, C> T accept(AbstractNodeVisitor<T, C> visitor, C context) {
     return visitor.visitLimit(this, context);
   }
-
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/ML.java b/core/src/main/java/org/opensearch/sql/ast/tree/ML.java
index 2f83a993b7..320fb2bcf7 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/ML.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/ML.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import static org.opensearch.sql.utils.MLCommonsConstants.ACTION;
@@ -66,7 +65,7 @@ public List<UnresolvedPlan> getChild() {
   }
 
   private String getAction() {
-    return  (String) arguments.get(ACTION).getValue();
+    return (String) arguments.get(ACTION).getValue();
   }
 
   /**
@@ -85,7 +84,7 @@ public Map<String, ExprCoreType> getOutputSchema(TypeEnvironment env) {
         return getPredictOutputSchema();
       default:
         throw new IllegalArgumentException(
-                "Action error. Please indicate train, predict or trainandpredict.");
+            "Action error. Please indicate train, predict or trainandpredict.");
     }
   }
 
@@ -122,8 +121,8 @@ public Map<String, ExprCoreType> getPredictOutputSchema() {
    * @return the schema
    */
   public Map<String, ExprCoreType> getTrainOutputSchema() {
-    boolean isAsync = arguments.containsKey(ASYNC)
-            ? (boolean) arguments.get(ASYNC).getValue() : false;
+    boolean isAsync =
+        arguments.containsKey(ASYNC) ? (boolean) arguments.get(ASYNC).getValue() : false;
     Map<String, ExprCoreType> res = new HashMap<>(Map.of(STATUS, ExprCoreType.STRING));
     if (isAsync) {
       res.put(TASKID, ExprCoreType.STRING);
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Paginate.java b/core/src/main/java/org/opensearch/sql/ast/tree/Paginate.java
index 55e0e8c7a6..69b11600c9 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Paginate.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Paginate.java
@@ -13,16 +13,12 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * AST node to represent pagination operation.
- * Actually a wrapper to the AST.
- */
+/** AST node to represent pagination operation. Actually a wrapper to the AST. */
 @RequiredArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @ToString
 public class Paginate extends UnresolvedPlan {
-  @Getter
-  private final int pageSize;
+  @Getter private final int pageSize;
   private UnresolvedPlan child;
 
   public Paginate(int pageSize, UnresolvedPlan child) {
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Parse.java b/core/src/main/java/org/opensearch/sql/ast/tree/Parse.java
index 02a69c93af..e91c4a68ff 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Parse.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Parse.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -20,9 +19,7 @@
 import org.opensearch.sql.ast.expression.ParseMethod;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * AST node represent Parse with regex operation.
- */
+/** AST node represent Parse with regex operation. */
 @Getter
 @Setter
 @ToString
@@ -30,29 +27,19 @@
 @RequiredArgsConstructor
 @AllArgsConstructor
 public class Parse extends UnresolvedPlan {
-  /**
-   * Method used to parse a field.
-   */
+  /** Method used to parse a field. */
   private final ParseMethod parseMethod;
 
-  /**
-   * Field.
-   */
+  /** Field. */
   private final UnresolvedExpression sourceField;
 
-  /**
-   * Pattern.
-   */
+  /** Pattern. */
   private final Literal pattern;
 
-  /**
-   * Optional arguments.
-   */
+  /** Optional arguments. */
   private final Map<String, Literal> arguments;
 
-  /**
-   * Child Plan.
-   */
+  /** Child Plan. */
   private UnresolvedPlan child;
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Project.java b/core/src/main/java/org/opensearch/sql/ast/tree/Project.java
index 33c7128855..cffb4dfdce 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Project.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Project.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -17,15 +16,12 @@
 import org.opensearch.sql.ast.expression.Argument;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * Logical plan node of Project, the interface for building the list of searching fields.
- */
+/** Logical plan node of Project, the interface for building the list of searching fields. */
 @ToString
 @Getter
 @EqualsAndHashCode(callSuper = false)
 public class Project extends UnresolvedPlan {
-  @Setter
-  private List<UnresolvedExpression> projectList;
+  @Setter private List<UnresolvedExpression> projectList;
   private List<Argument> argExprList;
   private UnresolvedPlan child;
 
@@ -43,9 +39,7 @@ public boolean hasArgument() {
     return !argExprList.isEmpty();
   }
 
-  /**
-   * The Project could been used to exclude fields from the source.
-   */
+  /** The Project could been used to exclude fields from the source. */
   public boolean isExcluded() {
     if (hasArgument()) {
       Argument argument = argExprList.get(0);
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java b/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
index c884afd86a..2cbe170541 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import java.util.Collections;
@@ -19,9 +18,7 @@
 import org.opensearch.sql.ast.expression.Field;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * AST node represent RareTopN operation.
- */
+/** AST node represent RareTopN operation. */
 @Getter
 @Setter
 @ToString
@@ -57,4 +54,3 @@ public enum CommandType {
     RARE
   }
 }
-
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java b/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java
index 8c3868329f..ec5264a86b 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -18,9 +17,7 @@
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * Logical plan node of Relation, the interface for building the searching sources.
- */
+/** Logical plan node of Relation, the interface for building the searching sources. */
 @AllArgsConstructor
 @ToString
 @EqualsAndHashCode(callSuper = false)
@@ -39,9 +36,7 @@ public Relation(UnresolvedExpression tableName, String alias) {
     this.alias = alias;
   }
 
-  /**
-   * Optional alias name for the relation.
-   */
+  /** Optional alias name for the relation. */
   private String alias;
 
   /**
@@ -72,9 +67,9 @@ public String getAlias() {
   }
 
   /**
-   * Get Qualified name preservs parts of the user given identifiers.
-   * This can later be utilized to determine DataSource,Schema and Table Name during
-   * Analyzer stage. So Passing QualifiedName directly to Analyzer Stage.
+   * Get Qualified name preservs parts of the user given identifiers. This can later be utilized to
+   * determine DataSource,Schema and Table Name during Analyzer stage. So Passing QualifiedName
+   * directly to Analyzer Stage.
    *
    * @return TableQualifiedName.
    */
@@ -82,9 +77,10 @@ public QualifiedName getTableQualifiedName() {
     if (tableName.size() == 1) {
       return (QualifiedName) tableName.get(0);
     } else {
-      return new QualifiedName(tableName.stream()
-          .map(UnresolvedExpression::toString)
-          .collect(Collectors.joining(COMMA)));
+      return new QualifiedName(
+          tableName.stream()
+              .map(UnresolvedExpression::toString)
+              .collect(Collectors.joining(COMMA)));
     }
   }
 
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/RelationSubquery.java b/core/src/main/java/org/opensearch/sql/ast/tree/RelationSubquery.java
index 89122bea7f..5ab4d71dd9 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/RelationSubquery.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/RelationSubquery.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -14,9 +13,7 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/**
- * Logical plan node of RelationSubquery.
- */
+/** Logical plan node of RelationSubquery. */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @RequiredArgsConstructor
@@ -25,9 +22,7 @@ public class RelationSubquery extends UnresolvedPlan {
   private UnresolvedPlan query;
   private String alias;
 
-  /**
-   * Take subquery alias as table name.
-   */
+  /** Take subquery alias as table name. */
   public String getAliasAsTableName() {
     return alias;
   }
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Rename.java b/core/src/main/java/org/opensearch/sql/ast/tree/Rename.java
index 69700c871c..e6f760aca0 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Rename.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Rename.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Sort.java b/core/src/main/java/org/opensearch/sql/ast/tree/Sort.java
index 5fb4139bea..073cb7aa1b 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Sort.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Sort.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import static org.opensearch.sql.ast.tree.Sort.NullOrder.NULL_FIRST;
@@ -22,9 +21,7 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.expression.Field;
 
-/**
- * AST node for Sort {@link Sort#sortList} represent a list of sort expression and sort options.
- */
+/** AST node for Sort {@link Sort#sortList} represent a list of sort expression and sort options. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @Getter
@@ -50,19 +47,14 @@ public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
     return nodeVisitor.visitSort(this, context);
   }
 
-  /**
-   * Sort Options.
-   */
+  /** Sort Options. */
   @Data
   public static class SortOption {
 
-    /**
-     * Default ascending sort option, null first.
-     */
+    /** Default ascending sort option, null first. */
     public static SortOption DEFAULT_ASC = new SortOption(ASC, NULL_FIRST);
-    /**
-     * Default descending sort option, null last.
-     */
+
+    /** Default descending sort option, null last. */
     public static SortOption DEFAULT_DESC = new SortOption(DESC, NULL_LAST);
 
     private final SortOrder sortOrder;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java b/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java
index 064cbf24fe..711a8a0ec5 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -11,16 +10,12 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import lombok.Setter;
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
-import org.opensearch.sql.ast.expression.Let;
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/**
- * ASTNode for Table Function.
- */
+/** ASTNode for Table Function. */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @RequiredArgsConstructor
@@ -28,8 +23,7 @@ public class TableFunction extends UnresolvedPlan {
 
   private final UnresolvedExpression functionName;
 
-  @Getter
-  private final List<UnresolvedExpression> arguments;
+  @Getter private final List<UnresolvedExpression> arguments;
 
   public QualifiedName getFunctionName() {
     return (QualifiedName) functionName;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/UnresolvedPlan.java b/core/src/main/java/org/opensearch/sql/ast/tree/UnresolvedPlan.java
index 672a4602ed..3074303b0d 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/UnresolvedPlan.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/UnresolvedPlan.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import lombok.EqualsAndHashCode;
@@ -11,9 +10,7 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/**
- * Abstract unresolved plan.
- */
+/** Abstract unresolved plan. */
 @EqualsAndHashCode(callSuper = false)
 @ToString
 public abstract class UnresolvedPlan extends Node {
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Values.java b/core/src/main/java/org/opensearch/sql/ast/tree/Values.java
index 5a662912f9..65d7e8d7cb 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Values.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Values.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -16,9 +15,7 @@
 import org.opensearch.sql.ast.Node;
 import org.opensearch.sql.ast.expression.Literal;
 
-/**
- * AST node class for a sequence of literal values.
- */
+/** AST node class for a sequence of literal values. */
 @ToString
 @Getter
 @EqualsAndHashCode(callSuper = false)
@@ -41,5 +38,4 @@ public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
   public List<? extends Node> getChild() {
     return ImmutableList.of();
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/AnalysisContextTest.java b/core/src/test/java/org/opensearch/sql/analysis/AnalysisContextTest.java
index 0d643aa53f..b052fe47ce 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/AnalysisContextTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/AnalysisContextTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTest.java
index 100cfd67af..2f4d6e8ada 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static java.util.Collections.emptyList;
@@ -134,17 +133,13 @@ public void filter_relation_with_reserved_qualifiedName() {
 
   @Test
   public void filter_relation_with_invalid_qualifiedName_SemanticCheckException() {
-    UnresolvedPlan invalidFieldPlan = AstDSL.filter(
-        AstDSL.relation("schema"),
-        AstDSL.equalTo(
-            AstDSL.qualifiedName("_invalid"),
-            AstDSL.stringLiteral("value"))
-    );
+    UnresolvedPlan invalidFieldPlan =
+        AstDSL.filter(
+            AstDSL.relation("schema"),
+            AstDSL.equalTo(AstDSL.qualifiedName("_invalid"), AstDSL.stringLiteral("value")));
 
     SemanticCheckException exception =
-        assertThrows(
-            SemanticCheckException.class,
-            () -> analyze(invalidFieldPlan));
+        assertThrows(SemanticCheckException.class, () -> analyze(invalidFieldPlan));
     assertEquals(
         "can't resolve Symbol(namespace=FIELD_NAME, name=_invalid) in type env",
         exception.getMessage());
@@ -152,15 +147,13 @@ public void filter_relation_with_invalid_qualifiedName_SemanticCheckException()
 
   @Test
   public void filter_relation_with_invalid_qualifiedName_ExpressionEvaluationException() {
-    UnresolvedPlan typeMismatchPlan = AstDSL.filter(
-        AstDSL.relation("schema"),
-        AstDSL.equalTo(AstDSL.qualifiedName("_test"), AstDSL.intLiteral(1))
-    );
+    UnresolvedPlan typeMismatchPlan =
+        AstDSL.filter(
+            AstDSL.relation("schema"),
+            AstDSL.equalTo(AstDSL.qualifiedName("_test"), AstDSL.intLiteral(1)));
 
     ExpressionEvaluationException exception =
-        assertThrows(
-            ExpressionEvaluationException.class,
-            () -> analyze(typeMismatchPlan));
+        assertThrows(ExpressionEvaluationException.class, () -> analyze(typeMismatchPlan));
     assertEquals(
         "= function expected {[BYTE,BYTE],[SHORT,SHORT],[INTEGER,INTEGER],[LONG,LONG],"
             + "[FLOAT,FLOAT],[DOUBLE,DOUBLE],[STRING,STRING],[BOOLEAN,BOOLEAN],[DATE,DATE],"
@@ -265,8 +258,8 @@ public void filter_relation_with_non_existing_datasource_with_three_parts() {
             LogicalPlanDSL.relation("test.nonexisting_schema.http_total_requests", table),
             DSL.equal(DSL.ref("integer_value", INTEGER), DSL.literal(integerValue(1)))),
         AstDSL.filter(
-            AstDSL.relation(AstDSL.qualifiedName("test",
-                "nonexisting_schema", "http_total_requests")),
+            AstDSL.relation(
+                AstDSL.qualifiedName("test", "nonexisting_schema", "http_total_requests")),
             AstDSL.equalTo(AstDSL.field("integer_value"), AstDSL.intLiteral(1))));
   }
 
@@ -283,73 +276,68 @@ public void filter_relation_with_multiple_tables() {
 
   @Test
   public void analyze_filter_visit_score_function() {
-    UnresolvedPlan unresolvedPlan = AstDSL.filter(
-        AstDSL.relation("schema"),
-        new ScoreFunction(
-            AstDSL.function("match_phrase_prefix",
-                AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
-                AstDSL.unresolvedArg("query", stringLiteral("search query")),
-                AstDSL.unresolvedArg("boost", stringLiteral("3"))
-            ), AstDSL.doubleLiteral(1.0))
-    );
+    UnresolvedPlan unresolvedPlan =
+        AstDSL.filter(
+            AstDSL.relation("schema"),
+            new ScoreFunction(
+                AstDSL.function(
+                    "match_phrase_prefix",
+                    AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
+                    AstDSL.unresolvedArg("query", stringLiteral("search query")),
+                    AstDSL.unresolvedArg("boost", stringLiteral("3"))),
+                AstDSL.doubleLiteral(1.0)));
     assertAnalyzeEqual(
         LogicalPlanDSL.filter(
             LogicalPlanDSL.relation("schema", table),
             DSL.match_phrase_prefix(
                 DSL.namedArgument("field", "field_value1"),
                 DSL.namedArgument("query", "search query"),
-                DSL.namedArgument("boost", "3.0")
-            )
-        ),
-        unresolvedPlan
-    );
+                DSL.namedArgument("boost", "3.0"))),
+        unresolvedPlan);
 
     LogicalPlan logicalPlan = analyze(unresolvedPlan);
     OpenSearchFunctions.OpenSearchFunction relevanceQuery =
-        (OpenSearchFunctions.OpenSearchFunction)((LogicalFilter) logicalPlan).getCondition();
+        (OpenSearchFunctions.OpenSearchFunction) ((LogicalFilter) logicalPlan).getCondition();
     assertEquals(true, relevanceQuery.isScoreTracked());
   }
 
   @Test
   public void analyze_filter_visit_without_score_function() {
-    UnresolvedPlan unresolvedPlan = AstDSL.filter(
-        AstDSL.relation("schema"),
-        AstDSL.function("match_phrase_prefix",
-            AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
-            AstDSL.unresolvedArg("query", stringLiteral("search query")),
-            AstDSL.unresolvedArg("boost", stringLiteral("3"))
-        )
-    );
+    UnresolvedPlan unresolvedPlan =
+        AstDSL.filter(
+            AstDSL.relation("schema"),
+            AstDSL.function(
+                "match_phrase_prefix",
+                AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
+                AstDSL.unresolvedArg("query", stringLiteral("search query")),
+                AstDSL.unresolvedArg("boost", stringLiteral("3"))));
     assertAnalyzeEqual(
         LogicalPlanDSL.filter(
             LogicalPlanDSL.relation("schema", table),
             DSL.match_phrase_prefix(
                 DSL.namedArgument("field", "field_value1"),
                 DSL.namedArgument("query", "search query"),
-                DSL.namedArgument("boost", "3")
-            )
-        ),
-        unresolvedPlan
-    );
+                DSL.namedArgument("boost", "3"))),
+        unresolvedPlan);
 
     LogicalPlan logicalPlan = analyze(unresolvedPlan);
     OpenSearchFunctions.OpenSearchFunction relevanceQuery =
-        (OpenSearchFunctions.OpenSearchFunction)((LogicalFilter) logicalPlan).getCondition();
+        (OpenSearchFunctions.OpenSearchFunction) ((LogicalFilter) logicalPlan).getCondition();
     assertEquals(false, relevanceQuery.isScoreTracked());
   }
 
   @Test
   public void analyze_filter_visit_score_function_with_double_boost() {
-    UnresolvedPlan unresolvedPlan = AstDSL.filter(
-        AstDSL.relation("schema"),
-        new ScoreFunction(
-            AstDSL.function("match_phrase_prefix",
-                AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
-                AstDSL.unresolvedArg("query", stringLiteral("search query")),
-                AstDSL.unresolvedArg("slop", stringLiteral("3"))
-            ), new Literal(3.0, DataType.DOUBLE)
-        )
-    );
+    UnresolvedPlan unresolvedPlan =
+        AstDSL.filter(
+            AstDSL.relation("schema"),
+            new ScoreFunction(
+                AstDSL.function(
+                    "match_phrase_prefix",
+                    AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
+                    AstDSL.unresolvedArg("query", stringLiteral("search query")),
+                    AstDSL.unresolvedArg("slop", stringLiteral("3"))),
+                new Literal(3.0, DataType.DOUBLE)));
 
     assertAnalyzeEqual(
         LogicalPlanDSL.filter(
@@ -358,44 +346,36 @@ public void analyze_filter_visit_score_function_with_double_boost() {
                 DSL.namedArgument("field", "field_value1"),
                 DSL.namedArgument("query", "search query"),
                 DSL.namedArgument("slop", "3"),
-                DSL.namedArgument("boost", "3.0")
-            )
-        ),
-        unresolvedPlan
-    );
+                DSL.namedArgument("boost", "3.0"))),
+        unresolvedPlan);
 
     LogicalPlan logicalPlan = analyze(unresolvedPlan);
     OpenSearchFunctions.OpenSearchFunction relevanceQuery =
-        (OpenSearchFunctions.OpenSearchFunction)((LogicalFilter) logicalPlan).getCondition();
+        (OpenSearchFunctions.OpenSearchFunction) ((LogicalFilter) logicalPlan).getCondition();
     assertEquals(true, relevanceQuery.isScoreTracked());
   }
 
   @Test
   public void analyze_filter_visit_score_function_with_unsupported_boost_SemanticCheckException() {
-    UnresolvedPlan unresolvedPlan = AstDSL.filter(
-        AstDSL.relation("schema"),
-        new ScoreFunction(
-            AstDSL.function("match_phrase_prefix",
-                AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
-                AstDSL.unresolvedArg("query", stringLiteral("search query")),
-                AstDSL.unresolvedArg("boost", stringLiteral("3"))
-            ), AstDSL.stringLiteral("3.0")
-        )
-    );
+    UnresolvedPlan unresolvedPlan =
+        AstDSL.filter(
+            AstDSL.relation("schema"),
+            new ScoreFunction(
+                AstDSL.function(
+                    "match_phrase_prefix",
+                    AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
+                    AstDSL.unresolvedArg("query", stringLiteral("search query")),
+                    AstDSL.unresolvedArg("boost", stringLiteral("3"))),
+                AstDSL.stringLiteral("3.0")));
     SemanticCheckException exception =
-        assertThrows(
-            SemanticCheckException.class,
-            () -> analyze(unresolvedPlan));
-    assertEquals(
-        "Expected boost type 'DOUBLE' but got 'STRING'",
-        exception.getMessage());
+        assertThrows(SemanticCheckException.class, () -> analyze(unresolvedPlan));
+    assertEquals("Expected boost type 'DOUBLE' but got 'STRING'", exception.getMessage());
   }
 
   @Test
   public void head_relation() {
     assertAnalyzeEqual(
-        LogicalPlanDSL.limit(LogicalPlanDSL.relation("schema", table),
-            10, 0),
+        LogicalPlanDSL.limit(LogicalPlanDSL.relation("schema", table), 10, 0),
         AstDSL.head(AstDSL.relation("schema"), 10, 0));
   }
 
@@ -418,7 +398,7 @@ public void analyze_filter_aggregation_relation() {
                     DSL.named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER))),
                     DSL.named("MIN(integer_value)", DSL.min(DSL.ref("integer_value", INTEGER)))),
                 ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING)))),
-            DSL.greater(// Expect to be replaced with reference by expression optimizer
+            DSL.greater( // Expect to be replaced with reference by expression optimizer
                 DSL.ref("MIN(integer_value)", INTEGER), DSL.literal(integerValue(10)))),
         AstDSL.filter(
             AstDSL.agg(
@@ -429,8 +409,7 @@ public void analyze_filter_aggregation_relation() {
                 emptyList(),
                 ImmutableList.of(alias("string_value", qualifiedName("string_value"))),
                 emptyList()),
-            compare(">",
-                aggregate("MIN", qualifiedName("integer_value")), intLiteral(10))));
+            compare(">", aggregate("MIN", qualifiedName("integer_value")), intLiteral(10))));
   }
 
   @Test
@@ -449,19 +428,16 @@ public void stats_source() {
     assertAnalyzeEqual(
         LogicalPlanDSL.aggregation(
             LogicalPlanDSL.relation("schema", table),
-            ImmutableList
-                .of(DSL.named("avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+            ImmutableList.of(
+                DSL.named("avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
             ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING)))),
         AstDSL.agg(
             AstDSL.relation("schema"),
             AstDSL.exprList(
                 AstDSL.alias(
-                    "avg(integer_value)",
-                    AstDSL.aggregate("avg", field("integer_value")))
-            ),
+                    "avg(integer_value)", AstDSL.aggregate("avg", field("integer_value")))),
             null,
-            ImmutableList.of(
-                AstDSL.alias("string_value", field("string_value"))),
+            ImmutableList.of(AstDSL.alias("string_value", field("string_value"))),
             AstDSL.defaultStatsArgs()));
   }
 
@@ -473,16 +449,13 @@ public void rare_source() {
             CommandType.RARE,
             10,
             ImmutableList.of(DSL.ref("string_value", STRING)),
-            DSL.ref("integer_value", INTEGER)
-        ),
+            DSL.ref("integer_value", INTEGER)),
         AstDSL.rareTopN(
             AstDSL.relation("schema"),
             CommandType.RARE,
             ImmutableList.of(argument("noOfResults", intLiteral(10))),
             ImmutableList.of(field("string_value")),
-            field("integer_value")
-        )
-    );
+            field("integer_value")));
   }
 
   @Test
@@ -493,16 +466,13 @@ public void top_source() {
             CommandType.TOP,
             5,
             ImmutableList.of(DSL.ref("string_value", STRING)),
-            DSL.ref("integer_value", INTEGER)
-        ),
+            DSL.ref("integer_value", INTEGER)),
         AstDSL.rareTopN(
             AstDSL.relation("schema"),
             CommandType.TOP,
             ImmutableList.of(argument("noOfResults", intLiteral(5))),
             ImmutableList.of(field("string_value")),
-            field("integer_value")
-        )
-    );
+            field("integer_value")));
   }
 
   @Test
@@ -516,8 +486,9 @@ public void rename_to_invalid_expression() {
                         AstDSL.agg(
                             AstDSL.relation("schema"),
                             AstDSL.exprList(
-                                AstDSL.alias("avg(integer_value)", AstDSL.aggregate("avg", field(
-                                    "integer_value")))),
+                                AstDSL.alias(
+                                    "avg(integer_value)",
+                                    AstDSL.aggregate("avg", field("integer_value")))),
                             Collections.emptyList(),
                             ImmutableList.of(),
                             AstDSL.defaultStatsArgs()),
@@ -535,8 +506,7 @@ public void project_source() {
         LogicalPlanDSL.project(
             LogicalPlanDSL.relation("schema", table),
             DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
-            DSL.named("double_value", DSL.ref("double_value", DOUBLE))
-        ),
+            DSL.named("double_value", DSL.ref("double_value", DOUBLE))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
@@ -550,34 +520,25 @@ public void project_nested_field_arg() {
         List.of(
             Map.of(
                 "field", new ReferenceExpression("message.info", STRING),
-                "path", new ReferenceExpression("message", STRING)
-            )
-        );
+                "path", new ReferenceExpression("message", STRING)));
 
     List<NamedExpression> projectList =
         List.of(
             new NamedExpression(
-                "nested(message.info)",
-                DSL.nested(DSL.ref("message.info", STRING)),
-                null)
-        );
+                "nested(message.info)", DSL.nested(DSL.ref("message.info", STRING)), null));
 
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.nested(
-                LogicalPlanDSL.relation("schema", table),
-                nestedArgs,
-                projectList),
-            DSL.named("nested(message.info)",
-                DSL.nested(DSL.ref("message.info", STRING)))
-        ),
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named("nested(message.info)", DSL.nested(DSL.ref("message.info", STRING)))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
-            AstDSL.alias("nested(message.info)",
-                function("nested", qualifiedName("message", "info")), null)
-        )
-    );
+            AstDSL.alias(
+                "nested(message.info)",
+                function("nested", qualifiedName("message", "info")),
+                null)));
 
     assertTrue(isNestedFunction(DSL.nested(DSL.ref("message.info", STRING))));
     assertFalse(isNestedFunction(DSL.literal("fieldA")));
@@ -586,64 +547,51 @@ public void project_nested_field_arg() {
 
   @Test
   public void sort_with_nested_all_tuple_fields_throws_exception() {
-    assertThrows(UnsupportedOperationException.class, () -> analyze(
-        AstDSL.project(
-          AstDSL.sort(
-                AstDSL.relation("schema"),
-                field(nestedAllTupleFields("message"))
-              ),
-            AstDSL.alias("nested(message.*)",
-                nestedAllTupleFields("message"))
-        )
-    ));
+    assertThrows(
+        UnsupportedOperationException.class,
+        () ->
+            analyze(
+                AstDSL.project(
+                    AstDSL.sort(AstDSL.relation("schema"), field(nestedAllTupleFields("message"))),
+                    AstDSL.alias("nested(message.*)", nestedAllTupleFields("message")))));
   }
 
   @Test
   public void filter_with_nested_all_tuple_fields_throws_exception() {
-    assertThrows(UnsupportedOperationException.class, () -> analyze(
-        AstDSL.project(
-            AstDSL.filter(
-                AstDSL.relation("schema"),
-                AstDSL.function("=", nestedAllTupleFields("message"), AstDSL.intLiteral(1))),
-            AstDSL.alias("nested(message.*)",
-                nestedAllTupleFields("message"))
-        )
-    ));
+    assertThrows(
+        UnsupportedOperationException.class,
+        () ->
+            analyze(
+                AstDSL.project(
+                    AstDSL.filter(
+                        AstDSL.relation("schema"),
+                        AstDSL.function(
+                            "=", nestedAllTupleFields("message"), AstDSL.intLiteral(1))),
+                    AstDSL.alias("nested(message.*)", nestedAllTupleFields("message")))));
   }
 
-
   @Test
   public void project_nested_field_star_arg() {
     List<Map<String, ReferenceExpression>> nestedArgs =
         List.of(
             Map.of(
                 "field", new ReferenceExpression("message.info", STRING),
-                "path", new ReferenceExpression("message", STRING)
-            )
-        );
+                "path", new ReferenceExpression("message", STRING)));
 
     List<NamedExpression> projectList =
         List.of(
-            new NamedExpression("nested(message.info)",
-                DSL.nested(DSL.ref("message.info", STRING)))
-        );
+            new NamedExpression(
+                "nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))));
 
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.nested(
-                LogicalPlanDSL.relation("schema", table),
-                nestedArgs,
-                projectList),
-            DSL.named("nested(message.info)",
-                DSL.nested(DSL.ref("message.info", STRING)))
-        ),
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named("nested(message.info)", DSL.nested(DSL.ref("message.info", STRING)))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
-            AstDSL.alias("nested(message.*)",
-                nestedAllTupleFields("message"))
-        )
-    );
+            AstDSL.alias("nested(message.*)", nestedAllTupleFields("message"))));
   }
 
   @Test
@@ -652,42 +600,29 @@ public void project_nested_field_star_arg_with_another_nested_function() {
         List.of(
             Map.of(
                 "field", new ReferenceExpression("message.info", STRING),
-                "path", new ReferenceExpression("message", STRING)
-            ),
+                "path", new ReferenceExpression("message", STRING)),
             Map.of(
                 "field", new ReferenceExpression("comment.data", STRING),
-                "path", new ReferenceExpression("comment", STRING)
-            )
-        );
+                "path", new ReferenceExpression("comment", STRING)));
 
     List<NamedExpression> projectList =
         List.of(
-            new NamedExpression("nested(message.info)",
-                DSL.nested(DSL.ref("message.info", STRING))),
-            new NamedExpression("nested(comment.data)",
-                DSL.nested(DSL.ref("comment.data", STRING)))
-        );
+            new NamedExpression(
+                "nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            new NamedExpression(
+                "nested(comment.data)", DSL.nested(DSL.ref("comment.data", STRING))));
 
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.nested(
-                LogicalPlanDSL.relation("schema", table),
-                nestedArgs,
-                projectList),
-            DSL.named("nested(message.info)",
-                DSL.nested(DSL.ref("message.info", STRING))),
-            DSL.named("nested(comment.data)",
-                DSL.nested(DSL.ref("comment.data", STRING)))
-        ),
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named("nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            DSL.named("nested(comment.data)", DSL.nested(DSL.ref("comment.data", STRING)))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
-            AstDSL.alias("nested(message.*)",
-                nestedAllTupleFields("message")),
-            AstDSL.alias("nested(comment.*)",
-                nestedAllTupleFields("comment"))
-        )
-    );
+            AstDSL.alias("nested(message.*)", nestedAllTupleFields("message")),
+            AstDSL.alias("nested(comment.*)", nestedAllTupleFields("comment"))));
   }
 
   @Test
@@ -696,38 +631,25 @@ public void project_nested_field_star_arg_with_another_field() {
         List.of(
             Map.of(
                 "field", new ReferenceExpression("message.info", STRING),
-                "path", new ReferenceExpression("message", STRING)
-            )
-        );
+                "path", new ReferenceExpression("message", STRING)));
 
     List<NamedExpression> projectList =
         List.of(
-            new NamedExpression("nested(message.info)",
-                DSL.nested(DSL.ref("message.info", STRING))),
-            new NamedExpression("comment.data",
-                DSL.ref("comment.data", STRING))
-        );
+            new NamedExpression(
+                "nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            new NamedExpression("comment.data", DSL.ref("comment.data", STRING)));
 
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.nested(
-                LogicalPlanDSL.relation("schema", table),
-                nestedArgs,
-                projectList),
-            DSL.named("nested(message.info)",
-                DSL.nested(DSL.ref("message.info", STRING))),
-            DSL.named("comment.data",
-                DSL.ref("comment.data", STRING))
-        ),
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named("nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            DSL.named("comment.data", DSL.ref("comment.data", STRING))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
-            AstDSL.alias("nested(message.*)",
-                nestedAllTupleFields("message")),
-            AstDSL.alias("comment.data",
-                field("comment.data"))
-        )
-    );
+            AstDSL.alias("nested(message.*)", nestedAllTupleFields("message")),
+            AstDSL.alias("comment.data", field("comment.data"))));
   }
 
   @Test
@@ -736,41 +658,32 @@ public void project_nested_field_star_arg_with_highlight() {
         List.of(
             Map.of(
                 "field", new ReferenceExpression("message.info", STRING),
-                "path", new ReferenceExpression("message", STRING)
-            )
-        );
+                "path", new ReferenceExpression("message", STRING)));
 
     List<NamedExpression> projectList =
         List.of(
-            new NamedExpression("nested(message.info)",
-                DSL.nested(DSL.ref("message.info", STRING))),
-            DSL.named("highlight(fieldA)",
-                new HighlightExpression(DSL.literal("fieldA")))
-        );
+            new NamedExpression(
+                "nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            DSL.named("highlight(fieldA)", new HighlightExpression(DSL.literal("fieldA"))));
 
     Map<String, Literal> highlightArgs = new HashMap<>();
 
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.nested(
-                LogicalPlanDSL.highlight(LogicalPlanDSL.relation("schema", table),
-                    DSL.literal("fieldA"), highlightArgs),
+                LogicalPlanDSL.highlight(
+                    LogicalPlanDSL.relation("schema", table), DSL.literal("fieldA"), highlightArgs),
                 nestedArgs,
                 projectList),
-            DSL.named("nested(message.info)",
-                DSL.nested(DSL.ref("message.info", STRING))),
-            DSL.named("highlight(fieldA)",
-                new HighlightExpression(DSL.literal("fieldA")))
-        ),
+            DSL.named("nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            DSL.named("highlight(fieldA)", new HighlightExpression(DSL.literal("fieldA")))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
-            AstDSL.alias("nested(message.*)",
-                nestedAllTupleFields("message")),
-            AstDSL.alias("highlight(fieldA)",
-                new HighlightFunction(AstDSL.stringLiteral("fieldA"), highlightArgs))
-        )
-    );
+            AstDSL.alias("nested(message.*)", nestedAllTupleFields("message")),
+            AstDSL.alias(
+                "highlight(fieldA)",
+                new HighlightFunction(AstDSL.stringLiteral("fieldA"), highlightArgs))));
   }
 
   @Test
@@ -779,40 +692,29 @@ public void project_nested_field_and_path_args() {
         List.of(
             Map.of(
                 "field", new ReferenceExpression("message.info", STRING),
-                "path", new ReferenceExpression("message", STRING)
-            )
-        );
+                "path", new ReferenceExpression("message", STRING)));
 
     List<NamedExpression> projectList =
         List.of(
             new NamedExpression(
                 "nested(message.info)",
                 DSL.nested(DSL.ref("message.info", STRING), DSL.ref("message", STRING)),
-                null)
-        );
+                null));
 
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.nested(
-                LogicalPlanDSL.relation("schema", table),
-                nestedArgs,
-                projectList),
-            DSL.named("nested(message.info)",
-                DSL.nested(DSL.ref("message.info", STRING), DSL.ref("message", STRING)))
-        ),
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named(
+                "nested(message.info)",
+                DSL.nested(DSL.ref("message.info", STRING), DSL.ref("message", STRING)))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
-            AstDSL.alias("nested(message.info)",
-                function(
-                    "nested",
-                    qualifiedName("message", "info"),
-                    qualifiedName("message")
-                ),
-                null
-            )
-        )
-    );
+            AstDSL.alias(
+                "nested(message.info)",
+                function("nested", qualifiedName("message", "info"), qualifiedName("message")),
+                null)));
   }
 
   @Test
@@ -821,34 +723,25 @@ public void project_nested_deep_field_arg() {
         List.of(
             Map.of(
                 "field", new ReferenceExpression("message.info.id", STRING),
-                "path", new ReferenceExpression("message.info", STRING)
-            )
-        );
+                "path", new ReferenceExpression("message.info", STRING)));
 
     List<NamedExpression> projectList =
         List.of(
             new NamedExpression(
-                "nested(message.info.id)",
-                DSL.nested(DSL.ref("message.info.id", STRING)),
-                null)
-        );
+                "nested(message.info.id)", DSL.nested(DSL.ref("message.info.id", STRING)), null));
 
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.nested(
-                LogicalPlanDSL.relation("schema", table),
-                nestedArgs,
-                projectList),
-            DSL.named("nested(message.info.id)",
-                DSL.nested(DSL.ref("message.info.id", STRING)))
-        ),
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named("nested(message.info.id)", DSL.nested(DSL.ref("message.info.id", STRING)))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
-            AstDSL.alias("nested(message.info.id)",
-                function("nested", qualifiedName("message", "info", "id")), null)
-        )
-    );
+            AstDSL.alias(
+                "nested(message.info.id)",
+                function("nested", qualifiedName("message", "info", "id")),
+                null)));
   }
 
   @Test
@@ -857,114 +750,102 @@ public void project_multiple_nested() {
         List.of(
             Map.of(
                 "field", new ReferenceExpression("message.info", STRING),
-                "path", new ReferenceExpression("message", STRING)
-            ),
+                "path", new ReferenceExpression("message", STRING)),
             Map.of(
                 "field", new ReferenceExpression("comment.data", STRING),
-                "path", new ReferenceExpression("comment", STRING)
-            )
-        );
+                "path", new ReferenceExpression("comment", STRING)));
 
     List<NamedExpression> projectList =
         List.of(
             new NamedExpression(
-                "nested(message.info)",
-                DSL.nested(DSL.ref("message.info", STRING)),
-                null),
+                "nested(message.info)", DSL.nested(DSL.ref("message.info", STRING)), null),
             new NamedExpression(
-                "nested(comment.data)",
-                DSL.nested(DSL.ref("comment.data", STRING)),
-                null)
-        );
+                "nested(comment.data)", DSL.nested(DSL.ref("comment.data", STRING)), null));
 
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.nested(
-                LogicalPlanDSL.relation("schema", table),
-                nestedArgs,
-                projectList),
-            DSL.named("nested(message.info)",
-                DSL.nested(DSL.ref("message.info", STRING))),
-            DSL.named("nested(comment.data)",
-                DSL.nested(DSL.ref("comment.data", STRING)))
-        ),
+                LogicalPlanDSL.relation("schema", table), nestedArgs, projectList),
+            DSL.named("nested(message.info)", DSL.nested(DSL.ref("message.info", STRING))),
+            DSL.named("nested(comment.data)", DSL.nested(DSL.ref("comment.data", STRING)))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
-            AstDSL.alias("nested(message.info)",
-                function("nested", qualifiedName("message", "info")), null),
-            AstDSL.alias("nested(comment.data)",
-                function("nested", qualifiedName("comment", "data")), null)
-        )
-    );
+            AstDSL.alias(
+                "nested(message.info)", function("nested", qualifiedName("message", "info")), null),
+            AstDSL.alias(
+                "nested(comment.data)",
+                function("nested", qualifiedName("comment", "data")),
+                null)));
   }
 
   @Test
   public void project_nested_invalid_field_throws_exception() {
-    var exception = assertThrows(
-        IllegalArgumentException.class,
-          () -> analyze(AstDSL.projectWithArg(
-              AstDSL.relation("schema"),
-              AstDSL.defaultFieldsArgs(),
-              AstDSL.alias("message",
-                  function("nested", qualifiedName("message")), null)
-          )
-        )
-    );
+    var exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                analyze(
+                    AstDSL.projectWithArg(
+                        AstDSL.relation("schema"),
+                        AstDSL.defaultFieldsArgs(),
+                        AstDSL.alias(
+                            "message", function("nested", qualifiedName("message")), null))));
     assertEquals(exception.getMessage(), "Illegal nested field name: message");
   }
 
   @Test
   public void project_nested_invalid_arg_type_throws_exception() {
-    var exception = assertThrows(
-        IllegalArgumentException.class,
-        () -> analyze(AstDSL.projectWithArg(
-                AstDSL.relation("schema"),
-                AstDSL.defaultFieldsArgs(),
-                AstDSL.alias("message",
-                    function("nested", stringLiteral("message")), null)
-            )
-        )
-    );
+    var exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                analyze(
+                    AstDSL.projectWithArg(
+                        AstDSL.relation("schema"),
+                        AstDSL.defaultFieldsArgs(),
+                        AstDSL.alias(
+                            "message", function("nested", stringLiteral("message")), null))));
     assertEquals(exception.getMessage(), "Illegal nested field name: message");
   }
 
   @Test
   public void project_nested_no_args_throws_exception() {
-    var exception = assertThrows(
-        IllegalArgumentException.class,
-        () -> analyze(AstDSL.projectWithArg(
-                AstDSL.relation("schema"),
-                AstDSL.defaultFieldsArgs(),
-                AstDSL.alias("message",
-                    function("nested"), null)
-            )
-        )
-    );
-    assertEquals(exception.getMessage(),
-        "on nested object only allowed 2 parameters (field,path) or 1 parameter (field)"
-    );
+    var exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                analyze(
+                    AstDSL.projectWithArg(
+                        AstDSL.relation("schema"),
+                        AstDSL.defaultFieldsArgs(),
+                        AstDSL.alias("message", function("nested"), null))));
+    assertEquals(
+        exception.getMessage(),
+        "on nested object only allowed 2 parameters (field,path) or 1 parameter (field)");
   }
 
   @Test
   public void project_nested_too_many_args_throws_exception() {
-    var exception = assertThrows(
-        IllegalArgumentException.class,
-        () -> analyze(AstDSL.projectWithArg(
-                AstDSL.relation("schema"),
-                AstDSL.defaultFieldsArgs(),
-                AstDSL.alias("message",
-                    function("nested",
-                        stringLiteral("message.info"),
-                        stringLiteral("message"),
-                        stringLiteral("message")),
-                    null)
-            )
-        )
-    );
-    assertEquals(exception.getMessage(),
-        "on nested object only allowed 2 parameters (field,path) or 1 parameter (field)"
-    );
+    var exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                analyze(
+                    AstDSL.projectWithArg(
+                        AstDSL.relation("schema"),
+                        AstDSL.defaultFieldsArgs(),
+                        AstDSL.alias(
+                            "message",
+                            function(
+                                "nested",
+                                stringLiteral("message.info"),
+                                stringLiteral("message"),
+                                stringLiteral("message")),
+                            null))));
+    assertEquals(
+        exception.getMessage(),
+        "on nested object only allowed 2 parameters (field,path) or 1 parameter (field)");
   }
 
   @Test
@@ -975,18 +856,17 @@ public void project_highlight() {
 
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
-            LogicalPlanDSL.highlight(LogicalPlanDSL.relation("schema", table),
-                DSL.literal("fieldA"), args),
-            DSL.named("highlight(fieldA, pre_tags='<mark>', post_tags='</mark>')",
-                new HighlightExpression(DSL.literal("fieldA")))
-        ),
+            LogicalPlanDSL.highlight(
+                LogicalPlanDSL.relation("schema", table), DSL.literal("fieldA"), args),
+            DSL.named(
+                "highlight(fieldA, pre_tags='<mark>', post_tags='</mark>')",
+                new HighlightExpression(DSL.literal("fieldA")))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
-            AstDSL.alias("highlight(fieldA, pre_tags='<mark>', post_tags='</mark>')",
-                new HighlightFunction(AstDSL.stringLiteral("fieldA"), args))
-        )
-    );
+            AstDSL.alias(
+                "highlight(fieldA, pre_tags='<mark>', post_tags='</mark>')",
+                new HighlightFunction(AstDSL.stringLiteral("fieldA"), args))));
   }
 
   @Test
@@ -994,18 +874,13 @@ public void project_highlight_wildcard() {
     Map<String, Literal> args = new HashMap<>();
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
-            LogicalPlanDSL.highlight(LogicalPlanDSL.relation("schema", table),
-                DSL.literal("*"), args),
-            DSL.named("highlight(*)",
-                new HighlightExpression(DSL.literal("*")))
-        ),
+            LogicalPlanDSL.highlight(
+                LogicalPlanDSL.relation("schema", table), DSL.literal("*"), args),
+            DSL.named("highlight(*)", new HighlightExpression(DSL.literal("*")))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
-            AstDSL.alias("highlight(*)",
-                new HighlightFunction(AstDSL.stringLiteral("*"), args))
-        )
-    );
+            AstDSL.alias("highlight(*)", new HighlightFunction(AstDSL.stringLiteral("*"), args))));
   }
 
   @Test
@@ -1013,8 +888,8 @@ public void remove_source() {
     assertAnalyzeEqual(
         LogicalPlanDSL.remove(
             LogicalPlanDSL.relation("schema", table),
-            DSL.ref("integer_value", INTEGER), DSL.ref(
-                "double_value", DOUBLE)),
+            DSL.ref("integer_value", INTEGER),
+            DSL.ref("double_value", DOUBLE)),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             Collections.singletonList(argument("exclude", booleanLiteral(true))),
@@ -1022,7 +897,8 @@ public void remove_source() {
             AstDSL.field("double_value")));
   }
 
-  @Disabled("the project/remove command should shrink the type env. Should be enabled once "
+  @Disabled(
+      "the project/remove command should shrink the type env. Should be enabled once "
           + "https://github.com/opensearch-project/sql/issues/917 is resolved")
   @Test
   public void project_source_change_type_env() {
@@ -1048,15 +924,12 @@ public void project_values() {
             LogicalPlanDSL.values(ImmutableList.of(DSL.literal(123))),
             DSL.named("123", DSL.literal(123)),
             DSL.named("hello", DSL.literal("hello")),
-            DSL.named("false", DSL.literal(false))
-        ),
+            DSL.named("false", DSL.literal(false))),
         AstDSL.project(
             AstDSL.values(ImmutableList.of(AstDSL.intLiteral(123))),
             AstDSL.alias("123", AstDSL.intLiteral(123)),
             AstDSL.alias("hello", AstDSL.stringLiteral("hello")),
-            AstDSL.alias("false", AstDSL.booleanLiteral(false))
-        )
-    );
+            AstDSL.alias("false", AstDSL.booleanLiteral(false))));
   }
 
   @SuppressWarnings("unchecked")
@@ -1069,8 +942,7 @@ public void sort_with_aggregator() {
                     LogicalPlanDSL.relation("test", table),
                     ImmutableList.of(
                         DSL.named(
-                            "avg(integer_value)",
-                            DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                            "avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
                     ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING)))),
                 // Aggregator in Sort AST node is replaced with reference by expression optimizer
                 Pair.of(SortOption.DEFAULT_ASC, DSL.ref("avg(integer_value)", DOUBLE))),
@@ -1081,12 +953,10 @@ public void sort_with_aggregator() {
                     AstDSL.relation("test"),
                     ImmutableList.of(
                         AstDSL.alias(
-                            "avg(integer_value)",
-                            function("avg", qualifiedName("integer_value")))),
+                            "avg(integer_value)", function("avg", qualifiedName("integer_value")))),
                     emptyList(),
                     ImmutableList.of(AstDSL.alias("string_value", qualifiedName("string_value"))),
-                    emptyList()
-                ),
+                    emptyList()),
                 field(
                     function("avg", qualifiedName("integer_value")),
                     argument("asc", booleanLiteral(true)))),
@@ -1098,40 +968,49 @@ public void sort_with_aggregator() {
   public void sort_with_options() {
     ImmutableMap<Argument[], SortOption> argOptions =
         ImmutableMap.<Argument[], SortOption>builder()
-            .put(new Argument[] {argument("asc", booleanLiteral(true))},
+            .put(
+                new Argument[] {argument("asc", booleanLiteral(true))},
                 new SortOption(SortOrder.ASC, NullOrder.NULL_FIRST))
-            .put(new Argument[] {argument("asc", booleanLiteral(false))},
+            .put(
+                new Argument[] {argument("asc", booleanLiteral(false))},
                 new SortOption(SortOrder.DESC, NullOrder.NULL_LAST))
-            .put(new Argument[] {
-                    argument("asc", booleanLiteral(true)),
-                    argument("nullFirst", booleanLiteral(true))},
+            .put(
+                new Argument[] {
+                  argument("asc", booleanLiteral(true)), argument("nullFirst", booleanLiteral(true))
+                },
                 new SortOption(SortOrder.ASC, NullOrder.NULL_FIRST))
-            .put(new Argument[] {
-                    argument("asc", booleanLiteral(true)),
-                    argument("nullFirst", booleanLiteral(false))},
+            .put(
+                new Argument[] {
+                  argument("asc", booleanLiteral(true)),
+                  argument("nullFirst", booleanLiteral(false))
+                },
                 new SortOption(SortOrder.ASC, NullOrder.NULL_LAST))
-            .put(new Argument[] {
-                    argument("asc", booleanLiteral(false)),
-                    argument("nullFirst", booleanLiteral(true))},
+            .put(
+                new Argument[] {
+                  argument("asc", booleanLiteral(false)),
+                  argument("nullFirst", booleanLiteral(true))
+                },
                 new SortOption(SortOrder.DESC, NullOrder.NULL_FIRST))
-            .put(new Argument[] {
-                    argument("asc", booleanLiteral(false)),
-                    argument("nullFirst", booleanLiteral(false))},
+            .put(
+                new Argument[] {
+                  argument("asc", booleanLiteral(false)),
+                  argument("nullFirst", booleanLiteral(false))
+                },
                 new SortOption(SortOrder.DESC, NullOrder.NULL_LAST))
             .build();
 
-    argOptions.forEach((args, expectOption) ->
-        assertAnalyzeEqual(
-            LogicalPlanDSL.project(
-                LogicalPlanDSL.sort(
-                    LogicalPlanDSL.relation("test", table),
-                    Pair.of(expectOption, DSL.ref("integer_value", INTEGER))),
-                DSL.named("string_value", DSL.ref("string_value", STRING))),
-            AstDSL.project(
-                AstDSL.sort(
-                    AstDSL.relation("test"),
-                    field(qualifiedName("integer_value"), args)),
-                AstDSL.alias("string_value", qualifiedName("string_value")))));
+    argOptions.forEach(
+        (args, expectOption) ->
+            assertAnalyzeEqual(
+                LogicalPlanDSL.project(
+                    LogicalPlanDSL.sort(
+                        LogicalPlanDSL.relation("test", table),
+                        Pair.of(expectOption, DSL.ref("integer_value", INTEGER))),
+                    DSL.named("string_value", DSL.ref("string_value", STRING))),
+                AstDSL.project(
+                    AstDSL.sort(
+                        AstDSL.relation("test"), field(qualifiedName("integer_value"), args)),
+                    AstDSL.alias("string_value", qualifiedName("string_value")))));
   }
 
   @SuppressWarnings("unchecked")
@@ -1156,7 +1035,8 @@ public void window_function() {
         AstDSL.project(
             AstDSL.relation("test"),
             AstDSL.alias("string_value", AstDSL.qualifiedName("string_value")),
-            AstDSL.alias("window_function",
+            AstDSL.alias(
+                "window_function",
                 AstDSL.window(
                     AstDSL.function("row_number"),
                     Collections.singletonList(AstDSL.qualifiedName("string_value")),
@@ -1164,11 +1044,7 @@ public void window_function() {
                         ImmutablePair.of(DEFAULT_ASC, AstDSL.qualifiedName("integer_value")))))));
   }
 
-  /**
-   * SELECT name FROM (
-   * SELECT name, age FROM test
-   * ) AS schema.
-   */
+  /** SELECT name FROM ( SELECT name, age FROM test ) AS schema. */
   @Test
   public void from_subquery() {
     assertAnalyzeEqual(
@@ -1176,29 +1052,19 @@ public void from_subquery() {
             LogicalPlanDSL.project(
                 LogicalPlanDSL.relation("schema", table),
                 DSL.named("string_value", DSL.ref("string_value", STRING)),
-                DSL.named("integer_value", DSL.ref("integer_value", INTEGER))
-            ),
-            DSL.named("string_value", DSL.ref("string_value", STRING))
-        ),
+                DSL.named("integer_value", DSL.ref("integer_value", INTEGER))),
+            DSL.named("string_value", DSL.ref("string_value", STRING))),
         AstDSL.project(
             AstDSL.relationSubquery(
                 AstDSL.project(
                     AstDSL.relation("schema"),
                     AstDSL.alias("string_value", AstDSL.qualifiedName("string_value")),
-                    AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value"))
-                ),
-                "schema"
-            ),
-            AstDSL.alias("string_value", AstDSL.qualifiedName("string_value"))
-        )
-    );
+                    AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value"))),
+                "schema"),
+            AstDSL.alias("string_value", AstDSL.qualifiedName("string_value"))));
   }
 
-  /**
-   * SELECT * FROM (
-   * SELECT name FROM test
-   * ) AS schema.
-   */
+  /** SELECT * FROM ( SELECT name FROM test ) AS schema. */
   @Test
   public void select_all_from_subquery() {
     assertAnalyzeEqual(
@@ -1206,147 +1072,130 @@ public void select_all_from_subquery() {
             LogicalPlanDSL.project(
                 LogicalPlanDSL.relation("schema", table),
                 DSL.named("string_value", DSL.ref("string_value", STRING))),
-            DSL.named("string_value", DSL.ref("string_value", STRING))
-        ),
+            DSL.named("string_value", DSL.ref("string_value", STRING))),
         AstDSL.project(
             AstDSL.relationSubquery(
                 AstDSL.project(
                     AstDSL.relation("schema"),
-                    AstDSL.alias("string_value", AstDSL.qualifiedName("string_value"))
-                ),
-                "schema"
-            ),
-            AstDSL.allFields()
-        )
-    );
+                    AstDSL.alias("string_value", AstDSL.qualifiedName("string_value"))),
+                "schema"),
+            AstDSL.allFields()));
   }
 
   /**
-   * Ensure Nested function falls back to legacy engine when used in GROUP BY clause.
-   * TODO Remove this test when support is added.
+   * Ensure Nested function falls back to legacy engine when used in GROUP BY clause. TODO Remove
+   * this test when support is added.
    */
   @Test
   public void nested_group_by_clause_throws_syntax_exception() {
-    SyntaxCheckException exception = assertThrows(SyntaxCheckException.class,
-        () -> analyze(
-            AstDSL.project(
-                AstDSL.agg(
-                    AstDSL.relation("schema"),
-                    emptyList(),
-                    emptyList(),
-                    ImmutableList.of(alias("nested(message.info)",
-                        function("nested",
-                            qualifiedName("message", "info")))),
-                    emptyList()
-                )))
-    );
-    assertEquals("Falling back to legacy engine. Nested function is not supported in WHERE,"
+    SyntaxCheckException exception =
+        assertThrows(
+            SyntaxCheckException.class,
+            () ->
+                analyze(
+                    AstDSL.project(
+                        AstDSL.agg(
+                            AstDSL.relation("schema"),
+                            emptyList(),
+                            emptyList(),
+                            ImmutableList.of(
+                                alias(
+                                    "nested(message.info)",
+                                    function("nested", qualifiedName("message", "info")))),
+                            emptyList()))));
+    assertEquals(
+        "Falling back to legacy engine. Nested function is not supported in WHERE,"
             + " GROUP BY, and HAVING clauses.",
         exception.getMessage());
   }
 
-  /**
-   * SELECT name, AVG(age) FROM test GROUP BY name.
-   */
+  /** SELECT name, AVG(age) FROM test GROUP BY name. */
   @Test
   public void sql_group_by_field() {
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
-                ImmutableList
-                    .of(DSL
-                        .named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                ImmutableList.of(
+                    DSL.named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
                 ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING)))),
             DSL.named("string_value", DSL.ref("string_value", STRING)),
             DSL.named("AVG(integer_value)", DSL.ref("AVG(integer_value)", DOUBLE))),
         AstDSL.project(
             AstDSL.agg(
                 AstDSL.relation("schema"),
-                ImmutableList.of(alias("AVG(integer_value)",
-                    aggregate("AVG", qualifiedName("integer_value")))),
+                ImmutableList.of(
+                    alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value")))),
                 emptyList(),
                 ImmutableList.of(alias("string_value", qualifiedName("string_value"))),
                 emptyList()),
             AstDSL.alias("string_value", qualifiedName("string_value")),
-            AstDSL.alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value"))))
-    );
+            AstDSL.alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value")))));
   }
 
-  /**
-   * SELECT abs(name), AVG(age) FROM test GROUP BY abs(name).
-   */
+  /** SELECT abs(name), AVG(age) FROM test GROUP BY abs(name). */
   @Test
   public void sql_group_by_function() {
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
-                ImmutableList
-                    .of(DSL
-                        .named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
-                ImmutableList.of(DSL.named("abs(long_value)",
-                    DSL.abs(DSL.ref("long_value", LONG))))),
+                ImmutableList.of(
+                    DSL.named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                ImmutableList.of(
+                    DSL.named("abs(long_value)", DSL.abs(DSL.ref("long_value", LONG))))),
             DSL.named("abs(long_value)", DSL.ref("abs(long_value)", LONG)),
             DSL.named("AVG(integer_value)", DSL.ref("AVG(integer_value)", DOUBLE))),
         AstDSL.project(
             AstDSL.agg(
                 AstDSL.relation("schema"),
-                ImmutableList.of(alias("AVG(integer_value)",
-                    aggregate("AVG", qualifiedName("integer_value")))),
+                ImmutableList.of(
+                    alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value")))),
                 emptyList(),
-                ImmutableList
-                    .of(alias("abs(long_value)", function("abs", qualifiedName("long_value")))),
+                ImmutableList.of(
+                    alias("abs(long_value)", function("abs", qualifiedName("long_value")))),
                 emptyList()),
             AstDSL.alias("abs(long_value)", function("abs", qualifiedName("long_value"))),
-            AstDSL.alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value"))))
-    );
+            AstDSL.alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value")))));
   }
 
-  /**
-   * SELECT abs(name), AVG(age) FROM test GROUP BY ABS(name).
-   */
+  /** SELECT abs(name), AVG(age) FROM test GROUP BY ABS(name). */
   @Test
   public void sql_group_by_function_in_uppercase() {
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
-                ImmutableList
-                    .of(DSL
-                        .named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
-                ImmutableList.of(DSL.named("ABS(long_value)",
-                    DSL.abs(DSL.ref("long_value", LONG))))),
+                ImmutableList.of(
+                    DSL.named("AVG(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                ImmutableList.of(
+                    DSL.named("ABS(long_value)", DSL.abs(DSL.ref("long_value", LONG))))),
             DSL.named("abs(long_value)", DSL.ref("ABS(long_value)", LONG)),
             DSL.named("AVG(integer_value)", DSL.ref("AVG(integer_value)", DOUBLE))),
         AstDSL.project(
             AstDSL.agg(
                 AstDSL.relation("schema"),
-                ImmutableList.of(alias("AVG(integer_value)",
-                    aggregate("AVG", qualifiedName("integer_value")))),
+                ImmutableList.of(
+                    alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value")))),
                 emptyList(),
-                ImmutableList
-                    .of(alias("ABS(long_value)", function("ABS", qualifiedName("long_value")))),
+                ImmutableList.of(
+                    alias("ABS(long_value)", function("ABS", qualifiedName("long_value")))),
                 emptyList()),
             AstDSL.alias("abs(long_value)", function("abs", qualifiedName("long_value"))),
-            AstDSL.alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value"))))
-    );
+            AstDSL.alias("AVG(integer_value)", aggregate("AVG", qualifiedName("integer_value")))));
   }
 
-  /**
-   * SELECT abs(name), abs(avg(age) FROM test GROUP BY abs(name).
-   */
+  /** SELECT abs(name), abs(avg(age) FROM test GROUP BY abs(name). */
   @Test
   public void sql_expression_over_one_aggregation() {
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
-                ImmutableList
-                    .of(DSL.named("avg(integer_value)",
-                        DSL.avg(DSL.ref("integer_value", INTEGER)))),
-                ImmutableList.of(DSL.named("abs(long_value)",
-                    DSL.abs(DSL.ref("long_value", LONG))))),
+                ImmutableList.of(
+                    DSL.named("avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                ImmutableList.of(
+                    DSL.named("abs(long_value)", DSL.abs(DSL.ref("long_value", LONG))))),
             DSL.named("abs(long_value)", DSL.ref("abs(long_value)", LONG)),
             DSL.named("abs(avg(integer_value)", DSL.abs(DSL.ref("avg(integer_value)", DOUBLE)))),
         AstDSL.project(
@@ -1355,34 +1204,32 @@ public void sql_expression_over_one_aggregation() {
                 ImmutableList.of(
                     alias("avg(integer_value)", aggregate("avg", qualifiedName("integer_value")))),
                 emptyList(),
-                ImmutableList
-                    .of(alias("abs(long_value)", function("abs", qualifiedName("long_value")))),
+                ImmutableList.of(
+                    alias("abs(long_value)", function("abs", qualifiedName("long_value")))),
                 emptyList()),
             AstDSL.alias("abs(long_value)", function("abs", qualifiedName("long_value"))),
-            AstDSL.alias("abs(avg(integer_value)",
-                function("abs", aggregate("avg", qualifiedName("integer_value")))))
-    );
+            AstDSL.alias(
+                "abs(avg(integer_value)",
+                function("abs", aggregate("avg", qualifiedName("integer_value"))))));
   }
 
-  /**
-   * SELECT abs(name), sum(age)-avg(age) FROM test GROUP BY abs(name).
-   */
+  /** SELECT abs(name), sum(age)-avg(age) FROM test GROUP BY abs(name). */
   @Test
   public void sql_expression_over_two_aggregation() {
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
-                ImmutableList
-                    .of(DSL.named("sum(integer_value)",
-                            DSL.sum(DSL.ref("integer_value", INTEGER))),
-                        DSL.named("avg(integer_value)",
-                            DSL.avg(DSL.ref("integer_value", INTEGER)))),
-                ImmutableList.of(DSL.named("abs(long_value)",
-                    DSL.abs(DSL.ref("long_value", LONG))))),
+                ImmutableList.of(
+                    DSL.named("sum(integer_value)", DSL.sum(DSL.ref("integer_value", INTEGER))),
+                    DSL.named("avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                ImmutableList.of(
+                    DSL.named("abs(long_value)", DSL.abs(DSL.ref("long_value", LONG))))),
             DSL.named("abs(long_value)", DSL.ref("abs(long_value)", LONG)),
-            DSL.named("sum(integer_value)-avg(integer_value)",
-                DSL.subtract(DSL.ref("sum(integer_value)", INTEGER),
+            DSL.named(
+                "sum(integer_value)-avg(integer_value)",
+                DSL.subtract(
+                    DSL.ref("sum(integer_value)", INTEGER),
                     DSL.ref("avg(integer_value)", DOUBLE)))),
         AstDSL.project(
             AstDSL.agg(
@@ -1391,40 +1238,33 @@ public void sql_expression_over_two_aggregation() {
                     alias("sum(integer_value)", aggregate("sum", qualifiedName("integer_value"))),
                     alias("avg(integer_value)", aggregate("avg", qualifiedName("integer_value")))),
                 emptyList(),
-                ImmutableList
-                    .of(alias("abs(long_value)", function("abs", qualifiedName("long_value")))),
+                ImmutableList.of(
+                    alias("abs(long_value)", function("abs", qualifiedName("long_value")))),
                 emptyList()),
             AstDSL.alias("abs(long_value)", function("abs", qualifiedName("long_value"))),
-            AstDSL.alias("sum(integer_value)-avg(integer_value)",
-                function("-", aggregate("sum", qualifiedName("integer_value")),
-                    aggregate("avg", qualifiedName("integer_value")))))
-    );
+            AstDSL.alias(
+                "sum(integer_value)-avg(integer_value)",
+                function(
+                    "-",
+                    aggregate("sum", qualifiedName("integer_value")),
+                    aggregate("avg", qualifiedName("integer_value"))))));
   }
 
   @Test
   public void limit_offset() {
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
-            LogicalPlanDSL.limit(
-                LogicalPlanDSL.relation("schema", table),
-                1, 1
-            ),
-            DSL.named("integer_value", DSL.ref("integer_value", INTEGER))
-        ),
+            LogicalPlanDSL.limit(LogicalPlanDSL.relation("schema", table), 1, 1),
+            DSL.named("integer_value", DSL.ref("integer_value", INTEGER))),
         AstDSL.project(
-            AstDSL.limit(
-                AstDSL.relation("schema"),
-                1, 1
-            ),
-            AstDSL.alias("integer_value", qualifiedName("integer_value"))
-        )
-    );
+            AstDSL.limit(AstDSL.relation("schema"), 1, 1),
+            AstDSL.alias("integer_value", qualifiedName("integer_value"))));
   }
 
   /**
-   * SELECT COUNT(NAME) FILTER(WHERE age > 1) FROM test.
-   * This test is to verify that the aggregator properties are taken
-   * when wrapping it to {@link org.opensearch.sql.expression.aggregation.NamedAggregator}
+   * SELECT COUNT(NAME) FILTER(WHERE age > 1) FROM test. This test is to verify that the aggregator
+   * properties are taken when wrapping it to {@link
+   * org.opensearch.sql.expression.aggregation.NamedAggregator}
    */
   @Test
   public void named_aggregator_with_condition() {
@@ -1433,36 +1273,37 @@ public void named_aggregator_with_condition() {
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
                 ImmutableList.of(
-                    DSL.named("count(string_value) filter(where integer_value > 1)",
-                        DSL.count(DSL.ref("string_value", STRING)).condition(DSL.greater(DSL.ref(
-                            "integer_value", INTEGER), DSL.literal(1))))
-                ),
-                emptyList()
-            ),
-            DSL.named("count(string_value) filter(where integer_value > 1)", DSL.ref(
-                "count(string_value) filter(where integer_value > 1)", INTEGER))
-        ),
+                    DSL.named(
+                        "count(string_value) filter(where integer_value > 1)",
+                        DSL.count(DSL.ref("string_value", STRING))
+                            .condition(
+                                DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))))),
+                emptyList()),
+            DSL.named(
+                "count(string_value) filter(where integer_value > 1)",
+                DSL.ref("count(string_value) filter(where integer_value > 1)", INTEGER))),
         AstDSL.project(
             AstDSL.agg(
                 AstDSL.relation("schema"),
                 ImmutableList.of(
-                    alias("count(string_value) filter(where integer_value > 1)", filteredAggregate(
-                        "count", qualifiedName("string_value"), function(
-                            ">", qualifiedName("integer_value"), intLiteral(1))))),
+                    alias(
+                        "count(string_value) filter(where integer_value > 1)",
+                        filteredAggregate(
+                            "count",
+                            qualifiedName("string_value"),
+                            function(">", qualifiedName("integer_value"), intLiteral(1))))),
                 emptyList(),
                 emptyList(),
-                emptyList()
-            ),
-            AstDSL.alias("count(string_value) filter(where integer_value > 1)", filteredAggregate(
-                "count", qualifiedName("string_value"), function(
-                    ">", qualifiedName("integer_value"), intLiteral(1))))
-        )
-    );
+                emptyList()),
+            AstDSL.alias(
+                "count(string_value) filter(where integer_value > 1)",
+                filteredAggregate(
+                    "count",
+                    qualifiedName("string_value"),
+                    function(">", qualifiedName("integer_value"), intLiteral(1))))));
   }
 
-  /**
-   * stats avg(integer_value) by string_value span(long_value, 10).
-   */
+  /** stats avg(integer_value) by string_value span(long_value, 10). */
   @Test
   public void ppl_stats_by_fieldAndSpan() {
     assertAnalyzeEqual(
@@ -1489,10 +1330,13 @@ public void parse_relation_with_grok_expression() {
         LogicalPlanDSL.project(
             LogicalPlanDSL.relation("schema", table),
             ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING))),
-            ImmutableList.of(DSL.named("grok_field",
-                DSL.grok(DSL.ref("string_value", STRING), DSL.literal("%{IPV4:grok_field}"),
-                    DSL.literal("grok_field"))))
-        ),
+            ImmutableList.of(
+                DSL.named(
+                    "grok_field",
+                    DSL.grok(
+                        DSL.ref("string_value", STRING),
+                        DSL.literal("%{IPV4:grok_field}"),
+                        DSL.literal("grok_field"))))),
         AstDSL.project(
             AstDSL.parse(
                 AstDSL.relation("schema"),
@@ -1500,8 +1344,7 @@ public void parse_relation_with_grok_expression() {
                 AstDSL.field("string_value"),
                 AstDSL.stringLiteral("%{IPV4:grok_field}"),
                 ImmutableMap.of()),
-            AstDSL.alias("string_value", qualifiedName("string_value"))
-        ));
+            AstDSL.alias("string_value", qualifiedName("string_value"))));
   }
 
   @Test
@@ -1510,10 +1353,13 @@ public void parse_relation_with_regex_expression() {
         LogicalPlanDSL.project(
             LogicalPlanDSL.relation("schema", table),
             ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING))),
-            ImmutableList.of(DSL.named("group",
-                DSL.regex(DSL.ref("string_value", STRING), DSL.literal("(?<group>.*)"),
-                    DSL.literal("group"))))
-        ),
+            ImmutableList.of(
+                DSL.named(
+                    "group",
+                    DSL.regex(
+                        DSL.ref("string_value", STRING),
+                        DSL.literal("(?<group>.*)"),
+                        DSL.literal("group"))))),
         AstDSL.project(
             AstDSL.parse(
                 AstDSL.relation("schema"),
@@ -1521,25 +1367,28 @@ public void parse_relation_with_regex_expression() {
                 AstDSL.field("string_value"),
                 AstDSL.stringLiteral("(?<group>.*)"),
                 ImmutableMap.of()),
-            AstDSL.alias("string_value", qualifiedName("string_value"))
-        ));
+            AstDSL.alias("string_value", qualifiedName("string_value"))));
   }
 
   @Test
   public void parse_relation_with_patterns_expression() {
-    Map<String, Literal> arguments = ImmutableMap.<String, Literal>builder()
-        .put("new_field", AstDSL.stringLiteral("custom_field"))
-        .put("pattern", AstDSL.stringLiteral("custom_pattern"))
-        .build();
+    Map<String, Literal> arguments =
+        ImmutableMap.<String, Literal>builder()
+            .put("new_field", AstDSL.stringLiteral("custom_field"))
+            .put("pattern", AstDSL.stringLiteral("custom_pattern"))
+            .build();
 
     assertAnalyzeEqual(
         LogicalPlanDSL.project(
             LogicalPlanDSL.relation("schema", table),
             ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING))),
-            ImmutableList.of(DSL.named("custom_field",
-                DSL.patterns(DSL.ref("string_value", STRING), DSL.literal("custom_pattern"),
-                    DSL.literal("custom_field"))))
-        ),
+            ImmutableList.of(
+                DSL.named(
+                    "custom_field",
+                    DSL.patterns(
+                        DSL.ref("string_value", STRING),
+                        DSL.literal("custom_pattern"),
+                        DSL.literal("custom_field"))))),
         AstDSL.project(
             AstDSL.parse(
                 AstDSL.relation("schema"),
@@ -1547,8 +1396,7 @@ public void parse_relation_with_patterns_expression() {
                 AstDSL.field("string_value"),
                 AstDSL.stringLiteral("custom_pattern"),
                 arguments),
-            AstDSL.alias("string_value", qualifiedName("string_value"))
-        ));
+            AstDSL.alias("string_value", qualifiedName("string_value"))));
   }
 
   @Test
@@ -1557,10 +1405,13 @@ public void parse_relation_with_patterns_expression_no_args() {
         LogicalPlanDSL.project(
             LogicalPlanDSL.relation("schema", table),
             ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING))),
-            ImmutableList.of(DSL.named("patterns_field",
-                DSL.patterns(DSL.ref("string_value", STRING), DSL.literal(""),
-                    DSL.literal("patterns_field"))))
-        ),
+            ImmutableList.of(
+                DSL.named(
+                    "patterns_field",
+                    DSL.patterns(
+                        DSL.ref("string_value", STRING),
+                        DSL.literal(""),
+                        DSL.literal("patterns_field"))))),
         AstDSL.project(
             AstDSL.parse(
                 AstDSL.relation("schema"),
@@ -1568,89 +1419,109 @@ public void parse_relation_with_patterns_expression_no_args() {
                 AstDSL.field("string_value"),
                 AstDSL.stringLiteral(""),
                 ImmutableMap.of()),
-            AstDSL.alias("string_value", qualifiedName("string_value"))
-        ));
+            AstDSL.alias("string_value", qualifiedName("string_value"))));
   }
 
   @Test
   public void kmeanns_relation() {
-    Map<String, Literal> argumentMap = new HashMap<String, Literal>() {{
-        put("centroids", new Literal(3, DataType.INTEGER));
-        put("iterations", new Literal(2, DataType.INTEGER));
-        put("distance_type", new Literal("COSINE", DataType.STRING));
-      }};
+    Map<String, Literal> argumentMap =
+        new HashMap<String, Literal>() {
+          {
+            put("centroids", new Literal(3, DataType.INTEGER));
+            put("iterations", new Literal(2, DataType.INTEGER));
+            put("distance_type", new Literal("COSINE", DataType.STRING));
+          }
+        };
     assertAnalyzeEqual(
-        new LogicalMLCommons(LogicalPlanDSL.relation("schema", table),
-            "kmeans", argumentMap),
-        new Kmeans(AstDSL.relation("schema"), argumentMap)
-    );
+        new LogicalMLCommons(LogicalPlanDSL.relation("schema", table), "kmeans", argumentMap),
+        new Kmeans(AstDSL.relation("schema"), argumentMap));
   }
 
   @Test
   public void ad_batchRCF_relation() {
     Map<String, Literal> argumentMap =
-        new HashMap<String, Literal>() {{
+        new HashMap<String, Literal>() {
+          {
             put("shingle_size", new Literal(8, DataType.INTEGER));
-          }};
+          }
+        };
     assertAnalyzeEqual(
         new LogicalAD(LogicalPlanDSL.relation("schema", table), argumentMap),
-        new AD(AstDSL.relation("schema"), argumentMap)
-    );
+        new AD(AstDSL.relation("schema"), argumentMap));
   }
 
   @Test
   public void ad_fitRCF_relation() {
-    Map<String, Literal> argumentMap = new HashMap<String, Literal>() {{
-        put("shingle_size", new Literal(8, DataType.INTEGER));
-        put("time_decay", new Literal(0.0001, DataType.DOUBLE));
-        put("time_field", new Literal("timestamp", DataType.STRING));
-      }};
+    Map<String, Literal> argumentMap =
+        new HashMap<String, Literal>() {
+          {
+            put("shingle_size", new Literal(8, DataType.INTEGER));
+            put("time_decay", new Literal(0.0001, DataType.DOUBLE));
+            put("time_field", new Literal("timestamp", DataType.STRING));
+          }
+        };
     assertAnalyzeEqual(
-        new LogicalAD(LogicalPlanDSL.relation("schema", table),
-            argumentMap),
-        new AD(AstDSL.relation("schema"), argumentMap)
-    );
+        new LogicalAD(LogicalPlanDSL.relation("schema", table), argumentMap),
+        new AD(AstDSL.relation("schema"), argumentMap));
   }
 
   @Test
   public void ad_fitRCF_relation_with_time_field() {
-    Map<String, Literal> argumentMap = new HashMap<String, Literal>() {{
-        put("shingle_size", new Literal(8, DataType.INTEGER));
-        put("time_decay", new Literal(0.0001, DataType.DOUBLE));
-        put("time_field", new Literal("ts", DataType.STRING));
-      }};
-
-    LogicalPlan actual = analyze(AstDSL.project(
-            new AD(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    Map<String, Literal> argumentMap =
+        new HashMap<String, Literal>() {
+          {
+            put("shingle_size", new Literal(8, DataType.INTEGER));
+            put("time_decay", new Literal(0.0001, DataType.DOUBLE));
+            put("time_field", new Literal("ts", DataType.STRING));
+          }
+        };
+
+    LogicalPlan actual =
+        analyze(AstDSL.project(new AD(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 3);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named("score", DSL.ref("score", DOUBLE))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named("anomaly_grade", DSL.ref("anomaly_grade", DOUBLE))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named("ts", DSL.ref("ts", TIMESTAMP))));
   }
 
   @Test
   public void ad_fitRCF_relation_without_time_field() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put("shingle_size", new Literal(8, DataType.INTEGER));
-        put("time_decay", new Literal(0.0001, DataType.DOUBLE));
-      }};
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put("shingle_size", new Literal(8, DataType.INTEGER));
+            put("time_decay", new Literal(0.0001, DataType.DOUBLE));
+          }
+        };
 
-    LogicalPlan actual = analyze(AstDSL.project(
-            new AD(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    LogicalPlan actual =
+        analyze(AstDSL.project(new AD(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 2);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named("score", DSL.ref("score", DOUBLE))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named("anomalous", DSL.ref("anomalous", BOOLEAN))));
   }
 
   @Test
   public void table_function() {
-    assertAnalyzeEqual(new LogicalRelation("query_range", table),
-        AstDSL.tableFunction(List.of("prometheus", "query_range"),
+    assertAnalyzeEqual(
+        new LogicalRelation("query_range", table),
+        AstDSL.tableFunction(
+            List.of("prometheus", "query_range"),
             unresolvedArg("query", stringLiteral("http_latency")),
             unresolvedArg("starttime", intLiteral(12345)),
             unresolvedArg("endtime", intLiteral(12345)),
@@ -1659,158 +1530,214 @@ public void table_function() {
 
   @Test
   public void table_function_with_no_datasource() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> analyze(AstDSL.tableFunction(List.of("query_range"),
-            unresolvedArg("query", stringLiteral("http_latency")),
-            unresolvedArg("", intLiteral(12345)),
-            unresolvedArg("", intLiteral(12345)),
-            unresolvedArg(null, intLiteral(14)))));
-    assertEquals("unsupported function name: query_range",
-        exception.getMessage());
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () ->
+                analyze(
+                    AstDSL.tableFunction(
+                        List.of("query_range"),
+                        unresolvedArg("query", stringLiteral("http_latency")),
+                        unresolvedArg("", intLiteral(12345)),
+                        unresolvedArg("", intLiteral(12345)),
+                        unresolvedArg(null, intLiteral(14)))));
+    assertEquals("unsupported function name: query_range", exception.getMessage());
   }
 
   @Test
   public void table_function_with_wrong_datasource() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> analyze(AstDSL.tableFunction(Arrays.asList("prome", "query_range"),
-            unresolvedArg("query", stringLiteral("http_latency")),
-            unresolvedArg("", intLiteral(12345)),
-            unresolvedArg("", intLiteral(12345)),
-            unresolvedArg(null, intLiteral(14)))));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () ->
+                analyze(
+                    AstDSL.tableFunction(
+                        Arrays.asList("prome", "query_range"),
+                        unresolvedArg("query", stringLiteral("http_latency")),
+                        unresolvedArg("", intLiteral(12345)),
+                        unresolvedArg("", intLiteral(12345)),
+                        unresolvedArg(null, intLiteral(14)))));
     assertEquals("unsupported function name: prome.query_range", exception.getMessage());
   }
 
   @Test
   public void table_function_with_wrong_table_function() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> analyze(AstDSL.tableFunction(Arrays.asList("prometheus", "queryrange"),
-            unresolvedArg("query", stringLiteral("http_latency")),
-            unresolvedArg("", intLiteral(12345)),
-            unresolvedArg("", intLiteral(12345)),
-            unresolvedArg(null, intLiteral(14)))));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () ->
+                analyze(
+                    AstDSL.tableFunction(
+                        Arrays.asList("prometheus", "queryrange"),
+                        unresolvedArg("query", stringLiteral("http_latency")),
+                        unresolvedArg("", intLiteral(12345)),
+                        unresolvedArg("", intLiteral(12345)),
+                        unresolvedArg(null, intLiteral(14)))));
     assertEquals("unsupported function name: queryrange", exception.getMessage());
   }
 
   @Test
   public void show_datasources() {
-    assertAnalyzeEqual(new LogicalRelation(DATASOURCES_TABLE_NAME,
-            new DataSourceTable(dataSourceService)),
+    assertAnalyzeEqual(
+        new LogicalRelation(DATASOURCES_TABLE_NAME, new DataSourceTable(dataSourceService)),
         AstDSL.relation(qualifiedName(DATASOURCES_TABLE_NAME)));
   }
 
   @Test
   public void ml_relation_unsupported_action() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal("unsupported", DataType.STRING));
-        put(ALGO, new Literal(KMEANS, DataType.STRING));
-      }};
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal("unsupported", DataType.STRING));
+            put(ALGO, new Literal(KMEANS, DataType.STRING));
+          }
+        };
 
     IllegalArgumentException exception =
-            assertThrows(
-                    IllegalArgumentException.class,
-                    () -> analyze(AstDSL.project(
-                            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields())));
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                analyze(
+                    AstDSL.project(
+                        new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields())));
     assertEquals(
-            "Action error. Please indicate train, predict or trainandpredict.",
-            exception.getMessage());
+        "Action error. Please indicate train, predict or trainandpredict.", exception.getMessage());
   }
 
   @Test
   public void ml_relation_unsupported_algorithm() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal(PREDICT, DataType.STRING));
-        put(ALGO, new Literal("unsupported", DataType.STRING));
-      }};
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal(PREDICT, DataType.STRING));
+            put(ALGO, new Literal("unsupported", DataType.STRING));
+          }
+        };
 
     IllegalArgumentException exception =
-            assertThrows(
-                    IllegalArgumentException.class,
-                    () -> analyze(AstDSL.project(
-                            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields())));
-    assertEquals(
-            "Unsupported algorithm: unsupported",
-            exception.getMessage());
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                analyze(
+                    AstDSL.project(
+                        new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields())));
+    assertEquals("Unsupported algorithm: unsupported", exception.getMessage());
   }
 
   @Test
   public void ml_relation_train_sync() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal(TRAIN, DataType.STRING));
-        put(ALGO, new Literal(KMEANS, DataType.STRING));
-      }};
-
-    LogicalPlan actual = analyze(AstDSL.project(
-            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal(TRAIN, DataType.STRING));
+            put(ALGO, new Literal(KMEANS, DataType.STRING));
+          }
+        };
+
+    LogicalPlan actual =
+        analyze(AstDSL.project(new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 2);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(STATUS, DSL.ref(STATUS, STRING))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(MODELID, DSL.ref(MODELID, STRING))));
   }
 
   @Test
   public void ml_relation_train_async() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal(TRAIN, DataType.STRING));
-        put(ALGO, new Literal(KMEANS, DataType.STRING));
-        put(ASYNC, new Literal(true, DataType.BOOLEAN));
-      }};
-
-    LogicalPlan actual = analyze(AstDSL.project(
-            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal(TRAIN, DataType.STRING));
+            put(ALGO, new Literal(KMEANS, DataType.STRING));
+            put(ASYNC, new Literal(true, DataType.BOOLEAN));
+          }
+        };
+
+    LogicalPlan actual =
+        analyze(AstDSL.project(new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 2);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(STATUS, DSL.ref(STATUS, STRING))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(TASKID, DSL.ref(TASKID, STRING))));
   }
 
   @Test
   public void ml_relation_predict_kmeans() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal(PREDICT, DataType.STRING));
-        put(ALGO, new Literal(KMEANS, DataType.STRING));
-      }};
-
-    LogicalPlan actual = analyze(AstDSL.project(
-            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal(PREDICT, DataType.STRING));
+            put(ALGO, new Literal(KMEANS, DataType.STRING));
+          }
+        };
+
+    LogicalPlan actual =
+        analyze(AstDSL.project(new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 1);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(CLUSTERID, DSL.ref(CLUSTERID, INTEGER))));
   }
 
   @Test
   public void ml_relation_predict_rcf_with_time_field() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal(PREDICT, DataType.STRING));
-        put(ALGO, new Literal(RCF, DataType.STRING));
-        put(RCF_TIME_FIELD, new Literal("ts", DataType.STRING));
-      }};
-
-    LogicalPlan actual = analyze(AstDSL.project(
-            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal(PREDICT, DataType.STRING));
+            put(ALGO, new Literal(RCF, DataType.STRING));
+            put(RCF_TIME_FIELD, new Literal("ts", DataType.STRING));
+          }
+        };
+
+    LogicalPlan actual =
+        analyze(AstDSL.project(new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 3);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(RCF_SCORE, DSL.ref(RCF_SCORE, DOUBLE))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(RCF_ANOMALY_GRADE, DSL.ref(RCF_ANOMALY_GRADE, DOUBLE))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named("ts", DSL.ref("ts", TIMESTAMP))));
   }
 
   @Test
   public void ml_relation_predict_rcf_without_time_field() {
-    Map<String, Literal> argumentMap = new HashMap<>() {{
-        put(ACTION, new Literal(PREDICT, DataType.STRING));
-        put(ALGO, new Literal(RCF, DataType.STRING));
-      }};
-
-    LogicalPlan actual = analyze(AstDSL.project(
-            new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
+    Map<String, Literal> argumentMap =
+        new HashMap<>() {
+          {
+            put(ACTION, new Literal(PREDICT, DataType.STRING));
+            put(ALGO, new Literal(RCF, DataType.STRING));
+          }
+        };
+
+    LogicalPlan actual =
+        analyze(AstDSL.project(new ML(AstDSL.relation("schema"), argumentMap), AstDSL.allFields()));
     assertTrue(((LogicalProject) actual).getProjectList().size() >= 2);
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(RCF_SCORE, DSL.ref(RCF_SCORE, DOUBLE))));
-    assertTrue(((LogicalProject) actual).getProjectList()
+    assertTrue(
+        ((LogicalProject) actual)
+            .getProjectList()
             .contains(DSL.named(RCF_ANOMALOUS, DSL.ref(RCF_ANOMALOUS, BOOLEAN))));
   }
 
@@ -1825,8 +1752,10 @@ public void visit_paginate() {
   void visit_cursor() {
     LogicalPlan actual = analyze((new FetchCursor("test")));
     assertTrue(actual instanceof LogicalFetchCursor);
-    assertEquals(new LogicalFetchCursor("test",
-        dataSourceService.getDataSource("@opensearch").getStorageEngine()), actual);
+    assertEquals(
+        new LogicalFetchCursor(
+            "test", dataSourceService.getDataSource("@opensearch").getStorageEngine()),
+        actual);
   }
 
   @Test
@@ -1835,7 +1764,7 @@ public void visit_close_cursor() {
     assertAll(
         () -> assertTrue(analyzed instanceof LogicalCloseCursor),
         () -> assertTrue(analyzed.getChild().get(0) instanceof LogicalFetchCursor),
-        () -> assertEquals("pewpew", ((LogicalFetchCursor) analyzed.getChild().get(0)).getCursor())
-    );
+        () ->
+            assertEquals("pewpew", ((LogicalFetchCursor) analyzed.getChild().get(0)).getCursor()));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java b/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java
index b6e2600041..f09bc5d380 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -47,7 +46,6 @@
 import org.opensearch.sql.storage.StorageEngine;
 import org.opensearch.sql.storage.Table;
 
-
 public class AnalyzerTestBase {
 
   protected Map<String, ExprType> typeMapping() {
@@ -92,31 +90,34 @@ public Table getTable(DataSourceSchemaName dataSourceSchemaName, String tableNam
   }
 
   protected Table table() {
-    return Optional.ofNullable(table).orElseGet(() -> new Table() {
-      @Override
-      public boolean exists() {
-        return true;
-      }
-
-      @Override
-      public void create(Map<String, ExprType> schema) {
-        throw new UnsupportedOperationException("Create table is not supported");
-      }
-
-      @Override
-      public Map<String, ExprType> getFieldTypes() {
-        return typeMapping();
-      }
-
-      @Override
-      public PhysicalPlan implement(LogicalPlan plan) {
-        throw new UnsupportedOperationException();
-      }
-
-      public Map<String, ExprType> getReservedFieldTypes() {
-        return ImmutableMap.of("_test", STRING);
-      }
-    });
+    return Optional.ofNullable(table)
+        .orElseGet(
+            () ->
+                new Table() {
+                  @Override
+                  public boolean exists() {
+                    return true;
+                  }
+
+                  @Override
+                  public void create(Map<String, ExprType> schema) {
+                    throw new UnsupportedOperationException("Create table is not supported");
+                  }
+
+                  @Override
+                  public Map<String, ExprType> getFieldTypes() {
+                    return typeMapping();
+                  }
+
+                  @Override
+                  public PhysicalPlan implement(LogicalPlan plan) {
+                    throw new UnsupportedOperationException();
+                  }
+
+                  public Map<String, ExprType> getReservedFieldTypes() {
+                    return ImmutableMap.of("_test", STRING);
+                  }
+                });
   }
 
   protected DataSourceService dataSourceService() {
@@ -125,10 +126,12 @@ protected DataSourceService dataSourceService() {
 
   protected SymbolTable symbolTable() {
     SymbolTable symbolTable = new SymbolTable();
-    typeMapping().entrySet()
+    typeMapping()
+        .entrySet()
         .forEach(
-            entry -> symbolTable
-                .store(new Symbol(Namespace.FIELD_NAME, entry.getKey()), entry.getValue()));
+            entry ->
+                symbolTable.store(
+                    new Symbol(Namespace.FIELD_NAME, entry.getKey()), entry.getValue()));
     return symbolTable;
   }
 
@@ -154,8 +157,8 @@ protected Environment<Expression, ExprType> typeEnv() {
 
   protected Analyzer analyzer = analyzer(expressionAnalyzer(), dataSourceService);
 
-  protected Analyzer analyzer(ExpressionAnalyzer expressionAnalyzer,
-                      DataSourceService dataSourceService) {
+  protected Analyzer analyzer(
+      ExpressionAnalyzer expressionAnalyzer, DataSourceService dataSourceService) {
     BuiltinFunctionRepository functionRepository = BuiltinFunctionRepository.getInstance();
     return new Analyzer(expressionAnalyzer, dataSourceService, functionRepository);
   }
@@ -182,18 +185,22 @@ protected LogicalPlan analyze(UnresolvedPlan unresolvedPlan) {
 
   private class DefaultDataSourceService implements DataSourceService {
 
-    private final DataSource opensearchDataSource = new DataSource(DEFAULT_DATASOURCE_NAME,
-        DataSourceType.OPENSEARCH, storageEngine());
-    private final DataSource prometheusDataSource
-        = new DataSource("prometheus", DataSourceType.PROMETHEUS, prometheusStorageEngine());
-
+    private final DataSource opensearchDataSource =
+        new DataSource(DEFAULT_DATASOURCE_NAME, DataSourceType.OPENSEARCH, storageEngine());
+    private final DataSource prometheusDataSource =
+        new DataSource("prometheus", DataSourceType.PROMETHEUS, prometheusStorageEngine());
 
     @Override
     public Set<DataSourceMetadata> getDataSourceMetadata(boolean isDefaultDataSourceRequired) {
       return Stream.of(opensearchDataSource, prometheusDataSource)
-          .map(ds -> new DataSourceMetadata(ds.getName(),
-              ds.getConnectorType(),Collections.emptyList(),
-              ImmutableMap.of())).collect(Collectors.toSet());
+          .map(
+              ds ->
+                  new DataSourceMetadata(
+                      ds.getName(),
+                      ds.getConnectorType(),
+                      Collections.emptyList(),
+                      ImmutableMap.of()))
+          .collect(Collectors.toSet());
     }
 
     @Override
@@ -216,18 +223,14 @@ public DataSource getDataSource(String dataSourceName) {
     }
 
     @Override
-    public void updateDataSource(DataSourceMetadata dataSourceMetadata) {
-
-    }
+    public void updateDataSource(DataSourceMetadata dataSourceMetadata) {}
 
     @Override
-    public void deleteDataSource(String dataSourceName) {
-    }
+    public void deleteDataSource(String dataSourceName) {}
 
     @Override
     public Boolean dataSourceExists(String dataSourceName) {
-      return dataSourceName.equals(DEFAULT_DATASOURCE_NAME)
-          || dataSourceName.equals("prometheus");
+      return dataSourceName.equals(DEFAULT_DATASOURCE_NAME) || dataSourceName.equals("prometheus");
     }
   }
 
@@ -239,8 +242,8 @@ private class TestTableFunctionImplementation implements TableFunctionImplementa
 
     private Table table;
 
-    public TestTableFunctionImplementation(FunctionName functionName, List<Expression> arguments,
-                                           Table table) {
+    public TestTableFunctionImplementation(
+        FunctionName functionName, List<Expression> arguments, Table table) {
       this.functionName = functionName;
       this.arguments = arguments;
       this.table = table;
diff --git a/core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
index 5a05c79132..9d30ebeaab 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static java.util.Collections.emptyList;
@@ -57,64 +56,50 @@ class ExpressionAnalyzerTest extends AnalyzerTestBase {
   public void equal() {
     assertAnalyzeEqual(
         DSL.equal(DSL.ref("integer_value", INTEGER), DSL.literal(integerValue(1))),
-        AstDSL.equalTo(AstDSL.unresolvedAttr("integer_value"), AstDSL.intLiteral(1))
-    );
+        AstDSL.equalTo(AstDSL.unresolvedAttr("integer_value"), AstDSL.intLiteral(1)));
   }
 
   @Test
   public void and() {
     assertAnalyzeEqual(
         DSL.and(DSL.ref("boolean_value", BOOLEAN), DSL.literal(LITERAL_TRUE)),
-        AstDSL.and(AstDSL.unresolvedAttr("boolean_value"), AstDSL.booleanLiteral(true))
-    );
+        AstDSL.and(AstDSL.unresolvedAttr("boolean_value"), AstDSL.booleanLiteral(true)));
   }
 
   @Test
   public void or() {
     assertAnalyzeEqual(
         DSL.or(DSL.ref("boolean_value", BOOLEAN), DSL.literal(LITERAL_TRUE)),
-        AstDSL.or(AstDSL.unresolvedAttr("boolean_value"), AstDSL.booleanLiteral(true))
-    );
+        AstDSL.or(AstDSL.unresolvedAttr("boolean_value"), AstDSL.booleanLiteral(true)));
   }
 
   @Test
   public void xor() {
     assertAnalyzeEqual(
         DSL.xor(DSL.ref("boolean_value", BOOLEAN), DSL.literal(LITERAL_TRUE)),
-        AstDSL.xor(AstDSL.unresolvedAttr("boolean_value"), AstDSL.booleanLiteral(true))
-    );
+        AstDSL.xor(AstDSL.unresolvedAttr("boolean_value"), AstDSL.booleanLiteral(true)));
   }
 
   @Test
   public void not() {
     assertAnalyzeEqual(
         DSL.not(DSL.ref("boolean_value", BOOLEAN)),
-        AstDSL.not(AstDSL.unresolvedAttr("boolean_value"))
-    );
+        AstDSL.not(AstDSL.unresolvedAttr("boolean_value")));
   }
 
   @Test
   public void qualified_name() {
-    assertAnalyzeEqual(
-        DSL.ref("integer_value", INTEGER),
-        qualifiedName("integer_value")
-    );
+    assertAnalyzeEqual(DSL.ref("integer_value", INTEGER), qualifiedName("integer_value"));
   }
 
   @Test
   public void between() {
     assertAnalyzeEqual(
         DSL.and(
-            DSL.gte(
-                DSL.ref("integer_value", INTEGER),
-                DSL.literal(20)),
-            DSL.lte(
-                DSL.ref("integer_value", INTEGER),
-                DSL.literal(30))),
+            DSL.gte(DSL.ref("integer_value", INTEGER), DSL.literal(20)),
+            DSL.lte(DSL.ref("integer_value", INTEGER), DSL.literal(30))),
         AstDSL.between(
-            qualifiedName("integer_value"),
-            AstDSL.intLiteral(20),
-            AstDSL.intLiteral(30)));
+            qualifiedName("integer_value"), AstDSL.intLiteral(20), AstDSL.intLiteral(30)));
   }
 
   @Test
@@ -149,36 +134,38 @@ public void case_conditions() {
         AstDSL.caseWhen(
             null,
             AstDSL.when(
-                AstDSL.function(">",
-                    qualifiedName("integer_value"),
-                    AstDSL.intLiteral(50)), AstDSL.stringLiteral("Fifty")),
+                AstDSL.function(">", qualifiedName("integer_value"), AstDSL.intLiteral(50)),
+                AstDSL.stringLiteral("Fifty")),
             AstDSL.when(
-                AstDSL.function(">",
-                    qualifiedName("integer_value"),
-                    AstDSL.intLiteral(30)), AstDSL.stringLiteral("Thirty"))));
+                AstDSL.function(">", qualifiedName("integer_value"), AstDSL.intLiteral(30)),
+                AstDSL.stringLiteral("Thirty"))));
   }
 
   @Test
   public void castAnalyzer() {
     assertAnalyzeEqual(
         DSL.castInt(DSL.ref("boolean_value", BOOLEAN)),
-        AstDSL.cast(AstDSL.unresolvedAttr("boolean_value"), AstDSL.stringLiteral("INT"))
-    );
+        AstDSL.cast(AstDSL.unresolvedAttr("boolean_value"), AstDSL.stringLiteral("INT")));
 
-    assertThrows(IllegalStateException.class, () -> analyze(AstDSL.cast(AstDSL.unresolvedAttr(
-        "boolean_value"), AstDSL.stringLiteral("INTERVAL"))));
+    assertThrows(
+        IllegalStateException.class,
+        () ->
+            analyze(
+                AstDSL.cast(
+                    AstDSL.unresolvedAttr("boolean_value"), AstDSL.stringLiteral("INTERVAL"))));
   }
 
   @Test
   public void case_with_default_result_type_different() {
-    UnresolvedExpression caseWhen = AstDSL.caseWhen(
-        qualifiedName("integer_value"),
-        AstDSL.intLiteral(60),
-        AstDSL.when(AstDSL.intLiteral(30), AstDSL.stringLiteral("Thirty")),
-        AstDSL.when(AstDSL.intLiteral(50), AstDSL.stringLiteral("Fifty")));
-
-    SemanticCheckException exception = assertThrows(
-        SemanticCheckException.class, () -> analyze(caseWhen));
+    UnresolvedExpression caseWhen =
+        AstDSL.caseWhen(
+            qualifiedName("integer_value"),
+            AstDSL.intLiteral(60),
+            AstDSL.when(AstDSL.intLiteral(30), AstDSL.stringLiteral("Thirty")),
+            AstDSL.when(AstDSL.intLiteral(50), AstDSL.stringLiteral("Fifty")));
+
+    SemanticCheckException exception =
+        assertThrows(SemanticCheckException.class, () -> analyze(caseWhen));
     assertEquals(
         "All result types of CASE clause must be the same, but found [STRING, STRING, INTEGER]",
         exception.getMessage());
@@ -187,8 +174,7 @@ public void case_with_default_result_type_different() {
   @Test
   public void scalar_window_function() {
     assertAnalyzeEqual(
-        DSL.rank(),
-        AstDSL.window(AstDSL.function("rank"), emptyList(), emptyList()));
+        DSL.rank(), AstDSL.window(AstDSL.function("rank"), emptyList(), emptyList()));
   }
 
   @SuppressWarnings("unchecked")
@@ -197,9 +183,7 @@ public void aggregate_window_function() {
     assertAnalyzeEqual(
         new AggregateWindowFunction(DSL.avg(DSL.ref("integer_value", INTEGER))),
         AstDSL.window(
-            AstDSL.aggregate("avg", qualifiedName("integer_value")),
-            emptyList(),
-            emptyList()));
+            AstDSL.aggregate("avg", qualifiedName("integer_value")), emptyList(), emptyList()));
   }
 
   @Test
@@ -207,26 +191,24 @@ public void qualified_name_with_qualifier() {
     analysisContext.push();
     analysisContext.peek().define(new Symbol(Namespace.INDEX_NAME, "index_alias"), STRUCT);
     assertAnalyzeEqual(
-        DSL.ref("integer_value", INTEGER),
-        qualifiedName("index_alias", "integer_value")
-    );
+        DSL.ref("integer_value", INTEGER), qualifiedName("index_alias", "integer_value"));
 
     analysisContext.peek().define(new Symbol(Namespace.FIELD_NAME, "object_field"), STRUCT);
-    analysisContext.peek().define(new Symbol(Namespace.FIELD_NAME, "object_field.integer_value"),
-        INTEGER);
+    analysisContext
+        .peek()
+        .define(new Symbol(Namespace.FIELD_NAME, "object_field.integer_value"), INTEGER);
     assertAnalyzeEqual(
         DSL.ref("object_field.integer_value", INTEGER),
-        qualifiedName("object_field", "integer_value")
-    );
+        qualifiedName("object_field", "integer_value"));
 
     SyntaxCheckException exception =
-        assertThrows(SyntaxCheckException.class,
+        assertThrows(
+            SyntaxCheckException.class,
             () -> analyze(qualifiedName("nested_field", "integer_value")));
     assertEquals(
         "The qualifier [nested_field] of qualified name [nested_field.integer_value] "
             + "must be an field name, index name or its alias",
-        exception.getMessage()
-    );
+        exception.getMessage());
     analysisContext.pop();
   }
 
@@ -237,21 +219,12 @@ public void qualified_name_with_reserved_symbol() {
     analysisContext.peek().addReservedWord(new Symbol(Namespace.FIELD_NAME, "_reserved"), STRING);
     analysisContext.peek().addReservedWord(new Symbol(Namespace.FIELD_NAME, "_priority"), FLOAT);
     analysisContext.peek().define(new Symbol(Namespace.INDEX_NAME, "index_alias"), STRUCT);
-    assertAnalyzeEqual(
-        DSL.ref("_priority", FLOAT),
-        qualifiedName("_priority")
-    );
-    assertAnalyzeEqual(
-        DSL.ref("_reserved", STRING),
-        qualifiedName("index_alias", "_reserved")
-    );
+    assertAnalyzeEqual(DSL.ref("_priority", FLOAT), qualifiedName("_priority"));
+    assertAnalyzeEqual(DSL.ref("_reserved", STRING), qualifiedName("index_alias", "_reserved"));
 
     // reserved fields take priority over symbol table
     analysisContext.peek().define(new Symbol(Namespace.FIELD_NAME, "_reserved"), LONG);
-    assertAnalyzeEqual(
-        DSL.ref("_reserved", STRING),
-        qualifiedName("index_alias", "_reserved")
-    );
+    assertAnalyzeEqual(DSL.ref("_reserved", STRING), qualifiedName("index_alias", "_reserved"));
 
     analysisContext.pop();
   }
@@ -265,9 +238,7 @@ public void interval() {
 
   @Test
   public void all_fields() {
-    assertAnalyzeEqual(
-        DSL.literal("*"),
-        AllFields.of());
+    assertAnalyzeEqual(DSL.literal("*"), AllFields.of());
   }
 
   @Test
@@ -281,25 +252,30 @@ public void case_clause() {
         AstDSL.caseWhen(
             AstDSL.nullLiteral(),
             AstDSL.when(
-                AstDSL.function("=",
-                    qualifiedName("integer_value"),
-                    AstDSL.intLiteral(30)),
+                AstDSL.function("=", qualifiedName("integer_value"), AstDSL.intLiteral(30)),
                 AstDSL.stringLiteral("test"))));
   }
 
   @Test
   public void undefined_var_semantic_check_failed() {
-    SemanticCheckException exception = assertThrows(SemanticCheckException.class,
-        () -> analyze(
-            AstDSL.and(AstDSL.unresolvedAttr("undefined_field"), AstDSL.booleanLiteral(true))));
-    assertEquals("can't resolve Symbol(namespace=FIELD_NAME, name=undefined_field) in type env",
+    SemanticCheckException exception =
+        assertThrows(
+            SemanticCheckException.class,
+            () ->
+                analyze(
+                    AstDSL.and(
+                        AstDSL.unresolvedAttr("undefined_field"), AstDSL.booleanLiteral(true))));
+    assertEquals(
+        "can't resolve Symbol(namespace=FIELD_NAME, name=undefined_field) in type env",
         exception.getMessage());
   }
 
   @Test
   public void undefined_aggregation_function() {
-    SemanticCheckException exception = assertThrows(SemanticCheckException.class,
-        () -> analyze(AstDSL.aggregate("ESTDC_ERROR", field("integer_value"))));
+    SemanticCheckException exception =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> analyze(AstDSL.aggregate("ESTDC_ERROR", field("integer_value"))));
     assertEquals("Unsupported aggregation function ESTDC_ERROR", exception.getMessage());
   }
 
@@ -308,25 +284,24 @@ public void aggregation_filter() {
     assertAnalyzeEqual(
         DSL.avg(DSL.ref("integer_value", INTEGER))
             .condition(DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))),
-        AstDSL.filteredAggregate("avg", qualifiedName("integer_value"),
-            function(">", qualifiedName("integer_value"), intLiteral(1)))
-    );
+        AstDSL.filteredAggregate(
+            "avg",
+            qualifiedName("integer_value"),
+            function(">", qualifiedName("integer_value"), intLiteral(1))));
   }
 
   @Test
   public void variance_mapto_varPop() {
     assertAnalyzeEqual(
         DSL.varPop(DSL.ref("integer_value", INTEGER)),
-        AstDSL.aggregate("variance", qualifiedName("integer_value"))
-    );
+        AstDSL.aggregate("variance", qualifiedName("integer_value")));
   }
 
   @Test
   public void distinct_count() {
     assertAnalyzeEqual(
         DSL.distinctCount(DSL.ref("integer_value", INTEGER)),
-        AstDSL.distinctAggregate("count", qualifiedName("integer_value"))
-    );
+        AstDSL.distinctAggregate("count", qualifiedName("integer_value")));
   }
 
   @Test
@@ -334,48 +309,49 @@ public void filtered_distinct_count() {
     assertAnalyzeEqual(
         DSL.distinctCount(DSL.ref("integer_value", INTEGER))
             .condition(DSL.greater(DSL.ref("integer_value", INTEGER), DSL.literal(1))),
-        AstDSL.filteredDistinctCount("count", qualifiedName("integer_value"), function(
-            ">", qualifiedName("integer_value"), intLiteral(1)))
-    );
+        AstDSL.filteredDistinctCount(
+            "count",
+            qualifiedName("integer_value"),
+            function(">", qualifiedName("integer_value"), intLiteral(1))));
   }
 
   @Test
   public void take_aggregation() {
     assertAnalyzeEqual(
         DSL.take(DSL.ref("string_value", STRING), DSL.literal(10)),
-        AstDSL.aggregate("take", qualifiedName("string_value"), intLiteral(10))
-    );
+        AstDSL.aggregate("take", qualifiedName("string_value"), intLiteral(10)));
   }
 
   @Test
   public void named_argument() {
     assertAnalyzeEqual(
         DSL.namedArgument("arg_name", DSL.literal("query")),
-        AstDSL.unresolvedArg("arg_name", stringLiteral("query"))
-    );
+        AstDSL.unresolvedArg("arg_name", stringLiteral("query")));
   }
 
   @Test
   public void named_parse_expression() {
     analysisContext.push();
     analysisContext.peek().define(new Symbol(Namespace.FIELD_NAME, "string_field"), STRING);
-    analysisContext.getNamedParseExpressions()
-        .add(DSL.named("group",
-            DSL.regex(ref("string_field", STRING), DSL.literal("(?<group>\\d+)"),
-            DSL.literal("group"))));
+    analysisContext
+        .getNamedParseExpressions()
+        .add(
+            DSL.named(
+                "group",
+                DSL.regex(
+                    ref("string_field", STRING),
+                    DSL.literal("(?<group>\\d+)"),
+                    DSL.literal("group"))));
     assertAnalyzeEqual(
-        DSL.regex(ref("string_field", STRING), DSL.literal("(?<group>\\d+)"),
-            DSL.literal("group")),
-        qualifiedName("group")
-    );
+        DSL.regex(ref("string_field", STRING), DSL.literal("(?<group>\\d+)"), DSL.literal("group")),
+        qualifiedName("group"));
   }
 
   @Test
   public void named_non_parse_expression() {
     analysisContext.push();
     analysisContext.peek().define(new Symbol(Namespace.FIELD_NAME, "string_field"), STRING);
-    analysisContext.getNamedParseExpressions()
-        .add(DSL.named("string_field", DSL.literal("123")));
+    analysisContext.getNamedParseExpressions().add(DSL.named("string_field", DSL.literal("123")));
     assertAnalyzeEqual(DSL.ref("string_field", STRING), qualifiedName("string_field"));
   }
 
@@ -385,25 +361,29 @@ void match_bool_prefix_expression() {
         DSL.match_bool_prefix(
             DSL.namedArgument("field", DSL.literal("field_value1")),
             DSL.namedArgument("query", DSL.literal("sample query"))),
-        AstDSL.function("match_bool_prefix",
+        AstDSL.function(
+            "match_bool_prefix",
             AstDSL.unresolvedArg("field", stringLiteral("field_value1")),
             AstDSL.unresolvedArg("query", stringLiteral("sample query"))));
   }
 
   @Test
   void match_bool_prefix_wrong_expression() {
-    assertThrows(SemanticCheckException.class,
-        () -> analyze(AstDSL.function("match_bool_prefix",
-            AstDSL.unresolvedArg("field", stringLiteral("fieldA")),
-            AstDSL.unresolvedArg("query", floatLiteral(1.2f)))));
+    assertThrows(
+        SemanticCheckException.class,
+        () ->
+            analyze(
+                AstDSL.function(
+                    "match_bool_prefix",
+                    AstDSL.unresolvedArg("field", stringLiteral("fieldA")),
+                    AstDSL.unresolvedArg("query", floatLiteral(1.2f)))));
   }
 
   @Test
   void visit_span() {
     assertAnalyzeEqual(
         DSL.span(DSL.ref("integer_value", INTEGER), DSL.literal(1), ""),
-        AstDSL.span(qualifiedName("integer_value"), intLiteral(1), SpanUnit.NONE)
-    );
+        AstDSL.span(qualifiedName("integer_value"), intLiteral(1), SpanUnit.NONE));
   }
 
   @Test
@@ -425,13 +405,16 @@ void visit_in() {
   void multi_match_expression() {
     assertAnalyzeEqual(
         DSL.multi_match(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field_value1", ExprValueUtils.floatValue(1.F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("field_value1", ExprValueUtils.floatValue(1.F)))))),
             DSL.namedArgument("query", DSL.literal("sample query"))),
-        AstDSL.function("multi_match",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of(
-                "field_value1", 1.F))),
+        AstDSL.function(
+            "multi_match",
+            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of("field_value1", 1.F))),
             AstDSL.unresolvedArg("query", stringLiteral("sample query"))));
   }
 
@@ -439,14 +422,17 @@ void multi_match_expression() {
   void multi_match_expression_with_params() {
     assertAnalyzeEqual(
         DSL.multi_match(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field_value1", ExprValueUtils.floatValue(1.F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("field_value1", ExprValueUtils.floatValue(1.F)))))),
             DSL.namedArgument("query", DSL.literal("sample query")),
             DSL.namedArgument("analyzer", DSL.literal("keyword"))),
-        AstDSL.function("multi_match",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of(
-                "field_value1", 1.F))),
+        AstDSL.function(
+            "multi_match",
+            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of("field_value1", 1.F))),
             AstDSL.unresolvedArg("query", stringLiteral("sample query")),
             AstDSL.unresolvedArg("analyzer", stringLiteral("keyword"))));
   }
@@ -455,14 +441,20 @@ void multi_match_expression_with_params() {
   void multi_match_expression_two_fields() {
     assertAnalyzeEqual(
         DSL.multi_match(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field_value1", ExprValueUtils.floatValue(1.F),
-                    "field_value2", ExprValueUtils.floatValue(.3F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of(
+                                "field_value1", ExprValueUtils.floatValue(1.F),
+                                "field_value2", ExprValueUtils.floatValue(.3F)))))),
             DSL.namedArgument("query", DSL.literal("sample query"))),
-        AstDSL.function("multi_match",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field_value1", 1.F, "field_value2", .3F))),
+        AstDSL.function(
+            "multi_match",
+            AstDSL.unresolvedArg(
+                "fields",
+                new RelevanceFieldList(ImmutableMap.of("field_value1", 1.F, "field_value2", .3F))),
             AstDSL.unresolvedArg("query", stringLiteral("sample query"))));
   }
 
@@ -470,13 +462,16 @@ void multi_match_expression_two_fields() {
   void simple_query_string_expression() {
     assertAnalyzeEqual(
         DSL.simple_query_string(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field_value1", ExprValueUtils.floatValue(1.F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("field_value1", ExprValueUtils.floatValue(1.F)))))),
             DSL.namedArgument("query", DSL.literal("sample query"))),
-        AstDSL.function("simple_query_string",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of(
-                "field_value1", 1.F))),
+        AstDSL.function(
+            "simple_query_string",
+            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of("field_value1", 1.F))),
             AstDSL.unresolvedArg("query", stringLiteral("sample query"))));
   }
 
@@ -484,14 +479,17 @@ void simple_query_string_expression() {
   void simple_query_string_expression_with_params() {
     assertAnalyzeEqual(
         DSL.simple_query_string(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field_value1", ExprValueUtils.floatValue(1.F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("field_value1", ExprValueUtils.floatValue(1.F)))))),
             DSL.namedArgument("query", DSL.literal("sample query")),
             DSL.namedArgument("analyzer", DSL.literal("keyword"))),
-        AstDSL.function("simple_query_string",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of(
-                "field_value1", 1.F))),
+        AstDSL.function(
+            "simple_query_string",
+            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of("field_value1", 1.F))),
             AstDSL.unresolvedArg("query", stringLiteral("sample query")),
             AstDSL.unresolvedArg("analyzer", stringLiteral("keyword"))));
   }
@@ -500,37 +498,44 @@ void simple_query_string_expression_with_params() {
   void simple_query_string_expression_two_fields() {
     assertAnalyzeEqual(
         DSL.simple_query_string(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field_value1", ExprValueUtils.floatValue(1.F),
-                    "field_value2", ExprValueUtils.floatValue(.3F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of(
+                                "field_value1", ExprValueUtils.floatValue(1.F),
+                                "field_value2", ExprValueUtils.floatValue(.3F)))))),
             DSL.namedArgument("query", DSL.literal("sample query"))),
-        AstDSL.function("simple_query_string",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field_value1", 1.F, "field_value2", .3F))),
+        AstDSL.function(
+            "simple_query_string",
+            AstDSL.unresolvedArg(
+                "fields",
+                new RelevanceFieldList(ImmutableMap.of("field_value1", 1.F, "field_value2", .3F))),
             AstDSL.unresolvedArg("query", stringLiteral("sample query"))));
   }
 
   @Test
   void query_expression() {
     assertAnalyzeEqual(
-            DSL.query(
-                    DSL.namedArgument("query", DSL.literal("field:query"))),
-            AstDSL.function("query",
-                    AstDSL.unresolvedArg("query", stringLiteral("field:query"))));
+        DSL.query(DSL.namedArgument("query", DSL.literal("field:query"))),
+        AstDSL.function("query", AstDSL.unresolvedArg("query", stringLiteral("field:query"))));
   }
 
   @Test
   void query_string_expression() {
     assertAnalyzeEqual(
         DSL.query_string(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field_value1", ExprValueUtils.floatValue(1.F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("field_value1", ExprValueUtils.floatValue(1.F)))))),
             DSL.namedArgument("query", DSL.literal("query_value"))),
-        AstDSL.function("query_string",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of(
-                "field_value1", 1.F))),
+        AstDSL.function(
+            "query_string",
+            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of("field_value1", 1.F))),
             AstDSL.unresolvedArg("query", stringLiteral("query_value"))));
   }
 
@@ -538,14 +543,17 @@ void query_string_expression() {
   void query_string_expression_with_params() {
     assertAnalyzeEqual(
         DSL.query_string(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field_value1", ExprValueUtils.floatValue(1.F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of("field_value1", ExprValueUtils.floatValue(1.F)))))),
             DSL.namedArgument("query", DSL.literal("query_value")),
             DSL.namedArgument("escape", DSL.literal("false"))),
-        AstDSL.function("query_string",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of(
-                "field_value1", 1.F))),
+        AstDSL.function(
+            "query_string",
+            AstDSL.unresolvedArg("fields", new RelevanceFieldList(Map.of("field_value1", 1.F))),
             AstDSL.unresolvedArg("query", stringLiteral("query_value")),
             AstDSL.unresolvedArg("escape", stringLiteral("false"))));
   }
@@ -554,14 +562,20 @@ void query_string_expression_with_params() {
   void query_string_expression_two_fields() {
     assertAnalyzeEqual(
         DSL.query_string(
-            DSL.namedArgument("fields", DSL.literal(
-                new ExprTupleValue(new LinkedHashMap<>(ImmutableMap.of(
-                    "field_value1", ExprValueUtils.floatValue(1.F),
-                    "field_value2", ExprValueUtils.floatValue(.3F)))))),
+            DSL.namedArgument(
+                "fields",
+                DSL.literal(
+                    new ExprTupleValue(
+                        new LinkedHashMap<>(
+                            ImmutableMap.of(
+                                "field_value1", ExprValueUtils.floatValue(1.F),
+                                "field_value2", ExprValueUtils.floatValue(.3F)))))),
             DSL.namedArgument("query", DSL.literal("query_value"))),
-        AstDSL.function("query_string",
-            AstDSL.unresolvedArg("fields", new RelevanceFieldList(ImmutableMap.of(
-                "field_value1", 1.F, "field_value2", .3F))),
+        AstDSL.function(
+            "query_string",
+            AstDSL.unresolvedArg(
+                "fields",
+                new RelevanceFieldList(ImmutableMap.of("field_value1", 1.F, "field_value2", .3F))),
             AstDSL.unresolvedArg("query", stringLiteral("query_value"))));
   }
 
@@ -571,7 +585,8 @@ void wildcard_query_expression() {
         DSL.wildcard_query(
             DSL.namedArgument("field", DSL.literal("test")),
             DSL.namedArgument("query", DSL.literal("query_value*"))),
-        AstDSL.function("wildcard_query",
+        AstDSL.function(
+            "wildcard_query",
             unresolvedArg("field", stringLiteral("test")),
             unresolvedArg("query", stringLiteral("query_value*"))));
   }
@@ -585,7 +600,8 @@ void wildcard_query_expression_all_params() {
             DSL.namedArgument("boost", DSL.literal("1.5")),
             DSL.namedArgument("case_insensitive", DSL.literal("true")),
             DSL.namedArgument("rewrite", DSL.literal("scoring_boolean"))),
-        AstDSL.function("wildcard_query",
+        AstDSL.function(
+            "wildcard_query",
             unresolvedArg("field", stringLiteral("test")),
             unresolvedArg("query", stringLiteral("query_value*")),
             unresolvedArg("boost", stringLiteral("1.5")),
@@ -603,154 +619,144 @@ public void match_phrase_prefix_all_params() {
             DSL.namedArgument("boost", "1.5"),
             DSL.namedArgument("analyzer", "standard"),
             DSL.namedArgument("max_expansions", "4"),
-            DSL.namedArgument("zero_terms_query", "NONE")
-            ),
-        AstDSL.function("match_phrase_prefix",
-          unresolvedArg("field", stringLiteral("field_value1")),
-          unresolvedArg("query", stringLiteral("search query")),
-          unresolvedArg("slop", stringLiteral("3")),
-          unresolvedArg("boost", stringLiteral("1.5")),
-          unresolvedArg("analyzer", stringLiteral("standard")),
-          unresolvedArg("max_expansions", stringLiteral("4")),
-          unresolvedArg("zero_terms_query", stringLiteral("NONE"))
-          )
-    );
-  }
-
-  @Test void score_function_expression() {
-    assertAnalyzeEqual(
-            DSL.score(
-                    DSL.namedArgument("RelevanceQuery",
-                            DSL.match_phrase_prefix(
-                                    DSL.namedArgument("field", "field_value1"),
-                                    DSL.namedArgument("query", "search query"),
-                                    DSL.namedArgument("slop", "3")
-                            )
-                    )),
-            AstDSL.function("score",
-                    unresolvedArg("RelevanceQuery",
-                            AstDSL.function("match_phrase_prefix",
-                                    unresolvedArg("field", stringLiteral("field_value1")),
-                                    unresolvedArg("query", stringLiteral("search query")),
-                                    unresolvedArg("slop", stringLiteral("3"))
-                            )
-                    )
-            )
-    );
-  }
-
-  @Test void score_function_with_boost() {
-    assertAnalyzeEqual(
-            DSL.score(
-                    DSL.namedArgument("RelevanceQuery",
-                            DSL.match_phrase_prefix(
-                                    DSL.namedArgument("field", "field_value1"),
-                                    DSL.namedArgument("query", "search query"),
-                                    DSL.namedArgument("boost", "3.0")
-                            )),
-                    DSL.namedArgument("boost", "2")
-                    ),
-            AstDSL.function("score",
-                    unresolvedArg("RelevanceQuery",
-                            AstDSL.function("match_phrase_prefix",
-                                    unresolvedArg("field", stringLiteral("field_value1")),
-                                    unresolvedArg("query", stringLiteral("search query")),
-                                    unresolvedArg("boost", stringLiteral("3.0"))
-                            )
-                    ),
-                    unresolvedArg("boost", stringLiteral("2"))
-            )
-    );
-  }
-
-  @Test void score_query_function_expression() {
-    assertAnalyzeEqual(
-            DSL.score_query(
-                    DSL.namedArgument("RelevanceQuery",
-                            DSL.wildcard_query(
-                                    DSL.namedArgument("field", "field_value1"),
-                                    DSL.namedArgument("query", "search query")
-                            )
-                    )),
-            AstDSL.function("score_query",
-                    unresolvedArg("RelevanceQuery",
-                            AstDSL.function("wildcard_query",
-                                    unresolvedArg("field", stringLiteral("field_value1")),
-                                    unresolvedArg("query", stringLiteral("search query"))
-                            )
-                    )
-            )
-    );
-  }
-
-  @Test void score_query_function_with_boost() {
-    assertAnalyzeEqual(
-            DSL.score_query(
-                    DSL.namedArgument("RelevanceQuery",
-                            DSL.wildcard_query(
-                                    DSL.namedArgument("field", "field_value1"),
-                                    DSL.namedArgument("query", "search query")
-                            )
-                    ),
-                    DSL.namedArgument("boost", "2.0")
-            ),
-            AstDSL.function("score_query",
-                    unresolvedArg("RelevanceQuery",
-                            AstDSL.function("wildcard_query",
-                                    unresolvedArg("field", stringLiteral("field_value1")),
-                                    unresolvedArg("query", stringLiteral("search query"))
-                            )
-                    ),
-                    unresolvedArg("boost", stringLiteral("2.0"))
-            )
-    );
-  }
-
-  @Test void scorequery_function_expression() {
-    assertAnalyzeEqual(
-            DSL.scorequery(
-                    DSL.namedArgument("RelevanceQuery",
-                            DSL.simple_query_string(
-                                    DSL.namedArgument("field", "field_value1"),
-                                    DSL.namedArgument("query", "search query"),
-                                    DSL.namedArgument("slop", "3")
-                            )
-                    )),
-            AstDSL.function("scorequery",
-                    unresolvedArg("RelevanceQuery",
-                            AstDSL.function("simple_query_string",
-                                    unresolvedArg("field", stringLiteral("field_value1")),
-                                    unresolvedArg("query", stringLiteral("search query")),
-                                    unresolvedArg("slop", stringLiteral("3"))
-                            )
-                    )
-            )
-    );
+            DSL.namedArgument("zero_terms_query", "NONE")),
+        AstDSL.function(
+            "match_phrase_prefix",
+            unresolvedArg("field", stringLiteral("field_value1")),
+            unresolvedArg("query", stringLiteral("search query")),
+            unresolvedArg("slop", stringLiteral("3")),
+            unresolvedArg("boost", stringLiteral("1.5")),
+            unresolvedArg("analyzer", stringLiteral("standard")),
+            unresolvedArg("max_expansions", stringLiteral("4")),
+            unresolvedArg("zero_terms_query", stringLiteral("NONE"))));
+  }
+
+  @Test
+  void score_function_expression() {
+    assertAnalyzeEqual(
+        DSL.score(
+            DSL.namedArgument(
+                "RelevanceQuery",
+                DSL.match_phrase_prefix(
+                    DSL.namedArgument("field", "field_value1"),
+                    DSL.namedArgument("query", "search query"),
+                    DSL.namedArgument("slop", "3")))),
+        AstDSL.function(
+            "score",
+            unresolvedArg(
+                "RelevanceQuery",
+                AstDSL.function(
+                    "match_phrase_prefix",
+                    unresolvedArg("field", stringLiteral("field_value1")),
+                    unresolvedArg("query", stringLiteral("search query")),
+                    unresolvedArg("slop", stringLiteral("3"))))));
+  }
+
+  @Test
+  void score_function_with_boost() {
+    assertAnalyzeEqual(
+        DSL.score(
+            DSL.namedArgument(
+                "RelevanceQuery",
+                DSL.match_phrase_prefix(
+                    DSL.namedArgument("field", "field_value1"),
+                    DSL.namedArgument("query", "search query"),
+                    DSL.namedArgument("boost", "3.0"))),
+            DSL.namedArgument("boost", "2")),
+        AstDSL.function(
+            "score",
+            unresolvedArg(
+                "RelevanceQuery",
+                AstDSL.function(
+                    "match_phrase_prefix",
+                    unresolvedArg("field", stringLiteral("field_value1")),
+                    unresolvedArg("query", stringLiteral("search query")),
+                    unresolvedArg("boost", stringLiteral("3.0")))),
+            unresolvedArg("boost", stringLiteral("2"))));
+  }
+
+  @Test
+  void score_query_function_expression() {
+    assertAnalyzeEqual(
+        DSL.score_query(
+            DSL.namedArgument(
+                "RelevanceQuery",
+                DSL.wildcard_query(
+                    DSL.namedArgument("field", "field_value1"),
+                    DSL.namedArgument("query", "search query")))),
+        AstDSL.function(
+            "score_query",
+            unresolvedArg(
+                "RelevanceQuery",
+                AstDSL.function(
+                    "wildcard_query",
+                    unresolvedArg("field", stringLiteral("field_value1")),
+                    unresolvedArg("query", stringLiteral("search query"))))));
+  }
+
+  @Test
+  void score_query_function_with_boost() {
+    assertAnalyzeEqual(
+        DSL.score_query(
+            DSL.namedArgument(
+                "RelevanceQuery",
+                DSL.wildcard_query(
+                    DSL.namedArgument("field", "field_value1"),
+                    DSL.namedArgument("query", "search query"))),
+            DSL.namedArgument("boost", "2.0")),
+        AstDSL.function(
+            "score_query",
+            unresolvedArg(
+                "RelevanceQuery",
+                AstDSL.function(
+                    "wildcard_query",
+                    unresolvedArg("field", stringLiteral("field_value1")),
+                    unresolvedArg("query", stringLiteral("search query")))),
+            unresolvedArg("boost", stringLiteral("2.0"))));
+  }
+
+  @Test
+  void scorequery_function_expression() {
+    assertAnalyzeEqual(
+        DSL.scorequery(
+            DSL.namedArgument(
+                "RelevanceQuery",
+                DSL.simple_query_string(
+                    DSL.namedArgument("field", "field_value1"),
+                    DSL.namedArgument("query", "search query"),
+                    DSL.namedArgument("slop", "3")))),
+        AstDSL.function(
+            "scorequery",
+            unresolvedArg(
+                "RelevanceQuery",
+                AstDSL.function(
+                    "simple_query_string",
+                    unresolvedArg("field", stringLiteral("field_value1")),
+                    unresolvedArg("query", stringLiteral("search query")),
+                    unresolvedArg("slop", stringLiteral("3"))))));
   }
 
   @Test
   void scorequery_function_with_boost() {
     assertAnalyzeEqual(
-            DSL.scorequery(
-                    DSL.namedArgument("RelevanceQuery",
-                            DSL.simple_query_string(
-                                    DSL.namedArgument("field", "field_value1"),
-                                    DSL.namedArgument("query", "search query"),
-                                    DSL.namedArgument("slop", "3")
-                            )),
-                    DSL.namedArgument("boost", "2.0")
-                    ),
-            AstDSL.function("scorequery",
-                    unresolvedArg("RelevanceQuery",
-                            AstDSL.function("simple_query_string",
-                                    unresolvedArg("field", stringLiteral("field_value1")),
-                                    unresolvedArg("query", stringLiteral("search query")),
-                                    unresolvedArg("slop", stringLiteral("3"))
-                            )
-                    ),
-                    unresolvedArg("boost", stringLiteral("2.0"))
-            )
-    );
+        DSL.scorequery(
+            DSL.namedArgument(
+                "RelevanceQuery",
+                DSL.simple_query_string(
+                    DSL.namedArgument("field", "field_value1"),
+                    DSL.namedArgument("query", "search query"),
+                    DSL.namedArgument("slop", "3"))),
+            DSL.namedArgument("boost", "2.0")),
+        AstDSL.function(
+            "scorequery",
+            unresolvedArg(
+                "RelevanceQuery",
+                AstDSL.function(
+                    "simple_query_string",
+                    unresolvedArg("field", stringLiteral("field_value1")),
+                    unresolvedArg("query", stringLiteral("search query")),
+                    unresolvedArg("slop", stringLiteral("3")))),
+            unresolvedArg("boost", stringLiteral("2.0"))));
   }
 
   @Test
@@ -764,8 +770,12 @@ public void function_returns_non_constant_value() {
     // Even a function returns the same values - they are calculated on each call
     // `sysdate()` which returns `LocalDateTime.now()` shouldn't be cached and should return always
     // different values
-    var values = List.of(analyze(function("sysdate")), analyze(function("sysdate")),
-        analyze(function("sysdate")), analyze(function("sysdate")));
+    var values =
+        List.of(
+            analyze(function("sysdate")),
+            analyze(function("sysdate")),
+            analyze(function("sysdate")),
+            analyze(function("sysdate")));
     var referenceValue = analyze(function("sysdate")).valueOf();
     assertTrue(values.stream().noneMatch(v -> v.valueOf() == referenceValue));
   }
@@ -773,8 +783,12 @@ public void function_returns_non_constant_value() {
   @Test
   public void now_as_a_function_not_cached() {
     // // We can call `now()` as a function, in that case nothing should be cached
-    var values = List.of(analyze(function("now")), analyze(function("now")),
-        analyze(function("now")), analyze(function("now")));
+    var values =
+        List.of(
+            analyze(function("now")),
+            analyze(function("now")),
+            analyze(function("now")),
+            analyze(function("now")));
     var referenceValue = analyze(function("now")).valueOf();
     assertTrue(values.stream().noneMatch(v -> v.valueOf() == referenceValue));
   }
@@ -783,13 +797,12 @@ protected Expression analyze(UnresolvedExpression unresolvedExpression) {
     return expressionAnalyzer.analyze(unresolvedExpression, analysisContext);
   }
 
-  protected void assertAnalyzeEqual(Expression expected,
-                                    UnresolvedExpression unresolvedExpression) {
+  protected void assertAnalyzeEqual(
+      Expression expected, UnresolvedExpression unresolvedExpression) {
     assertEquals(expected, analyze(unresolvedExpression));
   }
 
-  protected void assertAnalyzeEqual(Expression expected,
-                                    UnresolvedPlan unresolvedPlan) {
+  protected void assertAnalyzeEqual(Expression expected, UnresolvedPlan unresolvedPlan) {
     assertEquals(expected, analyze(unresolvedPlan));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizerTest.java b/core/src/test/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizerTest.java
index 89d5f699e3..28bcb8793f 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static java.util.Collections.emptyList;
@@ -27,65 +26,58 @@ class ExpressionReferenceOptimizerTest extends AnalyzerTestBase {
   void expression_without_aggregation_should_not_be_replaced() {
     assertEquals(
         DSL.subtract(DSL.ref("age", INTEGER), DSL.literal(1)),
-        optimize(DSL.subtract(DSL.ref("age", INTEGER), DSL.literal(1)))
-    );
+        optimize(DSL.subtract(DSL.ref("age", INTEGER), DSL.literal(1))));
   }
 
   @Test
   void group_expression_should_be_replaced() {
-    assertEquals(
-        DSL.ref("abs(balance)", INTEGER),
-        optimize(DSL.abs(DSL.ref("balance", INTEGER)))
-    );
+    assertEquals(DSL.ref("abs(balance)", INTEGER), optimize(DSL.abs(DSL.ref("balance", INTEGER))));
   }
 
   @Test
   void aggregation_expression_should_be_replaced() {
-    assertEquals(
-        DSL.ref("AVG(age)", DOUBLE),
-        optimize(DSL.avg(DSL.ref("age", INTEGER)))
-    );
+    assertEquals(DSL.ref("AVG(age)", DOUBLE), optimize(DSL.avg(DSL.ref("age", INTEGER))));
   }
 
   @Test
   void aggregation_in_expression_should_be_replaced() {
     assertEquals(
         DSL.subtract(DSL.ref("AVG(age)", DOUBLE), DSL.literal(1)),
-        optimize(DSL.subtract(DSL.avg(DSL.ref("age", INTEGER)), DSL.literal(1)))
-    );
+        optimize(DSL.subtract(DSL.avg(DSL.ref("age", INTEGER)), DSL.literal(1))));
   }
 
   @Test
   void case_clause_should_be_replaced() {
-    Expression caseClause = DSL.cases(
-        null,
-        DSL.when(
-            DSL.equal(DSL.ref("age", INTEGER), DSL.literal(30)),
-            DSL.literal("true")));
+    Expression caseClause =
+        DSL.cases(
+            null,
+            DSL.when(DSL.equal(DSL.ref("age", INTEGER), DSL.literal(30)), DSL.literal("true")));
 
     LogicalPlan logicalPlan =
         LogicalPlanDSL.aggregation(
             LogicalPlanDSL.relation("test", table),
             emptyList(),
-            ImmutableList.of(DSL.named(
-                "CaseClause(whenClauses=[WhenClause(condition==(age, 30), result=\"true\")],"
-                    + " defaultResult=null)",
-                caseClause)));
+            ImmutableList.of(
+                DSL.named(
+                    "CaseClause(whenClauses=[WhenClause(condition==(age, 30), result=\"true\")],"
+                        + " defaultResult=null)",
+                    caseClause)));
 
     assertEquals(
         DSL.ref(
             "CaseClause(whenClauses=[WhenClause(condition==(age, 30), result=\"true\")],"
-                + " defaultResult=null)", STRING),
+                + " defaultResult=null)",
+            STRING),
         optimize(caseClause, logicalPlan));
   }
 
   @Test
   void aggregation_in_case_when_clause_should_be_replaced() {
-    Expression caseClause = DSL.cases(
-        null,
-        DSL.when(
-            DSL.equal(DSL.avg(DSL.ref("age", INTEGER)), DSL.literal(30)),
-            DSL.literal("true")));
+    Expression caseClause =
+        DSL.cases(
+            null,
+            DSL.when(
+                DSL.equal(DSL.avg(DSL.ref("age", INTEGER)), DSL.literal(30)), DSL.literal("true")));
 
     LogicalPlan logicalPlan =
         LogicalPlanDSL.aggregation(
@@ -96,19 +88,16 @@ void aggregation_in_case_when_clause_should_be_replaced() {
     assertEquals(
         DSL.cases(
             null,
-            DSL.when(
-                DSL.equal(DSL.ref("AVG(age)", DOUBLE), DSL.literal(30)),
-                DSL.literal("true"))),
+            DSL.when(DSL.equal(DSL.ref("AVG(age)", DOUBLE), DSL.literal(30)), DSL.literal("true"))),
         optimize(caseClause, logicalPlan));
   }
 
   @Test
   void aggregation_in_case_else_clause_should_be_replaced() {
-    Expression caseClause = DSL.cases(
-        DSL.avg(DSL.ref("age", INTEGER)),
-        DSL.when(
-            DSL.equal(DSL.ref("age", INTEGER), DSL.literal(30)),
-            DSL.literal("true")));
+    Expression caseClause =
+        DSL.cases(
+            DSL.avg(DSL.ref("age", INTEGER)),
+            DSL.when(DSL.equal(DSL.ref("age", INTEGER), DSL.literal(30)), DSL.literal("true")));
 
     LogicalPlan logicalPlan =
         LogicalPlanDSL.aggregation(
@@ -119,9 +108,7 @@ void aggregation_in_case_else_clause_should_be_replaced() {
     assertEquals(
         DSL.cases(
             DSL.ref("AVG(age)", DOUBLE),
-            DSL.when(
-                DSL.equal(DSL.ref("age", INTEGER), DSL.literal(30)),
-                DSL.literal("true"))),
+            DSL.when(DSL.equal(DSL.ref("age", INTEGER), DSL.literal(30)), DSL.literal("true"))),
         optimize(caseClause, logicalPlan));
   }
 
@@ -136,12 +123,8 @@ void window_expression_should_be_replaced() {
             DSL.named(DSL.denseRank()),
             new WindowDefinition(emptyList(), emptyList()));
 
-    assertEquals(
-        DSL.ref("rank()", INTEGER),
-        optimize(DSL.rank(), logicalPlan));
-    assertEquals(
-        DSL.ref("dense_rank()", INTEGER),
-        optimize(DSL.denseRank(), logicalPlan));
+    assertEquals(DSL.ref("rank()", INTEGER), optimize(DSL.rank(), logicalPlan));
+    assertEquals(DSL.ref("dense_rank()", INTEGER), optimize(DSL.denseRank(), logicalPlan));
   }
 
   Expression optimize(Expression expression) {
@@ -158,11 +141,11 @@ Expression optimize(Expression expression, LogicalPlan logicalPlan) {
   LogicalPlan logicalPlan() {
     return LogicalPlanDSL.aggregation(
         LogicalPlanDSL.relation("schema", table),
-        ImmutableList
-            .of(DSL.named("AVG(age)", DSL.avg(DSL.ref("age", INTEGER))),
-                DSL.named("SUM(age)", DSL.sum(DSL.ref("age", INTEGER)))),
-        ImmutableList.of(DSL.named("balance", DSL.ref("balance", INTEGER)),
-            DSL.named("abs(balance)", DSL.abs(DSL.ref("balance", INTEGER))))
-    );
+        ImmutableList.of(
+            DSL.named("AVG(age)", DSL.avg(DSL.ref("age", INTEGER))),
+            DSL.named("SUM(age)", DSL.sum(DSL.ref("age", INTEGER)))),
+        ImmutableList.of(
+            DSL.named("balance", DSL.ref("balance", INTEGER)),
+            DSL.named("abs(balance)", DSL.abs(DSL.ref("balance", INTEGER)))));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/NamedExpressionAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/NamedExpressionAnalyzerTest.java
index e9c891905c..68c508b645 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/NamedExpressionAnalyzerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/NamedExpressionAnalyzerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -22,8 +21,7 @@ class NamedExpressionAnalyzerTest extends AnalyzerTestBase {
   void visit_named_select_item() {
     Alias alias = AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value"));
 
-    NamedExpressionAnalyzer analyzer =
-        new NamedExpressionAnalyzer(expressionAnalyzer);
+    NamedExpressionAnalyzer analyzer = new NamedExpressionAnalyzer(expressionAnalyzer);
 
     NamedExpression analyze = analyzer.analyze(alias, analysisContext);
     assertEquals("integer_value", analyze.getNameOrAlias());
@@ -32,11 +30,10 @@ void visit_named_select_item() {
   @Test
   void visit_highlight() {
     Map<String, Literal> args = new HashMap<>();
-    Alias alias = AstDSL.alias("highlight(fieldA)",
-        new HighlightFunction(
-            AstDSL.stringLiteral("fieldA"), args));
-    NamedExpressionAnalyzer analyzer =
-        new NamedExpressionAnalyzer(expressionAnalyzer);
+    Alias alias =
+        AstDSL.alias(
+            "highlight(fieldA)", new HighlightFunction(AstDSL.stringLiteral("fieldA"), args));
+    NamedExpressionAnalyzer analyzer = new NamedExpressionAnalyzer(expressionAnalyzer);
 
     NamedExpression analyze = analyzer.analyze(alias, analysisContext);
     assertEquals("highlight(fieldA)", analyze.getNameOrAlias());
diff --git a/core/src/test/java/org/opensearch/sql/analysis/QualifierAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/QualifierAnalyzerTest.java
index 5833ef6ae4..3599a86918 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/QualifierAnalyzerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/QualifierAnalyzerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -34,18 +33,26 @@ void should_return_original_name_if_no_qualifier() {
 
   @Test
   void should_report_error_if_qualifier_is_not_index() {
-    runInScope(new Symbol(Namespace.FIELD_NAME, "aIndex"), ARRAY, () -> {
-      SyntaxCheckException error = assertThrows(SyntaxCheckException.class,
-          () -> qualifierAnalyzer.unqualified("a", "integer_value"));
-      assertEquals("The qualifier [a] of qualified name [a.integer_value] "
-              + "must be an field name, index name or its alias", error.getMessage());
-    });
+    runInScope(
+        new Symbol(Namespace.FIELD_NAME, "aIndex"),
+        ARRAY,
+        () -> {
+          SyntaxCheckException error =
+              assertThrows(
+                  SyntaxCheckException.class,
+                  () -> qualifierAnalyzer.unqualified("a", "integer_value"));
+          assertEquals(
+              "The qualifier [a] of qualified name [a.integer_value] "
+                  + "must be an field name, index name or its alias",
+              error.getMessage());
+        });
   }
 
   @Test
   void should_report_error_if_qualifier_is_not_exist() {
-    SyntaxCheckException error = assertThrows(SyntaxCheckException.class,
-        () -> qualifierAnalyzer.unqualified("a", "integer_value"));
+    SyntaxCheckException error =
+        assertThrows(
+            SyntaxCheckException.class, () -> qualifierAnalyzer.unqualified("a", "integer_value"));
     assertEquals(
         "The qualifier [a] of qualified name [a.integer_value] must be an field name, index name "
             + "or its alias",
@@ -54,23 +61,26 @@ void should_report_error_if_qualifier_is_not_exist() {
 
   @Test
   void should_return_qualified_name_if_qualifier_is_index() {
-    runInScope(new Symbol(Namespace.INDEX_NAME, "a"), STRUCT, () ->
-        assertEquals("integer_value", qualifierAnalyzer.unqualified("a", "integer_value"))
-    );
+    runInScope(
+        new Symbol(Namespace.INDEX_NAME, "a"),
+        STRUCT,
+        () -> assertEquals("integer_value", qualifierAnalyzer.unqualified("a", "integer_value")));
   }
 
   @Test
   void should_return_qualified_name_if_qualifier_is_field() {
-    runInScope(new Symbol(Namespace.FIELD_NAME, "a"), STRUCT, () ->
-        assertEquals("a.integer_value", qualifierAnalyzer.unqualified("a", "integer_value"))
-    );
+    runInScope(
+        new Symbol(Namespace.FIELD_NAME, "a"),
+        STRUCT,
+        () -> assertEquals("a.integer_value", qualifierAnalyzer.unqualified("a", "integer_value")));
   }
 
   @Test
   void should_report_error_if_more_parts_in_qualified_name() {
-    runInScope(new Symbol(Namespace.INDEX_NAME, "a"), STRUCT, () ->
-        qualifierAnalyzer.unqualified("a", "integer_value", "invalid")
-    );
+    runInScope(
+        new Symbol(Namespace.INDEX_NAME, "a"),
+        STRUCT,
+        () -> qualifierAnalyzer.unqualified("a", "integer_value", "invalid"));
   }
 
   private void runInScope(Symbol symbol, ExprType type, Runnable test) {
@@ -82,5 +92,4 @@ private void runInScope(Symbol symbol, ExprType type, Runnable test) {
       analysisContext.pop();
     }
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/SelectAnalyzeTest.java b/core/src/test/java/org/opensearch/sql/analysis/SelectAnalyzeTest.java
index 3bd90f0081..27edc588fa 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/SelectAnalyzeTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/SelectAnalyzeTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.opensearch.sql.ast.dsl.AstDSL.argument;
@@ -44,8 +43,7 @@ public void project_all_from_source() {
             DSL.named("double_value", DSL.ref("double_value", DOUBLE)),
             DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
             DSL.named("double_value", DSL.ref("double_value", DOUBLE)),
-            DSL.named("string_value", DSL.ref("string_value", STRING))
-        ),
+            DSL.named("string_value", DSL.ref("string_value", STRING))),
         AstDSL.projectWithArg(
             AstDSL.relation("schema"),
             AstDSL.defaultFieldsArgs(),
@@ -61,11 +59,9 @@ public void select_and_project_all() {
             LogicalPlanDSL.project(
                 LogicalPlanDSL.relation("schema", table),
                 DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
-                DSL.named("double_value", DSL.ref("double_value", DOUBLE))
-            ),
+                DSL.named("double_value", DSL.ref("double_value", DOUBLE))),
             DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
-            DSL.named("double_value", DSL.ref("double_value", DOUBLE))
-        ),
+            DSL.named("double_value", DSL.ref("double_value", DOUBLE))),
         AstDSL.projectWithArg(
             AstDSL.projectWithArg(
                 AstDSL.relation("schema"),
@@ -73,8 +69,7 @@ public void select_and_project_all() {
                 AstDSL.field("integer_value"),
                 AstDSL.field("double_value")),
             AstDSL.defaultFieldsArgs(),
-            AllFields.of()
-        ));
+            AllFields.of()));
   }
 
   @Test
@@ -84,10 +79,8 @@ public void remove_and_project_all() {
             LogicalPlanDSL.remove(
                 LogicalPlanDSL.relation("schema", table),
                 DSL.ref("integer_value", INTEGER),
-                DSL.ref("double_value", DOUBLE)
-            ),
-            DSL.named("string_value", DSL.ref("string_value", STRING))
-        ),
+                DSL.ref("double_value", DOUBLE)),
+            DSL.named("string_value", DSL.ref("string_value", STRING))),
         AstDSL.projectWithArg(
             AstDSL.projectWithArg(
                 AstDSL.relation("schema"),
@@ -95,8 +88,7 @@ public void remove_and_project_all() {
                 AstDSL.field("integer_value"),
                 AstDSL.field("double_value")),
             AstDSL.defaultFieldsArgs(),
-            AllFields.of()
-        ));
+            AllFields.of()));
   }
 
   @Test
@@ -105,20 +97,21 @@ public void stats_and_project_all() {
         LogicalPlanDSL.project(
             LogicalPlanDSL.aggregation(
                 LogicalPlanDSL.relation("schema", table),
-                ImmutableList.of(DSL
-                    .named("avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
+                ImmutableList.of(
+                    DSL.named("avg(integer_value)", DSL.avg(DSL.ref("integer_value", INTEGER)))),
                 ImmutableList.of(DSL.named("string_value", DSL.ref("string_value", STRING)))),
             DSL.named("avg(integer_value)", DSL.ref("avg(integer_value)", DOUBLE)),
-            DSL.named("string_value", DSL.ref("string_value", STRING))
-        ),
+            DSL.named("string_value", DSL.ref("string_value", STRING))),
         AstDSL.projectWithArg(
             AstDSL.agg(
                 AstDSL.relation("schema"),
-                AstDSL.exprList(AstDSL.alias("avg(integer_value)", AstDSL.aggregate("avg",
-                    field("integer_value")))),
+                AstDSL.exprList(
+                    AstDSL.alias(
+                        "avg(integer_value)", AstDSL.aggregate("avg", field("integer_value")))),
                 null,
                 ImmutableList.of(AstDSL.alias("string_value", field("string_value"))),
-                AstDSL.defaultStatsArgs()), AstDSL.defaultFieldsArgs(),
+                AstDSL.defaultStatsArgs()),
+            AstDSL.defaultFieldsArgs(),
             AllFields.of()));
   }
 
@@ -131,14 +124,12 @@ public void rename_and_project_all() {
                 ImmutableMap.of(DSL.ref("integer_value", INTEGER), DSL.ref("ivalue", INTEGER))),
             DSL.named("double_value", DSL.ref("double_value", DOUBLE)),
             DSL.named("string_value", DSL.ref("string_value", STRING)),
-            DSL.named("ivalue", DSL.ref("ivalue", INTEGER))
-        ),
+            DSL.named("ivalue", DSL.ref("ivalue", INTEGER))),
         AstDSL.projectWithArg(
             AstDSL.rename(
                 AstDSL.relation("schema"),
                 AstDSL.map(AstDSL.field("integer_value"), AstDSL.field("ivalue"))),
             AstDSL.defaultFieldsArgs(),
-            AllFields.of()
-        ));
+            AllFields.of()));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/SelectExpressionAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/SelectExpressionAnalyzerTest.java
index b2fe29b509..38d4704bcd 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/SelectExpressionAnalyzerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/SelectExpressionAnalyzerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -28,23 +27,20 @@
 @ExtendWith(MockitoExtension.class)
 public class SelectExpressionAnalyzerTest extends AnalyzerTestBase {
 
-  @Mock
-  private ExpressionReferenceOptimizer optimizer;
+  @Mock private ExpressionReferenceOptimizer optimizer;
 
   @Test
   public void named_expression() {
     assertAnalyzeEqual(
         DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
-        AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value"))
-    );
+        AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value")));
   }
 
   @Test
   public void named_expression_with_alias() {
     assertAnalyzeEqual(
         DSL.named("integer_value", DSL.ref("integer_value", INTEGER), "int"),
-        AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value"), "int")
-    );
+        AstDSL.alias("integer_value", AstDSL.qualifiedName("integer_value"), "int"));
   }
 
   @Test
@@ -52,9 +48,8 @@ public void field_name_with_qualifier() {
     analysisContext.peek().define(new Symbol(Namespace.INDEX_NAME, "index_alias"), STRUCT);
     assertAnalyzeEqual(
         DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
-        AstDSL.alias("integer_alias.integer_value",
-            AstDSL.qualifiedName("index_alias", "integer_value"))
-    );
+        AstDSL.alias(
+            "integer_alias.integer_value", AstDSL.qualifiedName("index_alias", "integer_value")));
   }
 
   @Test
@@ -62,9 +57,9 @@ public void field_name_with_qualifier_quoted() {
     analysisContext.peek().define(new Symbol(Namespace.INDEX_NAME, "index_alias"), STRUCT);
     assertAnalyzeEqual(
         DSL.named("integer_value", DSL.ref("integer_value", INTEGER)),
-        AstDSL.alias("`integer_alias`.integer_value", // qualifier in SELECT is quoted originally
-            AstDSL.qualifiedName("index_alias", "integer_value"))
-    );
+        AstDSL.alias(
+            "`integer_alias`.integer_value", // qualifier in SELECT is quoted originally
+            AstDSL.qualifiedName("index_alias", "integer_value")));
   }
 
   @Test
@@ -72,21 +67,21 @@ public void field_name_in_expression_with_qualifier() {
     analysisContext.peek().define(new Symbol(Namespace.INDEX_NAME, "index_alias"), STRUCT);
     assertAnalyzeEqual(
         DSL.named("abs(index_alias.integer_value)", DSL.abs(DSL.ref("integer_value", INTEGER))),
-        AstDSL.alias("abs(index_alias.integer_value)",
-            AstDSL.function("abs", AstDSL.qualifiedName("index_alias", "integer_value")))
-    );
+        AstDSL.alias(
+            "abs(index_alias.integer_value)",
+            AstDSL.function("abs", AstDSL.qualifiedName("index_alias", "integer_value"))));
   }
 
   protected List<NamedExpression> analyze(UnresolvedExpression unresolvedExpression) {
-    doAnswer(invocation -> ((NamedExpression) invocation.getArgument(0))
-        .getDelegated()).when(optimizer).optimize(any(), any());
+    doAnswer(invocation -> ((NamedExpression) invocation.getArgument(0)).getDelegated())
+        .when(optimizer)
+        .optimize(any(), any());
     return new SelectExpressionAnalyzer(expressionAnalyzer)
-        .analyze(Arrays.asList(unresolvedExpression),
-            analysisContext, optimizer);
+        .analyze(Arrays.asList(unresolvedExpression), analysisContext, optimizer);
   }
 
-  protected void assertAnalyzeEqual(NamedExpression expected,
-                                    UnresolvedExpression unresolvedExpression) {
+  protected void assertAnalyzeEqual(
+      NamedExpression expected, UnresolvedExpression unresolvedExpression) {
     assertEquals(Arrays.asList(expected), analyze(unresolvedExpression));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/TypeEnvironmentTest.java b/core/src/test/java/org/opensearch/sql/analysis/TypeEnvironmentTest.java
index c963e1d30d..91677a901e 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/TypeEnvironmentTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/TypeEnvironmentTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -21,9 +20,7 @@
 
 public class TypeEnvironmentTest {
 
-  /**
-   * Use context class for push/pop.
-   */
+  /** Use context class for push/pop. */
   private AnalysisContext context = new AnalysisContext();
 
   @Test
@@ -69,20 +66,24 @@ public void defineFieldSymbolInDifferentEnvironmentsShouldNotAbleToResolveOncePo
     assertEquals(INTEGER, environment().resolve(toSymbol(age)));
     SemanticCheckException exception =
         assertThrows(SemanticCheckException.class, () -> environment().resolve(toSymbol(city)));
-    assertEquals("can't resolve Symbol(namespace=FIELD_NAME, name=s.city) in type env",
+    assertEquals(
+        "can't resolve Symbol(namespace=FIELD_NAME, name=s.city) in type env",
         exception.getMessage());
-    exception = assertThrows(SemanticCheckException.class,
-        () -> environment().resolve(toSymbol(manager)));
-    assertEquals("can't resolve Symbol(namespace=FIELD_NAME, name=s.manager) in type env",
+    exception =
+        assertThrows(SemanticCheckException.class, () -> environment().resolve(toSymbol(manager)));
+    assertEquals(
+        "can't resolve Symbol(namespace=FIELD_NAME, name=s.manager) in type env",
         exception.getMessage());
   }
 
   @Test
   public void resolveLiteralInEnvFailed() {
-    SemanticCheckException exception = assertThrows(SemanticCheckException.class,
-        () -> environment().resolve(new Symbol(Namespace.FIELD_NAME, "1")));
-    assertEquals("can't resolve Symbol(namespace=FIELD_NAME, name=1) in type env",
-        exception.getMessage());
+    SemanticCheckException exception =
+        assertThrows(
+            SemanticCheckException.class,
+            () -> environment().resolve(new Symbol(Namespace.FIELD_NAME, "1")));
+    assertEquals(
+        "can't resolve Symbol(namespace=FIELD_NAME, name=1) in type env", exception.getMessage());
   }
 
   private TypeEnvironment environment() {
@@ -92,5 +93,4 @@ private TypeEnvironment environment() {
   private Symbol toSymbol(ReferenceExpression ref) {
     return new Symbol(Namespace.FIELD_NAME, ref.getAttr());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/WindowExpressionAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/WindowExpressionAnalyzerTest.java
index dd4361ad6a..acb11f0b57 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/WindowExpressionAnalyzerTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/WindowExpressionAnalyzerTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -75,16 +74,12 @@ void should_not_generate_sort_operator_if_no_partition_by_and_order_by_list() {
         LogicalPlanDSL.window(
             LogicalPlanDSL.relation("test", table),
             DSL.named("row_number", DSL.rowNumber()),
-            new WindowDefinition(
-                ImmutableList.of(),
-                ImmutableList.of())),
+            new WindowDefinition(ImmutableList.of(), ImmutableList.of())),
         analyzer.analyze(
             AstDSL.alias(
                 "row_number",
                 AstDSL.window(
-                    AstDSL.function("row_number"),
-                    ImmutableList.of(),
-                    ImmutableList.of())),
+                    AstDSL.function("row_number"), ImmutableList.of(), ImmutableList.of())),
             analysisContext));
   }
 
@@ -93,10 +88,7 @@ void should_return_original_child_if_project_item_not_windowed() {
     assertEquals(
         child,
         analyzer.analyze(
-            AstDSL.alias(
-                "string_value",
-                AstDSL.qualifiedName("string_value")),
-            analysisContext));
+            AstDSL.alias("string_value", AstDSL.qualifiedName("string_value")), analysisContext));
   }
 
   @Test
@@ -114,20 +106,23 @@ void can_analyze_sort_options() {
             .put(new SortOption(DESC, NULL_LAST), DEFAULT_DESC)
             .build();
 
-    expects.forEach((option, expect) -> {
-      Alias ast = AstDSL.alias(
-          "row_number",
-          AstDSL.window(
-              AstDSL.function("row_number"),
-              Collections.emptyList(),
-              ImmutableList.of(
-                  ImmutablePair.of(option, AstDSL.qualifiedName("integer_value")))));
+    expects.forEach(
+        (option, expect) -> {
+          Alias ast =
+              AstDSL.alias(
+                  "row_number",
+                  AstDSL.window(
+                      AstDSL.function("row_number"),
+                      Collections.emptyList(),
+                      ImmutableList.of(
+                          ImmutablePair.of(option, AstDSL.qualifiedName("integer_value")))));
 
-      LogicalPlan plan = analyzer.analyze(ast, analysisContext);
-      LogicalSort sort = (LogicalSort) plan.getChild().get(0);
-      assertEquals(expect, sort.getSortList().get(0).getLeft(),
-          "Assertion failed on input option: " + option);
-    });
+          LogicalPlan plan = analyzer.analyze(ast, analysisContext);
+          LogicalSort sort = (LogicalSort) plan.getChild().get(0);
+          assertEquals(
+              expect,
+              sort.getSortList().get(0).getLeft(),
+              "Assertion failed on input option: " + option);
+        });
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/analysis/model/DataSourceSchemaIdentifierNameResolverTest.java b/core/src/test/java/org/opensearch/sql/analysis/model/DataSourceSchemaIdentifierNameResolverTest.java
index ac429e89a0..775984a528 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/model/DataSourceSchemaIdentifierNameResolverTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/model/DataSourceSchemaIdentifierNameResolverTest.java
@@ -7,7 +7,6 @@
 
 package org.opensearch.sql.analysis.model;
 
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
@@ -16,9 +15,7 @@
 import static org.opensearch.sql.analysis.model.DataSourceSchemaIdentifierNameResolverTest.Identifier.identifierOf;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -29,14 +26,12 @@
 @ExtendWith(MockitoExtension.class)
 public class DataSourceSchemaIdentifierNameResolverTest {
 
-  @Mock
-  private DataSourceService dataSourceService;
+  @Mock private DataSourceService dataSourceService;
 
   @Test
   void testFullyQualifiedName() {
     when(dataSourceService.dataSourceExists("prom")).thenReturn(Boolean.TRUE);
-    identifierOf(
-            Arrays.asList("prom", "information_schema", "tables"), dataSourceService)
+    identifierOf(Arrays.asList("prom", "information_schema", "tables"), dataSourceService)
         .datasource("prom")
         .schema("information_schema")
         .name("tables");
@@ -68,8 +63,8 @@ void defaultDataSourceNameResolve() {
   static class Identifier {
     private final DataSourceSchemaIdentifierNameResolver resolver;
 
-    protected static Identifier identifierOf(List<String> parts,
-                                             DataSourceService dataSourceService) {
+    protected static Identifier identifierOf(
+        List<String> parts, DataSourceService dataSourceService) {
       return new Identifier(parts, dataSourceService);
     }
 
diff --git a/core/src/test/java/org/opensearch/sql/analysis/symbol/SymbolTableTest.java b/core/src/test/java/org/opensearch/sql/analysis/symbol/SymbolTableTest.java
index 90f98e8492..176390560e 100644
--- a/core/src/test/java/org/opensearch/sql/analysis/symbol/SymbolTableTest.java
+++ b/core/src/test/java/org/opensearch/sql/analysis/symbol/SymbolTableTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis.symbol;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -24,7 +23,6 @@
 import org.junit.jupiter.api.Test;
 import org.opensearch.sql.data.type.ExprType;
 
-
 public class SymbolTableTest {
 
   private SymbolTable symbolTable;
@@ -60,13 +58,7 @@ public void defineFieldSymbolShouldBeAbleToResolveByPrefix() {
     Map<String, ExprType> typeByName =
         symbolTable.lookupByPrefix(new Symbol(Namespace.FIELD_NAME, "s.projects"));
 
-    assertThat(
-        typeByName,
-        allOf(
-            aMapWithSize(1),
-            hasEntry("s.projects.active", BOOLEAN)
-        )
-    );
+    assertThat(typeByName, allOf(aMapWithSize(1), hasEntry("s.projects.active", BOOLEAN)));
   }
 
   @Test
@@ -76,17 +68,11 @@ public void lookupAllFieldsReturnUnnestedFields() {
     symbolTable.store(new Symbol(Namespace.FIELD_NAME, "active.manager.name"), STRING);
     symbolTable.store(new Symbol(Namespace.FIELD_NAME, "s.address"), BOOLEAN);
 
-    Map<String, ExprType> typeByName =
-        symbolTable.lookupAllFields(Namespace.FIELD_NAME);
+    Map<String, ExprType> typeByName = symbolTable.lookupAllFields(Namespace.FIELD_NAME);
 
     assertThat(
         typeByName,
-        allOf(
-            aMapWithSize(2),
-            hasEntry("active", BOOLEAN),
-            hasEntry("s.address", BOOLEAN)
-        )
-    );
+        allOf(aMapWithSize(2), hasEntry("active", BOOLEAN), hasEntry("s.address", BOOLEAN)));
   }
 
   @Test
@@ -94,8 +80,8 @@ public void failedToResolveSymbolNoNamespaceMatched() {
     symbolTable.store(new Symbol(Namespace.FUNCTION_NAME, "customFunction"), BOOLEAN);
     assertFalse(symbolTable.lookup(new Symbol(Namespace.FIELD_NAME, "s.projects")).isPresent());
 
-    assertThat(symbolTable.lookupByPrefix(new Symbol(Namespace.FIELD_NAME, "s.projects")),
-        anEmptyMap());
+    assertThat(
+        symbolTable.lookupByPrefix(new Symbol(Namespace.FIELD_NAME, "s.projects")), anEmptyMap());
   }
 
   @Test
@@ -111,5 +97,4 @@ private void defineSymbolShouldBeAbleToResolve(Symbol symbol, ExprType expectedT
     assertTrue(actualType.isPresent());
     assertEquals(expectedType, actualType.get());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/ast/expression/CastTest.java b/core/src/test/java/org/opensearch/sql/ast/expression/CastTest.java
index d9386ab122..741db07eb3 100644
--- a/core/src/test/java/org/opensearch/sql/ast/expression/CastTest.java
+++ b/core/src/test/java/org/opensearch/sql/ast/expression/CastTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -23,5 +22,4 @@ void cast_to_int_and_integer_should_convert_to_same_function_impl() {
         new Cast(booleanLiteral(true), stringLiteral("INT")).convertFunctionName(),
         new Cast(booleanLiteral(true), stringLiteral("INTEGER")).convertFunctionName());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/ast/expression/QualifiedNameTest.java b/core/src/test/java/org/opensearch/sql/ast/expression/QualifiedNameTest.java
index b0ab66bc0e..c211f36ba7 100644
--- a/core/src/test/java/org/opensearch/sql/ast/expression/QualifiedNameTest.java
+++ b/core/src/test/java/org/opensearch/sql/ast/expression/QualifiedNameTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.ast.expression;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,5 +35,4 @@ void should_return_empty_if_only_single_part() {
     assertFalse(name.first().isPresent());
     assertFalse(name.getPrefix().isPresent());
   }
-
 }
diff --git a/core/src/test/java/org/opensearch/sql/config/TestConfig.java b/core/src/test/java/org/opensearch/sql/config/TestConfig.java
index 6179f020c2..92b6aac64f 100644
--- a/core/src/test/java/org/opensearch/sql/config/TestConfig.java
+++ b/core/src/test/java/org/opensearch/sql/config/TestConfig.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.config;
 
 import com.google.common.collect.ImmutableMap;
@@ -23,9 +22,7 @@
 import org.opensearch.sql.storage.StorageEngine;
 import org.opensearch.sql.storage.Table;
 
-/**
- * Configuration will be used for UT.
- */
+/** Configuration will be used for UT. */
 public class TestConfig {
   public static final String INT_TYPE_NULL_VALUE_FIELD = "int_null_value";
   public static final String INT_TYPE_MISSING_VALUE_FIELD = "int_missing_value";
@@ -36,32 +33,33 @@ public class TestConfig {
   public static final String STRING_TYPE_NULL_VALUE_FIELD = "string_null_value";
   public static final String STRING_TYPE_MISSING_VALUE_FIELD = "string_missing_value";
 
-  public static Map<String, ExprType> typeMapping = new ImmutableMap.Builder<String, ExprType>()
-      .put("integer_value", ExprCoreType.INTEGER)
-      .put(INT_TYPE_NULL_VALUE_FIELD, ExprCoreType.INTEGER)
-      .put(INT_TYPE_MISSING_VALUE_FIELD, ExprCoreType.INTEGER)
-      .put("long_value", ExprCoreType.LONG)
-      .put("float_value", ExprCoreType.FLOAT)
-      .put("double_value", ExprCoreType.DOUBLE)
-      .put(DOUBLE_TYPE_NULL_VALUE_FIELD, ExprCoreType.DOUBLE)
-      .put(DOUBLE_TYPE_MISSING_VALUE_FIELD, ExprCoreType.DOUBLE)
-      .put("boolean_value", ExprCoreType.BOOLEAN)
-      .put(BOOL_TYPE_NULL_VALUE_FIELD, ExprCoreType.BOOLEAN)
-      .put(BOOL_TYPE_MISSING_VALUE_FIELD, ExprCoreType.BOOLEAN)
-      .put("string_value", ExprCoreType.STRING)
-      .put(STRING_TYPE_NULL_VALUE_FIELD, ExprCoreType.STRING)
-      .put(STRING_TYPE_MISSING_VALUE_FIELD, ExprCoreType.STRING)
-      .put("struct_value", ExprCoreType.STRUCT)
-      .put("array_value", ExprCoreType.ARRAY)
-      .put("timestamp_value", ExprCoreType.TIMESTAMP)
-      .put("field_value1", ExprCoreType.STRING)
-      .put("field_value2", ExprCoreType.STRING)
-      .put("message", ExprCoreType.STRING)
-      .put("message.info", ExprCoreType.STRING)
-      .put("message.info.id", ExprCoreType.STRING)
-      .put("comment", ExprCoreType.STRING)
-      .put("comment.data", ExprCoreType.STRING)
-      .build();
+  public static Map<String, ExprType> typeMapping =
+      new ImmutableMap.Builder<String, ExprType>()
+          .put("integer_value", ExprCoreType.INTEGER)
+          .put(INT_TYPE_NULL_VALUE_FIELD, ExprCoreType.INTEGER)
+          .put(INT_TYPE_MISSING_VALUE_FIELD, ExprCoreType.INTEGER)
+          .put("long_value", ExprCoreType.LONG)
+          .put("float_value", ExprCoreType.FLOAT)
+          .put("double_value", ExprCoreType.DOUBLE)
+          .put(DOUBLE_TYPE_NULL_VALUE_FIELD, ExprCoreType.DOUBLE)
+          .put(DOUBLE_TYPE_MISSING_VALUE_FIELD, ExprCoreType.DOUBLE)
+          .put("boolean_value", ExprCoreType.BOOLEAN)
+          .put(BOOL_TYPE_NULL_VALUE_FIELD, ExprCoreType.BOOLEAN)
+          .put(BOOL_TYPE_MISSING_VALUE_FIELD, ExprCoreType.BOOLEAN)
+          .put("string_value", ExprCoreType.STRING)
+          .put(STRING_TYPE_NULL_VALUE_FIELD, ExprCoreType.STRING)
+          .put(STRING_TYPE_MISSING_VALUE_FIELD, ExprCoreType.STRING)
+          .put("struct_value", ExprCoreType.STRUCT)
+          .put("array_value", ExprCoreType.ARRAY)
+          .put("timestamp_value", ExprCoreType.TIMESTAMP)
+          .put("field_value1", ExprCoreType.STRING)
+          .put("field_value2", ExprCoreType.STRING)
+          .put("message", ExprCoreType.STRING)
+          .put("message.info", ExprCoreType.STRING)
+          .put("message.info.id", ExprCoreType.STRING)
+          .put("comment", ExprCoreType.STRING)
+          .put("comment.data", ExprCoreType.STRING)
+          .build();
 
   protected StorageEngine storageEngine() {
     return new StorageEngine() {
@@ -94,10 +92,12 @@ public PhysicalPlan implement(LogicalPlan plan) {
 
   protected SymbolTable symbolTable() {
     SymbolTable symbolTable = new SymbolTable();
-    typeMapping.entrySet()
+    typeMapping
+        .entrySet()
         .forEach(
-            entry -> symbolTable
-                .store(new Symbol(Namespace.FIELD_NAME, entry.getKey()), entry.getValue()));
+            entry ->
+                symbolTable.store(
+                    new Symbol(Namespace.FIELD_NAME, entry.getKey()), entry.getValue()));
     return symbolTable;
   }
 
diff --git a/core/src/test/java/org/opensearch/sql/data/model/DateTimeValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/DateTimeValueTest.java
index c78545f9ae..8bcd222903 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/DateTimeValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/DateTimeValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -47,13 +46,14 @@ public void timeValueInterfaceTest() {
 
     assertEquals(today, timeValue.dateValue(functionProperties));
     assertEquals(today.atTime(1, 1, 1), timeValue.datetimeValue(functionProperties));
-    assertEquals(ZonedDateTime.of(LocalTime.parse("01:01:01").atDate(today),
-        UTC_ZONE_ID).toInstant(), timeValue.timestampValue(functionProperties));
+    assertEquals(
+        ZonedDateTime.of(LocalTime.parse("01:01:01").atDate(today), UTC_ZONE_ID).toInstant(),
+        timeValue.timestampValue(functionProperties));
 
     assertEquals("01:01:01", timeValue.value());
     assertEquals("TIME '01:01:01'", timeValue.toString());
-    exception = assertThrows(ExpressionEvaluationException.class,
-        () -> integerValue(1).timeValue());
+    exception =
+        assertThrows(ExpressionEvaluationException.class, () -> integerValue(1).timeValue());
     assertEquals("invalid to get timeValue from value of type INTEGER", exception.getMessage());
   }
 
@@ -62,14 +62,17 @@ public void timestampValueInterfaceTest() {
     ExprValue timestampValue = new ExprTimestampValue("2020-07-07 01:01:01");
 
     assertEquals(TIMESTAMP, timestampValue.type());
-    assertEquals(ZonedDateTime.of(LocalDateTime.parse("2020-07-07T01:01:01"),
-        UTC_ZONE_ID).toInstant(), timestampValue.timestampValue());
+    assertEquals(
+        ZonedDateTime.of(LocalDateTime.parse("2020-07-07T01:01:01"), UTC_ZONE_ID).toInstant(),
+        timestampValue.timestampValue());
     assertEquals("2020-07-07 01:01:01", timestampValue.value());
     assertEquals("TIMESTAMP '2020-07-07 01:01:01'", timestampValue.toString());
     assertEquals(LocalDate.parse("2020-07-07"), timestampValue.dateValue());
     assertEquals(LocalTime.parse("01:01:01"), timestampValue.timeValue());
     assertEquals(LocalDateTime.parse("2020-07-07T01:01:01"), timestampValue.datetimeValue());
-    assertThrows(ExpressionEvaluationException.class, () -> integerValue(1).timestampValue(),
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> integerValue(1).timestampValue(),
         "invalid to get timestampValue from value of type INTEGER");
   }
 
@@ -80,12 +83,12 @@ public void dateValueInterfaceTest() {
     assertEquals(LocalDate.parse("2012-07-07"), dateValue.dateValue());
     assertEquals(LocalTime.parse("00:00:00"), dateValue.timeValue());
     assertEquals(LocalDateTime.parse("2012-07-07T00:00:00"), dateValue.datetimeValue());
-    assertEquals(ZonedDateTime.of(LocalDateTime.parse("2012-07-07T00:00:00"),
-        UTC_ZONE_ID).toInstant(), dateValue.timestampValue());
+    assertEquals(
+        ZonedDateTime.of(LocalDateTime.parse("2012-07-07T00:00:00"), UTC_ZONE_ID).toInstant(),
+        dateValue.timestampValue());
     ExpressionEvaluationException exception =
         assertThrows(ExpressionEvaluationException.class, () -> integerValue(1).dateValue());
-    assertEquals("invalid to get dateValue from value of type INTEGER",
-        exception.getMessage());
+    assertEquals("invalid to get dateValue from value of type INTEGER", exception.getMessage());
   }
 
   @Test
@@ -95,10 +98,13 @@ public void datetimeValueInterfaceTest() {
     assertEquals(LocalDateTime.parse("2020-08-17T19:44:00"), datetimeValue.datetimeValue());
     assertEquals(LocalDate.parse("2020-08-17"), datetimeValue.dateValue());
     assertEquals(LocalTime.parse("19:44:00"), datetimeValue.timeValue());
-    assertEquals(ZonedDateTime.of(LocalDateTime.parse("2020-08-17T19:44:00"),
-        UTC_ZONE_ID).toInstant(), datetimeValue.timestampValue());
+    assertEquals(
+        ZonedDateTime.of(LocalDateTime.parse("2020-08-17T19:44:00"), UTC_ZONE_ID).toInstant(),
+        datetimeValue.timestampValue());
     assertEquals("DATETIME '2020-08-17 19:44:00'", datetimeValue.toString());
-    assertThrows(ExpressionEvaluationException.class, () -> integerValue(1).datetimeValue(),
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> integerValue(1).datetimeValue(),
         "invalid to get datetimeValue from value of type INTEGER");
   }
 
@@ -106,23 +112,24 @@ public void datetimeValueInterfaceTest() {
   public void dateInUnsupportedFormat() {
     SemanticCheckException exception =
         assertThrows(SemanticCheckException.class, () -> new ExprDateValue("2020-07-07Z"));
-    assertEquals("date:2020-07-07Z in unsupported format, please use yyyy-MM-dd",
-        exception.getMessage());
+    assertEquals(
+        "date:2020-07-07Z in unsupported format, please use yyyy-MM-dd", exception.getMessage());
   }
 
   @Test
   public void timeInUnsupportedFormat() {
     SemanticCheckException exception =
         assertThrows(SemanticCheckException.class, () -> new ExprTimeValue("01:01:0"));
-    assertEquals("time:01:01:0 in unsupported format, please use HH:mm:ss[.SSSSSSSSS]",
+    assertEquals(
+        "time:01:01:0 in unsupported format, please use HH:mm:ss[.SSSSSSSSS]",
         exception.getMessage());
   }
 
   @Test
   public void timestampInUnsupportedFormat() {
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
-            () -> new ExprTimestampValue("2020-07-07T01:01:01Z"));
+        assertThrows(
+            SemanticCheckException.class, () -> new ExprTimestampValue("2020-07-07T01:01:01Z"));
     assertEquals(
         "timestamp:2020-07-07T01:01:01Z in unsupported format, "
             + "please use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]",
@@ -132,8 +139,8 @@ public void timestampInUnsupportedFormat() {
   @Test
   public void datetimeInUnsupportedFormat() {
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
-            () -> new ExprDatetimeValue("2020-07-07T01:01:01Z"));
+        assertThrows(
+            SemanticCheckException.class, () -> new ExprDatetimeValue("2020-07-07T01:01:01Z"));
     assertEquals(
         "datetime:2020-07-07T01:01:01Z in unsupported format, "
             + "please use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]",
@@ -150,7 +157,8 @@ public void stringDateTimeValue() {
     assertEquals("\"2020-08-17 19:44:00\"", stringValue.toString());
 
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
+        assertThrows(
+            SemanticCheckException.class,
             () -> new ExprStringValue("2020-07-07T01:01:01Z").datetimeValue());
     assertEquals(
         "datetime:2020-07-07T01:01:01Z in unsupported format, "
@@ -167,10 +175,10 @@ public void stringDateValue() {
     assertEquals("\"2020-08-17\"", stringValue.toString());
 
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
-            () -> new ExprStringValue("2020-07-07Z").dateValue());
-    assertEquals("date:2020-07-07Z in unsupported format, please use yyyy-MM-dd",
-        exception.getMessage());
+        assertThrows(
+            SemanticCheckException.class, () -> new ExprStringValue("2020-07-07Z").dateValue());
+    assertEquals(
+        "date:2020-07-07Z in unsupported format, please use yyyy-MM-dd", exception.getMessage());
   }
 
   @Test
@@ -181,9 +189,10 @@ public void stringTimeValue() {
     assertEquals("\"19:44:00\"", stringValue.toString());
 
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
-            () -> new ExprStringValue("01:01:0").timeValue());
-    assertEquals("time:01:01:0 in unsupported format, please use HH:mm:ss[.SSSSSSSSS]",
+        assertThrows(
+            SemanticCheckException.class, () -> new ExprStringValue("01:01:0").timeValue());
+    assertEquals(
+        "time:01:01:0 in unsupported format, please use HH:mm:ss[.SSSSSSSSS]",
         exception.getMessage());
   }
 
@@ -247,30 +256,31 @@ public void datetimeWithVariableNanoPrecision() {
   @Test
   public void timestampOverMaxNanoPrecision() {
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
+        assertThrows(
+            SemanticCheckException.class,
             () -> new ExprTimestampValue("2020-07-07 01:01:01.1234567890"));
     assertEquals(
         "timestamp:2020-07-07 01:01:01.1234567890 in unsupported format, "
-                + "please use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]",
+            + "please use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]",
         exception.getMessage());
   }
 
   @Test
   public void datetimeOverMaxNanoPrecision() {
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
+        assertThrows(
+            SemanticCheckException.class,
             () -> new ExprDatetimeValue("2020-07-07 01:01:01.1234567890"));
     assertEquals(
         "datetime:2020-07-07 01:01:01.1234567890 in unsupported format, "
-                + "please use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]",
+            + "please use yyyy-MM-dd HH:mm:ss[.SSSSSSSSS]",
         exception.getMessage());
   }
 
   @Test
   public void timeOverMaxNanoPrecision() {
     SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
-            () -> new ExprTimeValue("01:01:01.1234567890"));
+        assertThrows(SemanticCheckException.class, () -> new ExprTimeValue("01:01:01.1234567890"));
     assertEquals(
         "time:01:01:01.1234567890 in unsupported format, please use HH:mm:ss[.SSSSSSSSS]",
         exception.getMessage());
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprBooleanValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprBooleanValueTest.java
index 07aac33129..b77112528c 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprBooleanValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprBooleanValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -29,8 +28,8 @@ public void equal() {
     ExprValue v2 = ExprBooleanValue.of(true);
     assertTrue(v1.equals(v2));
     assertTrue(v2.equals(v1));
-    assertEquals(0, ((ExprBooleanValue)v1).compare((ExprBooleanValue)v2));
-    assertEquals(0, ((ExprBooleanValue)v2).compare((ExprBooleanValue)v1));
+    assertEquals(0, ((ExprBooleanValue) v1).compare((ExprBooleanValue) v2));
+    assertEquals(0, ((ExprBooleanValue) v2).compare((ExprBooleanValue) v1));
   }
 
   @Test
@@ -44,7 +43,9 @@ public void compare() {
   @Test
   public void invalid_get_value() {
     ExprDateValue value = new ExprDateValue("2020-08-20");
-    assertThrows(ExpressionEvaluationException.class, value::booleanValue,
+    assertThrows(
+        ExpressionEvaluationException.class,
+        value::booleanValue,
         String.format("invalid to get booleanValue from value of type %s", value.type()));
   }
 
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprCollectionValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprCollectionValueTest.java
index e61bdb111d..edd4e0d844 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprCollectionValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprCollectionValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -48,8 +47,9 @@ public void compare_collection_with_int_object() {
   @Test
   public void comparabilityTest() {
     ExprValue collectionValue = ExprValueUtils.collectionValue(Arrays.asList(0, 1));
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> compare(collectionValue, collectionValue));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class, () -> compare(collectionValue, collectionValue));
     assertEquals("ExprCollectionValue instances are not comparable", exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprIntervalValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprIntervalValueTest.java
index ff86ad70a1..36785d383e 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprIntervalValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprIntervalValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -41,14 +40,18 @@ public void compare() {
   public void invalid_compare() {
     ExprIntervalValue v1 = new ExprIntervalValue(Period.ofYears(1));
     ExprIntervalValue v2 = new ExprIntervalValue(Duration.ofHours(1));
-    assertThrows(ExpressionEvaluationException.class, () -> v1.compare(v2),
+    assertThrows(
+        ExpressionEvaluationException.class,
+        () -> v1.compare(v2),
         String.format("invalid to compare intervals with units %s and %s", v1.unit(), v2.unit()));
   }
 
   @Test
   public void invalid_get_value() {
     ExprDateValue value = new ExprDateValue("2020-08-20");
-    assertThrows(ExpressionEvaluationException.class, value::intervalValue,
+    assertThrows(
+        ExpressionEvaluationException.class,
+        value::intervalValue,
         String.format("invalid to get intervalValue from value of type %s", value.type()));
   }
 
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprMissingValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprMissingValueTest.java
index 871f312c6f..121ceb6ce2 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprMissingValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprMissingValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -19,7 +18,6 @@
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 
-
 class ExprMissingValueTest {
 
   @Test
@@ -51,8 +49,9 @@ public void equal() {
 
   @Test
   public void comparabilityTest() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> compare(LITERAL_MISSING, LITERAL_MISSING));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class, () -> compare(LITERAL_MISSING, LITERAL_MISSING));
     assertEquals("invalid to call compare operation on missing value", exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprNullValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprNullValueTest.java
index f7087a949d..81bcf8f7b3 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprNullValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprNullValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -50,8 +49,9 @@ public void equal() {
 
   @Test
   public void comparabilityTest() {
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> compare(LITERAL_NULL, LITERAL_NULL));
+    ExpressionEvaluationException exception =
+        assertThrows(
+            ExpressionEvaluationException.class, () -> compare(LITERAL_NULL, LITERAL_NULL));
     assertEquals("invalid to call compare operation on null value", exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprNumberValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprNumberValueTest.java
index 8c3f9dc742..ee245d73b4 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprNumberValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprNumberValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -17,8 +16,9 @@ public class ExprNumberValueTest {
   @Test
   public void getShortValueFromIncompatibleExprValue() {
     ExprBooleanValue booleanValue = ExprBooleanValue.of(true);
-    ExpressionEvaluationException exception = Assertions
-        .assertThrows(ExpressionEvaluationException.class, () -> booleanValue.shortValue());
+    ExpressionEvaluationException exception =
+        Assertions.assertThrows(
+            ExpressionEvaluationException.class, () -> booleanValue.shortValue());
     assertEquals("invalid to get shortValue from value of type BOOLEAN", exception.getMessage());
   }
 
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprStringValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprStringValueTest.java
index abbb730a0c..2a5e5033f7 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprStringValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprStringValueTest.java
@@ -27,8 +27,8 @@ public void equal() {
     ExprValue v2 = ExprValueUtils.stringValue("str");
     assertTrue(v1.equals(v2));
     assertTrue(v2.equals(v1));
-    assertEquals(0, ((ExprStringValue)v1).compare((ExprStringValue)v2));
-    assertEquals(0, ((ExprStringValue)v2).compare((ExprStringValue)v1));
+    assertEquals(0, ((ExprStringValue) v1).compare((ExprStringValue) v2));
+    assertEquals(0, ((ExprStringValue) v2).compare((ExprStringValue) v1));
   }
 
   @Test
@@ -42,7 +42,9 @@ public void compare() {
   @Test
   public void invalid_get_value() {
     ExprDateValue value = new ExprDateValue("2020-08-20");
-    assertThrows(ExpressionEvaluationException.class, value::stringValue,
+    assertThrows(
+        ExpressionEvaluationException.class,
+        value::stringValue,
         String.format("invalid to get intervalValue from value of type %s", value.type()));
   }
 
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprTupleValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprTupleValueTest.java
index f2568e5cb4..567e1e78db 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprTupleValueTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprTupleValueTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -52,8 +51,8 @@ public void compare_tuple_with_different_size() {
   @Test
   public void comparabilityTest() {
     ExprValue tupleValue = ExprValueUtils.tupleValue(ImmutableMap.of("integer_value", 2));
-    ExpressionEvaluationException exception = assertThrows(ExpressionEvaluationException.class,
-        () -> compare(tupleValue, tupleValue));
+    ExpressionEvaluationException exception =
+        assertThrows(ExpressionEvaluationException.class, () -> compare(tupleValue, tupleValue));
     assertEquals("ExprTupleValue instances are not comparable", exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprValueCompareTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprValueCompareTest.java
index 3ece5e9a96..b965dff643 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprValueCompareTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprValueCompareTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -42,136 +41,148 @@ public void dateValueCompare() {
 
   @Test
   public void datetimeValueCompare() {
-    assertEquals(0,
+    assertEquals(
+        0,
         new ExprDatetimeValue("2012-08-07 18:00:00")
             .compareTo(new ExprDatetimeValue("2012-08-07 18:00:00")));
-    assertEquals(1,
+    assertEquals(
+        1,
         new ExprDatetimeValue("2012-08-07 19:00:00")
             .compareTo(new ExprDatetimeValue("2012-08-07 18:00:00")));
-    assertEquals(-1,
+    assertEquals(
+        -1,
         new ExprDatetimeValue("2012-08-07 18:00:00")
             .compareTo(new ExprDatetimeValue("2012-08-07 19:00:00")));
   }
 
   @Test
   public void timestampValueCompare() {
-    assertEquals(0,
+    assertEquals(
+        0,
         new ExprTimestampValue("2012-08-07 18:00:00")
             .compareTo(new ExprTimestampValue("2012-08-07 18:00:00")));
-    assertEquals(1,
+    assertEquals(
+        1,
         new ExprTimestampValue("2012-08-07 19:00:00")
             .compareTo(new ExprTimestampValue("2012-08-07 18:00:00")));
-    assertEquals(-1,
+    assertEquals(
+        -1,
         new ExprTimestampValue("2012-08-07 18:00:00")
             .compareTo(new ExprTimestampValue("2012-08-07 19:00:00")));
   }
 
   private static Stream<Arguments> getEqualDatetimeValuesOfDifferentTypes() {
     return Stream.of(
-      Arguments.of(new ExprTimestampValue("1961-04-12 09:07:00"),
-          new ExprDatetimeValue("1961-04-12 09:07:00")),
-      Arguments.of(new ExprTimestampValue("1984-11-22 00:00:00"),
-          new ExprDateValue("1984-11-22")),
-      Arguments.of(new ExprTimestampValue(LocalDate.now() + " 00:00:00"),
-          new ExprDateValue(LocalDate.now())),
-      Arguments.of(new ExprDatetimeValue(LocalDate.now() + " 17:42:15"),
-          new ExprTimeValue("17:42:15")),
-      Arguments.of(new ExprDatetimeValue("2012-08-07 19:14:38"),
-          new ExprTimestampValue("2012-08-07 19:14:38")),
-      Arguments.of(new ExprDateValue("2012-08-07"),
-          new ExprDatetimeValue("2012-08-07 00:00:00")),
-      Arguments.of(new ExprDateValue("2007-01-27"),
-          new ExprDatetimeValue("2007-01-27 00:00:00")),
-      Arguments.of(new ExprDateValue(LocalDate.now()),
-          new ExprTimeValue("00:00:00")),
-      Arguments.of(new ExprTimestampValue("1984-11-22 00:00:00"),
-          new ExprDateValue("1984-11-22")),
-      Arguments.of(new ExprTimeValue("19:14:38"),
-          new ExprDatetimeValue(LocalDate.now() + " 19:14:38")),
-      Arguments.of(new ExprTimeValue("17:42:15"),
-          new ExprTimestampValue(LocalDate.now() + " 17:42:15"))
-    );
+        Arguments.of(
+            new ExprTimestampValue("1961-04-12 09:07:00"),
+            new ExprDatetimeValue("1961-04-12 09:07:00")),
+        Arguments.of(
+            new ExprTimestampValue("1984-11-22 00:00:00"), new ExprDateValue("1984-11-22")),
+        Arguments.of(
+            new ExprTimestampValue(LocalDate.now() + " 00:00:00"),
+            new ExprDateValue(LocalDate.now())),
+        Arguments.of(
+            new ExprDatetimeValue(LocalDate.now() + " 17:42:15"), new ExprTimeValue("17:42:15")),
+        Arguments.of(
+            new ExprDatetimeValue("2012-08-07 19:14:38"),
+            new ExprTimestampValue("2012-08-07 19:14:38")),
+        Arguments.of(new ExprDateValue("2012-08-07"), new ExprDatetimeValue("2012-08-07 00:00:00")),
+        Arguments.of(new ExprDateValue("2007-01-27"), new ExprDatetimeValue("2007-01-27 00:00:00")),
+        Arguments.of(new ExprDateValue(LocalDate.now()), new ExprTimeValue("00:00:00")),
+        Arguments.of(
+            new ExprTimestampValue("1984-11-22 00:00:00"), new ExprDateValue("1984-11-22")),
+        Arguments.of(
+            new ExprTimeValue("19:14:38"), new ExprDatetimeValue(LocalDate.now() + " 19:14:38")),
+        Arguments.of(
+            new ExprTimeValue("17:42:15"), new ExprTimestampValue(LocalDate.now() + " 17:42:15")));
   }
 
   /**
-   *  We can't compare directly ExprValues of different datetime types, we need to use
-   *  `FunctionProperties` object to extract comparable values.
+   * We can't compare directly ExprValues of different datetime types, we need to use
+   * `FunctionProperties` object to extract comparable values.
    */
   @ParameterizedTest
   @MethodSource("getEqualDatetimeValuesOfDifferentTypes")
   public void compareEqDifferentDateTimeValueTypes(ExprValue left, ExprValue right) {
-    assertEquals(0, extractDateTime(left, functionProperties)
-        .compareTo(extractDateTime(right, functionProperties)));
-    assertEquals(0, extractDateTime(right, functionProperties)
-        .compareTo(extractDateTime(left, functionProperties)));
+    assertEquals(
+        0,
+        extractDateTime(left, functionProperties)
+            .compareTo(extractDateTime(right, functionProperties)));
+    assertEquals(
+        0,
+        extractDateTime(right, functionProperties)
+            .compareTo(extractDateTime(left, functionProperties)));
   }
 
   private static Stream<Arguments> getNotEqualDatetimeValuesOfDifferentTypes() {
     return Stream.of(
-        Arguments.of(new ExprDatetimeValue("2012-08-07 19:14:38"),
+        Arguments.of(
+            new ExprDatetimeValue("2012-08-07 19:14:38"),
             new ExprTimestampValue("1961-04-12 09:07:00")),
-        Arguments.of(new ExprDatetimeValue("2012-08-07 19:14:38"),
-            new ExprTimeValue("09:07:00")),
-        Arguments.of(new ExprDatetimeValue(LocalDate.now() + " 19:14:38"),
-            new ExprTimeValue("09:07:00")),
-        Arguments.of(new ExprDatetimeValue("2012-08-07 00:00:00"),
-            new ExprDateValue("1961-04-12")),
-        Arguments.of(new ExprDatetimeValue("1961-04-12 19:14:38"),
-            new ExprDateValue("1961-04-12")),
-        Arguments.of(new ExprDateValue("1984-11-22"),
-            new ExprDatetimeValue("1961-04-12 19:14:38")),
-        Arguments.of(new ExprDateValue("1984-11-22"),
-            new ExprTimestampValue("2020-09-16 17:30:00")),
-        Arguments.of(new ExprDateValue("1984-11-22"),
-            new ExprTimeValue("19:14:38")),
-        Arguments.of(new ExprTimeValue("19:14:38"),
-            new ExprDateValue(LocalDate.now())),
-        Arguments.of(new ExprTimeValue("19:14:38"),
-            new ExprDatetimeValue("2012-08-07 09:07:00")),
-        Arguments.of(new ExprTimeValue("19:14:38"),
-            new ExprTimestampValue("1984-02-03 04:05:07")),
-        Arguments.of(new ExprTimestampValue("2012-08-07 19:14:38"),
+        Arguments.of(new ExprDatetimeValue("2012-08-07 19:14:38"), new ExprTimeValue("09:07:00")),
+        Arguments.of(
+            new ExprDatetimeValue(LocalDate.now() + " 19:14:38"), new ExprTimeValue("09:07:00")),
+        Arguments.of(new ExprDatetimeValue("2012-08-07 00:00:00"), new ExprDateValue("1961-04-12")),
+        Arguments.of(new ExprDatetimeValue("1961-04-12 19:14:38"), new ExprDateValue("1961-04-12")),
+        Arguments.of(new ExprDateValue("1984-11-22"), new ExprDatetimeValue("1961-04-12 19:14:38")),
+        Arguments.of(
+            new ExprDateValue("1984-11-22"), new ExprTimestampValue("2020-09-16 17:30:00")),
+        Arguments.of(new ExprDateValue("1984-11-22"), new ExprTimeValue("19:14:38")),
+        Arguments.of(new ExprTimeValue("19:14:38"), new ExprDateValue(LocalDate.now())),
+        Arguments.of(new ExprTimeValue("19:14:38"), new ExprDatetimeValue("2012-08-07 09:07:00")),
+        Arguments.of(new ExprTimeValue("19:14:38"), new ExprTimestampValue("1984-02-03 04:05:07")),
+        Arguments.of(
+            new ExprTimestampValue("2012-08-07 19:14:38"),
             new ExprDatetimeValue("1961-04-12 09:07:00")),
-        Arguments.of(new ExprTimestampValue("2012-08-07 19:14:38"),
-            new ExprTimeValue("09:07:00")),
-        Arguments.of(new ExprTimestampValue(LocalDate.now() + " 19:14:38"),
-            new ExprTimeValue("09:07:00")),
-        Arguments.of(new ExprTimestampValue("2012-08-07 00:00:00"),
-            new ExprDateValue("1961-04-12")),
-        Arguments.of(new ExprTimestampValue("1961-04-12 19:14:38"),
-            new ExprDateValue("1961-04-12"))
-    );
+        Arguments.of(new ExprTimestampValue("2012-08-07 19:14:38"), new ExprTimeValue("09:07:00")),
+        Arguments.of(
+            new ExprTimestampValue(LocalDate.now() + " 19:14:38"), new ExprTimeValue("09:07:00")),
+        Arguments.of(
+            new ExprTimestampValue("2012-08-07 00:00:00"), new ExprDateValue("1961-04-12")),
+        Arguments.of(
+            new ExprTimestampValue("1961-04-12 19:14:38"), new ExprDateValue("1961-04-12")));
   }
 
   /**
-   *  We can't compare directly ExprValues of different datetime types, we need to use
-   *  `FunctionProperties` object to extract comparable values.
+   * We can't compare directly ExprValues of different datetime types, we need to use
+   * `FunctionProperties` object to extract comparable values.
    */
   @ParameterizedTest
   @MethodSource("getNotEqualDatetimeValuesOfDifferentTypes")
   public void compareNeqDifferentDateTimeValueTypes(ExprValue left, ExprValue right) {
-    assertNotEquals(0, extractDateTime(left, functionProperties)
-        .compareTo(extractDateTime(right, functionProperties)));
-    assertNotEquals(0, extractDateTime(right, functionProperties)
-        .compareTo(extractDateTime(left, functionProperties)));
+    assertNotEquals(
+        0,
+        extractDateTime(left, functionProperties)
+            .compareTo(extractDateTime(right, functionProperties)));
+    assertNotEquals(
+        0,
+        extractDateTime(right, functionProperties)
+            .compareTo(extractDateTime(left, functionProperties)));
   }
 
   @Test
   public void compareDateTimeWithNotADateTime() {
-    var exception = assertThrows(ExpressionEvaluationException.class, () ->
-        new ExprDoubleValue(3.1415).compareTo(new ExprIntervalValue(Period.ofDays(1))));
-    assertEquals("compare expected value have same type, but with [DOUBLE, INTERVAL]",
+    var exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> new ExprDoubleValue(3.1415).compareTo(new ExprIntervalValue(Period.ofDays(1))));
+    assertEquals(
+        "compare expected value have same type, but with [DOUBLE, INTERVAL]",
         exception.getMessage());
 
-    exception = assertThrows(ExpressionEvaluationException.class, () ->
-        new ExprDateValue("1961-04-12").compareTo(new ExprIntegerValue(1)));
-    assertEquals("compare expected value have same type, but with [DATE, INTEGER]",
-        exception.getMessage());
+    exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> new ExprDateValue("1961-04-12").compareTo(new ExprIntegerValue(1)));
+    assertEquals(
+        "compare expected value have same type, but with [DATE, INTEGER]", exception.getMessage());
 
-    exception = assertThrows(ExpressionEvaluationException.class, () ->
-        new ExprStringValue("something").compareTo(new ExprTimeValue("10:20:30")));
-    assertEquals("compare expected value have same type, but with [STRING, TIME]",
-        exception.getMessage());
+    exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> new ExprStringValue("something").compareTo(new ExprTimeValue("10:20:30")));
+    assertEquals(
+        "compare expected value have same type, but with [STRING, TIME]", exception.getMessage());
   }
 
   @Test
@@ -194,8 +205,7 @@ private static Stream<Arguments> getEqualNumericValuesOfDifferentTypes() {
         Arguments.of(new ExprIntegerValue(42), new ExprShortValue(42)),
         Arguments.of(new ExprIntegerValue(42), new ExprLongValue(42)),
         Arguments.of(new ExprIntegerValue(42), new ExprFloatValue(42)),
-        Arguments.of(new ExprIntegerValue(42), new ExprDoubleValue(42))
-    );
+        Arguments.of(new ExprIntegerValue(42), new ExprDoubleValue(42)));
   }
 
   @ParameterizedTest
@@ -211,8 +221,7 @@ private static Stream<Arguments> getNotEqualNumericValuesOfDifferentTypes() {
         Arguments.of(new ExprIntegerValue(42), new ExprShortValue(146)),
         Arguments.of(new ExprIntegerValue(42), new ExprLongValue(100500)),
         Arguments.of(new ExprIntegerValue(42), new ExprFloatValue(-1.5)),
-        Arguments.of(new ExprIntegerValue(42), new ExprDoubleValue(1468.84138))
-    );
+        Arguments.of(new ExprIntegerValue(42), new ExprDoubleValue(1468.84138)));
   }
 
   @ParameterizedTest
@@ -231,47 +240,50 @@ public void stringValueCompare() {
 
   @Test
   public void intervalValueCompare() {
-    assertEquals(0, new ExprIntervalValue(Period.ofDays(1))
-        .compareTo(new ExprIntervalValue(Period.ofDays(1))));
-    assertEquals(1, new ExprIntervalValue(Period.ofDays(2))
-        .compareTo(new ExprIntervalValue(Period.ofDays(1))));
-    assertEquals(-1, new ExprIntervalValue(Period.ofDays(1))
-        .compareTo(new ExprIntervalValue(Period.ofDays(2))));
+    assertEquals(
+        0,
+        new ExprIntervalValue(Period.ofDays(1)).compareTo(new ExprIntervalValue(Period.ofDays(1))));
+    assertEquals(
+        1,
+        new ExprIntervalValue(Period.ofDays(2)).compareTo(new ExprIntervalValue(Period.ofDays(1))));
+    assertEquals(
+        -1,
+        new ExprIntervalValue(Period.ofDays(1)).compareTo(new ExprIntervalValue(Period.ofDays(2))));
   }
 
   @Test
   public void missingCompareToMethodShouldNotBeenCalledDirectly() {
-    IllegalStateException exception = assertThrows(IllegalStateException.class,
-        () -> LITERAL_MISSING.compareTo(LITERAL_FALSE));
-    assertEquals("[BUG] Unreachable, Comparing with NULL or MISSING is undefined",
-        exception.getMessage());
+    IllegalStateException exception =
+        assertThrows(IllegalStateException.class, () -> LITERAL_MISSING.compareTo(LITERAL_FALSE));
+    assertEquals(
+        "[BUG] Unreachable, Comparing with NULL or MISSING is undefined", exception.getMessage());
 
-    exception = assertThrows(IllegalStateException.class,
-        () -> LITERAL_FALSE.compareTo(LITERAL_MISSING));
-    assertEquals("[BUG] Unreachable, Comparing with NULL or MISSING is undefined",
-        exception.getMessage());
+    exception =
+        assertThrows(IllegalStateException.class, () -> LITERAL_FALSE.compareTo(LITERAL_MISSING));
+    assertEquals(
+        "[BUG] Unreachable, Comparing with NULL or MISSING is undefined", exception.getMessage());
 
-    exception = assertThrows(IllegalStateException.class,
-        () -> ExprMissingValue.of().compare(LITERAL_MISSING));
-    assertEquals("[BUG] Unreachable, Comparing with MISSING is undefined",
-        exception.getMessage());
+    exception =
+        assertThrows(
+            IllegalStateException.class, () -> ExprMissingValue.of().compare(LITERAL_MISSING));
+    assertEquals("[BUG] Unreachable, Comparing with MISSING is undefined", exception.getMessage());
   }
 
   @Test
   public void nullCompareToMethodShouldNotBeenCalledDirectly() {
-    IllegalStateException exception = assertThrows(IllegalStateException.class,
-        () -> LITERAL_NULL.compareTo(LITERAL_FALSE));
-    assertEquals("[BUG] Unreachable, Comparing with NULL or MISSING is undefined",
-        exception.getMessage());
+    IllegalStateException exception =
+        assertThrows(IllegalStateException.class, () -> LITERAL_NULL.compareTo(LITERAL_FALSE));
+    assertEquals(
+        "[BUG] Unreachable, Comparing with NULL or MISSING is undefined", exception.getMessage());
 
-    exception = assertThrows(IllegalStateException.class,
-        () -> LITERAL_FALSE.compareTo(LITERAL_NULL));
-    assertEquals("[BUG] Unreachable, Comparing with NULL or MISSING is undefined",
-        exception.getMessage());
+    exception =
+        assertThrows(IllegalStateException.class, () -> LITERAL_FALSE.compareTo(LITERAL_NULL));
+    assertEquals(
+        "[BUG] Unreachable, Comparing with NULL or MISSING is undefined", exception.getMessage());
 
-    exception = assertThrows(IllegalStateException.class,
-        () -> ExprNullValue.of().compare(LITERAL_MISSING));
-    assertEquals("[BUG] Unreachable, Comparing with NULL is undefined",
-        exception.getMessage());
+    exception =
+        assertThrows(
+            IllegalStateException.class, () -> ExprNullValue.of().compare(LITERAL_MISSING));
+    assertEquals("[BUG] Unreachable, Comparing with NULL is undefined", exception.getMessage());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/model/ExprValueUtilsTest.java b/core/src/test/java/org/opensearch/sql/data/model/ExprValueUtilsTest.java
index c4a00fe5ca..c879384955 100644
--- a/core/src/test/java/org/opensearch/sql/data/model/ExprValueUtilsTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/model/ExprValueUtilsTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.model;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -58,71 +57,87 @@ public class ExprValueUtilsTest {
     testTuple.put("1", new ExprIntegerValue(1));
   }
 
-  private static List<ExprValue> numberValues = Stream.of((byte) 1, (short) 1, 1, 1L, 1f, 1D)
-      .map(ExprValueUtils::fromObjectValue).collect(Collectors.toList());
+  private static List<ExprValue> numberValues =
+      Stream.of((byte) 1, (short) 1, 1, 1L, 1f, 1D)
+          .map(ExprValueUtils::fromObjectValue)
+          .collect(Collectors.toList());
 
-  private static List<ExprValue> nonNumberValues = Arrays.asList(
-      new ExprStringValue("1"),
-      ExprBooleanValue.of(true),
-      new ExprCollectionValue(ImmutableList.of(new ExprIntegerValue(1))),
-      new ExprTupleValue(testTuple),
-      new ExprDateValue("2012-08-07"),
-      new ExprTimeValue("18:00:00"),
-      new ExprDatetimeValue("2012-08-07 18:00:00"),
-      new ExprTimestampValue("2012-08-07 18:00:00"),
-      new ExprIntervalValue(Duration.ofSeconds(100)));
+  private static List<ExprValue> nonNumberValues =
+      Arrays.asList(
+          new ExprStringValue("1"),
+          ExprBooleanValue.of(true),
+          new ExprCollectionValue(ImmutableList.of(new ExprIntegerValue(1))),
+          new ExprTupleValue(testTuple),
+          new ExprDateValue("2012-08-07"),
+          new ExprTimeValue("18:00:00"),
+          new ExprDatetimeValue("2012-08-07 18:00:00"),
+          new ExprTimestampValue("2012-08-07 18:00:00"),
+          new ExprIntervalValue(Duration.ofSeconds(100)));
 
   private static List<ExprValue> allValues =
       Lists.newArrayList(Iterables.concat(numberValues, nonNumberValues));
 
-  private static List<Function<ExprValue, Object>> numberValueExtractor = Arrays.asList(
-      ExprValueUtils::getByteValue,
-      ExprValueUtils::getShortValue,
-      ExprValueUtils::getIntegerValue,
-      ExprValueUtils::getLongValue,
-      ExprValueUtils::getFloatValue,
-      ExprValueUtils::getDoubleValue);
-  private static List<Function<ExprValue, Object>> nonNumberValueExtractor = Arrays.asList(
-      ExprValueUtils::getStringValue,
-      ExprValueUtils::getBooleanValue,
-      ExprValueUtils::getCollectionValue,
-      ExprValueUtils::getTupleValue
-  );
-  private static List<Function<ExprValue, Object>> dateAndTimeValueExtractor = Arrays.asList(
-      ExprValue::dateValue,
-      ExprValue::timeValue,
-      ExprValue::datetimeValue,
-      ExprValue::timestampValue,
-      ExprValue::intervalValue);
-  private static List<Function<ExprValue, Object>> allValueExtractor = Lists.newArrayList(
-      Iterables.concat(numberValueExtractor, nonNumberValueExtractor, dateAndTimeValueExtractor));
+  private static List<Function<ExprValue, Object>> numberValueExtractor =
+      Arrays.asList(
+          ExprValueUtils::getByteValue,
+          ExprValueUtils::getShortValue,
+          ExprValueUtils::getIntegerValue,
+          ExprValueUtils::getLongValue,
+          ExprValueUtils::getFloatValue,
+          ExprValueUtils::getDoubleValue);
+  private static List<Function<ExprValue, Object>> nonNumberValueExtractor =
+      Arrays.asList(
+          ExprValueUtils::getStringValue,
+          ExprValueUtils::getBooleanValue,
+          ExprValueUtils::getCollectionValue,
+          ExprValueUtils::getTupleValue);
+  private static List<Function<ExprValue, Object>> dateAndTimeValueExtractor =
+      Arrays.asList(
+          ExprValue::dateValue,
+          ExprValue::timeValue,
+          ExprValue::datetimeValue,
+          ExprValue::timestampValue,
+          ExprValue::intervalValue);
+  private static List<Function<ExprValue, Object>> allValueExtractor =
+      Lists.newArrayList(
+          Iterables.concat(
+              numberValueExtractor, nonNumberValueExtractor, dateAndTimeValueExtractor));
 
   private static List<ExprCoreType> numberTypes =
-      Arrays.asList(ExprCoreType.BYTE, ExprCoreType.SHORT, ExprCoreType.INTEGER, ExprCoreType.LONG,
-          ExprCoreType.FLOAT, ExprCoreType.DOUBLE);
-  private static List<ExprCoreType> nonNumberTypes =
-      Arrays.asList(STRING, BOOLEAN, ARRAY, STRUCT);
+      Arrays.asList(
+          ExprCoreType.BYTE,
+          ExprCoreType.SHORT,
+          ExprCoreType.INTEGER,
+          ExprCoreType.LONG,
+          ExprCoreType.FLOAT,
+          ExprCoreType.DOUBLE);
+  private static List<ExprCoreType> nonNumberTypes = Arrays.asList(STRING, BOOLEAN, ARRAY, STRUCT);
   private static List<ExprCoreType> dateAndTimeTypes =
       Arrays.asList(DATE, TIME, DATETIME, TIMESTAMP, INTERVAL);
   private static List<ExprCoreType> allTypes =
       Lists.newArrayList(Iterables.concat(numberTypes, nonNumberTypes, dateAndTimeTypes));
 
   private static Stream<Arguments> getValueTestArgumentStream() {
-    List<Object> expectedValues = Arrays.asList((byte) 1, (short) 1, 1, 1L, 1f, 1D, "1", true,
-        Arrays.asList(integerValue(1)),
-        ImmutableMap.of("1", integerValue(1)),
-        LocalDate.parse("2012-08-07"),
-        LocalTime.parse("18:00:00"),
-        LocalDateTime.parse("2012-08-07T18:00:00"),
-        ZonedDateTime.of(LocalDateTime.parse("2012-08-07T18:00:00"), UTC_ZONE_ID).toInstant(),
-        Duration.ofSeconds(100)
-    );
+    List<Object> expectedValues =
+        Arrays.asList(
+            (byte) 1,
+            (short) 1,
+            1,
+            1L,
+            1f,
+            1D,
+            "1",
+            true,
+            Arrays.asList(integerValue(1)),
+            ImmutableMap.of("1", integerValue(1)),
+            LocalDate.parse("2012-08-07"),
+            LocalTime.parse("18:00:00"),
+            LocalDateTime.parse("2012-08-07T18:00:00"),
+            ZonedDateTime.of(LocalDateTime.parse("2012-08-07T18:00:00"), UTC_ZONE_ID).toInstant(),
+            Duration.ofSeconds(100));
     Stream.Builder<Arguments> builder = Stream.builder();
     for (int i = 0; i < expectedValues.size(); i++) {
-      builder.add(Arguments.of(
-          allValues.get(i),
-          allValueExtractor.get(i),
-          expectedValues.get(i)));
+      builder.add(Arguments.of(allValues.get(i), allValueExtractor.get(i), expectedValues.get(i)));
     }
     return builder.build();
   }
@@ -130,16 +145,13 @@ private static Stream<Arguments> getValueTestArgumentStream() {
   private static Stream<Arguments> getTypeTestArgumentStream() {
     Stream.Builder<Arguments> builder = Stream.builder();
     for (int i = 0; i < allValues.size(); i++) {
-      builder.add(Arguments.of(
-          allValues.get(i),
-          allTypes.get(i)));
+      builder.add(Arguments.of(allValues.get(i), allTypes.get(i)));
     }
     return builder.build();
   }
 
   private static Stream<Arguments> invalidGetNumberValueArgumentStream() {
-    return Lists.cartesianProduct(nonNumberValues, numberValueExtractor)
-        .stream()
+    return Lists.cartesianProduct(nonNumberValues, numberValueExtractor).stream()
         .map(list -> Arguments.of(list.get(0), list.get(1)));
   }
 
@@ -151,23 +163,20 @@ private static Stream<Arguments> invalidConvert() {
       extractorWithTypeList.add(
           new AbstractMap.SimpleEntry<>(nonNumberValueExtractor.get(i), nonNumberTypes.get(i)));
     }
-    return Lists.cartesianProduct(allValues, extractorWithTypeList)
-        .stream()
-        .filter(list -> {
-          ExprValue value = (ExprValue) list.get(0);
-          Map.Entry<Function<ExprValue, Object>, ExprCoreType> entry =
-              (Map.Entry<Function<ExprValue, Object>,
-                  ExprCoreType>) list
-                  .get(1);
-          return entry.getValue() != value.type();
-        })
-        .map(list -> {
-          Map.Entry<Function<ExprValue, Object>, ExprCoreType> entry =
-              (Map.Entry<Function<ExprValue, Object>,
-                  ExprCoreType>) list
-                  .get(1);
-          return Arguments.of(list.get(0), entry.getKey(), entry.getValue());
-        });
+    return Lists.cartesianProduct(allValues, extractorWithTypeList).stream()
+        .filter(
+            list -> {
+              ExprValue value = (ExprValue) list.get(0);
+              Map.Entry<Function<ExprValue, Object>, ExprCoreType> entry =
+                  (Map.Entry<Function<ExprValue, Object>, ExprCoreType>) list.get(1);
+              return entry.getValue() != value.type();
+            })
+        .map(
+            list -> {
+              Map.Entry<Function<ExprValue, Object>, ExprCoreType> entry =
+                  (Map.Entry<Function<ExprValue, Object>, ExprCoreType>) list.get(1);
+              return Arguments.of(list.get(0), entry.getKey(), entry.getValue());
+            });
   }
 
   @ParameterizedTest(name = "the value of ExprValue:{0} is: {2} ")
@@ -182,36 +191,33 @@ public void getType(ExprValue value, ExprCoreType expectType) {
     assertEquals(expectType, value.type());
   }
 
-  /**
-   * Test Invalid to get number.
-   */
+  /** Test Invalid to get number. */
   @ParameterizedTest(name = "invalid to get number value of ExprValue:{0}")
   @MethodSource("invalidGetNumberValueArgumentStream")
   public void invalidGetNumberValue(ExprValue value, Function<ExprValue, Object> extractor) {
-    Exception exception = assertThrows(ExpressionEvaluationException.class,
-        () -> extractor.apply(value));
+    Exception exception =
+        assertThrows(ExpressionEvaluationException.class, () -> extractor.apply(value));
     assertThat(exception.getMessage(), Matchers.containsString("invalid"));
   }
 
-  /**
-   * Test Invalid to convert.
-   */
+  /** Test Invalid to convert. */
   @ParameterizedTest(name = "invalid convert ExprValue:{0} to ExprType:{2}")
   @MethodSource("invalidConvert")
-  public void invalidConvertExprValue(ExprValue value, Function<ExprValue, Object> extractor,
-                                      ExprCoreType toType) {
-    Exception exception = assertThrows(ExpressionEvaluationException.class,
-        () -> extractor.apply(value));
+  public void invalidConvertExprValue(
+      ExprValue value, Function<ExprValue, Object> extractor, ExprCoreType toType) {
+    Exception exception =
+        assertThrows(ExpressionEvaluationException.class, () -> extractor.apply(value));
     assertThat(exception.getMessage(), Matchers.containsString("invalid"));
   }
 
   @Test
   public void unSupportedObject() {
-    Exception exception = assertThrows(ExpressionEvaluationException.class,
-        () -> ExprValueUtils.fromObjectValue(integerValue(1)));
+    Exception exception =
+        assertThrows(
+            ExpressionEvaluationException.class,
+            () -> ExprValueUtils.fromObjectValue(integerValue(1)));
     assertEquals(
-        "unsupported object "
-            + "class org.opensearch.sql.data.model.ExprIntegerValue",
+        "unsupported object " + "class org.opensearch.sql.data.model.ExprIntegerValue",
         exception.getMessage());
   }
 
@@ -228,13 +234,14 @@ public void bindingTuples() {
 
   @Test
   public void constructDateAndTimeValue() {
-    assertEquals(new ExprDateValue("2012-07-07"),
-        ExprValueUtils.fromObjectValue("2012-07-07", DATE));
-    assertEquals(new ExprTimeValue("01:01:01"),
-        ExprValueUtils.fromObjectValue("01:01:01", TIME));
-    assertEquals(new ExprDatetimeValue("2012-07-07 01:01:01"),
+    assertEquals(
+        new ExprDateValue("2012-07-07"), ExprValueUtils.fromObjectValue("2012-07-07", DATE));
+    assertEquals(new ExprTimeValue("01:01:01"), ExprValueUtils.fromObjectValue("01:01:01", TIME));
+    assertEquals(
+        new ExprDatetimeValue("2012-07-07 01:01:01"),
         ExprValueUtils.fromObjectValue("2012-07-07 01:01:01", DATETIME));
-    assertEquals(new ExprTimestampValue("2012-07-07 01:01:01"),
+    assertEquals(
+        new ExprTimestampValue("2012-07-07 01:01:01"),
         ExprValueUtils.fromObjectValue("2012-07-07 01:01:01", TIMESTAMP));
   }
 
@@ -244,17 +251,20 @@ public void hashCodeTest() {
     assertEquals(new ExprShortValue(1).hashCode(), new ExprShortValue(1).hashCode());
     assertEquals(new ExprIntegerValue(1).hashCode(), new ExprIntegerValue(1).hashCode());
     assertEquals(new ExprStringValue("1").hashCode(), new ExprStringValue("1").hashCode());
-    assertEquals(new ExprCollectionValue(ImmutableList.of(new ExprIntegerValue(1))).hashCode(),
+    assertEquals(
+        new ExprCollectionValue(ImmutableList.of(new ExprIntegerValue(1))).hashCode(),
         new ExprCollectionValue(ImmutableList.of(new ExprIntegerValue(1))).hashCode());
-    assertEquals(new ExprTupleValue(testTuple).hashCode(),
-        new ExprTupleValue(testTuple).hashCode());
-    assertEquals(new ExprDateValue("2012-08-07").hashCode(),
-        new ExprDateValue("2012-08-07").hashCode());
-    assertEquals(new ExprTimeValue("18:00:00").hashCode(),
-        new ExprTimeValue("18:00:00").hashCode());
-    assertEquals(new ExprDatetimeValue("2012-08-07 18:00:00").hashCode(),
+    assertEquals(
+        new ExprTupleValue(testTuple).hashCode(), new ExprTupleValue(testTuple).hashCode());
+    assertEquals(
+        new ExprDateValue("2012-08-07").hashCode(), new ExprDateValue("2012-08-07").hashCode());
+    assertEquals(
+        new ExprTimeValue("18:00:00").hashCode(), new ExprTimeValue("18:00:00").hashCode());
+    assertEquals(
+        new ExprDatetimeValue("2012-08-07 18:00:00").hashCode(),
         new ExprDatetimeValue("2012-08-07 18:00:00").hashCode());
-    assertEquals(new ExprTimestampValue("2012-08-07 18:00:00").hashCode(),
+    assertEquals(
+        new ExprTimestampValue("2012-08-07 18:00:00").hashCode(),
         new ExprTimestampValue("2012-08-07 18:00:00").hashCode());
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/data/type/ExprTypeTest.java b/core/src/test/java/org/opensearch/sql/data/type/ExprTypeTest.java
index 7db856d092..1def15cc6f 100644
--- a/core/src/test/java/org/opensearch/sql/data/type/ExprTypeTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/type/ExprTypeTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.type;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/core/src/test/java/org/opensearch/sql/data/utils/ExprValueOrderingTest.java b/core/src/test/java/org/opensearch/sql/data/utils/ExprValueOrderingTest.java
index ec00aebe18..cf9bb538c4 100644
--- a/core/src/test/java/org/opensearch/sql/data/utils/ExprValueOrderingTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/utils/ExprValueOrderingTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -32,10 +31,8 @@
 
 @ExtendWith(MockitoExtension.class)
 class ExprValueOrderingTest {
-  @Mock
-  ExprValue left;
-  @Mock
-  ExprValue right;
+  @Mock ExprValue left;
+  @Mock ExprValue right;
 
   @Test
   public void natural() {
diff --git a/core/src/test/java/org/opensearch/sql/data/utils/NullsFirstExprValueOrderingTest.java b/core/src/test/java/org/opensearch/sql/data/utils/NullsFirstExprValueOrderingTest.java
index c13f95ad63..97014fc410 100644
--- a/core/src/test/java/org/opensearch/sql/data/utils/NullsFirstExprValueOrderingTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/utils/NullsFirstExprValueOrderingTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/src/test/java/org/opensearch/sql/data/utils/NullsLastExprValueOrderingTest.java b/core/src/test/java/org/opensearch/sql/data/utils/NullsLastExprValueOrderingTest.java
index ab36247089..3625dc3760 100644
--- a/core/src/test/java/org/opensearch/sql/data/utils/NullsLastExprValueOrderingTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/utils/NullsLastExprValueOrderingTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/src/test/java/org/opensearch/sql/data/utils/ReverseExprValueOrderingTest.java b/core/src/test/java/org/opensearch/sql/data/utils/ReverseExprValueOrderingTest.java
index 297079fca5..ad88eb2c76 100644
--- a/core/src/test/java/org/opensearch/sql/data/utils/ReverseExprValueOrderingTest.java
+++ b/core/src/test/java/org/opensearch/sql/data/utils/ReverseExprValueOrderingTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.data.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;

From 88d772afb1f8167ac579964a4c8c501614309ca0 Mon Sep 17 00:00:00 2001
From: Mitchell Gale <Mitchell.Gale@improving.com>
Date: Wed, 2 Aug 2023 10:30:47 -0700
Subject: [PATCH 2/9] add build.gradle comment to mention why we are ignoring
 checkstyle failures for core.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---
 core/build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/build.gradle b/core/build.gradle
index cb603419d2..cf7f0b7a1c 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -34,6 +34,8 @@ repositories {
     mavenCentral()
 }
 
+// Being ignored as a temporary measure before being removed in favour of
+// spotless https://github.com/opensearch-project/sql/issues/1101
 checkstyleTest.ignoreFailures = true
 checkstyleMain.ignoreFailures = true
 

From 7462233aceefd0ad65b4c3aefc21f5f85e91a841 Mon Sep 17 00:00:00 2001
From: Mitchell Gale <Mitchell.Gale@improving.com>
Date: Wed, 2 Aug 2023 23:39:33 -0700
Subject: [PATCH 3/9] Fix include spotless build gradle.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---
 build.gradle | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7c444c331b..eb89dcde71 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,12 +84,10 @@ repositories {
 spotless {
     java {
         target fileTree('.') {
-            include 'core/src/main/java/org/opensearch/sql/ast/*.java',
-                    'core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java',
-                    'core/src/test/java/org/opensearch/sql/ast/*.java',
-                    'core/src/test/java/org/opensearch/sql/data/*.java',
-                    'core/src/test/java/org/opensearch/sql/config/*.java',
-                    'core/src/test/java/org/opensearch/sql/analysis/*.java'
+            include 'core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java',
+                    'core/src/test/java/org/opensearch/sql/data/**/*.java',
+                    'core/src/test/java/org/opensearch/sql/config/**/*.java',
+                    'core/src/test/java/org/opensearch/sql/analysis/**/*.java'
             exclude '**/build/**', '**/build-*/**'
         }
 //        importOrder()

From b95580d3fab485ba7e14bedae84fb834af75003b Mon Sep 17 00:00:00 2001
From: Mitchell Gale <Mitchell.Gale@improving.com>
Date: Wed, 2 Aug 2023 23:41:33 -0700
Subject: [PATCH 4/9] revert astDSL.JAVA

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---
 .../org/opensearch/sql/ast/dsl/AstDSL.java    | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java b/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
index ec6b0632dd..75f8205173 100644
--- a/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
+++ b/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
@@ -79,7 +79,7 @@ public UnresolvedPlan relation(String tableName) {
 
   public UnresolvedPlan relation(List<String> tableNames) {
     return new Relation(
-        tableNames.stream().map(AstDSL::qualifiedName).collect(Collectors.toList()));
+            tableNames.stream().map(AstDSL::qualifiedName).collect(Collectors.toList()));
   }
 
   public UnresolvedPlan relation(QualifiedName tableName) {
@@ -103,26 +103,26 @@ public static Eval eval(UnresolvedPlan input, Let... projectList) {
   }
 
   public static UnresolvedPlan projectWithArg(
-      UnresolvedPlan input, List<Argument> argList, UnresolvedExpression... projectList) {
+          UnresolvedPlan input, List<Argument> argList, UnresolvedExpression... projectList) {
     return new Project(Arrays.asList(projectList), argList).attach(input);
   }
 
   public static UnresolvedPlan agg(
-      UnresolvedPlan input,
-      List<UnresolvedExpression> aggList,
-      List<UnresolvedExpression> sortList,
-      List<UnresolvedExpression> groupList,
-      List<Argument> argList) {
+          UnresolvedPlan input,
+          List<UnresolvedExpression> aggList,
+          List<UnresolvedExpression> sortList,
+          List<UnresolvedExpression> groupList,
+          List<Argument> argList) {
     return new Aggregation(aggList, sortList, groupList, null, argList).attach(input);
   }
 
   public static UnresolvedPlan agg(
-      UnresolvedPlan input,
-      List<UnresolvedExpression> aggList,
-      List<UnresolvedExpression> sortList,
-      List<UnresolvedExpression> groupList,
-      UnresolvedExpression span,
-      List<Argument> argList) {
+          UnresolvedPlan input,
+          List<UnresolvedExpression> aggList,
+          List<UnresolvedExpression> sortList,
+          List<UnresolvedExpression> groupList,
+          UnresolvedExpression span,
+          List<Argument> argList) {
     return new Aggregation(aggList, sortList, groupList, span, argList).attach(input);
   }
 
@@ -145,7 +145,7 @@ public static QualifiedName qualifiedName(String... parts) {
   }
 
   public static UnresolvedExpression equalTo(
-      UnresolvedExpression left, UnresolvedExpression right) {
+          UnresolvedExpression left, UnresolvedExpression right) {
     return new EqualTo(left, right);
   }
 
@@ -226,12 +226,12 @@ public static UnresolvedExpression aggregate(String func, UnresolvedExpression f
   }
 
   public static UnresolvedExpression aggregate(
-      String func, UnresolvedExpression field, UnresolvedExpression... args) {
+          String func, UnresolvedExpression field, UnresolvedExpression... args) {
     return new AggregateFunction(func, field, Arrays.asList(args));
   }
 
   public static UnresolvedExpression filteredAggregate(
-      String func, UnresolvedExpression field, UnresolvedExpression condition) {
+          String func, UnresolvedExpression field, UnresolvedExpression condition) {
     return new AggregateFunction(func, field).condition(condition);
   }
 
@@ -240,7 +240,7 @@ public static UnresolvedExpression distinctAggregate(String func, UnresolvedExpr
   }
 
   public static UnresolvedExpression filteredDistinctCount(
-      String func, UnresolvedExpression field, UnresolvedExpression condition) {
+          String func, UnresolvedExpression field, UnresolvedExpression condition) {
     return new AggregateFunction(func, field, true).condition(condition);
   }
 
@@ -249,10 +249,10 @@ public static Function function(String funcName, UnresolvedExpression... funcArg
   }
 
   /**
-   * CASE<br>
-   *     WHEN search_condition THEN result_expr<br>
-   *     [WHEN search_condition THEN result_expr] ...<br>
-   *     [ELSE result_expr]<br>
+   * CASE
+   *     WHEN search_condition THEN result_expr
+   *     [WHEN search_condition THEN result_expr] ...
+   *     [ELSE result_expr]
    * END
    */
   public UnresolvedExpression caseWhen(UnresolvedExpression elseClause,
@@ -261,10 +261,10 @@ public UnresolvedExpression caseWhen(UnresolvedExpression elseClause,
   }
 
   /**
-   * CASE case_value_expr<br>
-   *     WHEN compare_expr THEN result_expr<br>
-   *     [WHEN compare_expr THEN result_expr] ...<br>
-   *     [ELSE result_expr]<br>
+   * CASE case_value_expr
+   *     WHEN compare_expr THEN result_expr
+   *     [WHEN compare_expr THEN result_expr] ...
+   *     [ELSE result_expr]
    * END
    */
   public UnresolvedExpression caseWhen(UnresolvedExpression caseValueExpr,
@@ -282,7 +282,7 @@ public When when(UnresolvedExpression condition, UnresolvedExpression result) {
   }
 
   public UnresolvedExpression highlight(UnresolvedExpression fieldName,
-      java.util.Map<String, Literal> arguments) {
+                                        java.util.Map<String, Literal> arguments) {
     return new HighlightFunction(fieldName, arguments);
   }
 
@@ -314,17 +314,17 @@ public static UnresolvedExpression xor(UnresolvedExpression left, UnresolvedExpr
   }
 
   public static UnresolvedExpression in(
-      UnresolvedExpression field, UnresolvedExpression... valueList) {
+          UnresolvedExpression field, UnresolvedExpression... valueList) {
     return new In(field, Arrays.asList(valueList));
   }
 
   public static UnresolvedExpression in(
-      UnresolvedExpression field, List<UnresolvedExpression> valueList) {
+          UnresolvedExpression field, List<UnresolvedExpression> valueList) {
     return new In(field, valueList);
   }
 
   public static UnresolvedExpression compare(
-      String operator, UnresolvedExpression left, UnresolvedExpression right) {
+          String operator, UnresolvedExpression left, UnresolvedExpression right) {
     return new Compare(operator, left, right);
   }
 
@@ -403,10 +403,10 @@ public static List<Argument> defaultFieldsArgs() {
    */
   public static List<Argument> defaultStatsArgs() {
     return exprList(
-        argument("partitions", intLiteral(1)),
-        argument("allnum", booleanLiteral(false)),
-        argument("delim", stringLiteral(" ")),
-        argument("dedupsplit", booleanLiteral(false)));
+            argument("partitions", intLiteral(1)),
+            argument("allnum", booleanLiteral(false)),
+            argument("delim", stringLiteral(" ")),
+            argument("dedupsplit", booleanLiteral(false)));
   }
 
   /**
@@ -414,9 +414,9 @@ public static List<Argument> defaultStatsArgs() {
    */
   public static List<Argument> defaultDedupArgs() {
     return exprList(
-        argument("number", intLiteral(1)),
-        argument("keepempty", booleanLiteral(false)),
-        argument("consecutive", booleanLiteral(false)));
+            argument("number", intLiteral(1)),
+            argument("keepempty", booleanLiteral(false)),
+            argument("consecutive", booleanLiteral(false)));
   }
 
   public static List<Argument> sortOptions() {
@@ -451,7 +451,7 @@ public static RareTopN rareTopN(UnresolvedPlan input, CommandType commandType,
                                   List<Argument> noOfResults, List<UnresolvedExpression> groupList,
                                   Field... fields) {
     return new RareTopN(input, commandType, noOfResults, Arrays.asList(fields), groupList)
-        .attach(input);
+            .attach(input);
   }
 
   public static Limit limit(UnresolvedPlan input, Integer limit, Integer offset) {
@@ -459,10 +459,10 @@ public static Limit limit(UnresolvedPlan input, Integer limit, Integer offset) {
   }
 
   public static Parse parse(UnresolvedPlan input, ParseMethod parseMethod,
-                                  UnresolvedExpression sourceField,
-                                  Literal pattern,
-                                  java.util.Map<String, Literal> arguments) {
+                            UnresolvedExpression sourceField,
+                            Literal pattern,
+                            java.util.Map<String, Literal> arguments) {
     return new Parse(parseMethod, sourceField, pattern, arguments, input);
   }
 
-}
+}
\ No newline at end of file

From de6831d9af6c1acda862fae192d6e4bd37ccb1e6 Mon Sep 17 00:00:00 2001
From: Mitchell Gale <Mitchell.Gale@improving.com>
Date: Wed, 2 Aug 2023 23:51:42 -0700
Subject: [PATCH 5/9] revert ast changes as was covered in spotless #1 PR for
 GJF.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---
 .../sql/ast/AbstractNodeVisitor.java          |  6 ++-
 .../java/org/opensearch/sql/ast/Node.java     |  5 +-
 .../org/opensearch/sql/ast/dsl/AstDSL.java    |  2 +-
 .../sql/ast/expression/AggregateFunction.java |  2 +-
 .../opensearch/sql/ast/expression/Alias.java  | 21 +++++---
 .../sql/ast/expression/AllFields.java         |  8 ++-
 .../opensearch/sql/ast/expression/And.java    |  5 +-
 .../sql/ast/expression/Argument.java          |  5 +-
 .../sql/ast/expression/AttributeList.java     |  8 ++-
 .../sql/ast/expression/Between.java           |  4 +-
 .../opensearch/sql/ast/expression/Case.java   | 18 +++++--
 .../opensearch/sql/ast/expression/Cast.java   | 49 ++++++++++---------
 .../sql/ast/expression/Compare.java           |  1 +
 .../sql/ast/expression/DataType.java          |  9 +++-
 .../sql/ast/expression/EqualTo.java           | 11 +++--
 .../opensearch/sql/ast/expression/Field.java  |  9 +++-
 .../sql/ast/expression/Function.java          |  8 +--
 .../sql/ast/expression/HighlightFunction.java |  4 +-
 .../org/opensearch/sql/ast/expression/In.java |  8 +--
 .../sql/ast/expression/Interval.java          |  1 +
 .../sql/ast/expression/IntervalUnit.java      | 13 +++--
 .../opensearch/sql/ast/expression/Let.java    |  5 +-
 .../sql/ast/expression/Literal.java           |  6 ++-
 .../opensearch/sql/ast/expression/Map.java    |  5 +-
 .../ast/expression/NestedAllTupleFields.java  |  9 +++-
 .../opensearch/sql/ast/expression/Not.java    |  5 +-
 .../org/opensearch/sql/ast/expression/Or.java |  5 +-
 .../sql/ast/expression/ParseMethod.java       |  4 +-
 .../sql/ast/expression/QualifiedName.java     | 16 +++---
 .../ast/expression/RelevanceFieldList.java    | 16 ++++--
 .../sql/ast/expression/ScoreFunction.java     |  4 +-
 .../opensearch/sql/ast/expression/Span.java   |  6 ++-
 .../sql/ast/expression/SpanUnit.java          | 11 +++--
 .../ast/expression/UnresolvedArgument.java    |  5 +-
 .../ast/expression/UnresolvedAttribute.java   |  6 ++-
 .../ast/expression/UnresolvedExpression.java  |  1 +
 .../opensearch/sql/ast/expression/When.java   | 14 ++++--
 .../sql/ast/expression/WindowFunction.java    |  2 +
 .../opensearch/sql/ast/expression/Xor.java    |  5 +-
 .../opensearch/sql/ast/statement/Explain.java |  4 +-
 .../opensearch/sql/ast/statement/Query.java   |  4 +-
 .../sql/ast/statement/Statement.java          |  4 +-
 .../java/org/opensearch/sql/ast/tree/AD.java  |  1 +
 .../opensearch/sql/ast/tree/Aggregation.java  | 31 +++++++-----
 .../opensearch/sql/ast/tree/CloseCursor.java  |  9 +++-
 .../org/opensearch/sql/ast/tree/Dedupe.java   |  5 +-
 .../org/opensearch/sql/ast/tree/Eval.java     |  5 +-
 .../opensearch/sql/ast/tree/FetchCursor.java  |  8 ++-
 .../org/opensearch/sql/ast/tree/Filter.java   |  5 +-
 .../org/opensearch/sql/ast/tree/Head.java     |  5 +-
 .../org/opensearch/sql/ast/tree/Kmeans.java   |  1 +
 .../org/opensearch/sql/ast/tree/Limit.java    |  2 +
 .../java/org/opensearch/sql/ast/tree/ML.java  |  9 ++--
 .../org/opensearch/sql/ast/tree/Paginate.java |  8 ++-
 .../org/opensearch/sql/ast/tree/Parse.java    | 25 +++++++---
 .../org/opensearch/sql/ast/tree/Project.java  | 12 +++--
 .../org/opensearch/sql/ast/tree/RareTopN.java |  6 ++-
 .../org/opensearch/sql/ast/tree/Relation.java | 18 ++++---
 .../sql/ast/tree/RelationSubquery.java        |  9 +++-
 .../org/opensearch/sql/ast/tree/Rename.java   |  1 +
 .../org/opensearch/sql/ast/tree/Sort.java     | 18 +++++--
 .../sql/ast/tree/TableFunction.java           | 10 +++-
 .../sql/ast/tree/UnresolvedPlan.java          |  5 +-
 .../org/opensearch/sql/ast/tree/Values.java   |  6 ++-
 64 files changed, 373 insertions(+), 160 deletions(-)

diff --git a/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java b/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java
index 973b10310b..f02bc07ccc 100644
--- a/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java
+++ b/core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast;
 
 import org.opensearch.sql.ast.expression.AggregateFunction;
@@ -61,7 +62,9 @@
 import org.opensearch.sql.ast.tree.TableFunction;
 import org.opensearch.sql.ast.tree.Values;
 
-/** AST nodes visitor Defines the traverse path. */
+/**
+ * AST nodes visitor Defines the traverse path.
+ */
 public abstract class AbstractNodeVisitor<T, C> {
 
   public T visit(Node node, C context) {
@@ -70,7 +73,6 @@ public T visit(Node node, C context) {
 
   /**
    * Visit child node.
-   *
    * @param node {@link Node}
    * @param context Context
    * @return Return Type.
diff --git a/core/src/main/java/org/opensearch/sql/ast/Node.java b/core/src/main/java/org/opensearch/sql/ast/Node.java
index faaf51f221..f3147eeb43 100644
--- a/core/src/main/java/org/opensearch/sql/ast/Node.java
+++ b/core/src/main/java/org/opensearch/sql/ast/Node.java
@@ -3,13 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast;
 
 import java.util.List;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-/** AST node. */
+/**
+ * AST node.
+ */
 @EqualsAndHashCode
 @ToString
 public abstract class Node {
diff --git a/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java b/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
index 75f8205173..761a502852 100644
--- a/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
+++ b/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
@@ -465,4 +465,4 @@ public static Parse parse(UnresolvedPlan input, ParseMethod parseMethod,
     return new Parse(parseMethod, sourceField, pattern, arguments, input);
   }
 
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/AggregateFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/AggregateFunction.java
index 2144338a35..e8f730d7e9 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/AggregateFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/AggregateFunction.java
@@ -17,7 +17,7 @@
 import org.opensearch.sql.common.utils.StringUtils;
 
 /**
- * Expression node of aggregate functions.<br>
+ * Expression node of aggregate functions.
  * Params include aggregate function name (AVG, SUM, MAX etc.) and the field to aggregate.
  */
 @Getter
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Alias.java b/core/src/main/java/org/opensearch/sql/ast/expression/Alias.java
index 7b3078629b..4183b19a3e 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Alias.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Alias.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import lombok.AllArgsConstructor;
@@ -13,10 +14,10 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Alias abstraction that associate an unnamed expression with a name and an optional alias. The
- * name and alias information preserved is useful for semantic analysis and response formatting
- * eventually. This can avoid restoring the info in toString() method which is inaccurate because
- * original info is already lost.
+ * Alias abstraction that associate an unnamed expression with a name and an optional alias.
+ * The name and alias information preserved is useful for semantic analysis and response
+ * formatting eventually. This can avoid restoring the info in toString() method which is
+ * inaccurate because original info is already lost.
  */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
@@ -25,13 +26,19 @@
 @ToString
 public class Alias extends UnresolvedExpression {
 
-  /** Original field name. */
+  /**
+   * Original field name.
+   */
   private final String name;
 
-  /** Expression aliased. */
+  /**
+   * Expression aliased.
+   */
   private final UnresolvedExpression delegated;
 
-  /** Optional field alias. */
+  /**
+   * Optional field alias.
+   */
   private String alias;
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/AllFields.java b/core/src/main/java/org/opensearch/sql/ast/expression/AllFields.java
index b9b90ea24a..1f5d919817 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/AllFields.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/AllFields.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.Collections;
@@ -12,13 +13,16 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/** Represent the All fields which is been used in SELECT *. */
+/**
+ * Represent the All fields which is been used in SELECT *.
+ */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 public class AllFields extends UnresolvedExpression {
   public static final AllFields INSTANCE = new AllFields();
 
-  private AllFields() {}
+  private AllFields() {
+  }
 
   public static AllFields of() {
     return INSTANCE;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/And.java b/core/src/main/java/org/opensearch/sql/ast/expression/And.java
index 565f1eb4ab..8d8c48f3b2 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/And.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/And.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -13,7 +14,9 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Expression node of logic AND. */
+/**
+ * Expression node of logic AND.
+ */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Argument.java b/core/src/main/java/org/opensearch/sql/ast/expression/Argument.java
index 4c2a485ea7..f054710a32 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Argument.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Argument.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -13,7 +14,9 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Argument. */
+/**
+ * Argument.
+ */
 @Getter
 @ToString
 @RequiredArgsConstructor
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/AttributeList.java b/core/src/main/java/org/opensearch/sql/ast/expression/AttributeList.java
index d137a83957..7e1fdb1516 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/AttributeList.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/AttributeList.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -13,12 +14,15 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Expression node that includes a list of Expression nodes. */
+/**
+ * Expression node that includes a list of Expression nodes.
+ */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @AllArgsConstructor
 public class AttributeList extends UnresolvedExpression {
-  @Getter private List<UnresolvedExpression> attrList;
+  @Getter
+  private List<UnresolvedExpression> attrList;
 
   @Override
   public List<UnresolvedExpression> getChild() {
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Between.java b/core/src/main/java/org/opensearch/sql/ast/expression/Between.java
index e13c3fb187..886c9a9282 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Between.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Between.java
@@ -12,7 +12,9 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/** Unresolved expression for BETWEEN. */
+/**
+ * Unresolved expression for BETWEEN.
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class Between extends UnresolvedExpression {
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Case.java b/core/src/main/java/org/opensearch/sql/ast/expression/Case.java
index 583bd0de97..81c74f3ea4 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Case.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Case.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -14,23 +15,29 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/** AST node that represents CASE clause similar as Switch statement in programming language. */
+/**
+ * AST node that represents CASE clause similar as Switch statement in programming language.
+ */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @Getter
 @ToString
 public class Case extends UnresolvedExpression {
 
-  /** Value to be compared by WHEN statements. Null in the case of CASE WHEN conditions. */
+  /**
+   * Value to be compared by WHEN statements. Null in the case of CASE WHEN conditions.
+   */
   private final UnresolvedExpression caseValue;
 
   /**
-   * Expression list that represents WHEN statements. Each is a mapping from condition to its
-   * result.
+   * Expression list that represents WHEN statements. Each is a mapping from condition
+   * to its result.
    */
   private final List<When> whenClauses;
 
-  /** Expression that represents ELSE statement result. */
+  /**
+   * Expression that represents ELSE statement result.
+   */
   private final UnresolvedExpression elseClause;
 
   @Override
@@ -51,4 +58,5 @@ public List<? extends Node> getChild() {
   public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
     return nodeVisitor.visitCase(this, context);
   }
+
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java b/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java
index 2019346fb5..785c65eb95 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import static org.opensearch.sql.expression.function.BuiltinFunctionName.CAST_TO_BOOLEAN;
@@ -32,7 +33,9 @@
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.function.FunctionName;
 
-/** AST node that represents Cast clause. */
+/**
+ * AST node that represents Cast clause.
+ */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @Getter
@@ -40,32 +43,35 @@
 public class Cast extends UnresolvedExpression {
 
   private static final Map<String, FunctionName> CONVERTED_TYPE_FUNCTION_NAME_MAP =
-      new ImmutableMap.Builder<String, FunctionName>()
-          .put("string", CAST_TO_STRING.getName())
-          .put("byte", CAST_TO_BYTE.getName())
-          .put("short", CAST_TO_SHORT.getName())
-          .put("int", CAST_TO_INT.getName())
-          .put("integer", CAST_TO_INT.getName())
-          .put("long", CAST_TO_LONG.getName())
-          .put("float", CAST_TO_FLOAT.getName())
-          .put("double", CAST_TO_DOUBLE.getName())
-          .put("boolean", CAST_TO_BOOLEAN.getName())
-          .put("date", CAST_TO_DATE.getName())
-          .put("time", CAST_TO_TIME.getName())
-          .put("timestamp", CAST_TO_TIMESTAMP.getName())
-          .put("datetime", CAST_TO_DATETIME.getName())
-          .build();
+          new ImmutableMap.Builder<String, FunctionName>()
+                  .put("string", CAST_TO_STRING.getName())
+                  .put("byte", CAST_TO_BYTE.getName())
+                  .put("short", CAST_TO_SHORT.getName())
+                  .put("int", CAST_TO_INT.getName())
+                  .put("integer", CAST_TO_INT.getName())
+                  .put("long", CAST_TO_LONG.getName())
+                  .put("float", CAST_TO_FLOAT.getName())
+                  .put("double", CAST_TO_DOUBLE.getName())
+                  .put("boolean", CAST_TO_BOOLEAN.getName())
+                  .put("date", CAST_TO_DATE.getName())
+                  .put("time", CAST_TO_TIME.getName())
+                  .put("timestamp", CAST_TO_TIMESTAMP.getName())
+                  .put("datetime", CAST_TO_DATETIME.getName())
+                  .build();
 
-  /** The source expression cast from. */
+  /**
+   * The source expression cast from.
+   */
   private final UnresolvedExpression expression;
 
-  /** Expression that represents name of the target type. */
+  /**
+   * Expression that represents name of the target type.
+   */
   private final UnresolvedExpression convertedType;
 
   /**
    * Check if the given function name is a cast function or not.
-   *
-   * @param name function name
+   * @param name  function name
    * @return true if cast function, otherwise false.
    */
   public static boolean isCastFunction(FunctionName name) {
@@ -74,8 +80,7 @@ public static boolean isCastFunction(FunctionName name) {
 
   /**
    * Get the cast function name for a given target data type.
-   *
-   * @param targetType target data type
+   * @param targetType  target data type
    * @return cast function name corresponding
    */
   public static FunctionName getCastFunctionName(ExprType targetType) {
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Compare.java b/core/src/main/java/org/opensearch/sql/ast/expression/Compare.java
index 8ba6ba5116..25cf3e0f73 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Compare.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Compare.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/DataType.java b/core/src/main/java/org/opensearch/sql/ast/expression/DataType.java
index 0b9add8f55..8755a15177 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/DataType.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/DataType.java
@@ -3,13 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.data.type.ExprCoreType;
 
-/** The DataType defintion in AST. Question, could we use {@link ExprCoreType} directly in AST? */
+/**
+ * The DataType defintion in AST.
+ * Question, could we use {@link ExprCoreType} directly in AST?
+ */
 @RequiredArgsConstructor
 public enum DataType {
   TYPE_ERROR(ExprCoreType.UNKNOWN),
@@ -28,5 +32,6 @@ public enum DataType {
   TIMESTAMP(ExprCoreType.TIMESTAMP),
   INTERVAL(ExprCoreType.INTERVAL);
 
-  @Getter private final ExprCoreType coreType;
+  @Getter
+  private final ExprCoreType coreType;
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/EqualTo.java b/core/src/main/java/org/opensearch/sql/ast/expression/EqualTo.java
index 344f3c5164..806f897abf 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/EqualTo.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/EqualTo.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -13,13 +14,17 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Expression node of binary operator or comparison relation EQUAL. */
+/**
+ * Expression node of binary operator or comparison relation EQUAL.
+ */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @AllArgsConstructor
 public class EqualTo extends UnresolvedExpression {
-  @Getter private UnresolvedExpression left;
-  @Getter private UnresolvedExpression right;
+  @Getter
+  private UnresolvedExpression left;
+  @Getter
+  private UnresolvedExpression right;
 
   @Override
   public List<UnresolvedExpression> getChild() {
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Field.java b/core/src/main/java/org/opensearch/sql/ast/expression/Field.java
index 0a2d726ad4..9a8109fbe3 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Field.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Field.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -22,12 +23,16 @@ public class Field extends UnresolvedExpression {
 
   private final List<Argument> fieldArgs;
 
-  /** Constructor of Field. */
+  /**
+   * Constructor of Field.
+   */
   public Field(UnresolvedExpression field) {
     this(field, Collections.emptyList());
   }
 
-  /** Constructor of Field. */
+  /**
+   * Constructor of Field.
+   */
   public Field(UnresolvedExpression field, List<Argument> fieldArgs) {
     this.field = field;
     this.fieldArgs = fieldArgs;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Function.java b/core/src/main/java/org/opensearch/sql/ast/expression/Function.java
index 1dbeae6ff8..e59bb0372b 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Function.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Function.java
@@ -16,7 +16,7 @@
 
 
 /**
- * Expression node of scalar function.<br>
+ * Expression node of scalar function.
  * Params include function name (@funcName) and function arguments (@funcArgs)
  */
 @Getter
@@ -39,8 +39,8 @@ public <R, C> R accept(AbstractNodeVisitor<R, C> nodeVisitor, C context) {
   @Override
   public String toString() {
     return String.format("%s(%s)", funcName,
-        funcArgs.stream()
-            .map(Object::toString)
-            .collect(Collectors.joining(", ")));
+            funcArgs.stream()
+                    .map(Object::toString)
+                    .collect(Collectors.joining(", ")));
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java
index 128d9327e8..0d4e57a78c 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/HighlightFunction.java
@@ -13,7 +13,9 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Expression node of Highlight function. */
+/**
+ * Expression node of Highlight function.
+ */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @Getter
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/In.java b/core/src/main/java/org/opensearch/sql/ast/expression/In.java
index 38c1b91b43..9ce1c124cb 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/In.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/In.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -14,9 +15,10 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Expression node of one-to-many mapping relation IN. Params include the field expression and/or
- * wildcard field expression, nested field expression (@field). And the values that the field is
- * mapped to (@valueList).
+ * Expression node of one-to-many mapping relation IN.
+ * Params include the field expression and/or wildcard field expression,
+ * nested field expression (@field).
+ * And the values that the field is mapped to (@valueList).
  */
 @Getter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Interval.java b/core/src/main/java/org/opensearch/sql/ast/expression/Interval.java
index c26f829f48..84b6ba02d1 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Interval.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Interval.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.Collections;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java b/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java
index 19e1b07e39..c731835a5e 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -12,7 +13,7 @@
 
 @Getter
 @RequiredArgsConstructor
-public enum IntervalUnit {
+public enum  IntervalUnit {
   UNKNOWN,
 
   MICROSECOND,
@@ -43,11 +44,13 @@ public enum IntervalUnit {
     INTERVAL_UNITS = builder.add(IntervalUnit.values()).build();
   }
 
-  /** Util method to get interval unit given the unit name. */
+  /**
+   * Util method to get interval unit given the unit name.
+   */
   public static IntervalUnit of(String unit) {
     return INTERVAL_UNITS.stream()
-        .filter(v -> unit.equalsIgnoreCase(v.name()))
-        .findFirst()
-        .orElse(IntervalUnit.UNKNOWN);
+            .filter(v -> unit.equalsIgnoreCase(v.name()))
+            .findFirst()
+            .orElse(IntervalUnit.UNKNOWN);
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Let.java b/core/src/main/java/org/opensearch/sql/ast/expression/Let.java
index 2f63a25f10..cea2a091e5 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Let.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Let.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -13,7 +14,9 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Represent the assign operation. e.g. velocity = distance/speed. */
+/**
+ * Represent the assign operation. e.g. velocity = distance/speed.
+ */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Literal.java b/core/src/main/java/org/opensearch/sql/ast/expression/Literal.java
index 80c877dd97..3ff360dbf0 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Literal.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Literal.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -13,8 +14,9 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Expression node of literal type Params include literal value (@value) and literal data type
- * (@type) which can be selected from {@link DataType}.
+ * Expression node of literal type
+ * Params include literal value (@value) and
+ * literal data type (@type) which can be selected from {@link DataType}.
  */
 @Getter
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Map.java b/core/src/main/java/org/opensearch/sql/ast/expression/Map.java
index 73d8d77261..45e98f127f 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Map.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Map.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -13,7 +14,9 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Expression node of one-to-one mapping relation. */
+/**
+ * Expression node of one-to-one mapping relation.
+ */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/NestedAllTupleFields.java b/core/src/main/java/org/opensearch/sql/ast/expression/NestedAllTupleFields.java
index be89dd9f19..adf2025e6c 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/NestedAllTupleFields.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/NestedAllTupleFields.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.Collections;
@@ -10,14 +11,18 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/** Represents all tuple fields used in nested function. */
+/**
+ * Represents all tuple fields used in nested function.
+ */
 @RequiredArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 public class NestedAllTupleFields extends UnresolvedExpression {
-  @Getter private final String path;
+  @Getter
+  private final String path;
 
   @Override
   public List<? extends Node> getChild() {
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Not.java b/core/src/main/java/org/opensearch/sql/ast/expression/Not.java
index 423cb088ef..2926c7e5cd 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Not.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Not.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -13,7 +14,9 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Expression node of the logic NOT. */
+/**
+ * Expression node of the logic NOT.
+ */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Or.java b/core/src/main/java/org/opensearch/sql/ast/expression/Or.java
index cc59170d31..b0dabb6e4e 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Or.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Or.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -13,7 +14,9 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Expression node of the logic OR. */
+/**
+ * Expression node of the logic OR.
+ */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/ParseMethod.java b/core/src/main/java/org/opensearch/sql/ast/expression/ParseMethod.java
index 7a2587c5f0..83a46323e6 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/ParseMethod.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/ParseMethod.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import lombok.Getter;
@@ -14,5 +15,6 @@ public enum ParseMethod {
   GROK("grok"),
   PATTERNS("patterns");
 
-  @Getter private final String name;
+  @Getter
+  private final String name;
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/QualifiedName.java b/core/src/main/java/org/opensearch/sql/ast/expression/QualifiedName.java
index 36e046a45a..8b16119dc0 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/QualifiedName.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/QualifiedName.java
@@ -82,14 +82,14 @@ public Optional<String> first() {
 
   /**
    * Get rest parts of the qualified name. Assume that there must be remaining parts
-   * so caller is responsible for the check (first() or size() must be called first).<br>
-   * For example:<br>
-   * {@code<br>
-   *  &ensp; QualifiedName name = ...<br>
-   *  &ensp; Optional<String> first = name.first();<br>
-   *  &ensp; if (first.isPresent()) {<br>
-   *  &emsp;   name.rest() ...<br>
-   *  &ensp; }<br>
+   * so caller is responsible for the check (first() or size() must be called first).
+   * For example:
+   * {@code
+   *   QualifiedName name = ...
+   *   Optional<String> first = name.first();
+   *   if (first.isPresent()) {
+   *     name.rest() ...
+   *   }
    * }
    * @return  rest part(s)
    */
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java b/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java
index a9e26a611f..65fb74881c 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.List;
@@ -12,11 +13,14 @@
 import lombok.Getter;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Expression node that includes a list of RelevanceField nodes. */
+/**
+ * Expression node that includes a list of RelevanceField nodes.
+ */
 @EqualsAndHashCode(callSuper = false)
 @AllArgsConstructor
 public class RelevanceFieldList extends UnresolvedExpression {
-  @Getter private java.util.Map<String, Float> fieldList;
+  @Getter
+  private java.util.Map<String, Float> fieldList;
 
   @Override
   public List<UnresolvedExpression> getChild() {
@@ -30,8 +34,10 @@ public <R, C> R accept(AbstractNodeVisitor<R, C> nodeVisitor, C context) {
 
   @Override
   public String toString() {
-    return fieldList.entrySet().stream()
-        .map(e -> String.format("\"%s\" ^ %s", e.getKey(), e.getValue()))
-        .collect(Collectors.joining(", "));
+    return fieldList
+            .entrySet()
+            .stream()
+            .map(e -> String.format("\"%s\" ^ %s", e.getKey(), e.getValue()))
+            .collect(Collectors.joining(", "));
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/ScoreFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/ScoreFunction.java
index 26d784dd8c..1b73f9bd95 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/ScoreFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/ScoreFunction.java
@@ -13,8 +13,8 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Expression node of Score function. Score takes a relevance-search expression as an argument and
- * returns it
+ * Expression node of Score function.
+ * Score takes a relevance-search expression as an argument and returns it
  */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Span.java b/core/src/main/java/org/opensearch/sql/ast/expression/Span.java
index edd309b22d..e57205c19c 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Span.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Span.java
@@ -13,7 +13,10 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Span expression node. Params include field expression and the span value. */
+/**
+ * Span expression node.
+ * Params include field expression and the span value.
+ */
 @Getter
 @EqualsAndHashCode(callSuper = false)
 @RequiredArgsConstructor
@@ -32,4 +35,5 @@ public List<UnresolvedExpression> getChild() {
   public <R, C> R accept(AbstractNodeVisitor<R, C> nodeVisitor, C context) {
     return nodeVisitor.visitSpan(this, context);
   }
+
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java b/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java
index 5252781edb..341d8084d0 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java
@@ -42,7 +42,9 @@ public enum SpanUnit {
     SPAN_UNITS = builder.add(SpanUnit.values()).build();
   }
 
-  /** Util method to get span unit given the unit name. */
+  /**
+   * Util method to get span unit given the unit name.
+   */
   public static SpanUnit of(String unit) {
     switch (unit) {
       case "":
@@ -53,13 +55,14 @@ public static SpanUnit of(String unit) {
         return m;
       default:
         return SPAN_UNITS.stream()
-            .filter(v -> unit.equalsIgnoreCase(v.name()))
-            .findFirst()
-            .orElse(UNKNOWN);
+                .filter(v -> unit.equalsIgnoreCase(v.name()))
+                .findFirst()
+                .orElse(UNKNOWN);
     }
   }
 
   public static String getName(SpanUnit unit) {
     return unit.name;
   }
+
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedArgument.java b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedArgument.java
index 2c6eee46e9..e4def038ed 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedArgument.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedArgument.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -12,7 +13,9 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Argument. */
+/**
+ * Argument.
+ */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedAttribute.java b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedAttribute.java
index e1754cbf76..f4bc88853f 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedAttribute.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedAttribute.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -14,8 +15,9 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
 /**
- * Expression node, representing the syntax that is not resolved to any other expression nodes yet
- * but non-negligible This expression is often created as the index name, field name etc.
+ * Expression node, representing the syntax that is not resolved to
+ * any other expression nodes yet but non-negligible
+ * This expression is often created as the index name, field name etc.
  */
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedExpression.java b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedExpression.java
index 9b2d530b7f..ee3922f797 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedExpression.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/UnresolvedExpression.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import lombok.EqualsAndHashCode;
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/When.java b/core/src/main/java/org/opensearch/sql/ast/expression/When.java
index db747592e5..a52870b408 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/When.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/When.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -14,17 +15,23 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/** AST node that represents WHEN clause. */
+/**
+ * AST node that represents WHEN clause.
+ */
 @EqualsAndHashCode(callSuper = false)
 @Getter
 @RequiredArgsConstructor
 @ToString
 public class When extends UnresolvedExpression {
 
-  /** WHEN condition, either a search condition or compare value if case value present. */
+  /**
+   * WHEN condition, either a search condition or compare value if case value present.
+   */
   private final UnresolvedExpression condition;
 
-  /** Result to return if condition matched. */
+  /**
+   * Result to return if condition matched.
+   */
   private final UnresolvedExpression result;
 
   @Override
@@ -36,4 +43,5 @@ public List<? extends Node> getChild() {
   public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
     return nodeVisitor.visitWhen(this, context);
   }
+
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/WindowFunction.java b/core/src/main/java/org/opensearch/sql/ast/expression/WindowFunction.java
index 47f5265765..9a7535e1fe 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/WindowFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/WindowFunction.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import com.google.common.collect.ImmutableList;
@@ -41,4 +42,5 @@ public List<? extends Node> getChild() {
   public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
     return nodeVisitor.visitWindowFunction(this, context);
   }
+
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Xor.java b/core/src/main/java/org/opensearch/sql/ast/expression/Xor.java
index 40db015fd7..731feccd33 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Xor.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Xor.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.expression;
 
 import java.util.Arrays;
@@ -13,7 +14,9 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Expression node of the logic XOR. */
+/**
+ * Expression node of the logic XOR.
+ */
 @Getter
 @ToString
 @EqualsAndHashCode(callSuper = false)
diff --git a/core/src/main/java/org/opensearch/sql/ast/statement/Explain.java b/core/src/main/java/org/opensearch/sql/ast/statement/Explain.java
index 5ee260c130..1e364d69fd 100644
--- a/core/src/main/java/org/opensearch/sql/ast/statement/Explain.java
+++ b/core/src/main/java/org/opensearch/sql/ast/statement/Explain.java
@@ -12,7 +12,9 @@
 import lombok.EqualsAndHashCode;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Explain Statement. */
+/**
+ * Explain Statement.
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class Explain extends Statement {
diff --git a/core/src/main/java/org/opensearch/sql/ast/statement/Query.java b/core/src/main/java/org/opensearch/sql/ast/statement/Query.java
index 6366451b72..82efdde4dd 100644
--- a/core/src/main/java/org/opensearch/sql/ast/statement/Query.java
+++ b/core/src/main/java/org/opensearch/sql/ast/statement/Query.java
@@ -16,7 +16,9 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 
-/** Query Statement. */
+/**
+ * Query Statement.
+ */
 @Getter
 @Setter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/statement/Statement.java b/core/src/main/java/org/opensearch/sql/ast/statement/Statement.java
index d90071a0ca..e32a8dbfd8 100644
--- a/core/src/main/java/org/opensearch/sql/ast/statement/Statement.java
+++ b/core/src/main/java/org/opensearch/sql/ast/statement/Statement.java
@@ -11,7 +11,9 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/** Statement is the high interface of core engine. */
+/**
+ * Statement is the high interface of core engine.
+ */
 public abstract class Statement extends Node {
   @Override
   public <R, C> R accept(AbstractNodeVisitor<R, C> visitor, C context) {
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/AD.java b/core/src/main/java/org/opensearch/sql/ast/tree/AD.java
index 0e1cc33db9..e9aee25c23 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/AD.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/AD.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Aggregation.java b/core/src/main/java/org/opensearch/sql/ast/tree/Aggregation.java
index f098d0ec53..e9fa26e981 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Aggregation.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Aggregation.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -16,7 +17,9 @@
 import org.opensearch.sql.ast.expression.Argument;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/** Logical plan node of Aggregation, the interface for building aggregation actions in queries. */
+/**
+ * Logical plan node of Aggregation, the interface for building aggregation actions in queries.
+ */
 @Getter
 @Setter
 @ToString
@@ -29,21 +32,23 @@ public class Aggregation extends UnresolvedPlan {
   private List<Argument> argExprList;
   private UnresolvedPlan child;
 
-  /** Aggregation Constructor without span and argument. */
-  public Aggregation(
-      List<UnresolvedExpression> aggExprList,
-      List<UnresolvedExpression> sortExprList,
-      List<UnresolvedExpression> groupExprList) {
+  /**
+   * Aggregation Constructor without span and argument.
+   */
+  public Aggregation(List<UnresolvedExpression> aggExprList,
+                     List<UnresolvedExpression> sortExprList,
+                     List<UnresolvedExpression> groupExprList) {
     this(aggExprList, sortExprList, groupExprList, null, Collections.emptyList());
   }
 
-  /** Aggregation Constructor. */
-  public Aggregation(
-      List<UnresolvedExpression> aggExprList,
-      List<UnresolvedExpression> sortExprList,
-      List<UnresolvedExpression> groupExprList,
-      UnresolvedExpression span,
-      List<Argument> argExprList) {
+  /**
+   * Aggregation Constructor.
+   */
+  public Aggregation(List<UnresolvedExpression> aggExprList,
+                     List<UnresolvedExpression> sortExprList,
+                     List<UnresolvedExpression> groupExprList,
+                     UnresolvedExpression span,
+                     List<Argument> argExprList) {
     this.aggExprList = aggExprList;
     this.sortExprList = sortExprList;
     this.groupExprList = groupExprList;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java b/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java
index 832b79d34a..cf82c2b070 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/CloseCursor.java
@@ -9,10 +9,15 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/** AST node to represent close cursor operation. Actually a wrapper to the AST. */
+/**
+ * AST node to represent close cursor operation.
+ * Actually a wrapper to the AST.
+ */
 public class CloseCursor extends UnresolvedPlan {
 
-  /** An instance of {@link FetchCursor}. */
+  /**
+   * An instance of {@link FetchCursor}.
+   */
   private UnresolvedPlan cursor;
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Dedupe.java b/core/src/main/java/org/opensearch/sql/ast/tree/Dedupe.java
index 3173f42f9c..6514d65a04 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Dedupe.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Dedupe.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -17,7 +18,9 @@
 import org.opensearch.sql.ast.expression.Argument;
 import org.opensearch.sql.ast.expression.Field;
 
-/** AST node represent Dedupe operation. */
+/**
+ * AST node represent Dedupe operation.
+ */
 @Getter
 @Setter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Eval.java b/core/src/main/java/org/opensearch/sql/ast/tree/Eval.java
index ecceabd757..184f2ac497 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Eval.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Eval.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -15,7 +16,9 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.expression.Let;
 
-/** AST node represent Eval operation. */
+/**
+ * AST node represent Eval operation.
+ */
 @Getter
 @Setter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java b/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java
index e34127c9d3..aa327c295b 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/FetchCursor.java
@@ -10,11 +10,15 @@
 import lombok.RequiredArgsConstructor;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** An unresolved plan that represents fetching the next batch in paginationed plan. */
+/**
+ * An unresolved plan that represents fetching the next
+ * batch in paginationed plan.
+ */
 @RequiredArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 public class FetchCursor extends UnresolvedPlan {
-  @Getter final String cursor;
+  @Getter
+  final String cursor;
 
   @Override
   public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Filter.java b/core/src/main/java/org/opensearch/sql/ast/tree/Filter.java
index 6c57275db9..8128078930 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Filter.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Filter.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -13,7 +14,9 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/** Logical plan node of Filter, the interface for building filters in queries. */
+/**
+ * Logical plan node of Filter, the interface for building filters in queries.
+ */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @Getter
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Head.java b/core/src/main/java/org/opensearch/sql/ast/tree/Head.java
index bf6b2caed1..8590c212ad 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Head.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Head.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -15,7 +16,9 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** AST node represent Head operation. */
+/**
+ * AST node represent Head operation.
+ */
 @Getter
 @Setter
 @ToString
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Kmeans.java b/core/src/main/java/org/opensearch/sql/ast/tree/Kmeans.java
index ed03efed8a..5d2e32c28b 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Kmeans.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Kmeans.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Limit.java b/core/src/main/java/org/opensearch/sql/ast/tree/Limit.java
index 9290776172..f9b8a8feab 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Limit.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Limit.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -37,4 +38,5 @@ public List<UnresolvedPlan> getChild() {
   public <T, C> T accept(AbstractNodeVisitor<T, C> visitor, C context) {
     return visitor.visitLimit(this, context);
   }
+
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/ML.java b/core/src/main/java/org/opensearch/sql/ast/tree/ML.java
index 320fb2bcf7..2f83a993b7 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/ML.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/ML.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import static org.opensearch.sql.utils.MLCommonsConstants.ACTION;
@@ -65,7 +66,7 @@ public List<UnresolvedPlan> getChild() {
   }
 
   private String getAction() {
-    return (String) arguments.get(ACTION).getValue();
+    return  (String) arguments.get(ACTION).getValue();
   }
 
   /**
@@ -84,7 +85,7 @@ public Map<String, ExprCoreType> getOutputSchema(TypeEnvironment env) {
         return getPredictOutputSchema();
       default:
         throw new IllegalArgumentException(
-            "Action error. Please indicate train, predict or trainandpredict.");
+                "Action error. Please indicate train, predict or trainandpredict.");
     }
   }
 
@@ -121,8 +122,8 @@ public Map<String, ExprCoreType> getPredictOutputSchema() {
    * @return the schema
    */
   public Map<String, ExprCoreType> getTrainOutputSchema() {
-    boolean isAsync =
-        arguments.containsKey(ASYNC) ? (boolean) arguments.get(ASYNC).getValue() : false;
+    boolean isAsync = arguments.containsKey(ASYNC)
+            ? (boolean) arguments.get(ASYNC).getValue() : false;
     Map<String, ExprCoreType> res = new HashMap<>(Map.of(STATUS, ExprCoreType.STRING));
     if (isAsync) {
       res.put(TASKID, ExprCoreType.STRING);
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Paginate.java b/core/src/main/java/org/opensearch/sql/ast/tree/Paginate.java
index 69b11600c9..55e0e8c7a6 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Paginate.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Paginate.java
@@ -13,12 +13,16 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/** AST node to represent pagination operation. Actually a wrapper to the AST. */
+/**
+ * AST node to represent pagination operation.
+ * Actually a wrapper to the AST.
+ */
 @RequiredArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @ToString
 public class Paginate extends UnresolvedPlan {
-  @Getter private final int pageSize;
+  @Getter
+  private final int pageSize;
   private UnresolvedPlan child;
 
   public Paginate(int pageSize, UnresolvedPlan child) {
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Parse.java b/core/src/main/java/org/opensearch/sql/ast/tree/Parse.java
index e91c4a68ff..02a69c93af 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Parse.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Parse.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -19,7 +20,9 @@
 import org.opensearch.sql.ast.expression.ParseMethod;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/** AST node represent Parse with regex operation. */
+/**
+ * AST node represent Parse with regex operation.
+ */
 @Getter
 @Setter
 @ToString
@@ -27,19 +30,29 @@
 @RequiredArgsConstructor
 @AllArgsConstructor
 public class Parse extends UnresolvedPlan {
-  /** Method used to parse a field. */
+  /**
+   * Method used to parse a field.
+   */
   private final ParseMethod parseMethod;
 
-  /** Field. */
+  /**
+   * Field.
+   */
   private final UnresolvedExpression sourceField;
 
-  /** Pattern. */
+  /**
+   * Pattern.
+   */
   private final Literal pattern;
 
-  /** Optional arguments. */
+  /**
+   * Optional arguments.
+   */
   private final Map<String, Literal> arguments;
 
-  /** Child Plan. */
+  /**
+   * Child Plan.
+   */
   private UnresolvedPlan child;
 
   @Override
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Project.java b/core/src/main/java/org/opensearch/sql/ast/tree/Project.java
index cffb4dfdce..33c7128855 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Project.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Project.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -16,12 +17,15 @@
 import org.opensearch.sql.ast.expression.Argument;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/** Logical plan node of Project, the interface for building the list of searching fields. */
+/**
+ * Logical plan node of Project, the interface for building the list of searching fields.
+ */
 @ToString
 @Getter
 @EqualsAndHashCode(callSuper = false)
 public class Project extends UnresolvedPlan {
-  @Setter private List<UnresolvedExpression> projectList;
+  @Setter
+  private List<UnresolvedExpression> projectList;
   private List<Argument> argExprList;
   private UnresolvedPlan child;
 
@@ -39,7 +43,9 @@ public boolean hasArgument() {
     return !argExprList.isEmpty();
   }
 
-  /** The Project could been used to exclude fields from the source. */
+  /**
+   * The Project could been used to exclude fields from the source.
+   */
   public boolean isExcluded() {
     if (hasArgument()) {
       Argument argument = argExprList.get(0);
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java b/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
index 2cbe170541..c884afd86a 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import java.util.Collections;
@@ -18,7 +19,9 @@
 import org.opensearch.sql.ast.expression.Field;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/** AST node represent RareTopN operation. */
+/**
+ * AST node represent RareTopN operation.
+ */
 @Getter
 @Setter
 @ToString
@@ -54,3 +57,4 @@ public enum CommandType {
     RARE
   }
 }
+
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java b/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java
index ec5264a86b..71eb014cd9 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -17,7 +18,9 @@
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/** Logical plan node of Relation, the interface for building the searching sources. */
+/**
+ * Logical plan node of Relation, the interface for building the searching sources.
+ */
 @AllArgsConstructor
 @ToString
 @EqualsAndHashCode(callSuper = false)
@@ -36,7 +39,9 @@ public Relation(UnresolvedExpression tableName, String alias) {
     this.alias = alias;
   }
 
-  /** Optional alias name for the relation. */
+  /**
+   * Optional alias name for the relation.
+   */
   private String alias;
 
   /**
@@ -67,9 +72,9 @@ public String getAlias() {
   }
 
   /**
-   * Get Qualified name preservs parts of the user given identifiers. This can later be utilized to
-   * determine DataSource,Schema and Table Name during Analyzer stage. So Passing QualifiedName
-   * directly to Analyzer Stage.
+   * Get Qualified name preservs parts of the user given identifiers.
+   * This can later be utilized to determine DataSource,Schema and Table Name during
+   * Analyzer stage. So Passing QualifiedName directly to Analyzer Stage.
    *
    * @return TableQualifiedName.
    */
@@ -77,8 +82,7 @@ public QualifiedName getTableQualifiedName() {
     if (tableName.size() == 1) {
       return (QualifiedName) tableName.get(0);
     } else {
-      return new QualifiedName(
-          tableName.stream()
+      return new QualifiedName(tableName.stream()
               .map(UnresolvedExpression::toString)
               .collect(Collectors.joining(COMMA)));
     }
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/RelationSubquery.java b/core/src/main/java/org/opensearch/sql/ast/tree/RelationSubquery.java
index 5ab4d71dd9..89122bea7f 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/RelationSubquery.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/RelationSubquery.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -13,7 +14,9 @@
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 
-/** Logical plan node of RelationSubquery. */
+/**
+ * Logical plan node of RelationSubquery.
+ */
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @RequiredArgsConstructor
@@ -22,7 +25,9 @@ public class RelationSubquery extends UnresolvedPlan {
   private UnresolvedPlan query;
   private String alias;
 
-  /** Take subquery alias as table name. */
+  /**
+   * Take subquery alias as table name.
+   */
   public String getAliasAsTableName() {
     return alias;
   }
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Rename.java b/core/src/main/java/org/opensearch/sql/ast/tree/Rename.java
index e6f760aca0..69700c871c 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Rename.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Rename.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Sort.java b/core/src/main/java/org/opensearch/sql/ast/tree/Sort.java
index 073cb7aa1b..5fb4139bea 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Sort.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Sort.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import static org.opensearch.sql.ast.tree.Sort.NullOrder.NULL_FIRST;
@@ -21,7 +22,9 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.expression.Field;
 
-/** AST node for Sort {@link Sort#sortList} represent a list of sort expression and sort options. */
+/**
+ * AST node for Sort {@link Sort#sortList} represent a list of sort expression and sort options.
+ */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @Getter
@@ -47,14 +50,19 @@ public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
     return nodeVisitor.visitSort(this, context);
   }
 
-  /** Sort Options. */
+  /**
+   * Sort Options.
+   */
   @Data
   public static class SortOption {
 
-    /** Default ascending sort option, null first. */
+    /**
+     * Default ascending sort option, null first.
+     */
     public static SortOption DEFAULT_ASC = new SortOption(ASC, NULL_FIRST);
-
-    /** Default descending sort option, null last. */
+    /**
+     * Default descending sort option, null last.
+     */
     public static SortOption DEFAULT_DESC = new SortOption(DESC, NULL_LAST);
 
     private final SortOrder sortOrder;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java b/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java
index 711a8a0ec5..064cbf24fe 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/TableFunction.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -10,12 +11,16 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.Setter;
 import lombok.ToString;
 import org.opensearch.sql.ast.AbstractNodeVisitor;
+import org.opensearch.sql.ast.expression.Let;
 import org.opensearch.sql.ast.expression.QualifiedName;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 
-/** ASTNode for Table Function. */
+/**
+ * ASTNode for Table Function.
+ */
 @ToString
 @EqualsAndHashCode(callSuper = false)
 @RequiredArgsConstructor
@@ -23,7 +28,8 @@ public class TableFunction extends UnresolvedPlan {
 
   private final UnresolvedExpression functionName;
 
-  @Getter private final List<UnresolvedExpression> arguments;
+  @Getter
+  private final List<UnresolvedExpression> arguments;
 
   public QualifiedName getFunctionName() {
     return (QualifiedName) functionName;
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/UnresolvedPlan.java b/core/src/main/java/org/opensearch/sql/ast/tree/UnresolvedPlan.java
index 3074303b0d..672a4602ed 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/UnresolvedPlan.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/UnresolvedPlan.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import lombok.EqualsAndHashCode;
@@ -10,7 +11,9 @@
 import org.opensearch.sql.ast.AbstractNodeVisitor;
 import org.opensearch.sql.ast.Node;
 
-/** Abstract unresolved plan. */
+/**
+ * Abstract unresolved plan.
+ */
 @EqualsAndHashCode(callSuper = false)
 @ToString
 public abstract class UnresolvedPlan extends Node {
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Values.java b/core/src/main/java/org/opensearch/sql/ast/tree/Values.java
index 65d7e8d7cb..5a662912f9 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Values.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Values.java
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
 package org.opensearch.sql.ast.tree;
 
 import com.google.common.collect.ImmutableList;
@@ -15,7 +16,9 @@
 import org.opensearch.sql.ast.Node;
 import org.opensearch.sql.ast.expression.Literal;
 
-/** AST node class for a sequence of literal values. */
+/**
+ * AST node class for a sequence of literal values.
+ */
 @ToString
 @Getter
 @EqualsAndHashCode(callSuper = false)
@@ -38,4 +41,5 @@ public <T, C> T accept(AbstractNodeVisitor<T, C> nodeVisitor, C context) {
   public List<? extends Node> getChild() {
     return ImmutableList.of();
   }
+
 }

From 938189294ed16d3b1b0877decf41bb27b034e111 Mon Sep 17 00:00:00 2001
From: Mitchell Gale <Mitchell.Gale@improving.com>
Date: Wed, 2 Aug 2023 23:54:27 -0700
Subject: [PATCH 6/9] Reverting commits in ast folder attempt #2

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---
 .../org/opensearch/sql/ast/dsl/AstDSL.java    | 64 +++++++++----------
 .../opensearch/sql/ast/expression/Cast.java   | 30 ++++-----
 .../sql/ast/expression/Function.java          |  6 +-
 .../sql/ast/expression/IntervalUnit.java      |  6 +-
 .../ast/expression/RelevanceFieldList.java    |  8 +--
 .../sql/ast/expression/SpanUnit.java          |  6 +-
 .../org/opensearch/sql/ast/tree/RareTopN.java |  1 -
 .../org/opensearch/sql/ast/tree/Relation.java |  4 +-
 8 files changed, 62 insertions(+), 63 deletions(-)

diff --git a/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java b/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
index 761a502852..d5f10fcfd4 100644
--- a/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
+++ b/core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java
@@ -79,7 +79,7 @@ public UnresolvedPlan relation(String tableName) {
 
   public UnresolvedPlan relation(List<String> tableNames) {
     return new Relation(
-            tableNames.stream().map(AstDSL::qualifiedName).collect(Collectors.toList()));
+        tableNames.stream().map(AstDSL::qualifiedName).collect(Collectors.toList()));
   }
 
   public UnresolvedPlan relation(QualifiedName tableName) {
@@ -103,26 +103,26 @@ public static Eval eval(UnresolvedPlan input, Let... projectList) {
   }
 
   public static UnresolvedPlan projectWithArg(
-          UnresolvedPlan input, List<Argument> argList, UnresolvedExpression... projectList) {
+      UnresolvedPlan input, List<Argument> argList, UnresolvedExpression... projectList) {
     return new Project(Arrays.asList(projectList), argList).attach(input);
   }
 
   public static UnresolvedPlan agg(
-          UnresolvedPlan input,
-          List<UnresolvedExpression> aggList,
-          List<UnresolvedExpression> sortList,
-          List<UnresolvedExpression> groupList,
-          List<Argument> argList) {
+      UnresolvedPlan input,
+      List<UnresolvedExpression> aggList,
+      List<UnresolvedExpression> sortList,
+      List<UnresolvedExpression> groupList,
+      List<Argument> argList) {
     return new Aggregation(aggList, sortList, groupList, null, argList).attach(input);
   }
 
   public static UnresolvedPlan agg(
-          UnresolvedPlan input,
-          List<UnresolvedExpression> aggList,
-          List<UnresolvedExpression> sortList,
-          List<UnresolvedExpression> groupList,
-          UnresolvedExpression span,
-          List<Argument> argList) {
+      UnresolvedPlan input,
+      List<UnresolvedExpression> aggList,
+      List<UnresolvedExpression> sortList,
+      List<UnresolvedExpression> groupList,
+      UnresolvedExpression span,
+      List<Argument> argList) {
     return new Aggregation(aggList, sortList, groupList, span, argList).attach(input);
   }
 
@@ -145,7 +145,7 @@ public static QualifiedName qualifiedName(String... parts) {
   }
 
   public static UnresolvedExpression equalTo(
-          UnresolvedExpression left, UnresolvedExpression right) {
+      UnresolvedExpression left, UnresolvedExpression right) {
     return new EqualTo(left, right);
   }
 
@@ -226,12 +226,12 @@ public static UnresolvedExpression aggregate(String func, UnresolvedExpression f
   }
 
   public static UnresolvedExpression aggregate(
-          String func, UnresolvedExpression field, UnresolvedExpression... args) {
+      String func, UnresolvedExpression field, UnresolvedExpression... args) {
     return new AggregateFunction(func, field, Arrays.asList(args));
   }
 
   public static UnresolvedExpression filteredAggregate(
-          String func, UnresolvedExpression field, UnresolvedExpression condition) {
+      String func, UnresolvedExpression field, UnresolvedExpression condition) {
     return new AggregateFunction(func, field).condition(condition);
   }
 
@@ -240,7 +240,7 @@ public static UnresolvedExpression distinctAggregate(String func, UnresolvedExpr
   }
 
   public static UnresolvedExpression filteredDistinctCount(
-          String func, UnresolvedExpression field, UnresolvedExpression condition) {
+      String func, UnresolvedExpression field, UnresolvedExpression condition) {
     return new AggregateFunction(func, field, true).condition(condition);
   }
 
@@ -282,7 +282,7 @@ public When when(UnresolvedExpression condition, UnresolvedExpression result) {
   }
 
   public UnresolvedExpression highlight(UnresolvedExpression fieldName,
-                                        java.util.Map<String, Literal> arguments) {
+      java.util.Map<String, Literal> arguments) {
     return new HighlightFunction(fieldName, arguments);
   }
 
@@ -314,17 +314,17 @@ public static UnresolvedExpression xor(UnresolvedExpression left, UnresolvedExpr
   }
 
   public static UnresolvedExpression in(
-          UnresolvedExpression field, UnresolvedExpression... valueList) {
+      UnresolvedExpression field, UnresolvedExpression... valueList) {
     return new In(field, Arrays.asList(valueList));
   }
 
   public static UnresolvedExpression in(
-          UnresolvedExpression field, List<UnresolvedExpression> valueList) {
+      UnresolvedExpression field, List<UnresolvedExpression> valueList) {
     return new In(field, valueList);
   }
 
   public static UnresolvedExpression compare(
-          String operator, UnresolvedExpression left, UnresolvedExpression right) {
+      String operator, UnresolvedExpression left, UnresolvedExpression right) {
     return new Compare(operator, left, right);
   }
 
@@ -403,10 +403,10 @@ public static List<Argument> defaultFieldsArgs() {
    */
   public static List<Argument> defaultStatsArgs() {
     return exprList(
-            argument("partitions", intLiteral(1)),
-            argument("allnum", booleanLiteral(false)),
-            argument("delim", stringLiteral(" ")),
-            argument("dedupsplit", booleanLiteral(false)));
+        argument("partitions", intLiteral(1)),
+        argument("allnum", booleanLiteral(false)),
+        argument("delim", stringLiteral(" ")),
+        argument("dedupsplit", booleanLiteral(false)));
   }
 
   /**
@@ -414,9 +414,9 @@ public static List<Argument> defaultStatsArgs() {
    */
   public static List<Argument> defaultDedupArgs() {
     return exprList(
-            argument("number", intLiteral(1)),
-            argument("keepempty", booleanLiteral(false)),
-            argument("consecutive", booleanLiteral(false)));
+        argument("number", intLiteral(1)),
+        argument("keepempty", booleanLiteral(false)),
+        argument("consecutive", booleanLiteral(false)));
   }
 
   public static List<Argument> sortOptions() {
@@ -451,7 +451,7 @@ public static RareTopN rareTopN(UnresolvedPlan input, CommandType commandType,
                                   List<Argument> noOfResults, List<UnresolvedExpression> groupList,
                                   Field... fields) {
     return new RareTopN(input, commandType, noOfResults, Arrays.asList(fields), groupList)
-            .attach(input);
+        .attach(input);
   }
 
   public static Limit limit(UnresolvedPlan input, Integer limit, Integer offset) {
@@ -459,9 +459,9 @@ public static Limit limit(UnresolvedPlan input, Integer limit, Integer offset) {
   }
 
   public static Parse parse(UnresolvedPlan input, ParseMethod parseMethod,
-                            UnresolvedExpression sourceField,
-                            Literal pattern,
-                            java.util.Map<String, Literal> arguments) {
+                                  UnresolvedExpression sourceField,
+                                  Literal pattern,
+                                  java.util.Map<String, Literal> arguments) {
     return new Parse(parseMethod, sourceField, pattern, arguments, input);
   }
 
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java b/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java
index 785c65eb95..9121dbd87c 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Cast.java
@@ -43,21 +43,21 @@
 public class Cast extends UnresolvedExpression {
 
   private static final Map<String, FunctionName> CONVERTED_TYPE_FUNCTION_NAME_MAP =
-          new ImmutableMap.Builder<String, FunctionName>()
-                  .put("string", CAST_TO_STRING.getName())
-                  .put("byte", CAST_TO_BYTE.getName())
-                  .put("short", CAST_TO_SHORT.getName())
-                  .put("int", CAST_TO_INT.getName())
-                  .put("integer", CAST_TO_INT.getName())
-                  .put("long", CAST_TO_LONG.getName())
-                  .put("float", CAST_TO_FLOAT.getName())
-                  .put("double", CAST_TO_DOUBLE.getName())
-                  .put("boolean", CAST_TO_BOOLEAN.getName())
-                  .put("date", CAST_TO_DATE.getName())
-                  .put("time", CAST_TO_TIME.getName())
-                  .put("timestamp", CAST_TO_TIMESTAMP.getName())
-                  .put("datetime", CAST_TO_DATETIME.getName())
-                  .build();
+      new ImmutableMap.Builder<String, FunctionName>()
+          .put("string", CAST_TO_STRING.getName())
+          .put("byte", CAST_TO_BYTE.getName())
+          .put("short", CAST_TO_SHORT.getName())
+          .put("int", CAST_TO_INT.getName())
+          .put("integer", CAST_TO_INT.getName())
+          .put("long", CAST_TO_LONG.getName())
+          .put("float", CAST_TO_FLOAT.getName())
+          .put("double", CAST_TO_DOUBLE.getName())
+          .put("boolean", CAST_TO_BOOLEAN.getName())
+          .put("date", CAST_TO_DATE.getName())
+          .put("time", CAST_TO_TIME.getName())
+          .put("timestamp", CAST_TO_TIMESTAMP.getName())
+          .put("datetime", CAST_TO_DATETIME.getName())
+          .build();
 
   /**
    * The source expression cast from.
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/Function.java b/core/src/main/java/org/opensearch/sql/ast/expression/Function.java
index e59bb0372b..c712d860f4 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/Function.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/Function.java
@@ -39,8 +39,8 @@ public <R, C> R accept(AbstractNodeVisitor<R, C> nodeVisitor, C context) {
   @Override
   public String toString() {
     return String.format("%s(%s)", funcName,
-            funcArgs.stream()
-                    .map(Object::toString)
-                    .collect(Collectors.joining(", ")));
+        funcArgs.stream()
+            .map(Object::toString)
+            .collect(Collectors.joining(", ")));
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java b/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java
index c731835a5e..2a86c89cf6 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/IntervalUnit.java
@@ -49,8 +49,8 @@ public enum  IntervalUnit {
    */
   public static IntervalUnit of(String unit) {
     return INTERVAL_UNITS.stream()
-            .filter(v -> unit.equalsIgnoreCase(v.name()))
-            .findFirst()
-            .orElse(IntervalUnit.UNKNOWN);
+        .filter(v -> unit.equalsIgnoreCase(v.name()))
+        .findFirst()
+        .orElse(IntervalUnit.UNKNOWN);
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java b/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java
index 65fb74881c..3166fe45c3 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/RelevanceFieldList.java
@@ -35,9 +35,9 @@ public <R, C> R accept(AbstractNodeVisitor<R, C> nodeVisitor, C context) {
   @Override
   public String toString() {
     return fieldList
-            .entrySet()
-            .stream()
-            .map(e -> String.format("\"%s\" ^ %s", e.getKey(), e.getValue()))
-            .collect(Collectors.joining(", "));
+        .entrySet()
+        .stream()
+        .map(e -> String.format("\"%s\" ^ %s", e.getKey(), e.getValue()))
+        .collect(Collectors.joining(", "));
   }
 }
diff --git a/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java b/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java
index 341d8084d0..f1f3fb19d4 100644
--- a/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java
+++ b/core/src/main/java/org/opensearch/sql/ast/expression/SpanUnit.java
@@ -55,9 +55,9 @@ public static SpanUnit of(String unit) {
         return m;
       default:
         return SPAN_UNITS.stream()
-                .filter(v -> unit.equalsIgnoreCase(v.name()))
-                .findFirst()
-                .orElse(UNKNOWN);
+            .filter(v -> unit.equalsIgnoreCase(v.name()))
+            .findFirst()
+            .orElse(UNKNOWN);
     }
   }
 
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java b/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
index c884afd86a..407d37e8e4 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
@@ -57,4 +57,3 @@ public enum CommandType {
     RARE
   }
 }
-
diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java b/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java
index 71eb014cd9..8c3868329f 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/Relation.java
@@ -83,8 +83,8 @@ public QualifiedName getTableQualifiedName() {
       return (QualifiedName) tableName.get(0);
     } else {
       return new QualifiedName(tableName.stream()
-              .map(UnresolvedExpression::toString)
-              .collect(Collectors.joining(COMMA)));
+          .map(UnresolvedExpression::toString)
+          .collect(Collectors.joining(COMMA)));
     }
   }
 

From 16266e8685d33f7033f8f335f420d5a3fc630446 Mon Sep 17 00:00:00 2001
From: Mitchell Gale <Mitchell.Gale@improving.com>
Date: Wed, 2 Aug 2023 23:55:28 -0700
Subject: [PATCH 7/9] revert change to RaretopN.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---
 core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java b/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
index 407d37e8e4..c884afd86a 100644
--- a/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
+++ b/core/src/main/java/org/opensearch/sql/ast/tree/RareTopN.java
@@ -57,3 +57,4 @@ public enum CommandType {
     RARE
   }
 }
+

From 4602609ed41a51dab3b4bf64c7975e2ef689f5f4 Mon Sep 17 00:00:00 2001
From: Mitchell Gale <Mitchell.Gale@improving.com>
Date: Fri, 4 Aug 2023 22:10:34 -0700
Subject: [PATCH 8/9] addressed PR comments.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8901bbffc3..fd574fe84b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -94,7 +94,7 @@ spotless {
 //        licenseHeader("/*\n" +
 //                " * Copyright OpenSearch Contributors\n" +
 //                " * SPDX-License-Identifier: Apache-2.0\n" +
-//                " */\n\n\n")
+//                " */\n\n")
         removeUnusedImports()
         trimTrailingWhitespace()
         endWithNewline()

From dae1da3fd18648f9a826c2b814a47563ed9d9449 Mon Sep 17 00:00:00 2001
From: Mitchell Gale <Mitchell.Gale@improving.com>
Date: Wed, 9 Aug 2023 14:11:09 -0700
Subject: [PATCH 9/9] Replacing removed include in spotless.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6cb1f05f3d..71f94636b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,7 +84,7 @@ repositories {
 spotless {
     java {
         target fileTree('.') {
-                    'core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java',
+            include 'core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java',
                     'core/src/test/java/org/opensearch/sql/data/**/*.java',
                     'core/src/test/java/org/opensearch/sql/config/**/*.java',
                     'core/src/test/java/org/opensearch/sql/analysis/**/*.java',