Skip to content

Commit

Permalink
[Backport 2.x] [Spotless] Applying Google Code Format for core/src/ma…
Browse files Browse the repository at this point in the history
…in files #4 #1933 (#1995)

* [Spotless] Applying Google Code Format for core/src/main files #4  (#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>

* spotless apply

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* addressed PR comments

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* remove pitest

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>
  • Loading branch information
MitchellGale committed Aug 22, 2023
1 parent 0fd0f4c commit 3f7db81
Show file tree
Hide file tree
Showing 32 changed files with 1,543 additions and 1,617 deletions.
12 changes: 8 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
Expand Down
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 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
Loading

0 comments on commit 3f7db81

Please sign in to comment.