You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluss.apache.org by ja...@apache.org on 2025/08/25 11:19:12 UTC
(fluss) 07/12: WIP
This is an automated email from the ASF dual-hosted git repository.
jark pushed a commit to branch ci-rename-to-apache
in repository https://gitbox.apache.org/repos/asf/fluss.git
commit 0e800b0db5a81260ef84f75d4dc0deb42686e81c
Author: Jark Wu <ja...@apache.org>
AuthorDate: Mon Aug 25 14:10:30 2025 +0800
WIP
---
.../apache/fluss/client/lookup/LookupSender.java | 1 +
.../fluss/client/metadata/MetadataUpdater.java | 1 +
.../fluss/client/table/scanner/log/LogFetcher.java | 1 +
.../client/table/scanner/log/LogScannerImpl.java | 1 +
.../fluss/client/write/RecordAccumulator.java | 1 +
.../java/org/apache/fluss/client/write/Sender.java | 1 +
.../security/acl/FlussAuthorizationITCase.java | 1 +
.../fluss/client/write/ArrowLogWriteBatchTest.java | 3 +-
.../compression/ZstdArrowCompressionCodec.java | 3 +-
.../main/java/org/apache/fluss/fs/FileSystem.java | 1 +
.../fluss/metrics/reporter/ReporterSetup.java | 1 +
.../apache/fluss/plugin/DefaultPluginManager.java | 1 +
.../security/auth/sasl/jaas/DefaultLogin.java | 1 +
.../bucketing/IcebergBucketingFunctionTest.java | 1 +
.../java/org/apache/fluss/cluster/ClusterTest.java | 1 +
.../compression/ArrowCompressionCodecTest.java | 1 +
.../fluss/lake/lakestorage/LakeStorageTest.java | 1 +
.../fluss/plugin/DefaultPluginManagerTest.java | 1 +
.../fluss/predicate/PredicateBuilderTest.java | 23 ++++++------
.../org/apache/fluss/predicate/PredicateTest.java | 23 ++++++------
.../apache/fluss/record/FileLogRecordsTest.java | 1 +
.../record/MemoryLogRecordsArrowBuilderTest.java | 5 +--
.../fluss/record/send/SendWritableOutputTest.java | 1 +
.../fluss/row/arrow/ArrowReaderWriterTest.java | 1 +
.../fluss/row/arrow/ArrowWriterPoolTest.java | 1 +
.../encode/iceberg/IcebergBinaryRowWriterTest.java | 1 +
.../row/encode/iceberg/IcebergKeyEncoderTest.java | 1 +
.../security/auth/AuthenticationFactoryTest.java | 1 +
.../org/apache/fluss/utils/ArrowUtilsTest.java | 5 +--
.../apache/fluss/utils/ProtoCodecUtilsTest.java | 5 +--
.../apache/fluss/utils/json/JsonSerdeTestBase.java | 1 +
.../org/apache/fluss/fs/obs/OBSFileSystem.java | 23 ++++++------
.../apache/fluss/fs/obs/OBSFileSystemPlugin.java | 23 ++++++------
.../DynamicTemporaryOBSCredentialsProvider.java | 23 ++++++------
.../fs/obs/token/OBSSecurityTokenProvider.java | 23 ++++++------
.../fs/obs/token/OBSSecurityTokenReceiver.java | 5 +--
.../fluss/fs/obs/OBSFileSystemBehaviorITCase.java | 1 +
...redentialsProviderFileSystemBehaviorITCase.java | 5 +--
.../obs/OBSWithTokenFileSystemBehaviorITCase.java | 1 +
.../apache/fluss/flink/catalog/FlinkCatalog.java | 41 +++++++++++-----------
.../fluss/flink/catalog/FlinkTableFactory.java | 19 +++++-----
.../org/apache/fluss/flink/source/FlinkSource.java | 23 ++++++------
.../fluss/flink/source/FlinkTableSource.java | 37 +++++++++----------
.../JsonStringDeserializationSchema.java | 5 +--
.../flink/source/emitter/FlinkRecordEmitter.java | 5 +--
.../source/enumerator/FlinkSourceEnumerator.java | 13 +++----
.../flink/source/reader/FlinkSourceReader.java | 9 ++---
.../source/reader/FlinkSourceSplitReader.java | 13 +++----
.../reader/fetcher/FlinkSourceFetcherManager.java | 11 +++---
.../flink/source/split/SourceSplitSerializer.java | 7 ++--
.../tiering/committer/TieringCommitOperator.java | 13 +++----
.../fluss/flink/tiering/source/TieringSource.java | 19 +++++-----
.../apache/fluss/flink/utils/FlinkConversions.java | 17 ++++-----
.../fluss/flink/lake/LakeSplitSerializerTest.java | 5 +--
.../flink/lake/reader/SortMergeReaderTest.java | 24 ++++++-------
.../security/acl/FlinkAuthorizationITCase.java | 13 +++----
.../fluss/flink/source/FlinkTableSourceITCase.java | 27 +++++++-------
.../FlussTableLakeSnapshotCommitterTest.java | 1 +
.../committer/TieringCommitOperatorTest.java | 27 +++++++-------
.../metrics/prometheus/PrometheusReporterTest.java | 7 ++--
.../generator/generator/ProtoCodeGenerator.java | 5 +--
.../generator/generator/ProtobufNumberField.java | 3 +-
.../org/apache/fluss/rpc/netty/NettyLogger.java | 1 +
.../apache/fluss/rpc/netty/client/NettyClient.java | 1 +
.../fluss/rpc/netty/client/NettyClientHandler.java | 1 +
.../fluss/rpc/netty/client/ServerConnection.java | 1 +
.../fluss/rpc/netty/server/FlussRequest.java | 1 +
.../apache/fluss/rpc/netty/server/NettyServer.java | 1 +
.../fluss/rpc/netty/server/NettyServerHandler.java | 1 +
.../rpc/netty/server/ServerChannelInitializer.java | 1 +
.../org/apache/fluss/rpc/protocol/ApiManager.java | 1 +
.../rpc/netty/server/NettyServerHandlerTest.java | 1 +
.../fluss/rpc/protocol/MessageCodecTest.java | 1 +
.../fluss/rpc/protocol/RequestChannelTest.java | 1 +
.../java/org/apache/fluss/server/ServerBase.java | 1 +
.../fluss/server/authorizer/DefaultAuthorizer.java | 1 +
.../ZkNodeChangeNotificationWatcher.java | 1 +
.../coordinator/CoordinatorEventProcessor.java | 1 +
.../server/coordinator/CoordinatorServer.java | 1 +
.../fluss/server/coordinator/MetadataManager.java | 1 +
.../coordinator/event/CoordinatorEventManager.java | 1 +
.../event/watcher/TableChangeWatcher.java | 1 +
.../event/watcher/TabletServerChangeWatcher.java | 1 +
.../statemachine/TableBucketStateMachine.java | 1 +
.../java/org/apache/fluss/server/kv/KvManager.java | 1 +
.../java/org/apache/fluss/server/kv/KvTablet.java | 1 +
.../org/apache/fluss/server/log/AbstractIndex.java | 1 +
.../org/apache/fluss/server/log/LogSegment.java | 1 +
.../org/apache/fluss/server/log/OffsetIndex.java | 1 +
.../org/apache/fluss/server/log/TimeIndex.java | 1 +
.../fluss/server/log/WriterStateManager.java | 1 +
.../replica/fetcher/ReplicaFetcherThread.java | 1 +
.../apache/fluss/server/tablet/TabletServer.java | 1 +
.../apache/fluss/server/zk/ZooKeeperClient.java | 1 +
.../org/apache/fluss/server/zk/ZooKeeperUtils.java | 3 +-
.../org/apache/fluss/server/ServerTestBase.java | 1 +
.../coordinator/CoordinatorEventProcessorTest.java | 1 +
.../statemachine/TableBucketStateMachineTest.java | 1 +
.../org/apache/fluss/server/kv/KvTabletTest.java | 1 +
.../fluss/server/kv/wal/ArrowWalBuilderTest.java | 1 +
.../fluss/server/log/WriterStateManagerTest.java | 1 +
.../log/remote/DefaultRemoteLogStorageTest.java | 1 +
.../server/replica/KvReplicaRestoreITCase.java | 1 +
.../server/testutils/FlussClusterExtension.java | 3 +-
.../fluss/server/zk/ZooKeeperClientTest.java | 1 +
.../apache/fluss/server/zk/ZooKeeperExtension.java | 3 +-
.../zk/data/CoordinatorAddressJsonSerdeTest.java | 1 +
.../zk/data/TableRegistrationJsonSerdeTest.java | 1 +
.../TabletServerRegistrationJsonSerdeTest.java | 1 +
pom.xml | 2 +-
110 files changed, 344 insertions(+), 250 deletions(-)
diff --git a/fluss-client/src/main/java/org/apache/fluss/client/lookup/LookupSender.java b/fluss-client/src/main/java/org/apache/fluss/client/lookup/LookupSender.java
index 41f6888a3..87fa0dff1 100644
--- a/fluss-client/src/main/java/org/apache/fluss/client/lookup/LookupSender.java
+++ b/fluss-client/src/main/java/org/apache/fluss/client/lookup/LookupSender.java
@@ -32,6 +32,7 @@ import org.apache.fluss.rpc.messages.PrefixLookupRequest;
import org.apache.fluss.rpc.messages.PrefixLookupResponse;
import org.apache.fluss.rpc.protocol.ApiError;
import org.apache.fluss.utils.types.Tuple2;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-client/src/main/java/org/apache/fluss/client/metadata/MetadataUpdater.java b/fluss-client/src/main/java/org/apache/fluss/client/metadata/MetadataUpdater.java
index 1332ce656..1730235f4 100644
--- a/fluss-client/src/main/java/org/apache/fluss/client/metadata/MetadataUpdater.java
+++ b/fluss-client/src/main/java/org/apache/fluss/client/metadata/MetadataUpdater.java
@@ -39,6 +39,7 @@ import org.apache.fluss.rpc.gateway.AdminReadOnlyGateway;
import org.apache.fluss.rpc.gateway.CoordinatorGateway;
import org.apache.fluss.rpc.gateway.TabletServerGateway;
import org.apache.fluss.utils.ExceptionUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/log/LogFetcher.java b/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/log/LogFetcher.java
index 93f8d3600..d195dc6f0 100644
--- a/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/log/LogFetcher.java
+++ b/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/log/LogFetcher.java
@@ -50,6 +50,7 @@ import org.apache.fluss.rpc.messages.PbFetchLogRespForTable;
import org.apache.fluss.rpc.protocol.Errors;
import org.apache.fluss.utils.IOUtils;
import org.apache.fluss.utils.Projection;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/log/LogScannerImpl.java b/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/log/LogScannerImpl.java
index 8d600fa06..cef05808f 100644
--- a/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/log/LogScannerImpl.java
+++ b/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/log/LogScannerImpl.java
@@ -30,6 +30,7 @@ import org.apache.fluss.metadata.TablePath;
import org.apache.fluss.rpc.metrics.ClientMetricGroup;
import org.apache.fluss.types.RowType;
import org.apache.fluss.utils.Projection;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-client/src/main/java/org/apache/fluss/client/write/RecordAccumulator.java b/fluss-client/src/main/java/org/apache/fluss/client/write/RecordAccumulator.java
index 8d6bae159..6164d6ecf 100644
--- a/fluss-client/src/main/java/org/apache/fluss/client/write/RecordAccumulator.java
+++ b/fluss-client/src/main/java/org/apache/fluss/client/write/RecordAccumulator.java
@@ -40,6 +40,7 @@ import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import org.apache.fluss.utils.CopyOnWriteMap;
import org.apache.fluss.utils.MathUtils;
import org.apache.fluss.utils.clock.Clock;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-client/src/main/java/org/apache/fluss/client/write/Sender.java b/fluss-client/src/main/java/org/apache/fluss/client/write/Sender.java
index 8213a5b05..a81c69ee7 100644
--- a/fluss-client/src/main/java/org/apache/fluss/client/write/Sender.java
+++ b/fluss-client/src/main/java/org/apache/fluss/client/write/Sender.java
@@ -41,6 +41,7 @@ import org.apache.fluss.rpc.messages.PutKvResponse;
import org.apache.fluss.rpc.protocol.ApiError;
import org.apache.fluss.rpc.protocol.Errors;
import org.apache.fluss.utils.ExceptionUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-client/src/test/java/org/apache/fluss/client/security/acl/FlussAuthorizationITCase.java b/fluss-client/src/test/java/org/apache/fluss/client/security/acl/FlussAuthorizationITCase.java
index c9806d309..2bfb6f8dc 100644
--- a/fluss-client/src/test/java/org/apache/fluss/client/security/acl/FlussAuthorizationITCase.java
+++ b/fluss-client/src/test/java/org/apache/fluss/client/security/acl/FlussAuthorizationITCase.java
@@ -56,6 +56,7 @@ import org.apache.fluss.security.acl.ResourceFilter;
import org.apache.fluss.server.testutils.FlussClusterExtension;
import org.apache.fluss.shaded.guava32.com.google.common.collect.Lists;
import org.apache.fluss.utils.CloseableIterator;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-client/src/test/java/org/apache/fluss/client/write/ArrowLogWriteBatchTest.java b/fluss-client/src/test/java/org/apache/fluss/client/write/ArrowLogWriteBatchTest.java
index cc5b7caa8..04ba2d8b7 100644
--- a/fluss-client/src/test/java/org/apache/fluss/client/write/ArrowLogWriteBatchTest.java
+++ b/fluss-client/src/test/java/org/apache/fluss/client/write/ArrowLogWriteBatchTest.java
@@ -17,7 +17,6 @@
package org.apache.fluss.client.write;
-import org.apache.commons.lang3.RandomStringUtils;
import org.apache.fluss.memory.MemorySegment;
import org.apache.fluss.memory.PreAllocatedPagedOutputView;
import org.apache.fluss.memory.TestingMemorySegmentPool;
@@ -34,6 +33,8 @@ import org.apache.fluss.row.arrow.ArrowWriterPool;
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import org.apache.fluss.utils.CloseableIterator;
+
+import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-common/src/main/java/org/apache/fluss/compression/ZstdArrowCompressionCodec.java b/fluss-common/src/main/java/org/apache/fluss/compression/ZstdArrowCompressionCodec.java
index dabaf901d..80dadb6d7 100644
--- a/fluss-common/src/main/java/org/apache/fluss/compression/ZstdArrowCompressionCodec.java
+++ b/fluss-common/src/main/java/org/apache/fluss/compression/ZstdArrowCompressionCodec.java
@@ -17,12 +17,13 @@
package org.apache.fluss.compression;
-import com.github.luben.zstd.Zstd;
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.ArrowBuf;
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.AbstractCompressionCodec;
import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.compression.CompressionUtil;
+import com.github.luben.zstd.Zstd;
+
import java.nio.ByteBuffer;
/* This file is based on source code of Apache Arrow-java Project (https://github.com/apache/arrow-java), licensed by
diff --git a/fluss-common/src/main/java/org/apache/fluss/fs/FileSystem.java b/fluss-common/src/main/java/org/apache/fluss/fs/FileSystem.java
index f4f83f9e6..7410b5409 100644
--- a/fluss-common/src/main/java/org/apache/fluss/fs/FileSystem.java
+++ b/fluss-common/src/main/java/org/apache/fluss/fs/FileSystem.java
@@ -29,6 +29,7 @@ import org.apache.fluss.shaded.guava32.com.google.common.collect.Iterators;
import org.apache.fluss.shaded.guava32.com.google.common.collect.Multimap;
import org.apache.fluss.utils.ExceptionUtils;
import org.apache.fluss.utils.TemporaryClassLoaderContext;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-common/src/main/java/org/apache/fluss/metrics/reporter/ReporterSetup.java b/fluss-common/src/main/java/org/apache/fluss/metrics/reporter/ReporterSetup.java
index 7a712b666..53d77c8df 100644
--- a/fluss-common/src/main/java/org/apache/fluss/metrics/reporter/ReporterSetup.java
+++ b/fluss-common/src/main/java/org/apache/fluss/metrics/reporter/ReporterSetup.java
@@ -22,6 +22,7 @@ import org.apache.fluss.config.Configuration;
import org.apache.fluss.plugin.PluginManager;
import org.apache.fluss.shaded.guava32.com.google.common.collect.Iterators;
import org.apache.fluss.utils.CollectionUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-common/src/main/java/org/apache/fluss/plugin/DefaultPluginManager.java b/fluss-common/src/main/java/org/apache/fluss/plugin/DefaultPluginManager.java
index c9441b1db..741afc822 100644
--- a/fluss-common/src/main/java/org/apache/fluss/plugin/DefaultPluginManager.java
+++ b/fluss-common/src/main/java/org/apache/fluss/plugin/DefaultPluginManager.java
@@ -20,6 +20,7 @@ package org.apache.fluss.plugin;
import org.apache.fluss.annotation.Internal;
import org.apache.fluss.shaded.guava32.com.google.common.base.Joiner;
import org.apache.fluss.shaded.guava32.com.google.common.collect.Iterators;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-common/src/main/java/org/apache/fluss/security/auth/sasl/jaas/DefaultLogin.java b/fluss-common/src/main/java/org/apache/fluss/security/auth/sasl/jaas/DefaultLogin.java
index 27b7b27ec..fcb58714f 100644
--- a/fluss-common/src/main/java/org/apache/fluss/security/auth/sasl/jaas/DefaultLogin.java
+++ b/fluss-common/src/main/java/org/apache/fluss/security/auth/sasl/jaas/DefaultLogin.java
@@ -18,6 +18,7 @@
package org.apache.fluss.security.auth.sasl.jaas;
import org.apache.fluss.utils.TemporaryClassLoaderContext;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-common/src/test/java/org/apache/fluss/bucketing/IcebergBucketingFunctionTest.java b/fluss-common/src/test/java/org/apache/fluss/bucketing/IcebergBucketingFunctionTest.java
index 2ca6c51bb..77f6b1b75 100644
--- a/fluss-common/src/test/java/org/apache/fluss/bucketing/IcebergBucketingFunctionTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/bucketing/IcebergBucketingFunctionTest.java
@@ -25,6 +25,7 @@ import org.apache.fluss.row.encode.iceberg.IcebergKeyEncoder;
import org.apache.fluss.types.DataType;
import org.apache.fluss.types.DataTypes;
import org.apache.fluss.types.RowType;
+
import org.apache.iceberg.transforms.Transform;
import org.apache.iceberg.transforms.Transforms;
import org.apache.iceberg.types.Types;
diff --git a/fluss-common/src/test/java/org/apache/fluss/cluster/ClusterTest.java b/fluss-common/src/test/java/org/apache/fluss/cluster/ClusterTest.java
index caa491a6d..ff810c3dc 100644
--- a/fluss-common/src/test/java/org/apache/fluss/cluster/ClusterTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/cluster/ClusterTest.java
@@ -21,6 +21,7 @@ import org.apache.fluss.metadata.PhysicalTablePath;
import org.apache.fluss.metadata.SchemaInfo;
import org.apache.fluss.metadata.TableInfo;
import org.apache.fluss.metadata.TablePath;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-common/src/test/java/org/apache/fluss/compression/ArrowCompressionCodecTest.java b/fluss-common/src/test/java/org/apache/fluss/compression/ArrowCompressionCodecTest.java
index d9ab2b3e5..22103031b 100644
--- a/fluss-common/src/test/java/org/apache/fluss/compression/ArrowCompressionCodecTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/compression/ArrowCompressionCodecTest.java
@@ -34,6 +34,7 @@ import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.ipc.message.ArrowFi
import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Field;
import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/fluss-common/src/test/java/org/apache/fluss/lake/lakestorage/LakeStorageTest.java b/fluss-common/src/test/java/org/apache/fluss/lake/lakestorage/LakeStorageTest.java
index e2fcd0290..f0452812b 100644
--- a/fluss-common/src/test/java/org/apache/fluss/lake/lakestorage/LakeStorageTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/lake/lakestorage/LakeStorageTest.java
@@ -24,6 +24,7 @@ import org.apache.fluss.lake.writer.LakeTieringFactory;
import org.apache.fluss.metadata.TableDescriptor;
import org.apache.fluss.metadata.TablePath;
import org.apache.fluss.plugin.PluginManager;
+
import org.junit.jupiter.api.Test;
import java.util.Collections;
diff --git a/fluss-common/src/test/java/org/apache/fluss/plugin/DefaultPluginManagerTest.java b/fluss-common/src/test/java/org/apache/fluss/plugin/DefaultPluginManagerTest.java
index 4c63f2ea4..f4fe1bf61 100644
--- a/fluss-common/src/test/java/org/apache/fluss/plugin/DefaultPluginManagerTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/plugin/DefaultPluginManagerTest.java
@@ -19,6 +19,7 @@ package org.apache.fluss.plugin;
import org.apache.fluss.plugin.jar.pluginb.TestServiceB;
import org.apache.fluss.shaded.guava32.com.google.common.collect.Lists;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateBuilderTest.java b/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateBuilderTest.java
index 3c5013407..19a317f6c 100644
--- a/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateBuilderTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateBuilderTest.java
@@ -1,18 +1,17 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Copyright (c) 2025 Alibaba Group Holding Ltd.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.fluss.predicate;
diff --git a/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateTest.java b/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateTest.java
index b116e4283..ee8f680bc 100644
--- a/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateTest.java
@@ -1,18 +1,17 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Copyright (c) 2025 Alibaba Group Holding Ltd.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.fluss.predicate;
diff --git a/fluss-common/src/test/java/org/apache/fluss/record/FileLogRecordsTest.java b/fluss-common/src/test/java/org/apache/fluss/record/FileLogRecordsTest.java
index ac57c8652..b20505c48 100644
--- a/fluss-common/src/test/java/org/apache/fluss/record/FileLogRecordsTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/record/FileLogRecordsTest.java
@@ -18,6 +18,7 @@
package org.apache.fluss.record;
import org.apache.fluss.exception.FlussRuntimeException;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-common/src/test/java/org/apache/fluss/record/MemoryLogRecordsArrowBuilderTest.java b/fluss-common/src/test/java/org/apache/fluss/record/MemoryLogRecordsArrowBuilderTest.java
index fa68822f8..7759e711e 100644
--- a/fluss-common/src/test/java/org/apache/fluss/record/MemoryLogRecordsArrowBuilderTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/record/MemoryLogRecordsArrowBuilderTest.java
@@ -17,8 +17,6 @@
package org.apache.fluss.record;
-import org.apache.commons.lang3.RandomUtils;
-import org.apache.commons.lang3.StringUtils;
import org.apache.fluss.compression.ArrowCompressionInfo;
import org.apache.fluss.compression.ArrowCompressionType;
import org.apache.fluss.config.ConfigOptions;
@@ -33,6 +31,9 @@ import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import org.apache.fluss.testutils.DataTestUtils;
import org.apache.fluss.utils.CloseableIterator;
+
+import org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-common/src/test/java/org/apache/fluss/record/send/SendWritableOutputTest.java b/fluss-common/src/test/java/org/apache/fluss/record/send/SendWritableOutputTest.java
index 97b3ee829..e981471cd 100644
--- a/fluss-common/src/test/java/org/apache/fluss/record/send/SendWritableOutputTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/record/send/SendWritableOutputTest.java
@@ -24,6 +24,7 @@ import org.apache.fluss.record.bytesview.MultiBytesView;
import org.apache.fluss.row.BinaryString;
import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
+
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/fluss-common/src/test/java/org/apache/fluss/row/arrow/ArrowReaderWriterTest.java b/fluss-common/src/test/java/org/apache/fluss/row/arrow/ArrowReaderWriterTest.java
index 25a3de17b..f94f147fe 100644
--- a/fluss-common/src/test/java/org/apache/fluss/row/arrow/ArrowReaderWriterTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/row/arrow/ArrowReaderWriterTest.java
@@ -35,6 +35,7 @@ import org.apache.fluss.types.DataType;
import org.apache.fluss.types.DataTypes;
import org.apache.fluss.types.RowType;
import org.apache.fluss.utils.ArrowUtils;
+
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/fluss-common/src/test/java/org/apache/fluss/row/arrow/ArrowWriterPoolTest.java b/fluss-common/src/test/java/org/apache/fluss/row/arrow/ArrowWriterPoolTest.java
index b949418a0..b5ef58c20 100644
--- a/fluss-common/src/test/java/org/apache/fluss/row/arrow/ArrowWriterPoolTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/row/arrow/ArrowWriterPoolTest.java
@@ -19,6 +19,7 @@ package org.apache.fluss.row.arrow;
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergBinaryRowWriterTest.java b/fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergBinaryRowWriterTest.java
index c62363b0b..f7d39498f 100644
--- a/fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergBinaryRowWriterTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergBinaryRowWriterTest.java
@@ -19,6 +19,7 @@ package org.apache.fluss.row.encode.iceberg;
import org.apache.fluss.row.BinaryString;
import org.apache.fluss.row.Decimal;
+
import org.junit.jupiter.api.Test;
import java.math.BigDecimal;
diff --git a/fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java b/fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java
index c9430e1d4..e7059f296 100644
--- a/fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/row/encode/iceberg/IcebergKeyEncoderTest.java
@@ -24,6 +24,7 @@ import org.apache.fluss.row.TimestampNtz;
import org.apache.fluss.types.DataType;
import org.apache.fluss.types.DataTypes;
import org.apache.fluss.types.RowType;
+
import org.apache.iceberg.types.Conversions;
import org.apache.iceberg.types.Types;
import org.junit.jupiter.api.Test;
diff --git a/fluss-common/src/test/java/org/apache/fluss/security/auth/AuthenticationFactoryTest.java b/fluss-common/src/test/java/org/apache/fluss/security/auth/AuthenticationFactoryTest.java
index dba58b4fd..7bc19d6df 100644
--- a/fluss-common/src/test/java/org/apache/fluss/security/auth/AuthenticationFactoryTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/security/auth/AuthenticationFactoryTest.java
@@ -23,6 +23,7 @@ import org.apache.fluss.security.auth.TestIdentifierAuthenticationPlugin.TestIde
import org.apache.fluss.security.auth.TestIdentifierAuthenticationPlugin.TestIdentifierServerAuthenticator;
import org.apache.fluss.utils.ParentResourceBlockingClassLoader;
import org.apache.fluss.utils.TemporaryClassLoaderContext;
+
import org.junit.jupiter.api.Test;
import java.net.URL;
diff --git a/fluss-common/src/test/java/org/apache/fluss/utils/ArrowUtilsTest.java b/fluss-common/src/test/java/org/apache/fluss/utils/ArrowUtilsTest.java
index 76d2dac93..91f3df1fe 100644
--- a/fluss-common/src/test/java/org/apache/fluss/utils/ArrowUtilsTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/utils/ArrowUtilsTest.java
@@ -17,8 +17,6 @@
package org.apache.fluss.utils;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.lang3.RandomUtils;
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.BigIntVector;
@@ -46,6 +44,9 @@ import org.apache.fluss.types.DataField;
import org.apache.fluss.types.DataType;
import org.apache.fluss.types.DataTypes;
import org.apache.fluss.types.RowType;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomUtils;
import org.junit.jupiter.api.Test;
import java.io.ByteArrayOutputStream;
diff --git a/fluss-common/src/test/java/org/apache/fluss/utils/ProtoCodecUtilsTest.java b/fluss-common/src/test/java/org/apache/fluss/utils/ProtoCodecUtilsTest.java
index ac5d45678..916ad9204 100644
--- a/fluss-common/src/test/java/org/apache/fluss/utils/ProtoCodecUtilsTest.java
+++ b/fluss-common/src/test/java/org/apache/fluss/utils/ProtoCodecUtilsTest.java
@@ -17,10 +17,11 @@
package org.apache.fluss.utils;
-import com.google.protobuf.CodedInputStream;
-import com.google.protobuf.CodedOutputStream;
import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled;
+
+import com.google.protobuf.CodedInputStream;
+import com.google.protobuf.CodedOutputStream;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
diff --git a/fluss-common/src/test/java/org/apache/fluss/utils/json/JsonSerdeTestBase.java b/fluss-common/src/test/java/org/apache/fluss/utils/json/JsonSerdeTestBase.java
index 8370ddfa8..7dcf4e55d 100644
--- a/fluss-common/src/test/java/org/apache/fluss/utils/json/JsonSerdeTestBase.java
+++ b/fluss-common/src/test/java/org/apache/fluss/utils/json/JsonSerdeTestBase.java
@@ -18,6 +18,7 @@
package org.apache.fluss.utils.json;
import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
+
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystem.java b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystem.java
index 145ece1ab..bf19c0dcf 100644
--- a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystem.java
+++ b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystem.java
@@ -1,18 +1,17 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Copyright (c) 2025 Alibaba Group Holding Ltd.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.fluss.fs.obs;
diff --git a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystemPlugin.java b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystemPlugin.java
index 0750472a6..33fb41875 100644
--- a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystemPlugin.java
+++ b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystemPlugin.java
@@ -1,18 +1,17 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Copyright (c) 2025 Alibaba Group Holding Ltd.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.fluss.fs.obs;
diff --git a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/DynamicTemporaryOBSCredentialsProvider.java b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/DynamicTemporaryOBSCredentialsProvider.java
index f6e830d1f..2d966eef6 100644
--- a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/DynamicTemporaryOBSCredentialsProvider.java
+++ b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/DynamicTemporaryOBSCredentialsProvider.java
@@ -1,18 +1,17 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Copyright (c) 2025 Alibaba Group Holding Ltd.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.fluss.fs.obs.token;
diff --git a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/OBSSecurityTokenProvider.java b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/OBSSecurityTokenProvider.java
index 236764a22..765c5f691 100644
--- a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/OBSSecurityTokenProvider.java
+++ b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/OBSSecurityTokenProvider.java
@@ -1,18 +1,17 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Copyright (c) 2025 Alibaba Group Holding Ltd.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.fluss.fs.obs.token;
diff --git a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/OBSSecurityTokenReceiver.java b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/OBSSecurityTokenReceiver.java
index 08ae3af4e..f4facb8a5 100644
--- a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/OBSSecurityTokenReceiver.java
+++ b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/OBSSecurityTokenReceiver.java
@@ -17,12 +17,13 @@
package org.apache.fluss.fs.obs.token;
-import com.obs.services.internal.security.BasicSecurityKey;
-import com.obs.services.model.ISecurityKey;
import org.apache.fluss.fs.obs.OBSFileSystemPlugin;
import org.apache.fluss.fs.token.CredentialsJsonSerde;
import org.apache.fluss.fs.token.ObtainedSecurityToken;
import org.apache.fluss.fs.token.SecurityTokenReceiver;
+
+import com.obs.services.internal.security.BasicSecurityKey;
+import com.obs.services.model.ISecurityKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-filesystems/fluss-fs-obs/src/test/java/org/apache/fluss/fs/obs/OBSFileSystemBehaviorITCase.java b/fluss-filesystems/fluss-fs-obs/src/test/java/org/apache/fluss/fs/obs/OBSFileSystemBehaviorITCase.java
index 2718496b2..edfa815a1 100644
--- a/fluss-filesystems/fluss-fs-obs/src/test/java/org/apache/fluss/fs/obs/OBSFileSystemBehaviorITCase.java
+++ b/fluss-filesystems/fluss-fs-obs/src/test/java/org/apache/fluss/fs/obs/OBSFileSystemBehaviorITCase.java
@@ -21,6 +21,7 @@ import org.apache.fluss.config.Configuration;
import org.apache.fluss.fs.FileSystem;
import org.apache.fluss.fs.FileSystemBehaviorTestSuite;
import org.apache.fluss.fs.FsPath;
+
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
diff --git a/fluss-filesystems/fluss-fs-obs/src/test/java/org/apache/fluss/fs/obs/OBSWithCredentialsProviderFileSystemBehaviorITCase.java b/fluss-filesystems/fluss-fs-obs/src/test/java/org/apache/fluss/fs/obs/OBSWithCredentialsProviderFileSystemBehaviorITCase.java
index 441105620..338d9e73d 100644
--- a/fluss-filesystems/fluss-fs-obs/src/test/java/org/apache/fluss/fs/obs/OBSWithCredentialsProviderFileSystemBehaviorITCase.java
+++ b/fluss-filesystems/fluss-fs-obs/src/test/java/org/apache/fluss/fs/obs/OBSWithCredentialsProviderFileSystemBehaviorITCase.java
@@ -17,12 +17,13 @@
package org.apache.fluss.fs.obs;
-import com.obs.services.EnvironmentVariableObsCredentialsProvider;
-import com.obs.services.IObsCredentialsProvider;
import org.apache.fluss.config.Configuration;
import org.apache.fluss.fs.FileSystem;
import org.apache.fluss.fs.FileSystemBehaviorTestSuite;
import org.apache.fluss.fs.FsPath;
+
+import com.obs.services.EnvironmentVariableObsCredentialsProvider;
+import com.obs.services.IObsCredentialsProvider;
import org.junit.jupiter.api.BeforeAll;
import java.util.UUID;
diff --git a/fluss-filesystems/fluss-fs-obs/src/test/java/org/apache/fluss/fs/obs/OBSWithTokenFileSystemBehaviorITCase.java b/fluss-filesystems/fluss-fs-obs/src/test/java/org/apache/fluss/fs/obs/OBSWithTokenFileSystemBehaviorITCase.java
index 0fa8fb5a6..dbc4b9c36 100644
--- a/fluss-filesystems/fluss-fs-obs/src/test/java/org/apache/fluss/fs/obs/OBSWithTokenFileSystemBehaviorITCase.java
+++ b/fluss-filesystems/fluss-fs-obs/src/test/java/org/apache/fluss/fs/obs/OBSWithTokenFileSystemBehaviorITCase.java
@@ -22,6 +22,7 @@ import org.apache.fluss.fs.FileSystem;
import org.apache.fluss.fs.FsPath;
import org.apache.fluss.fs.obs.token.OBSSecurityTokenReceiver;
import org.apache.fluss.fs.token.ObtainedSecurityToken;
+
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/catalog/FlinkCatalog.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/catalog/FlinkCatalog.java
index 43cecead7..7dd651158 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/catalog/FlinkCatalog.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/catalog/FlinkCatalog.java
@@ -17,6 +17,27 @@
package org.apache.fluss.flink.catalog;
+import org.apache.fluss.client.Connection;
+import org.apache.fluss.client.ConnectionFactory;
+import org.apache.fluss.client.admin.Admin;
+import org.apache.fluss.config.ConfigOptions;
+import org.apache.fluss.config.Configuration;
+import org.apache.fluss.exception.FlussRuntimeException;
+import org.apache.fluss.exception.InvalidTableException;
+import org.apache.fluss.flink.lake.LakeCatalog;
+import org.apache.fluss.flink.procedure.ProcedureManager;
+import org.apache.fluss.flink.utils.CatalogExceptionUtils;
+import org.apache.fluss.flink.utils.DataLakeUtils;
+import org.apache.fluss.flink.utils.FlinkConversions;
+import org.apache.fluss.metadata.DatabaseDescriptor;
+import org.apache.fluss.metadata.PartitionInfo;
+import org.apache.fluss.metadata.PartitionSpec;
+import org.apache.fluss.metadata.TableDescriptor;
+import org.apache.fluss.metadata.TableInfo;
+import org.apache.fluss.metadata.TablePath;
+import org.apache.fluss.utils.ExceptionUtils;
+import org.apache.fluss.utils.IOUtils;
+
import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.table.catalog.AbstractCatalog;
import org.apache.flink.table.catalog.CatalogBaseTable;
@@ -48,26 +69,6 @@ import org.apache.flink.table.catalog.stats.CatalogTableStatistics;
import org.apache.flink.table.expressions.Expression;
import org.apache.flink.table.factories.Factory;
import org.apache.flink.table.procedures.Procedure;
-import org.apache.fluss.client.Connection;
-import org.apache.fluss.client.ConnectionFactory;
-import org.apache.fluss.client.admin.Admin;
-import org.apache.fluss.config.ConfigOptions;
-import org.apache.fluss.config.Configuration;
-import org.apache.fluss.exception.FlussRuntimeException;
-import org.apache.fluss.exception.InvalidTableException;
-import org.apache.fluss.flink.lake.LakeCatalog;
-import org.apache.fluss.flink.procedure.ProcedureManager;
-import org.apache.fluss.flink.utils.CatalogExceptionUtils;
-import org.apache.fluss.flink.utils.DataLakeUtils;
-import org.apache.fluss.flink.utils.FlinkConversions;
-import org.apache.fluss.metadata.DatabaseDescriptor;
-import org.apache.fluss.metadata.PartitionInfo;
-import org.apache.fluss.metadata.PartitionSpec;
-import org.apache.fluss.metadata.TableDescriptor;
-import org.apache.fluss.metadata.TableInfo;
-import org.apache.fluss.metadata.TablePath;
-import org.apache.fluss.utils.ExceptionUtils;
-import org.apache.fluss.utils.IOUtils;
import javax.annotation.Nullable;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/catalog/FlinkTableFactory.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/catalog/FlinkTableFactory.java
index 8ecef4eb6..9ca8efae7 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/catalog/FlinkTableFactory.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/catalog/FlinkTableFactory.java
@@ -17,6 +17,16 @@
package org.apache.fluss.flink.catalog;
+import org.apache.fluss.config.ConfigOptions;
+import org.apache.fluss.config.Configuration;
+import org.apache.fluss.flink.FlinkConnectorOptions;
+import org.apache.fluss.flink.lake.LakeTableFactory;
+import org.apache.fluss.flink.sink.FlinkTableSink;
+import org.apache.fluss.flink.source.FlinkTableSource;
+import org.apache.fluss.flink.utils.FlinkConnectorOptionsUtils;
+import org.apache.fluss.metadata.DataLakeFormat;
+import org.apache.fluss.metadata.TablePath;
+
import org.apache.flink.api.common.RuntimeExecutionMode;
import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.CoreOptions;
@@ -35,15 +45,6 @@ import org.apache.flink.table.factories.DynamicTableSinkFactory;
import org.apache.flink.table.factories.DynamicTableSourceFactory;
import org.apache.flink.table.factories.FactoryUtil;
import org.apache.flink.table.types.logical.RowType;
-import org.apache.fluss.config.ConfigOptions;
-import org.apache.fluss.config.Configuration;
-import org.apache.fluss.flink.FlinkConnectorOptions;
-import org.apache.fluss.flink.lake.LakeTableFactory;
-import org.apache.fluss.flink.sink.FlinkTableSink;
-import org.apache.fluss.flink.source.FlinkTableSource;
-import org.apache.fluss.flink.utils.FlinkConnectorOptionsUtils;
-import org.apache.fluss.metadata.DataLakeFormat;
-import org.apache.fluss.metadata.TablePath;
import java.io.File;
import java.time.ZoneId;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/FlinkSource.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/FlinkSource.java
index 47a38e4c7..375d0540f 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/FlinkSource.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/FlinkSource.java
@@ -17,17 +17,6 @@
package org.apache.fluss.flink.source;
-import org.apache.flink.api.common.typeinfo.TypeInformation;
-import org.apache.flink.api.connector.source.Boundedness;
-import org.apache.flink.api.connector.source.Source;
-import org.apache.flink.api.connector.source.SourceReader;
-import org.apache.flink.api.connector.source.SourceReaderContext;
-import org.apache.flink.api.connector.source.SplitEnumerator;
-import org.apache.flink.api.connector.source.SplitEnumeratorContext;
-import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
-import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds;
-import org.apache.flink.connector.base.source.reader.synchronization.FutureCompletingBlockingQueue;
-import org.apache.flink.core.io.SimpleVersionedSerializer;
import org.apache.fluss.config.Configuration;
import org.apache.fluss.flink.source.deserializer.DeserializerInitContextImpl;
import org.apache.fluss.flink.source.deserializer.FlussDeserializationSchema;
@@ -47,6 +36,18 @@ import org.apache.fluss.lake.source.LakeSplit;
import org.apache.fluss.metadata.TablePath;
import org.apache.fluss.types.RowType;
+import org.apache.flink.api.common.typeinfo.TypeInformation;
+import org.apache.flink.api.connector.source.Boundedness;
+import org.apache.flink.api.connector.source.Source;
+import org.apache.flink.api.connector.source.SourceReader;
+import org.apache.flink.api.connector.source.SourceReaderContext;
+import org.apache.flink.api.connector.source.SplitEnumerator;
+import org.apache.flink.api.connector.source.SplitEnumeratorContext;
+import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
+import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds;
+import org.apache.flink.connector.base.source.reader.synchronization.FutureCompletingBlockingQueue;
+import org.apache.flink.core.io.SimpleVersionedSerializer;
+
import javax.annotation.Nullable;
import java.util.List;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/FlinkTableSource.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/FlinkTableSource.java
index 19df8fe24..ef0d04a25 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/FlinkTableSource.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/FlinkTableSource.java
@@ -17,6 +17,25 @@
package org.apache.fluss.flink.source;
+import org.apache.fluss.config.Configuration;
+import org.apache.fluss.flink.FlinkConnectorOptions;
+import org.apache.fluss.flink.source.deserializer.RowDataDeserializationSchema;
+import org.apache.fluss.flink.source.enumerator.initializer.OffsetsInitializer;
+import org.apache.fluss.flink.source.lookup.FlinkAsyncLookupFunction;
+import org.apache.fluss.flink.source.lookup.FlinkLookupFunction;
+import org.apache.fluss.flink.source.lookup.LookupNormalizer;
+import org.apache.fluss.flink.utils.FlinkConnectorOptionsUtils;
+import org.apache.fluss.flink.utils.FlinkConversions;
+import org.apache.fluss.flink.utils.PushdownUtils;
+import org.apache.fluss.flink.utils.PushdownUtils.FieldEqual;
+import org.apache.fluss.lake.source.LakeSource;
+import org.apache.fluss.lake.source.LakeSplit;
+import org.apache.fluss.metadata.MergeEngineType;
+import org.apache.fluss.metadata.TablePath;
+import org.apache.fluss.predicate.Predicate;
+import org.apache.fluss.predicate.PredicateBuilder;
+import org.apache.fluss.types.RowType;
+
import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.connector.source.Source;
@@ -49,24 +68,6 @@ import org.apache.flink.table.functions.FunctionDefinition;
import org.apache.flink.table.functions.LookupFunction;
import org.apache.flink.table.types.DataType;
import org.apache.flink.table.types.logical.LogicalType;
-import org.apache.fluss.config.Configuration;
-import org.apache.fluss.flink.FlinkConnectorOptions;
-import org.apache.fluss.flink.source.deserializer.RowDataDeserializationSchema;
-import org.apache.fluss.flink.source.enumerator.initializer.OffsetsInitializer;
-import org.apache.fluss.flink.source.lookup.FlinkAsyncLookupFunction;
-import org.apache.fluss.flink.source.lookup.FlinkLookupFunction;
-import org.apache.fluss.flink.source.lookup.LookupNormalizer;
-import org.apache.fluss.flink.utils.FlinkConnectorOptionsUtils;
-import org.apache.fluss.flink.utils.FlinkConversions;
-import org.apache.fluss.flink.utils.PushdownUtils;
-import org.apache.fluss.flink.utils.PushdownUtils.FieldEqual;
-import org.apache.fluss.lake.source.LakeSource;
-import org.apache.fluss.lake.source.LakeSplit;
-import org.apache.fluss.metadata.MergeEngineType;
-import org.apache.fluss.metadata.TablePath;
-import org.apache.fluss.predicate.Predicate;
-import org.apache.fluss.predicate.PredicateBuilder;
-import org.apache.fluss.types.RowType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/deserializer/JsonStringDeserializationSchema.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/deserializer/JsonStringDeserializationSchema.java
index e06c144a0..c426501c2 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/deserializer/JsonStringDeserializationSchema.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/deserializer/JsonStringDeserializationSchema.java
@@ -17,8 +17,6 @@
package org.apache.fluss.flink.source.deserializer;
-import org.apache.flink.api.common.typeinfo.TypeInformation;
-import org.apache.flink.api.common.typeinfo.Types;
import org.apache.fluss.annotation.PublicEvolving;
import org.apache.fluss.flink.utils.FlussRowToJsonConverters;
import org.apache.fluss.flink.utils.TimestampFormat;
@@ -29,6 +27,9 @@ import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.node.Obje
import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.apache.fluss.types.RowType;
+import org.apache.flink.api.common.typeinfo.TypeInformation;
+import org.apache.flink.api.common.typeinfo.Types;
+
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/emitter/FlinkRecordEmitter.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/emitter/FlinkRecordEmitter.java
index 5ef300f7c..82a3ed87e 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/emitter/FlinkRecordEmitter.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/emitter/FlinkRecordEmitter.java
@@ -17,8 +17,6 @@
package org.apache.fluss.flink.source.emitter;
-import org.apache.flink.api.connector.source.SourceOutput;
-import org.apache.flink.connector.base.source.reader.RecordEmitter;
import org.apache.fluss.client.table.scanner.ScanRecord;
import org.apache.fluss.flink.lake.LakeRecordRecordEmitter;
import org.apache.fluss.flink.source.deserializer.FlussDeserializationSchema;
@@ -26,6 +24,9 @@ import org.apache.fluss.flink.source.reader.FlinkSourceReader;
import org.apache.fluss.flink.source.reader.RecordAndPos;
import org.apache.fluss.flink.source.split.HybridSnapshotLogSplitState;
import org.apache.fluss.flink.source.split.SourceSplitState;
+
+import org.apache.flink.api.connector.source.SourceOutput;
+import org.apache.flink.connector.base.source.reader.RecordEmitter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/enumerator/FlinkSourceEnumerator.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/enumerator/FlinkSourceEnumerator.java
index 155220b7d..e63d286d0 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/enumerator/FlinkSourceEnumerator.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/enumerator/FlinkSourceEnumerator.java
@@ -17,12 +17,6 @@
package org.apache.fluss.flink.source.enumerator;
-import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.api.connector.source.SourceEvent;
-import org.apache.flink.api.connector.source.SplitEnumerator;
-import org.apache.flink.api.connector.source.SplitEnumeratorContext;
-import org.apache.flink.api.connector.source.SplitsAssignment;
-import org.apache.flink.util.FlinkRuntimeException;
import org.apache.fluss.client.Connection;
import org.apache.fluss.client.ConnectionFactory;
import org.apache.fluss.client.admin.Admin;
@@ -50,6 +44,13 @@ import org.apache.fluss.metadata.TableInfo;
import org.apache.fluss.metadata.TablePath;
import org.apache.fluss.types.DataField;
import org.apache.fluss.utils.ExceptionUtils;
+
+import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.api.connector.source.SourceEvent;
+import org.apache.flink.api.connector.source.SplitEnumerator;
+import org.apache.flink.api.connector.source.SplitEnumeratorContext;
+import org.apache.flink.api.connector.source.SplitsAssignment;
+import org.apache.flink.util.FlinkRuntimeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/reader/FlinkSourceReader.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/reader/FlinkSourceReader.java
index 161d30cee..6364532bb 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/reader/FlinkSourceReader.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/reader/FlinkSourceReader.java
@@ -17,10 +17,6 @@
package org.apache.fluss.flink.source.reader;
-import org.apache.flink.api.connector.source.SourceEvent;
-import org.apache.flink.api.connector.source.SourceReaderContext;
-import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds;
-import org.apache.flink.connector.base.source.reader.synchronization.FutureCompletingBlockingQueue;
import org.apache.fluss.config.Configuration;
import org.apache.fluss.flink.adapter.SingleThreadMultiplexSourceReaderBaseAdapter;
import org.apache.fluss.flink.lake.LakeSplitStateInitializer;
@@ -39,6 +35,11 @@ import org.apache.fluss.metadata.TableBucket;
import org.apache.fluss.metadata.TablePath;
import org.apache.fluss.types.RowType;
+import org.apache.flink.api.connector.source.SourceEvent;
+import org.apache.flink.api.connector.source.SourceReaderContext;
+import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds;
+import org.apache.flink.connector.base.source.reader.synchronization.FutureCompletingBlockingQueue;
+
import javax.annotation.Nullable;
import java.util.Map;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/reader/FlinkSourceSplitReader.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/reader/FlinkSourceSplitReader.java
index 208afc2e6..b809feca5 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/reader/FlinkSourceSplitReader.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/reader/FlinkSourceSplitReader.java
@@ -17,12 +17,6 @@
package org.apache.fluss.flink.source.reader;
-import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds;
-import org.apache.flink.connector.base.source.reader.splitreader.SplitReader;
-import org.apache.flink.connector.base.source.reader.splitreader.SplitsAddition;
-import org.apache.flink.connector.base.source.reader.splitreader.SplitsChange;
-import org.apache.flink.table.api.ValidationException;
-import org.apache.flink.util.FlinkRuntimeException;
import org.apache.fluss.client.Connection;
import org.apache.fluss.client.ConnectionFactory;
import org.apache.fluss.client.table.Table;
@@ -46,6 +40,13 @@ import org.apache.fluss.metadata.TablePath;
import org.apache.fluss.types.RowType;
import org.apache.fluss.utils.CloseableIterator;
import org.apache.fluss.utils.ExceptionUtils;
+
+import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds;
+import org.apache.flink.connector.base.source.reader.splitreader.SplitReader;
+import org.apache.flink.connector.base.source.reader.splitreader.SplitsAddition;
+import org.apache.flink.connector.base.source.reader.splitreader.SplitsChange;
+import org.apache.flink.table.api.ValidationException;
+import org.apache.flink.util.FlinkRuntimeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/reader/fetcher/FlinkSourceFetcherManager.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/reader/fetcher/FlinkSourceFetcherManager.java
index a9a360b1d..9b1c9ff0f 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/reader/fetcher/FlinkSourceFetcherManager.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/reader/fetcher/FlinkSourceFetcherManager.java
@@ -17,6 +17,12 @@
package org.apache.fluss.flink.source.reader.fetcher;
+import org.apache.fluss.flink.adapter.SingleThreadFetcherManagerAdapter;
+import org.apache.fluss.flink.source.reader.FlinkSourceSplitReader;
+import org.apache.fluss.flink.source.reader.RecordAndPos;
+import org.apache.fluss.flink.source.split.SourceSplitBase;
+import org.apache.fluss.metadata.TableBucket;
+
import org.apache.flink.annotation.Internal;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds;
@@ -25,11 +31,6 @@ import org.apache.flink.connector.base.source.reader.fetcher.SplitFetcher;
import org.apache.flink.connector.base.source.reader.fetcher.SplitFetcherTask;
import org.apache.flink.connector.base.source.reader.splitreader.SplitReader;
import org.apache.flink.connector.base.source.reader.synchronization.FutureCompletingBlockingQueue;
-import org.apache.fluss.flink.adapter.SingleThreadFetcherManagerAdapter;
-import org.apache.fluss.flink.source.reader.FlinkSourceSplitReader;
-import org.apache.fluss.flink.source.reader.RecordAndPos;
-import org.apache.fluss.flink.source.split.SourceSplitBase;
-import org.apache.fluss.metadata.TableBucket;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/split/SourceSplitSerializer.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/split/SourceSplitSerializer.java
index b31ef23c1..7ee92cef9 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/split/SourceSplitSerializer.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/source/split/SourceSplitSerializer.java
@@ -17,14 +17,15 @@
package org.apache.fluss.flink.source.split;
-import org.apache.flink.core.io.SimpleVersionedSerializer;
-import org.apache.flink.core.memory.DataInputDeserializer;
-import org.apache.flink.core.memory.DataOutputSerializer;
import org.apache.fluss.flink.lake.LakeSplitSerializer;
import org.apache.fluss.lake.source.LakeSource;
import org.apache.fluss.lake.source.LakeSplit;
import org.apache.fluss.metadata.TableBucket;
+import org.apache.flink.core.io.SimpleVersionedSerializer;
+import org.apache.flink.core.memory.DataInputDeserializer;
+import org.apache.flink.core.memory.DataOutputSerializer;
+
import javax.annotation.Nullable;
import java.io.IOException;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/tiering/committer/TieringCommitOperator.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/tiering/committer/TieringCommitOperator.java
index 5e7e5d5f9..fa52a86cd 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/tiering/committer/TieringCommitOperator.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/tiering/committer/TieringCommitOperator.java
@@ -17,12 +17,6 @@
package org.apache.fluss.flink.tiering.committer;
-import org.apache.flink.runtime.operators.coordination.OperatorEventGateway;
-import org.apache.flink.runtime.source.event.SourceEventWrapper;
-import org.apache.flink.streaming.api.operators.AbstractStreamOperator;
-import org.apache.flink.streaming.api.operators.OneInputStreamOperator;
-import org.apache.flink.streaming.api.operators.StreamOperatorParameters;
-import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
import org.apache.fluss.client.Connection;
import org.apache.fluss.client.ConnectionFactory;
import org.apache.fluss.client.admin.Admin;
@@ -47,6 +41,13 @@ import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator
import org.apache.fluss.utils.ExceptionUtils;
import org.apache.fluss.utils.json.BucketOffsetJsonSerde;
+import org.apache.flink.runtime.operators.coordination.OperatorEventGateway;
+import org.apache.flink.runtime.source.event.SourceEventWrapper;
+import org.apache.flink.streaming.api.operators.AbstractStreamOperator;
+import org.apache.flink.streaming.api.operators.OneInputStreamOperator;
+import org.apache.flink.streaming.api.operators.StreamOperatorParameters;
+import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
+
import javax.annotation.Nullable;
import java.io.IOException;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/tiering/source/TieringSource.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/tiering/source/TieringSource.java
index 341304894..1c1917987 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/tiering/source/TieringSource.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/tiering/source/TieringSource.java
@@ -17,15 +17,6 @@
package org.apache.fluss.flink.tiering.source;
-import org.apache.flink.api.connector.source.Boundedness;
-import org.apache.flink.api.connector.source.Source;
-import org.apache.flink.api.connector.source.SourceReader;
-import org.apache.flink.api.connector.source.SourceReaderContext;
-import org.apache.flink.api.connector.source.SplitEnumerator;
-import org.apache.flink.api.connector.source.SplitEnumeratorContext;
-import org.apache.flink.core.io.SimpleVersionedSerializer;
-import org.apache.flink.runtime.jobgraph.OperatorID;
-import org.apache.flink.streaming.api.graph.StreamGraphHasherV2;
import org.apache.fluss.config.Configuration;
import org.apache.fluss.flink.tiering.source.enumerator.TieringSourceEnumerator;
import org.apache.fluss.flink.tiering.source.split.TieringSplit;
@@ -37,6 +28,16 @@ import org.apache.fluss.shaded.guava32.com.google.common.hash.HashFunction;
import org.apache.fluss.shaded.guava32.com.google.common.hash.Hasher;
import org.apache.fluss.shaded.guava32.com.google.common.hash.Hashing;
+import org.apache.flink.api.connector.source.Boundedness;
+import org.apache.flink.api.connector.source.Source;
+import org.apache.flink.api.connector.source.SourceReader;
+import org.apache.flink.api.connector.source.SourceReaderContext;
+import org.apache.flink.api.connector.source.SplitEnumerator;
+import org.apache.flink.api.connector.source.SplitEnumeratorContext;
+import org.apache.flink.core.io.SimpleVersionedSerializer;
+import org.apache.flink.runtime.jobgraph.OperatorID;
+import org.apache.flink.streaming.api.graph.StreamGraphHasherV2;
+
import java.nio.charset.StandardCharsets;
import static org.apache.fluss.flink.tiering.source.TieringSourceOptions.POLL_TIERING_TABLE_INTERVAL;
diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/utils/FlinkConversions.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/utils/FlinkConversions.java
index dd6045eed..200f2075a 100644
--- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/utils/FlinkConversions.java
+++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/utils/FlinkConversions.java
@@ -17,14 +17,6 @@
package org.apache.fluss.flink.utils;
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.table.catalog.CatalogDatabase;
-import org.apache.flink.table.catalog.CatalogTable;
-import org.apache.flink.table.catalog.Column;
-import org.apache.flink.table.catalog.ResolvedCatalogTable;
-import org.apache.flink.table.catalog.ResolvedSchema;
-import org.apache.flink.table.catalog.exceptions.CatalogException;
-import org.apache.flink.types.RowKind;
import org.apache.fluss.annotation.VisibleForTesting;
import org.apache.fluss.config.ConfigOption;
import org.apache.fluss.config.FlussConfigUtils;
@@ -43,6 +35,15 @@ import org.apache.fluss.types.RowType;
import org.apache.fluss.utils.StringUtils;
import org.apache.fluss.utils.TimeUtils;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.table.catalog.CatalogDatabase;
+import org.apache.flink.table.catalog.CatalogTable;
+import org.apache.flink.table.catalog.Column;
+import org.apache.flink.table.catalog.ResolvedCatalogTable;
+import org.apache.flink.table.catalog.ResolvedSchema;
+import org.apache.flink.table.catalog.exceptions.CatalogException;
+import org.apache.flink.types.RowKind;
+
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/lake/LakeSplitSerializerTest.java b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/lake/LakeSplitSerializerTest.java
index d369e9f26..ff69bce92 100644
--- a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/lake/LakeSplitSerializerTest.java
+++ b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/lake/LakeSplitSerializerTest.java
@@ -18,14 +18,15 @@
package org.apache.fluss.flink.lake;
-import org.apache.flink.core.memory.DataInputDeserializer;
-import org.apache.flink.core.memory.DataOutputSerializer;
import org.apache.fluss.flink.lake.split.LakeSnapshotAndFlussLogSplit;
import org.apache.fluss.flink.lake.split.LakeSnapshotSplit;
import org.apache.fluss.flink.source.split.SourceSplitBase;
import org.apache.fluss.lake.serializer.SimpleVersionedSerializer;
import org.apache.fluss.lake.source.LakeSplit;
import org.apache.fluss.metadata.TableBucket;
+
+import org.apache.flink.core.memory.DataInputDeserializer;
+import org.apache.flink.core.memory.DataOutputSerializer;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/lake/reader/SortMergeReaderTest.java b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/lake/reader/SortMergeReaderTest.java
index 5e476b0e3..2bd02cd05 100644
--- a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/lake/reader/SortMergeReaderTest.java
+++ b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/lake/reader/SortMergeReaderTest.java
@@ -1,19 +1,17 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * Copyright (c) 2025 Alibaba Group Holding Ltd.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.fluss.flink.lake.reader;
diff --git a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/security/acl/FlinkAuthorizationITCase.java b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/security/acl/FlinkAuthorizationITCase.java
index 595ac4ba6..05cbd7802 100644
--- a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/security/acl/FlinkAuthorizationITCase.java
+++ b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/security/acl/FlinkAuthorizationITCase.java
@@ -17,12 +17,6 @@
package org.apache.fluss.flink.security.acl;
-import org.apache.commons.lang3.RandomUtils;
-import org.apache.flink.table.api.EnvironmentSettings;
-import org.apache.flink.table.api.TableEnvironment;
-import org.apache.flink.test.util.AbstractTestBase;
-import org.apache.flink.types.Row;
-import org.apache.flink.util.CollectionUtil;
import org.apache.fluss.config.ConfigOptions;
import org.apache.fluss.config.Configuration;
import org.apache.fluss.config.MemorySize;
@@ -40,6 +34,13 @@ import org.apache.fluss.security.auth.sasl.jaas.LoginManager;
import org.apache.fluss.server.testutils.FlussClusterExtension;
import org.apache.fluss.utils.ParentResourceBlockingClassLoader;
import org.apache.fluss.utils.TemporaryClassLoaderContext;
+
+import org.apache.commons.lang3.RandomUtils;
+import org.apache.flink.table.api.EnvironmentSettings;
+import org.apache.flink.table.api.TableEnvironment;
+import org.apache.flink.test.util.AbstractTestBase;
+import org.apache.flink.types.Row;
+import org.apache.flink.util.CollectionUtil;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
diff --git a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/source/FlinkTableSourceITCase.java b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/source/FlinkTableSourceITCase.java
index cc41e04ac..24757cb05 100644
--- a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/source/FlinkTableSourceITCase.java
+++ b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/source/FlinkTableSourceITCase.java
@@ -17,6 +17,20 @@
package org.apache.fluss.flink.source;
+import org.apache.fluss.client.Connection;
+import org.apache.fluss.client.ConnectionFactory;
+import org.apache.fluss.client.admin.Admin;
+import org.apache.fluss.client.metadata.KvSnapshots;
+import org.apache.fluss.client.table.Table;
+import org.apache.fluss.client.table.writer.UpsertWriter;
+import org.apache.fluss.config.ConfigOptions;
+import org.apache.fluss.config.Configuration;
+import org.apache.fluss.metadata.TablePath;
+import org.apache.fluss.row.GenericRow;
+import org.apache.fluss.row.InternalRow;
+import org.apache.fluss.server.testutils.FlussClusterExtension;
+import org.apache.fluss.utils.clock.ManualClock;
+
import org.apache.commons.lang3.RandomUtils;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.common.typeinfo.Types;
@@ -31,19 +45,6 @@ import org.apache.flink.table.api.config.ExecutionConfigOptions;
import org.apache.flink.test.util.AbstractTestBase;
import org.apache.flink.types.Row;
import org.apache.flink.util.CloseableIterator;
-import org.apache.fluss.client.Connection;
-import org.apache.fluss.client.ConnectionFactory;
-import org.apache.fluss.client.admin.Admin;
-import org.apache.fluss.client.metadata.KvSnapshots;
-import org.apache.fluss.client.table.Table;
-import org.apache.fluss.client.table.writer.UpsertWriter;
-import org.apache.fluss.config.ConfigOptions;
-import org.apache.fluss.config.Configuration;
-import org.apache.fluss.metadata.TablePath;
-import org.apache.fluss.row.GenericRow;
-import org.apache.fluss.row.InternalRow;
-import org.apache.fluss.server.testutils.FlussClusterExtension;
-import org.apache.fluss.utils.clock.ManualClock;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
diff --git a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/tiering/committer/FlussTableLakeSnapshotCommitterTest.java b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/tiering/committer/FlussTableLakeSnapshotCommitterTest.java
index 4fb261964..d1b3ddc6d 100644
--- a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/tiering/committer/FlussTableLakeSnapshotCommitterTest.java
+++ b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/tiering/committer/FlussTableLakeSnapshotCommitterTest.java
@@ -23,6 +23,7 @@ import org.apache.fluss.lake.committer.CommittedLakeSnapshot;
import org.apache.fluss.metadata.ResolvedPartitionSpec;
import org.apache.fluss.metadata.TableBucket;
import org.apache.fluss.metadata.TablePath;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/tiering/committer/TieringCommitOperatorTest.java b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/tiering/committer/TieringCommitOperatorTest.java
index 1889ed0fd..e6c412cad 100644
--- a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/tiering/committer/TieringCommitOperatorTest.java
+++ b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/tiering/committer/TieringCommitOperatorTest.java
@@ -17,6 +17,20 @@
package org.apache.fluss.flink.tiering.committer;
+import org.apache.fluss.client.metadata.LakeSnapshot;
+import org.apache.fluss.exception.LakeTableSnapshotNotExistException;
+import org.apache.fluss.flink.tiering.TestingLakeTieringFactory;
+import org.apache.fluss.flink.tiering.TestingWriteResult;
+import org.apache.fluss.flink.tiering.event.FailedTieringEvent;
+import org.apache.fluss.flink.tiering.event.FinishedTieringEvent;
+import org.apache.fluss.flink.tiering.source.TableBucketWriteResult;
+import org.apache.fluss.flink.utils.FlinkTestBase;
+import org.apache.fluss.lake.committer.CommittedLakeSnapshot;
+import org.apache.fluss.metadata.ResolvedPartitionSpec;
+import org.apache.fluss.metadata.TableBucket;
+import org.apache.fluss.metadata.TablePath;
+import org.apache.fluss.utils.types.Tuple2;
+
import org.apache.flink.configuration.Configuration;
import org.apache.flink.runtime.jobgraph.OperatorID;
import org.apache.flink.runtime.operators.coordination.MockOperatorEventGateway;
@@ -31,19 +45,6 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
import org.apache.flink.streaming.runtime.tasks.SourceOperatorStreamTask;
import org.apache.flink.streaming.util.MockOutput;
import org.apache.flink.streaming.util.MockStreamConfig;
-import org.apache.fluss.client.metadata.LakeSnapshot;
-import org.apache.fluss.exception.LakeTableSnapshotNotExistException;
-import org.apache.fluss.flink.tiering.TestingLakeTieringFactory;
-import org.apache.fluss.flink.tiering.TestingWriteResult;
-import org.apache.fluss.flink.tiering.event.FailedTieringEvent;
-import org.apache.fluss.flink.tiering.event.FinishedTieringEvent;
-import org.apache.fluss.flink.tiering.source.TableBucketWriteResult;
-import org.apache.fluss.flink.utils.FlinkTestBase;
-import org.apache.fluss.lake.committer.CommittedLakeSnapshot;
-import org.apache.fluss.metadata.ResolvedPartitionSpec;
-import org.apache.fluss.metadata.TableBucket;
-import org.apache.fluss.metadata.TablePath;
-import org.apache.fluss.utils.types.Tuple2;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-metrics/fluss-metrics-prometheus/src/test/java/org/apache/fluss/metrics/prometheus/PrometheusReporterTest.java b/fluss-metrics/fluss-metrics-prometheus/src/test/java/org/apache/fluss/metrics/prometheus/PrometheusReporterTest.java
index 17341bec2..be67ff741 100644
--- a/fluss-metrics/fluss-metrics-prometheus/src/test/java/org/apache/fluss/metrics/prometheus/PrometheusReporterTest.java
+++ b/fluss-metrics/fluss-metrics-prometheus/src/test/java/org/apache/fluss/metrics/prometheus/PrometheusReporterTest.java
@@ -17,9 +17,6 @@
package org.apache.fluss.metrics.prometheus;
-import com.mashape.unirest.http.HttpResponse;
-import com.mashape.unirest.http.Unirest;
-import com.mashape.unirest.http.exceptions.UnirestException;
import org.apache.fluss.metrics.Counter;
import org.apache.fluss.metrics.Gauge;
import org.apache.fluss.metrics.Histogram;
@@ -31,6 +28,10 @@ import org.apache.fluss.metrics.util.TestHistogram;
import org.apache.fluss.metrics.util.TestMeter;
import org.apache.fluss.shaded.guava32.com.google.common.collect.Iterators;
import org.apache.fluss.utils.NetUtils;
+
+import com.mashape.unirest.http.HttpResponse;
+import com.mashape.unirest.http.Unirest;
+import com.mashape.unirest.http.exceptions.UnirestException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-protogen/fluss-protogen-generator/src/main/java/org/apache/fluss/protogen/generator/generator/ProtoCodeGenerator.java b/fluss-protogen/fluss-protogen-generator/src/main/java/org/apache/fluss/protogen/generator/generator/ProtoCodeGenerator.java
index 6cd420e69..6ab4d3a2a 100644
--- a/fluss-protogen/fluss-protogen-generator/src/main/java/org/apache/fluss/protogen/generator/generator/ProtoCodeGenerator.java
+++ b/fluss-protogen/fluss-protogen-generator/src/main/java/org/apache/fluss/protogen/generator/generator/ProtoCodeGenerator.java
@@ -17,11 +17,12 @@
package org.apache.fluss.protogen.generator.generator;
-import io.protostuff.parser.Proto;
-import io.protostuff.parser.ProtoUtil;
import org.apache.fluss.shaded.guava32.com.google.common.base.Joiner;
import org.apache.fluss.shaded.guava32.com.google.common.base.Splitter;
+import io.protostuff.parser.Proto;
+import io.protostuff.parser.ProtoUtil;
+
import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
diff --git a/fluss-protogen/fluss-protogen-generator/src/main/java/org/apache/fluss/protogen/generator/generator/ProtobufNumberField.java b/fluss-protogen/fluss-protogen-generator/src/main/java/org/apache/fluss/protogen/generator/generator/ProtobufNumberField.java
index 09cc33257..f064dd173 100644
--- a/fluss-protogen/fluss-protogen-generator/src/main/java/org/apache/fluss/protogen/generator/generator/ProtobufNumberField.java
+++ b/fluss-protogen/fluss-protogen-generator/src/main/java/org/apache/fluss/protogen/generator/generator/ProtobufNumberField.java
@@ -17,9 +17,10 @@
package org.apache.fluss.protogen.generator.generator;
-import io.protostuff.parser.Field;
import org.apache.fluss.shaded.guava32.com.google.common.collect.Maps;
+import io.protostuff.parser.Field;
+
import java.io.PrintWriter;
import java.util.Map;
diff --git a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/NettyLogger.java b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/NettyLogger.java
index f70531fd8..555177d0c 100644
--- a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/NettyLogger.java
+++ b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/NettyLogger.java
@@ -22,6 +22,7 @@ import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufHolder;
import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
import org.apache.fluss.shaded.netty4.io.netty.handler.logging.LogLevel;
import org.apache.fluss.shaded.netty4.io.netty.handler.logging.LoggingHandler;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/client/NettyClient.java b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/client/NettyClient.java
index 70c83538f..3334e392a 100644
--- a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/client/NettyClient.java
+++ b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/client/NettyClient.java
@@ -35,6 +35,7 @@ import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelOption;
import org.apache.fluss.shaded.netty4.io.netty.channel.EventLoopGroup;
import org.apache.fluss.utils.MapUtils;
import org.apache.fluss.utils.concurrent.FutureUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/client/NettyClientHandler.java b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/client/NettyClientHandler.java
index 83dccae27..a2c03028d 100644
--- a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/client/NettyClientHandler.java
+++ b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/client/NettyClientHandler.java
@@ -30,6 +30,7 @@ import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelInboundHandlerAdapter;
import org.apache.fluss.shaded.netty4.io.netty.handler.timeout.IdleState;
import org.apache.fluss.shaded.netty4.io.netty.handler.timeout.IdleStateEvent;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/client/ServerConnection.java b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/client/ServerConnection.java
index cce8d9447..f07afdf9e 100644
--- a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/client/ServerConnection.java
+++ b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/client/ServerConnection.java
@@ -42,6 +42,7 @@ import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelFuture;
import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelFutureListener;
import org.apache.fluss.utils.ExponentialBackoff;
import org.apache.fluss.utils.MapUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/FlussRequest.java b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/FlussRequest.java
index f34210b6d..adc67298e 100644
--- a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/FlussRequest.java
+++ b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/FlussRequest.java
@@ -23,6 +23,7 @@ import org.apache.fluss.rpc.protocol.RequestType;
import org.apache.fluss.security.acl.FlussPrincipal;
import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf;
import org.apache.fluss.shaded.netty4.io.netty.util.ReferenceCountUtil;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/NettyServer.java b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/NettyServer.java
index c1b034fd1..7f2198566 100644
--- a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/NettyServer.java
+++ b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/NettyServer.java
@@ -36,6 +36,7 @@ import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandler;
import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelOption;
import org.apache.fluss.shaded.netty4.io.netty.channel.EventLoopGroup;
import org.apache.fluss.utils.concurrent.FutureUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/NettyServerHandler.java b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/NettyServerHandler.java
index 2da1b46af..3080c87e0 100644
--- a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/NettyServerHandler.java
+++ b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/NettyServerHandler.java
@@ -41,6 +41,7 @@ import org.apache.fluss.shaded.netty4.io.netty.handler.timeout.IdleState;
import org.apache.fluss.shaded.netty4.io.netty.handler.timeout.IdleStateEvent;
import org.apache.fluss.utils.ExceptionUtils;
import org.apache.fluss.utils.IOUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/ServerChannelInitializer.java b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/ServerChannelInitializer.java
index 4d412462b..83813be37 100644
--- a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/ServerChannelInitializer.java
+++ b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/server/ServerChannelInitializer.java
@@ -24,6 +24,7 @@ import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelInitializer;
import org.apache.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel;
import org.apache.fluss.utils.MathUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/main/java/org/apache/fluss/rpc/protocol/ApiManager.java b/fluss-rpc/src/main/java/org/apache/fluss/rpc/protocol/ApiManager.java
index 2975fa490..d8602eaf1 100644
--- a/fluss-rpc/src/main/java/org/apache/fluss/rpc/protocol/ApiManager.java
+++ b/fluss-rpc/src/main/java/org/apache/fluss/rpc/protocol/ApiManager.java
@@ -24,6 +24,7 @@ import org.apache.fluss.rpc.gateway.CoordinatorGateway;
import org.apache.fluss.rpc.gateway.TabletServerGateway;
import org.apache.fluss.rpc.messages.ApiMessage;
import org.apache.fluss.shaded.guava32.com.google.common.collect.ImmutableList;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-rpc/src/test/java/org/apache/fluss/rpc/netty/server/NettyServerHandlerTest.java b/fluss-rpc/src/test/java/org/apache/fluss/rpc/netty/server/NettyServerHandlerTest.java
index c52a5119f..113bf3f7a 100644
--- a/fluss-rpc/src/test/java/org/apache/fluss/rpc/netty/server/NettyServerHandlerTest.java
+++ b/fluss-rpc/src/test/java/org/apache/fluss/rpc/netty/server/NettyServerHandlerTest.java
@@ -38,6 +38,7 @@ import org.apache.fluss.shaded.netty4.io.netty.channel.Channel;
import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelId;
import org.apache.fluss.shaded.netty4.io.netty.util.concurrent.DefaultEventExecutor;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git a/fluss-rpc/src/test/java/org/apache/fluss/rpc/protocol/MessageCodecTest.java b/fluss-rpc/src/test/java/org/apache/fluss/rpc/protocol/MessageCodecTest.java
index 6bf4dc556..29c9f1489 100644
--- a/fluss-rpc/src/test/java/org/apache/fluss/rpc/protocol/MessageCodecTest.java
+++ b/fluss-rpc/src/test/java/org/apache/fluss/rpc/protocol/MessageCodecTest.java
@@ -38,6 +38,7 @@ import org.apache.fluss.shaded.netty4.io.netty.channel.Channel;
import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext;
import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelId;
import org.apache.fluss.shaded.netty4.io.netty.util.concurrent.EventExecutor;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-rpc/src/test/java/org/apache/fluss/rpc/protocol/RequestChannelTest.java b/fluss-rpc/src/test/java/org/apache/fluss/rpc/protocol/RequestChannelTest.java
index f70d3049a..a76df2d2a 100644
--- a/fluss-rpc/src/test/java/org/apache/fluss/rpc/protocol/RequestChannelTest.java
+++ b/fluss-rpc/src/test/java/org/apache/fluss/rpc/protocol/RequestChannelTest.java
@@ -24,6 +24,7 @@ import org.apache.fluss.rpc.netty.server.RequestChannel;
import org.apache.fluss.rpc.netty.server.RpcRequest;
import org.apache.fluss.shaded.netty4.io.netty.buffer.EmptyByteBuf;
import org.apache.fluss.shaded.netty4.io.netty.buffer.UnpooledByteBufAllocator;
+
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/ServerBase.java b/fluss-server/src/main/java/org/apache/fluss/server/ServerBase.java
index 04676ef16..99c1e105f 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/ServerBase.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/ServerBase.java
@@ -35,6 +35,7 @@ import org.apache.fluss.server.utils.ShutdownHookUtil;
import org.apache.fluss.utils.AutoCloseableAsync;
import org.apache.fluss.utils.ExceptionUtils;
import org.apache.fluss.utils.concurrent.FutureUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/authorizer/DefaultAuthorizer.java b/fluss-server/src/main/java/org/apache/fluss/server/authorizer/DefaultAuthorizer.java
index fa1f842c8..c7528edc5 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/authorizer/DefaultAuthorizer.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/authorizer/DefaultAuthorizer.java
@@ -40,6 +40,7 @@ import org.apache.fluss.shaded.guava32.com.google.common.collect.Maps;
import org.apache.fluss.shaded.guava32.com.google.common.collect.Sets;
import org.apache.fluss.utils.clock.SystemClock;
import org.apache.fluss.utils.types.Tuple2;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/authorizer/ZkNodeChangeNotificationWatcher.java b/fluss-server/src/main/java/org/apache/fluss/server/authorizer/ZkNodeChangeNotificationWatcher.java
index 409ebbd6f..497e72756 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/authorizer/ZkNodeChangeNotificationWatcher.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/authorizer/ZkNodeChangeNotificationWatcher.java
@@ -25,6 +25,7 @@ import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cac
import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.data.Stat;
import org.apache.fluss.utils.clock.Clock;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/CoordinatorEventProcessor.java b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/CoordinatorEventProcessor.java
index 0e53eb54d..d47609c49 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/CoordinatorEventProcessor.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/CoordinatorEventProcessor.java
@@ -82,6 +82,7 @@ import org.apache.fluss.server.zk.data.TabletServerRegistration;
import org.apache.fluss.server.zk.data.ZkData.PartitionIdsZNode;
import org.apache.fluss.server.zk.data.ZkData.TableIdsZNode;
import org.apache.fluss.utils.types.Tuple2;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/CoordinatorServer.java b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/CoordinatorServer.java
index 5e4601569..ef393aeb5 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/CoordinatorServer.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/CoordinatorServer.java
@@ -49,6 +49,7 @@ import org.apache.fluss.utils.ExceptionUtils;
import org.apache.fluss.utils.ExecutorUtils;
import org.apache.fluss.utils.concurrent.ExecutorThreadFactory;
import org.apache.fluss.utils.concurrent.FutureUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/MetadataManager.java b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/MetadataManager.java
index 1b739bad9..6017fe3de 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/MetadataManager.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/MetadataManager.java
@@ -49,6 +49,7 @@ import org.apache.fluss.server.zk.data.TableRegistration;
import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import org.apache.fluss.utils.function.RunnableWithException;
import org.apache.fluss.utils.function.ThrowingRunnable;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/event/CoordinatorEventManager.java b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/event/CoordinatorEventManager.java
index 04657584c..06a92dabb 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/event/CoordinatorEventManager.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/event/CoordinatorEventManager.java
@@ -27,6 +27,7 @@ import org.apache.fluss.server.coordinator.CoordinatorContext;
import org.apache.fluss.server.coordinator.statemachine.ReplicaState;
import org.apache.fluss.server.metrics.group.CoordinatorMetricGroup;
import org.apache.fluss.utils.concurrent.ShutdownableThread;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/event/watcher/TableChangeWatcher.java b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/event/watcher/TableChangeWatcher.java
index 9d308032d..c8ee481f6 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/event/watcher/TableChangeWatcher.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/event/watcher/TableChangeWatcher.java
@@ -39,6 +39,7 @@ import org.apache.fluss.server.zk.data.ZkData.TableZNode;
import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.ChildData;
import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCache;
import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCacheListener;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/event/watcher/TabletServerChangeWatcher.java b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/event/watcher/TabletServerChangeWatcher.java
index 393fd8cbb..a8f4dcb15 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/event/watcher/TabletServerChangeWatcher.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/event/watcher/TabletServerChangeWatcher.java
@@ -31,6 +31,7 @@ import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cac
import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCache;
import org.apache.fluss.shaded.curator5.org.apache.curator.framework.recipes.cache.CuratorCacheListener;
import org.apache.fluss.shaded.curator5.org.apache.curator.utils.ZKPaths;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/statemachine/TableBucketStateMachine.java b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/statemachine/TableBucketStateMachine.java
index 89ff4eca7..d1b9958cb 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/coordinator/statemachine/TableBucketStateMachine.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/coordinator/statemachine/TableBucketStateMachine.java
@@ -26,6 +26,7 @@ import org.apache.fluss.server.entity.RegisterTableBucketLeadAndIsrInfo;
import org.apache.fluss.server.zk.ZooKeeperClient;
import org.apache.fluss.server.zk.data.LeaderAndIsr;
import org.apache.fluss.shaded.guava32.com.google.common.collect.Sets;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/kv/KvManager.java b/fluss-server/src/main/java/org/apache/fluss/server/kv/KvManager.java
index 6d3fe0d46..22290e983 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/kv/KvManager.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/kv/KvManager.java
@@ -43,6 +43,7 @@ import org.apache.fluss.utils.FileUtils;
import org.apache.fluss.utils.FlussPaths;
import org.apache.fluss.utils.MapUtils;
import org.apache.fluss.utils.types.Tuple2;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/kv/KvTablet.java b/fluss-server/src/main/java/org/apache/fluss/server/kv/KvTablet.java
index 22bea611e..4c3fde697 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/kv/KvTablet.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/kv/KvTablet.java
@@ -64,6 +64,7 @@ import org.apache.fluss.utils.BytesUtils;
import org.apache.fluss.utils.FileUtils;
import org.apache.fluss.utils.FlussPaths;
import org.apache.fluss.utils.types.Tuple2;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/log/AbstractIndex.java b/fluss-server/src/main/java/org/apache/fluss/server/log/AbstractIndex.java
index 249ff9fde..dbf0e21c2 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/log/AbstractIndex.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/log/AbstractIndex.java
@@ -22,6 +22,7 @@ import org.apache.fluss.server.exception.CorruptIndexException;
import org.apache.fluss.utils.FileUtils;
import org.apache.fluss.utils.IOUtils;
import org.apache.fluss.utils.log.ByteBufferUnmapper;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/log/LogSegment.java b/fluss-server/src/main/java/org/apache/fluss/server/log/LogSegment.java
index 2b9f0cf4f..105fc47e7 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/log/LogSegment.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/log/LogSegment.java
@@ -35,6 +35,7 @@ import org.apache.fluss.record.TimestampAndOffset;
import org.apache.fluss.shaded.guava32.com.google.common.collect.Iterables;
import org.apache.fluss.utils.FileUtils;
import org.apache.fluss.utils.FlussPaths;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/log/OffsetIndex.java b/fluss-server/src/main/java/org/apache/fluss/server/log/OffsetIndex.java
index 3e21e8ad7..3b470724e 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/log/OffsetIndex.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/log/OffsetIndex.java
@@ -20,6 +20,7 @@ package org.apache.fluss.server.log;
import org.apache.fluss.exception.IndexOffsetOverflowException;
import org.apache.fluss.exception.InvalidOffsetException;
import org.apache.fluss.server.exception.CorruptIndexException;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/log/TimeIndex.java b/fluss-server/src/main/java/org/apache/fluss/server/log/TimeIndex.java
index 277f307e7..3b5952d2e 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/log/TimeIndex.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/log/TimeIndex.java
@@ -19,6 +19,7 @@ package org.apache.fluss.server.log;
import org.apache.fluss.exception.InvalidOffsetException;
import org.apache.fluss.server.exception.CorruptIndexException;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/log/WriterStateManager.java b/fluss-server/src/main/java/org/apache/fluss/server/log/WriterStateManager.java
index 661126f22..e8712964c 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/log/WriterStateManager.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/log/WriterStateManager.java
@@ -27,6 +27,7 @@ import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import org.apache.fluss.utils.json.JsonDeserializer;
import org.apache.fluss.utils.json.JsonSerdeUtils;
import org.apache.fluss.utils.json.JsonSerializer;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/replica/fetcher/ReplicaFetcherThread.java b/fluss-server/src/main/java/org/apache/fluss/server/replica/fetcher/ReplicaFetcherThread.java
index 5127639cd..398bfb6ff 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/replica/fetcher/ReplicaFetcherThread.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/replica/fetcher/ReplicaFetcherThread.java
@@ -44,6 +44,7 @@ import org.apache.fluss.utils.FileUtils;
import org.apache.fluss.utils.FlussPaths;
import org.apache.fluss.utils.concurrent.ShutdownableThread;
import org.apache.fluss.utils.log.FairBucketStatusMap;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/tablet/TabletServer.java b/fluss-server/src/main/java/org/apache/fluss/server/tablet/TabletServer.java
index 4967f4542..9f8db8000 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/tablet/TabletServer.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/tablet/TabletServer.java
@@ -53,6 +53,7 @@ import org.apache.fluss.utils.clock.SystemClock;
import org.apache.fluss.utils.concurrent.FlussScheduler;
import org.apache.fluss.utils.concurrent.FutureUtils;
import org.apache.fluss.utils.concurrent.Scheduler;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/zk/ZooKeeperClient.java b/fluss-server/src/main/java/org/apache/fluss/server/zk/ZooKeeperClient.java
index 72a118343..abdc5e1fd 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/zk/ZooKeeperClient.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/zk/ZooKeeperClient.java
@@ -71,6 +71,7 @@ import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.CreateMode;
import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.data.Stat;
import org.apache.fluss.utils.types.Tuple2;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/main/java/org/apache/fluss/server/zk/ZooKeeperUtils.java b/fluss-server/src/main/java/org/apache/fluss/server/zk/ZooKeeperUtils.java
index 71fdae00e..485b0ea14 100644
--- a/fluss-server/src/main/java/org/apache/fluss/server/zk/ZooKeeperUtils.java
+++ b/fluss-server/src/main/java/org/apache/fluss/server/zk/ZooKeeperUtils.java
@@ -17,7 +17,6 @@
package org.apache.fluss.server.zk;
-import org.apache.commons.lang3.StringUtils;
import org.apache.fluss.annotation.VisibleForTesting;
import org.apache.fluss.config.ConfigOptions;
import org.apache.fluss.config.Configuration;
@@ -32,6 +31,8 @@ import org.apache.fluss.shaded.curator5.org.apache.curator.retry.ExponentialBack
import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.client.ZKClientConfig;
import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.server.quorum.QuorumPeerConfig;
import org.apache.fluss.utils.function.ThrowingRunnable;
+
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/ServerTestBase.java b/fluss-server/src/test/java/org/apache/fluss/server/ServerTestBase.java
index 5c952f2e2..c97cd4e99 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/ServerTestBase.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/ServerTestBase.java
@@ -29,6 +29,7 @@ import org.apache.fluss.server.zk.data.ZkData.CoordinatorZNode;
import org.apache.fluss.server.zk.data.ZkData.ServerIdZNode;
import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.data.Stat;
import org.apache.fluss.testutils.common.AllCallbackWrapper;
+
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/coordinator/CoordinatorEventProcessorTest.java b/fluss-server/src/test/java/org/apache/fluss/server/coordinator/CoordinatorEventProcessorTest.java
index 4c1ab75d9..b448c4126 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/coordinator/CoordinatorEventProcessorTest.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/coordinator/CoordinatorEventProcessorTest.java
@@ -68,6 +68,7 @@ import org.apache.fluss.types.DataTypes;
import org.apache.fluss.utils.ExceptionUtils;
import org.apache.fluss.utils.concurrent.ExecutorThreadFactory;
import org.apache.fluss.utils.types.Tuple2;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/coordinator/statemachine/TableBucketStateMachineTest.java b/fluss-server/src/test/java/org/apache/fluss/server/coordinator/statemachine/TableBucketStateMachineTest.java
index e04b8b8e5..9009765e4 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/coordinator/statemachine/TableBucketStateMachineTest.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/coordinator/statemachine/TableBucketStateMachineTest.java
@@ -43,6 +43,7 @@ import org.apache.fluss.server.zk.data.LeaderAndIsr;
import org.apache.fluss.shaded.guava32.com.google.common.collect.Sets;
import org.apache.fluss.testutils.common.AllCallbackWrapper;
import org.apache.fluss.utils.concurrent.ExecutorThreadFactory;
+
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/kv/KvTabletTest.java b/fluss-server/src/test/java/org/apache/fluss/server/kv/KvTabletTest.java
index b5d6355b6..1f3271562 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/kv/KvTabletTest.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/kv/KvTabletTest.java
@@ -54,6 +54,7 @@ import org.apache.fluss.types.RowType;
import org.apache.fluss.types.StringType;
import org.apache.fluss.utils.clock.SystemClock;
import org.apache.fluss.utils.concurrent.FlussScheduler;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/kv/wal/ArrowWalBuilderTest.java b/fluss-server/src/test/java/org/apache/fluss/server/kv/wal/ArrowWalBuilderTest.java
index fce6bd4b6..72e6441cd 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/kv/wal/ArrowWalBuilderTest.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/kv/wal/ArrowWalBuilderTest.java
@@ -31,6 +31,7 @@ import org.apache.fluss.row.arrow.ArrowWriterProvider;
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator;
import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator;
import org.apache.fluss.utils.types.Tuple2;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/log/WriterStateManagerTest.java b/fluss-server/src/test/java/org/apache/fluss/server/log/WriterStateManagerTest.java
index 6353f7fa4..b0ac3cd2b 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/log/WriterStateManagerTest.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/log/WriterStateManagerTest.java
@@ -23,6 +23,7 @@ import org.apache.fluss.exception.OutOfOrderSequenceException;
import org.apache.fluss.metadata.TableBucket;
import org.apache.fluss.utils.clock.ManualClock;
import org.apache.fluss.utils.types.Tuple2;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/log/remote/DefaultRemoteLogStorageTest.java b/fluss-server/src/test/java/org/apache/fluss/server/log/remote/DefaultRemoteLogStorageTest.java
index 6270950f4..207bf1654 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/log/remote/DefaultRemoteLogStorageTest.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/log/remote/DefaultRemoteLogStorageTest.java
@@ -26,6 +26,7 @@ import org.apache.fluss.server.log.LogTablet;
import org.apache.fluss.server.log.remote.RemoteLogStorage.IndexType;
import org.apache.fluss.shaded.guava32.com.google.common.io.Files;
import org.apache.fluss.utils.FlussPaths;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/replica/KvReplicaRestoreITCase.java b/fluss-server/src/test/java/org/apache/fluss/server/replica/KvReplicaRestoreITCase.java
index 9161ffd56..c6adbbbb1 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/replica/KvReplicaRestoreITCase.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/replica/KvReplicaRestoreITCase.java
@@ -33,6 +33,7 @@ import org.apache.fluss.server.testutils.FlussClusterExtension;
import org.apache.fluss.utils.ExceptionUtils;
import org.apache.fluss.utils.FileUtils;
import org.apache.fluss.utils.types.Tuple2;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/testutils/FlussClusterExtension.java b/fluss-server/src/test/java/org/apache/fluss/server/testutils/FlussClusterExtension.java
index 9dd00a3cd..05d85edf5 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/testutils/FlussClusterExtension.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/testutils/FlussClusterExtension.java
@@ -17,7 +17,6 @@
package org.apache.fluss.server.testutils;
-import org.apache.curator.test.TestingServer;
import org.apache.fluss.cluster.Endpoint;
import org.apache.fluss.cluster.ServerNode;
import org.apache.fluss.cluster.ServerType;
@@ -67,6 +66,8 @@ import org.apache.fluss.server.zk.data.TableAssignment;
import org.apache.fluss.utils.FileUtils;
import org.apache.fluss.utils.clock.Clock;
import org.apache.fluss.utils.clock.SystemClock;
+
+import org.apache.curator.test.TestingServer;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/zk/ZooKeeperClientTest.java b/fluss-server/src/test/java/org/apache/fluss/server/zk/ZooKeeperClientTest.java
index 0df4b87cd..89c260180 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/zk/ZooKeeperClientTest.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/zk/ZooKeeperClientTest.java
@@ -43,6 +43,7 @@ import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.client.ZKClientCo
import org.apache.fluss.testutils.common.AllCallbackWrapper;
import org.apache.fluss.types.DataTypes;
import org.apache.fluss.utils.types.Tuple2;
+
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/zk/ZooKeeperExtension.java b/fluss-server/src/test/java/org/apache/fluss/server/zk/ZooKeeperExtension.java
index 7fb7a4a78..18516960a 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/zk/ZooKeeperExtension.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/zk/ZooKeeperExtension.java
@@ -17,10 +17,11 @@
package org.apache.fluss.server.zk;
-import org.apache.curator.test.TestingServer;
import org.apache.fluss.server.utils.FatalErrorHandler;
import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.KeeperException;
import org.apache.fluss.testutils.common.CustomExtension;
+
+import org.apache.curator.test.TestingServer;
import org.apache.zookeeper.server.ZooKeeperServer;
import org.junit.jupiter.api.extension.Extension;
import org.junit.jupiter.api.extension.ExtensionContext;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/zk/data/CoordinatorAddressJsonSerdeTest.java b/fluss-server/src/test/java/org/apache/fluss/server/zk/data/CoordinatorAddressJsonSerdeTest.java
index 75a6888fa..d90151d83 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/zk/data/CoordinatorAddressJsonSerdeTest.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/zk/data/CoordinatorAddressJsonSerdeTest.java
@@ -21,6 +21,7 @@ import org.apache.fluss.cluster.Endpoint;
import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.fluss.utils.json.JsonSerdeTestBase;
+
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/zk/data/TableRegistrationJsonSerdeTest.java b/fluss-server/src/test/java/org/apache/fluss/server/zk/data/TableRegistrationJsonSerdeTest.java
index c3aec9563..348b20cfc 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/zk/data/TableRegistrationJsonSerdeTest.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/zk/data/TableRegistrationJsonSerdeTest.java
@@ -22,6 +22,7 @@ import org.apache.fluss.metadata.TableDescriptor.TableDistribution;
import org.apache.fluss.record.TestData;
import org.apache.fluss.shaded.guava32.com.google.common.collect.Maps;
import org.apache.fluss.utils.json.JsonSerdeTestBase;
+
import org.junit.jupiter.api.Test;
import java.util.Arrays;
diff --git a/fluss-server/src/test/java/org/apache/fluss/server/zk/data/TabletServerRegistrationJsonSerdeTest.java b/fluss-server/src/test/java/org/apache/fluss/server/zk/data/TabletServerRegistrationJsonSerdeTest.java
index ec0e99c7c..575e5dba2 100644
--- a/fluss-server/src/test/java/org/apache/fluss/server/zk/data/TabletServerRegistrationJsonSerdeTest.java
+++ b/fluss-server/src/test/java/org/apache/fluss/server/zk/data/TabletServerRegistrationJsonSerdeTest.java
@@ -21,6 +21,7 @@ import org.apache.fluss.cluster.Endpoint;
import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.fluss.utils.json.JsonSerdeTestBase;
+
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/pom.xml b/pom.xml
index b43cc11ae..17ebb3849 100644
--- a/pom.xml
+++ b/pom.xml
@@ -989,7 +989,7 @@
<configuration>
<java>
<googleJavaFormat>
- <version>1.7</version>
+ <version>1.15</version>
<style>AOSP</style>
</googleJavaFormat>