Merge branch 'main' into dev/sl_GoogleJavaFormat14

Signed-off-by: Mitchell Gale <[email protected]>
opensearch-project · Aug 16, 2023 · 81f43bb · 81f43bb
2 parents ec08d0e + b035b13
commit 81f43bb
Show file tree

Hide file tree

Showing 65 changed files with 2,790 additions and 3,122 deletions.
diff --git a/build.gradle b/build.gradle
@@ -84,10 +84,11 @@ repositories {
 spotless {
     java {
         target fileTree('.') {
-            include 'common/**/*.java',
-                    'datasources/**/*.java',
+            include 'datasources/**/*.java',
                     'core/**/*.java',
                     'protocol/**/*.java',
+                    'sql/**/*.java',
+                    'common/**/*.java',
                     'ppl/**/*.java'
             exclude '**/build/**', '**/build-*/**'
         }

diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/TestConfig.java b/integ-test/src/test/java/org/opensearch/sql/correctness/TestConfig.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness;
 
 import static java.util.stream.Collectors.joining;
@@ -19,11 +18,13 @@
 import org.opensearch.sql.legacy.utils.StringUtils;
 
 /**
+ * <pre>
  * Test configuration parse the following information from command line arguments:
  * 1) Test schema and data
  * 2) Test queries
  * 3) OpenSearch connection URL
  * 4) Other database connection URLs
+ * </pre>
  */
 public class TestConfig {
 
@@ -37,9 +38,7 @@ public class TestConfig {
 
   private final String openSearchHostUrl;
 
-  /**
-   * Test against some database rather than OpenSearch via our JDBC driver
-   */
+  /** Test against some database rather than OpenSearch via our JDBC driver */
   private final String dbConnectionUrl;
 
   private final Map<String, String> otherDbConnectionNameAndUrls = new HashMap<>();
@@ -75,12 +74,14 @@ public Map<String, String> getOtherDbConnectionNameAndUrls() {
 
   private TestDataSet[] buildDefaultTestDataSet() {
     return new TestDataSet[] {
-        new TestDataSet("opensearch_dashboards_sample_data_flights",
-            readFile("opensearch_dashboards_sample_data_flights.json"),
-            readFile("opensearch_dashboards_sample_data_flights.csv")),
-        new TestDataSet("opensearch_dashboards_sample_data_ecommerce",
-            readFile("opensearch_dashboards_sample_data_ecommerce.json"),
-            readFile("opensearch_dashboards_sample_data_ecommerce.csv")),
+      new TestDataSet(
+          "opensearch_dashboards_sample_data_flights",
+          readFile("opensearch_dashboards_sample_data_flights.json"),
+          readFile("opensearch_dashboards_sample_data_flights.csv")),
+      new TestDataSet(
+          "opensearch_dashboards_sample_data_ecommerce",
+          readFile("opensearch_dashboards_sample_data_ecommerce.json"),
+          readFile("opensearch_dashboards_sample_data_ecommerce.csv")),
     };
   }
 
@@ -118,31 +119,33 @@ private static String readFile(String relativePath) {
   @Override
   public String toString() {
     return "\n=================================\n"
-        + "Tested Database  : " + openSearchHostUrlToString() + '\n'
-        + "Other Databases  :\n" + otherDbConnectionInfoToString() + '\n'
-        + "Test data set(s) :\n" + testDataSetsToString() + '\n'
-        + "Test query set   : " + testQuerySet + '\n'
-        + "=================================\n";
+        + "Tested Database  : "
+        + openSearchHostUrlToString()
+        + "\nOther Databases  :\n"
+        + otherDbConnectionInfoToString()
+        + "\nTest data set(s) :\n"
+        + testDataSetsToString()
+        + "\nTest query set   : "
+        + testQuerySet
+        + "\n=================================\n";
   }
 
   private String testDataSetsToString() {
-    return Arrays.stream(testDataSets).
-        map(TestDataSet::toString).
-        collect(joining("\n"));
+    return Arrays.stream(testDataSets).map(TestDataSet::toString).collect(joining("\n"));
   }
 
   private String openSearchHostUrlToString() {
     if (!dbConnectionUrl.isEmpty()) {
       return dbConnectionUrl;
     }
-    return openSearchHostUrl.isEmpty() ? "(Use internal OpenSearch in workspace)" :
-        openSearchHostUrl;
+    return openSearchHostUrl.isEmpty()
+        ? "(Use internal OpenSearch in workspace)"
+        : openSearchHostUrl;
   }
 
   private String otherDbConnectionInfoToString() {
-    return otherDbConnectionNameAndUrls.entrySet().stream().
-        map(e -> StringUtils.format(" %s = %s", e.getKey(), e.getValue())).
-        collect(joining("\n"));
+    return otherDbConnectionNameAndUrls.entrySet().stream()
+        .map(e -> StringUtils.format(" %s = %s", e.getKey(), e.getValue()))
+        .collect(joining("\n"));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/report/SuccessTestCase.java b/integ-test/src/test/java/org/opensearch/sql/correctness/report/SuccessTestCase.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.report;
 
 import static org.opensearch.sql.correctness.report.TestCaseReport.TestResult.SUCCESS;
@@ -12,9 +11,7 @@
 import lombok.Getter;
 import lombok.ToString;
 
-/**
- * Report for successful test case result.
- */
+/** Report for successful test case result. */
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Getter

diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestCaseReport.java b/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestCaseReport.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.report;
 
 import static org.opensearch.sql.correctness.report.TestCaseReport.TestResult.SUCCESS;
@@ -12,22 +11,19 @@
 import lombok.Getter;
 import lombok.ToString;
 
-/**
- * Base class for different test result.
- */
+/** Base class for different test result. */
 @EqualsAndHashCode
 @ToString
 public abstract class TestCaseReport {
 
   public enum TestResult {
-    SUCCESS, FAILURE;
+    SUCCESS,
+    FAILURE;
   }
 
-  @Getter
-  private final int id;
+  @Getter private final int id;
 
-  @Getter
-  private final String sql;
+  @Getter private final String sql;
 
   private final TestResult result;
 
@@ -40,5 +36,4 @@ public TestCaseReport(int id, String sql, TestResult result) {
   public String getResult() {
     return result == SUCCESS ? "Success" : "Failed";
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestReport.java b/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestReport.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.report;
 
 import java.util.ArrayList;
@@ -12,9 +11,7 @@
 import lombok.Getter;
 import lombok.ToString;
 
-/**
- * Test report class to generate JSON report.
- */
+/** Test report class to generate JSON report. */
 @EqualsAndHashCode
 @ToString
 @Getter
@@ -37,5 +34,4 @@ public void addTestCase(TestCaseReport testCase) {
       summary.addFailure();
     }
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestSummary.java b/integ-test/src/test/java/org/opensearch/sql/correctness/report/TestSummary.java
@@ -3,16 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.report;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 
-/**
- * Test summary section.
- */
+/** Test summary section. */
 @EqualsAndHashCode
 @ToString
 @Getter
@@ -33,5 +30,4 @@ public void addFailure() {
     failure++;
     total++;
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/Type.java b/integ-test/src/test/java/org/opensearch/sql/correctness/runner/resultset/Type.java
@@ -3,25 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.runner.resultset;
 
 import lombok.Data;
 
-/**
- * Column type in schema
- */
+/** Column type in schema */
 @Data
 public class Type {
 
-  /**
-   * Column name
-   */
+  /** Column name */
   private final String name;
 
-  /**
-   * Column type
-   */
+  /** Column type */
   private final String type;
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestConfigTest.java b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestConfigTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.tests;
 
 import static java.util.Collections.emptyMap;
@@ -18,9 +17,7 @@
 import org.junit.Test;
 import org.opensearch.sql.correctness.TestConfig;
 
-/**
- * Tests for {@link TestConfig}
- */
+/** Tests for {@link TestConfig} */
 public class TestConfigTest {
 
   @Test
@@ -31,9 +28,7 @@ public void testDefaultConfig() {
         config.getOtherDbConnectionNameAndUrls(),
         allOf(
             hasEntry("H2", "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"),
-            hasEntry("SQLite", "jdbc:sqlite::memory:")
-        )
-    );
+            hasEntry("SQLite", "jdbc:sqlite::memory:")));
   }
 
   @Test
@@ -45,18 +40,16 @@ public void testCustomESUrls() {
 
   @Test
   public void testCustomDbUrls() {
-    Map<String, String> args = ImmutableMap.of("otherDbUrls",
-        "H2=jdbc:h2:mem:test;DB_CLOSE_DELAY=-1,"
-            + "Derby=jdbc:derby:memory:myDb;create=true");
+    Map<String, String> args =
+        ImmutableMap.of(
+            "otherDbUrls",
+            "H2=jdbc:h2:mem:test;DB_CLOSE_DELAY=-1,Derby=jdbc:derby:memory:myDb;create=true");
 
     TestConfig config = new TestConfig(args);
     assertThat(
         config.getOtherDbConnectionNameAndUrls(),
         allOf(
             hasEntry("H2", "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"),
-            hasEntry("Derby", "jdbc:derby:memory:myDb;create=true")
-        )
-    );
+            hasEntry("Derby", "jdbc:derby:memory:myDb;create=true")));
   }
-
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestDataSetTest.java b/integ-test/src/test/java/org/opensearch/sql/correctness/tests/TestDataSetTest.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package org.opensearch.sql.correctness.tests;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -13,9 +12,7 @@
 import org.junit.Test;
 import org.opensearch.sql.correctness.testset.TestDataSet;
 
-/**
- * Tests for {@link TestDataSet}
- */
+/** Tests for {@link TestDataSet} */
 public class TestDataSetTest {
 
   @Test
@@ -40,9 +37,7 @@ public void testDataSetWithSingleColumnData() {
             new Object[] {"field"},
             new Object[] {"hello"},
             new Object[] {"world"},
-            new Object[] {"123"}
-        )
-    );
+            new Object[] {"123"}));
   }
 
   @Test
@@ -61,16 +56,13 @@ public void testDataSetWithMultiColumnsData() {
             + "  }\n"
             + "}";
 
-    TestDataSet dataSet = new TestDataSet("test", mappings,
-        "field1,field2\nhello,123\nworld,456");
+    TestDataSet dataSet = new TestDataSet("test", mappings, "field1,field2\nhello,123\nworld,456");
     assertThat(
         dataSet.getDataRows(),
         contains(
             new Object[] {"field1", "field2"},
             new Object[] {"hello", 123},
-            new Object[] {"world", 456}
-        )
-    );
+            new Object[] {"world", 456}));
   }
 
   @Test
@@ -86,17 +78,15 @@ public void testDataSetWithEscapedComma() {
             + "  }\n"
             + "}";
 
-    TestDataSet dataSet = new TestDataSet("test", mappings,
-        "field\n\"hello,world,123\"\n123\n\"[abc,def,ghi]\"");
+    TestDataSet dataSet =
+        new TestDataSet("test", mappings, "field\n\"hello,world,123\"\n123\n\"[abc,def,ghi]\"");
     assertThat(
         dataSet.getDataRows(),
         contains(
             new Object[] {"field"},
             new Object[] {"hello,world,123"},
             new Object[] {"123"},
-            new Object[] {"[abc,def,ghi]"}
-        )
-    );
+            new Object[] {"[abc,def,ghi]"}));
   }
 
   @Test
@@ -115,17 +105,13 @@ public void testDataSetWithNullData() {
             + "  }\n"
             + "}";
 
-    TestDataSet dataSet = new TestDataSet("test", mappings,
-        "field1,field2\n,123\nworld,\n,");
+    TestDataSet dataSet = new TestDataSet("test", mappings, "field1,field2\n,123\nworld,\n,");
     assertThat(
         dataSet.getDataRows(),
         contains(
             new Object[] {"field1", "field2"},
             new Object[] {null, 123},
             new Object[] {"world", null},
-            new Object[] {null, null}
-        )
-    );
+            new Object[] {null, null}));
   }
-
 }