Skip to content

Commit a603bf1

Browse files
MINOR-restructuring: Relocated PartitionMetadataClient to server-common (#21440)
This PR moves PartitionMetadataClient to server-common so it can be reused across multiple components. The change improves modularity, avoids duplication, and makes these clients accessible from all required call sites without tight coupling. Reviewers: Sean Quah <squah@confluent.io>, Sushant Mahajan <smahajan@confluent.io>, Apoorv Mittal <apoorvmittal10@gmail.com>
1 parent 1af5fae commit a603bf1

File tree

6 files changed

+7
-8
lines changed

6 files changed

+7
-8
lines changed

core/src/main/scala/kafka/server/BrokerServer.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import org.apache.kafka.common.utils.{LogContext, Time, Utils}
3535
import org.apache.kafka.common.{ClusterResource, TopicPartition, Uuid}
3636
import org.apache.kafka.coordinator.common.runtime.{CoordinatorLoaderImpl, CoordinatorRecord}
3737
import org.apache.kafka.coordinator.group.metrics.{GroupCoordinatorMetrics, GroupCoordinatorRuntimeMetrics}
38-
import org.apache.kafka.coordinator.group.{GroupConfigManager, GroupCoordinator, GroupCoordinatorRecordSerde, GroupCoordinatorService, NetworkPartitionMetadataClient, PartitionMetadataClient}
38+
import org.apache.kafka.coordinator.group.{GroupConfigManager, GroupCoordinator, GroupCoordinatorRecordSerde, GroupCoordinatorService}
3939
import org.apache.kafka.coordinator.share.metrics.{ShareCoordinatorMetrics, ShareCoordinatorRuntimeMetrics}
4040
import org.apache.kafka.coordinator.share.{ShareCoordinator, ShareCoordinatorRecordSerde, ShareCoordinatorService}
4141
import org.apache.kafka.coordinator.transaction.ProducerIdManager
@@ -54,7 +54,7 @@ import org.apache.kafka.server.network.{EndpointReadyFutures, KafkaAuthorizerSer
5454
import org.apache.kafka.server.share.persister.{DefaultStatePersister, NoOpStatePersister, Persister, PersisterStateManager}
5555
import org.apache.kafka.server.share.session.ShareSessionCache
5656
import org.apache.kafka.server.util.timer.{SystemTimer, SystemTimerReaper}
57-
import org.apache.kafka.server.util.{Deadline, FutureUtils, KafkaScheduler}
57+
import org.apache.kafka.server.util.{Deadline, FutureUtils, KafkaScheduler, NetworkPartitionMetadataClient, PartitionMetadataClient}
5858
import org.apache.kafka.server.{AssignmentsManager, BrokerFeatures, BrokerLifecycleManager, ClientMetricsManager, DefaultApiVersionManager, DelayedActionQueue, FetchManager, FetchSessionCacheShard, KRaftTopicCreator, NodeToControllerChannelManagerImpl, ProcessRole, RaftControllerNodeProvider}
5959
import org.apache.kafka.server.transaction.AddPartitionsToTxnManager
6060
import org.apache.kafka.storage.internals.log.LogDirFailureChannel

group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@
119119
import org.apache.kafka.server.share.persister.ReadShareGroupStateSummaryResult;
120120
import org.apache.kafka.server.share.persister.TopicData;
121121
import org.apache.kafka.server.util.FutureUtils;
122+
import org.apache.kafka.server.util.PartitionMetadataClient;
122123
import org.apache.kafka.server.util.timer.Timer;
123124
import org.apache.kafka.server.util.timer.TimerTask;
124125

group-coordinator/src/test/java/org/apache/kafka/coordinator/group/GroupCoordinatorServiceTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
import org.apache.kafka.server.share.persister.ReadShareGroupStateSummaryParameters;
114114
import org.apache.kafka.server.share.persister.ReadShareGroupStateSummaryResult;
115115
import org.apache.kafka.server.share.persister.TopicData;
116+
import org.apache.kafka.server.util.PartitionMetadataClient;
116117
import org.apache.kafka.server.util.timer.MockTimer;
117118

118119
import org.junit.jupiter.api.Test;

group-coordinator/src/main/java/org/apache/kafka/coordinator/group/PartitionMetadataClient.java renamed to server-common/src/main/java/org/apache/kafka/server/util/PartitionMetadataClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.kafka.coordinator.group;
17+
package org.apache.kafka.server.util;
1818

1919
import org.apache.kafka.common.TopicPartition;
2020
import org.apache.kafka.common.protocol.Errors;

group-coordinator/src/main/java/org/apache/kafka/coordinator/group/NetworkPartitionMetadataClient.java renamed to server/src/main/java/org/apache/kafka/server/util/NetworkPartitionMetadataClient.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.kafka.coordinator.group;
17+
package org.apache.kafka.server.util;
1818

1919
import org.apache.kafka.clients.ClientResponse;
2020
import org.apache.kafka.clients.CommonClientConfigs;
@@ -34,8 +34,6 @@
3434
import org.apache.kafka.common.utils.Time;
3535
import org.apache.kafka.common.utils.Utils;
3636
import org.apache.kafka.metadata.MetadataCache;
37-
import org.apache.kafka.server.util.InterBrokerSendThread;
38-
import org.apache.kafka.server.util.RequestAndCompletionHandler;
3937
import org.apache.kafka.server.util.timer.Timer;
4038
import org.apache.kafka.server.util.timer.TimerTask;
4139

group-coordinator/src/test/java/org/apache/kafka/coordinator/group/NetworkPartitionMetadataClientTest.java renamed to server/src/test/java/org/apache/kafka/server/util/NetworkPartitionMetadataClientTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package org.apache.kafka.coordinator.group;
17+
package org.apache.kafka.server.util;
1818

1919
import org.apache.kafka.clients.ClientResponse;
2020
import org.apache.kafka.clients.CommonClientConfigs;
@@ -35,7 +35,6 @@
3535
import org.apache.kafka.common.utils.ExponentialBackoffManager;
3636
import org.apache.kafka.common.utils.Time;
3737
import org.apache.kafka.metadata.MetadataCache;
38-
import org.apache.kafka.server.util.MockTime;
3938
import org.apache.kafka.server.util.timer.MockTimer;
4039
import org.apache.kafka.server.util.timer.Timer;
4140

0 commit comments

Comments
 (0)