Skip to content

Commit 7f4a33a

Browse files
committed
Fixing spotless check failures
Signed-off-by: Suresh N S <nssuresh@amazon.com>
1 parent 573275a commit 7f4a33a

3 files changed

Lines changed: 23 additions & 17 deletions

File tree

sandbox/plugins/dsl-query-executor/src/test/java/org/opensearch/dsl/converter/SearchSourceConverterTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,9 @@ public void testGoldenFileRelNodeGeneration() throws Exception {
193193

194194
List<String> actualFields = relNode.getRowType().getFieldNames();
195195
if (!tc.getMockResultFieldNames().equals(actualFields)) {
196-
failures.add(fileName + ": Field names mismatch\n Expected: " + tc.getMockResultFieldNames() + "\n Actual: " + actualFields);
196+
failures.add(
197+
fileName + ": Field names mismatch\n Expected: " + tc.getMockResultFieldNames() + "\n Actual: " + actualFields
198+
);
197199
}
198200
} catch (Exception e) {
199201
failures.add(fileName + ": " + e.getClass().getSimpleName() + " - " + e.getMessage());

sandbox/plugins/dsl-query-executor/src/test/java/org/opensearch/dsl/golden/CalciteTestInfra.java

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,7 @@ public RelDataType getRowType(RelDataTypeFactory tf) {
7676
typeFactory,
7777
new CalciteConnectionConfigImpl(new Properties())
7878
);
79-
RelOptTable table = Objects.requireNonNull(
80-
reader.getTable(List.of(indexName)),
81-
"Table not found in schema: " + indexName
82-
);
79+
RelOptTable table = Objects.requireNonNull(reader.getTable(List.of(indexName)), "Table not found in schema: " + indexName);
8380

8481
return new InfraResult(cluster, table, schema);
8582
}
@@ -91,19 +88,28 @@ public RelDataType getRowType(RelDataTypeFactory tf) {
9188
*/
9289
private static SqlTypeName toSqlTypeName(String goldenType) {
9390
switch (goldenType) {
94-
case "VARCHAR": return SqlTypeName.VARCHAR;
95-
case "INTEGER": return SqlTypeName.INTEGER;
96-
case "BIGINT": return SqlTypeName.BIGINT;
97-
case "DOUBLE": return SqlTypeName.DOUBLE;
98-
case "FLOAT": return SqlTypeName.FLOAT;
99-
case "BOOLEAN": return SqlTypeName.BOOLEAN;
100-
case "DATE": return SqlTypeName.DATE;
101-
case "TIMESTAMP": return SqlTypeName.TIMESTAMP;
91+
case "VARCHAR":
92+
return SqlTypeName.VARCHAR;
93+
case "INTEGER":
94+
return SqlTypeName.INTEGER;
95+
case "BIGINT":
96+
return SqlTypeName.BIGINT;
97+
case "DOUBLE":
98+
return SqlTypeName.DOUBLE;
99+
case "FLOAT":
100+
return SqlTypeName.FLOAT;
101+
case "BOOLEAN":
102+
return SqlTypeName.BOOLEAN;
103+
case "DATE":
104+
return SqlTypeName.DATE;
105+
case "TIMESTAMP":
106+
return SqlTypeName.TIMESTAMP;
102107
default:
103108
throw new IllegalArgumentException("Unsupported SQL type in golden file indexMapping: " + goldenType);
104109
}
105110
}
106111

107112
/** Result record containing the Calcite infrastructure built from a golden file mapping. */
108-
public record InfraResult(RelOptCluster cluster, RelOptTable table, SchemaPlus schema) {}
113+
public record InfraResult(RelOptCluster cluster, RelOptTable table, SchemaPlus schema) {
114+
}
109115
}

sandbox/plugins/dsl-query-executor/src/test/java/org/opensearch/dsl/golden/GoldenFileLoader.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,7 @@ private static void validate(GoldenTestCase testCase, Path filePath) {
9696

9797
private static void requireNonNull(Object value, String fieldName, Path filePath) {
9898
if (value == null) {
99-
throw new IllegalArgumentException(
100-
"Golden file " + filePath + " missing required field: " + fieldName
101-
);
99+
throw new IllegalArgumentException("Golden file " + filePath + " missing required field: " + fieldName);
102100
}
103101
}
104102
}

0 commit comments

Comments
 (0)