Skip to content

Commit aa99862

Browse files
committed
[FLINK-39252][sqlserver] fix: replace Java 9+ APIs with Java 8 compatible code in SQL Server connector
1 parent 1c6b293 commit aa99862

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-sqlserver/src/main/java/org/apache/flink/cdc/connectors/sqlserver/factory/SqlServerDataSourceFactory.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import java.util.HashSet;
5050
import java.util.List;
5151
import java.util.Map;
52-
import java.util.Objects;
5352
import java.util.Properties;
5453
import java.util.Set;
5554
import java.util.stream.Collectors;
@@ -274,7 +273,9 @@ public String identifier() {
274273

275274
private static List<String> getTableList(
276275
@Nullable List<TableId> tableIdList, Selectors selectors) {
277-
return Objects.requireNonNullElse(tableIdList, Collections.<TableId>emptyList()).stream()
276+
List<TableId> resolvedTableIdList =
277+
tableIdList == null ? Collections.emptyList() : tableIdList;
278+
return resolvedTableIdList.stream()
278279
.filter(selectors::isMatch)
279280
// SQL Server tableList format: schemaName.tableName (without database prefix)
280281
// See SqlServerSourceBuilder: "Each identifier is of the form

flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-sqlserver/src/test/java/org/apache/flink/cdc/connectors/sqlserver/source/SqlServerOnlineSchemaMigrationITCase.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
import java.util.Arrays;
5454
import java.util.Collections;
5555
import java.util.List;
56-
import java.util.Map;
5756
import java.util.stream.Collectors;
5857
import java.util.stream.Stream;
5958

@@ -187,7 +186,7 @@ void testSchemaMigrationFromScratch() throws Exception {
187186
new AlterColumnTypeEvent(
188187
tableId,
189188
Collections.singletonMap("ext", DataTypes.DOUBLE()),
190-
Map.of("ext", DataTypes.INT())),
189+
Collections.singletonMap("ext", DataTypes.INT())),
191190
DataChangeEvent.insertEvent(
192191
tableId,
193192
generate(

0 commit comments

Comments
 (0)