Skip to content

Commit 10805c9

Browse files
authored
KAFKA-20297 Move SecurityUtils, ConfigUtils, LogContext, AppInfoParser into internal (#22110)
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 following class into internal module - SecurityUtils - ConfigUtils - LogContext - AppInfoParser Reviewers: Chia-Ping Tsai <chia7712@gmail.com>
1 parent b047948 commit 10805c9

577 files changed

Lines changed: 611 additions & 588 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerBounceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.apache.kafka.common.test.api.ClusterTestDefaults;
3434
import org.apache.kafka.common.test.api.ClusterTests;
3535
import org.apache.kafka.common.test.api.Type;
36-
import org.apache.kafka.common.utils.LogContext;
36+
import org.apache.kafka.common.utils.internals.LogContext;
3737
import org.apache.kafka.coordinator.group.GroupCoordinatorConfig;
3838
import org.apache.kafka.raft.KRaftConfigs;
3939
import org.apache.kafka.server.IntegrationTestUtils;

clients/src/main/java/org/apache/kafka/clients/ClientUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import org.apache.kafka.common.security.JaasContext;
3030
import org.apache.kafka.common.security.auth.SecurityProtocol;
3131
import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender;
32-
import org.apache.kafka.common.utils.LogContext;
3332
import org.apache.kafka.common.utils.Time;
33+
import org.apache.kafka.common.utils.internals.LogContext;
3434

3535
import org.slf4j.Logger;
3636
import org.slf4j.LoggerFactory;

clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package org.apache.kafka.clients;
1818

1919
import org.apache.kafka.common.errors.AuthenticationException;
20-
import org.apache.kafka.common.utils.LogContext;
2120
import org.apache.kafka.common.utils.internals.ExponentialBackoff;
21+
import org.apache.kafka.common.utils.internals.LogContext;
2222

2323
import org.slf4j.Logger;
2424

clients/src/main/java/org/apache/kafka/clients/FetchSessionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.apache.kafka.common.requests.FetchMetadata;
2525
import org.apache.kafka.common.requests.FetchRequest.PartitionData;
2626
import org.apache.kafka.common.requests.FetchResponse;
27-
import org.apache.kafka.common.utils.LogContext;
27+
import org.apache.kafka.common.utils.internals.LogContext;
2828

2929
import org.slf4j.Logger;
3030

clients/src/main/java/org/apache/kafka/clients/Metadata.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.apache.kafka.common.requests.MetadataRequest;
3131
import org.apache.kafka.common.requests.MetadataResponse;
3232
import org.apache.kafka.common.requests.MetadataResponse.PartitionMetadata;
33-
import org.apache.kafka.common.utils.LogContext;
3433
import org.apache.kafka.common.utils.internals.ExponentialBackoff;
34+
import org.apache.kafka.common.utils.internals.LogContext;
3535

3636
import org.slf4j.Logger;
3737

clients/src/main/java/org/apache/kafka/clients/NetworkClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
import org.apache.kafka.common.requests.RequestHeader;
4646
import org.apache.kafka.common.security.authenticator.SaslClientAuthenticator;
4747
import org.apache.kafka.common.telemetry.internals.ClientTelemetrySender;
48-
import org.apache.kafka.common.utils.LogContext;
4948
import org.apache.kafka.common.utils.Time;
5049
import org.apache.kafka.common.utils.Utils;
50+
import org.apache.kafka.common.utils.internals.LogContext;
5151

5252
import org.slf4j.Logger;
5353

clients/src/main/java/org/apache/kafka/clients/admin/KafkaAdminClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,13 +257,13 @@
257257
import org.apache.kafka.common.security.token.delegation.TokenInformation;
258258
import org.apache.kafka.common.telemetry.internals.ClientTelemetryReporter;
259259
import org.apache.kafka.common.telemetry.internals.ClientTelemetryUtils;
260-
import org.apache.kafka.common.utils.AppInfoParser;
261-
import org.apache.kafka.common.utils.LogContext;
262260
import org.apache.kafka.common.utils.ProducerIdAndEpoch;
263261
import org.apache.kafka.common.utils.Time;
264262
import org.apache.kafka.common.utils.Utils;
263+
import org.apache.kafka.common.utils.internals.AppInfoParser;
265264
import org.apache.kafka.common.utils.internals.ExponentialBackoff;
266265
import org.apache.kafka.common.utils.internals.KafkaThread;
266+
import org.apache.kafka.common.utils.internals.LogContext;
267267

268268
import org.slf4j.Logger;
269269

clients/src/main/java/org/apache/kafka/clients/admin/internals/AbortTransactionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.kafka.common.requests.AbstractResponse;
3030
import org.apache.kafka.common.requests.WriteTxnMarkersRequest;
3131
import org.apache.kafka.common.requests.WriteTxnMarkersResponse;
32-
import org.apache.kafka.common.utils.LogContext;
32+
import org.apache.kafka.common.utils.internals.LogContext;
3333

3434
import org.slf4j.Logger;
3535

clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminApiDriver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.apache.kafka.common.requests.AbstractResponse;
2525
import org.apache.kafka.common.requests.FindCoordinatorRequest.NoBatchedFindCoordinatorsException;
2626
import org.apache.kafka.common.requests.OffsetFetchRequest.NoBatchedOffsetFetchRequestException;
27-
import org.apache.kafka.common.utils.LogContext;
2827
import org.apache.kafka.common.utils.internals.ExponentialBackoff;
28+
import org.apache.kafka.common.utils.internals.LogContext;
2929

3030
import org.slf4j.Logger;
3131

clients/src/main/java/org/apache/kafka/clients/admin/internals/AdminMetadataManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.apache.kafka.common.requests.MetadataResponse;
2828
import org.apache.kafka.common.requests.RequestHeader;
2929
import org.apache.kafka.common.requests.RequestUtils;
30-
import org.apache.kafka.common.utils.LogContext;
30+
import org.apache.kafka.common.utils.internals.LogContext;
3131

3232
import org.slf4j.Logger;
3333

0 commit comments

Comments
 (0)