This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 10cee5241d [core] Paimon core should import the correct package (#5843)
10cee5241d is described below
commit 10cee5241d53e845cdd9153ed5214d0068a85b39
Author: YeJunHao <[email protected]>
AuthorDate: Tue Jul 8 14:46:39 2025 +0800
[core] Paimon core should import the correct package (#5843)
---
.../test/java/org/apache/paimon/benchmark/Benchmark.java | 4 ++--
.../org/apache/paimon/iceberg/migrate/IcebergMigrator.java | 7 ++++---
.../src/main/java/org/apache/paimon/lookup/ByteArray.java | 4 +---
.../src/main/java/org/apache/paimon/rest/RESTCatalog.java | 2 +-
.../test/java/org/apache/paimon/rest/RESTCatalogServer.java | 2 +-
.../test/java/org/apache/paimon/rest/RESTCatalogTest.java | 2 +-
.../org/apache/paimon/table/AppendOnlySimpleTableTest.java | 3 ++-
.../org/apache/paimon/table/PrimaryKeySimpleTableTest.java | 3 ++-
.../paimon/flink/procedure/CreateBranchProcedure.java | 3 ++-
.../paimon/flink/action/cdc/mongodb/MongoDBSchemaUtils.java | 2 +-
.../paimon/flink/action/cdc/mongodb/MongoDBContainer.java | 13 ++++++++++---
.../org/apache/paimon/flink/action/CreateBranchAction.java | 2 +-
.../paimon/flink/procedure/CreateBranchProcedure.java | 3 ++-
.../test/java/org/apache/paimon/flink/BranchSqlITCase.java | 3 ++-
.../java/org/apache/paimon/flink/CatalogTableITCase.java | 3 ++-
.../test/java/org/apache/paimon/flink/ShowCreateUtil.java | 3 ++-
paimon-format/src/main/java/org/apache/orc/OrcConf.java | 3 ++-
.../java/org/apache/paimon/spark/SparkReadTestBase.java | 3 ++-
.../org/apache/paimon/spark/SparkSchemaEvolutionITCase.java | 3 ++-
tools/maven/checkstyle.xml | 5 +++++
20 files changed, 47 insertions(+), 26 deletions(-)
diff --git
a/paimon-benchmark/paimon-micro-benchmarks/src/test/java/org/apache/paimon/benchmark/Benchmark.java
b/paimon-benchmark/paimon-micro-benchmarks/src/test/java/org/apache/paimon/benchmark/Benchmark.java
index b6a27fdbcf..939f8cf90b 100644
---
a/paimon-benchmark/paimon-micro-benchmarks/src/test/java/org/apache/paimon/benchmark/Benchmark.java
+++
b/paimon-benchmark/paimon-micro-benchmarks/src/test/java/org/apache/paimon/benchmark/Benchmark.java
@@ -18,8 +18,8 @@
package org.apache.paimon.benchmark;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.SystemUtils;
+import org.apache.paimon.shade.org.apache.commons.lang3.StringUtils;
+import org.apache.paimon.shade.org.apache.commons.lang3.SystemUtils;
import java.io.BufferedReader;
import java.io.File;
diff --git
a/paimon-core/src/main/java/org/apache/paimon/iceberg/migrate/IcebergMigrator.java
b/paimon-core/src/main/java/org/apache/paimon/iceberg/migrate/IcebergMigrator.java
index 660c6fc389..0132e14276 100644
---
a/paimon-core/src/main/java/org/apache/paimon/iceberg/migrate/IcebergMigrator.java
+++
b/paimon-core/src/main/java/org/apache/paimon/iceberg/migrate/IcebergMigrator.java
@@ -54,9 +54,10 @@ import org.apache.paimon.types.DataField;
import org.apache.paimon.utils.JsonSerdeUtil;
import org.apache.paimon.utils.Preconditions;
-import org.apache.avro.file.DataFileStream;
-import org.apache.avro.generic.GenericDatumReader;
-import org.apache.avro.generic.GenericRecord;
+import org.apache.paimon.shade.org.apache.avro.file.DataFileStream;
+import org.apache.paimon.shade.org.apache.avro.generic.GenericDatumReader;
+import org.apache.paimon.shade.org.apache.avro.generic.GenericRecord;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/paimon-core/src/main/java/org/apache/paimon/lookup/ByteArray.java
b/paimon-core/src/main/java/org/apache/paimon/lookup/ByteArray.java
index 95a279d20f..43c618fadf 100644
--- a/paimon-core/src/main/java/org/apache/paimon/lookup/ByteArray.java
+++ b/paimon-core/src/main/java/org/apache/paimon/lookup/ByteArray.java
@@ -20,8 +20,6 @@ package org.apache.paimon.lookup;
import org.apache.paimon.utils.SortUtil;
-import org.jetbrains.annotations.NotNull;
-
import java.util.Arrays;
/** A class wraps byte[] to implement equals and hashCode. */
@@ -55,7 +53,7 @@ public class ByteArray implements Comparable<ByteArray> {
}
@Override
- public int compareTo(@NotNull ByteArray o) {
+ public int compareTo(ByteArray o) {
return SortUtil.compareBinary(bytes, o.bytes);
}
}
diff --git a/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalog.java
b/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalog.java
index b84903dafa..85dbb29a9c 100644
--- a/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalog.java
+++ b/paimon-core/src/main/java/org/apache/paimon/rest/RESTCatalog.java
@@ -60,7 +60,7 @@ import org.apache.paimon.view.ViewChange;
import org.apache.paimon.view.ViewImpl;
import org.apache.paimon.view.ViewSchema;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.paimon.shade.org.apache.commons.lang3.StringUtils;
import javax.annotation.Nullable;
diff --git
a/paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogServer.java
b/paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogServer.java
index 8dbefb3d4e..dbeec6ffcd 100644
--- a/paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogServer.java
+++ b/paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogServer.java
@@ -103,12 +103,12 @@ import org.apache.paimon.view.ViewImpl;
import org.apache.paimon.view.ViewSchema;
import
org.apache.paimon.shade.jackson2.com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.paimon.shade.org.apache.commons.lang3.StringUtils;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
diff --git
a/paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogTest.java
b/paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogTest.java
index 6db20f6bfd..6febac167f 100644
--- a/paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogTest.java
+++ b/paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogTest.java
@@ -62,9 +62,9 @@ import
org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableList;
import org.apache.paimon.shade.guava30.com.google.common.collect.ImmutableMap;
import org.apache.paimon.shade.guava30.com.google.common.collect.Lists;
import org.apache.paimon.shade.guava30.com.google.common.collect.Maps;
+import org.apache.paimon.shade.org.apache.commons.lang3.StringUtils;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git
a/paimon-core/src/test/java/org/apache/paimon/table/AppendOnlySimpleTableTest.java
b/paimon-core/src/test/java/org/apache/paimon/table/AppendOnlySimpleTableTest.java
index 6d43da5240..9a0148112a 100644
---
a/paimon-core/src/test/java/org/apache/paimon/table/AppendOnlySimpleTableTest.java
+++
b/paimon-core/src/test/java/org/apache/paimon/table/AppendOnlySimpleTableTest.java
@@ -59,7 +59,8 @@ import org.apache.paimon.table.source.TableScan;
import org.apache.paimon.types.DataTypes;
import org.apache.paimon.types.RowType;
-import org.apache.parquet.hadoop.ParquetOutputFormat;
+import org.apache.paimon.shade.org.apache.parquet.hadoop.ParquetOutputFormat;
+
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
diff --git
a/paimon-core/src/test/java/org/apache/paimon/table/PrimaryKeySimpleTableTest.java
b/paimon-core/src/test/java/org/apache/paimon/table/PrimaryKeySimpleTableTest.java
index 73208f290a..c02d617dbe 100644
---
a/paimon-core/src/test/java/org/apache/paimon/table/PrimaryKeySimpleTableTest.java
+++
b/paimon-core/src/test/java/org/apache/paimon/table/PrimaryKeySimpleTableTest.java
@@ -79,7 +79,8 @@ import org.apache.paimon.types.RowType;
import org.apache.paimon.utils.ChangelogManager;
import org.apache.paimon.utils.Pair;
-import org.apache.parquet.hadoop.ParquetOutputFormat;
+import org.apache.paimon.shade.org.apache.parquet.hadoop.ParquetOutputFormat;
+
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
diff --git
a/paimon-flink/paimon-flink-1.18/src/main/java/org/apache/paimon/flink/procedure/CreateBranchProcedure.java
b/paimon-flink/paimon-flink-1.18/src/main/java/org/apache/paimon/flink/procedure/CreateBranchProcedure.java
index 093505923f..0bf2292b14 100644
---
a/paimon-flink/paimon-flink-1.18/src/main/java/org/apache/paimon/flink/procedure/CreateBranchProcedure.java
+++
b/paimon-flink/paimon-flink-1.18/src/main/java/org/apache/paimon/flink/procedure/CreateBranchProcedure.java
@@ -22,7 +22,8 @@ import org.apache.paimon.catalog.Catalog;
import org.apache.paimon.catalog.Identifier;
import org.apache.paimon.table.Table;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.paimon.shade.org.apache.commons.lang3.StringUtils;
+
import org.apache.flink.table.procedure.ProcedureContext;
/**
diff --git
a/paimon-flink/paimon-flink-cdc/src/main/java/org/apache/paimon/flink/action/cdc/mongodb/MongoDBSchemaUtils.java
b/paimon-flink/paimon-flink-cdc/src/main/java/org/apache/paimon/flink/action/cdc/mongodb/MongoDBSchemaUtils.java
index 9d7aca5f1c..9dbb6eef7d 100644
---
a/paimon-flink/paimon-flink-cdc/src/main/java/org/apache/paimon/flink/action/cdc/mongodb/MongoDBSchemaUtils.java
+++
b/paimon-flink/paimon-flink-cdc/src/main/java/org/apache/paimon/flink/action/cdc/mongodb/MongoDBSchemaUtils.java
@@ -20,6 +20,7 @@ package org.apache.paimon.flink.action.cdc.mongodb;
import org.apache.paimon.schema.Schema;
import org.apache.paimon.types.DataTypes;
+import org.apache.paimon.utils.StringUtils;
import com.mongodb.ConnectionString;
import com.mongodb.MongoClientSettings;
@@ -27,7 +28,6 @@ import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
-import org.apache.commons.lang3.StringUtils;
import
org.apache.flink.cdc.connectors.mongodb.source.config.MongoDBSourceOptions;
import org.apache.flink.configuration.Configuration;
import org.bson.Document;
diff --git
a/paimon-flink/paimon-flink-cdc/src/test/java/org/apache/paimon/flink/action/cdc/mongodb/MongoDBContainer.java
b/paimon-flink/paimon-flink-cdc/src/test/java/org/apache/paimon/flink/action/cdc/mongodb/MongoDBContainer.java
index 5bf4e2912b..67ce243fd6 100644
---
a/paimon-flink/paimon-flink-cdc/src/test/java/org/apache/paimon/flink/action/cdc/mongodb/MongoDBContainer.java
+++
b/paimon-flink/paimon-flink-cdc/src/test/java/org/apache/paimon/flink/action/cdc/mongodb/MongoDBContainer.java
@@ -18,8 +18,9 @@
package org.apache.paimon.flink.action.cdc.mongodb;
+import org.apache.paimon.utils.StringUtils;
+
import com.github.dockerjava.api.command.InspectContainerResponse;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.Network;
@@ -67,7 +68,10 @@ public class MongoDBContainer extends
org.testcontainers.containers.MongoDBConta
try {
String createUserCommand =
Files.readAllLines(Paths.get(setupFile.toURI())).stream()
- .filter(x -> StringUtils.isNotBlank(x) &&
!x.trim().startsWith("//"))
+ .filter(
+ x ->
+
!StringUtils.isNullOrWhitespaceOnly(x)
+ &&
!x.trim().startsWith("//"))
.map(
x -> {
final Matcher m =
COMMENT_PATTERN.matcher(x);
@@ -168,7 +172,10 @@ public class MongoDBContainer extends
org.testcontainers.containers.MongoDBConta
String command0 = String.format("db = db.getSiblingDB('%s');\n",
dbName);
String command1 =
Files.readAllLines(Paths.get(ddlTestFile.toURI())).stream()
- .filter(x -> StringUtils.isNotBlank(x) &&
!x.trim().startsWith("//"))
+ .filter(
+ x ->
+
!StringUtils.isNullOrWhitespaceOnly(x)
+ &&
!x.trim().startsWith("//"))
.map(
x -> {
final Matcher m =
COMMENT_PATTERN.matcher(x);
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/action/CreateBranchAction.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/action/CreateBranchAction.java
index c8eb1d83a4..f62401172b 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/action/CreateBranchAction.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/action/CreateBranchAction.java
@@ -18,7 +18,7 @@
package org.apache.paimon.flink.action;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.paimon.shade.org.apache.commons.lang3.StringUtils;
import java.util.Map;
diff --git
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/procedure/CreateBranchProcedure.java
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/procedure/CreateBranchProcedure.java
index 74cf85a4c5..897f2d6bda 100644
---
a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/procedure/CreateBranchProcedure.java
+++
b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/flink/procedure/CreateBranchProcedure.java
@@ -22,7 +22,8 @@ import org.apache.paimon.catalog.Catalog;
import org.apache.paimon.catalog.Identifier;
import org.apache.paimon.table.Table;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.paimon.shade.org.apache.commons.lang3.StringUtils;
+
import org.apache.flink.table.annotation.ArgumentHint;
import org.apache.flink.table.annotation.DataTypeHint;
import org.apache.flink.table.annotation.ProcedureHint;
diff --git
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/BranchSqlITCase.java
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/BranchSqlITCase.java
index 41313e0e9c..5a1933d165 100644
---
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/BranchSqlITCase.java
+++
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/BranchSqlITCase.java
@@ -23,7 +23,8 @@ import org.apache.paimon.table.FileStoreTable;
import org.apache.paimon.utils.BlockingIterator;
import org.apache.paimon.utils.SnapshotManager;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.paimon.shade.org.apache.commons.lang3.StringUtils;
+
import org.apache.flink.types.Row;
import org.apache.flink.util.CloseableIterator;
import org.junit.jupiter.api.Test;
diff --git
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
index 47795c34c4..46baaa3eef 100644
---
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
+++
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
@@ -23,7 +23,8 @@ import org.apache.paimon.table.system.AllTableOptionsTable;
import org.apache.paimon.table.system.CatalogOptionsTable;
import org.apache.paimon.utils.BlockingIterator;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.paimon.shade.org.apache.commons.lang3.StringUtils;
+
import org.apache.flink.table.catalog.CatalogPartition;
import org.apache.flink.table.catalog.CatalogPartitionSpec;
import org.apache.flink.table.catalog.ObjectPath;
diff --git
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/ShowCreateUtil.java
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/ShowCreateUtil.java
index 3ff1fcbb0c..415135ae51 100644
---
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/ShowCreateUtil.java
+++
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/ShowCreateUtil.java
@@ -18,7 +18,8 @@
package org.apache.paimon.flink;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.paimon.shade.org.apache.commons.lang3.StringUtils;
+
import org.apache.flink.table.api.TableException;
import org.apache.flink.table.catalog.CatalogBaseTable;
import org.apache.flink.table.catalog.Column;
diff --git a/paimon-format/src/main/java/org/apache/orc/OrcConf.java
b/paimon-format/src/main/java/org/apache/orc/OrcConf.java
index 57da5f4b4a..22eb39c5c3 100644
--- a/paimon-format/src/main/java/org/apache/orc/OrcConf.java
+++ b/paimon-format/src/main/java/org/apache/orc/OrcConf.java
@@ -18,7 +18,8 @@
package org.apache.orc;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.paimon.utils.StringUtils;
+
import org.apache.hadoop.conf.Configuration;
import java.util.ArrayList;
diff --git
a/paimon-spark/paimon-spark-ut/src/test/java/org/apache/paimon/spark/SparkReadTestBase.java
b/paimon-spark/paimon-spark-ut/src/test/java/org/apache/paimon/spark/SparkReadTestBase.java
index 204404e1ba..a4983325c4 100644
---
a/paimon-spark/paimon-spark-ut/src/test/java/org/apache/paimon/spark/SparkReadTestBase.java
+++
b/paimon-spark/paimon-spark-ut/src/test/java/org/apache/paimon/spark/SparkReadTestBase.java
@@ -35,7 +35,8 @@ import org.apache.paimon.table.sink.TableCommitImpl;
import org.apache.paimon.types.DataField;
import org.apache.paimon.types.RowKind;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.paimon.shade.org.apache.commons.lang3.StringUtils;
+
import org.apache.spark.sql.Dataset;
import org.apache.spark.sql.Row;
import org.apache.spark.sql.SparkSession;
diff --git
a/paimon-spark/paimon-spark-ut/src/test/java/org/apache/paimon/spark/SparkSchemaEvolutionITCase.java
b/paimon-spark/paimon-spark-ut/src/test/java/org/apache/paimon/spark/SparkSchemaEvolutionITCase.java
index fb4dab38ed..933658b004 100644
---
a/paimon-spark/paimon-spark-ut/src/test/java/org/apache/paimon/spark/SparkSchemaEvolutionITCase.java
+++
b/paimon-spark/paimon-spark-ut/src/test/java/org/apache/paimon/spark/SparkSchemaEvolutionITCase.java
@@ -18,7 +18,8 @@
package org.apache.paimon.spark;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.paimon.shade.org.apache.commons.lang3.StringUtils;
+
import org.apache.spark.sql.AnalysisException;
import org.apache.spark.sql.Dataset;
import org.apache.spark.sql.Row;
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index 80e7853535..998c56383f 100644
--- a/tools/maven/checkstyle.xml
+++ b/tools/maven/checkstyle.xml
@@ -189,6 +189,11 @@ This file is based on the checkstyle file of Apache Beam.
<property name="message"
value="Use Paimon's Preconditions
instead of Guava's Preconditions"/>
</module>
+ <module name="Regexp">
+ <property name="format" value="import
org\.apache\.commons\.lang3\.StringUtils"/>
+ <property name="illegalPattern" value="true"/>
+ <property name="message" value="{0}; Use paimon
StringUtils or paimon shaded StringUtils instead."/>
+ </module>
<!-- Enforce Java-style array declarations -->
<module name="ArrayTypeStyle"/>
