Skip to content

Commit 28016fd

Browse files
authored
[FLINK-32313] Remove usage of flink-shaded from the code, add deprecation on checkstyle level. This closes apache#56
* [FLINK-32313] Remove usage of flink-shaded from the code, add deprecation on checkstyle level
1 parent 1a2186c commit 28016fd

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/databases/cratedb/catalog/CrateDBCatalog.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@
2424
import org.apache.flink.table.catalog.exceptions.CatalogException;
2525
import org.apache.flink.table.catalog.exceptions.DatabaseNotExistException;
2626

27-
import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList;
28-
2927
import org.apache.commons.compress.utils.Lists;
3028
import org.slf4j.Logger;
3129
import org.slf4j.LoggerFactory;
3230

3331
import java.sql.Connection;
3432
import java.sql.PreparedStatement;
3533
import java.sql.SQLException;
34+
import java.util.Collections;
3635
import java.util.HashSet;
3736
import java.util.List;
3837
import java.util.Set;
@@ -75,7 +74,7 @@ public CrateDBCatalog(
7574

7675
@Override
7776
public List<String> listDatabases() throws CatalogException {
78-
return ImmutableList.of(DEFAULT_DATABASE);
77+
return Collections.singletonList(DEFAULT_DATABASE);
7978
}
8079

8180
// ------ schemas ------

tools/maven/checkstyle.xml

+2-10
Original file line numberDiff line numberDiff line change
@@ -213,16 +213,8 @@ This file is based on the checkstyle file of Apache Beam.
213213
value="autovalue.shaded, avro.shaded, com.google.api.client.repackaged, com.google.appengine.repackaged"/>
214214
</module>
215215
<module name="IllegalImport">
216-
<property name="illegalPkgs" value="org.codehaus.jackson"/>
217-
<message key="import.illegal" value="{0}; Use flink-shaded-jackson instead."/>
218-
</module>
219-
<module name="IllegalImport">
220-
<property name="illegalPkgs" value="org.objectweb.asm"/>
221-
<message key="import.illegal" value="{0}; Use flink-shaded-asm instead."/>
222-
</module>
223-
<module name="IllegalImport">
224-
<property name="illegalPkgs" value="io.netty"/>
225-
<message key="import.illegal" value="{0}; Use flink-shaded-netty instead."/>
216+
<property name="illegalPkgs" value="org.apache.flink.shaded"/>
217+
<message key="import.illegal" value="{0}; Flink-jdbc-connector should not use flink-shaded."/>
226218
</module>
227219

228220
<module name="RedundantModifier">

0 commit comments

Comments
 (0)