This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4ae78a36acf KAFKA-20297 Move ByteBufferUnmapper, BufferSupplier,
ChunkedBytesStream into internal (#22081)
4ae78a36acf is described below
commit 4ae78a36acffaccac7ade887c359e5e31b3c1d14
Author: Ken Huang <[email protected]>
AuthorDate: Sat Apr 18 21:00:12 2026 +0800
KAFKA-20297 Move ByteBufferUnmapper, BufferSupplier, ChunkedBytesStream
into internal (#22081)
We have exposed several classes in org.apache.kafka.common.utils as
public APIs, which can be misleading since not all classes in this
package are intended for external use.
So move ByteBufferUnmapper, BufferSupplier, ChunkedBytesStream into
internal module
Reviewers: Chia-Ping Tsai <[email protected]>
---
.../org/apache/kafka/clients/consumer/internals/AbstractFetch.java | 2 +-
.../org/apache/kafka/clients/consumer/internals/CompletedFetch.java | 2 +-
.../apache/kafka/clients/consumer/internals/ShareCompletedFetch.java | 2 +-
.../kafka/clients/consumer/internals/ShareConsumeRequestManager.java | 2 +-
.../src/main/java/org/apache/kafka/common/compress/Compression.java | 2 +-
.../main/java/org/apache/kafka/common/compress/GzipCompression.java | 4 ++--
.../java/org/apache/kafka/common/compress/Lz4BlockInputStream.java | 2 +-
.../main/java/org/apache/kafka/common/compress/Lz4Compression.java | 4 ++--
.../src/main/java/org/apache/kafka/common/compress/NoCompression.java | 2 +-
.../main/java/org/apache/kafka/common/compress/SnappyCompression.java | 4 ++--
.../main/java/org/apache/kafka/common/compress/ZstdCompression.java | 4 ++--
.../main/java/org/apache/kafka/common/network/SslTransportLayer.java | 2 +-
.../kafka/common/record/internal/AbstractLegacyRecordBatch.java | 2 +-
.../org/apache/kafka/common/record/internal/DefaultRecordBatch.java | 2 +-
.../org/apache/kafka/common/record/internal/FileLogInputStream.java | 2 +-
.../java/org/apache/kafka/common/record/internal/MemoryRecords.java | 2 +-
.../org/apache/kafka/common/record/internal/MutableRecordBatch.java | 2 +-
.../java/org/apache/kafka/common/record/internal/RecordBatch.java | 2 +-
.../apache/kafka/common/telemetry/internals/ClientTelemetryUtils.java | 2 +-
.../org/apache/kafka/common/utils/{ => internals}/BufferSupplier.java | 2 +-
.../apache/kafka/common/utils/{ => internals}/ByteBufferUnmapper.java | 2 +-
.../apache/kafka/common/utils/{ => internals}/ChunkedBytesStream.java | 2 +-
.../apache/kafka/clients/consumer/internals/CompletedFetchTest.java | 2 +-
.../org/apache/kafka/clients/consumer/internals/FetchBufferTest.java | 2 +-
.../apache/kafka/clients/consumer/internals/FetchCollectorTest.java | 2 +-
.../kafka/clients/consumer/internals/FetchRequestManagerTest.java | 2 +-
.../java/org/apache/kafka/clients/consumer/internals/FetcherTest.java | 2 +-
.../kafka/clients/consumer/internals/ShareCompletedFetchTest.java | 2 +-
.../clients/consumer/internals/ShareConsumeRequestManagerTest.java | 2 +-
.../apache/kafka/clients/consumer/internals/ShareFetchBufferTest.java | 2 +-
.../kafka/clients/consumer/internals/ShareFetchCollectorTest.java | 2 +-
.../java/org/apache/kafka/common/compress/GzipCompressionTest.java | 2 +-
.../java/org/apache/kafka/common/compress/Lz4CompressionTest.java | 4 ++--
.../test/java/org/apache/kafka/common/compress/NoCompressionTest.java | 2 +-
.../java/org/apache/kafka/common/compress/SnappyCompressionTest.java | 2 +-
.../java/org/apache/kafka/common/compress/ZstdCompressionTest.java | 2 +-
.../org/apache/kafka/common/record/internal/BufferSupplierTest.java | 2 +-
.../apache/kafka/common/record/internal/DefaultRecordBatchTest.java | 4 ++--
.../apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java | 2 +-
.../org/apache/kafka/common/record/internal/MemoryRecordsTest.java | 2 +-
.../java/org/apache/kafka/common/utils/ByteBufferUnmapperTest.java | 1 +
.../java/org/apache/kafka/common/utils/ChunkedBytesStreamTest.java | 3 +++
.../apache/kafka/coordinator/common/runtime/CoordinatorRuntime.java | 2 +-
core/src/main/scala/kafka/server/DynamicBrokerConfig.scala | 3 ++-
.../test/scala/integration/kafka/server/RaftClusterSnapshotTest.scala | 2 +-
core/src/test/scala/kafka/server/KafkaRequestHandlerTest.scala | 3 ++-
gradle/spotbugs-exclude.xml | 4 ++--
.../java/org/apache/kafka/coordinator/group/GroupCoordinator.java | 2 +-
.../org/apache/kafka/coordinator/group/GroupCoordinatorService.java | 2 +-
.../apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java | 2 +-
.../src/test/java/org/apache/kafka/controller/MockRaftClient.java | 2 +-
raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java | 2 +-
.../apache/kafka/raft/internals/KRaftControlRecordStateMachine.java | 2 +-
.../main/java/org/apache/kafka/raft/internals/RecordsBatchReader.java | 2 +-
.../main/java/org/apache/kafka/raft/internals/RecordsIterator.java | 2 +-
.../main/java/org/apache/kafka/snapshot/RecordsSnapshotReader.java | 2 +-
raft/src/main/java/org/apache/kafka/snapshot/Snapshots.java | 2 +-
.../test/java/org/apache/kafka/raft/KafkaRaftClientAutoJoinTest.java | 2 +-
.../test/java/org/apache/kafka/raft/KafkaRaftClientReconfigTest.java | 2 +-
raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java | 2 +-
.../kafka/raft/internals/KRaftControlRecordStateMachineTest.java | 2 +-
.../java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java | 2 +-
.../java/org/apache/kafka/raft/internals/RecordsIteratorTest.java | 2 +-
raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java | 2 +-
.../java/org/apache/kafka/snapshot/RecordsSnapshotWriterTest.java | 2 +-
.../test/java/org/apache/kafka/snapshot/SnapshotWriterReaderTest.java | 4 ++--
.../src/main/java/org/apache/kafka/server/common/RequestLocal.java | 2 +-
.../org/apache/kafka/server/log/remote/storage/RemoteLogManager.java | 2 +-
.../java/org/apache/kafka/storage/internals/log/AbstractIndex.java | 2 +-
.../src/main/java/org/apache/kafka/storage/internals/log/Cleaner.java | 2 +-
.../main/java/org/apache/kafka/storage/internals/log/LogSegment.java | 2 +-
.../java/org/apache/kafka/storage/internals/log/LogValidator.java | 2 +-
.../java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java | 2 +-
73 files changed, 85 insertions(+), 79 deletions(-)
diff --git
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java
index 0f552b8426c..9b3e0a70ab5 100644
---
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java
+++
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/AbstractFetch.java
@@ -34,11 +34,11 @@ import org.apache.kafka.common.protocol.ApiKeys;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.requests.FetchRequest;
import org.apache.kafka.common.requests.FetchResponse;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Timer;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.slf4j.Logger;
import org.slf4j.helpers.MessageFormatter;
diff --git
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java
index 7eae356e8a5..3979cdf4a93 100644
---
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java
+++
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/CompletedFetch.java
@@ -34,7 +34,7 @@ import org.apache.kafka.common.record.internal.RecordBatch;
import org.apache.kafka.common.requests.FetchRequest;
import org.apache.kafka.common.requests.FetchResponse;
import org.apache.kafka.common.serialization.Deserializer;
-import org.apache.kafka.common.utils.BufferSupplier;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.CloseableIterator;
import org.slf4j.Logger;
diff --git
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java
index f7fe9901b8e..57a2738e88b 100644
---
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java
+++
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetch.java
@@ -33,8 +33,8 @@ import org.apache.kafka.common.record.internal.RecordBatch;
import org.apache.kafka.common.requests.ShareFetchRequest;
import org.apache.kafka.common.requests.ShareFetchResponse;
import org.apache.kafka.common.serialization.Deserializer;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.CloseableIterator;
import org.slf4j.Logger;
diff --git
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java
index 104199a9d3b..49f83fbef98 100644
---
a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java
+++
b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java
@@ -40,10 +40,10 @@ import
org.apache.kafka.common.requests.ShareAcknowledgeRequest;
import org.apache.kafka.common.requests.ShareAcknowledgeResponse;
import org.apache.kafka.common.requests.ShareFetchRequest;
import org.apache.kafka.common.requests.ShareFetchResponse;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.slf4j.Logger;
diff --git
a/clients/src/main/java/org/apache/kafka/common/compress/Compression.java
b/clients/src/main/java/org/apache/kafka/common/compress/Compression.java
index ef5abf7ff96..c6a3fc0d433 100644
--- a/clients/src/main/java/org/apache/kafka/common/compress/Compression.java
+++ b/clients/src/main/java/org/apache/kafka/common/compress/Compression.java
@@ -17,8 +17,8 @@
package org.apache.kafka.common.compress;
import org.apache.kafka.common.record.internal.CompressionType;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import java.io.InputStream;
import java.io.OutputStream;
diff --git
a/clients/src/main/java/org/apache/kafka/common/compress/GzipCompression.java
b/clients/src/main/java/org/apache/kafka/common/compress/GzipCompression.java
index cee5fa05d13..307600d7f14 100644
---
a/clients/src/main/java/org/apache/kafka/common/compress/GzipCompression.java
+++
b/clients/src/main/java/org/apache/kafka/common/compress/GzipCompression.java
@@ -18,10 +18,10 @@ package org.apache.kafka.common.compress;
import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.record.internal.CompressionType;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferInputStream;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
-import org.apache.kafka.common.utils.ChunkedBytesStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ChunkedBytesStream;
import java.io.BufferedOutputStream;
import java.io.InputStream;
diff --git
a/clients/src/main/java/org/apache/kafka/common/compress/Lz4BlockInputStream.java
b/clients/src/main/java/org/apache/kafka/common/compress/Lz4BlockInputStream.java
index f212ed7873a..27ca3c589b1 100644
---
a/clients/src/main/java/org/apache/kafka/common/compress/Lz4BlockInputStream.java
+++
b/clients/src/main/java/org/apache/kafka/common/compress/Lz4BlockInputStream.java
@@ -18,7 +18,7 @@ package org.apache.kafka.common.compress;
import org.apache.kafka.common.compress.Lz4BlockOutputStream.BD;
import org.apache.kafka.common.compress.Lz4BlockOutputStream.FLG;
-import org.apache.kafka.common.utils.BufferSupplier;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import net.jpountz.lz4.LZ4Compressor;
import net.jpountz.lz4.LZ4Exception;
diff --git
a/clients/src/main/java/org/apache/kafka/common/compress/Lz4Compression.java
b/clients/src/main/java/org/apache/kafka/common/compress/Lz4Compression.java
index 72f5e999a42..1dde05a473a 100644
--- a/clients/src/main/java/org/apache/kafka/common/compress/Lz4Compression.java
+++ b/clients/src/main/java/org/apache/kafka/common/compress/Lz4Compression.java
@@ -19,9 +19,9 @@ package org.apache.kafka.common.compress;
import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.record.internal.CompressionType;
import org.apache.kafka.common.record.internal.RecordBatch;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
-import org.apache.kafka.common.utils.ChunkedBytesStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ChunkedBytesStream;
import java.io.InputStream;
import java.io.OutputStream;
diff --git
a/clients/src/main/java/org/apache/kafka/common/compress/NoCompression.java
b/clients/src/main/java/org/apache/kafka/common/compress/NoCompression.java
index fa8cf575f54..866cc931c43 100644
--- a/clients/src/main/java/org/apache/kafka/common/compress/NoCompression.java
+++ b/clients/src/main/java/org/apache/kafka/common/compress/NoCompression.java
@@ -17,9 +17,9 @@
package org.apache.kafka.common.compress;
import org.apache.kafka.common.record.internal.CompressionType;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferInputStream;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import java.io.InputStream;
import java.io.OutputStream;
diff --git
a/clients/src/main/java/org/apache/kafka/common/compress/SnappyCompression.java
b/clients/src/main/java/org/apache/kafka/common/compress/SnappyCompression.java
index 052e3deb4ec..23d08d5de4c 100644
---
a/clients/src/main/java/org/apache/kafka/common/compress/SnappyCompression.java
+++
b/clients/src/main/java/org/apache/kafka/common/compress/SnappyCompression.java
@@ -19,10 +19,10 @@ package org.apache.kafka.common.compress;
import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.record.internal.CompressionType;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferInputStream;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
-import org.apache.kafka.common.utils.ChunkedBytesStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ChunkedBytesStream;
import org.xerial.snappy.SnappyInputStream;
import org.xerial.snappy.SnappyOutputStream;
diff --git
a/clients/src/main/java/org/apache/kafka/common/compress/ZstdCompression.java
b/clients/src/main/java/org/apache/kafka/common/compress/ZstdCompression.java
index 29b2d96ab5e..c5456b65799 100644
---
a/clients/src/main/java/org/apache/kafka/common/compress/ZstdCompression.java
+++
b/clients/src/main/java/org/apache/kafka/common/compress/ZstdCompression.java
@@ -19,10 +19,10 @@ package org.apache.kafka.common.compress;
import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.record.internal.CompressionType;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferInputStream;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
-import org.apache.kafka.common.utils.ChunkedBytesStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ChunkedBytesStream;
import com.github.luben.zstd.BufferPool;
import com.github.luben.zstd.RecyclingBufferPool;
diff --git
a/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java
b/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java
index a52f19469a1..cc1c8bd8074 100644
---
a/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java
+++
b/clients/src/main/java/org/apache/kafka/common/network/SslTransportLayer.java
@@ -18,9 +18,9 @@ package org.apache.kafka.common.network;
import org.apache.kafka.common.errors.SslAuthenticationException;
import org.apache.kafka.common.security.auth.KafkaPrincipal;
-import org.apache.kafka.common.utils.ByteBufferUnmapper;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ByteBufferUnmapper;
import org.apache.kafka.common.utils.internals.ByteUtils;
import org.slf4j.Logger;
diff --git
a/clients/src/main/java/org/apache/kafka/common/record/internal/AbstractLegacyRecordBatch.java
b/clients/src/main/java/org/apache/kafka/common/record/internal/AbstractLegacyRecordBatch.java
index 13cb169bcc1..692df3df564 100644
---
a/clients/src/main/java/org/apache/kafka/common/record/internal/AbstractLegacyRecordBatch.java
+++
b/clients/src/main/java/org/apache/kafka/common/record/internal/AbstractLegacyRecordBatch.java
@@ -22,10 +22,10 @@ import org.apache.kafka.common.compress.Compression;
import org.apache.kafka.common.errors.CorruptRecordException;
import org.apache.kafka.common.header.Header;
import org.apache.kafka.common.record.TimestampType;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.Utils;
import org.apache.kafka.common.utils.internals.AbstractIterator;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.ByteUtils;
import org.apache.kafka.common.utils.internals.CloseableIterator;
diff --git
a/clients/src/main/java/org/apache/kafka/common/record/internal/DefaultRecordBatch.java
b/clients/src/main/java/org/apache/kafka/common/record/internal/DefaultRecordBatch.java
index 42b8d605dfe..9935514b935 100644
---
a/clients/src/main/java/org/apache/kafka/common/record/internal/DefaultRecordBatch.java
+++
b/clients/src/main/java/org/apache/kafka/common/record/internal/DefaultRecordBatch.java
@@ -22,8 +22,8 @@ import org.apache.kafka.common.compress.Compression;
import org.apache.kafka.common.errors.CorruptRecordException;
import org.apache.kafka.common.header.Header;
import org.apache.kafka.common.record.TimestampType;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.ByteUtils;
import org.apache.kafka.common.utils.internals.CloseableIterator;
import org.apache.kafka.common.utils.internals.Crc32C;
diff --git
a/clients/src/main/java/org/apache/kafka/common/record/internal/FileLogInputStream.java
b/clients/src/main/java/org/apache/kafka/common/record/internal/FileLogInputStream.java
index 493607f1837..1b038e18325 100644
---
a/clients/src/main/java/org/apache/kafka/common/record/internal/FileLogInputStream.java
+++
b/clients/src/main/java/org/apache/kafka/common/record/internal/FileLogInputStream.java
@@ -21,8 +21,8 @@ import org.apache.kafka.common.errors.CorruptRecordException;
import org.apache.kafka.common.record.TimestampType;
import
org.apache.kafka.common.record.internal.AbstractLegacyRecordBatch.LegacyFileChannelRecordBatch;
import
org.apache.kafka.common.record.internal.DefaultRecordBatch.DefaultFileChannelRecordBatch;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.CloseableIterator;
import java.io.IOException;
diff --git
a/clients/src/main/java/org/apache/kafka/common/record/internal/MemoryRecords.java
b/clients/src/main/java/org/apache/kafka/common/record/internal/MemoryRecords.java
index 3a6ee63bb4d..7c7f23ee06b 100644
---
a/clients/src/main/java/org/apache/kafka/common/record/internal/MemoryRecords.java
+++
b/clients/src/main/java/org/apache/kafka/common/record/internal/MemoryRecords.java
@@ -27,10 +27,10 @@ import org.apache.kafka.common.network.TransferableChannel;
import org.apache.kafka.common.record.TimestampType;
import
org.apache.kafka.common.record.internal.MemoryRecords.RecordFilter.BatchRetention;
import
org.apache.kafka.common.record.internal.MemoryRecords.RecordFilter.BatchRetentionResult;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.Utils;
import org.apache.kafka.common.utils.internals.AbstractIterator;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.CloseableIterator;
import java.io.IOException;
diff --git
a/clients/src/main/java/org/apache/kafka/common/record/internal/MutableRecordBatch.java
b/clients/src/main/java/org/apache/kafka/common/record/internal/MutableRecordBatch.java
index cdb0ed22efd..5f14f8b2ad8 100644
---
a/clients/src/main/java/org/apache/kafka/common/record/internal/MutableRecordBatch.java
+++
b/clients/src/main/java/org/apache/kafka/common/record/internal/MutableRecordBatch.java
@@ -17,8 +17,8 @@
package org.apache.kafka.common.record.internal;
import org.apache.kafka.common.record.TimestampType;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.CloseableIterator;
/**
diff --git
a/clients/src/main/java/org/apache/kafka/common/record/internal/RecordBatch.java
b/clients/src/main/java/org/apache/kafka/common/record/internal/RecordBatch.java
index 96e83270259..16bf94133cf 100644
---
a/clients/src/main/java/org/apache/kafka/common/record/internal/RecordBatch.java
+++
b/clients/src/main/java/org/apache/kafka/common/record/internal/RecordBatch.java
@@ -17,7 +17,7 @@
package org.apache.kafka.common.record.internal;
import org.apache.kafka.common.record.TimestampType;
-import org.apache.kafka.common.utils.BufferSupplier;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.CloseableIterator;
import java.nio.ByteBuffer;
diff --git
a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryUtils.java
b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryUtils.java
index cafa1bcf402..d56b4c74aab 100644
---
a/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryUtils.java
+++
b/clients/src/main/java/org/apache/kafka/common/telemetry/internals/ClientTelemetryUtils.java
@@ -23,8 +23,8 @@ import org.apache.kafka.common.metrics.MetricsContext;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.record.internal.CompressionType;
import org.apache.kafka.common.record.internal.RecordBatch;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/clients/src/main/java/org/apache/kafka/common/utils/BufferSupplier.java
b/clients/src/main/java/org/apache/kafka/common/utils/internals/BufferSupplier.java
similarity index 98%
rename from
clients/src/main/java/org/apache/kafka/common/utils/BufferSupplier.java
rename to
clients/src/main/java/org/apache/kafka/common/utils/internals/BufferSupplier.java
index 55869333bd8..85ef3be9eed 100644
--- a/clients/src/main/java/org/apache/kafka/common/utils/BufferSupplier.java
+++
b/clients/src/main/java/org/apache/kafka/common/utils/internals/BufferSupplier.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.common.utils;
+package org.apache.kafka.common.utils.internals;
import java.nio.ByteBuffer;
import java.util.ArrayDeque;
diff --git
a/clients/src/main/java/org/apache/kafka/common/utils/ByteBufferUnmapper.java
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ByteBufferUnmapper.java
similarity index 98%
rename from
clients/src/main/java/org/apache/kafka/common/utils/ByteBufferUnmapper.java
rename to
clients/src/main/java/org/apache/kafka/common/utils/internals/ByteBufferUnmapper.java
index ba51a8dd491..da45438e590 100644
---
a/clients/src/main/java/org/apache/kafka/common/utils/ByteBufferUnmapper.java
+++
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ByteBufferUnmapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.common.utils;
+package org.apache.kafka.common.utils.internals;
import java.io.IOException;
import java.lang.invoke.MethodHandle;
diff --git
a/clients/src/main/java/org/apache/kafka/common/utils/ChunkedBytesStream.java
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ChunkedBytesStream.java
similarity index 99%
rename from
clients/src/main/java/org/apache/kafka/common/utils/ChunkedBytesStream.java
rename to
clients/src/main/java/org/apache/kafka/common/utils/internals/ChunkedBytesStream.java
index ec600ad3b59..c3537d27a22 100644
---
a/clients/src/main/java/org/apache/kafka/common/utils/ChunkedBytesStream.java
+++
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ChunkedBytesStream.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.common.utils;
+package org.apache.kafka.common.utils.internals;
import java.io.BufferedInputStream;
import java.io.FilterInputStream;
diff --git
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CompletedFetchTest.java
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CompletedFetchTest.java
index 0fbb3bd590b..6795bc30185 100644
---
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CompletedFetchTest.java
+++
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/CompletedFetchTest.java
@@ -37,11 +37,11 @@ import org.apache.kafka.common.record.internal.SimpleRecord;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.apache.kafka.common.serialization.UUIDDeserializer;
import org.apache.kafka.common.serialization.UUIDSerializer;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchBufferTest.java
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchBufferTest.java
index 5b2f6d6f48e..612e9ec29a9 100644
---
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchBufferTest.java
+++
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchBufferTest.java
@@ -21,11 +21,11 @@ import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.message.FetchResponseData;
import org.apache.kafka.common.metrics.Metrics;
import org.apache.kafka.common.serialization.StringSerializer;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Timer;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchCollectorTest.java
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchCollectorTest.java
index 1f4e728794f..c6091161843 100644
---
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchCollectorTest.java
+++
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchCollectorTest.java
@@ -37,10 +37,10 @@ import org.apache.kafka.common.record.internal.Records;
import org.apache.kafka.common.record.internal.SimpleRecord;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.apache.kafka.common.serialization.StringSerializer;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
diff --git
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java
index e6efb4ab740..6212a720c1f 100644
---
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java
+++
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetchRequestManagerTest.java
@@ -78,13 +78,13 @@ import
org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.kafka.common.serialization.BytesDeserializer;
import org.apache.kafka.common.serialization.Deserializer;
import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Timer;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.test.DelayedReceive;
import org.apache.kafka.test.MockSelector;
import org.apache.kafka.test.TestUtils;
diff --git
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java
index a77101e519c..8a102057a56 100644
---
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java
+++
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/FetcherTest.java
@@ -77,12 +77,12 @@ import
org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.kafka.common.serialization.BytesDeserializer;
import org.apache.kafka.common.serialization.Deserializer;
import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Timer;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.test.DelayedReceive;
import org.apache.kafka.test.MockSelector;
import org.apache.kafka.test.TestUtils;
diff --git
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetchTest.java
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetchTest.java
index 8e97f0c5eee..f0dfc7e5b5f 100644
---
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetchTest.java
+++
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareCompletedFetchTest.java
@@ -40,11 +40,11 @@ import org.apache.kafka.common.record.internal.SimpleRecord;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.apache.kafka.common.serialization.UUIDDeserializer;
import org.apache.kafka.common.serialization.UUIDSerializer;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManagerTest.java
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManagerTest.java
index bdad2512e18..85cc39738a2 100644
---
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManagerTest.java
+++
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManagerTest.java
@@ -70,12 +70,12 @@ import org.apache.kafka.common.requests.ShareFetchResponse;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.kafka.common.serialization.Deserializer;
import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Timer;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchBufferTest.java
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchBufferTest.java
index d6e1a38a2a7..b8be2d3240c 100644
---
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchBufferTest.java
+++
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchBufferTest.java
@@ -23,11 +23,11 @@ import
org.apache.kafka.common.message.ShareFetchResponseData;
import org.apache.kafka.common.metrics.Metrics;
import org.apache.kafka.common.protocol.ApiKeys;
import org.apache.kafka.common.serialization.StringSerializer;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Timer;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollectorTest.java
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollectorTest.java
index 492a8b857a1..e082b48fbf2 100644
---
a/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollectorTest.java
+++
b/clients/src/test/java/org/apache/kafka/clients/consumer/internals/ShareFetchCollectorTest.java
@@ -36,9 +36,9 @@ import
org.apache.kafka.common.record.internal.MemoryRecordsBuilder;
import org.apache.kafka.common.record.internal.Records;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.apache.kafka.common.serialization.StringSerializer;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
diff --git
a/clients/src/test/java/org/apache/kafka/common/compress/GzipCompressionTest.java
b/clients/src/test/java/org/apache/kafka/common/compress/GzipCompressionTest.java
index d96daf69477..dce5bd3c0f7 100644
---
a/clients/src/test/java/org/apache/kafka/common/compress/GzipCompressionTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/compress/GzipCompressionTest.java
@@ -19,8 +19,8 @@ package org.apache.kafka.common.compress;
import org.apache.kafka.common.config.ConfigDef;
import org.apache.kafka.common.config.ConfigException;
import org.apache.kafka.common.record.internal.RecordBatch;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/common/compress/Lz4CompressionTest.java
b/clients/src/test/java/org/apache/kafka/common/compress/Lz4CompressionTest.java
index ce33ca60bc5..b621e23b7ee 100644
---
a/clients/src/test/java/org/apache/kafka/common/compress/Lz4CompressionTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/compress/Lz4CompressionTest.java
@@ -17,9 +17,9 @@
package org.apache.kafka.common.compress;
import org.apache.kafka.common.record.internal.RecordBatch;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
-import org.apache.kafka.common.utils.ChunkedBytesStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ChunkedBytesStream;
import net.jpountz.xxhash.XXHashFactory;
diff --git
a/clients/src/test/java/org/apache/kafka/common/compress/NoCompressionTest.java
b/clients/src/test/java/org/apache/kafka/common/compress/NoCompressionTest.java
index 7faae4aa3ab..fcd3a8cb059 100644
---
a/clients/src/test/java/org/apache/kafka/common/compress/NoCompressionTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/compress/NoCompressionTest.java
@@ -17,8 +17,8 @@
package org.apache.kafka.common.compress;
import org.apache.kafka.common.record.internal.RecordBatch;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/common/compress/SnappyCompressionTest.java
b/clients/src/test/java/org/apache/kafka/common/compress/SnappyCompressionTest.java
index 65f6681f8eb..9dc7c500682 100644
---
a/clients/src/test/java/org/apache/kafka/common/compress/SnappyCompressionTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/compress/SnappyCompressionTest.java
@@ -17,8 +17,8 @@
package org.apache.kafka.common.compress;
import org.apache.kafka.common.record.internal.RecordBatch;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/common/compress/ZstdCompressionTest.java
b/clients/src/test/java/org/apache/kafka/common/compress/ZstdCompressionTest.java
index 7a664fec0bd..9a6535144ad 100644
---
a/clients/src/test/java/org/apache/kafka/common/compress/ZstdCompressionTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/compress/ZstdCompressionTest.java
@@ -17,8 +17,8 @@
package org.apache.kafka.common.compress;
import org.apache.kafka.common.record.internal.RecordBatch;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/common/record/internal/BufferSupplierTest.java
b/clients/src/test/java/org/apache/kafka/common/record/internal/BufferSupplierTest.java
index 5dbca82a30f..71e3c3d7856 100644
---
a/clients/src/test/java/org/apache/kafka/common/record/internal/BufferSupplierTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/record/internal/BufferSupplierTest.java
@@ -17,7 +17,7 @@
package org.apache.kafka.common.record.internal;
-import org.apache.kafka.common.utils.BufferSupplier;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java
b/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java
index d960a4b8261..f48168a26a7 100644
---
a/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordBatchTest.java
@@ -23,9 +23,9 @@ import org.apache.kafka.common.errors.CorruptRecordException;
import org.apache.kafka.common.header.Header;
import org.apache.kafka.common.header.internals.RecordHeader;
import org.apache.kafka.common.record.TimestampType;
-import org.apache.kafka.common.utils.BufferSupplier;
-import org.apache.kafka.common.utils.ChunkedBytesStream;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ChunkedBytesStream;
import org.apache.kafka.common.utils.internals.CloseableIterator;
import org.apache.kafka.test.TestUtils;
diff --git
a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java
b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java
index 8e6e503dd4d..0f8131ab1b2 100644
---
a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java
@@ -20,9 +20,9 @@ import org.apache.kafka.common.compress.Compression;
import org.apache.kafka.common.message.LeaderChangeMessage;
import org.apache.kafka.common.message.LeaderChangeMessage.Voter;
import org.apache.kafka.common.record.TimestampType;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.CloseableIterator;
import org.apache.kafka.test.TestUtils;
diff --git
a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java
b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java
index c5228b17acf..83b174cccd6 100644
---
a/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/record/internal/MemoryRecordsTest.java
@@ -24,8 +24,8 @@ import
org.apache.kafka.common.message.LeaderChangeMessage.Voter;
import org.apache.kafka.common.record.TimestampType;
import org.apache.kafka.common.record.internal.MemoryRecords.RecordFilter;
import
org.apache.kafka.common.record.internal.MemoryRecords.RecordFilter.BatchRetention;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.CloseableIterator;
import org.apache.kafka.test.TestUtils;
diff --git
a/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferUnmapperTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferUnmapperTest.java
index 6488941029e..05e5ad963b2 100644
---
a/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferUnmapperTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferUnmapperTest.java
@@ -17,6 +17,7 @@
package org.apache.kafka.common.utils;
+import org.apache.kafka.common.utils.internals.ByteBufferUnmapper;
import org.apache.kafka.test.TestUtils;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/common/utils/ChunkedBytesStreamTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/ChunkedBytesStreamTest.java
index 2b230455b22..e7703592471 100644
---
a/clients/src/test/java/org/apache/kafka/common/utils/ChunkedBytesStreamTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/utils/ChunkedBytesStreamTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.kafka.common.utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ChunkedBytesStream;
+
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
diff --git
a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntime.java
b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntime.java
index cf55ffbbd29..eab9c5f1a64 100644
---
a/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntime.java
+++
b/coordinator-common/src/main/java/org/apache/kafka/coordinator/common/runtime/CoordinatorRuntime.java
@@ -33,10 +33,10 @@ import
org.apache.kafka.common.record.internal.MemoryRecordsBuilder;
import org.apache.kafka.common.record.internal.RecordBatch;
import org.apache.kafka.common.record.internal.SimpleRecord;
import org.apache.kafka.common.requests.TransactionResult;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.deferred.DeferredEvent;
import org.apache.kafka.deferred.DeferredEventQueue;
import org.apache.kafka.server.common.TransactionVersion;
diff --git a/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala
b/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala
index a6ca3497cc8..11c19dc8715 100755
--- a/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala
+++ b/core/src/main/scala/kafka/server/DynamicBrokerConfig.scala
@@ -33,7 +33,8 @@ import org.apache.kafka.common.metrics.{Metrics,
MetricsReporter}
import org.apache.kafka.common.network.{ListenerName, ListenerReconfigurable}
import org.apache.kafka.common.security.authenticator.LoginManager
import org.apache.kafka.common.utils.LogContext
-import org.apache.kafka.common.utils.{BufferSupplier, ConfigUtils, Utils}
+import org.apache.kafka.common.utils.internals.BufferSupplier
+import org.apache.kafka.common.utils.{ConfigUtils, Utils}
import org.apache.kafka.config
import org.apache.kafka.network.SocketServer
import org.apache.kafka.raft.KafkaRaftClient
diff --git
a/core/src/test/scala/integration/kafka/server/RaftClusterSnapshotTest.scala
b/core/src/test/scala/integration/kafka/server/RaftClusterSnapshotTest.scala
index a9c902f89c2..19d49f070d6 100644
--- a/core/src/test/scala/integration/kafka/server/RaftClusterSnapshotTest.scala
+++ b/core/src/test/scala/integration/kafka/server/RaftClusterSnapshotTest.scala
@@ -19,8 +19,8 @@ package kafka.server
import kafka.utils.TestUtils
import org.apache.kafka.common.test.{KafkaClusterTestKit, TestKitNodes}
-import org.apache.kafka.common.utils.BufferSupplier
import org.apache.kafka.common.utils.LogContext
+import org.apache.kafka.common.utils.internals.BufferSupplier
import org.apache.kafka.metadata.MetadataRecordSerde
import org.apache.kafka.raft.MetadataLogConfig
import org.apache.kafka.snapshot.RecordsSnapshotReader
diff --git a/core/src/test/scala/kafka/server/KafkaRequestHandlerTest.scala
b/core/src/test/scala/kafka/server/KafkaRequestHandlerTest.scala
index c6eba176828..6a2d7dde6c4 100644
--- a/core/src/test/scala/kafka/server/KafkaRequestHandlerTest.scala
+++ b/core/src/test/scala/kafka/server/KafkaRequestHandlerTest.scala
@@ -24,7 +24,8 @@ import org.apache.kafka.common.network.{ClientInformation,
ListenerName}
import org.apache.kafka.common.protocol.ApiKeys
import org.apache.kafka.common.requests.{RequestContext, RequestHeader}
import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol}
-import org.apache.kafka.common.utils.{BufferSupplier, MockTime, Time}
+import org.apache.kafka.common.utils.internals.BufferSupplier
+import org.apache.kafka.common.utils.{MockTime, Time}
import org.apache.kafka.network.metrics.RequestChannelMetrics
import org.apache.kafka.server.common.RequestLocal
import org.apache.kafka.server.log.remote.storage.RemoteStorageMetrics
diff --git a/gradle/spotbugs-exclude.xml b/gradle/spotbugs-exclude.xml
index 664777decf6..a3fa66e3c79 100644
--- a/gradle/spotbugs-exclude.xml
+++ b/gradle/spotbugs-exclude.xml
@@ -497,7 +497,7 @@ For a detailed description of spotbugs bug categories, see
https://spotbugs.read
<Class
name="org.apache.kafka.clients.consumer.internals.CompletedFetch"/>
<Class name="org.apache.kafka.clients.producer.MockProducer"/>
<Class
name="org.apache.kafka.clients.producer.internals.ProducerBatch"/>
- <Class name="org.apache.kafka.common.utils.ChunkedBytesStream"/>
+ <Class
name="org.apache.kafka.common.utils.internals.ChunkedBytesStream"/>
<Class
name="org.apache.kafka.common.security.authenticator.LoginManager"/>
<Class
name="org.apache.kafka.storage.internals.log.AbstractIndex"/>
<Class name="org.apache.kafka.server.AssignmentsManager"/>
@@ -588,7 +588,7 @@ For a detailed description of spotbugs bug categories, see
https://spotbugs.read
<Class
name="org.apache.kafka.common.security.kerberos.KerberosLogin"/>
<Class
name="org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallbackHandler"/>
<Class
name="org.apache.kafka.common.security.oauthbearer.internals.secured.RefreshingHttpsJwks"/>
- <Class name="org.apache.kafka.common.utils.ChunkedBytesStream"/>
+ <Class
name="org.apache.kafka.common.utils.internals.ChunkedBytesStream"/>
<Class name="org.apache.kafka.common.utils.Shell"/>
<Class
name="org.apache.kafka.clients.producer.internals.TransactionManager$TxnRequestHandler"/>
<Class
name="org.apache.kafka.server.log.remote.metadata.storage.ConsumerTask"/>
diff --git
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinator.java
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinator.java
index b07669ca727..da82e775761 100644
---
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinator.java
+++
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinator.java
@@ -52,7 +52,7 @@ import org.apache.kafka.common.message.SyncGroupResponseData;
import org.apache.kafka.common.message.TxnOffsetCommitRequestData;
import org.apache.kafka.common.message.TxnOffsetCommitResponseData;
import org.apache.kafka.common.requests.TransactionResult;
-import org.apache.kafka.common.utils.BufferSupplier;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.coordinator.group.streams.StreamsGroupHeartbeatResult;
import org.apache.kafka.image.MetadataDelta;
import org.apache.kafka.image.MetadataImage;
diff --git
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java
index 2081d5bd5f4..7bcff80722c 100644
---
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java
+++
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java
@@ -79,10 +79,10 @@ import
org.apache.kafka.common.requests.ShareGroupHeartbeatRequest;
import org.apache.kafka.common.requests.StreamsGroupDescribeRequest;
import org.apache.kafka.common.requests.TransactionResult;
import org.apache.kafka.common.requests.TxnOffsetCommitRequest;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import
org.apache.kafka.coordinator.common.runtime.CoordinatorBackgroundThreadPoolExecutor;
import org.apache.kafka.coordinator.common.runtime.CoordinatorEventProcessor;
import org.apache.kafka.coordinator.common.runtime.CoordinatorLoader;
diff --git
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java
index 1df3cbb096b..b879f8ff152 100644
---
a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java
+++
b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java
@@ -86,9 +86,9 @@ import org.apache.kafka.common.requests.RequestHeader;
import org.apache.kafka.common.requests.TransactionResult;
import org.apache.kafka.common.security.auth.KafkaPrincipal;
import org.apache.kafka.common.security.auth.SecurityProtocol;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord;
import org.apache.kafka.coordinator.common.runtime.CoordinatorRuntime;
import org.apache.kafka.coordinator.common.runtime.MetadataImageBuilder;
diff --git
a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClient.java
b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClient.java
index 8bf6d9543e7..3606fdbd153 100644
--- a/metadata/src/test/java/org/apache/kafka/controller/MockRaftClient.java
+++ b/metadata/src/test/java/org/apache/kafka/controller/MockRaftClient.java
@@ -20,10 +20,10 @@ package org.apache.kafka.controller;
import org.apache.kafka.common.Node;
import org.apache.kafka.common.network.ListenerName;
import org.apache.kafka.common.protocol.ObjectSerializationCache;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.metadata.MetadataRecordSerde;
import org.apache.kafka.queue.EventQueue;
import org.apache.kafka.queue.KafkaEventQueue;
diff --git a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java
b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java
index 02ae182901f..a3f929629b7 100644
--- a/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java
+++ b/raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java
@@ -63,10 +63,10 @@ import org.apache.kafka.common.requests.FetchRequest;
import org.apache.kafka.common.requests.FetchResponse;
import org.apache.kafka.common.requests.FetchSnapshotRequest;
import org.apache.kafka.common.requests.FetchSnapshotResponse;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Timer;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.raft.errors.NotLeaderException;
import org.apache.kafka.raft.internals.AddVoterHandler;
import org.apache.kafka.raft.internals.BatchAccumulator;
diff --git
a/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java
b/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java
index 724d52ce4fd..b97230867d7 100644
---
a/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java
+++
b/raft/src/main/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachine.java
@@ -18,8 +18,8 @@ package org.apache.kafka.raft.internals;
import org.apache.kafka.common.message.KRaftVersionRecord;
import org.apache.kafka.common.message.VotersRecord;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.raft.Batch;
import org.apache.kafka.raft.ControlRecord;
import org.apache.kafka.raft.ExternalKRaftMetrics;
diff --git
a/raft/src/main/java/org/apache/kafka/raft/internals/RecordsBatchReader.java
b/raft/src/main/java/org/apache/kafka/raft/internals/RecordsBatchReader.java
index 2b53a5469f4..48db8f9aeea 100644
--- a/raft/src/main/java/org/apache/kafka/raft/internals/RecordsBatchReader.java
+++ b/raft/src/main/java/org/apache/kafka/raft/internals/RecordsBatchReader.java
@@ -17,8 +17,8 @@
package org.apache.kafka.raft.internals;
import org.apache.kafka.common.record.internal.Records;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.raft.Batch;
import org.apache.kafka.raft.BatchReader;
import org.apache.kafka.server.common.serialization.RecordSerde;
diff --git
a/raft/src/main/java/org/apache/kafka/raft/internals/RecordsIterator.java
b/raft/src/main/java/org/apache/kafka/raft/internals/RecordsIterator.java
index d18d6742ef6..9ab99971438 100644
--- a/raft/src/main/java/org/apache/kafka/raft/internals/RecordsIterator.java
+++ b/raft/src/main/java/org/apache/kafka/raft/internals/RecordsIterator.java
@@ -22,9 +22,9 @@ import org.apache.kafka.common.record.internal.FileRecords;
import org.apache.kafka.common.record.internal.MemoryRecords;
import org.apache.kafka.common.record.internal.MutableRecordBatch;
import org.apache.kafka.common.record.internal.Records;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.ByteUtils;
import org.apache.kafka.raft.Batch;
import org.apache.kafka.raft.ControlRecord;
diff --git
a/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotReader.java
b/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotReader.java
index 530279fecb6..c08df4e5dcb 100644
--- a/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotReader.java
+++ b/raft/src/main/java/org/apache/kafka/snapshot/RecordsSnapshotReader.java
@@ -19,8 +19,8 @@ package org.apache.kafka.snapshot;
import org.apache.kafka.common.message.SnapshotHeaderRecord;
import org.apache.kafka.common.record.internal.ControlRecordType;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.raft.Batch;
import org.apache.kafka.raft.internals.RecordsIterator;
import org.apache.kafka.server.common.OffsetAndEpoch;
diff --git a/raft/src/main/java/org/apache/kafka/snapshot/Snapshots.java
b/raft/src/main/java/org/apache/kafka/snapshot/Snapshots.java
index 3a78be9c534..113aecc9519 100644
--- a/raft/src/main/java/org/apache/kafka/snapshot/Snapshots.java
+++ b/raft/src/main/java/org/apache/kafka/snapshot/Snapshots.java
@@ -16,9 +16,9 @@
*/
package org.apache.kafka.snapshot;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.raft.KafkaRaftClient;
import org.apache.kafka.raft.internals.IdentitySerde;
import org.apache.kafka.server.common.OffsetAndEpoch;
diff --git
a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientAutoJoinTest.java
b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientAutoJoinTest.java
index 494cb009895..b8a185deec6 100644
--- a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientAutoJoinTest.java
+++ b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientAutoJoinTest.java
@@ -18,7 +18,7 @@ package org.apache.kafka.raft;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.record.internal.MemoryRecords;
-import org.apache.kafka.common.utils.BufferSupplier;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.server.common.KRaftVersion;
import org.junit.jupiter.api.Test;
diff --git
a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientReconfigTest.java
b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientReconfigTest.java
index a63c1f40243..9d00d7fe9f1 100644
--- a/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientReconfigTest.java
+++ b/raft/src/test/java/org/apache/kafka/raft/KafkaRaftClientReconfigTest.java
@@ -40,8 +40,8 @@ import
org.apache.kafka.common.record.internal.MemoryRecordsBuilder;
import org.apache.kafka.common.record.internal.Record;
import org.apache.kafka.common.record.internal.RecordBatch;
import org.apache.kafka.common.record.internal.Records;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.server.common.Feature;
import org.apache.kafka.server.common.KRaftVersion;
import org.apache.kafka.snapshot.RecordsSnapshotReader;
diff --git
a/raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java
b/raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java
index a6d968d7aed..8f1cabcf1b5 100644
--- a/raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java
+++ b/raft/src/test/java/org/apache/kafka/raft/RaftEventSimulationTest.java
@@ -28,10 +28,10 @@ import
org.apache.kafka.common.protocol.ObjectSerializationCache;
import org.apache.kafka.common.protocol.Readable;
import org.apache.kafka.common.protocol.Writable;
import org.apache.kafka.common.protocol.types.Type;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.raft.MockLog.LogBatch;
import org.apache.kafka.raft.MockLog.LogEntry;
import org.apache.kafka.raft.internals.BatchMemoryPool;
diff --git
a/raft/src/test/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachineTest.java
b/raft/src/test/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachineTest.java
index 83d9c0957a5..ed99e893922 100644
---
a/raft/src/test/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachineTest.java
+++
b/raft/src/test/java/org/apache/kafka/raft/internals/KRaftControlRecordStateMachineTest.java
@@ -22,8 +22,8 @@ import org.apache.kafka.common.message.KRaftVersionRecord;
import org.apache.kafka.common.metrics.KafkaMetric;
import org.apache.kafka.common.metrics.Metrics;
import org.apache.kafka.common.record.internal.MemoryRecords;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.raft.ExternalKRaftMetrics;
import org.apache.kafka.raft.MockLog;
import org.apache.kafka.raft.VoterSet;
diff --git
a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java
b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java
index e01db38dc50..ae07e70e28a 100644
---
a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java
+++
b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsBatchReaderTest.java
@@ -22,8 +22,8 @@ import
org.apache.kafka.common.record.internal.ControlRecordType;
import org.apache.kafka.common.record.internal.FileRecords;
import org.apache.kafka.common.record.internal.MemoryRecords;
import org.apache.kafka.common.record.internal.Records;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.raft.BatchReader;
import org.apache.kafka.raft.ControlRecord;
import org.apache.kafka.raft.internals.RecordsIteratorTest.TestBatch;
diff --git
a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java
b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java
index 6dfd3586883..06837a2d19a 100644
---
a/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java
+++
b/raft/src/test/java/org/apache/kafka/raft/internals/RecordsIteratorTest.java
@@ -36,9 +36,9 @@ import org.apache.kafka.common.record.internal.MemoryRecords;
import org.apache.kafka.common.record.internal.MemoryRecordsBuilder;
import org.apache.kafka.common.record.internal.RecordBatch;
import org.apache.kafka.common.record.internal.Records;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.raft.Batch;
import org.apache.kafka.raft.ControlRecord;
import org.apache.kafka.raft.VoterSet;
diff --git
a/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java
b/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java
index 24206678086..73d88d1d09f 100644
--- a/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java
+++ b/raft/src/test/java/org/apache/kafka/snapshot/FileRawSnapshotTest.java
@@ -23,8 +23,8 @@ import org.apache.kafka.common.record.internal.RecordBatch;
import org.apache.kafka.common.record.internal.SimpleRecord;
import org.apache.kafka.common.record.internal.UnalignedFileRecords;
import org.apache.kafka.common.record.internal.UnalignedMemoryRecords;
-import org.apache.kafka.common.utils.BufferSupplier.GrowableBufferSupplier;
import org.apache.kafka.common.utils.Utils;
+import
org.apache.kafka.common.utils.internals.BufferSupplier.GrowableBufferSupplier;
import org.apache.kafka.server.common.OffsetAndEpoch;
import org.apache.kafka.test.TestUtils;
diff --git
a/raft/src/test/java/org/apache/kafka/snapshot/RecordsSnapshotWriterTest.java
b/raft/src/test/java/org/apache/kafka/snapshot/RecordsSnapshotWriterTest.java
index 73499b055bd..030b40b4153 100644
---
a/raft/src/test/java/org/apache/kafka/snapshot/RecordsSnapshotWriterTest.java
+++
b/raft/src/test/java/org/apache/kafka/snapshot/RecordsSnapshotWriterTest.java
@@ -21,9 +21,9 @@ import org.apache.kafka.common.message.KRaftVersionRecord;
import org.apache.kafka.common.message.SnapshotFooterRecord;
import org.apache.kafka.common.message.SnapshotHeaderRecord;
import org.apache.kafka.common.record.internal.ControlRecordType;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.raft.Batch;
import org.apache.kafka.raft.VoterSet;
import org.apache.kafka.raft.VoterSetTest;
diff --git
a/raft/src/test/java/org/apache/kafka/snapshot/SnapshotWriterReaderTest.java
b/raft/src/test/java/org/apache/kafka/snapshot/SnapshotWriterReaderTest.java
index 67c653d52ec..b635d95b575 100644
--- a/raft/src/test/java/org/apache/kafka/snapshot/SnapshotWriterReaderTest.java
+++ b/raft/src/test/java/org/apache/kafka/snapshot/SnapshotWriterReaderTest.java
@@ -21,9 +21,9 @@ import org.apache.kafka.common.message.SnapshotHeaderRecord;
import org.apache.kafka.common.record.internal.ControlRecordUtils;
import org.apache.kafka.common.record.internal.Record;
import org.apache.kafka.common.record.internal.RecordBatch;
-import org.apache.kafka.common.utils.BufferSupplier;
-import org.apache.kafka.common.utils.BufferSupplier.GrowableBufferSupplier;
import org.apache.kafka.common.utils.LogContext;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
+import
org.apache.kafka.common.utils.internals.BufferSupplier.GrowableBufferSupplier;
import org.apache.kafka.raft.Batch;
import org.apache.kafka.raft.ControlRecord;
import org.apache.kafka.raft.RaftClientTestContext;
diff --git
a/server-common/src/main/java/org/apache/kafka/server/common/RequestLocal.java
b/server-common/src/main/java/org/apache/kafka/server/common/RequestLocal.java
index 06f4639b1d0..46a6c1aa0ae 100644
---
a/server-common/src/main/java/org/apache/kafka/server/common/RequestLocal.java
+++
b/server-common/src/main/java/org/apache/kafka/server/common/RequestLocal.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.server.common;
-import org.apache.kafka.common.utils.BufferSupplier;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import java.util.Objects;
diff --git
a/storage/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogManager.java
b/storage/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogManager.java
index 178d0307141..f8943c68e1a 100644
---
a/storage/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogManager.java
+++
b/storage/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteLogManager.java
@@ -37,11 +37,11 @@ import org.apache.kafka.common.record.internal.Record;
import org.apache.kafka.common.record.internal.RecordBatch;
import org.apache.kafka.common.record.internal.RemoteLogInputStream;
import org.apache.kafka.common.requests.FetchRequest;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.ChildFirstClassLoader;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.CloseableIterator;
import org.apache.kafka.common.utils.internals.ThreadUtils;
import org.apache.kafka.server.common.CheckpointFile;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/AbstractIndex.java
b/storage/src/main/java/org/apache/kafka/storage/internals/log/AbstractIndex.java
index 7e7c3e1cc63..e484d88bcac 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/AbstractIndex.java
+++
b/storage/src/main/java/org/apache/kafka/storage/internals/log/AbstractIndex.java
@@ -16,8 +16,8 @@
*/
package org.apache.kafka.storage.internals.log;
-import org.apache.kafka.common.utils.ByteBufferUnmapper;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ByteBufferUnmapper;
import org.apache.kafka.server.util.LockUtils;
import org.slf4j.Logger;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/Cleaner.java
b/storage/src/main/java/org/apache/kafka/storage/internals/log/Cleaner.java
index d2bea0bd52b..9ec1c3e302d 100644
--- a/storage/src/main/java/org/apache/kafka/storage/internals/log/Cleaner.java
+++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/Cleaner.java
@@ -26,9 +26,9 @@ import org.apache.kafka.common.record.internal.MemoryRecords;
import org.apache.kafka.common.record.internal.MutableRecordBatch;
import org.apache.kafka.common.record.internal.Record;
import org.apache.kafka.common.record.internal.RecordBatch;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.CloseableIterator;
import org.apache.kafka.storage.internals.utils.Throttler;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogSegment.java
b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogSegment.java
index d461a705de5..25b7a3fbb54 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogSegment.java
+++
b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogSegment.java
@@ -24,9 +24,9 @@ import org.apache.kafka.common.record.internal.FileRecords;
import org.apache.kafka.common.record.internal.FileRecords.LogOffsetPosition;
import org.apache.kafka.common.record.internal.MemoryRecords;
import org.apache.kafka.common.record.internal.RecordBatch;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.server.metrics.KafkaMetricsGroup;
import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogValidator.java
b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogValidator.java
index 591b778db2b..2f998ed283a 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogValidator.java
+++
b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogValidator.java
@@ -33,8 +33,8 @@ import
org.apache.kafka.common.record.internal.MutableRecordBatch;
import org.apache.kafka.common.record.internal.Record;
import org.apache.kafka.common.record.internal.RecordBatch;
import org.apache.kafka.common.requests.ProduceResponse.RecordError;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.common.utils.internals.CloseableIterator;
import org.apache.kafka.common.utils.internals.PrimitiveRef;
import org.apache.kafka.common.utils.internals.PrimitiveRef.LongRef;
diff --git
a/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java
b/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java
index d3bbe410fec..48953d133a5 100644
---
a/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java
+++
b/storage/src/test/java/org/apache/kafka/storage/internals/log/UnifiedLogTest.java
@@ -53,8 +53,8 @@ import org.apache.kafka.common.record.internal.Records;
import org.apache.kafka.common.record.internal.SimpleRecord;
import org.apache.kafka.common.requests.ListOffsetsRequest;
import org.apache.kafka.common.requests.ListOffsetsResponse;
-import org.apache.kafka.common.utils.BufferSupplier;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.BufferSupplier;
import org.apache.kafka.coordinator.transaction.TransactionLogConfig;
import org.apache.kafka.server.common.RequestLocal;
import org.apache.kafka.server.common.TransactionVersion;
