Skip to content

Commit bb28a32

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

File tree

4 files changed

+9
-30
lines changed

4 files changed

+9
-30
lines changed

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

Lines changed: 3 additions & 2 deletions
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

Lines changed: 0 additions & 11 deletions
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

Lines changed: 0 additions & 11 deletions
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

sdks/python/apache_beam/yaml/generate_yaml_docs.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,12 @@ def add_transform_links(transform, description, provider_list):
203203
would be converted to
204204
"Some description talking about <a href="#mytransform">MyTransform</a>"
205205
206-
meanwhile,
207-
```
208-
- type: MyTransform
209-
config:
210-
...
211-
```
206+
meanwhile::
207+
208+
type: MyTransform
209+
config:
210+
...
211+
212212
Would remain unchanged.
213213
214214
Avoid self-linking within a Transform page.

0 commit comments

Comments
 (0)