Skip to content

Commit 9a3e0f6

Browse files
MitchellGaleMitchellGale
authored
Merge branch 'main' into integ/sl_GoogleJavaFormat6
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
2 parents 601b598 + 91bbb5d commit 9a3e0f6

532 files changed

Lines changed: 12461 additions & 12707 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,11 @@ repositories {
8484
spotless {
8585
java {
8686
target fileTree('.') {
87-
include 'datasources/**/*.java'
87+
include 'datasources/**/*.java',
88+
'core/**/*.java'
8889
exclude '**/build/**', '**/build-*/**'
8990
}
90-
// importOrder()
91+
importOrder()
9192
// licenseHeader("/*\n" +
9293
// " * Copyright OpenSearch Contributors\n" +
9394
// " * SPDX-License-Identifier: Apache-2.0\n" +

‎core/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ 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+
checkstyleTestFixtures.ignoreFailures = true
42+
3743
pitest {
3844
targetClasses = ['org.opensearch.sql.*']
3945
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/main/java/org/opensearch/sql/analysis/AnalysisContext.java‎

Lines changed: 7 additions & 14 deletions
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 java.util.ArrayList;
@@ -13,26 +12,22 @@
1312
import org.opensearch.sql.expression.NamedExpression;
1413
import org.opensearch.sql.expression.function.FunctionProperties;
1514

16-
/**
17-
* The context used for Analyzer.
18-
*/
15+
/** The context used for Analyzer. */
1916
public class AnalysisContext {
20-
/**
21-
* Environment stack for symbol scope management.
22-
*/
17+
/** Environment stack for symbol scope management. */
2318
private TypeEnvironment environment;
24-
@Getter
25-
private final List<NamedExpression> namedParseExpressions;
2619

27-
@Getter
28-
private final FunctionProperties functionProperties;
20+
@Getter private final List<NamedExpression> namedParseExpressions;
21+
22+
@Getter private final FunctionProperties functionProperties;
2923

3024
public AnalysisContext() {
3125
this(new TypeEnvironment(null));
3226
}
3327

3428
/**
3529
* Class CTOR.
30+
*
3631
* @param environment Env to set to a new instance.
3732
*/
3833
public AnalysisContext(TypeEnvironment environment) {
@@ -41,9 +36,7 @@ public AnalysisContext(TypeEnvironment environment) {
4136
this.functionProperties = new FunctionProperties();
4237
}
4338

44-
/**
45-
* Push a new environment.
46-
*/
39+
/** Push a new environment. */
4740
public void push() {
4841
environment = new TypeEnvironment(environment);
4942
}

0 commit comments

Comments
 (0)