From d9bb902241e443891c1acb807e5d552d2d1353f2 Mon Sep 17 00:00:00 2001
From: Simonas Gelazevicius <simonas.gelazevicius@vinted.com>
Date: Fri, 8 Jul 2022 11:21:33 +0300
Subject: [PATCH] chore[vitess-cdc]: Rebase from latest master

---
 flink-connector-vitess-cdc/pom.xml                          | 6 +++---
 .../ververica/cdc/connectors/vitess/VitessValidator.java    | 2 +-
 .../vervetica/cdc/connectors/vitess/VitessSourceTest.java   | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/flink-connector-vitess-cdc/pom.xml b/flink-connector-vitess-cdc/pom.xml
index b504c152313..cde12b30820 100644
--- a/flink-connector-vitess-cdc/pom.xml
+++ b/flink-connector-vitess-cdc/pom.xml
@@ -79,14 +79,14 @@ under the License.
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId>
+            <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
             <version>${flink.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
+            <artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
             <version>${flink.version}</version>
             <scope>test</scope>
         </dependency>
@@ -132,7 +132,7 @@ under the License.
 
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId>
+            <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
             <version>${flink.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessValidator.java b/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessValidator.java
index 95cd61356dd..99a429c3063 100644
--- a/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessValidator.java
+++ b/flink-connector-vitess-cdc/src/main/java/com/ververica/cdc/connectors/vitess/VitessValidator.java
@@ -18,7 +18,7 @@
 
 package com.ververica.cdc.connectors.vitess;
 
-import org.apache.flink.shaded.guava18.com.google.common.collect.Maps;
+import org.apache.flink.shaded.guava30.com.google.common.collect.Maps;
 
 import com.ververica.cdc.debezium.Validator;
 import io.debezium.connector.vitess.VitessConnector;
diff --git a/flink-connector-vitess-cdc/src/test/java/com/vervetica/cdc/connectors/vitess/VitessSourceTest.java b/flink-connector-vitess-cdc/src/test/java/com/vervetica/cdc/connectors/vitess/VitessSourceTest.java
index ac8f68628b2..4dfe11f944d 100644
--- a/flink-connector-vitess-cdc/src/test/java/com/vervetica/cdc/connectors/vitess/VitessSourceTest.java
+++ b/flink-connector-vitess-cdc/src/test/java/com/vervetica/cdc/connectors/vitess/VitessSourceTest.java
@@ -47,6 +47,7 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.OptionalLong;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -297,6 +298,11 @@ public boolean isRestored() {
             return isRestored;
         }
 
+        @Override
+        public OptionalLong getRestoredCheckpointId() {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public OperatorStateStore getOperatorStateStore() {
             return operatorStateStore;