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 e7a568863e2 KAFKA-20297 move Crc32C Checksums and Sanitizer from utils
to utils.internals (#22072)
e7a568863e2 is described below
commit e7a568863e28c1cd1d122d805b2a100d42ca513d
Author: Chia-Yi Chiu <[email protected]>
AuthorDate: Thu Apr 16 17:42:18 2026 +0900
KAFKA-20297 move Crc32C Checksums and Sanitizer from utils to
utils.internals (#22072)
Summary: move Crc32C Checksums and Sanitizer from utils to
utils.internals
Reviewers: Ken Huang <[email protected]>, Chia-Ping Tsai
<[email protected]>
---
clients/src/main/java/org/apache/kafka/common/metrics/JmxReporter.java | 2 +-
.../org/apache/kafka/common/record/internal/DefaultRecordBatch.java | 2 +-
.../java/org/apache/kafka/common/record/internal/LegacyRecord.java | 2 +-
clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java | 1 +
.../java/org/apache/kafka/common/utils/{ => internals}/Checksums.java | 2 +-
.../java/org/apache/kafka/common/utils/{ => internals}/Crc32C.java | 2 +-
.../java/org/apache/kafka/common/utils/{ => internals}/Sanitizer.java | 2 +-
.../org/apache/kafka/common/utils/{ => internals}/ChecksumsTest.java | 2 +-
.../java/org/apache/kafka/common/utils/{ => internals}/Crc32CTest.java | 2 +-
.../org/apache/kafka/common/utils/{ => internals}/SanitizerTest.java | 2 +-
.../main/scala/kafka/server/metadata/ClientQuotaMetadataManager.scala | 2 +-
core/src/test/scala/integration/kafka/api/UserClientIdQuotaTest.scala | 2 +-
core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala | 3 ++-
.../src/main/java/org/apache/kafka/jmh/util/Crc32CBenchmark.java | 2 +-
.../main/java/org/apache/kafka/server/metrics/KafkaMetricsGroup.java | 2 +-
.../main/java/org/apache/kafka/server/metrics/KafkaYammerMetrics.java | 2 +-
server/src/main/java/org/apache/kafka/network/Session.java | 2 +-
server/src/main/java/org/apache/kafka/server/ClientMetricsManager.java | 2 +-
.../main/java/org/apache/kafka/server/quota/ClientQuotaManager.java | 2 +-
.../org/apache/kafka/storage/internals/log/ProducerStateManager.java | 2 +-
20 files changed, 21 insertions(+), 19 deletions(-)
diff --git
a/clients/src/main/java/org/apache/kafka/common/metrics/JmxReporter.java
b/clients/src/main/java/org/apache/kafka/common/metrics/JmxReporter.java
index 0612015d1a2..017a0d39bd5 100644
--- a/clients/src/main/java/org/apache/kafka/common/metrics/JmxReporter.java
+++ b/clients/src/main/java/org/apache/kafka/common/metrics/JmxReporter.java
@@ -19,7 +19,7 @@ package org.apache.kafka.common.metrics;
import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.MetricName;
import org.apache.kafka.common.config.ConfigException;
-import org.apache.kafka.common.utils.Sanitizer;
+import org.apache.kafka.common.utils.internals.Sanitizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 b62e9dc3301..42b8d605dfe 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
@@ -24,9 +24,9 @@ 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.Crc32C;
import org.apache.kafka.common.utils.internals.ByteUtils;
import org.apache.kafka.common.utils.internals.CloseableIterator;
+import org.apache.kafka.common.utils.internals.Crc32C;
import java.io.IOException;
import java.io.InputStream;
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 1f5d7d825ff..9a817b259c1 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
@@ -20,9 +20,9 @@ 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.Checksums;
import org.apache.kafka.common.utils.Utils;
import org.apache.kafka.common.utils.internals.ByteUtils;
+import org.apache.kafka.common.utils.internals.Checksums;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java
b/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java
index cc2d7b75f1e..9148e82418c 100644
--- a/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java
+++ b/clients/src/main/java/org/apache/kafka/common/utils/AppInfoParser.java
@@ -19,6 +19,7 @@ package org.apache.kafka.common.utils;
import org.apache.kafka.common.MetricName;
import org.apache.kafka.common.metrics.Gauge;
import org.apache.kafka.common.metrics.Metrics;
+import org.apache.kafka.common.utils.internals.Sanitizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Checksums.java
b/clients/src/main/java/org/apache/kafka/common/utils/internals/Checksums.java
similarity index 98%
rename from clients/src/main/java/org/apache/kafka/common/utils/Checksums.java
rename to
clients/src/main/java/org/apache/kafka/common/utils/internals/Checksums.java
index 546a2fdac33..908d5cde0ac 100644
--- a/clients/src/main/java/org/apache/kafka/common/utils/Checksums.java
+++
b/clients/src/main/java/org/apache/kafka/common/utils/internals/Checksums.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.nio.ByteBuffer;
import java.util.zip.Checksum;
diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Crc32C.java
b/clients/src/main/java/org/apache/kafka/common/utils/internals/Crc32C.java
similarity index 97%
rename from clients/src/main/java/org/apache/kafka/common/utils/Crc32C.java
rename to
clients/src/main/java/org/apache/kafka/common/utils/internals/Crc32C.java
index 09c0e518bbf..49513bc98e3 100644
--- a/clients/src/main/java/org/apache/kafka/common/utils/Crc32C.java
+++ b/clients/src/main/java/org/apache/kafka/common/utils/internals/Crc32C.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.zip.CRC32C;
diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Sanitizer.java
b/clients/src/main/java/org/apache/kafka/common/utils/internals/Sanitizer.java
similarity index 98%
rename from clients/src/main/java/org/apache/kafka/common/utils/Sanitizer.java
rename to
clients/src/main/java/org/apache/kafka/common/utils/internals/Sanitizer.java
index 669b9c37763..e1e10773fe1 100644
--- a/clients/src/main/java/org/apache/kafka/common/utils/Sanitizer.java
+++
b/clients/src/main/java/org/apache/kafka/common/utils/internals/Sanitizer.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.net.URLDecoder;
import java.net.URLEncoder;
diff --git
a/clients/src/test/java/org/apache/kafka/common/utils/ChecksumsTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ChecksumsTest.java
similarity index 98%
rename from
clients/src/test/java/org/apache/kafka/common/utils/ChecksumsTest.java
rename to
clients/src/test/java/org/apache/kafka/common/utils/internals/ChecksumsTest.java
index 4c214005eac..bb04dee0c7b 100644
--- a/clients/src/test/java/org/apache/kafka/common/utils/ChecksumsTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/utils/internals/ChecksumsTest.java
@@ -15,7 +15,7 @@
* 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/Crc32CTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/internals/Crc32CTest.java
similarity index 95%
rename from clients/src/test/java/org/apache/kafka/common/utils/Crc32CTest.java
rename to
clients/src/test/java/org/apache/kafka/common/utils/internals/Crc32CTest.java
index b8e5d1daaa4..e4745f96fdf 100644
--- a/clients/src/test/java/org/apache/kafka/common/utils/Crc32CTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/utils/internals/Crc32CTest.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/SanitizerTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/internals/SanitizerTest.java
similarity index 98%
rename from
clients/src/test/java/org/apache/kafka/common/utils/SanitizerTest.java
rename to
clients/src/test/java/org/apache/kafka/common/utils/internals/SanitizerTest.java
index 229311ec03e..4662bdedcaa 100644
--- a/clients/src/test/java/org/apache/kafka/common/utils/SanitizerTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/utils/internals/SanitizerTest.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/core/src/main/scala/kafka/server/metadata/ClientQuotaMetadataManager.scala
b/core/src/main/scala/kafka/server/metadata/ClientQuotaMetadataManager.scala
index 4c56ce06bdc..079d257ca47 100644
--- a/core/src/main/scala/kafka/server/metadata/ClientQuotaMetadataManager.scala
+++ b/core/src/main/scala/kafka/server/metadata/ClientQuotaMetadataManager.scala
@@ -23,8 +23,8 @@ import
kafka.server.metadata.ClientQuotaMetadataManager.transferToClientQuotaEnt
import kafka.utils.Logging
import org.apache.kafka.common.metrics.Quota
import org.apache.kafka.common.quota.ClientQuotaEntity
+import org.apache.kafka.common.utils.internals.Sanitizer
import org.apache.kafka.server.quota.ClientQuotaEntity.ConfigEntity
-import org.apache.kafka.common.utils.Sanitizer
import java.net.{InetAddress, UnknownHostException}
import java.util.Optional
diff --git
a/core/src/test/scala/integration/kafka/api/UserClientIdQuotaTest.scala
b/core/src/test/scala/integration/kafka/api/UserClientIdQuotaTest.scala
index eac85dc2afd..112b7714ddb 100644
--- a/core/src/test/scala/integration/kafka/api/UserClientIdQuotaTest.scala
+++ b/core/src/test/scala/integration/kafka/api/UserClientIdQuotaTest.scala
@@ -18,7 +18,7 @@ import kafka.server._
import kafka.utils.TestUtils
import org.apache.kafka.common.config.internals.BrokerSecurityConfigs
import org.apache.kafka.common.security.auth.{KafkaPrincipal, SecurityProtocol}
-import org.apache.kafka.common.utils.Sanitizer
+import org.apache.kafka.common.utils.internals.Sanitizer
import org.junit.jupiter.api.{BeforeEach, TestInfo}
class UserClientIdQuotaTest extends BaseQuotaTest {
diff --git a/core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala
b/core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala
index 0a409ab3320..25c6eba4dc8 100644
--- a/core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala
+++ b/core/src/test/scala/unit/kafka/server/RequestQuotaTest.scala
@@ -35,7 +35,8 @@ import org.apache.kafka.common.record.internal._
import org.apache.kafka.common.requests._
import org.apache.kafka.common.resource.{PatternType, ResourceType =>
AdminResourceType}
import org.apache.kafka.common.security.auth._
-import org.apache.kafka.common.utils.{Sanitizer, SecurityUtils}
+import org.apache.kafka.common.utils.SecurityUtils
+import org.apache.kafka.common.utils.internals.Sanitizer
import org.apache.kafka.coordinator.group.GroupCoordinatorConfig
import org.apache.kafka.metadata.authorizer.StandardAuthorizer
import org.apache.kafka.network.Session
diff --git
a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/util/Crc32CBenchmark.java
b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/util/Crc32CBenchmark.java
index d7927676ec1..5768ace2686 100644
---
a/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/util/Crc32CBenchmark.java
+++
b/jmh-benchmarks/src/main/java/org/apache/kafka/jmh/util/Crc32CBenchmark.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.jmh.util;
-import org.apache.kafka.common.utils.Crc32C;
+import org.apache.kafka.common.utils.internals.Crc32C;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Fork;
diff --git
a/server-common/src/main/java/org/apache/kafka/server/metrics/KafkaMetricsGroup.java
b/server-common/src/main/java/org/apache/kafka/server/metrics/KafkaMetricsGroup.java
index 3a7045d7d5e..a8b6e366c8e 100644
---
a/server-common/src/main/java/org/apache/kafka/server/metrics/KafkaMetricsGroup.java
+++
b/server-common/src/main/java/org/apache/kafka/server/metrics/KafkaMetricsGroup.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.server.metrics;
-import org.apache.kafka.common.utils.Sanitizer;
+import org.apache.kafka.common.utils.internals.Sanitizer;
import com.yammer.metrics.core.Gauge;
import com.yammer.metrics.core.Histogram;
diff --git
a/server-common/src/main/java/org/apache/kafka/server/metrics/KafkaYammerMetrics.java
b/server-common/src/main/java/org/apache/kafka/server/metrics/KafkaYammerMetrics.java
index 7909c63e242..0bf3adf5c29 100644
---
a/server-common/src/main/java/org/apache/kafka/server/metrics/KafkaYammerMetrics.java
+++
b/server-common/src/main/java/org/apache/kafka/server/metrics/KafkaYammerMetrics.java
@@ -21,7 +21,7 @@ import org.apache.kafka.common.Reconfigurable;
import org.apache.kafka.common.config.ConfigException;
import org.apache.kafka.common.metrics.JmxReporter;
import org.apache.kafka.common.utils.Exit;
-import org.apache.kafka.common.utils.Sanitizer;
+import org.apache.kafka.common.utils.internals.Sanitizer;
import com.yammer.metrics.core.MetricName;
import com.yammer.metrics.core.MetricsRegistry;
diff --git a/server/src/main/java/org/apache/kafka/network/Session.java
b/server/src/main/java/org/apache/kafka/network/Session.java
index 1793e4d565c..d3e6c6f10f7 100644
--- a/server/src/main/java/org/apache/kafka/network/Session.java
+++ b/server/src/main/java/org/apache/kafka/network/Session.java
@@ -17,7 +17,7 @@
package org.apache.kafka.network;
import org.apache.kafka.common.security.auth.KafkaPrincipal;
-import org.apache.kafka.common.utils.Sanitizer;
+import org.apache.kafka.common.utils.internals.Sanitizer;
import java.net.InetAddress;
diff --git
a/server/src/main/java/org/apache/kafka/server/ClientMetricsManager.java
b/server/src/main/java/org/apache/kafka/server/ClientMetricsManager.java
index 87f2234da9a..c8e01502ed1 100644
--- a/server/src/main/java/org/apache/kafka/server/ClientMetricsManager.java
+++ b/server/src/main/java/org/apache/kafka/server/ClientMetricsManager.java
@@ -44,8 +44,8 @@ import
org.apache.kafka.common.requests.GetTelemetrySubscriptionsResponse;
import org.apache.kafka.common.requests.PushTelemetryRequest;
import org.apache.kafka.common.requests.PushTelemetryResponse;
import org.apache.kafka.common.requests.RequestContext;
-import org.apache.kafka.common.utils.Crc32C;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.Crc32C;
import org.apache.kafka.server.metrics.ClientMetricsConfigs;
import org.apache.kafka.server.metrics.ClientMetricsInstance;
import org.apache.kafka.server.metrics.ClientMetricsInstanceMetadata;
diff --git
a/server/src/main/java/org/apache/kafka/server/quota/ClientQuotaManager.java
b/server/src/main/java/org/apache/kafka/server/quota/ClientQuotaManager.java
index a755003f26f..010b10af91a 100644
--- a/server/src/main/java/org/apache/kafka/server/quota/ClientQuotaManager.java
+++ b/server/src/main/java/org/apache/kafka/server/quota/ClientQuotaManager.java
@@ -27,8 +27,8 @@ import org.apache.kafka.common.metrics.stats.Avg;
import org.apache.kafka.common.metrics.stats.CumulativeSum;
import org.apache.kafka.common.metrics.stats.Rate;
import org.apache.kafka.common.security.auth.KafkaPrincipal;
-import org.apache.kafka.common.utils.Sanitizer;
import org.apache.kafka.common.utils.Time;
+import org.apache.kafka.common.utils.internals.Sanitizer;
import org.apache.kafka.network.Session;
import org.apache.kafka.server.config.ClientQuotaManagerConfig;
import org.apache.kafka.server.util.ShutdownableThread;
diff --git
a/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java
b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java
index 6f9f736b8ce..4d8772512e3 100644
---
a/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java
+++
b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerStateManager.java
@@ -20,11 +20,11 @@ import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.protocol.ByteBufferAccessor;
import org.apache.kafka.common.protocol.MessageUtil;
import org.apache.kafka.common.record.internal.RecordBatch;
-import org.apache.kafka.common.utils.Crc32C;
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.ByteUtils;
+import org.apache.kafka.common.utils.internals.Crc32C;
import
org.apache.kafka.server.log.remote.metadata.storage.generated.ProducerSnapshot;
import org.slf4j.Logger;
