[flink-connector-jdbc] branch main updated: [FLINK-32313] Remove usage of flink-shaded from the code, add deprecation on checkstyle level. This closes #56

[martijnvisser]

This is an automated email from the ASF dual-hosted git repository.

martijnvisser pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git


The following commit(s) were added to refs/heads/main by this push:
     new 28016fd  [FLINK-32313] Remove usage of flink-shaded from the code, add 
deprecation on checkstyle level. This closes #56
28016fd is described below

commit 28016fdec16621e37b0e42322b1a542ca79343f8
Author: Sergey Nuyanzin <snuyan...@gmail.com>
AuthorDate: Mon Jun 12 20:50:29 2023 +0200

    [FLINK-32313] Remove usage of flink-shaded from the code, add deprecation 
on checkstyle level. This closes #56
    
    * [FLINK-32313] Remove usage of flink-shaded from the code, add deprecation 
on checkstyle level
---
 .../jdbc/databases/cratedb/catalog/CrateDBCatalog.java       |  5 ++---
 tools/maven/checkstyle.xml                                   | 12 ++----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git 
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java
 
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java
index 8eb0927..04ed2a4 100644
--- 
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java
+++ 
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java
@@ -24,8 +24,6 @@ import org.apache.flink.table.catalog.ObjectPath;
 import org.apache.flink.table.catalog.exceptions.CatalogException;
 import org.apache.flink.table.catalog.exceptions.DatabaseNotExistException;
 
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
-
 import org.apache.commons.compress.utils.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,6 +31,7 @@ import org.slf4j.LoggerFactory;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -75,7 +74,7 @@ public class CrateDBCatalog extends PostgresCatalog {
 
     @Override
     public List<String> listDatabases() throws CatalogException {
-        return ImmutableList.of(DEFAULT_DATABASE);
+        return Collections.singletonList(DEFAULT_DATABASE);
     }
 
     // ------ schemas ------
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index 7d1f9fd..5b94140 100644
--- a/tools/maven/checkstyle.xml
+++ b/tools/maven/checkstyle.xml
@@ -213,16 +213,8 @@ This file is based on the checkstyle file of Apache Beam.
                                          value="autovalue.shaded, avro.shaded, 
com.google.api.client.repackaged, com.google.appengine.repackaged"/>
                </module>
                <module name="IllegalImport">
-                       <property name="illegalPkgs" 
value="org.codehaus.jackson"/>
-                       <message key="import.illegal" value="{0}; Use 
flink-shaded-jackson instead."/>
-               </module>
-               <module name="IllegalImport">
-                       <property name="illegalPkgs" value="org.objectweb.asm"/>
-                       <message key="import.illegal" value="{0}; Use 
flink-shaded-asm instead."/>
-               </module>
-               <module name="IllegalImport">
-                       <property name="illegalPkgs" value="io.netty"/>
-                       <message key="import.illegal" value="{0}; Use 
flink-shaded-netty instead."/>
+                       <property name="illegalPkgs" 
value="org.apache.flink.shaded"/>
+                       <message key="import.illegal" value="{0}; 
Flink-jdbc-connector should not use flink-shaded."/>
                </module>
 
                <module name="RedundantModifier">