Skip to content
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

Support #[serde(flatten)] for maps. #799

Merged
merged 1 commit into from
Nov 13, 2023
Merged

Conversation

blp
Copy link
Contributor

@blp blp commented Nov 13, 2023

utoipa already supported #[serde(flatten)] on fields with structure type, by putting the fields inside those structures into the parent type. This is commonly used for factoring out frequently used keys, as documented at https://serde.rs/attr-flatten.html#factor-out-frequently-grouped-keys.

#[serde(flatten)] has another use that utoipa does not support: to capture additional unnamed fields within a structure, as documented at https://serde.rs/attr-flatten.html#capture-additional-fields. This commit adds support for that functionality as well as a pair of tests. It only makes sense to have one such field per structure, so this commit reports an error if there is more than one.

`utoipa` already supported `#[serde(flatten)]` on fields with structure
type, by putting the fields inside those structures into the parent type.
This is commonly used for factoring out frequently used keys, as documented
at <https://serde.rs/attr-flatten.html#factor-out-frequently-grouped-keys>.

`#[serde(flatten)]` has another use that utoipa does not support: to
capture additional unnamed fields within a structure, as documented at
<https://serde.rs/attr-flatten.html#capture-additional-fields>.  This
commit adds support for that functionality as well as a pair of tests.
It only makes sense to have one such field per structure, so this commit
reports an error if there is more than one.
Copy link
Owner

@juhaku juhaku left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice addition 💯 Good work 👍

@juhaku juhaku merged commit 5d96e30 into juhaku:master Nov 13, 2023
5 checks passed
@blp
Copy link
Contributor Author

blp commented Nov 13, 2023

Thank you!

blp added a commit to feldera/feldera that referenced this pull request Nov 13, 2023
By upgrading to `utoipa` 4.1, we can take advantage of its new support
for `#[serde(flatten)]` from juhaku/utoipa#799.
This means we can drop the handwritten implementations.

Signed-off-by: Ben Pfaff <blp@feldera.com>
blp added a commit to feldera/feldera that referenced this pull request Nov 13, 2023
By upgrading to `utoipa` 4.1, we can take advantage of its new support
for `#[serde(flatten)]` from juhaku/utoipa#799.
This means we can drop the handwritten implementations.

Fixes #1016.

Signed-off-by: Ben Pfaff <blp@feldera.com>
blp added a commit to feldera/feldera that referenced this pull request Nov 13, 2023
By upgrading to `utoipa` 4.1, we can take advantage of its new support
for `#[serde(flatten)]` from juhaku/utoipa#799.
This means we can drop the handwritten implementations.

Also, remove unused `ToSchema` from `KafkaOutputConfig` outside of
the `pipeline_types` crate.

Fixes #1016.

Signed-off-by: Ben Pfaff <blp@feldera.com>
blp added a commit to feldera/feldera that referenced this pull request Nov 13, 2023
By upgrading to `utoipa` 4.1, we can take advantage of its new support
for `#[serde(flatten)]` from juhaku/utoipa#799.
This means we can drop the handwritten implementations.

Also, remove unused `ToSchema` from `KafkaOutputConfig` outside of
the `pipeline_types` crate.

Fixes #1016.

Signed-off-by: Ben Pfaff <blp@feldera.com>
blp added a commit to feldera/feldera that referenced this pull request Nov 14, 2023
By upgrading to `utoipa` 4.1, we can take advantage of its new support
for `#[serde(flatten)]` from juhaku/utoipa#799.
This means we can drop the handwritten implementations.

This changes the Python API client in a benign way.

Fixes #1016.

Signed-off-by: Ben Pfaff <blp@feldera.com>
blp added a commit to feldera/feldera that referenced this pull request Nov 14, 2023
By upgrading to `utoipa` 4.1, we can take advantage of its new support
for `#[serde(flatten)]` from juhaku/utoipa#799.
This means we can drop the handwritten implementations.

This changes the Python API client in a benign way.

Fixes #1016.

Signed-off-by: Ben Pfaff <blp@feldera.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants