[23265] Allow creation of built-in content filters with different type name by MiguelCompany · Pull Request #5867 · eProsima/Fast-DDS

MiguelCompany · 2025-06-11T12:35:28Z

Description

This fixes a bug that disallows the creation of built-in content filters when the type support is registered with a custom type name.

@Mergifyio backport 3.2.x 2.14.x

This PR is on top of the following one, and should be merged after it:

[23264] Feature: DataWriter sample prefilter #5861

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 backport compatible: they do NOT break ABI nor change library core behavior.
Changes are API compatible.
N/A: New feature has been added to the versions.md file (if applicable).
N/A: New feature has been documented/Current behavior is correctly described in the documentation.
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.
If this is a critical bug fix, backports to the critical-only supported branches have been requested.
Check CI results: changes do not issue any warning.
Check CI results: failing tests are unrelated with the changes.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

Mario-DL

LGTM with green CI

MiguelCompany · 2025-06-13T10:57:49Z

@Mergifyio backport 3.2.x 2.14.x

mergify · 2025-06-13T10:58:00Z

backport 3.2.x 2.14.x

✅ Backports have been created

Details

#5874 [23265] Allow creation of built-in content filters with different type name (backport #5867) has been created for branch 3.2.x but encountered conflicts
#5875 [23265] Allow creation of built-in content filters with different type name (backport #5867) has been created for branch 2.14.x but encountered conflicts

…5867) * Refs #23265. Add unit test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Add blackbox test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Use type identifiers when creating DDS filter object. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Refactor for readability. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Apply review suggestion. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 92260c2) # Conflicts: # src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterFactory.cpp # test/blackbox/common/DDSBlackboxTestsContentFilter.cpp

…5867) * Refs #23265. Add unit test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Add blackbox test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Use type identifiers when creating DDS filter object. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Refactor for readability. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Apply review suggestion. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 92260c2) # Conflicts: # test/blackbox/common/DDSBlackboxTestsContentFilter.cpp

…5867) (#5874) * Allow creation of built-in content filters with different type name (#5867) * Refs #23265. Add unit test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Add blackbox test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Use type identifiers when creating DDS filter object. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Refactor for readability. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Apply review suggestion. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 92260c2) # Conflicts: # test/blackbox/common/DDSBlackboxTestsContentFilter.cpp * Fix conflicts Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Fix linters Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

…5867) * Refs #23265. Add unit test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Add blackbox test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Use type identifiers when creating DDS filter object. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Refactor for readability. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Apply review suggestion. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

…5867) (#5875) * Allow creation of built-in content filters with different type name (#5867) * Refs #23265. Add unit test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Add blackbox test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Use type identifiers when creating DDS filter object. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Refactor for readability. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23265. Apply review suggestion. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Fix uncrustify Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Ensure type object registration in blackbox test. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

MiguelCompany added this to the v3.3.0 milestone Jun 11, 2025

MiguelCompany requested review from richiprosima and removed request for richiprosima June 11, 2025 12:38

github-actions Bot added the ci-pending PR which CI is running label Jun 11, 2025

Base automatically changed from feature/dw/sample-prefilter to master June 12, 2025 06:08

MiguelCompany added 4 commits June 12, 2025 08:12

Refs #23265. Add unit test.

60bbee4

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

Refs #23265. Add blackbox test.

6a283d0

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

Refs #23265. Use type identifiers when creating DDS filter object.

170cb20

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

Refs #23265. Refactor for readability.

ced08b2

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

MiguelCompany force-pushed the feature/23265 branch from fc9d205 to ced08b2 Compare June 12, 2025 06:12

MiguelCompany requested review from richiprosima and removed request for richiprosima June 12, 2025 06:13

Mario-DL suggested changes Jun 12, 2025

View reviewed changes

Comment thread src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterFactory.cpp Outdated

Comment thread src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterFactory.cpp

Refs #23265. Apply review suggestion.

594ca6b

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

MiguelCompany requested a review from Mario-DL June 13, 2025 08:52

Mario-DL approved these changes Jun 13, 2025

View reviewed changes

MiguelCompany merged commit 92260c2 into master Jun 13, 2025
17 checks passed

MiguelCompany deleted the feature/23265 branch June 13, 2025 15:43

This was referenced Jun 13, 2025

[23265] Allow creation of built-in content filters with different type name (backport #5867) #5874

Merged

[23265] Allow creation of built-in content filters with different type name (backport #5867) #5875

Merged

MiguelCompany mentioned this pull request Jun 18, 2025

[23346] Add get_complete_type_object to ITypeObjectRegistry #5885

Merged

12 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[23265] Allow creation of built-in content filters with different type name#5867

[23265] Allow creation of built-in content filters with different type name#5867
MiguelCompany merged 5 commits into
masterfrom
feature/23265

MiguelCompany commented Jun 11, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Mario-DL left a comment

Uh oh!

MiguelCompany commented Jun 13, 2025

Uh oh!

mergify Bot commented Jun 13, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

MiguelCompany commented Jun 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Contributor Checklist

Reviewer Checklist

Uh oh!

Uh oh!

Uh oh!

Mario-DL left a comment

Choose a reason for hiding this comment

Uh oh!

MiguelCompany commented Jun 13, 2025

Uh oh!

mergify Bot commented Jun 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

MiguelCompany commented Jun 11, 2025 •

edited

Loading

mergify Bot commented Jun 13, 2025 •

edited

Loading