Skip to content

Commit 8068378

Browse files
committed
fix failing tests
Signed-off-by: Jeffrey Kinard <[email protected]>
1 parent fd7b354 commit 8068378

File tree

3 files changed

+3
-24
lines changed

3 files changed

+3
-24
lines changed

sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcWriteSchemaTransformProvider.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ public abstract static class JdbcWriteSchemaTransformConfiguration implements Se
337337
public abstract String getWriteStatement();
338338

339339
public void validate() {
340-
validate("JDBC");
340+
validate("");
341341
}
342342

343343
public void validate(String jdbcType) throws IllegalArgumentException {
@@ -360,7 +360,8 @@ public void validate(String jdbcType) throws IllegalArgumentException {
360360
}
361361
if (jdbcTypePresent
362362
&& !JDBC_DRIVER_MAP.containsKey(Objects.requireNonNull(jdbcType).toLowerCase())) {
363-
throw new IllegalArgumentException("JDBC type must be one of " + JDBC_DRIVER_MAP.keySet());
363+
throw new IllegalArgumentException(
364+
"JDBC type must be one of " + JDBC_DRIVER_MAP.keySet() + " but was " + jdbcType);
364365
}
365366

366367
boolean writeStatementPresent =

sdks/java/io/jdbc/src/test/java/org/apache/beam/sdk/io/jdbc/JdbcReadSchemaTransformProviderTest.java

-11
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,6 @@ public void testInvalidReadSchemaOptions() {
122122
.build()
123123
.validate();
124124
});
125-
assertThrows(
126-
IllegalArgumentException.class,
127-
() -> {
128-
JdbcReadSchemaTransformProvider.JdbcReadSchemaTransformConfiguration.builder()
129-
.setJdbcUrl("JdbcUrl")
130-
.setLocation("Location")
131-
.setDriverClassName("ClassName")
132-
.setJdbcType((String) JDBC_DRIVER_MAP.keySet().toArray()[0])
133-
.build()
134-
.validate();
135-
});
136125
}
137126

138127
@Test

sdks/java/io/jdbc/src/test/java/org/apache/beam/sdk/io/jdbc/JdbcWriteSchemaTransformProviderTest.java

-11
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,6 @@ public void testInvalidWriteSchemaOptions() {
122122
.build()
123123
.validate();
124124
});
125-
assertThrows(
126-
IllegalArgumentException.class,
127-
() -> {
128-
JdbcWriteSchemaTransformProvider.JdbcWriteSchemaTransformConfiguration.builder()
129-
.setJdbcUrl("JdbcUrl")
130-
.setLocation("Location")
131-
.setDriverClassName("ClassName")
132-
.setJdbcType((String) JDBC_DRIVER_MAP.keySet().toArray()[0])
133-
.build()
134-
.validate();
135-
});
136125
}
137126

138127
@Test

0 commit comments

Comments
 (0)