Skip to content

Commit bc7d2ed

Browse files
578223592caicai
andauthored
[ISSUE #3412]♻️Refactor UnlockBatchMqRequestHeader with derive marco RequestHeaderCodec (#3497)
Co-authored-by: caicai <caicai@didiglobal.com>
1 parent 692fe9f commit bc7d2ed

File tree

2 files changed

+3
-31
lines changed

2 files changed

+3
-31
lines changed

rocketmq-client/src/implementation/mq_client_api_impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ impl MQClientAPIImpl {
906906
client_id: &str,
907907
subscription_data: &SubscriptionData,
908908
timeout_millis: u64,
909-
) -> rocketmq_error::RocketMQResult<()> {
909+
) -> RocketMQResult<()> {
910910
let mut request = RemotingCommand::create_remoting_command(RequestCode::CheckClientConfig);
911911
let body = CheckClientRequestBody::new(
912912
client_id.to_string(),

rocketmq-remoting/src/protocol/header/unlock_batch_mq_request_header.rs

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,44 +14,16 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
use std::collections::HashMap;
1817

19-
use cheetah_string::CheetahString;
18+
use rocketmq_macros::RequestHeaderCodec;
2019
use serde::Deserialize;
2120
use serde::Serialize;
2221

23-
use crate::protocol::command_custom_header::CommandCustomHeader;
24-
use crate::protocol::command_custom_header::FromMap;
2522
use crate::rpc::rpc_request_header::RpcRequestHeader;
2623

27-
#[derive(Serialize, Deserialize, Debug, Default)]
24+
#[derive(Serialize, Deserialize, Debug, Default, RequestHeaderCodec)]
2825
#[serde(rename_all = "camelCase")]
2926
pub struct UnlockBatchMqRequestHeader {
3027
#[serde(flatten)]
3128
pub rpc_request_header: Option<RpcRequestHeader>,
3229
}
33-
34-
impl CommandCustomHeader for UnlockBatchMqRequestHeader {
35-
fn to_map(&self) -> Option<HashMap<CheetahString, CheetahString>> {
36-
let mut map = HashMap::new();
37-
if let Some(value) = self.rpc_request_header.as_ref() {
38-
if let Some(value) = value.to_map() {
39-
map.extend(value);
40-
}
41-
}
42-
Some(map)
43-
}
44-
}
45-
46-
impl FromMap for UnlockBatchMqRequestHeader {
47-
type Error = rocketmq_error::RocketmqError;
48-
49-
type Target = Self;
50-
51-
fn from(map: &HashMap<CheetahString, CheetahString>) -> Result<Self::Target, Self::Error> {
52-
let rpc_request_header = <RpcRequestHeader as FromMap>::from(map)?;
53-
Ok(UnlockBatchMqRequestHeader {
54-
rpc_request_header: Some(rpc_request_header),
55-
})
56-
}
57-
}

0 commit comments

Comments
 (0)