Support Flink 1.18 and 1.19 (#32)

getindata · Apr 11, 2024 · 7aa9497 · 7aa9497
1 parent f36a447
commit 7aa9497
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,14 +23,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        flink: [ "1.17.1" ]
+        flink: [ "1.17.2", "1.18.1", "1.19.0" ]
+        jdk: [ "11" ]
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 11
+      - name: Set up JDK ${{ matrix.jdk }}
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: ${{ matrix.jdk }}
           distribution: 'adopt'
           cache: maven
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+-   Support Flink 1.19.0.
+
 ## [0.2.0] - 2024-01-29
 
 -   Fix `catalog.include` option and add more logging.

diff --git a/pom.xml b/pom.xml
@@ -41,8 +41,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <elastic.version>8.11.1</elastic.version>
-    <flink.version>1.17.1</flink.version>
-    <flink-connector-jdbc.version>3.1.1-1.17</flink-connector-jdbc.version>
+    <flink.version>1.18.1</flink.version>
+    <flink-connector-jdbc.version>3.1.2-1.18</flink-connector-jdbc.version>
     <flink-connector-jdbc-elasticsearch-dialect.version>0.2.0</flink-connector-jdbc-elasticsearch-dialect.version>
 
     <!-- Test properties -->
@@ -176,6 +176,7 @@
       <groupId>com.getindata</groupId>
       <artifactId>flink-connector-jdbc-elasticsearch-dialect</artifactId>
       <version>${flink-connector-jdbc-elasticsearch-dialect.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.elasticsearch.plugin</groupId>

diff --git a/src/main/java/com/getindata/flink/connector/jdbc/catalog/IndexFilterResolver.java b/src/main/java/com/getindata/flink/connector/jdbc/catalog/IndexFilterResolver.java
@@ -1,6 +1,5 @@
 package com.getindata.flink.connector.jdbc.catalog;
 
-import org.apache.flink.shaded.guava30.com.google.common.base.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,7 +23,7 @@ static IndexFilterResolver of(String rawIncludePatterns, String rawExcludePatter
     }
 
     private static List<Pattern> parseRaw(String commaSeparatedList) {
-        if (Strings.isNullOrEmpty(commaSeparatedList)) {
+        if (commaSeparatedList == null || commaSeparatedList.isEmpty()) {
             return emptyList();
         }
         return Arrays.stream(commaSeparatedList.split(","))