[Backport 2.x] [Spotless] Applying Google Code Format for core/src/ma…

…in files #4 opensearch-project#1933 (opensearch-project#1995) * [Spotless] Applying Google Code Format for core/src/main files #4 (opensearch-project#1933) * GJF part 4 Signed-off-by: Mitchell Gale <[email protected]> * add build.gradle comment to mention why we are ignoring checkstyle failures for core. Signed-off-by: Mitchell Gale <[email protected]> * Fix include spotless build gradle. Signed-off-by: Mitchell Gale <[email protected]> * revert astDSL.JAVA Signed-off-by: Mitchell Gale <[email protected]> * revert ast changes as was covered in spotless #1 PR for GJF. Signed-off-by: Mitchell Gale <[email protected]> * Reverting commits in ast folder attempt #2 Signed-off-by: Mitchell Gale <[email protected]> * revert change to RaretopN.java Signed-off-by: Mitchell Gale <[email protected]> * addressed PR comments. Signed-off-by: Mitchell Gale <[email protected]> * Replacing removed include in spotless. Signed-off-by: Mitchell Gale <[email protected]> --------- Signed-off-by: Mitchell Gale <[email protected]> Signed-off-by: Mitchell Gale <[email protected]> * spotless apply Signed-off-by: Mitchell Gale <[email protected]> * addressed PR comments Signed-off-by: Mitchell Gale <[email protected]> * remove pitest Signed-off-by: Mitchell Gale <[email protected]> --------- Signed-off-by: Mitchell Gale <[email protected]> Signed-off-by: Mitchell Gale <[email protected]>
Bit-Quill · Aug 22, 2023 · 3f7db81 · 3f7db81
1 parent 0fd0f4c
commit 3f7db81
Show file tree

Hide file tree

Showing 32 changed files with 1,543 additions and 1,617 deletions.
diff --git a/build.gradle b/build.gradle
@@ -84,19 +84,23 @@ repositories {
 spotless {
     java {
         target fileTree('.') {
-            include 'core/src/main/java/org/opensearch/sql/planner/**/*.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',
+                    'core/src/main/java/org/opensearch/sql/planner/**/*.java',
                     'core/src/main/java/org/opensearch/sql/storage/**/*.java',
                     'core/src/main/java/org/opensearch/sql/utils/**/*.java',
                     'core/src/main/java/org/opensearch/sql/monitor/**/*.java'
             exclude '**/build/**', '**/build-*/**'
         }
-//        importOrder()
+        importOrder()
 //        licenseHeader("/*\n" +
 //                " * Copyright OpenSearch Contributors\n" +
 //                " * SPDX-License-Identifier: Apache-2.0\n" +
 //                " */\n\n")
-//        removeUnusedImports()
-//        trimTrailingWhitespace()
+        removeUnusedImports()
+        trimTrailingWhitespace()
         endWithNewline()
         googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
     }

diff --git 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/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;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,5 +17,4 @@ public class DataSourceSchemaName {
		private final String dataSourceName;

		private final String schemaName;

		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
      * SPDX-License-Identifier: Apache-2.0
      */
     package org.opensearch.sql.analysis;
     import static org.junit.jupiter.api.Assertions.assertEquals;
@@ Expand Down @@