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 6cd450e6773 MINOR: Move ByteBufferInputStream and
ByteBufferOutputStream to internal package (#22814)
6cd450e6773 is described below
commit 6cd450e6773d0489cb4256b500b5f66525467f23
Author: Eric Chang <[email protected]>
AuthorDate: Mon Jul 13 22:14:37 2026 +0800
MINOR: Move ByteBufferInputStream and ByteBufferOutputStream to internal
package (#22814)
Moves ByteBufferInputStream and ByteBufferOutputStream to the internal
utils package and updates Kafka callers.
Reviewers: Ken Huang <[email protected]>, Chia-Ping Tsai
<[email protected]>
---
.../src/main/java/org/apache/kafka/common/compress/Compression.java | 2 +-
.../main/java/org/apache/kafka/common/compress/GzipCompression.java | 4 ++--
.../main/java/org/apache/kafka/common/compress/Lz4Compression.java | 2 +-
.../src/main/java/org/apache/kafka/common/compress/NoCompression.java | 4 ++--
.../main/java/org/apache/kafka/common/compress/SnappyCompression.java | 4 ++--
.../main/java/org/apache/kafka/common/compress/ZstdCompression.java | 4 ++--
.../kafka/common/record/internal/AbstractLegacyRecordBatch.java | 2 +-
.../org/apache/kafka/common/record/internal/DefaultRecordBatch.java | 2 +-
.../java/org/apache/kafka/common/record/internal/LegacyRecord.java | 2 +-
.../java/org/apache/kafka/common/record/internal/MemoryRecords.java | 2 +-
.../org/apache/kafka/common/record/internal/MemoryRecordsBuilder.java | 2 +-
.../org/apache/kafka/common/record/internal/MutableRecordBatch.java | 2 +-
.../apache/kafka/common/telemetry/internals/ClientTelemetryUtils.java | 2 +-
.../kafka/common/utils/{ => internals}/ByteBufferInputStream.java | 2 +-
.../kafka/common/utils/{ => internals}/ByteBufferOutputStream.java | 2 +-
.../kafka/clients/consumer/internals/FetchRequestManagerTest.java | 2 +-
.../java/org/apache/kafka/clients/consumer/internals/FetcherTest.java | 2 +-
.../clients/consumer/internals/ShareConsumeRequestManagerTest.java | 2 +-
.../java/org/apache/kafka/common/compress/GzipCompressionTest.java | 2 +-
.../java/org/apache/kafka/common/compress/Lz4CompressionTest.java | 2 +-
.../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 +-
.../apache/kafka/common/protocol/DataOutputStreamWritableTest.java | 2 +-
.../org/apache/kafka/common/record/internal/DefaultRecordTest.java | 4 ++--
.../apache/kafka/common/record/internal/MemoryRecordsBuilderTest.java | 2 +-
.../apache/kafka/common/record/internal/SimpleLegacyRecordTest.java | 2 +-
clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java | 1 +
.../kafka/common/utils/{ => internals}/ByteBufferInputStreamTest.java | 2 +-
.../common/utils/{ => internals}/ByteBufferOutputStreamTest.java | 2 +-
.../java/org/apache/kafka/common/utils/internals/ByteUtilsTest.java | 2 --
.../apache/kafka/common/utils/internals/ChunkedBytesStreamTest.java | 2 --
raft/src/main/java/org/apache/kafka/raft/internals/BatchBuilder.java | 2 +-
.../java/org/apache/kafka/snapshot/MockRawSnapshotWriter.java | 2 +-
.../kafka/streams/processor/internals/assignment/AssignmentInfo.java | 2 +-
.../test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java | 2 +-
36 files changed, 39 insertions(+), 42 deletions(-)
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 c6a3fc0d433..598ef795402 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.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
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 307600d7f14..c390540a191 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,9 +18,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.utils.ByteBufferInputStream;
-import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferInputStream;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.ChunkedBytesStream;
import java.io.BufferedOutputStream;
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 1dde05a473a..937a3bddf7e 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,8 +19,8 @@ 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.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.ChunkedBytesStream;
import java.io.InputStream;
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 866cc931c43..3b50ad9eb03 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.ByteBufferInputStream;
-import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferInputStream;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
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 23d08d5de4c..1a0bdc222d8 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,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.utils.ByteBufferInputStream;
-import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferInputStream;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.ChunkedBytesStream;
import org.xerial.snappy.SnappyInputStream;
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 c5456b65799..d8263899233 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,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.utils.ByteBufferInputStream;
-import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferInputStream;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.ChunkedBytesStream;
import com.github.luben.zstd.BufferPool;
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 692df3df564..2083bf16dd9 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.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.ByteBufferOutputStream;
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 9935514b935..b20ed9fdcc0 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.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
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/LegacyRecord.java
b/clients/src/main/java/org/apache/kafka/common/record/internal/LegacyRecord.java
index 9a817b259c1..d72f7d5504c 100644
---
a/clients/src/main/java/org/apache/kafka/common/record/internal/LegacyRecord.java
+++
b/clients/src/main/java/org/apache/kafka/common/record/internal/LegacyRecord.java
@@ -19,8 +19,8 @@ package org.apache.kafka.common.record.internal;
import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.errors.CorruptRecordException;
import org.apache.kafka.common.record.TimestampType;
-import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.ByteUtils;
import org.apache.kafka.common.utils.internals.Checksums;
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 7c7f23ee06b..08caf0859cc 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.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.ByteBufferOutputStream;
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/MemoryRecordsBuilder.java
b/clients/src/main/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilder.java
index 3fd89deaba1..d2e3bfcc2b8 100644
---
a/clients/src/main/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilder.java
+++
b/clients/src/main/java/org/apache/kafka/common/record/internal/MemoryRecordsBuilder.java
@@ -26,8 +26,8 @@ import org.apache.kafka.common.message.SnapshotHeaderRecord;
import org.apache.kafka.common.message.VotersRecord;
import org.apache.kafka.common.protocol.MessageUtil;
import org.apache.kafka.common.record.TimestampType;
-import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import java.io.DataOutputStream;
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 5f14f8b2ad8..6c7c7bf695b 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.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.CloseableIterator;
/**
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 6a4c90f22ce..f2bc10288c1 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
@@ -24,8 +24,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.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/clients/src/main/java/org/apache/kafka/common/utils/ByteBufferInputStream.java
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ByteBufferInputStream.java
similarity index 97%
rename from
clients/src/main/java/org/apache/kafka/common/utils/ByteBufferInputStream.java
rename to
clients/src/main/java/org/apache/kafka/common/utils/internals/ByteBufferInputStream.java
index 475b2d66cee..4bbdeb9c675 100644
---
a/clients/src/main/java/org/apache/kafka/common/utils/ByteBufferInputStream.java
+++
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ByteBufferInputStream.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.IOException;
import java.io.InputStream;
diff --git
a/clients/src/main/java/org/apache/kafka/common/utils/ByteBufferOutputStream.java
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ByteBufferOutputStream.java
similarity index 99%
rename from
clients/src/main/java/org/apache/kafka/common/utils/ByteBufferOutputStream.java
rename to
clients/src/main/java/org/apache/kafka/common/utils/internals/ByteBufferOutputStream.java
index 43e3bba2d19..85172ca5143 100644
---
a/clients/src/main/java/org/apache/kafka/common/utils/ByteBufferOutputStream.java
+++
b/clients/src/main/java/org/apache/kafka/common/utils/internals/ByteBufferOutputStream.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.OutputStream;
import java.nio.ByteBuffer;
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 4767b607417..de5d971ff2d 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,12 +78,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.ByteBufferOutputStream;
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.common.utils.internals.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.LogContext;
import org.apache.kafka.test.DelayedReceive;
import org.apache.kafka.test.MockSelector;
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 9b7820bb8cf..25ec584d1b1 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,11 +77,11 @@ 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.ByteBufferOutputStream;
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.common.utils.internals.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.LogContext;
import org.apache.kafka.test.DelayedReceive;
import org.apache.kafka.test.MockSelector;
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 4530965a35d..7b696a37338 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,11 +70,11 @@ 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.ByteBufferOutputStream;
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.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.LogContext;
import org.junit.jupiter.api.AfterEach;
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 dce5bd3c0f7..d9694465ea8 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.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
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 b621e23b7ee..5fcd54d9391 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,8 +17,8 @@
package org.apache.kafka.common.compress;
import org.apache.kafka.common.record.internal.RecordBatch;
-import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
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 fcd3a8cb059..d8fec3341a8 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.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
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 9dc7c500682..2b14771e80a 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.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
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 9a6535144ad..ef3e7eef081 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.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/common/protocol/DataOutputStreamWritableTest.java
b/clients/src/test/java/org/apache/kafka/common/protocol/DataOutputStreamWritableTest.java
index 3003bbb809b..aeb411e7174 100644
---
a/clients/src/test/java/org/apache/kafka/common/protocol/DataOutputStreamWritableTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/protocol/DataOutputStreamWritableTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.common.protocol;
-import org.apache.kafka.common.utils.ByteBufferOutputStream;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordTest.java
b/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordTest.java
index 4afe2767b04..ea8e15701f5 100644
---
a/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/record/internal/DefaultRecordTest.java
@@ -19,8 +19,8 @@ package org.apache.kafka.common.record.internal;
import org.apache.kafka.common.InvalidRecordException;
import org.apache.kafka.common.header.Header;
import org.apache.kafka.common.header.internals.RecordHeader;
-import org.apache.kafka.common.utils.ByteBufferInputStream;
-import org.apache.kafka.common.utils.ByteBufferOutputStream;
+import org.apache.kafka.common.utils.internals.ByteBufferInputStream;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.ByteUtils;
import org.junit.jupiter.api.Test;
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 0f8131ab1b2..2c7b16f4e29 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.ByteBufferOutputStream;
import org.apache.kafka.common.utils.Utils;
import org.apache.kafka.common.utils.internals.BufferSupplier;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
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/SimpleLegacyRecordTest.java
b/clients/src/test/java/org/apache/kafka/common/record/internal/SimpleLegacyRecordTest.java
index e58417ec245..187a6f6b2bf 100644
---
a/clients/src/test/java/org/apache/kafka/common/record/internal/SimpleLegacyRecordTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/record/internal/SimpleLegacyRecordTest.java
@@ -20,8 +20,8 @@ import org.apache.kafka.common.InvalidRecordException;
import org.apache.kafka.common.compress.Compression;
import org.apache.kafka.common.errors.CorruptRecordException;
import org.apache.kafka.common.record.TimestampType;
-import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.junit.jupiter.api.Test;
diff --git a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java
index 8870e26a259..470d4846ca7 100755
--- a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java
@@ -17,6 +17,7 @@
package org.apache.kafka.common.utils;
import org.apache.kafka.common.config.ConfigException;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.apache.kafka.test.TestUtils;
import org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferInputStreamTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferInputStreamTest.java
similarity index 97%
rename from
clients/src/test/java/org/apache/kafka/common/utils/ByteBufferInputStreamTest.java
rename to
clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferInputStreamTest.java
index 9664bc6aa84..ad2a8a19ad0 100644
---
a/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferInputStreamTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferInputStreamTest.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 org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferOutputStreamTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferOutputStreamTest.java
similarity index 98%
rename from
clients/src/test/java/org/apache/kafka/common/utils/ByteBufferOutputStreamTest.java
rename to
clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferOutputStreamTest.java
index 5bc147d5062..d4810046e56 100644
---
a/clients/src/test/java/org/apache/kafka/common/utils/ByteBufferOutputStreamTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteBufferOutputStreamTest.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 org.junit.jupiter.api.Test;
diff --git
a/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteUtilsTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteUtilsTest.java
index 139e3efdd4b..81ba60a5188 100644
---
a/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteUtilsTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ByteUtilsTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.kafka.common.utils.internals;
-import org.apache.kafka.common.utils.ByteBufferInputStream;
-import org.apache.kafka.common.utils.ByteBufferOutputStream;
import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.common.utils.Utils;
diff --git
a/clients/src/test/java/org/apache/kafka/common/utils/internals/ChunkedBytesStreamTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ChunkedBytesStreamTest.java
index 8323969ad34..81af1000380 100644
---
a/clients/src/test/java/org/apache/kafka/common/utils/internals/ChunkedBytesStreamTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ChunkedBytesStreamTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.kafka.common.utils.internals;
-import org.apache.kafka.common.utils.ByteBufferInputStream;
-
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
diff --git
a/raft/src/main/java/org/apache/kafka/raft/internals/BatchBuilder.java
b/raft/src/main/java/org/apache/kafka/raft/internals/BatchBuilder.java
index dda02eb72ae..5f9b85dee6c 100644
--- a/raft/src/main/java/org/apache/kafka/raft/internals/BatchBuilder.java
+++ b/raft/src/main/java/org/apache/kafka/raft/internals/BatchBuilder.java
@@ -26,7 +26,7 @@ import org.apache.kafka.common.record.internal.DefaultRecord;
import org.apache.kafka.common.record.internal.DefaultRecordBatch;
import org.apache.kafka.common.record.internal.MemoryRecords;
import org.apache.kafka.common.record.internal.RecordBatch;
-import org.apache.kafka.common.utils.ByteBufferOutputStream;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.apache.kafka.common.utils.internals.ByteUtils;
import org.apache.kafka.server.common.serialization.RecordSerde;
diff --git
a/raft/src/testFixtures/java/org/apache/kafka/snapshot/MockRawSnapshotWriter.java
b/raft/src/testFixtures/java/org/apache/kafka/snapshot/MockRawSnapshotWriter.java
index 7187bba6893..eb208a89df6 100644
---
a/raft/src/testFixtures/java/org/apache/kafka/snapshot/MockRawSnapshotWriter.java
+++
b/raft/src/testFixtures/java/org/apache/kafka/snapshot/MockRawSnapshotWriter.java
@@ -18,7 +18,7 @@ package org.apache.kafka.snapshot;
import org.apache.kafka.common.record.internal.MemoryRecords;
import org.apache.kafka.common.record.internal.UnalignedMemoryRecords;
-import org.apache.kafka.common.utils.ByteBufferOutputStream;
+import org.apache.kafka.common.utils.internals.ByteBufferOutputStream;
import org.apache.kafka.server.common.OffsetAndEpoch;
import java.nio.ByteBuffer;
diff --git
a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignmentInfo.java
b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignmentInfo.java
index d2cc5ab0fbd..d260b477939 100644
---
a/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignmentInfo.java
+++
b/streams/src/main/java/org/apache/kafka/streams/processor/internals/assignment/AssignmentInfo.java
@@ -17,7 +17,7 @@
package org.apache.kafka.streams.processor.internals.assignment;
import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.utils.ByteBufferInputStream;
+import org.apache.kafka.common.utils.internals.ByteBufferInputStream;
import org.apache.kafka.streams.errors.TaskAssignmentException;
import org.apache.kafka.streams.processor.TaskId;
import org.apache.kafka.streams.state.HostInfo;
diff --git
a/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java
b/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java
index 801cb7c199d..5d7ec5dd58e 100644
---
a/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java
+++
b/streams/src/test/java/org/apache/kafka/streams/tests/StreamsUpgradeTest.java
@@ -25,8 +25,8 @@ import org.apache.kafka.common.Cluster;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.kafka.common.serialization.Serdes;
-import org.apache.kafka.common.utils.ByteBufferInputStream;
import org.apache.kafka.common.utils.Utils;
+import org.apache.kafka.common.utils.internals.ByteBufferInputStream;
import org.apache.kafka.common.utils.internals.Exit;
import org.apache.kafka.streams.KafkaClientSupplier;
import org.apache.kafka.streams.KafkaStreams;
