This is an automated email from the ASF dual-hosted git repository. dajac pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git
from 79ea7d6122a MINOR: Various cleanups in clients (#16193) add 7d832cf74fd KAFKA-14701; Move `PartitionAssignor` to new `group-coordinator-api` module (#16198) No new revisions were added by this update. Summary of changes: build.gradle | 63 ++++++++++++ core/src/main/scala/kafka/server/KafkaConfig.scala | 2 +- .../assignor/ConsumerGroupPartitionAssignor.java | 6 +- .../group/api}/assignor/GroupAssignment.java | 8 +- .../coordinator/group/api}/assignor/GroupSpec.java | 18 ++-- .../group/api/assignor/MemberAssignment.java} | 17 ++-- .../group/api/assignor/MemberSubscription.java} | 6 +- .../group/api}/assignor/PartitionAssignor.java | 6 +- .../api}/assignor/PartitionAssignorException.java | 2 +- .../api}/assignor/SubscribedTopicDescriber.java | 2 +- .../group/api}/assignor/SubscriptionType.java | 5 +- .../coordinator/group/GroupCoordinatorConfig.java | 2 +- .../coordinator/group/GroupMetadataManager.java | 10 +- .../assignor/AbstractUniformAssignmentBuilder.java | 5 +- .../assignor/GeneralUniformAssignmentBuilder.java | 16 ++- .../OptimizedUniformAssignmentBuilder.java | 16 ++- .../coordinator/group/assignor/RangeAssignor.java | 25 +++-- .../group/assignor/UniformAssignor.java | 7 +- .../coordinator/group/consumer/Assignment.java | 4 +- .../coordinator/group/consumer/ConsumerGroup.java | 6 +- .../{assignor => consumer}/GroupSpecImpl.java | 35 ++++--- .../MemberAssignmentImpl.java} | 29 +++--- .../MemberSubscriptionAndAssignmentImpl.java} | 20 ++-- ...data.java => SubscribedTopicDescriberImpl.java} | 10 +- .../group/consumer/TargetAssignmentBuilder.java | 26 +++-- .../coordinator/group/AssignmentTestUtil.java | 12 +-- .../group/GroupCoordinatorConfigTest.java | 2 +- .../group/GroupMetadataManagerTest.java | 101 +++++++++---------- .../group/GroupMetadataManagerTestContext.java | 2 +- .../coordinator/group/MockPartitionAssignor.java | 12 +-- .../coordinator/group/NoOpPartitionAssignor.java | 15 ++- .../GeneralUniformAssignmentBuilderTest.java | 90 +++++++++-------- .../group/assignor/GroupSpecImplTest.java | 13 ++- .../OptimizedUniformAssignmentBuilderTest.java | 95 +++++++++--------- .../group/assignor/RangeAssignorTest.java | 107 +++++++++++---------- .../group/consumer/ConsumerGroupTest.java | 4 +- .../consumer/SubscribedTopicMetadataTest.java | 10 +- .../consumer/TargetAssignmentBuilderTest.java | 66 ++++++------- .../kafka/jmh/assignor/AssignorBenchmarkUtils.java | 6 +- .../jmh/assignor/ClientSideAssignorBenchmark.java | 6 +- .../jmh/assignor/ServerSideAssignorBenchmark.java | 39 ++++---- .../assignor/TargetAssignmentBuilderBenchmark.java | 22 ++--- settings.gradle | 1 + 43 files changed, 538 insertions(+), 411 deletions(-) copy group-coordinator/{src/main/java/org/apache/kafka/coordinator/group => group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api}/assignor/ConsumerGroupPartitionAssignor.java (85%) rename group-coordinator/{src/main/java/org/apache/kafka/coordinator/group => group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api}/assignor/GroupAssignment.java (89%) rename group-coordinator/{src/main/java/org/apache/kafka/coordinator/group => group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api}/assignor/GroupSpec.java (78%) rename group-coordinator/{src/main/java/org/apache/kafka/coordinator/group/assignor/ConsumerGroupPartitionAssignor.java => group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/MemberAssignment.java} (72%) rename group-coordinator/{src/main/java/org/apache/kafka/coordinator/group/assignor/MemberSubscriptionSpec.java => group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api/assignor/MemberSubscription.java} (87%) rename group-coordinator/{src/main/java/org/apache/kafka/coordinator/group => group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api}/assignor/PartitionAssignor.java (90%) rename group-coordinator/{src/main/java/org/apache/kafka/coordinator/group => group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api}/assignor/PartitionAssignorException.java (95%) rename group-coordinator/{src/main/java/org/apache/kafka/coordinator/group => group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api}/assignor/SubscribedTopicDescriber.java (97%) rename group-coordinator/{src/main/java/org/apache/kafka/coordinator/group => group-coordinator-api/src/main/java/org/apache/kafka/coordinator/group/api}/assignor/SubscriptionType.java (90%) rename group-coordinator/src/main/java/org/apache/kafka/coordinator/group/{assignor => consumer}/GroupSpecImpl.java (75%) rename group-coordinator/src/main/java/org/apache/kafka/coordinator/group/{assignor/MemberAssignment.java => consumer/MemberAssignmentImpl.java} (61%) rename group-coordinator/src/main/java/org/apache/kafka/coordinator/group/{assignor/MemberSubscriptionSpecImpl.java => consumer/MemberSubscriptionAndAssignmentImpl.java} (77%) rename group-coordinator/src/main/java/org/apache/kafka/coordinator/group/consumer/{SubscribedTopicMetadata.java => SubscribedTopicDescriberImpl.java} (89%)