[Spotless] Applying Google Code Format for core/src/main files #4 (op…

…ensearch-project#1933) * GJF part 4 Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> * add build.gradle comment to mention why we are ignoring checkstyle failures for core. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> * Fix include spotless build gradle. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> * revert astDSL.JAVA Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> * revert ast changes as was covered in spotless #1 PR for GJF. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> * Reverting commits in ast folder attempt #2 Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> * revert change to RaretopN.java Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> * addressed PR comments. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> * Replacing removed include in spotless. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> --------- Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com> Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Bit-Quill · Aug 14, 2023 · 633d495 · 633d495
1 parent 3bcd3a1
commit 633d495
Show file tree

Hide file tree

Showing 17 changed files with 1,221 additions and 1,320 deletions.
diff --git a/build.gradle b/build.gradle
@@ -84,7 +84,11 @@ 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',

diff --git a/core/build.gradle b/core/build.gradle
@@ -34,8 +34,10 @@ repositories {
     mavenCentral()
 }
 
-checkstyleMain.ignoreFailures = true
+// 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
 
 pitest {
     targetClasses = ['org.opensearch.sql.*']

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 @@