# This is a combination of 9 commits.

# This is the 1st commit message: Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (#1899) * Added setDefaultMediaType for create_index and create_index_with_IOException Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> (cherry picked from commit 7b932a7) Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Resolving merge conflicts for pre tag in java docs. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> running spotless check on newly pre tagged javadocs. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Converts java doc table to proper java doc table. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Resolving merge conflicts for pre tag in java docs 2 Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> running spotless check on newly pre tagged javadocs. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> cherry pick 60c0018 Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Addressed PR comment for table format in AbstractExprValue. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Removed pre tag from ExpressionReferenceOptimizer. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Removed pre tag from AstDSL.java Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Removed pre tag from AstDSL.java Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Removed pre tag from SelectExpressionAnalyzer.java Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> fixed java doc in QualifiedName.java Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Removing checkstyle test for core and added spotless for relevant directories. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> # This is the commit message #2: Fixing spacing around headers in ExpressionReferenceOptimizer.java SelectExpressionAnalyzer.java Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> # This is the commit message #3: Fix breaking changes. Disable some flaky tests in legacy. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> (cherry picked from commit 809e656) Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> # This is the commit message #4: Resolving merge conflicts for pre tag in java docs. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> # This is the commit message #5: running spotless check on newly pre tagged javadocs. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> # This is the commit message #6: Fixed java doc spelling and improving string concatination. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> # This is the commit message #7: improving string concatination. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> # This is the commit message #8: Improving failure format on some functions. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> # This is the commit message #9: spotless apply and fix of build.gradle Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
opensearch-project · Aug 3, 2023 · 496fe8e · 496fe8e
1 parent d2de909
commit 496fe8e
Show file tree

Hide file tree

Showing 133 changed files with 1,106 additions and 1,504 deletions.
diff --git a/build.gradle b/build.gradle
@@ -84,7 +84,10 @@ repositories {
 spotless {
     java {
         target fileTree('.') {
-            include '**/*.java'
+            include 'core/src/main/java/org/opensearch/sql/analysis/**/*.java',
+                    'core/src/test/java/org/opensearch/sql/data/**/*.java',
+                    'core/src/test/java/org/opensearch/sql/datasource/**/*.java',
+                    'core/src/test/java/org/opensearch/sql/ast/**/*.java'
             exclude '**/build/**', '**/build-*/**'
         }
 //        importOrder()
@@ -95,7 +98,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
@@ -34,6 +34,9 @@ repositories {
     mavenCentral()
 }
 
+checkstyleMain.ignoreFailures = true
+checkstyleTest.ignoreFailures = true
+
 pitest {
     targetClasses = ['org.opensearch.sql.*']
     pitestVersion = '1.9.0'

diff --git a/core/src/main/java/org/opensearch/sql/analysis/AnalysisContext.java b/core/src/main/java/org/opensearch/sql/analysis/AnalysisContext.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.analysis;
 
 import java.util.ArrayList;
@@ -13,26 +12,22 @@
 import org.opensearch.sql.expression.NamedExpression;
 import org.opensearch.sql.expression.function.FunctionProperties;
 
-/**
- * The context used for Analyzer.
- */
+/** The context used for Analyzer. */
 public class AnalysisContext {
-  /**
-   * Environment stack for symbol scope management.
-   */
+  /** Environment stack for symbol scope management. */
   private TypeEnvironment environment;
-  @Getter
-  private final List<NamedExpression> namedParseExpressions;
 
-  @Getter
-  private final FunctionProperties functionProperties;
+  @Getter private final List<NamedExpression> namedParseExpressions;
+
+  @Getter private final FunctionProperties functionProperties;
 
   public AnalysisContext() {
     this(new TypeEnvironment(null));
   }
 
   /**
    * Class CTOR.
+   *
    * @param environment Env to set to a new instance.
    */
   public AnalysisContext(TypeEnvironment environment) {
@@ -41,9 +36,7 @@ public AnalysisContext(TypeEnvironment environment) {
     this.functionProperties = new FunctionProperties();
   }
 
-  /**
-   * Push a new environment.
-   */
+  /** Push a new environment. */
   public void push() {
     environment = new TypeEnvironment(environment);
   }