diff --git a/build.gradle b/build.gradle index a227987b1b0d1..f59a53b8739a2 100644 --- a/build.gradle +++ b/build.gradle @@ -204,10 +204,6 @@ def determineCommitId() { def excludedSpotlessModules = [':clients', ':connect:runtime', ':core', - ':metadata', - ':server', - ':storage', - ':storage:storage-api', // rename in settings.gradle ':streams', ':streams:examples', ':streams:streams-scala', diff --git a/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java index 3e1804cf43c63..d7c5dd1a3e585 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/AclControlManager.java @@ -38,6 +38,7 @@ import org.apache.kafka.timeline.SnapshotRegistry; import org.apache.kafka.timeline.TimelineHashMap; import org.apache.kafka.timeline.TimelineHashSet; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java b/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java index 6cb7f615cc9e8..e1734c52fbc37 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/BrokerHeartbeatManager.java @@ -17,11 +17,11 @@ package org.apache.kafka.controller; -import java.util.OptionalLong; import org.apache.kafka.common.message.BrokerHeartbeatRequestData; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; import org.apache.kafka.metadata.placement.UsableBroker; + import org.slf4j.Logger; import java.util.Collection; @@ -30,12 +30,13 @@ import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Optional; +import java.util.OptionalLong; import java.util.TreeSet; import java.util.function.Function; import java.util.function.Supplier; -import static org.apache.kafka.controller.BrokerControlState.FENCED; import static org.apache.kafka.controller.BrokerControlState.CONTROLLED_SHUTDOWN; +import static org.apache.kafka.controller.BrokerControlState.FENCED; import static org.apache.kafka.controller.BrokerControlState.SHUTDOWN_NOW; import static org.apache.kafka.controller.BrokerControlState.UNFENCED; diff --git a/metadata/src/main/java/org/apache/kafka/controller/BrokersToIsrs.java b/metadata/src/main/java/org/apache/kafka/controller/BrokersToIsrs.java index eb33823bf323d..42d9da29545af 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/BrokersToIsrs.java +++ b/metadata/src/main/java/org/apache/kafka/controller/BrokersToIsrs.java @@ -18,8 +18,8 @@ package org.apache.kafka.controller; import org.apache.kafka.common.Uuid; -import org.apache.kafka.server.common.TopicIdPartition; import org.apache.kafka.metadata.Replicas; +import org.apache.kafka.server.common.TopicIdPartition; import org.apache.kafka.timeline.SnapshotRegistry; import org.apache.kafka.timeline.TimelineHashMap; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java index db6bf9c327cd8..d8a7e842d34e4 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ClientQuotaControlManager.java @@ -31,6 +31,7 @@ import org.apache.kafka.server.mutable.BoundedList; import org.apache.kafka.timeline.SnapshotRegistry; import org.apache.kafka.timeline.TimelineHashMap; + import org.slf4j.Logger; import java.net.InetAddress; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java index de9068214afaa..7f24d55b6fdcf 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java @@ -54,6 +54,7 @@ import org.apache.kafka.server.common.MetadataVersion; import org.apache.kafka.timeline.SnapshotRegistry; import org.apache.kafka.timeline.TimelineHashMap; + import org.slf4j.Logger; import java.util.AbstractMap; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ClusterFeatureSupportDescriber.java b/metadata/src/main/java/org/apache/kafka/controller/ClusterFeatureSupportDescriber.java index 7091079a6b9c7..77dc11fb938bb 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ClusterFeatureSupportDescriber.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ClusterFeatureSupportDescriber.java @@ -17,15 +17,14 @@ package org.apache.kafka.controller; +import org.apache.kafka.metadata.VersionRange; + import java.util.Iterator; -import java.util.Map.Entry; import java.util.Map; - -import org.apache.kafka.metadata.VersionRange; +import java.util.Map.Entry; public interface ClusterFeatureSupportDescriber { Iterator>> brokerSupported(); Iterator>> controllerSupported(); } - diff --git a/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java index 4ef66f1870a8e..b27d5be328d4c 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ConfigurationControlManager.java @@ -20,8 +20,8 @@ import org.apache.kafka.clients.admin.AlterConfigOp.OpType; import org.apache.kafka.clients.admin.ConfigEntry; import org.apache.kafka.common.config.ConfigException; -import org.apache.kafka.common.config.ConfigResource.Type; import org.apache.kafka.common.config.ConfigResource; +import org.apache.kafka.common.config.ConfigResource.Type; import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.metadata.ConfigRecord; import org.apache.kafka.common.protocol.Errors; @@ -34,6 +34,7 @@ import org.apache.kafka.server.policy.AlterConfigPolicy.RequestMetadata; import org.apache.kafka.timeline.SnapshotRegistry; import org.apache.kafka.timeline.TimelineHashMap; + import org.slf4j.Logger; import java.util.ArrayList; diff --git a/metadata/src/main/java/org/apache/kafka/controller/Controller.java b/metadata/src/main/java/org/apache/kafka/controller/Controller.java index 21d1536bb665b..6845e908e7a61 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/Controller.java +++ b/metadata/src/main/java/org/apache/kafka/controller/Controller.java @@ -22,10 +22,10 @@ import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.message.AllocateProducerIdsRequestData; import org.apache.kafka.common.message.AllocateProducerIdsResponseData; -import org.apache.kafka.common.message.AlterPartitionRequestData; -import org.apache.kafka.common.message.AlterPartitionResponseData; import org.apache.kafka.common.message.AlterPartitionReassignmentsRequestData; import org.apache.kafka.common.message.AlterPartitionReassignmentsResponseData; +import org.apache.kafka.common.message.AlterPartitionRequestData; +import org.apache.kafka.common.message.AlterPartitionResponseData; import org.apache.kafka.common.message.AlterUserScramCredentialsRequestData; import org.apache.kafka.common.message.AlterUserScramCredentialsResponseData; import org.apache.kafka.common.message.AssignReplicasToDirsRequestData; @@ -39,10 +39,10 @@ import org.apache.kafka.common.message.CreatePartitionsResponseData.CreatePartitionsTopicResult; import org.apache.kafka.common.message.CreateTopicsRequestData; import org.apache.kafka.common.message.CreateTopicsResponseData; -import org.apache.kafka.common.message.ExpireDelegationTokenRequestData; -import org.apache.kafka.common.message.ExpireDelegationTokenResponseData; import org.apache.kafka.common.message.ElectLeadersRequestData; import org.apache.kafka.common.message.ElectLeadersResponseData; +import org.apache.kafka.common.message.ExpireDelegationTokenRequestData; +import org.apache.kafka.common.message.ExpireDelegationTokenResponseData; import org.apache.kafka.common.message.ListPartitionReassignmentsRequestData; import org.apache.kafka.common.message.ListPartitionReassignmentsResponseData; import org.apache.kafka.common.message.RenewDelegationTokenRequestData; diff --git a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java index a5fda589a3960..fa50570a48f79 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java @@ -17,6 +17,7 @@ package org.apache.kafka.controller; +import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.CreateDelegationTokenRequestData; import org.apache.kafka.common.message.CreateDelegationTokenRequestData.CreatableRenewers; import org.apache.kafka.common.message.CreateDelegationTokenResponseData; @@ -31,22 +32,21 @@ import org.apache.kafka.common.security.token.delegation.TokenInformation; import org.apache.kafka.common.security.token.delegation.internals.DelegationTokenCache; import org.apache.kafka.common.utils.LogContext; -import org.apache.kafka.common.Uuid; +import org.apache.kafka.common.utils.Time; import org.apache.kafka.metadata.DelegationTokenData; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.common.utils.Time; - -import java.nio.charset.StandardCharsets; -import javax.crypto.spec.SecretKeySpec; -import javax.crypto.Mac; import org.slf4j.Logger; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Base64; import java.util.List; +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; + import static org.apache.kafka.common.protocol.Errors.DELEGATION_TOKEN_AUTH_DISABLED; import static org.apache.kafka.common.protocol.Errors.DELEGATION_TOKEN_EXPIRED; import static org.apache.kafka.common.protocol.Errors.DELEGATION_TOKEN_NOT_FOUND; diff --git a/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java index ebf1f9067bef0..4d7f2b862fbf5 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/FeatureControlManager.java @@ -17,17 +17,6 @@ package org.apache.kafka.controller; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map.Entry; -import java.util.Map; -import java.util.Optional; -import java.util.TreeMap; -import java.util.function.Consumer; - import org.apache.kafka.clients.admin.FeatureUpdate; import org.apache.kafka.common.metadata.FeatureLevelRecord; import org.apache.kafka.common.metadata.ZkMigrationStateRecord; @@ -43,8 +32,20 @@ import org.apache.kafka.timeline.SnapshotRegistry; import org.apache.kafka.timeline.TimelineHashMap; import org.apache.kafka.timeline.TimelineObject; + import org.slf4j.Logger; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.TreeMap; +import java.util.function.Consumer; + import static org.apache.kafka.common.metadata.MetadataRecordType.FEATURE_LEVEL_RECORD; import static org.apache.kafka.controller.QuorumController.MAX_RECORDS_PER_USER_OP; diff --git a/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java b/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java index 41f881245fcd1..8777306029100 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java +++ b/metadata/src/main/java/org/apache/kafka/controller/LogReplayTracker.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.protocol.ApiMessage; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; diff --git a/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java index 76bae6ada072c..4094c34e58006 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/OffsetControlManager.java @@ -28,6 +28,7 @@ import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.snapshot.Snapshots; import org.apache.kafka.timeline.SnapshotRegistry; + import org.slf4j.Logger; import java.util.Optional; diff --git a/metadata/src/main/java/org/apache/kafka/controller/PartitionChangeBuilder.java b/metadata/src/main/java/org/apache/kafka/controller/PartitionChangeBuilder.java index 86d7a0f1494f6..43e589f72ea5c 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/PartitionChangeBuilder.java +++ b/metadata/src/main/java/org/apache/kafka/controller/PartitionChangeBuilder.java @@ -17,17 +17,6 @@ package org.apache.kafka.controller; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.IntPredicate; -import java.util.stream.Collectors; - import org.apache.kafka.common.DirectoryId; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.AlterPartitionRequestData.BrokerState; @@ -38,8 +27,21 @@ import org.apache.kafka.metadata.placement.DefaultDirProvider; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.function.IntPredicate; +import java.util.stream.Collectors; + import static org.apache.kafka.metadata.LeaderConstants.NO_LEADER; import static org.apache.kafka.metadata.LeaderConstants.NO_LEADER_CHANGE; diff --git a/metadata/src/main/java/org/apache/kafka/controller/PartitionReassignmentReplicas.java b/metadata/src/main/java/org/apache/kafka/controller/PartitionReassignmentReplicas.java index ee1a1d0631c18..842743520b020 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/PartitionReassignmentReplicas.java +++ b/metadata/src/main/java/org/apache/kafka/controller/PartitionReassignmentReplicas.java @@ -22,10 +22,10 @@ import org.apache.kafka.metadata.placement.PartitionAssignment; import java.util.ArrayList; -import java.util.Set; import java.util.List; import java.util.Objects; import java.util.Optional; +import java.util.Set; import java.util.TreeSet; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java index f2a29609edda4..2c1a0b49e4c98 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ProducerIdControlManager.java @@ -25,6 +25,7 @@ import org.apache.kafka.timeline.SnapshotRegistry; import org.apache.kafka.timeline.TimelineLong; import org.apache.kafka.timeline.TimelineObject; + import org.slf4j.Logger; import java.util.Collections; diff --git a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java index 890551febbeda..769feeb8eaff5 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java +++ b/metadata/src/main/java/org/apache/kafka/controller/QuorumController.java @@ -31,10 +31,10 @@ import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.message.AllocateProducerIdsRequestData; import org.apache.kafka.common.message.AllocateProducerIdsResponseData; -import org.apache.kafka.common.message.AlterPartitionRequestData; -import org.apache.kafka.common.message.AlterPartitionResponseData; import org.apache.kafka.common.message.AlterPartitionReassignmentsRequestData; import org.apache.kafka.common.message.AlterPartitionReassignmentsResponseData; +import org.apache.kafka.common.message.AlterPartitionRequestData; +import org.apache.kafka.common.message.AlterPartitionResponseData; import org.apache.kafka.common.message.AlterUserScramCredentialsRequestData; import org.apache.kafka.common.message.AlterUserScramCredentialsResponseData; import org.apache.kafka.common.message.AssignReplicasToDirsRequestData; @@ -78,11 +78,11 @@ import org.apache.kafka.common.metadata.RemoveAccessControlEntryRecord; import org.apache.kafka.common.metadata.RemoveDelegationTokenRecord; import org.apache.kafka.common.metadata.RemoveTopicRecord; -import org.apache.kafka.common.metadata.UserScramCredentialRecord; import org.apache.kafka.common.metadata.RemoveUserScramCredentialRecord; import org.apache.kafka.common.metadata.TopicRecord; import org.apache.kafka.common.metadata.UnfenceBrokerRecord; import org.apache.kafka.common.metadata.UnregisterBrokerRecord; +import org.apache.kafka.common.metadata.UserScramCredentialRecord; import org.apache.kafka.common.metadata.ZkMigrationStateRecord; import org.apache.kafka.common.protocol.ApiMessage; import org.apache.kafka.common.quota.ClientQuotaAlteration; @@ -95,6 +95,8 @@ import org.apache.kafka.controller.errors.ControllerExceptions; import org.apache.kafka.controller.errors.EventHandlerExceptionInfo; import org.apache.kafka.controller.metrics.QuorumControllerMetrics; +import org.apache.kafka.deferred.DeferredEvent; +import org.apache.kafka.deferred.DeferredEventQueue; import org.apache.kafka.metadata.BrokerHeartbeatReply; import org.apache.kafka.metadata.BrokerRegistrationReply; import org.apache.kafka.metadata.FinalizedControllerFeatures; @@ -106,10 +108,8 @@ import org.apache.kafka.metadata.placement.ReplicaPlacer; import org.apache.kafka.metadata.placement.StripedReplicaPlacer; import org.apache.kafka.metadata.util.RecordRedactor; -import org.apache.kafka.deferred.DeferredEventQueue; -import org.apache.kafka.deferred.DeferredEvent; -import org.apache.kafka.queue.EventQueue.EarliestDeadlineFunction; import org.apache.kafka.queue.EventQueue; +import org.apache.kafka.queue.EventQueue.EarliestDeadlineFunction; import org.apache.kafka.queue.KafkaEventQueue; import org.apache.kafka.raft.Batch; import org.apache.kafka.raft.BatchReader; @@ -127,6 +127,7 @@ import org.apache.kafka.snapshot.SnapshotReader; import org.apache.kafka.snapshot.Snapshots; import org.apache.kafka.timeline.SnapshotRegistry; + import org.slf4j.Logger; import java.util.ArrayList; @@ -136,8 +137,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map.Entry; import java.util.Map; +import java.util.Map.Entry; import java.util.Optional; import java.util.OptionalInt; import java.util.OptionalLong; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java index 3c946954f7fb4..7ae7f658b42a9 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ReplicationControlManager.java @@ -38,15 +38,15 @@ import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.internals.Topic; -import org.apache.kafka.common.message.AlterPartitionRequestData; -import org.apache.kafka.common.message.AlterPartitionRequestData.BrokerState; -import org.apache.kafka.common.message.AlterPartitionResponseData; import org.apache.kafka.common.message.AlterPartitionReassignmentsRequestData; import org.apache.kafka.common.message.AlterPartitionReassignmentsRequestData.ReassignablePartition; import org.apache.kafka.common.message.AlterPartitionReassignmentsRequestData.ReassignableTopic; import org.apache.kafka.common.message.AlterPartitionReassignmentsResponseData; import org.apache.kafka.common.message.AlterPartitionReassignmentsResponseData.ReassignablePartitionResponse; import org.apache.kafka.common.message.AlterPartitionReassignmentsResponseData.ReassignableTopicResponse; +import org.apache.kafka.common.message.AlterPartitionRequestData; +import org.apache.kafka.common.message.AlterPartitionRequestData.BrokerState; +import org.apache.kafka.common.message.AlterPartitionResponseData; import org.apache.kafka.common.message.AssignReplicasToDirsRequestData; import org.apache.kafka.common.message.AssignReplicasToDirsResponseData; import org.apache.kafka.common.message.BrokerHeartbeatRequestData; @@ -101,6 +101,7 @@ import org.apache.kafka.timeline.SnapshotRegistry; import org.apache.kafka.timeline.TimelineHashMap; import org.apache.kafka.timeline.TimelineHashSet; + import org.slf4j.Logger; import java.util.AbstractMap.SimpleImmutableEntry; @@ -113,8 +114,8 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import java.util.Map.Entry; import java.util.Map; +import java.util.Map.Entry; import java.util.Objects; import java.util.Optional; import java.util.OptionalInt; diff --git a/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java index 91fda0779847e..8eed942dbd45e 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java +++ b/metadata/src/main/java/org/apache/kafka/controller/ScramControlManager.java @@ -46,9 +46,9 @@ import static org.apache.kafka.common.protocol.Errors.DUPLICATE_RESOURCE; import static org.apache.kafka.common.protocol.Errors.NONE; import static org.apache.kafka.common.protocol.Errors.RESOURCE_NOT_FOUND; -import static org.apache.kafka.common.protocol.Errors.UNSUPPORTED_VERSION; import static org.apache.kafka.common.protocol.Errors.UNACCEPTABLE_CREDENTIAL; import static org.apache.kafka.common.protocol.Errors.UNSUPPORTED_SASL_MECHANISM; +import static org.apache.kafka.common.protocol.Errors.UNSUPPORTED_VERSION; /** diff --git a/metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerMetadataMetrics.java b/metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerMetadataMetrics.java index 520e697480c20..d6d7a549d0e2c 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerMetadataMetrics.java +++ b/metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerMetadataMetrics.java @@ -17,10 +17,11 @@ package org.apache.kafka.controller.metrics; +import org.apache.kafka.server.metrics.KafkaYammerMetrics; + import com.yammer.metrics.core.Gauge; import com.yammer.metrics.core.MetricName; import com.yammer.metrics.core.MetricsRegistry; -import org.apache.kafka.server.metrics.KafkaYammerMetrics; import java.util.Arrays; import java.util.Optional; diff --git a/metadata/src/main/java/org/apache/kafka/controller/metrics/QuorumControllerMetrics.java b/metadata/src/main/java/org/apache/kafka/controller/metrics/QuorumControllerMetrics.java index 9b67f0a945a2e..96e455b28909c 100644 --- a/metadata/src/main/java/org/apache/kafka/controller/metrics/QuorumControllerMetrics.java +++ b/metadata/src/main/java/org/apache/kafka/controller/metrics/QuorumControllerMetrics.java @@ -17,12 +17,13 @@ package org.apache.kafka.controller.metrics; +import org.apache.kafka.common.utils.Time; +import org.apache.kafka.server.metrics.KafkaYammerMetrics; + import com.yammer.metrics.core.Gauge; import com.yammer.metrics.core.Histogram; import com.yammer.metrics.core.MetricName; import com.yammer.metrics.core.MetricsRegistry; -import org.apache.kafka.common.utils.Time; -import org.apache.kafka.server.metrics.KafkaYammerMetrics; import java.util.Arrays; import java.util.Optional; diff --git a/metadata/src/main/java/org/apache/kafka/image/ClientQuotaImage.java b/metadata/src/main/java/org/apache/kafka/image/ClientQuotaImage.java index 63aef5dedf45e..7ae96f83a0df0 100644 --- a/metadata/src/main/java/org/apache/kafka/image/ClientQuotaImage.java +++ b/metadata/src/main/java/org/apache/kafka/image/ClientQuotaImage.java @@ -29,8 +29,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.Map.Entry; import java.util.Map; +import java.util.Map.Entry; import java.util.Objects; diff --git a/metadata/src/main/java/org/apache/kafka/image/ClientQuotasImage.java b/metadata/src/main/java/org/apache/kafka/image/ClientQuotasImage.java index 840fca55de843..0cea475b2b427 100644 --- a/metadata/src/main/java/org/apache/kafka/image/ClientQuotasImage.java +++ b/metadata/src/main/java/org/apache/kafka/image/ClientQuotasImage.java @@ -31,16 +31,16 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Map.Entry; import java.util.Map; +import java.util.Map.Entry; import java.util.Objects; import java.util.Set; import static org.apache.kafka.common.quota.ClientQuotaEntity.CLIENT_ID; import static org.apache.kafka.common.quota.ClientQuotaEntity.IP; import static org.apache.kafka.common.quota.ClientQuotaEntity.USER; -import static org.apache.kafka.common.requests.DescribeClientQuotasRequest.MATCH_TYPE_EXACT; import static org.apache.kafka.common.requests.DescribeClientQuotasRequest.MATCH_TYPE_DEFAULT; +import static org.apache.kafka.common.requests.DescribeClientQuotasRequest.MATCH_TYPE_EXACT; import static org.apache.kafka.common.requests.DescribeClientQuotasRequest.MATCH_TYPE_SPECIFIED; diff --git a/metadata/src/main/java/org/apache/kafka/image/ConfigurationsImage.java b/metadata/src/main/java/org/apache/kafka/image/ConfigurationsImage.java index 0f0aef4d0a0d8..71f9def40a5cb 100644 --- a/metadata/src/main/java/org/apache/kafka/image/ConfigurationsImage.java +++ b/metadata/src/main/java/org/apache/kafka/image/ConfigurationsImage.java @@ -23,8 +23,8 @@ import org.apache.kafka.image.writer.ImageWriterOptions; import java.util.Collections; -import java.util.Map.Entry; import java.util.Map; +import java.util.Map.Entry; import java.util.Objects; import java.util.Properties; diff --git a/metadata/src/main/java/org/apache/kafka/image/DelegationTokenDelta.java b/metadata/src/main/java/org/apache/kafka/image/DelegationTokenDelta.java index a50a2c300ae3c..3743501fbc7e4 100644 --- a/metadata/src/main/java/org/apache/kafka/image/DelegationTokenDelta.java +++ b/metadata/src/main/java/org/apache/kafka/image/DelegationTokenDelta.java @@ -23,8 +23,8 @@ import org.apache.kafka.server.common.MetadataVersion; import java.util.HashMap; -import java.util.Map.Entry; import java.util.Map; +import java.util.Map.Entry; import java.util.Optional; diff --git a/metadata/src/main/java/org/apache/kafka/image/DelegationTokenImage.java b/metadata/src/main/java/org/apache/kafka/image/DelegationTokenImage.java index 7e139a5be8b9b..52a4fd911c663 100644 --- a/metadata/src/main/java/org/apache/kafka/image/DelegationTokenImage.java +++ b/metadata/src/main/java/org/apache/kafka/image/DelegationTokenImage.java @@ -22,9 +22,9 @@ import org.apache.kafka.image.writer.ImageWriterOptions; import org.apache.kafka.metadata.DelegationTokenData; +import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.Map.Entry; diff --git a/metadata/src/main/java/org/apache/kafka/image/LocalReplicaChanges.java b/metadata/src/main/java/org/apache/kafka/image/LocalReplicaChanges.java index d41dbb2f0820d..e24b1455cb298 100644 --- a/metadata/src/main/java/org/apache/kafka/image/LocalReplicaChanges.java +++ b/metadata/src/main/java/org/apache/kafka/image/LocalReplicaChanges.java @@ -22,8 +22,8 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.metadata.PartitionRegistration; -import java.util.Set; import java.util.Map; +import java.util.Set; public final class LocalReplicaChanges { // partitions for which the broker is not a replica anymore diff --git a/metadata/src/main/java/org/apache/kafka/image/ScramDelta.java b/metadata/src/main/java/org/apache/kafka/image/ScramDelta.java index 129ea5951c24c..fc8da6960f3d0 100644 --- a/metadata/src/main/java/org/apache/kafka/image/ScramDelta.java +++ b/metadata/src/main/java/org/apache/kafka/image/ScramDelta.java @@ -20,12 +20,12 @@ import org.apache.kafka.clients.admin.ScramMechanism; import org.apache.kafka.common.metadata.RemoveUserScramCredentialRecord; import org.apache.kafka.common.metadata.UserScramCredentialRecord; -import org.apache.kafka.server.common.MetadataVersion; import org.apache.kafka.metadata.ScramCredentialData; +import org.apache.kafka.server.common.MetadataVersion; import java.util.HashMap; -import java.util.Map.Entry; import java.util.Map; +import java.util.Map.Entry; import java.util.Optional; diff --git a/metadata/src/main/java/org/apache/kafka/image/ScramImage.java b/metadata/src/main/java/org/apache/kafka/image/ScramImage.java index 0066390d86832..d9067322c3453 100644 --- a/metadata/src/main/java/org/apache/kafka/image/ScramImage.java +++ b/metadata/src/main/java/org/apache/kafka/image/ScramImage.java @@ -17,9 +17,6 @@ package org.apache.kafka.image; -import org.apache.kafka.image.node.ScramImageNode; -import org.apache.kafka.image.writer.ImageWriter; -import org.apache.kafka.image.writer.ImageWriterOptions; import org.apache.kafka.clients.admin.ScramMechanism; import org.apache.kafka.common.message.DescribeUserScramCredentialsRequestData; import org.apache.kafka.common.message.DescribeUserScramCredentialsRequestData.UserName; @@ -27,13 +24,16 @@ import org.apache.kafka.common.message.DescribeUserScramCredentialsResponseData.CredentialInfo; import org.apache.kafka.common.message.DescribeUserScramCredentialsResponseData.DescribeUserScramCredentialsResult; import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.image.node.ScramImageNode; +import org.apache.kafka.image.writer.ImageWriter; +import org.apache.kafka.image.writer.ImageWriterOptions; import org.apache.kafka.metadata.ScramCredentialData; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; -import java.util.ArrayList; import java.util.Map; -import java.util.HashMap; import java.util.Map.Entry; diff --git a/metadata/src/main/java/org/apache/kafka/image/TopicDelta.java b/metadata/src/main/java/org/apache/kafka/image/TopicDelta.java index 22115499e3aa6..683816073e70d 100644 --- a/metadata/src/main/java/org/apache/kafka/image/TopicDelta.java +++ b/metadata/src/main/java/org/apache/kafka/image/TopicDelta.java @@ -18,8 +18,8 @@ package org.apache.kafka.image; import org.apache.kafka.common.TopicIdPartition; -import org.apache.kafka.common.Uuid; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.Uuid; import org.apache.kafka.common.metadata.PartitionChangeRecord; import org.apache.kafka.common.metadata.PartitionRecord; import org.apache.kafka.metadata.PartitionRegistration; @@ -27,8 +27,8 @@ import java.util.HashMap; import java.util.HashSet; -import java.util.Map.Entry; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.stream.Collectors; diff --git a/metadata/src/main/java/org/apache/kafka/image/TopicImage.java b/metadata/src/main/java/org/apache/kafka/image/TopicImage.java index 66c22cb7e65bd..eaf1f5e1a8505 100644 --- a/metadata/src/main/java/org/apache/kafka/image/TopicImage.java +++ b/metadata/src/main/java/org/apache/kafka/image/TopicImage.java @@ -24,8 +24,8 @@ import org.apache.kafka.image.writer.ImageWriterOptions; import org.apache.kafka.metadata.PartitionRegistration; -import java.util.Map.Entry; import java.util.Map; +import java.util.Map.Entry; import java.util.Objects; diff --git a/metadata/src/main/java/org/apache/kafka/image/TopicsDelta.java b/metadata/src/main/java/org/apache/kafka/image/TopicsDelta.java index f21793833e579..2b441776003c5 100644 --- a/metadata/src/main/java/org/apache/kafka/image/TopicsDelta.java +++ b/metadata/src/main/java/org/apache/kafka/image/TopicsDelta.java @@ -25,8 +25,8 @@ import org.apache.kafka.common.metadata.RemoveTopicRecord; import org.apache.kafka.common.metadata.TopicRecord; import org.apache.kafka.metadata.Replicas; -import org.apache.kafka.server.immutable.ImmutableMap; import org.apache.kafka.server.common.MetadataVersion; +import org.apache.kafka.server.immutable.ImmutableMap; import java.util.Collections; import java.util.HashMap; diff --git a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java index 2ca8cac4c46ed..97d1a1f9c0fca 100644 --- a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java +++ b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataBatchLoader.java @@ -27,6 +27,7 @@ import org.apache.kafka.raft.LeaderAndEpoch; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.fault.FaultHandler; + import org.slf4j.Logger; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java index 3c53ece0609de..36b4396c41982 100644 --- a/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java +++ b/metadata/src/main/java/org/apache/kafka/image/loader/MetadataLoader.java @@ -37,6 +37,7 @@ import org.apache.kafka.server.fault.FaultHandlerException; import org.apache.kafka.snapshot.SnapshotReader; import org.apache.kafka.snapshot.Snapshots; + import org.slf4j.Logger; import java.util.Iterator; diff --git a/metadata/src/main/java/org/apache/kafka/image/loader/metrics/MetadataLoaderMetrics.java b/metadata/src/main/java/org/apache/kafka/image/loader/metrics/MetadataLoaderMetrics.java index ac3cbc3daf57d..066fa16e20033 100644 --- a/metadata/src/main/java/org/apache/kafka/image/loader/metrics/MetadataLoaderMetrics.java +++ b/metadata/src/main/java/org/apache/kafka/image/loader/metrics/MetadataLoaderMetrics.java @@ -17,13 +17,14 @@ package org.apache.kafka.image.loader.metrics; -import com.yammer.metrics.core.Gauge; -import com.yammer.metrics.core.MetricName; -import com.yammer.metrics.core.MetricsRegistry; import org.apache.kafka.image.MetadataProvenance; import org.apache.kafka.server.common.MetadataVersion; import org.apache.kafka.server.metrics.KafkaYammerMetrics; +import com.yammer.metrics.core.Gauge; +import com.yammer.metrics.core.MetricName; +import com.yammer.metrics.core.MetricsRegistry; + import java.util.Arrays; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java b/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java index e8e0e77ea7ca5..dfb97934cea7a 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/BrokerRegistrationTracker.java @@ -23,6 +23,7 @@ import org.apache.kafka.image.loader.LoaderManifest; import org.apache.kafka.metadata.BrokerRegistration; import org.apache.kafka.server.common.MetadataVersion; + import org.slf4j.Logger; /** diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java index 8dcd19d8300c1..d9f6b73742480 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotEmitter.java @@ -28,6 +28,7 @@ import org.apache.kafka.raft.RaftClient; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.snapshot.SnapshotWriter; + import org.slf4j.Logger; import java.util.Optional; diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java index 7435efeafd234..e427fbe61da31 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/SnapshotGenerator.java @@ -27,6 +27,7 @@ import org.apache.kafka.queue.EventQueue; import org.apache.kafka.queue.KafkaEventQueue; import org.apache.kafka.server.fault.FaultHandler; + import org.slf4j.Logger; import java.util.concurrent.TimeUnit; diff --git a/metadata/src/main/java/org/apache/kafka/image/publisher/metrics/SnapshotEmitterMetrics.java b/metadata/src/main/java/org/apache/kafka/image/publisher/metrics/SnapshotEmitterMetrics.java index d46b738d2a415..87d0ef3474b53 100644 --- a/metadata/src/main/java/org/apache/kafka/image/publisher/metrics/SnapshotEmitterMetrics.java +++ b/metadata/src/main/java/org/apache/kafka/image/publisher/metrics/SnapshotEmitterMetrics.java @@ -17,11 +17,12 @@ package org.apache.kafka.image.publisher.metrics; +import org.apache.kafka.common.utils.Time; +import org.apache.kafka.server.metrics.KafkaYammerMetrics; + import com.yammer.metrics.core.Gauge; import com.yammer.metrics.core.MetricName; import com.yammer.metrics.core.MetricsRegistry; -import org.apache.kafka.common.utils.Time; -import org.apache.kafka.server.metrics.KafkaYammerMetrics; import java.util.Arrays; import java.util.Optional; diff --git a/metadata/src/main/java/org/apache/kafka/image/writer/ImageWriterOptions.java b/metadata/src/main/java/org/apache/kafka/image/writer/ImageWriterOptions.java index b89b93a01556d..f84fe1e66d671 100644 --- a/metadata/src/main/java/org/apache/kafka/image/writer/ImageWriterOptions.java +++ b/metadata/src/main/java/org/apache/kafka/image/writer/ImageWriterOptions.java @@ -94,4 +94,3 @@ public void handleLoss(String loss) { lossHandler.accept(new UnwritableMetadataException(requestedMetadataVersion, loss)); } } - diff --git a/metadata/src/main/java/org/apache/kafka/metadata/KafkaConfigSchema.java b/metadata/src/main/java/org/apache/kafka/metadata/KafkaConfigSchema.java index 116dc7b290691..642c697b8badd 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/KafkaConfigSchema.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/KafkaConfigSchema.java @@ -24,13 +24,13 @@ import org.apache.kafka.common.config.types.Password; import org.apache.kafka.common.metadata.ConfigRecord; import org.apache.kafka.common.requests.DescribeConfigsResponse; +import org.apache.kafka.server.config.ConfigSynonym; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; -import org.apache.kafka.server.config.ConfigSynonym; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/ListenerInfo.java b/metadata/src/main/java/org/apache/kafka/metadata/ListenerInfo.java index 11e80ece4955b..294e8b0cbd91a 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/ListenerInfo.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/ListenerInfo.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.metadata.RegisterBrokerRecord; import org.apache.kafka.common.metadata.RegisterControllerRecord; import org.apache.kafka.common.security.auth.SecurityProtocol; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/PartitionRegistration.java b/metadata/src/main/java/org/apache/kafka/metadata/PartitionRegistration.java index 441b88fb02742..59c3763ca7205 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/PartitionRegistration.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/PartitionRegistration.java @@ -26,6 +26,7 @@ import org.apache.kafka.common.metadata.PartitionRecord; import org.apache.kafka.image.writer.ImageWriterOptions; import org.apache.kafka.server.common.ApiMessageAndVersion; + import org.slf4j.Logger; import java.util.Arrays; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerData.java b/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerData.java index 8f5feda449093..db285ea660955 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerData.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerData.java @@ -33,6 +33,7 @@ import org.apache.kafka.server.authorizer.Action; import org.apache.kafka.server.authorizer.AuthorizableRequestContext; import org.apache.kafka.server.authorizer.AuthorizationResult; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java b/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java index a30638d61d918..61c4cf2592bf5 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/migration/KRaftMigrationDriver.java @@ -38,6 +38,7 @@ import org.apache.kafka.server.fault.FaultHandler; import org.apache.kafka.server.util.Deadline; import org.apache.kafka.server.util.FutureUtils; + import org.slf4j.Logger; import java.util.EnumSet; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/placement/StripedReplicaPlacer.java b/metadata/src/main/java/org/apache/kafka/metadata/placement/StripedReplicaPlacer.java index 5cff0f668894a..3feb3f0c81b49 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/placement/StripedReplicaPlacer.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/placement/StripedReplicaPlacer.java @@ -17,6 +17,9 @@ package org.apache.kafka.metadata.placement; +import org.apache.kafka.common.errors.InvalidReplicationFactorException; +import org.apache.kafka.metadata.OptionalStringComparator; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -27,9 +30,6 @@ import java.util.Random; import java.util.stream.Collectors; -import org.apache.kafka.common.errors.InvalidReplicationFactorException; -import org.apache.kafka.metadata.OptionalStringComparator; - /** * The striped replica placer. diff --git a/metadata/src/main/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsemble.java b/metadata/src/main/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsemble.java index 19a2b8b2cb4f3..dd3ddb129dd7d 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsemble.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsemble.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.DirectoryId; import org.apache.kafka.common.Uuid; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java b/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java index 252db1a599c90..a03f08291b5d8 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/publisher/FeaturesPublisher.java @@ -23,6 +23,7 @@ import org.apache.kafka.image.loader.LoaderManifest; import org.apache.kafka.image.publisher.MetadataPublisher; import org.apache.kafka.server.common.FinalizedFeatures; + import org.slf4j.Logger; import static org.apache.kafka.server.common.MetadataVersion.MINIMUM_KRAFT_VERSION; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/util/BatchFileReader.java b/metadata/src/main/java/org/apache/kafka/metadata/util/BatchFileReader.java index 174fb416add6b..11f6403a850f6 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/util/BatchFileReader.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/util/BatchFileReader.java @@ -29,6 +29,7 @@ import org.apache.kafka.metadata.MetadataRecordSerde; import org.apache.kafka.raft.Batch; import org.apache.kafka.server.common.ApiMessageAndVersion; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/metadata/src/main/java/org/apache/kafka/metadata/util/SnapshotFileReader.java b/metadata/src/main/java/org/apache/kafka/metadata/util/SnapshotFileReader.java index a7bfd7b796502..b712be5add43c 100644 --- a/metadata/src/main/java/org/apache/kafka/metadata/util/SnapshotFileReader.java +++ b/metadata/src/main/java/org/apache/kafka/metadata/util/SnapshotFileReader.java @@ -33,6 +33,7 @@ import org.apache.kafka.raft.RaftClient; import org.apache.kafka.raft.internals.MemoryBatchReader; import org.apache.kafka.server.common.ApiMessageAndVersion; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/metadata/src/test/java/org/apache/kafka/controller/AclControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/AclControlManagerTest.java index f9e9bd54f3367..8ad6ce2633eb7 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/AclControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/AclControlManagerTest.java @@ -49,6 +49,7 @@ import org.apache.kafka.server.authorizer.AuthorizerServerInfo; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.timeline.SnapshotRegistry; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -71,10 +72,10 @@ import static org.apache.kafka.common.resource.PatternType.MATCH; import static org.apache.kafka.common.resource.ResourceType.TOPIC; import static org.apache.kafka.metadata.authorizer.StandardAclWithIdTest.TEST_ACLS; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; @Timeout(value = 40) diff --git a/metadata/src/test/java/org/apache/kafka/controller/ActivationRecordsGeneratorTest.java b/metadata/src/test/java/org/apache/kafka/controller/ActivationRecordsGeneratorTest.java index 5d3921e42bbc6..2e01ed994bd2a 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/ActivationRecordsGeneratorTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/ActivationRecordsGeneratorTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.metadata.bootstrap.BootstrapMetadata; import org.apache.kafka.metadata.migration.ZkMigrationState; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; import java.util.Optional; diff --git a/metadata/src/test/java/org/apache/kafka/controller/BrokerHeartbeatManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/BrokerHeartbeatManagerTest.java index f5c9730fef620..34f8a0f4b7d6e 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/BrokerHeartbeatManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/BrokerHeartbeatManagerTest.java @@ -17,14 +17,6 @@ package org.apache.kafka.controller; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Optional; -import java.util.OptionalLong; -import java.util.Set; -import java.util.TreeSet; - import org.apache.kafka.common.message.BrokerHeartbeatRequestData; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.MockTime; @@ -33,9 +25,18 @@ import org.apache.kafka.controller.BrokerHeartbeatManager.BrokerHeartbeatStateList; import org.apache.kafka.controller.BrokerHeartbeatManager.UsableBrokerIterator; import org.apache.kafka.metadata.placement.UsableBroker; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Optional; +import java.util.OptionalLong; +import java.util.Set; +import java.util.TreeSet; + import static org.apache.kafka.controller.BrokerControlState.CONTROLLED_SHUTDOWN; import static org.apache.kafka.controller.BrokerControlState.FENCED; import static org.apache.kafka.controller.BrokerControlState.SHUTDOWN_NOW; diff --git a/metadata/src/test/java/org/apache/kafka/controller/BrokerToElrsTest.java b/metadata/src/test/java/org/apache/kafka/controller/BrokerToElrsTest.java index b385428ca048d..32571bf081b20 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/BrokerToElrsTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/BrokerToElrsTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.server.common.TopicIdPartition; import org.apache.kafka.timeline.SnapshotRegistry; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/metadata/src/test/java/org/apache/kafka/controller/BrokersToIsrsTest.java b/metadata/src/test/java/org/apache/kafka/controller/BrokersToIsrsTest.java index f964c7dd3878c..391d301a00da2 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/BrokersToIsrsTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/BrokersToIsrsTest.java @@ -19,9 +19,10 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.utils.LogContext; -import org.apache.kafka.server.common.TopicIdPartition; import org.apache.kafka.controller.BrokersToIsrs.PartitionsOnReplicaIterator; +import org.apache.kafka.server.common.TopicIdPartition; import org.apache.kafka.timeline.SnapshotRegistry; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/controller/ClusterControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/ClusterControlManagerTest.java index 1036463276cd4..318129fddafc3 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/ClusterControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/ClusterControlManagerTest.java @@ -52,6 +52,7 @@ import org.apache.kafka.server.common.MetadataVersion; import org.apache.kafka.test.TestUtils; import org.apache.kafka.timeline.SnapshotRegistry; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; diff --git a/metadata/src/test/java/org/apache/kafka/controller/ConfigurationControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/ConfigurationControlManagerTest.java index f61d763c81888..0efdd13b112d2 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/ConfigurationControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/ConfigurationControlManagerTest.java @@ -25,13 +25,16 @@ import org.apache.kafka.common.metadata.ConfigRecord; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ApiError; -import org.apache.kafka.server.config.ConfigSynonym; import org.apache.kafka.metadata.KafkaConfigSchema; import org.apache.kafka.metadata.RecordTestUtils; import org.apache.kafka.server.common.ApiMessageAndVersion; +import org.apache.kafka.server.config.ConfigSynonym; import org.apache.kafka.server.policy.AlterConfigPolicy; import org.apache.kafka.server.policy.AlterConfigPolicy.RequestMetadata; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; + import java.util.AbstractMap.SimpleImmutableEntry; import java.util.Collections; import java.util.HashMap; @@ -43,9 +46,6 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.Timeout; - import static java.util.Arrays.asList; import static org.apache.kafka.clients.admin.AlterConfigOp.OpType.APPEND; import static org.apache.kafka.clients.admin.AlterConfigOp.OpType.DELETE; diff --git a/metadata/src/test/java/org/apache/kafka/controller/ControllerRequestContextUtil.java b/metadata/src/test/java/org/apache/kafka/controller/ControllerRequestContextUtil.java index 21153ae7a98ac..7128a173bf816 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/ControllerRequestContextUtil.java +++ b/metadata/src/test/java/org/apache/kafka/controller/ControllerRequestContextUtil.java @@ -17,14 +17,14 @@ package org.apache.kafka.controller; -import java.util.OptionalLong; -import java.util.function.Consumer; - import org.apache.kafka.common.errors.ThrottlingQuotaExceededException; import org.apache.kafka.common.message.RequestHeaderData; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.security.auth.KafkaPrincipal; +import java.util.OptionalLong; +import java.util.function.Consumer; + public class ControllerRequestContextUtil { public static final ControllerRequestContext ANONYMOUS_CONTEXT = new ControllerRequestContext( diff --git a/metadata/src/test/java/org/apache/kafka/controller/FeatureControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/FeatureControlManagerTest.java index df66f68843bbd..32401d274477e 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/FeatureControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/FeatureControlManagerTest.java @@ -17,17 +17,6 @@ package org.apache.kafka.controller; -import java.util.AbstractMap.SimpleImmutableEntry; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; - import org.apache.kafka.clients.admin.FeatureUpdate; import org.apache.kafka.common.metadata.FeatureLevelRecord; import org.apache.kafka.common.protocol.Errors; @@ -41,10 +30,22 @@ import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; import org.apache.kafka.timeline.SnapshotRegistry; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; +import java.util.AbstractMap.SimpleImmutableEntry; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; + import static java.util.Collections.emptyList; import static java.util.Collections.singletonMap; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/metadata/src/test/java/org/apache/kafka/controller/LogReplayTrackerTest.java b/metadata/src/test/java/org/apache/kafka/controller/LogReplayTrackerTest.java index eb0bd0fb70a0c..02bf9faa35a6b 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/LogReplayTrackerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/LogReplayTrackerTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.controller; import org.apache.kafka.common.metadata.NoOpRecord; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/controller/OffsetControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/OffsetControlManagerTest.java index f2f774517e797..2aa7e9e831924 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/OffsetControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/OffsetControlManagerTest.java @@ -26,6 +26,7 @@ import org.apache.kafka.raft.OffsetAndEpoch; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.timeline.TrackingSnapshotRegistry; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; diff --git a/metadata/src/test/java/org/apache/kafka/controller/PartitionChangeBuilderTest.java b/metadata/src/test/java/org/apache/kafka/controller/PartitionChangeBuilderTest.java index 7435dd00da055..632eda81b5711 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/PartitionChangeBuilderTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/PartitionChangeBuilderTest.java @@ -29,6 +29,7 @@ import org.apache.kafka.metadata.placement.DefaultDirProvider; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; diff --git a/metadata/src/test/java/org/apache/kafka/controller/PartitionReassignmentReplicasTest.java b/metadata/src/test/java/org/apache/kafka/controller/PartitionReassignmentReplicasTest.java index e35f468132983..3f4491e3d8731 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/PartitionReassignmentReplicasTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/PartitionReassignmentReplicasTest.java @@ -17,16 +17,17 @@ package org.apache.kafka.controller; -import java.util.Arrays; -import java.util.Collections; -import java.util.Optional; - import org.apache.kafka.common.Uuid; import org.apache.kafka.metadata.LeaderRecoveryState; import org.apache.kafka.metadata.PartitionRegistration; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; +import java.util.Arrays; +import java.util.Collections; +import java.util.Optional; + import static org.apache.kafka.metadata.placement.PartitionAssignmentTest.partitionAssignment; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/metadata/src/test/java/org/apache/kafka/controller/PartitionReassignmentRevertTest.java b/metadata/src/test/java/org/apache/kafka/controller/PartitionReassignmentRevertTest.java index 05148813e8108..721280b881d97 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/PartitionReassignmentRevertTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/PartitionReassignmentRevertTest.java @@ -17,14 +17,15 @@ package org.apache.kafka.controller; -import java.util.Arrays; - import org.apache.kafka.common.Uuid; import org.apache.kafka.metadata.LeaderRecoveryState; import org.apache.kafka.metadata.PartitionRegistration; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; +import java.util.Arrays; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/metadata/src/test/java/org/apache/kafka/controller/ProducerIdControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/ProducerIdControlManagerTest.java index ce2983eca47c4..6a449e4cb8454 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/ProducerIdControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/ProducerIdControlManagerTest.java @@ -17,7 +17,6 @@ package org.apache.kafka.controller; -import java.util.Collections; import org.apache.kafka.common.errors.StaleBrokerEpochException; import org.apache.kafka.common.errors.UnknownServerException; import org.apache.kafka.common.metadata.ProducerIdsRecord; @@ -27,9 +26,12 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.server.common.ProducerIdsBlock; import org.apache.kafka.timeline.SnapshotRegistry; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.Collections; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerIntegrationTestUtils.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerIntegrationTestUtils.java index c40ae1093d9cf..a8331fe9f2312 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerIntegrationTestUtils.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerIntegrationTestUtils.java @@ -17,31 +17,32 @@ package org.apache.kafka.controller; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.message.CreateTopicsResponseData.CreatableTopicResult; import org.apache.kafka.common.message.BrokerHeartbeatRequestData; +import org.apache.kafka.common.message.BrokerRegistrationRequestData; import org.apache.kafka.common.message.BrokerRegistrationRequestData.Listener; import org.apache.kafka.common.message.BrokerRegistrationRequestData.ListenerCollection; -import org.apache.kafka.common.message.BrokerRegistrationRequestData; import org.apache.kafka.common.message.CreateTopicsRequestData; import org.apache.kafka.common.message.CreateTopicsRequestData.CreatableTopic; import org.apache.kafka.common.message.CreateTopicsResponseData; +import org.apache.kafka.common.message.CreateTopicsResponseData.CreatableTopicResult; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.metadata.BrokerHeartbeatReply; import org.apache.kafka.metadata.BrokerRegistrationReply; import org.apache.kafka.server.common.MetadataVersion; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + import static org.apache.kafka.controller.ControllerRequestContextUtil.ANONYMOUS_CONTEXT; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java index f48063cda55a9..79a2448d428cb 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsIntegrationTest.java @@ -26,6 +26,7 @@ import org.apache.kafka.metadata.BrokerHeartbeatReply; import org.apache.kafka.metalog.LocalLogManagerTestEnv; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java index 6fd51df32a41f..8eed783158f8e 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java @@ -17,68 +17,26 @@ package org.apache.kafka.controller; -import java.io.File; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.OptionalInt; -import java.util.OptionalLong; -import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.errors.BrokerIdNotRegisteredException; -import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; -import org.apache.kafka.common.message.ControllerRegistrationRequestData; -import org.apache.kafka.common.message.RequestHeaderData; -import org.apache.kafka.common.metadata.AbortTransactionRecord; -import org.apache.kafka.common.metadata.BeginTransactionRecord; -import org.apache.kafka.common.metadata.BrokerRegistrationChangeRecord; -import org.apache.kafka.common.metadata.ConfigRecord; -import org.apache.kafka.common.metadata.EndTransactionRecord; -import org.apache.kafka.common.metadata.RegisterControllerRecord; -import org.apache.kafka.common.metadata.UnfenceBrokerRecord; -import org.apache.kafka.common.metadata.ZkMigrationStateRecord; -import org.apache.kafka.common.protocol.ApiKeys; -import org.apache.kafka.common.requests.AlterPartitionRequest; -import org.apache.kafka.common.security.auth.KafkaPrincipal; -import org.apache.kafka.common.security.auth.SecurityProtocol; -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.config.ConfigResource; +import org.apache.kafka.common.errors.BrokerIdNotRegisteredException; import org.apache.kafka.common.errors.TimeoutException; +import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.common.message.AllocateProducerIdsRequestData; -import org.apache.kafka.common.message.AlterPartitionRequestData; -import org.apache.kafka.common.message.AlterPartitionReassignmentsRequestData.ReassignableTopic; import org.apache.kafka.common.message.AlterPartitionReassignmentsRequestData; +import org.apache.kafka.common.message.AlterPartitionReassignmentsRequestData.ReassignableTopic; import org.apache.kafka.common.message.AlterPartitionReassignmentsResponseData; +import org.apache.kafka.common.message.AlterPartitionRequestData; import org.apache.kafka.common.message.BrokerHeartbeatRequestData; +import org.apache.kafka.common.message.BrokerRegistrationRequestData; import org.apache.kafka.common.message.BrokerRegistrationRequestData.Listener; import org.apache.kafka.common.message.BrokerRegistrationRequestData.ListenerCollection; -import org.apache.kafka.common.message.BrokerRegistrationRequestData; +import org.apache.kafka.common.message.ControllerRegistrationRequestData; import org.apache.kafka.common.message.CreatePartitionsRequestData.CreatePartitionsTopic; import org.apache.kafka.common.message.CreatePartitionsResponseData.CreatePartitionsTopicResult; +import org.apache.kafka.common.message.CreateTopicsRequestData; import org.apache.kafka.common.message.CreateTopicsRequestData.CreatableReplicaAssignment; import org.apache.kafka.common.message.CreateTopicsRequestData.CreatableReplicaAssignmentCollection; -import org.apache.kafka.common.message.CreateTopicsRequestData; import org.apache.kafka.common.message.CreateTopicsRequestData.CreatableTopic; import org.apache.kafka.common.message.CreateTopicsRequestData.CreatableTopicCollection; import org.apache.kafka.common.message.CreateTopicsResponseData; @@ -86,15 +44,31 @@ import org.apache.kafka.common.message.ElectLeadersResponseData; import org.apache.kafka.common.message.ListPartitionReassignmentsRequestData; import org.apache.kafka.common.message.ListPartitionReassignmentsResponseData; +import org.apache.kafka.common.message.RequestHeaderData; +import org.apache.kafka.common.metadata.AbortTransactionRecord; +import org.apache.kafka.common.metadata.BeginTransactionRecord; +import org.apache.kafka.common.metadata.BrokerRegistrationChangeRecord; +import org.apache.kafka.common.metadata.ConfigRecord; +import org.apache.kafka.common.metadata.EndTransactionRecord; import org.apache.kafka.common.metadata.FeatureLevelRecord; import org.apache.kafka.common.metadata.PartitionRecord; import org.apache.kafka.common.metadata.ProducerIdsRecord; import org.apache.kafka.common.metadata.RegisterBrokerRecord; import org.apache.kafka.common.metadata.RegisterBrokerRecord.BrokerEndpoint; import org.apache.kafka.common.metadata.RegisterBrokerRecord.BrokerEndpointCollection; +import org.apache.kafka.common.metadata.RegisterControllerRecord; import org.apache.kafka.common.metadata.TopicRecord; +import org.apache.kafka.common.metadata.UnfenceBrokerRecord; +import org.apache.kafka.common.metadata.ZkMigrationStateRecord; +import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; +import org.apache.kafka.common.requests.AlterPartitionRequest; import org.apache.kafka.common.requests.ApiError; +import org.apache.kafka.common.security.auth.KafkaPrincipal; +import org.apache.kafka.common.security.auth.SecurityProtocol; +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.controller.QuorumController.ConfigResourceExistenceChecker; import org.apache.kafka.image.AclsDelta; import org.apache.kafka.image.AclsImage; @@ -139,6 +113,7 @@ import org.apache.kafka.snapshot.Snapshots; import org.apache.kafka.test.TestUtils; import org.apache.kafka.timeline.SnapshotRegistry; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -148,6 +123,32 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.OptionalInt; +import java.util.OptionalLong; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + import static java.util.Collections.singletonList; import static java.util.function.Function.identity; import static org.apache.kafka.clients.admin.AlterConfigOp.OpType.SET; diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumFeaturesTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumFeaturesTest.java index 9c81fad156166..e9629c0948e38 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumFeaturesTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumFeaturesTest.java @@ -24,6 +24,7 @@ import org.apache.kafka.metadata.VersionRange; import org.apache.kafka.server.common.Features; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java b/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java index c5c231029d8a8..684b0dbfcbcc6 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/ReplicationControlManagerTest.java @@ -27,17 +27,17 @@ import org.apache.kafka.common.errors.PolicyViolationException; import org.apache.kafka.common.errors.StaleBrokerEpochException; import org.apache.kafka.common.errors.UnsupportedVersionException; -import org.apache.kafka.common.message.AlterPartitionRequestData; -import org.apache.kafka.common.message.AlterPartitionRequestData.BrokerState; -import org.apache.kafka.common.message.AlterPartitionRequestData.PartitionData; -import org.apache.kafka.common.message.AlterPartitionRequestData.TopicData; -import org.apache.kafka.common.message.AlterPartitionResponseData; import org.apache.kafka.common.message.AlterPartitionReassignmentsRequestData; import org.apache.kafka.common.message.AlterPartitionReassignmentsRequestData.ReassignablePartition; import org.apache.kafka.common.message.AlterPartitionReassignmentsRequestData.ReassignableTopic; import org.apache.kafka.common.message.AlterPartitionReassignmentsResponseData; import org.apache.kafka.common.message.AlterPartitionReassignmentsResponseData.ReassignablePartitionResponse; import org.apache.kafka.common.message.AlterPartitionReassignmentsResponseData.ReassignableTopicResponse; +import org.apache.kafka.common.message.AlterPartitionRequestData; +import org.apache.kafka.common.message.AlterPartitionRequestData.BrokerState; +import org.apache.kafka.common.message.AlterPartitionRequestData.PartitionData; +import org.apache.kafka.common.message.AlterPartitionRequestData.TopicData; +import org.apache.kafka.common.message.AlterPartitionResponseData; import org.apache.kafka.common.message.AssignReplicasToDirsRequestData; import org.apache.kafka.common.message.AssignReplicasToDirsResponseData; import org.apache.kafka.common.message.BrokerHeartbeatRequestData; @@ -63,10 +63,10 @@ import org.apache.kafka.common.metadata.BrokerRegistrationChangeRecord; import org.apache.kafka.common.metadata.ConfigRecord; import org.apache.kafka.common.metadata.PartitionChangeRecord; +import org.apache.kafka.common.metadata.PartitionRecord; import org.apache.kafka.common.metadata.RegisterBrokerRecord; import org.apache.kafka.common.metadata.RemoveTopicRecord; import org.apache.kafka.common.metadata.TopicRecord; -import org.apache.kafka.common.metadata.PartitionRecord; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ApiMessage; import org.apache.kafka.common.protocol.Errors; @@ -95,6 +95,7 @@ import org.apache.kafka.server.policy.CreateTopicPolicy; import org.apache.kafka.server.util.MockRandom; import org.apache.kafka.timeline.SnapshotRegistry; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; @@ -103,12 +104,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; -import java.util.Comparator; -import java.util.TreeSet; -import java.util.concurrent.atomic.AtomicLong; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -116,7 +115,9 @@ import java.util.Optional; import java.util.OptionalInt; import java.util.Set; +import java.util.TreeSet; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; import java.util.stream.IntStream; diff --git a/metadata/src/test/java/org/apache/kafka/controller/ResultOrErrorTest.java b/metadata/src/test/java/org/apache/kafka/controller/ResultOrErrorTest.java index c4c7ae4617fa5..c0085a8d70a9a 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/ResultOrErrorTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/ResultOrErrorTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.ApiError; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/controller/errors/ControllerExceptionsTest.java b/metadata/src/test/java/org/apache/kafka/controller/errors/ControllerExceptionsTest.java index 2d1905b1a5c1c..a199b053c120d 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/errors/ControllerExceptionsTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/errors/ControllerExceptionsTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.errors.NotControllerException; import org.apache.kafka.common.errors.TimeoutException; import org.apache.kafka.common.errors.TopicExistsException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/controller/errors/EventHandlerExceptionInfoTest.java b/metadata/src/test/java/org/apache/kafka/controller/errors/EventHandlerExceptionInfoTest.java index 042ca75aad84c..4ae963ec2e1dc 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/errors/EventHandlerExceptionInfoTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/errors/EventHandlerExceptionInfoTest.java @@ -24,6 +24,7 @@ import org.apache.kafka.common.errors.UnknownServerException; import org.apache.kafka.raft.errors.NotLeaderException; import org.apache.kafka.raft.errors.UnexpectedBaseOffsetException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetadataMetricsPublisherTest.java b/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetadataMetricsPublisherTest.java index 1f6adf93c5721..2d230d605127f 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetadataMetricsPublisherTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetadataMetricsPublisherTest.java @@ -17,8 +17,6 @@ package org.apache.kafka.controller.metrics; -import java.util.Optional; - import org.apache.kafka.common.Uuid; import org.apache.kafka.image.AclsImage; import org.apache.kafka.image.ClientQuotasImage; @@ -39,8 +37,11 @@ import org.apache.kafka.image.writer.ImageWriterOptions; import org.apache.kafka.raft.LeaderAndEpoch; import org.apache.kafka.server.fault.MockFaultHandler; + import org.junit.jupiter.api.Test; +import java.util.Optional; + import static org.apache.kafka.controller.metrics.ControllerMetricsTestUtils.FakePartitionRegistrationType.NON_PREFERRED_LEADER; import static org.apache.kafka.controller.metrics.ControllerMetricsTestUtils.FakePartitionRegistrationType.NORMAL; import static org.apache.kafka.controller.metrics.ControllerMetricsTestUtils.FakePartitionRegistrationType.OFFLINE; diff --git a/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetadataMetricsTest.java b/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetadataMetricsTest.java index 9bec14d0c698b..984ad68d0c151 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetadataMetricsTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetadataMetricsTest.java @@ -21,6 +21,8 @@ import com.yammer.metrics.core.MetricName; import com.yammer.metrics.core.MetricsRegistry; +import org.junit.jupiter.api.Test; + import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -28,7 +30,6 @@ import java.util.function.BiConsumer; import java.util.function.Function; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; public class ControllerMetadataMetricsTest { diff --git a/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetricsChangesTest.java b/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetricsChangesTest.java index eaf789619d18e..0cfea7b4ce5b6 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetricsChangesTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetricsChangesTest.java @@ -17,10 +17,6 @@ package org.apache.kafka.controller.metrics; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - import org.apache.kafka.common.Uuid; import org.apache.kafka.common.metadata.PartitionChangeRecord; import org.apache.kafka.common.metadata.PartitionRecord; @@ -30,10 +26,15 @@ import org.apache.kafka.metadata.BrokerRegistration; import org.apache.kafka.metadata.PartitionRegistration; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; -import static org.apache.kafka.controller.metrics.ControllerMetricsTestUtils.FakePartitionRegistrationType.NORMAL; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + import static org.apache.kafka.controller.metrics.ControllerMetricsTestUtils.FakePartitionRegistrationType.NON_PREFERRED_LEADER; +import static org.apache.kafka.controller.metrics.ControllerMetricsTestUtils.FakePartitionRegistrationType.NORMAL; import static org.apache.kafka.controller.metrics.ControllerMetricsTestUtils.FakePartitionRegistrationType.OFFLINE; import static org.apache.kafka.controller.metrics.ControllerMetricsTestUtils.fakePartitionRegistration; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetricsTestUtils.java b/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetricsTestUtils.java index a0e3a5cd86a50..8d0029ccb57e9 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetricsTestUtils.java +++ b/metadata/src/test/java/org/apache/kafka/controller/metrics/ControllerMetricsTestUtils.java @@ -17,7 +17,6 @@ package org.apache.kafka.controller.metrics; -import com.yammer.metrics.core.MetricsRegistry; import org.apache.kafka.common.DirectoryId; import org.apache.kafka.common.Uuid; import org.apache.kafka.image.TopicImage; @@ -25,6 +24,8 @@ import org.apache.kafka.metadata.LeaderRecoveryState; import org.apache.kafka.metadata.PartitionRegistration; +import com.yammer.metrics.core.MetricsRegistry; + import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/metadata/src/test/java/org/apache/kafka/controller/metrics/QuorumControllerMetricsTest.java b/metadata/src/test/java/org/apache/kafka/controller/metrics/QuorumControllerMetricsTest.java index 95b58e792338e..04dfefa98cda2 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/metrics/QuorumControllerMetricsTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/metrics/QuorumControllerMetricsTest.java @@ -17,21 +17,22 @@ package org.apache.kafka.controller.metrics; +import org.apache.kafka.common.utils.MockTime; + import com.yammer.metrics.core.Gauge; import com.yammer.metrics.core.Histogram; import com.yammer.metrics.core.MetricName; import com.yammer.metrics.core.MetricsRegistry; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Optional; -import org.apache.kafka.common.utils.MockTime; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; - import static org.junit.jupiter.api.Assertions.assertEquals; public class QuorumControllerMetricsTest { diff --git a/metadata/src/test/java/org/apache/kafka/image/AclsDeltaTest.java b/metadata/src/test/java/org/apache/kafka/image/AclsDeltaTest.java index 08f67c4ff6d41..1d403b5cc4231 100644 --- a/metadata/src/test/java/org/apache/kafka/image/AclsDeltaTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/AclsDeltaTest.java @@ -17,15 +17,11 @@ package org.apache.kafka.image; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.apache.kafka.common.Uuid; import org.apache.kafka.common.metadata.AccessControlEntryRecord; import org.apache.kafka.common.metadata.RemoveAccessControlEntryRecord; import org.apache.kafka.metadata.authorizer.StandardAcl; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; @@ -34,6 +30,11 @@ import java.util.Map; import java.util.Optional; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + @Timeout(40) public class AclsDeltaTest { diff --git a/metadata/src/test/java/org/apache/kafka/image/AclsImageTest.java b/metadata/src/test/java/org/apache/kafka/image/AclsImageTest.java index 5ba2716e24e09..021e3c52e53b9 100644 --- a/metadata/src/test/java/org/apache/kafka/image/AclsImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/AclsImageTest.java @@ -25,6 +25,7 @@ import org.apache.kafka.metadata.authorizer.StandardAcl; import org.apache.kafka.metadata.authorizer.StandardAclWithId; import org.apache.kafka.server.common.ApiMessageAndVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/ClusterImageTest.java b/metadata/src/test/java/org/apache/kafka/image/ClusterImageTest.java index f07cfeaaba5a1..cc7e04ed1a5a5 100644 --- a/metadata/src/test/java/org/apache/kafka/image/ClusterImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/ClusterImageTest.java @@ -41,6 +41,7 @@ import org.apache.kafka.metadata.VersionRange; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/ConfigurationsImageTest.java b/metadata/src/test/java/org/apache/kafka/image/ConfigurationsImageTest.java index 9cc7f9052d546..3b49ec339463a 100644 --- a/metadata/src/test/java/org/apache/kafka/image/ConfigurationsImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/ConfigurationsImageTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.image.writer.RecordListWriter; import org.apache.kafka.metadata.RecordTestUtils; import org.apache.kafka.server.common.ApiMessageAndVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/DelegationTokenImageTest.java b/metadata/src/test/java/org/apache/kafka/image/DelegationTokenImageTest.java index 13d61ddbd7d67..7de0237068d1b 100644 --- a/metadata/src/test/java/org/apache/kafka/image/DelegationTokenImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/DelegationTokenImageTest.java @@ -24,10 +24,11 @@ import org.apache.kafka.common.utils.SecurityUtils; import org.apache.kafka.image.writer.ImageWriterOptions; import org.apache.kafka.image.writer.RecordListWriter; -import org.apache.kafka.metadata.RecordTestUtils; import org.apache.kafka.metadata.DelegationTokenData; +import org.apache.kafka.metadata.RecordTestUtils; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/FeaturesImageTest.java b/metadata/src/test/java/org/apache/kafka/image/FeaturesImageTest.java index c2c67f9a84f97..a23678098fb02 100644 --- a/metadata/src/test/java/org/apache/kafka/image/FeaturesImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/FeaturesImageTest.java @@ -24,6 +24,7 @@ import org.apache.kafka.metadata.migration.ZkMigrationState; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/ImageDowngradeTest.java b/metadata/src/test/java/org/apache/kafka/image/ImageDowngradeTest.java index 4da792ae95735..68fc8053bd2dd 100644 --- a/metadata/src/test/java/org/apache/kafka/image/ImageDowngradeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/ImageDowngradeTest.java @@ -29,6 +29,7 @@ import org.apache.kafka.metadata.RecordTestUtils; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/MetadataImageTest.java b/metadata/src/test/java/org/apache/kafka/image/MetadataImageTest.java index b2cefade5dfa6..b75ca8330fd0b 100644 --- a/metadata/src/test/java/org/apache/kafka/image/MetadataImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/MetadataImageTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.image.writer.RecordListWriter; import org.apache.kafka.metadata.RecordTestUtils; import org.apache.kafka.server.common.ApiMessageAndVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/ProducerIdsImageTest.java b/metadata/src/test/java/org/apache/kafka/image/ProducerIdsImageTest.java index a99e90bdc7f00..4412d16deb453 100644 --- a/metadata/src/test/java/org/apache/kafka/image/ProducerIdsImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/ProducerIdsImageTest.java @@ -22,6 +22,7 @@ import org.apache.kafka.image.writer.RecordListWriter; import org.apache.kafka.metadata.RecordTestUtils; import org.apache.kafka.server.common.ApiMessageAndVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/ScramImageTest.java b/metadata/src/test/java/org/apache/kafka/image/ScramImageTest.java index 56f9846673c5b..528b75fbe03cf 100644 --- a/metadata/src/test/java/org/apache/kafka/image/ScramImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/ScramImageTest.java @@ -22,11 +22,12 @@ import org.apache.kafka.common.metadata.UserScramCredentialRecord; import org.apache.kafka.image.writer.ImageWriterOptions; import org.apache.kafka.image.writer.RecordListWriter; -import org.apache.kafka.server.common.MetadataVersion; -import org.apache.kafka.server.util.MockRandom; import org.apache.kafka.metadata.RecordTestUtils; import org.apache.kafka.metadata.ScramCredentialData; import org.apache.kafka.server.common.ApiMessageAndVersion; +import org.apache.kafka.server.common.MetadataVersion; +import org.apache.kafka.server.util.MockRandom; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/TopicsImageTest.java b/metadata/src/test/java/org/apache/kafka/image/TopicsImageTest.java index be85516a19c2e..2dbb93e4f41fa 100644 --- a/metadata/src/test/java/org/apache/kafka/image/TopicsImageTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/TopicsImageTest.java @@ -29,8 +29,9 @@ import org.apache.kafka.metadata.LeaderRecoveryState; import org.apache.kafka.metadata.PartitionRegistration; import org.apache.kafka.metadata.RecordTestUtils; -import org.apache.kafka.server.immutable.ImmutableMap; import org.apache.kafka.server.common.ApiMessageAndVersion; +import org.apache.kafka.server.immutable.ImmutableMap; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/loader/MetadataBatchLoaderTest.java b/metadata/src/test/java/org/apache/kafka/image/loader/MetadataBatchLoaderTest.java index a77d72b72bcee..311aac0098dc0 100644 --- a/metadata/src/test/java/org/apache/kafka/image/loader/MetadataBatchLoaderTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/loader/MetadataBatchLoaderTest.java @@ -32,6 +32,7 @@ import org.apache.kafka.raft.LeaderAndEpoch; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.fault.MockFaultHandler; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java b/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java index 550d32b4e2654..f9949703d9576 100644 --- a/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/loader/MetadataLoaderTest.java @@ -44,6 +44,7 @@ import org.apache.kafka.server.fault.MockFaultHandler; import org.apache.kafka.snapshot.SnapshotReader; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; diff --git a/metadata/src/test/java/org/apache/kafka/image/loader/metrics/MetadataLoaderMetricsTest.java b/metadata/src/test/java/org/apache/kafka/image/loader/metrics/MetadataLoaderMetricsTest.java index 0ecf2a1d65e8a..014a226e08139 100644 --- a/metadata/src/test/java/org/apache/kafka/image/loader/metrics/MetadataLoaderMetricsTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/loader/metrics/MetadataLoaderMetricsTest.java @@ -17,10 +17,15 @@ package org.apache.kafka.image.loader.metrics; +import org.apache.kafka.controller.metrics.ControllerMetricsTestUtils; +import org.apache.kafka.image.MetadataProvenance; + import com.yammer.metrics.core.Gauge; import com.yammer.metrics.core.MetricName; import com.yammer.metrics.core.MetricsRegistry; +import org.junit.jupiter.api.Test; + import java.util.Arrays; import java.util.Collections; import java.util.HashSet; @@ -29,10 +34,6 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -import org.apache.kafka.controller.metrics.ControllerMetricsTestUtils; -import org.apache.kafka.image.MetadataProvenance; -import org.junit.jupiter.api.Test; - import static org.apache.kafka.server.common.MetadataVersion.IBP_3_3_IV2; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/metadata/src/test/java/org/apache/kafka/image/node/ClientQuotasImageNodeTest.java b/metadata/src/test/java/org/apache/kafka/image/node/ClientQuotasImageNodeTest.java index 7abf08fbb3042..c22ae8821a439 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/ClientQuotasImageNodeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/ClientQuotasImageNodeTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.image.node; import org.apache.kafka.common.quota.ClientQuotaEntity; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageBrokersNodeTest.java b/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageBrokersNodeTest.java index e08bacec719d6..e846443d0fb93 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageBrokersNodeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageBrokersNodeTest.java @@ -22,6 +22,7 @@ import org.apache.kafka.metadata.BrokerRegistration; import org.apache.kafka.metadata.VersionRange; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageControllersNodeTest.java b/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageControllersNodeTest.java index b98e89f4f0e62..43f52dabaa28a 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageControllersNodeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageControllersNodeTest.java @@ -22,6 +22,7 @@ import org.apache.kafka.metadata.ControllerRegistration; import org.apache.kafka.metadata.VersionRange; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageNodeTest.java b/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageNodeTest.java index 64a50aa072c5f..1c9e6c8192796 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageNodeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/ClusterImageNodeTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.image.node; import org.apache.kafka.image.ClusterImage; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/node/ConfigurationImageNodeTest.java b/metadata/src/test/java/org/apache/kafka/image/node/ConfigurationImageNodeTest.java index d94587a03b514..d7a19d034f7f0 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/ConfigurationImageNodeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/ConfigurationImageNodeTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.image.node.printer.MetadataNodeRedactionCriteria; import org.apache.kafka.image.node.printer.NodeStringifier; import org.apache.kafka.metadata.KafkaConfigSchema; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/node/ConfigurationsImageNodeTest.java b/metadata/src/test/java/org/apache/kafka/image/node/ConfigurationsImageNodeTest.java index 68bb2d912b0fb..f34e86e191da1 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/ConfigurationsImageNodeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/ConfigurationsImageNodeTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.image.ConfigurationImage; import org.apache.kafka.image.ConfigurationsImage; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/node/ScramCredentialDataNodeTest.java b/metadata/src/test/java/org/apache/kafka/image/node/ScramCredentialDataNodeTest.java index b8f4cf780585b..a78870b8f1185 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/ScramCredentialDataNodeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/ScramCredentialDataNodeTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.image.node.printer.NodeStringifier; import org.apache.kafka.metadata.ScramCredentialData; import org.apache.kafka.server.util.MockRandom; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/metadata/src/test/java/org/apache/kafka/image/node/TopicImageNodeTest.java b/metadata/src/test/java/org/apache/kafka/image/node/TopicImageNodeTest.java index 8a0b8026a0526..60d4587c3401b 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/TopicImageNodeTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/TopicImageNodeTest.java @@ -23,11 +23,14 @@ import org.apache.kafka.image.node.printer.NodeStringifier; import org.apache.kafka.metadata.LeaderRecoveryState; import org.apache.kafka.metadata.PartitionRegistration; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; + import java.util.Arrays; import java.util.HashMap; import java.util.Map; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/metadata/src/test/java/org/apache/kafka/image/node/printer/MetadataNodeRedactionCriteriaTest.java b/metadata/src/test/java/org/apache/kafka/image/node/printer/MetadataNodeRedactionCriteriaTest.java index 13ad633c771de..a6d1a65ed7d80 100644 --- a/metadata/src/test/java/org/apache/kafka/image/node/printer/MetadataNodeRedactionCriteriaTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/node/printer/MetadataNodeRedactionCriteriaTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.metadata.KafkaConfigSchema; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/metadata/src/test/java/org/apache/kafka/image/publisher/BrokerRegistrationTrackerTest.java b/metadata/src/test/java/org/apache/kafka/image/publisher/BrokerRegistrationTrackerTest.java index 4438acc75825b..2e081dbb0775c 100644 --- a/metadata/src/test/java/org/apache/kafka/image/publisher/BrokerRegistrationTrackerTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/publisher/BrokerRegistrationTrackerTest.java @@ -26,6 +26,7 @@ import org.apache.kafka.image.loader.LogDeltaManifest; import org.apache.kafka.raft.LeaderAndEpoch; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; diff --git a/metadata/src/test/java/org/apache/kafka/image/publisher/ControllerRegistrationsPublisherTest.java b/metadata/src/test/java/org/apache/kafka/image/publisher/ControllerRegistrationsPublisherTest.java index 4df46a2e8db84..8013d299940fc 100644 --- a/metadata/src/test/java/org/apache/kafka/image/publisher/ControllerRegistrationsPublisherTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/publisher/ControllerRegistrationsPublisherTest.java @@ -26,6 +26,7 @@ import org.apache.kafka.metadata.RecordTestUtils; import org.apache.kafka.raft.LeaderAndEpoch; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; diff --git a/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotEmitterTest.java b/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotEmitterTest.java index d8008ad56f8f2..bcf603b577fe0 100644 --- a/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotEmitterTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotEmitterTest.java @@ -25,6 +25,7 @@ import org.apache.kafka.raft.RaftClient; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.snapshot.SnapshotWriter; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java b/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java index a99fee3968c62..955a73bd1e254 100644 --- a/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/publisher/SnapshotGeneratorTest.java @@ -27,6 +27,7 @@ import org.apache.kafka.server.fault.FaultHandlerException; import org.apache.kafka.server.fault.MockFaultHandler; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/publisher/metrics/SnapshotEmitterMetricsTest.java b/metadata/src/test/java/org/apache/kafka/image/publisher/metrics/SnapshotEmitterMetricsTest.java index 9f79631eef3d0..ed6130c0c33e9 100644 --- a/metadata/src/test/java/org/apache/kafka/image/publisher/metrics/SnapshotEmitterMetricsTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/publisher/metrics/SnapshotEmitterMetricsTest.java @@ -17,22 +17,23 @@ package org.apache.kafka.image.publisher.metrics; +import org.apache.kafka.common.utils.MockTime; +import org.apache.kafka.controller.metrics.ControllerMetricsTestUtils; + import com.yammer.metrics.core.Gauge; import com.yammer.metrics.core.MetricName; import com.yammer.metrics.core.MetricsRegistry; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Optional; - -import org.apache.kafka.common.utils.MockTime; -import org.apache.kafka.controller.metrics.ControllerMetricsTestUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Optional; + import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/metadata/src/test/java/org/apache/kafka/image/writer/ImageReWriterTest.java b/metadata/src/test/java/org/apache/kafka/image/writer/ImageReWriterTest.java index fd81cc98dcc83..c089fd77d3f0f 100644 --- a/metadata/src/test/java/org/apache/kafka/image/writer/ImageReWriterTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/writer/ImageReWriterTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.metadata.TopicRecord; import org.apache.kafka.image.MetadataDelta; import org.apache.kafka.image.MetadataImage; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/writer/ImageWriterOptionsTest.java b/metadata/src/test/java/org/apache/kafka/image/writer/ImageWriterOptionsTest.java index 8db386117ab51..c1c119f9b4cb5 100644 --- a/metadata/src/test/java/org/apache/kafka/image/writer/ImageWriterOptionsTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/writer/ImageWriterOptionsTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.image.writer; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/writer/RaftSnapshotWriterTest.java b/metadata/src/test/java/org/apache/kafka/image/writer/RaftSnapshotWriterTest.java index 0137aeb077224..3602e8988b8ab 100644 --- a/metadata/src/test/java/org/apache/kafka/image/writer/RaftSnapshotWriterTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/writer/RaftSnapshotWriterTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.image.writer; import org.apache.kafka.image.FakeSnapshotWriter; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/image/writer/RecordListWriterTest.java b/metadata/src/test/java/org/apache/kafka/image/writer/RecordListWriterTest.java index 713c2e4d0596b..a3b5627f3a3a1 100644 --- a/metadata/src/test/java/org/apache/kafka/image/writer/RecordListWriterTest.java +++ b/metadata/src/test/java/org/apache/kafka/image/writer/RecordListWriterTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.metadata.TopicRecord; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/BrokerRegistrationTest.java b/metadata/src/test/java/org/apache/kafka/metadata/BrokerRegistrationTest.java index 8f3eac706f04a..485a39aad8b0f 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/BrokerRegistrationTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/BrokerRegistrationTest.java @@ -25,6 +25,7 @@ import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.image.writer.ImageWriterOptions; import org.apache.kafka.server.common.ApiMessageAndVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/BrokerStateTest.java b/metadata/src/test/java/org/apache/kafka/metadata/BrokerStateTest.java index 788fe923ce5eb..7af145bfc5795 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/BrokerStateTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/BrokerStateTest.java @@ -17,11 +17,11 @@ package org.apache.kafka.metadata; -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; +import static org.junit.jupiter.api.Assertions.assertEquals; + @Timeout(value = 40) public class BrokerStateTest { diff --git a/metadata/src/test/java/org/apache/kafka/metadata/ConfigSynonymTest.java b/metadata/src/test/java/org/apache/kafka/metadata/ConfigSynonymTest.java index deff4f801b2fc..f50c10b612a50 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/ConfigSynonymTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/ConfigSynonymTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.metadata; import org.apache.kafka.server.config.ConfigSynonym; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/ControllerRegistrationTest.java b/metadata/src/test/java/org/apache/kafka/metadata/ControllerRegistrationTest.java index ff1b6328a5f47..fc8786a202849 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/ControllerRegistrationTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/ControllerRegistrationTest.java @@ -25,6 +25,7 @@ import org.apache.kafka.image.writer.ImageWriterOptions; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/DelegationTokenDataTest.java b/metadata/src/test/java/org/apache/kafka/metadata/DelegationTokenDataTest.java index 2c84d8d6031f1..f945b373be17d 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/DelegationTokenDataTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/DelegationTokenDataTest.java @@ -17,11 +17,12 @@ package org.apache.kafka.metadata; +import org.apache.kafka.common.Uuid; import org.apache.kafka.common.metadata.DelegationTokenRecord; import org.apache.kafka.common.security.auth.KafkaPrincipal; import org.apache.kafka.common.security.token.delegation.TokenInformation; -import org.apache.kafka.common.Uuid; import org.apache.kafka.server.common.ApiMessageAndVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/KafkaConfigSchemaTest.java b/metadata/src/test/java/org/apache/kafka/metadata/KafkaConfigSchemaTest.java index 49597fff9ae7b..268aba6634e8f 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/KafkaConfigSchemaTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/KafkaConfigSchemaTest.java @@ -22,6 +22,7 @@ import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.requests.DescribeConfigsResponse; import org.apache.kafka.server.config.ConfigSynonym; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/LeaderRecoveryStateTest.java b/metadata/src/test/java/org/apache/kafka/metadata/LeaderRecoveryStateTest.java index 5e1513b1e0e5d..f2620e84e7e5c 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/LeaderRecoveryStateTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/LeaderRecoveryStateTest.java @@ -17,10 +17,12 @@ package org.apache.kafka.metadata; +import org.junit.jupiter.api.Test; + import java.util.HashSet; import java.util.Optional; import java.util.Set; -import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/ListenerInfoTest.java b/metadata/src/test/java/org/apache/kafka/metadata/ListenerInfoTest.java index ac90599d7d9d0..a0f9fa3b379da 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/ListenerInfoTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/ListenerInfoTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.Endpoint; import org.apache.kafka.common.security.auth.SecurityProtocol; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/MetadataRecordSerdeTest.java b/metadata/src/test/java/org/apache/kafka/metadata/MetadataRecordSerdeTest.java index cbcbe85659c1c..1e61f10d8fe3b 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/MetadataRecordSerdeTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/MetadataRecordSerdeTest.java @@ -24,6 +24,7 @@ import org.apache.kafka.common.utils.ByteUtils; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.serialization.MetadataParseException; + import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/PartitionRegistrationTest.java b/metadata/src/test/java/org/apache/kafka/metadata/PartitionRegistrationTest.java index b1ce4fa00ca05..cce2a9ebb0547 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/PartitionRegistrationTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/PartitionRegistrationTest.java @@ -17,11 +17,6 @@ package org.apache.kafka.metadata; -import net.jqwik.api.Arbitraries; -import net.jqwik.api.Arbitrary; -import net.jqwik.api.ForAll; -import net.jqwik.api.Property; -import net.jqwik.api.Provide; import org.apache.kafka.common.DirectoryId; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; @@ -32,6 +27,13 @@ import org.apache.kafka.image.writer.UnwritableMetadataException; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; + +import net.jqwik.api.Arbitraries; +import net.jqwik.api.Arbitrary; +import net.jqwik.api.ForAll; +import net.jqwik.api.Property; +import net.jqwik.api.Provide; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; @@ -48,8 +50,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; @Timeout(40) diff --git a/metadata/src/test/java/org/apache/kafka/metadata/ScramCredentialDataTest.java b/metadata/src/test/java/org/apache/kafka/metadata/ScramCredentialDataTest.java index 1b4d9eaccd148..cfb774680870b 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/ScramCredentialDataTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/ScramCredentialDataTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.common.metadata.UserScramCredentialRecord; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.util.MockRandom; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/VersionRangeTest.java b/metadata/src/test/java/org/apache/kafka/metadata/VersionRangeTest.java index 4e8cec759ee47..8058d149a8628 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/VersionRangeTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/VersionRangeTest.java @@ -19,6 +19,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/ClusterMetadataAuthorizerTest.java b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/ClusterMetadataAuthorizerTest.java index 3242170bcdfed..eb62c931d8e51 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/ClusterMetadataAuthorizerTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/ClusterMetadataAuthorizerTest.java @@ -34,6 +34,7 @@ import org.apache.kafka.server.authorizer.AuthorizableRequestContext; import org.apache.kafka.server.authorizer.AuthorizationResult; import org.apache.kafka.server.authorizer.AuthorizerServerInfo; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclRecordIteratorTest.java b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclRecordIteratorTest.java index f5b17018dd4ef..99c17edd37d98 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclRecordIteratorTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclRecordIteratorTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.metadata.authorizer; import org.apache.kafka.server.common.ApiMessageAndVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclTest.java b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclTest.java index e2264eb7db2d0..3017c565b3b0b 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.resource.PatternType; import org.apache.kafka.common.resource.Resource; import org.apache.kafka.common.resource.ResourceType; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclWithIdTest.java b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclWithIdTest.java index c4393f5ed590d..eec6e4ba475c0 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclWithIdTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAclWithIdTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.metadata.AccessControlEntryRecord; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerPropertyTest.java b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerPropertyTest.java index 8935b92e2f9d5..5c532c4873738 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerPropertyTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerPropertyTest.java @@ -16,13 +16,6 @@ */ package org.apache.kafka.metadata.authorizer; -import net.jqwik.api.Assume; -import net.jqwik.api.ForAll; -import net.jqwik.api.Property; -import net.jqwik.api.constraints.AlphaChars; -import net.jqwik.api.constraints.Chars; -import net.jqwik.api.constraints.NumericChars; -import net.jqwik.api.constraints.Size; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.acl.AccessControlEntryFilter; import org.apache.kafka.common.acl.AclBinding; @@ -39,6 +32,14 @@ import org.apache.kafka.server.authorizer.AuthorizableRequestContext; import org.apache.kafka.server.authorizer.AuthorizationResult; +import net.jqwik.api.Assume; +import net.jqwik.api.ForAll; +import net.jqwik.api.Property; +import net.jqwik.api.constraints.AlphaChars; +import net.jqwik.api.constraints.Chars; +import net.jqwik.api.constraints.NumericChars; +import net.jqwik.api.constraints.Size; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerTest.java b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerTest.java index 25ebf65b1823e..bfa40c7c2e0f8 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/authorizer/StandardAuthorizerTest.java @@ -36,6 +36,7 @@ import org.apache.kafka.server.authorizer.Action; import org.apache.kafka.server.authorizer.AuthorizableRequestContext; import org.apache.kafka.server.authorizer.AuthorizerServerInfo; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; @@ -55,8 +56,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.CompletionStage; +import java.util.concurrent.atomic.AtomicLong; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java index 0a3d4d6f9dbfc..8e35ea6741ef2 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapDirectoryTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.server.common.MetadataVersion; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapMetadataTest.java b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapMetadataTest.java index 363d853f2c7a1..121c2c3f884cb 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapMetadataTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/bootstrap/BootstrapMetadataTest.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.metadata.FeatureLevelRecord; import org.apache.kafka.common.metadata.NoOpRecord; import org.apache.kafka.server.common.ApiMessageAndVersion; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/migration/KRaftMigrationDriverTest.java b/metadata/src/test/java/org/apache/kafka/metadata/migration/KRaftMigrationDriverTest.java index d58da3eca5cde..b6e02fd6683a5 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/migration/KRaftMigrationDriverTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/migration/KRaftMigrationDriverTest.java @@ -52,6 +52,7 @@ import org.apache.kafka.server.common.MetadataVersion; import org.apache.kafka.server.fault.MockFaultHandler; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -67,8 +68,8 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.OptionalInt; import java.util.Optional; +import java.util.OptionalInt; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/migration/KRaftMigrationZkWriterTest.java b/metadata/src/test/java/org/apache/kafka/metadata/migration/KRaftMigrationZkWriterTest.java index 0e109f6b9c74a..560fffd617878 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/migration/KRaftMigrationZkWriterTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/migration/KRaftMigrationZkWriterTest.java @@ -16,9 +16,9 @@ */ package org.apache.kafka.metadata.migration; -import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.config.ConfigResource; import org.apache.kafka.image.AclsImage; import org.apache.kafka.image.AclsImageTest; import org.apache.kafka.image.ClientQuotasImage; @@ -33,6 +33,7 @@ import org.apache.kafka.image.ProducerIdsImageTest; import org.apache.kafka.image.ScramImage; import org.apache.kafka.image.TopicsImageTest; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/migration/MigrationManifestTest.java b/metadata/src/test/java/org/apache/kafka/metadata/migration/MigrationManifestTest.java index 711073e364a4b..8b5c56e742544 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/migration/MigrationManifestTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/migration/MigrationManifestTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.common.ApiMessageAndVersion; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/placement/PartitionAssignmentTest.java b/metadata/src/test/java/org/apache/kafka/metadata/placement/PartitionAssignmentTest.java index 6dca18b4dd575..2f0fdee512c5e 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/placement/PartitionAssignmentTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/placement/PartitionAssignmentTest.java @@ -17,16 +17,17 @@ package org.apache.kafka.metadata.placement; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; - import org.apache.kafka.common.DirectoryId; import org.apache.kafka.common.Uuid; + import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + public class PartitionAssignmentTest { public static PartitionAssignment partitionAssignment(List replicas) { return new PartitionAssignment(replicas, __ -> DirectoryId.MIGRATING); diff --git a/metadata/src/test/java/org/apache/kafka/metadata/placement/StripedReplicaPlacerTest.java b/metadata/src/test/java/org/apache/kafka/metadata/placement/StripedReplicaPlacerTest.java index d0b4ad956ea1a..25a70efae2a3b 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/placement/StripedReplicaPlacerTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/placement/StripedReplicaPlacerTest.java @@ -23,6 +23,7 @@ import org.apache.kafka.metadata.placement.StripedReplicaPlacer.BrokerList; import org.apache.kafka.metadata.placement.StripedReplicaPlacer.RackList; import org.apache.kafka.server.util.MockRandom; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/placement/TopicAssignmentTest.java b/metadata/src/test/java/org/apache/kafka/metadata/placement/TopicAssignmentTest.java index 1e28fcbeae7eb..ce6fb6e77c903 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/placement/TopicAssignmentTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/placement/TopicAssignmentTest.java @@ -17,17 +17,18 @@ package org.apache.kafka.metadata.placement; -import static org.apache.kafka.metadata.placement.PartitionAssignmentTest.partitionAssignment; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; - import org.apache.kafka.common.Uuid; + import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; import java.util.List; +import static org.apache.kafka.metadata.placement.PartitionAssignmentTest.partitionAssignment; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + public class TopicAssignmentTest { @Test diff --git a/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java b/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java index 5eb8ee39529c4..17f823fceebff 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesEnsembleTest.java @@ -17,6 +17,11 @@ package org.apache.kafka.metadata.properties; +import org.apache.kafka.common.Uuid; +import org.apache.kafka.test.TestUtils; + +import org.junit.jupiter.api.Test; + import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -36,10 +41,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.kafka.common.Uuid; -import org.apache.kafka.test.TestUtils; -import org.junit.jupiter.api.Test; - import static org.apache.kafka.metadata.properties.MetaPropertiesEnsemble.EMPTY; import static org.apache.kafka.metadata.properties.MetaPropertiesEnsemble.META_PROPERTIES_NAME; import static org.apache.kafka.metadata.properties.MetaPropertiesEnsemble.VerificationFlag.REQUIRE_AT_LEAST_ONE_VALID; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesTest.java b/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesTest.java index 44dd24497cfa6..b39a6f7470658 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesTest.java @@ -17,12 +17,14 @@ package org.apache.kafka.metadata.properties; +import org.apache.kafka.common.Uuid; + +import org.junit.jupiter.api.Test; + import java.util.Optional; import java.util.OptionalInt; import java.util.Properties; -import org.apache.kafka.common.Uuid; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesVersionTest.java b/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesVersionTest.java index 6c8841e9bcb35..b6c4b4f613268 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesVersionTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/properties/MetaPropertiesVersionTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.metadata.properties; import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java b/metadata/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java index a633a7c66bf0b..9789a17faa127 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/properties/PropertiesUtilsTest.java @@ -17,16 +17,17 @@ package org.apache.kafka.metadata.properties; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.util.Properties; - import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.Properties; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java b/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java index c03530192c106..3c32a320e21f7 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/util/BatchFileWriterReaderTest.java @@ -17,9 +17,6 @@ package org.apache.kafka.metadata.util; -import java.io.File; -import java.nio.file.Path; -import java.util.List; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.SnapshotFooterRecord; import org.apache.kafka.common.message.SnapshotHeaderRecord; @@ -28,7 +25,13 @@ import org.apache.kafka.raft.Batch; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; + +import java.io.File; +import java.nio.file.Path; +import java.util.List; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/metadata/src/test/java/org/apache/kafka/metadata/util/RecordRedactorTest.java b/metadata/src/test/java/org/apache/kafka/metadata/util/RecordRedactorTest.java index 9fb77ad96805f..0fbd4ef00ae59 100644 --- a/metadata/src/test/java/org/apache/kafka/metadata/util/RecordRedactorTest.java +++ b/metadata/src/test/java/org/apache/kafka/metadata/util/RecordRedactorTest.java @@ -17,10 +17,6 @@ package org.apache.kafka.metadata.util; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - import org.apache.kafka.common.Uuid; import org.apache.kafka.common.config.ConfigDef; import org.apache.kafka.common.config.ConfigResource; @@ -28,8 +24,13 @@ import org.apache.kafka.common.metadata.TopicRecord; import org.apache.kafka.common.metadata.UserScramCredentialRecord; import org.apache.kafka.metadata.KafkaConfigSchema; + import org.junit.jupiter.api.Test; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + import static org.apache.kafka.common.config.ConfigResource.Type.BROKER; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java index f7336b90c5703..97d56da9e2153 100644 --- a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java +++ b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManager.java @@ -41,6 +41,7 @@ import org.apache.kafka.snapshot.RecordsSnapshotWriter; import org.apache.kafka.snapshot.SnapshotReader; import org.apache.kafka.snapshot.SnapshotWriter; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManagerTest.java b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManagerTest.java index b0745ecc424ee..a37c4530731e6 100644 --- a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManagerTest.java +++ b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManagerTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.raft.LeaderAndEpoch; import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManagerTestEnv.java b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManagerTestEnv.java index 5dbf7dcad7b54..287a7b0251750 100644 --- a/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManagerTestEnv.java +++ b/metadata/src/test/java/org/apache/kafka/metalog/LocalLogManagerTestEnv.java @@ -27,6 +27,7 @@ import org.apache.kafka.server.common.ApiMessageAndVersion; import org.apache.kafka.snapshot.RawSnapshotReader; import org.apache.kafka.test.TestUtils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/metadata/src/test/java/org/apache/kafka/metalog/MockMetaLogManagerListener.java b/metadata/src/test/java/org/apache/kafka/metalog/MockMetaLogManagerListener.java index 77183f5dcb691..53bc49f807531 100644 --- a/metadata/src/test/java/org/apache/kafka/metalog/MockMetaLogManagerListener.java +++ b/metadata/src/test/java/org/apache/kafka/metalog/MockMetaLogManagerListener.java @@ -22,8 +22,8 @@ import org.apache.kafka.raft.BatchReader; import org.apache.kafka.raft.LeaderAndEpoch; import org.apache.kafka.raft.RaftClient; -import org.apache.kafka.snapshot.SnapshotReader; import org.apache.kafka.server.common.ApiMessageAndVersion; +import org.apache.kafka.snapshot.SnapshotReader; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/org/apache/kafka/network/SocketServerConfigs.java b/server/src/main/java/org/apache/kafka/network/SocketServerConfigs.java index 2bb6fd25d0db4..9d79d132ac18c 100644 --- a/server/src/main/java/org/apache/kafka/network/SocketServerConfigs.java +++ b/server/src/main/java/org/apache/kafka/network/SocketServerConfigs.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.network.ListenerName; import org.apache.kafka.common.security.auth.SecurityProtocol; import org.apache.kafka.server.config.ReplicationConfigs; + import java.util.Arrays; import java.util.stream.Collectors; diff --git a/server/src/main/java/org/apache/kafka/server/AssignmentsManager.java b/server/src/main/java/org/apache/kafka/server/AssignmentsManager.java index 4a00b02339535..ef9bc77ec6e31 100644 --- a/server/src/main/java/org/apache/kafka/server/AssignmentsManager.java +++ b/server/src/main/java/org/apache/kafka/server/AssignmentsManager.java @@ -17,7 +17,6 @@ package org.apache.kafka.server; -import com.yammer.metrics.core.Gauge; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.message.AssignReplicasToDirsRequestData; @@ -36,6 +35,9 @@ import org.apache.kafka.queue.KafkaEventQueue; import org.apache.kafka.server.common.TopicIdPartition; import org.apache.kafka.server.metrics.KafkaMetricsGroup; + +import com.yammer.metrics.core.Gauge; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 9140799d67e43..655a3d8625a84 100644 --- a/server/src/main/java/org/apache/kafka/server/ClientMetricsManager.java +++ b/server/src/main/java/org/apache/kafka/server/ClientMetricsManager.java @@ -54,6 +54,7 @@ import org.apache.kafka.server.util.timer.SystemTimerReaper; import org.apache.kafka.server.util.timer.Timer; import org.apache.kafka.server.util.timer.TimerTask; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/src/main/java/org/apache/kafka/server/config/AbstractKafkaConfig.java b/server/src/main/java/org/apache/kafka/server/config/AbstractKafkaConfig.java index cd993f96c544b..245562e0fc382 100644 --- a/server/src/main/java/org/apache/kafka/server/config/AbstractKafkaConfig.java +++ b/server/src/main/java/org/apache/kafka/server/config/AbstractKafkaConfig.java @@ -30,6 +30,7 @@ import org.apache.kafka.server.metrics.MetricConfigs; import org.apache.kafka.storage.internals.log.CleanerConfig; import org.apache.kafka.storage.internals.log.LogConfig; + import java.util.Arrays; import java.util.Map; diff --git a/server/src/main/java/org/apache/kafka/server/config/KRaftConfigs.java b/server/src/main/java/org/apache/kafka/server/config/KRaftConfigs.java index b58f3e962db78..a29c71ad4be85 100644 --- a/server/src/main/java/org/apache/kafka/server/config/KRaftConfigs.java +++ b/server/src/main/java/org/apache/kafka/server/config/KRaftConfigs.java @@ -20,6 +20,7 @@ import org.apache.kafka.common.config.SaslConfigs; import org.apache.kafka.common.record.Records; import org.apache.kafka.storage.internals.log.LogConfig; + import java.util.Collections; import java.util.concurrent.TimeUnit; diff --git a/server/src/main/java/org/apache/kafka/server/config/ZkConfigs.java b/server/src/main/java/org/apache/kafka/server/config/ZkConfigs.java index 32ddea26d9675..54619c11dc228 100644 --- a/server/src/main/java/org/apache/kafka/server/config/ZkConfigs.java +++ b/server/src/main/java/org/apache/kafka/server/config/ZkConfigs.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.config.ConfigDef; + import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollector.java b/server/src/main/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollector.java index a90c9b4341a6c..e34a4d5c4265a 100644 --- a/server/src/main/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollector.java +++ b/server/src/main/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollector.java @@ -17,6 +17,7 @@ package org.apache.kafka.server.metrics; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java index 457f5bd59a942..976fd08f3197f 100644 --- a/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java +++ b/server/src/test/java/org/apache/kafka/server/AssignmentsManagerTest.java @@ -17,9 +17,6 @@ package org.apache.kafka.server; -import com.yammer.metrics.core.Gauge; -import com.yammer.metrics.core.Metric; -import com.yammer.metrics.core.MetricName; import org.apache.kafka.clients.ClientResponse; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.errors.AuthenticationException; @@ -34,6 +31,11 @@ import org.apache.kafka.server.common.TopicIdPartition; import org.apache.kafka.server.metrics.KafkaYammerMetrics; import org.apache.kafka.test.TestUtils; + +import com.yammer.metrics.core.Gauge; +import com.yammer.metrics.core.Metric; +import com.yammer.metrics.core.MetricName; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -47,8 +49,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.CompletableFuture; import java.util.Optional; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.function.Function; diff --git a/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java b/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java index 71dc0a6a8c318..de6aad8f2045b 100644 --- a/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java +++ b/server/src/test/java/org/apache/kafka/server/ClientMetricsManagerTest.java @@ -37,6 +37,7 @@ import org.apache.kafka.server.metrics.ClientMetricsTestUtils; import org.apache.kafka.server.util.timer.SystemTimer; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsInstanceMetadataTest.java b/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsInstanceMetadataTest.java index 23e194a9842c6..8bf22e7f90f55 100644 --- a/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsInstanceMetadataTest.java +++ b/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsInstanceMetadataTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.server.metrics; import org.apache.kafka.common.Uuid; + import org.junit.jupiter.api.Test; import java.net.InetAddress; diff --git a/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsInstanceTest.java b/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsInstanceTest.java index c5109470dae49..01826ac164894 100644 --- a/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsInstanceTest.java +++ b/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsInstanceTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.server.metrics; import org.apache.kafka.common.Uuid; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsReceiverPluginTest.java b/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsReceiverPluginTest.java index 7ac6fcf23d190..35f9a41b47dda 100644 --- a/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsReceiverPluginTest.java +++ b/server/src/test/java/org/apache/kafka/server/metrics/ClientMetricsReceiverPluginTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.message.PushTelemetryRequestData; import org.apache.kafka.common.requests.PushTelemetryRequest; import org.apache.kafka.server.metrics.ClientMetricsTestUtils.TestClientMetricsReceiver; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/server/src/test/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollectorTest.java b/server/src/test/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollectorTest.java index 8caa9ab664cd9..ab2760e14db4d 100644 --- a/server/src/test/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollectorTest.java +++ b/server/src/test/java/org/apache/kafka/server/metrics/LinuxIoMetricsCollectorTest.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.utils.MockTime; import org.apache.kafka.common.utils.Time; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/server/src/test/java/org/apache/kafka/server/share/CachedSharePartitionTest.java b/server/src/test/java/org/apache/kafka/server/share/CachedSharePartitionTest.java index e9694d27d6435..80851bed8c94f 100644 --- a/server/src/test/java/org/apache/kafka/server/share/CachedSharePartitionTest.java +++ b/server/src/test/java/org/apache/kafka/server/share/CachedSharePartitionTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.server.share; import org.apache.kafka.common.Uuid; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/server/src/test/java/org/apache/kafka/server/share/ShareSessionCacheTest.java b/server/src/test/java/org/apache/kafka/server/share/ShareSessionCacheTest.java index 37fa8b2b2efcb..e0ac30d7c4295 100644 --- a/server/src/test/java/org/apache/kafka/server/share/ShareSessionCacheTest.java +++ b/server/src/test/java/org/apache/kafka/server/share/ShareSessionCacheTest.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.Uuid; import org.apache.kafka.common.utils.ImplicitLinkedHashCollection; + import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -26,9 +27,9 @@ import java.util.Iterator; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class ShareSessionCacheTest { diff --git a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageMetrics.java b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageMetrics.java index 019b68828fecf..1170c7e688696 100644 --- a/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageMetrics.java +++ b/storage/api/src/main/java/org/apache/kafka/server/log/remote/storage/RemoteStorageMetrics.java @@ -16,9 +16,10 @@ */ package org.apache.kafka.server.log.remote.storage; -import com.yammer.metrics.core.MetricName; import org.apache.kafka.server.metrics.KafkaYammerMetrics; +import com.yammer.metrics.core.MetricName; + import java.util.Arrays; import java.util.Collections; import java.util.HashSet; diff --git a/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/LogSegmentDataTest.java b/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/LogSegmentDataTest.java index e0a2022bd587d..8959cbf9e6a99 100644 --- a/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/LogSegmentDataTest.java +++ b/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/LogSegmentDataTest.java @@ -17,6 +17,7 @@ package org.apache.kafka.server.log.remote.storage; import org.apache.kafka.test.TestUtils; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentMetadataTest.java b/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentMetadataTest.java index 4cd2b350441c5..0aaaa4d99e45e 100644 --- a/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentMetadataTest.java +++ b/storage/api/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogSegmentMetadataTest.java @@ -19,9 +19,10 @@ import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; -import org.junit.jupiter.api.Test; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata.CustomMetadata; +import org.junit.jupiter.api.Test; + import java.util.HashMap; import java.util.Map; import java.util.Optional; diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ClassLoaderAwareRemoteLogMetadataManager.java b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ClassLoaderAwareRemoteLogMetadataManager.java index 663d06275c5aa..dc2678242f4e1 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ClassLoaderAwareRemoteLogMetadataManager.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ClassLoaderAwareRemoteLogMetadataManager.java @@ -17,12 +17,12 @@ package org.apache.kafka.server.log.remote.metadata.storage; import org.apache.kafka.common.TopicIdPartition; -import org.apache.kafka.storage.internals.log.StorageAction; import org.apache.kafka.server.log.remote.storage.RemoteLogMetadataManager; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadataUpdate; import org.apache.kafka.server.log.remote.storage.RemotePartitionDeleteMetadata; import org.apache.kafka.server.log.remote.storage.RemoteStorageException; +import org.apache.kafka.storage.internals.log.StorageAction; import java.io.IOException; import java.util.Iterator; diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ConsumerManager.java b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ConsumerManager.java index ed310f45149e6..39cfa0270a875 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ConsumerManager.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ConsumerManager.java @@ -23,6 +23,7 @@ import org.apache.kafka.common.utils.KafkaThread; import org.apache.kafka.common.utils.Time; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ConsumerTask.java b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ConsumerTask.java index a328b256ee0a1..593d84f727316 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ConsumerTask.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ConsumerTask.java @@ -27,6 +27,7 @@ import org.apache.kafka.server.log.remote.metadata.storage.serialization.RemoteLogMetadataSerde; import org.apache.kafka.server.log.remote.storage.RemoteLogMetadata; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ProducerManager.java b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ProducerManager.java index 7e186e2d81d68..e6fd0e9cdecb5 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ProducerManager.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/ProducerManager.java @@ -24,6 +24,7 @@ import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.server.log.remote.metadata.storage.serialization.RemoteLogMetadataSerde; import org.apache.kafka.server.log.remote.storage.RemoteLogMetadata; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataCache.java b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataCache.java index d9a31e680fa8d..2ee1c29f6e5a0 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataCache.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataCache.java @@ -21,6 +21,7 @@ import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadataUpdate; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentState; import org.apache.kafka.server.log.remote.storage.RemoteResourceNotFoundException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataTopicPartitioner.java b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataTopicPartitioner.java index af12647d45a1f..e6f8926264a5e 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataTopicPartitioner.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogMetadataTopicPartitioner.java @@ -18,6 +18,7 @@ import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentMetadataSnapshot.java b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentMetadataSnapshot.java index de33a05441390..a1ba23dd8f824 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentMetadataSnapshot.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentMetadataSnapshot.java @@ -27,8 +27,8 @@ import java.util.Map; import java.util.NavigableMap; import java.util.Objects; -import java.util.TreeMap; import java.util.Optional; +import java.util.TreeMap; /** * This class represents the entry containing the metadata about a remote log segment. This is similar to diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemotePartitionMetadataStore.java b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemotePartitionMetadataStore.java index 14f5b3dd7177e..86c29567d360f 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemotePartitionMetadataStore.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/RemotePartitionMetadataStore.java @@ -25,6 +25,7 @@ import org.apache.kafka.server.log.remote.storage.RemotePartitionDeleteState; import org.apache.kafka.server.log.remote.storage.RemoteResourceNotFoundException; import org.apache.kafka.server.log.remote.storage.RemoteStorageException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManager.java b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManager.java index c79331a44c9e8..94c757e9ec5bf 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManager.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManager.java @@ -37,6 +37,7 @@ import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentState; import org.apache.kafka.server.log.remote.storage.RemotePartitionDeleteMetadata; import org.apache.kafka.server.log.remote.storage.RemoteStorageException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/main/java/org/apache/kafka/server/log/remote/storage/ClassLoaderAwareRemoteStorageManager.java b/storage/src/main/java/org/apache/kafka/server/log/remote/storage/ClassLoaderAwareRemoteStorageManager.java index 0260264e34497..9e10fc844305e 100644 --- a/storage/src/main/java/org/apache/kafka/server/log/remote/storage/ClassLoaderAwareRemoteStorageManager.java +++ b/storage/src/main/java/org/apache/kafka/server/log/remote/storage/ClassLoaderAwareRemoteStorageManager.java @@ -16,9 +16,8 @@ */ package org.apache.kafka.server.log.remote.storage; -import org.apache.kafka.storage.internals.log.StorageAction; - import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata.CustomMetadata; +import org.apache.kafka.storage.internals.log.StorageAction; import java.io.IOException; import java.io.InputStream; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CheckpointFileWithFailureHandler.java b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CheckpointFileWithFailureHandler.java index 79963d79d2360..c44f8e9320176 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CheckpointFileWithFailureHandler.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CheckpointFileWithFailureHandler.java @@ -19,6 +19,7 @@ import org.apache.kafka.common.errors.KafkaStorageException; import org.apache.kafka.server.common.CheckpointFile; import org.apache.kafka.storage.internals.log.LogDirFailureChannel; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java index c9b94ae8fc199..42c41226783a4 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/checkpoint/CleanShutdownFileHandler.java @@ -17,15 +17,17 @@ package org.apache.kafka.storage.internals.checkpoint; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.util.Json; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import org.slf4j.Logger; +import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; -import java.io.BufferedWriter; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java b/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java index 7b78a70993d93..1304fa311cb6f 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/epoch/LeaderEpochFileCache.java @@ -21,6 +21,7 @@ import org.apache.kafka.server.util.Scheduler; import org.apache.kafka.storage.internals.checkpoint.LeaderEpochCheckpointFile; import org.apache.kafka.storage.internals.log.EpochEntry; + import org.slf4j.Logger; import java.util.AbstractMap; 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 21644130f098a..9c7c645c4a705 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 @@ -19,6 +19,7 @@ import org.apache.kafka.common.utils.ByteBufferUnmapper; import org.apache.kafka.common.utils.OperatingSystem; import org.apache.kafka.common.utils.Utils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/FetchPartitionData.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/FetchPartitionData.java index 3bbd5157b9c32..6cad30152b34e 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/FetchPartitionData.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/FetchPartitionData.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.storage.internals.log; -import java.util.OptionalInt; -import java.util.OptionalLong; import org.apache.kafka.common.message.FetchResponseData; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.record.Records; import java.util.List; import java.util.Optional; +import java.util.OptionalInt; +import java.util.OptionalLong; public class FetchPartitionData { public final Errors error; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/LazyIndex.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LazyIndex.java index feb6dc94952a8..f8da9552ed9d9 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/LazyIndex.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LazyIndex.java @@ -16,6 +16,8 @@ */ package org.apache.kafka.storage.internals.log; +import org.apache.kafka.common.utils.Utils; + import java.io.Closeable; import java.io.File; import java.io.IOException; @@ -23,7 +25,6 @@ import java.nio.file.NoSuchFileException; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.kafka.common.utils.Utils; /** * A wrapper over an `AbstractIndex` instance that provides a mechanism to defer loading diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogConfig.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogConfig.java index 7d05aadefe679..4f6c326a86373 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogConfig.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogConfig.java @@ -16,34 +16,6 @@ */ package org.apache.kafka.storage.internals.log; -import static java.util.Arrays.asList; -import static org.apache.kafka.common.config.ConfigDef.Importance.HIGH; -import static org.apache.kafka.common.config.ConfigDef.Range.between; -import static org.apache.kafka.common.config.ConfigDef.Type.BOOLEAN; -import static org.apache.kafka.common.config.ConfigDef.Type.CLASS; -import static org.apache.kafka.common.config.ConfigDef.Type.DOUBLE; -import static org.apache.kafka.common.config.ConfigDef.Type.LIST; -import static org.apache.kafka.common.config.ConfigDef.Type.LONG; -import static org.apache.kafka.common.config.ConfigDef.Type.STRING; -import static org.apache.kafka.server.common.MetadataVersion.IBP_3_0_IV1; -import static org.apache.kafka.common.config.ConfigDef.Importance.LOW; -import static org.apache.kafka.common.config.ConfigDef.Importance.MEDIUM; -import static org.apache.kafka.common.config.ConfigDef.Range.atLeast; -import static org.apache.kafka.common.config.ConfigDef.Type.INT; -import static org.apache.kafka.common.config.ConfigDef.ValidString.in; - -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.ThreadLocalRandom; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - import org.apache.kafka.common.compress.Compression; import org.apache.kafka.common.compress.GzipCompression; import org.apache.kafka.common.compress.Lz4Compression; @@ -69,6 +41,34 @@ import org.apache.kafka.server.config.ServerTopicConfigSynonyms; import org.apache.kafka.server.record.BrokerCompressionType; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import static java.util.Arrays.asList; +import static org.apache.kafka.common.config.ConfigDef.Importance.HIGH; +import static org.apache.kafka.common.config.ConfigDef.Importance.LOW; +import static org.apache.kafka.common.config.ConfigDef.Importance.MEDIUM; +import static org.apache.kafka.common.config.ConfigDef.Range.atLeast; +import static org.apache.kafka.common.config.ConfigDef.Range.between; +import static org.apache.kafka.common.config.ConfigDef.Type.BOOLEAN; +import static org.apache.kafka.common.config.ConfigDef.Type.CLASS; +import static org.apache.kafka.common.config.ConfigDef.Type.DOUBLE; +import static org.apache.kafka.common.config.ConfigDef.Type.INT; +import static org.apache.kafka.common.config.ConfigDef.Type.LIST; +import static org.apache.kafka.common.config.ConfigDef.Type.LONG; +import static org.apache.kafka.common.config.ConfigDef.Type.STRING; +import static org.apache.kafka.common.config.ConfigDef.ValidString.in; +import static org.apache.kafka.server.common.MetadataVersion.IBP_3_0_IV1; + public class LogConfig extends AbstractConfig { public static class MessageFormatVersion { @@ -98,15 +98,15 @@ public boolean shouldIgnore() { public boolean shouldWarn() { return interBrokerProtocolVersion.isAtLeast(IBP_3_0_IV1) - && messageFormatVersion.highestSupportedRecordVersion().precedes(RecordVersion.V2); + && messageFormatVersion.highestSupportedRecordVersion().precedes(RecordVersion.V2); } @SuppressWarnings("deprecation") public String topicWarningMessage(String topicName) { return "Topic configuration " + TopicConfig.MESSAGE_FORMAT_VERSION_CONFIG + " with value `" - + messageFormatVersionString + "` is ignored for `" + topicName + "` because the " - + "inter-broker protocol version `" + interBrokerProtocolVersionString + "` is greater or " - + "equal than 3.0. This configuration is deprecated and it will be removed in Apache Kafka 4.0."; + + messageFormatVersionString + "` is ignored for `" + topicName + "` because the " + + "inter-broker protocol version `" + interBrokerProtocolVersionString + "` is greater or " + + "equal than 3.0. This configuration is deprecated and it will be removed in Apache Kafka 4.0."; } } @@ -184,7 +184,7 @@ public Optional serverConfigName(String configName) { public static final long DEFAULT_LOCAL_RETENTION_MS = -2; // It indicates the value to be derived from RetentionMs /* See `TopicConfig.MESSAGE_FORMAT_VERSION_CONFIG` for details - * Keep DEFAULT_MESSAGE_FORMAT_VERSION as a way to handle the deprecated value */ + * Keep DEFAULT_MESSAGE_FORMAT_VERSION as a way to handle the deprecated value */ @Deprecated public static final String DEFAULT_MESSAGE_FORMAT_VERSION = ServerLogConfigs.LOG_MESSAGE_FORMAT_VERSION_DEFAULT; @@ -200,9 +200,9 @@ public Optional serverConfigName(String configName) { // Visible for testing public static final Set CONFIGS_WITH_NO_SERVER_DEFAULTS = Collections.unmodifiableSet(Utils.mkSet( - TopicConfig.REMOTE_LOG_STORAGE_ENABLE_CONFIG, - QuotaConfigs.LEADER_REPLICATION_THROTTLED_REPLICAS_CONFIG, - QuotaConfigs.FOLLOWER_REPLICATION_THROTTLED_REPLICAS_CONFIG + TopicConfig.REMOTE_LOG_STORAGE_ENABLE_CONFIG, + QuotaConfigs.LEADER_REPLICATION_THROTTLED_REPLICAS_CONFIG, + QuotaConfigs.FOLLOWER_REPLICATION_THROTTLED_REPLICAS_CONFIG )); @SuppressWarnings("deprecation") @@ -254,73 +254,73 @@ public Optional serverConfigName(String configName) { private static final LogConfigDef CONFIG = new LogConfigDef(); static { CONFIG. - define(TopicConfig.SEGMENT_BYTES_CONFIG, INT, DEFAULT_SEGMENT_BYTES, atLeast(LegacyRecord.RECORD_OVERHEAD_V0), MEDIUM, - TopicConfig.SEGMENT_BYTES_DOC) - .define(TopicConfig.SEGMENT_MS_CONFIG, LONG, DEFAULT_SEGMENT_MS, atLeast(1), MEDIUM, TopicConfig.SEGMENT_MS_DOC) - .define(TopicConfig.SEGMENT_JITTER_MS_CONFIG, LONG, DEFAULT_SEGMENT_JITTER_MS, atLeast(0), MEDIUM, - TopicConfig.SEGMENT_JITTER_MS_DOC) - .define(TopicConfig.SEGMENT_INDEX_BYTES_CONFIG, INT, ServerLogConfigs.LOG_INDEX_SIZE_MAX_BYTES_DEFAULT, atLeast(4), MEDIUM, - TopicConfig.SEGMENT_INDEX_BYTES_DOC) - .define(TopicConfig.FLUSH_MESSAGES_INTERVAL_CONFIG, LONG, ServerLogConfigs.LOG_FLUSH_INTERVAL_MESSAGES_DEFAULT, atLeast(1), MEDIUM, - TopicConfig.FLUSH_MESSAGES_INTERVAL_DOC) - .define(TopicConfig.FLUSH_MS_CONFIG, LONG, ServerLogConfigs.LOG_FLUSH_SCHEDULER_INTERVAL_MS_DEFAULT, atLeast(0), MEDIUM, - TopicConfig.FLUSH_MS_DOC) - // can be negative. See kafka.log.LogManager.cleanupSegmentsToMaintainSize - .define(TopicConfig.RETENTION_BYTES_CONFIG, LONG, ServerLogConfigs.LOG_RETENTION_BYTES_DEFAULT, MEDIUM, TopicConfig.RETENTION_BYTES_DOC) - // can be negative. See kafka.log.LogManager.cleanupExpiredSegments - .define(TopicConfig.RETENTION_MS_CONFIG, LONG, DEFAULT_RETENTION_MS, atLeast(-1), MEDIUM, - TopicConfig.RETENTION_MS_DOC) - .define(TopicConfig.MAX_MESSAGE_BYTES_CONFIG, INT, DEFAULT_MAX_MESSAGE_BYTES, atLeast(0), MEDIUM, - TopicConfig.MAX_MESSAGE_BYTES_DOC) - .define(TopicConfig.INDEX_INTERVAL_BYTES_CONFIG, INT, ServerLogConfigs.LOG_INDEX_INTERVAL_BYTES_DEFAULT, atLeast(0), MEDIUM, - TopicConfig.INDEX_INTERVAL_BYTES_DOC) - .define(TopicConfig.DELETE_RETENTION_MS_CONFIG, LONG, DEFAULT_DELETE_RETENTION_MS, atLeast(0), MEDIUM, - TopicConfig.DELETE_RETENTION_MS_DOC) - .define(TopicConfig.MIN_COMPACTION_LAG_MS_CONFIG, LONG, DEFAULT_MIN_COMPACTION_LAG_MS, atLeast(0), MEDIUM, - TopicConfig.MIN_COMPACTION_LAG_MS_DOC) - .define(TopicConfig.MAX_COMPACTION_LAG_MS_CONFIG, LONG, DEFAULT_MAX_COMPACTION_LAG_MS, atLeast(1), MEDIUM, - TopicConfig.MAX_COMPACTION_LAG_MS_DOC) - .define(TopicConfig.FILE_DELETE_DELAY_MS_CONFIG, LONG, ServerLogConfigs.LOG_DELETE_DELAY_MS_DEFAULT, atLeast(0), MEDIUM, - TopicConfig.FILE_DELETE_DELAY_MS_DOC) - .define(TopicConfig.MIN_CLEANABLE_DIRTY_RATIO_CONFIG, DOUBLE, DEFAULT_MIN_CLEANABLE_DIRTY_RATIO, between(0, 1), MEDIUM, - TopicConfig.MIN_CLEANABLE_DIRTY_RATIO_DOC) - .define(TopicConfig.CLEANUP_POLICY_CONFIG, LIST, ServerLogConfigs.LOG_CLEANUP_POLICY_DEFAULT, ValidList.in(TopicConfig.CLEANUP_POLICY_COMPACT, - TopicConfig.CLEANUP_POLICY_DELETE), MEDIUM, TopicConfig.CLEANUP_POLICY_DOC) - .define(TopicConfig.UNCLEAN_LEADER_ELECTION_ENABLE_CONFIG, BOOLEAN, DEFAULT_UNCLEAN_LEADER_ELECTION_ENABLE, - MEDIUM, TopicConfig.UNCLEAN_LEADER_ELECTION_ENABLE_DOC) - .define(TopicConfig.MIN_IN_SYNC_REPLICAS_CONFIG, INT, ServerLogConfigs.MIN_IN_SYNC_REPLICAS_DEFAULT, atLeast(1), MEDIUM, - TopicConfig.MIN_IN_SYNC_REPLICAS_DOC) - .define(TopicConfig.COMPRESSION_TYPE_CONFIG, STRING, DEFAULT_COMPRESSION_TYPE, in(BrokerCompressionType.names().toArray(new String[0])), - MEDIUM, TopicConfig.COMPRESSION_TYPE_DOC) - .define(TopicConfig.COMPRESSION_GZIP_LEVEL_CONFIG, INT, GzipCompression.DEFAULT_LEVEL, - new GzipCompression.LevelValidator(), MEDIUM, TopicConfig.COMPRESSION_GZIP_LEVEL_DOC) - .define(TopicConfig.COMPRESSION_LZ4_LEVEL_CONFIG, INT, Lz4Compression.DEFAULT_LEVEL, - between(Lz4Compression.MIN_LEVEL, Lz4Compression.MAX_LEVEL), MEDIUM, TopicConfig.COMPRESSION_LZ4_LEVEL_DOC) - .define(TopicConfig.COMPRESSION_ZSTD_LEVEL_CONFIG, INT, ZstdCompression.DEFAULT_LEVEL, - between(ZstdCompression.MIN_LEVEL, ZstdCompression.MAX_LEVEL), MEDIUM, TopicConfig.COMPRESSION_ZSTD_LEVEL_DOC) - .define(TopicConfig.PREALLOCATE_CONFIG, BOOLEAN, DEFAULT_PREALLOCATE, MEDIUM, TopicConfig.PREALLOCATE_DOC) - .define(MESSAGE_FORMAT_VERSION_CONFIG, STRING, DEFAULT_MESSAGE_FORMAT_VERSION, new MetadataVersionValidator(), MEDIUM, - MESSAGE_FORMAT_VERSION_DOC) - .define(TopicConfig.MESSAGE_TIMESTAMP_TYPE_CONFIG, STRING, ServerLogConfigs.LOG_MESSAGE_TIMESTAMP_TYPE_DEFAULT, - in("CreateTime", "LogAppendTime"), MEDIUM, TopicConfig.MESSAGE_TIMESTAMP_TYPE_DOC) - .define(MESSAGE_TIMESTAMP_DIFFERENCE_MAX_MS_CONFIG, LONG, DEFAULT_MESSAGE_TIMESTAMP_DIFFERENCE_MAX_MS, - atLeast(0), MEDIUM, MESSAGE_TIMESTAMP_DIFFERENCE_MAX_MS_DOC) - .define(TopicConfig.MESSAGE_TIMESTAMP_BEFORE_MAX_MS_CONFIG, LONG, ServerLogConfigs.LOG_MESSAGE_TIMESTAMP_BEFORE_MAX_MS_DEFAULT, - atLeast(0), MEDIUM, TopicConfig.MESSAGE_TIMESTAMP_BEFORE_MAX_MS_DOC) - .define(TopicConfig.MESSAGE_TIMESTAMP_AFTER_MAX_MS_CONFIG, LONG, ServerLogConfigs.LOG_MESSAGE_TIMESTAMP_AFTER_MAX_MS_DEFAULT, - atLeast(0), MEDIUM, TopicConfig.MESSAGE_TIMESTAMP_AFTER_MAX_MS_DOC) - .define(QuotaConfigs.LEADER_REPLICATION_THROTTLED_REPLICAS_CONFIG, LIST, QuotaConfigs.LEADER_REPLICATION_THROTTLED_REPLICAS_DEFAULT, - ThrottledReplicaListValidator.INSTANCE, MEDIUM, QuotaConfigs.LEADER_REPLICATION_THROTTLED_REPLICAS_DOC) - .define(QuotaConfigs.FOLLOWER_REPLICATION_THROTTLED_REPLICAS_CONFIG, LIST, QuotaConfigs.FOLLOWER_REPLICATION_THROTTLED_REPLICAS_DEFAULT, - ThrottledReplicaListValidator.INSTANCE, MEDIUM, QuotaConfigs.FOLLOWER_REPLICATION_THROTTLED_REPLICAS_DOC) - .define(TopicConfig.MESSAGE_DOWNCONVERSION_ENABLE_CONFIG, BOOLEAN, ServerLogConfigs.LOG_MESSAGE_DOWNCONVERSION_ENABLE_DEFAULT, LOW, - TopicConfig.MESSAGE_DOWNCONVERSION_ENABLE_DOC) - .define(TopicConfig.REMOTE_LOG_STORAGE_ENABLE_CONFIG, BOOLEAN, DEFAULT_REMOTE_STORAGE_ENABLE, null, - MEDIUM, TopicConfig.REMOTE_LOG_STORAGE_ENABLE_DOC) - .define(TopicConfig.LOCAL_LOG_RETENTION_MS_CONFIG, LONG, DEFAULT_LOCAL_RETENTION_MS, atLeast(-2), MEDIUM, - TopicConfig.LOCAL_LOG_RETENTION_MS_DOC) - .define(TopicConfig.LOCAL_LOG_RETENTION_BYTES_CONFIG, LONG, DEFAULT_LOCAL_RETENTION_BYTES, atLeast(-2), MEDIUM, - TopicConfig.LOCAL_LOG_RETENTION_BYTES_DOC); + define(TopicConfig.SEGMENT_BYTES_CONFIG, INT, DEFAULT_SEGMENT_BYTES, atLeast(LegacyRecord.RECORD_OVERHEAD_V0), MEDIUM, + TopicConfig.SEGMENT_BYTES_DOC) + .define(TopicConfig.SEGMENT_MS_CONFIG, LONG, DEFAULT_SEGMENT_MS, atLeast(1), MEDIUM, TopicConfig.SEGMENT_MS_DOC) + .define(TopicConfig.SEGMENT_JITTER_MS_CONFIG, LONG, DEFAULT_SEGMENT_JITTER_MS, atLeast(0), MEDIUM, + TopicConfig.SEGMENT_JITTER_MS_DOC) + .define(TopicConfig.SEGMENT_INDEX_BYTES_CONFIG, INT, ServerLogConfigs.LOG_INDEX_SIZE_MAX_BYTES_DEFAULT, atLeast(4), MEDIUM, + TopicConfig.SEGMENT_INDEX_BYTES_DOC) + .define(TopicConfig.FLUSH_MESSAGES_INTERVAL_CONFIG, LONG, ServerLogConfigs.LOG_FLUSH_INTERVAL_MESSAGES_DEFAULT, atLeast(1), MEDIUM, + TopicConfig.FLUSH_MESSAGES_INTERVAL_DOC) + .define(TopicConfig.FLUSH_MS_CONFIG, LONG, ServerLogConfigs.LOG_FLUSH_SCHEDULER_INTERVAL_MS_DEFAULT, atLeast(0), MEDIUM, + TopicConfig.FLUSH_MS_DOC) + // can be negative. See kafka.log.LogManager.cleanupSegmentsToMaintainSize + .define(TopicConfig.RETENTION_BYTES_CONFIG, LONG, ServerLogConfigs.LOG_RETENTION_BYTES_DEFAULT, MEDIUM, TopicConfig.RETENTION_BYTES_DOC) + // can be negative. See kafka.log.LogManager.cleanupExpiredSegments + .define(TopicConfig.RETENTION_MS_CONFIG, LONG, DEFAULT_RETENTION_MS, atLeast(-1), MEDIUM, + TopicConfig.RETENTION_MS_DOC) + .define(TopicConfig.MAX_MESSAGE_BYTES_CONFIG, INT, DEFAULT_MAX_MESSAGE_BYTES, atLeast(0), MEDIUM, + TopicConfig.MAX_MESSAGE_BYTES_DOC) + .define(TopicConfig.INDEX_INTERVAL_BYTES_CONFIG, INT, ServerLogConfigs.LOG_INDEX_INTERVAL_BYTES_DEFAULT, atLeast(0), MEDIUM, + TopicConfig.INDEX_INTERVAL_BYTES_DOC) + .define(TopicConfig.DELETE_RETENTION_MS_CONFIG, LONG, DEFAULT_DELETE_RETENTION_MS, atLeast(0), MEDIUM, + TopicConfig.DELETE_RETENTION_MS_DOC) + .define(TopicConfig.MIN_COMPACTION_LAG_MS_CONFIG, LONG, DEFAULT_MIN_COMPACTION_LAG_MS, atLeast(0), MEDIUM, + TopicConfig.MIN_COMPACTION_LAG_MS_DOC) + .define(TopicConfig.MAX_COMPACTION_LAG_MS_CONFIG, LONG, DEFAULT_MAX_COMPACTION_LAG_MS, atLeast(1), MEDIUM, + TopicConfig.MAX_COMPACTION_LAG_MS_DOC) + .define(TopicConfig.FILE_DELETE_DELAY_MS_CONFIG, LONG, ServerLogConfigs.LOG_DELETE_DELAY_MS_DEFAULT, atLeast(0), MEDIUM, + TopicConfig.FILE_DELETE_DELAY_MS_DOC) + .define(TopicConfig.MIN_CLEANABLE_DIRTY_RATIO_CONFIG, DOUBLE, DEFAULT_MIN_CLEANABLE_DIRTY_RATIO, between(0, 1), MEDIUM, + TopicConfig.MIN_CLEANABLE_DIRTY_RATIO_DOC) + .define(TopicConfig.CLEANUP_POLICY_CONFIG, LIST, ServerLogConfigs.LOG_CLEANUP_POLICY_DEFAULT, ValidList.in(TopicConfig.CLEANUP_POLICY_COMPACT, + TopicConfig.CLEANUP_POLICY_DELETE), MEDIUM, TopicConfig.CLEANUP_POLICY_DOC) + .define(TopicConfig.UNCLEAN_LEADER_ELECTION_ENABLE_CONFIG, BOOLEAN, DEFAULT_UNCLEAN_LEADER_ELECTION_ENABLE, + MEDIUM, TopicConfig.UNCLEAN_LEADER_ELECTION_ENABLE_DOC) + .define(TopicConfig.MIN_IN_SYNC_REPLICAS_CONFIG, INT, ServerLogConfigs.MIN_IN_SYNC_REPLICAS_DEFAULT, atLeast(1), MEDIUM, + TopicConfig.MIN_IN_SYNC_REPLICAS_DOC) + .define(TopicConfig.COMPRESSION_TYPE_CONFIG, STRING, DEFAULT_COMPRESSION_TYPE, in(BrokerCompressionType.names().toArray(new String[0])), + MEDIUM, TopicConfig.COMPRESSION_TYPE_DOC) + .define(TopicConfig.COMPRESSION_GZIP_LEVEL_CONFIG, INT, GzipCompression.DEFAULT_LEVEL, + new GzipCompression.LevelValidator(), MEDIUM, TopicConfig.COMPRESSION_GZIP_LEVEL_DOC) + .define(TopicConfig.COMPRESSION_LZ4_LEVEL_CONFIG, INT, Lz4Compression.DEFAULT_LEVEL, + between(Lz4Compression.MIN_LEVEL, Lz4Compression.MAX_LEVEL), MEDIUM, TopicConfig.COMPRESSION_LZ4_LEVEL_DOC) + .define(TopicConfig.COMPRESSION_ZSTD_LEVEL_CONFIG, INT, ZstdCompression.DEFAULT_LEVEL, + between(ZstdCompression.MIN_LEVEL, ZstdCompression.MAX_LEVEL), MEDIUM, TopicConfig.COMPRESSION_ZSTD_LEVEL_DOC) + .define(TopicConfig.PREALLOCATE_CONFIG, BOOLEAN, DEFAULT_PREALLOCATE, MEDIUM, TopicConfig.PREALLOCATE_DOC) + .define(MESSAGE_FORMAT_VERSION_CONFIG, STRING, DEFAULT_MESSAGE_FORMAT_VERSION, new MetadataVersionValidator(), MEDIUM, + MESSAGE_FORMAT_VERSION_DOC) + .define(TopicConfig.MESSAGE_TIMESTAMP_TYPE_CONFIG, STRING, ServerLogConfigs.LOG_MESSAGE_TIMESTAMP_TYPE_DEFAULT, + in("CreateTime", "LogAppendTime"), MEDIUM, TopicConfig.MESSAGE_TIMESTAMP_TYPE_DOC) + .define(MESSAGE_TIMESTAMP_DIFFERENCE_MAX_MS_CONFIG, LONG, DEFAULT_MESSAGE_TIMESTAMP_DIFFERENCE_MAX_MS, + atLeast(0), MEDIUM, MESSAGE_TIMESTAMP_DIFFERENCE_MAX_MS_DOC) + .define(TopicConfig.MESSAGE_TIMESTAMP_BEFORE_MAX_MS_CONFIG, LONG, ServerLogConfigs.LOG_MESSAGE_TIMESTAMP_BEFORE_MAX_MS_DEFAULT, + atLeast(0), MEDIUM, TopicConfig.MESSAGE_TIMESTAMP_BEFORE_MAX_MS_DOC) + .define(TopicConfig.MESSAGE_TIMESTAMP_AFTER_MAX_MS_CONFIG, LONG, ServerLogConfigs.LOG_MESSAGE_TIMESTAMP_AFTER_MAX_MS_DEFAULT, + atLeast(0), MEDIUM, TopicConfig.MESSAGE_TIMESTAMP_AFTER_MAX_MS_DOC) + .define(QuotaConfigs.LEADER_REPLICATION_THROTTLED_REPLICAS_CONFIG, LIST, QuotaConfigs.LEADER_REPLICATION_THROTTLED_REPLICAS_DEFAULT, + ThrottledReplicaListValidator.INSTANCE, MEDIUM, QuotaConfigs.LEADER_REPLICATION_THROTTLED_REPLICAS_DOC) + .define(QuotaConfigs.FOLLOWER_REPLICATION_THROTTLED_REPLICAS_CONFIG, LIST, QuotaConfigs.FOLLOWER_REPLICATION_THROTTLED_REPLICAS_DEFAULT, + ThrottledReplicaListValidator.INSTANCE, MEDIUM, QuotaConfigs.FOLLOWER_REPLICATION_THROTTLED_REPLICAS_DOC) + .define(TopicConfig.MESSAGE_DOWNCONVERSION_ENABLE_CONFIG, BOOLEAN, ServerLogConfigs.LOG_MESSAGE_DOWNCONVERSION_ENABLE_DEFAULT, LOW, + TopicConfig.MESSAGE_DOWNCONVERSION_ENABLE_DOC) + .define(TopicConfig.REMOTE_LOG_STORAGE_ENABLE_CONFIG, BOOLEAN, DEFAULT_REMOTE_STORAGE_ENABLE, null, + MEDIUM, TopicConfig.REMOTE_LOG_STORAGE_ENABLE_DOC) + .define(TopicConfig.LOCAL_LOG_RETENTION_MS_CONFIG, LONG, DEFAULT_LOCAL_RETENTION_MS, atLeast(-2), MEDIUM, + TopicConfig.LOCAL_LOG_RETENTION_MS_DOC) + .define(TopicConfig.LOCAL_LOG_RETENTION_BYTES_CONFIG, LONG, DEFAULT_LOCAL_RETENTION_BYTES, atLeast(-2), MEDIUM, + TopicConfig.LOCAL_LOG_RETENTION_BYTES_DOC); } public final Set overriddenConfigs; @@ -396,13 +396,13 @@ public LogConfig(Map props, Set overriddenConfigs) { this.maxCompactionLagMs = getLong(TopicConfig.MAX_COMPACTION_LAG_MS_CONFIG); this.minCleanableRatio = getDouble(TopicConfig.MIN_CLEANABLE_DIRTY_RATIO_CONFIG); this.compact = getList(TopicConfig.CLEANUP_POLICY_CONFIG).stream() - .map(c -> c.toLowerCase(Locale.ROOT)) - .collect(Collectors.toList()) - .contains(TopicConfig.CLEANUP_POLICY_COMPACT); + .map(c -> c.toLowerCase(Locale.ROOT)) + .collect(Collectors.toList()) + .contains(TopicConfig.CLEANUP_POLICY_COMPACT); this.delete = getList(TopicConfig.CLEANUP_POLICY_CONFIG).stream() - .map(c -> c.toLowerCase(Locale.ROOT)) - .collect(Collectors.toList()) - .contains(TopicConfig.CLEANUP_POLICY_DELETE); + .map(c -> c.toLowerCase(Locale.ROOT)) + .collect(Collectors.toList()) + .contains(TopicConfig.CLEANUP_POLICY_DELETE); this.uncleanLeaderElectionEnable = getBoolean(TopicConfig.UNCLEAN_LEADER_ELECTION_ENABLE_CONFIG); this.minInSyncReplicas = getInt(TopicConfig.MIN_IN_SYNC_REPLICAS_CONFIG); this.compressionType = BrokerCompressionType.forName(getString(TopicConfig.COMPRESSION_TYPE_CONFIG)); @@ -602,7 +602,7 @@ public static void validateBrokerLogConfigValues(Map props, * @param props The properties to be validated */ private static void validateTopicLogConfigValues(Map props, - boolean isRemoteLogStorageSystemEnabled) { + boolean isRemoteLogStorageSystemEnabled) { validateValues(props); boolean isRemoteLogStorageEnabled = (Boolean) props.get(TopicConfig.REMOTE_LOG_STORAGE_ENABLE_CONFIG); if (isRemoteLogStorageEnabled) { diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogDirFailureChannel.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogDirFailureChannel.java index a2ae2f3676e7c..21c5dc01bb67c 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/LogDirFailureChannel.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/LogDirFailureChannel.java @@ -16,15 +16,15 @@ */ package org.apache.kafka.storage.internals.log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /* * LogDirFailureChannel allows an external thread to block waiting for new offline log dirs. * 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 969fa8b1db455..bf702949ffcd2 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 @@ -16,24 +16,6 @@ */ package org.apache.kafka.storage.internals.log; -import java.io.Closeable; -import java.io.File; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.file.Files; -import java.nio.file.NoSuchFileException; -import java.nio.file.attribute.FileTime; -import java.util.Iterator; -import java.util.Map; -import java.util.Optional; -import java.util.OptionalLong; -import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import com.yammer.metrics.core.MetricName; -import com.yammer.metrics.core.Timer; import org.apache.kafka.common.InvalidRecordException; import org.apache.kafka.common.errors.CorruptRecordException; import org.apache.kafka.common.record.FileLogInputStream.FileChannelRecordBatch; @@ -46,10 +28,30 @@ import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.metrics.KafkaMetricsGroup; import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache; + +import com.yammer.metrics.core.MetricName; +import com.yammer.metrics.core.Timer; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.event.Level; +import java.io.Closeable; +import java.io.File; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.file.Files; +import java.nio.file.NoSuchFileException; +import java.nio.file.attribute.FileTime; +import java.util.Iterator; +import java.util.Map; +import java.util.Optional; +import java.util.OptionalLong; +import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import static java.util.Arrays.asList; /** 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 53f7cc3631823..c42b550a03e0d 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 @@ -16,13 +16,6 @@ */ package org.apache.kafka.storage.internals.log; -import static org.apache.kafka.server.common.MetadataVersion.IBP_2_1_IV0; - -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; import org.apache.kafka.common.InvalidRecordException; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.compress.Compression; @@ -49,7 +42,14 @@ import org.apache.kafka.common.utils.Time; import org.apache.kafka.server.common.MetadataVersion; +import java.nio.ByteBuffer; +import java.util.ArrayList; import java.util.Iterator; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +import static org.apache.kafka.server.common.MetadataVersion.IBP_2_1_IV0; public class LogValidator { diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/OffsetIndex.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/OffsetIndex.java index 5db8f411365a1..09bde2a88cb81 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/OffsetIndex.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/OffsetIndex.java @@ -17,6 +17,7 @@ package org.apache.kafka.storage.internals.log; import org.apache.kafka.common.errors.InvalidOffsetException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerAppendInfo.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerAppendInfo.java index bd2778287db32..9037d25672eb4 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerAppendInfo.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/ProducerAppendInfo.java @@ -25,6 +25,7 @@ import org.apache.kafka.common.record.EndTransactionMarker; import org.apache.kafka.common.record.Record; import org.apache.kafka.common.record.RecordBatch; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 125730e410c0c..6a3d3ed759d04 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 @@ -28,6 +28,7 @@ import org.apache.kafka.common.utils.Crc32C; import org.apache.kafka.common.utils.LogContext; import org.apache.kafka.common.utils.Time; + import org.slf4j.Logger; import java.io.File; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/RecordValidationException.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/RecordValidationException.java index 53665670c05bd..07eddfe9d19d7 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/RecordValidationException.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/RecordValidationException.java @@ -16,11 +16,12 @@ */ package org.apache.kafka.storage.internals.log; -import java.util.Collections; -import java.util.List; import org.apache.kafka.common.errors.ApiException; import org.apache.kafka.common.requests.ProduceResponse.RecordError; +import java.util.Collections; +import java.util.List; + public class RecordValidationException extends RuntimeException { private final ApiException invalidException; private final List recordErrors; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/RemoteIndexCache.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/RemoteIndexCache.java index 0c066816155d2..f974f29af5aee 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/RemoteIndexCache.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/RemoteIndexCache.java @@ -16,9 +16,6 @@ */ package org.apache.kafka.storage.internals.log; -import com.github.benmanes.caffeine.cache.Cache; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.github.benmanes.caffeine.cache.RemovalCause; import org.apache.kafka.common.KafkaException; import org.apache.kafka.common.Uuid; import org.apache.kafka.common.utils.Time; @@ -29,6 +26,11 @@ import org.apache.kafka.server.log.remote.storage.RemoteStorageManager; import org.apache.kafka.server.log.remote.storage.RemoteStorageManager.IndexType; import org.apache.kafka.server.util.ShutdownableThread; + +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; +import com.github.benmanes.caffeine.cache.RemovalCause; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/main/java/org/apache/kafka/storage/internals/log/RemoteLogReadResult.java b/storage/src/main/java/org/apache/kafka/storage/internals/log/RemoteLogReadResult.java index 06c72ecb80cd8..b44b4a0aaa4a9 100644 --- a/storage/src/main/java/org/apache/kafka/storage/internals/log/RemoteLogReadResult.java +++ b/storage/src/main/java/org/apache/kafka/storage/internals/log/RemoteLogReadResult.java @@ -27,4 +27,3 @@ public RemoteLogReadResult(Optional fetchDataInfo, Optional buildDeleteSegmentSpecList(String topic) { return deleteSegmentSpecList; } } - diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestContext.java b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestContext.java index 91455f862327d..a2d2f3d8e2e44 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestContext.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestContext.java @@ -16,16 +16,10 @@ */ package org.apache.kafka.tiered.storage; -import org.apache.kafka.clients.CommonClientConfigs; -import org.apache.kafka.clients.consumer.Consumer; -import org.apache.kafka.common.network.ListenerName; -import org.apache.kafka.common.serialization.StringDeserializer; -import org.apache.kafka.common.serialization.StringSerializer; -import org.apache.kafka.tiered.storage.specs.ExpandPartitionCountSpec; -import org.apache.kafka.tiered.storage.specs.TopicSpec; -import org.apache.kafka.tiered.storage.utils.BrokerLocalStorage; import kafka.log.UnifiedLog; import kafka.utils.TestUtils; + +import org.apache.kafka.clients.CommonClientConfigs; import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AlterConfigOp; import org.apache.kafka.clients.admin.AlterConfigsOptions; @@ -33,6 +27,7 @@ import org.apache.kafka.clients.admin.NewPartitions; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.admin.TopicDescription; +import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.producer.KafkaProducer; @@ -40,14 +35,18 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicPartitionInfo; import org.apache.kafka.common.config.ConfigResource; +import org.apache.kafka.common.network.ListenerName; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serializer; +import org.apache.kafka.common.serialization.StringDeserializer; +import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.log.remote.storage.LocalTieredStorage; import org.apache.kafka.server.log.remote.storage.LocalTieredStorageHistory; import org.apache.kafka.server.log.remote.storage.LocalTieredStorageSnapshot; -import scala.Function0; -import scala.Function1; +import org.apache.kafka.tiered.storage.specs.ExpandPartitionCountSpec; +import org.apache.kafka.tiered.storage.specs.TopicSpec; +import org.apache.kafka.tiered.storage.utils.BrokerLocalStorage; import java.io.FilenameFilter; import java.io.IOException; @@ -65,6 +64,8 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; +import scala.Function0; +import scala.Function1; import scala.Option; import scala.collection.JavaConverters; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java index 1183383bea08a..91b24fc2b0d72 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestHarness.java @@ -19,6 +19,7 @@ import kafka.api.IntegrationTestHarness; import kafka.log.remote.RemoteLogManager; import kafka.server.KafkaBroker; + import org.apache.kafka.common.replica.ReplicaSelector; import org.apache.kafka.common.utils.Utils; import org.apache.kafka.server.config.ReplicationConfigs; @@ -28,14 +29,13 @@ import org.apache.kafka.server.log.remote.storage.RemoteStorageManager; import org.apache.kafka.test.TestUtils; import org.apache.kafka.tiered.storage.utils.BrokerLocalStorage; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import scala.collection.JavaConverters; -import scala.collection.Seq; import java.util.ArrayList; import java.util.Collections; @@ -45,6 +45,9 @@ import java.util.Properties; import java.util.stream.Collectors; +import scala.collection.JavaConverters; +import scala.collection.Seq; + import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.STORAGE_WAIT_TIMEOUT_SEC; import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.createPropsForRemoteStorage; /** diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestReport.java b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestReport.java index c3014cd518357..6f90d00401c20 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestReport.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestReport.java @@ -16,8 +16,8 @@ */ package org.apache.kafka.tiered.storage; -import org.apache.kafka.tiered.storage.utils.DumpLocalTieredStorage; import org.apache.kafka.server.log.remote.storage.LocalTieredStorage; +import org.apache.kafka.tiered.storage.utils.DumpLocalTieredStorage; import java.io.PrintStream; import java.util.ArrayList; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ConsumeAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ConsumeAction.java index 0fd7ceed657bb..250db6a46e866 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ConsumeAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ConsumeAction.java @@ -34,8 +34,8 @@ import java.util.stream.Collectors; import static org.apache.kafka.server.log.remote.storage.LocalTieredStorageEvent.EventType.FETCH_SEGMENT; -import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.tieredStorageRecords; import static org.apache.kafka.tiered.storage.utils.RecordsKeyValueMatcher.correspondTo; +import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.tieredStorageRecords; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/DeleteRecordsAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/DeleteRecordsAction.java index 0f6a756c048b3..55ed7318aedd1 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/DeleteRecordsAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/DeleteRecordsAction.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.tiered.storage.actions; +import org.apache.kafka.clients.admin.RecordsToDelete; +import org.apache.kafka.common.TopicPartition; import org.apache.kafka.server.log.remote.storage.LocalTieredStorage; import org.apache.kafka.server.log.remote.storage.LocalTieredStorageCondition; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; -import org.apache.kafka.clients.admin.RecordsToDelete; -import org.apache.kafka.common.TopicPartition; import org.apache.kafka.tiered.storage.specs.RemoteDeleteSegmentSpec; import java.io.PrintStream; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/DeleteTopicAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/DeleteTopicAction.java index 893d932385e71..e5b91be32e5df 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/DeleteTopicAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/DeleteTopicAction.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.tiered.storage.actions; +import org.apache.kafka.server.log.remote.storage.LocalTieredStorage; +import org.apache.kafka.server.log.remote.storage.LocalTieredStorageCondition; import org.apache.kafka.tiered.storage.TieredStorageTestAction; import org.apache.kafka.tiered.storage.TieredStorageTestContext; import org.apache.kafka.tiered.storage.specs.RemoteDeleteSegmentSpec; -import org.apache.kafka.server.log.remote.storage.LocalTieredStorage; -import org.apache.kafka.server.log.remote.storage.LocalTieredStorageCondition; import java.io.PrintStream; import java.util.List; @@ -30,8 +30,8 @@ import java.util.stream.Collectors; import static org.apache.kafka.server.log.remote.storage.LocalTieredStorageCondition.expectEvent; -import static org.apache.kafka.server.log.remote.storage.LocalTieredStorageEvent.EventType.DELETE_SEGMENT; import static org.apache.kafka.server.log.remote.storage.LocalTieredStorageEvent.EventType.DELETE_PARTITION; +import static org.apache.kafka.server.log.remote.storage.LocalTieredStorageEvent.EventType.DELETE_SEGMENT; public final class DeleteTopicAction implements TieredStorageTestAction { diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java index 29b8ce22ace0f..01de48284b0d3 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectEmptyRemoteStorageAction.java @@ -16,11 +16,11 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.tiered.storage.TieredStorageTestAction; -import org.apache.kafka.tiered.storage.TieredStorageTestContext; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.server.log.remote.storage.LocalTieredStorageSnapshot; import org.apache.kafka.test.TestUtils; +import org.apache.kafka.tiered.storage.TieredStorageTestAction; +import org.apache.kafka.tiered.storage.TieredStorageTestContext; import java.io.PrintStream; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java index 27a6818def90b..62f7729df948e 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderAction.java @@ -17,8 +17,6 @@ package org.apache.kafka.tiered.storage.actions; import org.apache.kafka.clients.admin.AlterPartitionReassignmentsResult; -import org.apache.kafka.tiered.storage.TieredStorageTestAction; -import org.apache.kafka.tiered.storage.TieredStorageTestContext; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.common.ElectionType; @@ -27,6 +25,8 @@ import org.apache.kafka.common.TopicPartitionInfo; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.test.TestUtils; +import org.apache.kafka.tiered.storage.TieredStorageTestAction; +import org.apache.kafka.tiered.storage.TieredStorageTestContext; import java.io.PrintStream; import java.util.ArrayList; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java index 986b3641db7bc..10231ad06ff04 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java @@ -16,20 +16,22 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.tiered.storage.TieredStorageTestAction; -import org.apache.kafka.tiered.storage.TieredStorageTestContext; import kafka.log.UnifiedLog; + import org.apache.kafka.common.TopicPartition; import org.apache.kafka.storage.internals.epoch.LeaderEpochFileCache; import org.apache.kafka.storage.internals.log.EpochEntry; import org.apache.kafka.test.TestUtils; -import scala.Option; +import org.apache.kafka.tiered.storage.TieredStorageTestAction; +import org.apache.kafka.tiered.storage.TieredStorageTestContext; import java.io.PrintStream; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicReference; +import scala.Option; + public final class ExpectLeaderEpochCheckpointAction implements TieredStorageTestAction { private final Integer brokerId; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectListOffsetsAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectListOffsetsAction.java index 6b3e77f516a04..a4196517ed231 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectListOffsetsAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectListOffsetsAction.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.tiered.storage.TieredStorageTestAction; -import org.apache.kafka.tiered.storage.TieredStorageTestContext; import org.apache.kafka.clients.admin.ListOffsetsResult; import org.apache.kafka.clients.admin.OffsetSpec; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.storage.internals.log.EpochEntry; +import org.apache.kafka.tiered.storage.TieredStorageTestAction; +import org.apache.kafka.tiered.storage.TieredStorageTestContext; import java.io.PrintStream; import java.util.Collections; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectUserTopicMappedToMetadataPartitionsAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectUserTopicMappedToMetadataPartitionsAction.java index ef7066ffe0408..53b913cc74497 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectUserTopicMappedToMetadataPartitionsAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectUserTopicMappedToMetadataPartitionsAction.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.tiered.storage.TieredStorageTestAction; -import org.apache.kafka.tiered.storage.TieredStorageTestContext; import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.common.TopicIdPartition; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.Uuid; import org.apache.kafka.server.log.remote.metadata.storage.RemoteLogMetadataTopicPartitioner; import org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig; +import org.apache.kafka.tiered.storage.TieredStorageTestAction; +import org.apache.kafka.tiered.storage.TieredStorageTestContext; import java.io.PrintStream; import java.util.Arrays; @@ -33,8 +33,8 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.describeTopics; +import static org.junit.jupiter.api.Assertions.assertTrue; public final class ExpectUserTopicMappedToMetadataPartitionsAction implements TieredStorageTestAction { diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ProduceAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ProduceAction.java index 99be3c1c564b2..7ea38502d5021 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ProduceAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ProduceAction.java @@ -39,8 +39,8 @@ import static org.apache.kafka.server.log.remote.storage.LocalTieredStorageCondition.expectEvent; import static org.apache.kafka.server.log.remote.storage.LocalTieredStorageEvent.EventType.COPY_SEGMENT; -import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.tieredStorageRecords; import static org.apache.kafka.tiered.storage.utils.RecordsKeyValueMatcher.correspondTo; +import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.tieredStorageRecords; import static org.hamcrest.MatcherAssert.assertThat; public final class ProduceAction implements TieredStorageTestAction { diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java index 06d9013649bc6..2b979edab7308 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ReassignReplicaAction.java @@ -16,14 +16,14 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.tiered.storage.TieredStorageTestAction; -import org.apache.kafka.tiered.storage.TieredStorageTestContext; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.common.Node; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.test.TestUtils; +import org.apache.kafka.tiered.storage.TieredStorageTestAction; +import org.apache.kafka.tiered.storage.TieredStorageTestContext; import java.io.PrintStream; import java.util.Collections; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java index fc840d0485321..473a0f08a0ef4 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/actions/ShrinkReplicaAction.java @@ -16,12 +16,12 @@ */ package org.apache.kafka.tiered.storage.actions; -import org.apache.kafka.tiered.storage.TieredStorageTestAction; -import org.apache.kafka.tiered.storage.TieredStorageTestContext; import org.apache.kafka.clients.admin.NewPartitionReassignment; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.TopicPartitionInfo; import org.apache.kafka.test.TestUtils; +import org.apache.kafka.tiered.storage.TieredStorageTestAction; +import org.apache.kafka.tiered.storage.TieredStorageTestContext; import java.io.PrintStream; import java.util.ArrayList; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/DeleteSegmentsDueToLogStartOffsetBreachTest.java b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/DeleteSegmentsDueToLogStartOffsetBreachTest.java index 5f10df5c68c4d..01f09c50ca465 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/DeleteSegmentsDueToLogStartOffsetBreachTest.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/DeleteSegmentsDueToLogStartOffsetBreachTest.java @@ -24,9 +24,9 @@ import java.util.List; import java.util.Map; -import static org.apache.kafka.server.log.remote.storage.LocalTieredStorageEvent.EventType.DELETE_SEGMENT; import static org.apache.kafka.common.utils.Utils.mkEntry; import static org.apache.kafka.common.utils.Utils.mkMap; +import static org.apache.kafka.server.log.remote.storage.LocalTieredStorageEvent.EventType.DELETE_SEGMENT; public final class DeleteSegmentsDueToLogStartOffsetBreachTest extends TieredStorageTestHarness { diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/FetchFromLeaderWithCorruptedCheckpointTest.java b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/FetchFromLeaderWithCorruptedCheckpointTest.java index 556977e54978e..2102f7ca956c4 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/FetchFromLeaderWithCorruptedCheckpointTest.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/FetchFromLeaderWithCorruptedCheckpointTest.java @@ -18,6 +18,7 @@ import kafka.log.LogManager; import kafka.server.ReplicaManager; + import org.apache.kafka.storage.internals.checkpoint.CleanShutdownFileHandler; import org.apache.kafka.tiered.storage.TieredStorageTestBuilder; import org.apache.kafka.tiered.storage.TieredStorageTestHarness; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java index 207f9bd4e837f..4f8ae1630a865 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsWithTieredStoreTest.java @@ -19,12 +19,13 @@ import kafka.api.TransactionsTest; import kafka.server.HostedPartition; import kafka.server.KafkaBroker; + import org.apache.kafka.common.TopicPartition; import org.apache.kafka.test.TestUtils; import org.apache.kafka.tiered.storage.utils.BrokerLocalStorage; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInfo; -import scala.collection.JavaConverters; import java.util.HashMap; import java.util.List; @@ -34,9 +35,11 @@ import java.util.Properties; import java.util.stream.Collectors; +import scala.collection.JavaConverters; + +import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.STORAGE_WAIT_TIMEOUT_SEC; import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.createPropsForRemoteStorage; import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.createTopicConfigForRemoteStorage; -import static org.apache.kafka.tiered.storage.utils.TieredStorageTestUtils.STORAGE_WAIT_TIMEOUT_SEC; public class TransactionsWithTieredStoreTest extends TransactionsTest { diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/utils/RecordsKeyValueMatcher.java b/storage/src/test/java/org/apache/kafka/tiered/storage/utils/RecordsKeyValueMatcher.java index 902b5c2d7132a..d9843f7f857f7 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/utils/RecordsKeyValueMatcher.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/utils/RecordsKeyValueMatcher.java @@ -26,6 +26,7 @@ import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.Serde; import org.apache.kafka.common.utils.Utils; + import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; diff --git a/storage/src/test/java/org/apache/kafka/tiered/storage/utils/TieredStorageTestUtils.java b/storage/src/test/java/org/apache/kafka/tiered/storage/utils/TieredStorageTestUtils.java index 4db4ece844b99..7497ee762b2cc 100644 --- a/storage/src/test/java/org/apache/kafka/tiered/storage/utils/TieredStorageTestUtils.java +++ b/storage/src/test/java/org/apache/kafka/tiered/storage/utils/TieredStorageTestUtils.java @@ -17,6 +17,7 @@ package org.apache.kafka.tiered.storage.utils; import kafka.utils.TestUtils; + import org.apache.kafka.clients.admin.TopicDescription; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.config.TopicConfig; @@ -26,6 +27,7 @@ import org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig; import org.apache.kafka.server.log.remote.storage.LocalTieredStorage; import org.apache.kafka.tiered.storage.TieredStorageTestContext; + import org.junit.jupiter.api.Assertions; import java.io.IOException; @@ -40,6 +42,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import static org.apache.kafka.server.config.ServerLogConfigs.LOG_CLEANUP_INTERVAL_MS_CONFIG; import static org.apache.kafka.server.config.ServerLogConfigs.LOG_INITIAL_TASK_DELAY_MS_CONFIG; import static org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManagerConfig.REMOTE_LOG_METADATA_INITIALIZATION_RETRY_INTERVAL_MS_PROP; import static org.apache.kafka.server.log.remote.storage.LocalTieredStorage.DELETE_ON_CLOSE_CONFIG; @@ -51,7 +54,6 @@ import static org.apache.kafka.server.log.remote.storage.RemoteLogManagerConfig.REMOTE_LOG_STORAGE_SYSTEM_ENABLE_PROP; import static org.apache.kafka.server.log.remote.storage.RemoteLogManagerConfig.REMOTE_STORAGE_MANAGER_CLASS_NAME_PROP; import static org.apache.kafka.server.log.remote.storage.RemoteLogManagerConfig.REMOTE_STORAGE_MANAGER_CONFIG_PREFIX_PROP; -import static org.apache.kafka.server.config.ServerLogConfigs.LOG_CLEANUP_INTERVAL_MS_CONFIG; import static org.apache.kafka.storage.internals.log.CleanerConfig.LOG_CLEANER_ENABLE_PROP; public class TieredStorageTestUtils {