From d781271654850d7dd1ac723f8c6dd39af3bb912b Mon Sep 17 00:00:00 2001 From: rongtong Date: Sun, 20 Nov 2022 21:51:32 +0800 Subject: [PATCH] Move the header of the controller to the upper layer (#5550) --- .../broker/controller/ReplicasManager.java | 6 +++--- .../rocketmq/broker/out/BrokerOuterAPI.java | 12 ++++++------ .../broker/controller/ReplicasManagerTest.java | 6 +++--- .../rocketmq/client/impl/MQClientAPIImpl.java | 8 ++++---- .../apache/rocketmq/controller/Controller.java | 10 +++++----- .../rocketmq/controller/ControllerManager.java | 4 ++-- .../controller/impl/DLedgerController.java | 12 ++++++------ .../impl/manager/ReplicasInfoManager.java | 18 +++++++++--------- .../processor/ControllerRequestProcessor.java | 14 +++++++------- .../impl/controller/ControllerManagerTest.java | 8 ++++---- .../controller/impl/DLedgerControllerTest.java | 14 +++++++------- .../impl/manager/ReplicasInfoManagerTest.java | 18 +++++++++--------- .../AlterSyncStateSetRequestHeader.java | 2 +- .../AlterSyncStateSetResponseHeader.java | 2 +- ...CleanControllerBrokerDataRequestHeader.java | 2 +- .../controller/ElectMasterRequestHeader.java | 2 +- .../controller/ElectMasterResponseHeader.java | 2 +- .../controller/GetMetaDataResponseHeader.java | 2 +- .../GetReplicaInfoRequestHeader.java | 2 +- .../GetReplicaInfoResponseHeader.java | 2 +- ...egisterBrokerToControllerRequestHeader.java | 2 +- ...gisterBrokerToControllerResponseHeader.java | 2 +- .../tools/admin/DefaultMQAdminExt.java | 4 ++-- .../tools/admin/DefaultMQAdminExtImpl.java | 4 ++-- .../rocketmq/tools/admin/MQAdminExt.java | 4 ++-- .../GetControllerMetaDataSubCommand.java | 2 +- .../controller/ReElectMasterSubCommand.java | 2 +- 27 files changed, 83 insertions(+), 83 deletions(-) rename remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/{namesrv => }/controller/AlterSyncStateSetRequestHeader.java (96%) rename remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/{namesrv => }/controller/AlterSyncStateSetResponseHeader.java (95%) rename remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/{namesrv => }/controller/CleanControllerBrokerDataRequestHeader.java (97%) rename remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/{namesrv => }/controller/ElectMasterRequestHeader.java (97%) rename remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/{namesrv => }/controller/ElectMasterResponseHeader.java (97%) rename remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/{namesrv => }/controller/GetMetaDataResponseHeader.java (97%) rename remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/{namesrv => }/controller/GetReplicaInfoRequestHeader.java (96%) rename remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/{namesrv => }/controller/GetReplicaInfoResponseHeader.java (96%) rename remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/{namesrv => }/controller/RegisterBrokerToControllerRequestHeader.java (97%) rename remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/{namesrv => }/controller/RegisterBrokerToControllerResponseHeader.java (96%) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java b/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java index 4bfb9fdf14..2689507037 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java @@ -40,9 +40,9 @@ import org.apache.rocketmq.logging.InternalLogger; import org.apache.rocketmq.logging.InternalLoggerFactory; import org.apache.rocketmq.remoting.protocol.EpochEntry; import org.apache.rocketmq.remoting.protocol.body.SyncStateSet; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetMetaDataResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerResponseHeader; import org.apache.rocketmq.store.config.BrokerRole; import org.apache.rocketmq.store.ha.autoswitch.AutoSwitchHAService; diff --git a/broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java b/broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java index 96def3f57b..2673c62afa 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/out/BrokerOuterAPI.java @@ -110,12 +110,12 @@ import org.apache.rocketmq.remoting.protocol.header.namesrv.QueryDataVersionResp import org.apache.rocketmq.remoting.protocol.header.namesrv.RegisterBrokerRequestHeader; import org.apache.rocketmq.remoting.protocol.header.namesrv.RegisterBrokerResponseHeader; import org.apache.rocketmq.remoting.protocol.header.namesrv.UnRegisterBrokerRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.AlterSyncStateSetRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetMetaDataResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.AlterSyncStateSetRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerResponseHeader; import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData; import org.apache.rocketmq.remoting.protocol.namesrv.RegisterBrokerResult; import org.apache.rocketmq.remoting.protocol.route.BrokerData; diff --git a/broker/src/test/java/org/apache/rocketmq/broker/controller/ReplicasManagerTest.java b/broker/src/test/java/org/apache/rocketmq/broker/controller/ReplicasManagerTest.java index 6d67aeac3c..9c08d8e670 100644 --- a/broker/src/test/java/org/apache/rocketmq/broker/controller/ReplicasManagerTest.java +++ b/broker/src/test/java/org/apache/rocketmq/broker/controller/ReplicasManagerTest.java @@ -24,9 +24,9 @@ import org.apache.rocketmq.broker.slave.SlaveSynchronize; import org.apache.rocketmq.common.BrokerConfig; import org.apache.rocketmq.common.Pair; import org.apache.rocketmq.remoting.protocol.body.SyncStateSet; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetMetaDataResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerResponseHeader; import org.apache.rocketmq.store.DefaultMessageStore; import org.apache.rocketmq.store.config.MessageStoreConfig; import org.apache.rocketmq.store.ha.autoswitch.AutoSwitchHAService; diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java index f0d6f8dc9f..75c50f433e 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java @@ -205,10 +205,10 @@ import org.apache.rocketmq.remoting.protocol.header.namesrv.GetRouteInfoRequestH import org.apache.rocketmq.remoting.protocol.header.namesrv.PutKVConfigRequestHeader; import org.apache.rocketmq.remoting.protocol.header.namesrv.WipeWritePermOfBrokerRequestHeader; import org.apache.rocketmq.remoting.protocol.header.namesrv.WipeWritePermOfBrokerResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.CleanControllerBrokerDataRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetMetaDataResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.CleanControllerBrokerDataRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader; import org.apache.rocketmq.remoting.protocol.heartbeat.HeartbeatData; import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel; import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData; diff --git a/controller/src/main/java/org/apache/rocketmq/controller/Controller.java b/controller/src/main/java/org/apache/rocketmq/controller/Controller.java index 3e236c3375..58a9b62145 100644 --- a/controller/src/main/java/org/apache/rocketmq/controller/Controller.java +++ b/controller/src/main/java/org/apache/rocketmq/controller/Controller.java @@ -22,11 +22,11 @@ import java.util.concurrent.CompletableFuture; import org.apache.rocketmq.remoting.RemotingServer; import org.apache.rocketmq.remoting.protocol.RemotingCommand; import org.apache.rocketmq.remoting.protocol.body.SyncStateSet; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.AlterSyncStateSetRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.CleanControllerBrokerDataRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.AlterSyncStateSetRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.CleanControllerBrokerDataRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerRequestHeader; /** * The api for controller diff --git a/controller/src/main/java/org/apache/rocketmq/controller/ControllerManager.java b/controller/src/main/java/org/apache/rocketmq/controller/ControllerManager.java index 1add67a38a..de4534e28f 100644 --- a/controller/src/main/java/org/apache/rocketmq/controller/ControllerManager.java +++ b/controller/src/main/java/org/apache/rocketmq/controller/ControllerManager.java @@ -46,8 +46,8 @@ import org.apache.rocketmq.remoting.protocol.RemotingCommand; import org.apache.rocketmq.remoting.protocol.RequestCode; import org.apache.rocketmq.remoting.protocol.body.BrokerMemberGroup; import org.apache.rocketmq.remoting.protocol.header.NotifyBrokerRoleChangedRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterResponseHeader; public class ControllerManager { private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.CONTROLLER_LOGGER_NAME); diff --git a/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerController.java b/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerController.java index bb963e3332..44ee9c0e06 100644 --- a/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerController.java +++ b/controller/src/main/java/org/apache/rocketmq/controller/impl/DLedgerController.java @@ -57,12 +57,12 @@ import org.apache.rocketmq.remoting.netty.NettyServerConfig; import org.apache.rocketmq.remoting.protocol.RemotingCommand; import org.apache.rocketmq.remoting.protocol.ResponseCode; import org.apache.rocketmq.remoting.protocol.body.SyncStateSet; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.AlterSyncStateSetRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.CleanControllerBrokerDataRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetMetaDataResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.AlterSyncStateSetRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.CleanControllerBrokerDataRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerRequestHeader; /** * The implementation of controller, based on dledger (raft). diff --git a/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java b/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java index b3c76735e4..f3962df5e8 100644 --- a/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java +++ b/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java @@ -43,15 +43,15 @@ import org.apache.rocketmq.remoting.protocol.ResponseCode; import org.apache.rocketmq.remoting.protocol.body.BrokerMemberGroup; import org.apache.rocketmq.remoting.protocol.body.InSyncStateData; import org.apache.rocketmq.remoting.protocol.body.SyncStateSet; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.AlterSyncStateSetRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.AlterSyncStateSetResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.CleanControllerBrokerDataRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.AlterSyncStateSetRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.AlterSyncStateSetResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.CleanControllerBrokerDataRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerResponseHeader; /** * The manager that manages the replicas info for all brokers. We can think of this class as the controller's memory diff --git a/controller/src/main/java/org/apache/rocketmq/controller/processor/ControllerRequestProcessor.java b/controller/src/main/java/org/apache/rocketmq/controller/processor/ControllerRequestProcessor.java index 42094a6bd4..f9e0a0c769 100644 --- a/controller/src/main/java/org/apache/rocketmq/controller/processor/ControllerRequestProcessor.java +++ b/controller/src/main/java/org/apache/rocketmq/controller/processor/ControllerRequestProcessor.java @@ -36,13 +36,13 @@ import org.apache.rocketmq.remoting.protocol.RemotingSerializable; import org.apache.rocketmq.remoting.protocol.ResponseCode; import org.apache.rocketmq.remoting.protocol.body.SyncStateSet; import org.apache.rocketmq.remoting.protocol.header.namesrv.BrokerHeartbeatRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.AlterSyncStateSetRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.CleanControllerBrokerDataRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.AlterSyncStateSetRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.CleanControllerBrokerDataRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerResponseHeader; import static org.apache.rocketmq.remoting.protocol.RequestCode.BROKER_HEARTBEAT; import static org.apache.rocketmq.remoting.protocol.RequestCode.CLEAN_BROKER_DATA; diff --git a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/ControllerManagerTest.java b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/ControllerManagerTest.java index 2052dcbfa7..41bcaa0bb1 100644 --- a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/ControllerManagerTest.java +++ b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/ControllerManagerTest.java @@ -37,10 +37,10 @@ import org.apache.rocketmq.remoting.netty.NettyServerConfig; import org.apache.rocketmq.remoting.protocol.RemotingCommand; import org.apache.rocketmq.remoting.protocol.RequestCode; import org.apache.rocketmq.remoting.protocol.header.namesrv.BrokerHeartbeatRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerResponseHeader; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DLedgerControllerTest.java b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DLedgerControllerTest.java index 1c5affb5c9..84bf7c72ba 100644 --- a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DLedgerControllerTest.java +++ b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DLedgerControllerTest.java @@ -35,13 +35,13 @@ import org.apache.rocketmq.remoting.protocol.RemotingCommand; import org.apache.rocketmq.remoting.protocol.RemotingSerializable; import org.apache.rocketmq.remoting.protocol.ResponseCode; import org.apache.rocketmq.remoting.protocol.body.SyncStateSet; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.AlterSyncStateSetRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.AlterSyncStateSetRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerResponseHeader; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/manager/ReplicasInfoManagerTest.java b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/manager/ReplicasInfoManagerTest.java index a928a2e061..0b7faafc0c 100644 --- a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/manager/ReplicasInfoManagerTest.java +++ b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/manager/ReplicasInfoManagerTest.java @@ -30,15 +30,15 @@ import org.apache.rocketmq.controller.impl.manager.ReplicasInfoManager; import org.apache.rocketmq.remoting.protocol.RemotingSerializable; import org.apache.rocketmq.remoting.protocol.ResponseCode; import org.apache.rocketmq.remoting.protocol.body.SyncStateSet; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.AlterSyncStateSetRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.AlterSyncStateSetResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.CleanControllerBrokerDataRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetReplicaInfoResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.RegisterBrokerToControllerResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.AlterSyncStateSetRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.AlterSyncStateSetResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.CleanControllerBrokerDataRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerRequestHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerResponseHeader; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/AlterSyncStateSetRequestHeader.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/AlterSyncStateSetRequestHeader.java similarity index 96% rename from remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/AlterSyncStateSetRequestHeader.java rename to remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/AlterSyncStateSetRequestHeader.java index dd1e19c316..3e01379f88 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/AlterSyncStateSetRequestHeader.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/AlterSyncStateSetRequestHeader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.rocketmq.remoting.protocol.header.namesrv.controller; +package org.apache.rocketmq.remoting.protocol.header.controller; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.exception.RemotingCommandException; diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/AlterSyncStateSetResponseHeader.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/AlterSyncStateSetResponseHeader.java similarity index 95% rename from remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/AlterSyncStateSetResponseHeader.java rename to remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/AlterSyncStateSetResponseHeader.java index 05995657a6..012197c73b 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/AlterSyncStateSetResponseHeader.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/AlterSyncStateSetResponseHeader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.rocketmq.remoting.protocol.header.namesrv.controller; +package org.apache.rocketmq.remoting.protocol.header.controller; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.exception.RemotingCommandException; diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/CleanControllerBrokerDataRequestHeader.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/CleanControllerBrokerDataRequestHeader.java similarity index 97% rename from remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/CleanControllerBrokerDataRequestHeader.java rename to remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/CleanControllerBrokerDataRequestHeader.java index abdc2a0b58..00746fc4bf 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/CleanControllerBrokerDataRequestHeader.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/CleanControllerBrokerDataRequestHeader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.rocketmq.remoting.protocol.header.namesrv.controller; +package org.apache.rocketmq.remoting.protocol.header.controller; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/ElectMasterRequestHeader.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/ElectMasterRequestHeader.java similarity index 97% rename from remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/ElectMasterRequestHeader.java rename to remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/ElectMasterRequestHeader.java index dd2025c45d..9eff52558b 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/ElectMasterRequestHeader.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/ElectMasterRequestHeader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.rocketmq.remoting.protocol.header.namesrv.controller; +package org.apache.rocketmq.remoting.protocol.header.controller; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNotNull; diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/ElectMasterResponseHeader.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/ElectMasterResponseHeader.java similarity index 97% rename from remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/ElectMasterResponseHeader.java rename to remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/ElectMasterResponseHeader.java index 41ee1a8588..896ea9963a 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/ElectMasterResponseHeader.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/ElectMasterResponseHeader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.rocketmq.remoting.protocol.header.namesrv.controller; +package org.apache.rocketmq.remoting.protocol.header.controller; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.exception.RemotingCommandException; diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/GetMetaDataResponseHeader.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/GetMetaDataResponseHeader.java similarity index 97% rename from remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/GetMetaDataResponseHeader.java rename to remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/GetMetaDataResponseHeader.java index dad5016a03..9ae6c7ca08 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/GetMetaDataResponseHeader.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/GetMetaDataResponseHeader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.rocketmq.remoting.protocol.header.namesrv.controller; +package org.apache.rocketmq.remoting.protocol.header.controller; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.exception.RemotingCommandException; diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/GetReplicaInfoRequestHeader.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/GetReplicaInfoRequestHeader.java similarity index 96% rename from remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/GetReplicaInfoRequestHeader.java rename to remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/GetReplicaInfoRequestHeader.java index 6c750aff63..9fe0e53162 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/GetReplicaInfoRequestHeader.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/GetReplicaInfoRequestHeader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.rocketmq.remoting.protocol.header.namesrv.controller; +package org.apache.rocketmq.remoting.protocol.header.controller; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.exception.RemotingCommandException; diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/GetReplicaInfoResponseHeader.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/GetReplicaInfoResponseHeader.java similarity index 96% rename from remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/GetReplicaInfoResponseHeader.java rename to remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/GetReplicaInfoResponseHeader.java index 8e0dfcb18b..fc6d4ce2e4 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/GetReplicaInfoResponseHeader.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/GetReplicaInfoResponseHeader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.rocketmq.remoting.protocol.header.namesrv.controller; +package org.apache.rocketmq.remoting.protocol.header.controller; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.exception.RemotingCommandException; diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/RegisterBrokerToControllerRequestHeader.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/RegisterBrokerToControllerRequestHeader.java similarity index 97% rename from remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/RegisterBrokerToControllerRequestHeader.java rename to remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/RegisterBrokerToControllerRequestHeader.java index e0b2ddfdb4..81ed03d489 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/RegisterBrokerToControllerRequestHeader.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/RegisterBrokerToControllerRequestHeader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.rocketmq.remoting.protocol.header.namesrv.controller; +package org.apache.rocketmq.remoting.protocol.header.controller; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.annotation.CFNullable; diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/RegisterBrokerToControllerResponseHeader.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/RegisterBrokerToControllerResponseHeader.java similarity index 96% rename from remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/RegisterBrokerToControllerResponseHeader.java rename to remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/RegisterBrokerToControllerResponseHeader.java index 74c93106f5..0fdcfaccb7 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/namesrv/controller/RegisterBrokerToControllerResponseHeader.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/controller/RegisterBrokerToControllerResponseHeader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.rocketmq.remoting.protocol.header.namesrv.controller; +package org.apache.rocketmq.remoting.protocol.header.controller; import org.apache.rocketmq.remoting.CommandCustomHeader; import org.apache.rocketmq.remoting.exception.RemotingCommandException; diff --git a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java index 74a13a7407..9f15ccaffc 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExt.java @@ -60,8 +60,8 @@ import org.apache.rocketmq.remoting.protocol.body.QueueTimeSpan; import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper; import org.apache.rocketmq.remoting.protocol.body.TopicConfigSerializeWrapper; import org.apache.rocketmq.remoting.protocol.body.TopicList; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetMetaDataResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader; import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData; import org.apache.rocketmq.remoting.protocol.route.TopicRouteData; import org.apache.rocketmq.remoting.protocol.statictopic.TopicQueueMappingDetail; diff --git a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java index 1a0e292a0a..3d72f6a781 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java @@ -97,8 +97,8 @@ import org.apache.rocketmq.remoting.protocol.body.TopicConfigSerializeWrapper; import org.apache.rocketmq.remoting.protocol.body.TopicList; import org.apache.rocketmq.remoting.protocol.header.UpdateConsumerOffsetRequestHeader; import org.apache.rocketmq.remoting.protocol.header.UpdateGroupForbiddenRequestHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetMetaDataResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader; import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel; import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData; import org.apache.rocketmq.remoting.protocol.route.BrokerData; diff --git a/tools/src/main/java/org/apache/rocketmq/tools/admin/MQAdminExt.java b/tools/src/main/java/org/apache/rocketmq/tools/admin/MQAdminExt.java index 130fe603cc..efe8c03421 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/admin/MQAdminExt.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/admin/MQAdminExt.java @@ -57,8 +57,8 @@ import org.apache.rocketmq.remoting.protocol.body.QueueTimeSpan; import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper; import org.apache.rocketmq.remoting.protocol.body.TopicConfigSerializeWrapper; import org.apache.rocketmq.remoting.protocol.body.TopicList; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterResponseHeader; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetMetaDataResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader; import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData; import org.apache.rocketmq.remoting.protocol.route.TopicRouteData; import org.apache.rocketmq.remoting.protocol.statictopic.TopicQueueMappingDetail; diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/controller/GetControllerMetaDataSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/controller/GetControllerMetaDataSubCommand.java index f5cd2ea8e4..70bd7f8e98 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/controller/GetControllerMetaDataSubCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/controller/GetControllerMetaDataSubCommand.java @@ -21,7 +21,7 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.remoting.RPCHook; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.GetMetaDataResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader; import org.apache.rocketmq.tools.admin.DefaultMQAdminExt; import org.apache.rocketmq.tools.command.SubCommand; import org.apache.rocketmq.tools.command.SubCommandException; diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/controller/ReElectMasterSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/controller/ReElectMasterSubCommand.java index 63e4d42d95..a901bfbe32 100644 --- a/tools/src/main/java/org/apache/rocketmq/tools/command/controller/ReElectMasterSubCommand.java +++ b/tools/src/main/java/org/apache/rocketmq/tools/command/controller/ReElectMasterSubCommand.java @@ -22,7 +22,7 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.rocketmq.remoting.RPCHook; import org.apache.rocketmq.remoting.protocol.body.BrokerMemberGroup; -import org.apache.rocketmq.remoting.protocol.header.namesrv.controller.ElectMasterResponseHeader; +import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterResponseHeader; import org.apache.rocketmq.tools.admin.DefaultMQAdminExt; import org.apache.rocketmq.tools.command.SubCommand; import org.apache.rocketmq.tools.command.SubCommandException;