This is an automated email from the ASF dual-hosted git repository. bbejeck pushed a commit to branch checkstyle_fixes in repository https://gitbox.apache.org/repos/asf/kafka.git
commit 4166fd3801696d2741fa955ad4baca98eb8fd7ab Author: Bill <[email protected]> AuthorDate: Mon Dec 2 12:48:19 2024 -0500 Updates from running spotless apply --- .../internals/events/StreamsOnAllTasksLostCallbackNeededEvent.java | 1 - .../internals/events/StreamsOnTasksRevokedCallbackNeededEvent.java | 1 - clients/src/main/java/org/apache/kafka/common/protocol/Errors.java | 1 + .../java/org/apache/kafka/coordinator/group/streams/StreamsGroup.java | 2 +- .../coordinator/group/streams/topics/CopartitionedTopicsEnforcer.java | 1 + .../kafka/coordinator/group/streams/topics/RepartitionTopics.java | 1 + .../coordinator/group/streams/CoordinatorStreamsRecordHelpersTest.java | 1 + .../kafka/coordinator/group/streams/TargetAssignmentBuilderTest.java | 1 + .../apache/kafka/coordinator/group/streams/TopologyMetadataTest.java | 1 + .../kafka/coordinator/group/streams/topics/RepartitionTopicsTest.java | 1 + streams/src/test/java/org/apache/kafka/test/MockClientSupplier.java | 2 +- streams/src/test/resources/log4j.properties | 1 + .../src/main/java/org/apache/kafka/streams/TopologyTestDriver.java | 2 -- 13 files changed, 10 insertions(+), 6 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/StreamsOnAllTasksLostCallbackNeededEvent.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/StreamsOnAllTasksLostCallbackNeededEvent.java index 294cf3e2fde..29e1a94ec72 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/StreamsOnAllTasksLostCallbackNeededEvent.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/StreamsOnAllTasksLostCallbackNeededEvent.java @@ -27,4 +27,3 @@ public class StreamsOnAllTasksLostCallbackNeededEvent extends CompletableBackgro return super.toStringBase(); } } - diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/StreamsOnTasksRevokedCallbackNeededEvent.java b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/StreamsOnTasksRevokedCallbackNeededEvent.java index be7ae13b446..05260eb311d 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/StreamsOnTasksRevokedCallbackNeededEvent.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/internals/events/StreamsOnTasksRevokedCallbackNeededEvent.java @@ -40,4 +40,3 @@ public class StreamsOnTasksRevokedCallbackNeededEvent extends CompletableBackgro ", active tasks to revoke=" + activeTasksToRevoke; } } - diff --git a/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java b/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java index 139d856345b..2dbf3abde97 100644 --- a/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java +++ b/clients/src/main/java/org/apache/kafka/common/protocol/Errors.java @@ -151,6 +151,7 @@ import org.apache.kafka.common.errors.UnsupportedForMessageFormatException; import org.apache.kafka.common.errors.UnsupportedSaslMechanismException; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.common.errors.VoterNotFoundException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsGroup.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsGroup.java index f8eb754a9b4..9e1a35db049 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsGroup.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/StreamsGroup.java @@ -31,8 +31,8 @@ import org.apache.kafka.coordinator.group.Group; import org.apache.kafka.coordinator.group.OffsetExpirationCondition; import org.apache.kafka.coordinator.group.OffsetExpirationConditionImpl; import org.apache.kafka.coordinator.group.metrics.GroupCoordinatorMetricsShard; -import org.apache.kafka.coordinator.group.streams.topics.InternalTopicManager; import org.apache.kafka.coordinator.group.streams.topics.ConfiguredTopology; +import org.apache.kafka.coordinator.group.streams.topics.InternalTopicManager; import org.apache.kafka.image.ClusterImage; import org.apache.kafka.image.TopicImage; import org.apache.kafka.image.TopicsImage; diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/topics/CopartitionedTopicsEnforcer.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/topics/CopartitionedTopicsEnforcer.java index decd948c018..208575b5edc 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/topics/CopartitionedTopicsEnforcer.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/topics/CopartitionedTopicsEnforcer.java @@ -18,6 +18,7 @@ package org.apache.kafka.coordinator.group.streams.topics; import org.apache.kafka.common.errors.StreamsInvalidTopologyException; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.Collection; diff --git a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/topics/RepartitionTopics.java b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/topics/RepartitionTopics.java index 901bd09a526..5cec05a7776 100644 --- a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/topics/RepartitionTopics.java +++ b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/streams/topics/RepartitionTopics.java @@ -17,6 +17,7 @@ package org.apache.kafka.coordinator.group.streams.topics; import org.apache.kafka.common.utils.LogContext; + import org.slf4j.Logger; import java.util.HashMap; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/CoordinatorStreamsRecordHelpersTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/CoordinatorStreamsRecordHelpersTest.java index 7793231efb6..843713ea80f 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/CoordinatorStreamsRecordHelpersTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/CoordinatorStreamsRecordHelpersTest.java @@ -21,6 +21,7 @@ import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; import org.apache.kafka.coordinator.group.generated.StreamsGroupTopologyKey; import org.apache.kafka.coordinator.group.generated.StreamsGroupTopologyValue; import org.apache.kafka.server.common.ApiMessageAndVersion; + import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/TargetAssignmentBuilderTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/TargetAssignmentBuilderTest.java index 174be2f6535..aba992ebb4e 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/TargetAssignmentBuilderTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/TargetAssignmentBuilderTest.java @@ -27,6 +27,7 @@ import org.apache.kafka.coordinator.group.taskassignor.GroupSpecImpl; import org.apache.kafka.coordinator.group.taskassignor.MemberAssignment; import org.apache.kafka.coordinator.group.taskassignor.TaskAssignor; import org.apache.kafka.image.TopicsImage; + import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/TopologyMetadataTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/TopologyMetadataTest.java index efc3efb9c15..ad1f6593109 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/TopologyMetadataTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/TopologyMetadataTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.coordinator.group.streams; import org.apache.kafka.coordinator.group.streams.topics.ConfiguredSubtopology; import org.apache.kafka.coordinator.group.streams.topics.ConfiguredTopology; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/topics/RepartitionTopicsTest.java b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/topics/RepartitionTopicsTest.java index 1d6f3b8c4b0..e5ad2c97013 100644 --- a/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/topics/RepartitionTopicsTest.java +++ b/group-coordinator/src/test/java/org/apache/kafka/coordinator/group/streams/topics/RepartitionTopicsTest.java @@ -18,6 +18,7 @@ package org.apache.kafka.coordinator.group.streams.topics; import org.apache.kafka.common.requests.StreamsGroupHeartbeatResponse.Status; import org.apache.kafka.common.utils.LogContext; + import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/streams/src/test/java/org/apache/kafka/test/MockClientSupplier.java b/streams/src/test/java/org/apache/kafka/test/MockClientSupplier.java index c25a6c3bb06..545a783b284 100644 --- a/streams/src/test/java/org/apache/kafka/test/MockClientSupplier.java +++ b/streams/src/test/java/org/apache/kafka/test/MockClientSupplier.java @@ -20,8 +20,8 @@ import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.MockAdminClient; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.MockConsumer; -import org.apache.kafka.clients.consumer.internals.StreamsAssignmentInterface; import org.apache.kafka.clients.consumer.internals.AutoOffsetResetStrategy; +import org.apache.kafka.clients.consumer.internals.StreamsAssignmentInterface; import org.apache.kafka.clients.producer.MockProducer; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.clients.producer.ProducerConfig; diff --git a/streams/src/test/resources/log4j.properties b/streams/src/test/resources/log4j.properties index 4dcab88183b..02d945dbe40 100644 --- a/streams/src/test/resources/log4j.properties +++ b/streams/src/test/resources/log4j.properties @@ -26,6 +26,7 @@ log4j.logger.org.apache.kafka.clients=ERROR # These are the only logs we will likely ever find anything useful in to debug Streams test failures log4j.logger.org.apache.kafka.clients.consumer=INFO log4j.logger.org.apache.kafka.clients.producer=INFO +log4j.logger.org.apache.kafka.common.telemetry.internals.ClientTelemetryUtils=DEBUG log4j.logger.org.apache.kafka.streams=INFO log4j.logger.org.apache.kafka.coordinator.group=INFO log4j.logger.org.apache.kafka.clients.consumer.internals.StreamsGroupHeartbeatRequestManager=INFO diff --git a/streams/test-utils/src/main/java/org/apache/kafka/streams/TopologyTestDriver.java b/streams/test-utils/src/main/java/org/apache/kafka/streams/TopologyTestDriver.java index 64eec4c7b27..525e01f151c 100644 --- a/streams/test-utils/src/main/java/org/apache/kafka/streams/TopologyTestDriver.java +++ b/streams/test-utils/src/main/java/org/apache/kafka/streams/TopologyTestDriver.java @@ -21,8 +21,6 @@ import org.apache.kafka.clients.consumer.ConsumerGroupMetadata; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.MockConsumer; import org.apache.kafka.clients.consumer.OffsetAndMetadata; -import org.apache.kafka.clients.consumer.OffsetResetStrategy; -import org.apache.kafka.clients.consumer.internals.StreamsAssignmentInterface; import org.apache.kafka.clients.consumer.internals.AutoOffsetResetStrategy; import org.apache.kafka.clients.producer.MockProducer; import org.apache.kafka.clients.producer.Producer;
