Skip to content

Commit 1b7fa89

Browse files
authored
Merge pull request #317 from Bit-Quill/dev/sl_GoogleJavaFormat4
[Spotless] Applying Google Code Format for core/src/main files #4
2 parents d00dc4d + 16266e8 commit 1b7fa89

35 files changed

+1548
-1622
lines changed

build.gradle

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,13 @@ repositories {
8383
// Spotless checks will be added as PRs are applied to resolve each style issue is approved.
8484
spotless {
8585
java {
86-
// target fileTree('.') {
87-
// include '**/*.java', 'src/*/java/**/*.java'
88-
// exclude '**/build/**', '**/build-*/**'
89-
// }
86+
target fileTree('.') {
87+
include 'core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java',
88+
'core/src/test/java/org/opensearch/sql/data/**/*.java',
89+
'core/src/test/java/org/opensearch/sql/config/**/*.java',
90+
'core/src/test/java/org/opensearch/sql/analysis/**/*.java'
91+
exclude '**/build/**', '**/build-*/**'
92+
}
9093
// importOrder()
9194
// licenseHeader("/*\n" +
9295
// " * Copyright OpenSearch Contributors\n" +
@@ -95,7 +98,7 @@ spotless {
9598
// removeUnusedImports()
9699
// trimTrailingWhitespace()
97100
// endWithNewline()
98-
// googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
101+
googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
99102
}
100103
}
101104

core/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ repositories {
3434
mavenCentral()
3535
}
3636

37+
// Being ignored as a temporary measure before being removed in favour of
38+
// spotless https://github.com/opensearch-project/sql/issues/1101
39+
checkstyleTest.ignoreFailures = true
40+
checkstyleMain.ignoreFailures = true
41+
3742
pitest {
3843
targetClasses = ['org.opensearch.sql.*']
3944
pitestVersion = '1.9.0'

core/src/main/java/org/opensearch/sql/DataSourceSchemaName.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ public class DataSourceSchemaName {
1717
private final String dataSourceName;
1818

1919
private final String schemaName;
20-
2120
}

core/src/test/java/org/opensearch/sql/analysis/AnalysisContextTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
76
package org.opensearch.sql.analysis;
87

98
import static org.junit.jupiter.api.Assertions.assertEquals;

0 commit comments

Comments
 (0)