From 12a4e5f58400549329d3d185d0bc0d47ad5f09f6 Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@apache.org>
Date: Mon, 16 Oct 2023 23:19:08 +0800
Subject: [PATCH] Fix package name

---
 .../java/org/apache/zeppelin/flink/Flink116Shims.java     | 2 +-
 .../{shims117 => shims116}/CollectStreamTableSink.java    | 2 +-
 .../java/org/apache/zeppelin/flink/Flink117Shims.java     | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)
 rename flink/flink1.16-shims/src/main/java/org/apache/zeppelin/flink/{shims117 => shims116}/CollectStreamTableSink.java (98%)

diff --git a/flink/flink1.16-shims/src/main/java/org/apache/zeppelin/flink/Flink116Shims.java b/flink/flink1.16-shims/src/main/java/org/apache/zeppelin/flink/Flink116Shims.java
index e6d289a5d38..3578ffc8bb0 100644
--- a/flink/flink1.16-shims/src/main/java/org/apache/zeppelin/flink/Flink116Shims.java
+++ b/flink/flink1.16-shims/src/main/java/org/apache/zeppelin/flink/Flink116Shims.java
@@ -58,7 +58,7 @@
 import org.apache.flink.types.Row;
 import org.apache.flink.types.RowKind;
 import org.apache.flink.util.FlinkException;
-import org.apache.zeppelin.flink.shims117.CollectStreamTableSink;
+import org.apache.zeppelin.flink.shims116.CollectStreamTableSink;
 import org.apache.zeppelin.interpreter.InterpreterContext;
 import org.apache.zeppelin.interpreter.InterpreterResult;
 import org.slf4j.Logger;
diff --git a/flink/flink1.16-shims/src/main/java/org/apache/zeppelin/flink/shims117/CollectStreamTableSink.java b/flink/flink1.16-shims/src/main/java/org/apache/zeppelin/flink/shims116/CollectStreamTableSink.java
similarity index 98%
rename from flink/flink1.16-shims/src/main/java/org/apache/zeppelin/flink/shims117/CollectStreamTableSink.java
rename to flink/flink1.16-shims/src/main/java/org/apache/zeppelin/flink/shims116/CollectStreamTableSink.java
index ee58e770d44..cf7968e7e65 100644
--- a/flink/flink1.16-shims/src/main/java/org/apache/zeppelin/flink/shims117/CollectStreamTableSink.java
+++ b/flink/flink1.16-shims/src/main/java/org/apache/zeppelin/flink/shims116/CollectStreamTableSink.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zeppelin.flink.shims117;
+package org.apache.zeppelin.flink.shims116;
 
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.common.typeinfo.Types;
diff --git a/flink/flink1.17-shims/src/main/java/org/apache/zeppelin/flink/Flink117Shims.java b/flink/flink1.17-shims/src/main/java/org/apache/zeppelin/flink/Flink117Shims.java
index 4ab2d51aeab..9bc22cc57df 100644
--- a/flink/flink1.17-shims/src/main/java/org/apache/zeppelin/flink/Flink117Shims.java
+++ b/flink/flink1.17-shims/src/main/java/org/apache/zeppelin/flink/Flink117Shims.java
@@ -23,7 +23,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.flink.api.common.RuntimeExecutionMode;
-import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.common.typeutils.TypeSerializer;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.client.cli.CliFrontend;
@@ -53,7 +52,6 @@
 import org.apache.flink.table.functions.TableAggregateFunction;
 import org.apache.flink.table.functions.TableFunction;
 import org.apache.flink.table.module.ModuleManager;
-import org.apache.flink.table.planner.calcite.FlinkTypeFactory;
 import org.apache.flink.table.resource.ResourceManager;
 import org.apache.flink.table.sinks.TableSink;
 import org.apache.flink.table.typeutils.TimeIndicatorTypeInfo;
@@ -78,7 +76,7 @@
 
 
 /**
- * Shims for flink 1.16
+ * Shims for flink 1.17
  */
 public class Flink117Shims extends FlinkShims {
 
@@ -252,12 +250,12 @@ public boolean rowEquals(Object row1, Object row2) {
 
   @Override
   public Object fromDataSet(Object btenv, Object ds) {
-    throw new RuntimeException("Conversion from DataSet is not supported in Flink 1.15");
+    throw new RuntimeException("Conversion from DataSet is not supported in Flink 1.17");
   }
 
   @Override
   public Object toDataSet(Object btenv, Object table) {
-    throw new RuntimeException("Conversion to DataSet is not supported in Flink 1.15");
+    throw new RuntimeException("Conversion to DataSet is not supported in Flink 1.17");
   }
 
   @Override