Skip to content

Commit dc62079

Browse files
committed
Fix line separator and license header
Signed-off-by: Chen Dai <daichen@amazon.com>
1 parent 19e2f54 commit dc62079

3 files changed

Lines changed: 17 additions & 2 deletions

File tree

api/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ spotless {
2626
exclude '**/build/**', '**/build-*/**', 'src/main/gen/**'
2727
}
2828
importOrder()
29+
licenseHeader("/*\n" +
30+
" * Copyright OpenSearch Contributors\n" +
31+
" * SPDX-License-Identifier: Apache-2.0\n" +
32+
" */\n\n")
2933
removeUnusedImports()
3034
trimTrailingWhitespace()
3135
endWithNewline()

api/src/main/java/org/opensearch/sql/api/EmptyDataSourceService.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright OpenSearch Contributors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package org.opensearch.sql.api;
27

38
import java.util.Map;

api/src/test/java/org/opensearch/sql/api/transpiler/UnifiedQueryTranspilerTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void testToSql() {
3030
RelNode plan = planner.plan(pplQuery);
3131

3232
String actualSql = transpiler.toSql(plan);
33-
String expectedSql = "SELECT *\nFROM `catalog`.`employees`";
33+
String expectedSql = normalize("SELECT *\nFROM `catalog`.`employees`");
3434
assertEquals(
3535
"Transpiled SQL using SparkSqlDialect should match expected SQL", expectedSql, actualSql);
3636
}
@@ -44,10 +44,16 @@ public void testToSqlWithCustomDialect() {
4444
UnifiedQueryTranspiler.builder().dialect(OpenSearchSparkSqlDialect.DEFAULT).build();
4545
String actualSql = customTranspiler.toSql(plan);
4646
String expectedSql =
47-
"SELECT *\nFROM `catalog`.`employees`\nWHERE TRY_CAST(`name` AS DOUBLE) = 1.230E2";
47+
normalize(
48+
"SELECT *\nFROM `catalog`.`employees`\nWHERE TRY_CAST(`name` AS DOUBLE) = 1.230E2");
4849
assertEquals(
4950
"Transpiled query using OpenSearchSparkSqlDialect should translate SAFE_CAST to TRY_CAST",
5051
expectedSql,
5152
actualSql);
5253
}
54+
55+
/** Normalizes line endings to platform-specific format for cross-platform test compatibility. */
56+
private String normalize(String sql) {
57+
return sql.replace("\n", System.lineSeparator());
58+
}
5359
}

0 commit comments

Comments
 (0)