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.

Sign up for GitHub

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

Jump to bottom

[20903] DynamicData to JSON serializer #4780

Merged
merged 38 commits into from
Jul 11, 2024
Merged

[20903] DynamicData to JSON serializer #4780

merged 38 commits into from
Jul 11, 2024

Conversation

juanlofer-eprosima
Copy link
Contributor

@juanlofer-eprosima juanlofer-eprosima commented May 14, 2024 •
edited by EduPonz
Loading

Description

This PR introduces a couple of utility functions meant to ease the transformation of a DynamicData to a digestible JSON object, which is dumped to a user-provided ostream. The resulting JSON objects can follow the OMG standard format (as in https://www.omg.org/spec/DDS-JSON/1.0/Beta1/PDF), or an alternative custom one.

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • Any new/modified methods have been properly documented using Doxygen.
  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
  • Changes are ABI compatible.
  • Changes are API compatible.
  • New feature has been added to the versions.md file (if applicable).
  • New feature has been documented/Current behavior is correctly described in the documentation.
  • N/A Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@juanlofer-eprosima juanlofer-eprosima added this to the v3.0.0 milestone May 14, 2024
@juanlofer-eprosima juanlofer-eprosima mentioned this pull request May 14, 2024
Merged
12 tasks
@elianalf elianalf added the needs-review PR that is ready to be reviewed label May 30, 2024
@LuciaEchevarria99 LuciaEchevarria99 mentioned this pull request Jun 4, 2024
Merged
@juanlofer-eprosima
Copy link
Contributor Author

juanlofer-eprosima commented Jun 4, 2024 •
edited
Loading

Bitset inheritance has recently been refactored, I would add coverage for this scenario.

juanlofer-eprosima
juanlofer-eprosima commented Jun 7, 2024
View reviewed changes
test/unittest/CMakeLists.txt Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_idl/idl_to_json_Tests.cpp Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_idl/types/types.cpp Outdated Show resolved Hide resolved
test/unittest/utils/json/DataType.json Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_idl/types/data_test/common/DataTestCommon.cpp Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_idl/idl_to_json_Tests.cpp Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_idl/idl_to_json_Tests.cpp Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_idl/idl_to_json_Tests.cpp Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_idl/idl_to_json_Tests.cpp Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_idl/types/data_test/DataTest.idl Outdated Show resolved Hide resolved
LuciaEchevarria99
LuciaEchevarria99 requested changes Jun 10, 2024
View reviewed changes
src/cpp/fastdds/xtypes/utils.cpp Outdated Show resolved Hide resolved
src/cpp/fastdds/xtypes/utils.cpp Outdated Show resolved Hide resolved
src/cpp/fastdds/xtypes/utils.cpp Outdated Show resolved Hide resolved
src/cpp/fastdds/xtypes/utils.cpp Outdated Show resolved Hide resolved
src/cpp/fastdds/xtypes/utils.cpp Outdated Show resolved Hide resolved
@elianalf elianalf removed the needs-review PR that is ready to be reviewed label Jun 24, 2024
juanlofer-eprosima
juanlofer-eprosima commented Jun 28, 2024
View reviewed changes
test/unittest/dds/xtypes/dyndata_json/idl_to_json_Tests.cpp Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_json/CMakeLists.txt Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_json/types/comprehensive_type/ComprehensiveType.idl Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_json/types/comprehensive_type/common/ComprehensiveCommon.cpp Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_json/idl_to_json_Tests.cpp Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_json/idl_to_json_Tests.cpp Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_json/types/types.hpp Outdated Show resolved Hide resolved
test/unittest/dds/xtypes/dyndata_json/types/comprehensive_type/common/ComprehensiveCommon.cpp Outdated Show resolved Hide resolved
@LuciaEchevarria99 LuciaEchevarria99 mentioned this pull request Jul 4, 2024
Merged
7 tasks
LuciaEchevarria99
LuciaEchevarria99 requested changes Jul 8, 2024
View reviewed changes
versions.md Outdated Show resolved Hide resolved
juanlofer-eprosima and others added 20 commits July 10, 2024 10:57
@juanlofer-eprosima @LuciaEchevarria99
Fix collection of enums case
fccb442 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
@juanlofer-eprosima @LuciaEchevarria99
Change log warnings to errors
dd3f6a1 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
@juanlofer-eprosima @LuciaEchevarria99
Change method signature to please Tempate
0091012 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
@LuciaEchevarria99
Add filled bitmask sequence and regenerate JSONs
ded352a 
Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
@LuciaEchevarria99
Add enum sequence
b3954d0 
Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
@juanlofer-eprosima @LuciaEchevarria99
Update versions.md
0b794c3 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
@juanlofer-eprosima @LuciaEchevarria99
Display 1-bit bitfields as 0/1
b042c0d 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
@LuciaEchevarria99
Add asserts in the tests to check DynType and DynData is not nullptr
41c6e53 
Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
@LuciaEchevarria99
Apply suggestions
9883bb2 
Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
@juanlofer-eprosima @LuciaEchevarria99
Apply suggestion
d5c4041 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
@LuciaEchevarria99
Fix uncrustify
5c5920c 
Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
@juanlofer-eprosima @LuciaEchevarria99
Change pending trace verbosity
c613a32 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
@juanlofer-eprosima @LuciaEchevarria99
Apply richi suggestions
979173e 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
@juanlofer-eprosima @LuciaEchevarria99
Update types generator script
f824e53 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
@juanlofer-eprosima @LuciaEchevarria99
Silence warning
7160fdc 
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
@LuciaEchevarria99
Substitute long strings for json to fix compilation in Windows
bd0dadb 
Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
@LuciaEchevarria99
Regenerate types with fastddsgen in master
46862d9 
Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
@LuciaEchevarria99
Fix versions.md
1643485 
Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
@LuciaEchevarria99
Fix cmake for compilation in Windows
88f80c4 
Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
@LuciaEchevarria99
Fix link failure in Windows
83176fd 
Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
@LuciaEchevarria99 LuciaEchevarria99 requested review from richiprosima and removed request for richiprosima July 10, 2024 08:58
EduPonz
EduPonz approved these changes Jul 10, 2024
View reviewed changes
Copy link

@EduPonz EduPonz left a comment

Choose a reason for hiding this comment

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

Update of update_generated_code_from_idl.sh LGTM

Tempate
Tempate approved these changes Jul 10, 2024
View reviewed changes
Copy link
Contributor

@Tempate Tempate left a comment

Choose a reason for hiding this comment

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

LGTM

juanlofer-eprosima
juanlofer-eprosima commented Jul 10, 2024
View reviewed changes
Copy link
Contributor Author

@juanlofer-eprosima juanlofer-eprosima left a comment

Choose a reason for hiding this comment

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

Tests LGTM

@EduPonz EduPonz merged commit ace3bc8 into master Jul 11, 2024
15 of 17 checks passed
@EduPonz EduPonz deleted the v3.0/dynamic-data-json branch July 11, 2024 06:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany left review comments

@LuciaEchevarria99 LuciaEchevarria99 LuciaEchevarria99 approved these changes

@Tempate Tempate Tempate approved these changes

@EduPonz EduPonz EduPonz approved these changes

@richiware richiware richiware left review comments

@richiprosima richiprosima Awaiting requested review from richiprosima

Assignees
No one assigned
Labels
ci-pending PR which CI is running first-to-merge
Projects
None yet
Milestone
v3.0.0
Development

Successfully merging this pull request may close these issues.
7 participants
@juanlofer-eprosima @richiware @EduPonz @Tempate @MiguelCompany @LuciaEchevarria99 @elianalf