-
Notifications
You must be signed in to change notification settings - Fork 246
[ISSUE #9707]🧪Freeze legacy request-header derive compatibility contracts #9708
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // Copyright 2026 The RocketMQ Rust Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #[test] | ||
| fn request_header_codec_v1_legacy_contract_remains_compilable_and_deprecated() { | ||
| let tests = trybuild::TestCases::new(); | ||
| tests.pass("tests/ui/request_header_codec_v1/pass/*.rs"); | ||
| tests.compile_fail("tests/ui/request_header_codec_v1/fail/*.rs"); | ||
| } |
164 changes: 164 additions & 0 deletions
164
rocketmq-protocol/tests/request_header_codec_v1_wire_snapshot.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| // Copyright 2026 The RocketMQ Rust Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use std::collections::BTreeMap; | ||
|
|
||
| use cheetah_string::CheetahString; | ||
| use rocketmq_macros::RequestHeaderCodec; | ||
| use rocketmq_protocol::{CommandCustomHeader, FromMap, HeaderMap}; | ||
| use serde::{Deserialize, Serialize}; | ||
|
|
||
| // RequestHeaderCodec V1 expands these paths relative to its consuming crate. | ||
| pub mod protocol { | ||
| pub mod command_custom_header { | ||
| pub use rocketmq_protocol::{CommandCustomHeader, FromMap}; | ||
| } | ||
| } | ||
|
|
||
| #[allow( | ||
| deprecated, | ||
| reason = "freezes the legacy RequestHeaderCodec V1 nested-header expansion" | ||
| )] | ||
| mod legacy_nested_header { | ||
| use super::*; | ||
|
|
||
| #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, RequestHeaderCodec)] | ||
| pub struct LegacyNestedHeader { | ||
| pub nested_flag: bool, | ||
| } | ||
| } | ||
|
|
||
| use legacy_nested_header::LegacyNestedHeader; | ||
|
|
||
| #[allow( | ||
| deprecated, | ||
| reason = "freezes the legacy RequestHeaderCodec V1 wire and decode contract" | ||
| )] | ||
| mod legacy_header { | ||
| use super::*; | ||
|
|
||
| #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, RequestHeaderCodec)] | ||
| pub struct LegacyHeader { | ||
| #[required] | ||
| pub request_name: String, | ||
| #[required] | ||
| pub request_token: CheetahString, | ||
| pub attempt_count: Option<i32>, | ||
| pub optional_label: Option<CheetahString>, | ||
| pub retry_count: i32, | ||
| #[serde(flatten)] | ||
| pub nested: LegacyNestedHeader, | ||
| } | ||
| } | ||
|
|
||
| use legacy_header::LegacyHeader; | ||
|
|
||
| fn sorted(map: &HeaderMap) -> BTreeMap<String, String> { | ||
| map.iter() | ||
| .map(|(key, value)| (key.to_string(), value.to_string())) | ||
| .collect() | ||
| } | ||
|
|
||
| #[test] | ||
| fn v1_named_struct_wire_map_and_decode_quirks_are_frozen() { | ||
| let header = LegacyHeader { | ||
| request_name: "request-name".to_owned(), | ||
| request_token: CheetahString::from_static_str("token-7"), | ||
| attempt_count: Some(7), | ||
| optional_label: Some(CheetahString::from_static_str("label")), | ||
| retry_count: 3, | ||
| nested: LegacyNestedHeader { nested_flag: true }, | ||
| }; | ||
|
|
||
| assert_eq!( | ||
| sorted(&header.to_map().expect("legacy header map")), | ||
| BTreeMap::from([ | ||
| ("attemptCount".to_owned(), "7".to_owned()), | ||
| ("nestedFlag".to_owned(), "true".to_owned()), | ||
| ("optionalLabel".to_owned(), "label".to_owned()), | ||
| ("requestName".to_owned(), "request-name".to_owned()), | ||
| ("requestToken".to_owned(), "token-7".to_owned()), | ||
| ("retryCount".to_owned(), "3".to_owned()), | ||
| ]) | ||
| ); | ||
|
|
||
| let decoded = <LegacyHeader as FromMap>::from(&HeaderMap::from([ | ||
| (CheetahString::from_static_str("requestName"), "request-name".into()), | ||
| (CheetahString::from_static_str("requestToken"), "token-7".into()), | ||
| (CheetahString::from_static_str("attemptCount"), "invalid".into()), | ||
| (CheetahString::from_static_str("optionalLabel"), "label".into()), | ||
| (CheetahString::from_static_str("retryCount"), "invalid".into()), | ||
| (CheetahString::from_static_str("nestedFlag"), "true".into()), | ||
| ])) | ||
| .expect("legacy decode"); | ||
|
|
||
| assert_eq!(decoded.request_name, "request-name"); | ||
| assert_eq!(decoded.request_token.as_str(), "token-7"); | ||
| assert_eq!(decoded.attempt_count, None); | ||
| assert_eq!(decoded.optional_label.as_deref(), Some("label")); | ||
| assert_eq!(decoded.retry_count, 0); | ||
| assert!(decoded.nested.nested_flag); | ||
|
|
||
| let missing_required = <LegacyHeader as FromMap>::from(&HeaderMap::new()).expect_err("missing requestName"); | ||
| assert!(missing_required.to_string().contains("Missing requestName field")); | ||
| } | ||
|
|
||
| #[test] | ||
| fn v1_required_decode_order_and_absent_optional_defaults_are_frozen() { | ||
| let missing_request_token = <LegacyHeader as FromMap>::from(&HeaderMap::from([ | ||
| (CheetahString::from_static_str("requestName"), "request-name".into()), | ||
| (CheetahString::from_static_str("nestedFlag"), "true".into()), | ||
| ])) | ||
| .expect_err("requestToken remains required after requestName and nested fields are present"); | ||
| assert_eq!( | ||
| missing_request_token.to_string(), | ||
| "Request header error: Missing requestToken field" | ||
| ); | ||
|
|
||
| let decoded = <LegacyHeader as FromMap>::from(&HeaderMap::from([ | ||
| (CheetahString::from_static_str("requestName"), "request-name".into()), | ||
| (CheetahString::from_static_str("requestToken"), "token-7".into()), | ||
| (CheetahString::from_static_str("nestedFlag"), "true".into()), | ||
| ])) | ||
| .expect("optional fields and non-required scalar may be absent"); | ||
|
|
||
| assert_eq!(decoded.attempt_count, None); | ||
| assert_eq!(decoded.optional_label, None); | ||
| assert_eq!(decoded.retry_count, 0); | ||
| } | ||
|
|
||
| #[test] | ||
| fn v1_none_optionals_omit_their_wire_keys_with_a_literal_oracle() { | ||
| let header = LegacyHeader { | ||
| request_name: "request-name".to_owned(), | ||
| request_token: CheetahString::from_static_str("token-7"), | ||
| attempt_count: None, | ||
| optional_label: None, | ||
| retry_count: 0, | ||
| nested: LegacyNestedHeader { nested_flag: true }, | ||
| }; | ||
|
|
||
| let map = header.to_map().expect("legacy header map"); | ||
| assert!(!map.contains_key("attemptCount")); | ||
| assert!(!map.contains_key("optionalLabel")); | ||
| assert_eq!( | ||
| sorted(&map), | ||
| BTreeMap::from([ | ||
| ("nestedFlag".to_owned(), "true".to_owned()), | ||
| ("requestName".to_owned(), "request-name".to_owned()), | ||
| ("requestToken".to_owned(), "token-7".to_owned()), | ||
| ("retryCount".to_owned(), "0".to_owned()), | ||
| ]) | ||
| ); | ||
| } | ||
31 changes: 31 additions & 0 deletions
31
rocketmq-protocol/tests/ui/request_header_codec_v1/fail/deprecated.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| // Copyright 2026 The RocketMQ Rust Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #![deny(deprecated)] | ||
|
|
||
| use cheetah_string::CheetahString; | ||
| use rocketmq_macros::RequestHeaderCodec; | ||
|
|
||
| pub mod protocol { | ||
| pub mod command_custom_header { | ||
| pub use rocketmq_protocol::{CommandCustomHeader, FromMap}; | ||
| } | ||
| } | ||
|
|
||
| #[derive(RequestHeaderCodec)] | ||
| struct DeprecatedHeader { | ||
| value: CheetahString, | ||
| } | ||
|
|
||
| fn main() {} |
11 changes: 11 additions & 0 deletions
11
rocketmq-protocol/tests/ui/request_header_codec_v1/fail/deprecated.stderr
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| error: use of deprecated macro `RequestHeaderCodec`: use RequestHeaderCodecV3 with dedicated #[header(...)] wire metadata | ||
| --> tests/ui/request_header_codec_v1/fail/deprecated.rs:26:10 | ||
| | | ||
| 26 | #[derive(RequestHeaderCodec)] | ||
| | ^^^^^^^^^^^^^^^^^^ | ||
| | | ||
| note: the lint level is defined here | ||
| --> tests/ui/request_header_codec_v1/fail/deprecated.rs:15:9 | ||
| | | ||
| 15 | #![deny(deprecated)] | ||
| | ^^^^^^^^^^ |
142 changes: 142 additions & 0 deletions
142
...col/tests/ui/request_header_codec_v1/fail/legacy_codecs_do_not_implement_v3_descriptor.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| // Copyright 2026 The RocketMQ Rust Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use rocketmq_macros::{RequestHeaderCodec, RequestHeaderCodecV2}; | ||
| use rocketmq_protocol::protocol::header_codec::{HeaderCodec, HeaderFieldSpec}; | ||
|
|
||
| pub mod protocol { | ||
| pub mod command_custom_header { | ||
| pub use rocketmq_protocol::{CommandCustomHeader, FromMap}; | ||
| } | ||
| } | ||
|
|
||
| #[allow( | ||
| deprecated, | ||
| reason = "proves RequestHeaderCodec V1 does not gain a V3 descriptor contract" | ||
| )] | ||
| mod legacy_v1_header { | ||
| use super::*; | ||
|
|
||
| #[derive(RequestHeaderCodec)] | ||
| pub struct LegacyV1Header { | ||
| value: i32, | ||
| } | ||
| } | ||
|
|
||
| use legacy_v1_header::LegacyV1Header; | ||
|
|
||
| #[allow( | ||
| deprecated, | ||
| reason = "proves RequestHeaderCodecV2 does not gain a V3 descriptor contract" | ||
| )] | ||
| mod legacy_v2_header { | ||
| use super::*; | ||
|
|
||
| #[derive(RequestHeaderCodecV2)] | ||
| #[request_header_codec_v2(crate = "rocketmq_protocol")] | ||
| pub struct LegacyV2Header { | ||
| value: i32, | ||
| } | ||
| } | ||
|
|
||
| use legacy_v2_header::LegacyV2Header; | ||
|
|
||
| #[allow( | ||
| deprecated, | ||
| reason = "proves silent RequestHeaderCodec V1 tuple expansion produces no legacy codec traits" | ||
| )] | ||
| mod silent_tuple_header { | ||
| use super::*; | ||
|
|
||
| #[derive(RequestHeaderCodec)] | ||
| pub struct SilentTupleHeader(i32); | ||
| } | ||
|
|
||
| use silent_tuple_header::SilentTupleHeader; | ||
|
|
||
| #[allow( | ||
| deprecated, | ||
| reason = "proves silent RequestHeaderCodec V1 unit expansion produces no legacy codec traits" | ||
| )] | ||
| mod silent_unit_header { | ||
| use super::*; | ||
|
|
||
| #[derive(RequestHeaderCodec)] | ||
| pub struct SilentUnitHeader; | ||
| } | ||
|
|
||
| use silent_unit_header::SilentUnitHeader; | ||
|
|
||
| #[allow( | ||
| deprecated, | ||
| reason = "proves silent RequestHeaderCodec V1 enum expansion produces no legacy codec traits" | ||
| )] | ||
| mod silent_enum_header { | ||
| use super::*; | ||
|
|
||
| #[derive(RequestHeaderCodec)] | ||
| pub enum SilentEnumHeader { | ||
| V1, | ||
| } | ||
| } | ||
|
|
||
| use silent_enum_header::SilentEnumHeader; | ||
|
|
||
| trait LocalV3Descriptor { | ||
| const TYPE_ID: &'static str; | ||
| const LOCAL_FIELD_SPECS: &'static [HeaderFieldSpec]; | ||
|
|
||
| fn visit_field_specs(visitor: &mut dyn FnMut(&HeaderFieldSpec)); | ||
| } | ||
|
|
||
| #[diagnostic::do_not_recommend] | ||
| impl<T: HeaderCodec> LocalV3Descriptor for T { | ||
| const TYPE_ID: &'static str = T::TYPE_ID; | ||
| const LOCAL_FIELD_SPECS: &'static [HeaderFieldSpec] = T::LOCAL_FIELD_SPECS; | ||
|
|
||
| fn visit_field_specs(visitor: &mut dyn FnMut(&HeaderFieldSpec)) { | ||
| T::visit_field_specs(visitor); | ||
| } | ||
| } | ||
|
|
||
| fn requires_v3_descriptor<T: LocalV3Descriptor>() { | ||
| let _ = T::TYPE_ID; | ||
| let _ = T::LOCAL_FIELD_SPECS; | ||
| T::visit_field_specs(&mut |_| {}); | ||
| } | ||
|
|
||
| trait LocalLegacyCommandCustomHeader {} | ||
|
|
||
| #[diagnostic::do_not_recommend] | ||
| impl<T: crate::protocol::command_custom_header::CommandCustomHeader> LocalLegacyCommandCustomHeader for T {} | ||
|
|
||
| trait LocalLegacyFromMap {} | ||
|
|
||
| #[diagnostic::do_not_recommend] | ||
| impl<T: crate::protocol::command_custom_header::FromMap> LocalLegacyFromMap for T {} | ||
|
|
||
| fn requires_legacy_command_custom_header<T: LocalLegacyCommandCustomHeader>() {} | ||
|
|
||
| fn requires_legacy_from_map<T: LocalLegacyFromMap>() {} | ||
|
|
||
| fn main() { | ||
| requires_v3_descriptor::<LegacyV1Header>(); | ||
| requires_v3_descriptor::<LegacyV2Header>(); | ||
| requires_legacy_command_custom_header::<SilentTupleHeader>(); | ||
| requires_legacy_command_custom_header::<SilentUnitHeader>(); | ||
| requires_legacy_command_custom_header::<SilentEnumHeader>(); | ||
| requires_legacy_from_map::<SilentTupleHeader>(); | ||
| requires_legacy_from_map::<SilentUnitHeader>(); | ||
| requires_legacy_from_map::<SilentEnumHeader>(); | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win
Use the repository Apache header in every new Rust fixture.
rocketmq-protocol/tests/request_header_codec_v1_wire_snapshot.rs#L1-L13: Change the copyright year to2023.rocketmq-protocol/tests/request_header_codec_v1_ui.rs#L1-L13: Change the copyright year to2023.rocketmq-protocol/tests/ui/request_header_codec_v1/pass/legacy_named_struct_and_silent_non_named.rs#L1-L1: Add the standard Apache header withCopyright 2023.rocketmq-protocol/tests/ui/request_header_codec_v1/fail/deprecated.rs#L1-L1: Add the standard Apache header withCopyright 2023.rocketmq-protocol/tests/ui/request_header_codec_v1/fail/legacy_codecs_do_not_implement_v3_descriptor.rs#L1-L1: Add the standard Apache header withCopyright 2023.As per coding guidelines, “New Rust source files must keep the repository's Apache 2.0 copyright-header style.” Based on learnings, this repository uses
Copyright 2023.📍 Affects 5 files
rocketmq-protocol/tests/request_header_codec_v1_wire_snapshot.rs#L1-L13(this comment)rocketmq-protocol/tests/request_header_codec_v1_ui.rs#L1-L13rocketmq-protocol/tests/ui/request_header_codec_v1/pass/legacy_named_struct_and_silent_non_named.rs#L1-L1rocketmq-protocol/tests/ui/request_header_codec_v1/fail/deprecated.rs#L1-L1rocketmq-protocol/tests/ui/request_header_codec_v1/fail/legacy_codecs_do_not_implement_v3_descriptor.rs#L1-L1🤖 Prompt for AI Agents
Sources: Coding guidelines, Learnings