Skip to content

Commit 7cf5ca3

Browse files
committed
[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]>
1 parent d9a78df commit 7cf5ca3

17 files changed

+1256
-1326
lines changed

build.gradle

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,32 @@ repositories {
8484
spotless {
8585
java {
8686
target fileTree('.') {
87-
include '**/*.java'
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+
'core/src/main/java/org/opensearch/sql/planner/**/*.java',
92+
'core/src/main/java/org/opensearch/sql/storage/**/*.java',
93+
'core/src/main/java/org/opensearch/sql/utils/**/*.java',
94+
'core/src/main/java/org/opensearch/sql/monitor/**/*.java',
95+
'core/src/main/java/org/opensearch/sql/expression/**/*.java',
96+
'core/src/main/java/org/opensearch/sql/executor/**/*.java',
97+
'core/src/main/java/org/opensearch/sql/exception/**/*.java',
98+
'core/src/main/java/org/opensearch/sql/analysis/**/*.java',
99+
'core/src/test/java/org/opensearch/sql/data/**/*.java',
100+
'core/src/test/java/org/opensearch/sql/datasource/**/*.java',
101+
'core/src/test/java/org/opensearch/sql/ast/**/*.java'
88102
exclude '**/build/**', '**/build-*/**'
89103
}
90-
// importOrder()
104+
importOrder()
91105
// licenseHeader("/*\n" +
92106
// " * Copyright OpenSearch Contributors\n" +
93107
// " * SPDX-License-Identifier: Apache-2.0\n" +
94108
// " */\n\n")
95-
// removeUnusedImports()
96-
// trimTrailingWhitespace()
109+
removeUnusedImports()
110+
trimTrailingWhitespace()
97111
endWithNewline()
98-
// googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
112+
googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
99113
}
100114
}
101115

@@ -113,9 +127,8 @@ allprojects {
113127
sourceCompatibility = targetCompatibility = "11"
114128
}
115129
configurations.all {
116-
resolutionStrategy.force "com.squareup.okio:okio:3.5.0"
117-
resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.9.0"
118-
resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0"
130+
resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
131+
resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0"
119132
}
120133
}
121134

@@ -217,5 +230,12 @@ task updateVersion {
217230
println "Setting version to ${newVersion}."
218231
// String tokenization to support -SNAPSHOT
219232
ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true)
233+
ant.replaceregexp(match:'"version": "\\d+.\\d+.\\d+.\\d+', replace:'"version": ' + '"' + newVersion.tokenize('-')[0] + '.0', flags:'g', byline:true) {
234+
fileset(dir: projectDir) {
235+
include(name: "workbench/package.json")
236+
include(name: "workbench/opensearch_dashboards.json")
237+
}
238+
}
239+
ant.replaceregexp(file:'workbench/opensearch_dashboards.json', match:'"opensearchDashboardsVersion": "\\d+.\\d+.\\d+', replace:'"opensearchDashboardsVersion": ' + '"' + newVersion.tokenize('-')[0], flags:'g', byline:true)
220240
}
221241
}

core/build.gradle

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,28 @@ plugins {
2626
id 'java-library'
2727
id "io.freefair.lombok"
2828
id 'jacoco'
29+
id 'info.solidsoft.pitest' version '1.9.0'
2930
id 'java-test-fixtures'
3031
}
3132

3233
repositories {
3334
mavenCentral()
3435
}
3536

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+
42+
pitest {
43+
targetClasses = ['org.opensearch.sql.*']
44+
pitestVersion = '1.9.0'
45+
threads = 4
46+
outputFormats = ['HTML', 'XML']
47+
timestampedReports = false
48+
junit5PluginVersion = '1.0.0'
49+
}
50+
3651
dependencies {
3752
api group: 'com.google.guava', name: 'guava', version: '32.0.1-jre'
3853
api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.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)