Skip to content

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

Merged
MiguelCompany merged 3 commits into3.2.xfrom
mergify/bp/3.2.x/pr-5867
Jul 2, 2025
Merged

[23265] Allow creation of built-in content filters with different type name (backport #5867)#5874
MiguelCompany merged 3 commits into3.2.xfrom
mergify/bp/3.2.x/pr-5867

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 13, 2025

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:

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.

This is an automatic backport of pull request #5867 done by [Mergify](https://mergify.com).

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jun 13, 2025

Cherry-pick of 92260c2 has failed:

On branch mergify/bp/3.2.x/pr-5867
Your branch is up to date with 'origin/3.2.x'.

You are currently cherry-picking commit 92260c2d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterFactory.cpp
	modified:   test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/common/DDSBlackboxTestsContentFilter.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jun 13, 2025
@MiguelCompany MiguelCompany added this to the v3.2.3 milestone Jun 13, 2025
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Jul 2, 2025
@MiguelCompany MiguelCompany self-requested a review July 2, 2025 07:01
@github-actions github-actions bot added the ci-pending PR which CI is running label Jul 2, 2025
MiguelCompany
MiguelCompany previously approved these changes Jul 2, 2025
Copy link
Copy Markdown
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@MiguelCompany
Copy link
Copy Markdown
Member

@Mergifyio rebase

…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
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jul 2, 2025

rebase

✅ Branch has been successfully rebased

@MiguelCompany MiguelCompany force-pushed the mergify/bp/3.2.x/pr-5867 branch from 241dc71 to 9059857 Compare July 2, 2025 07:05
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Copy link
Copy Markdown
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@MiguelCompany MiguelCompany merged commit 1a739ff into 3.2.x Jul 2, 2025
25 of 27 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/3.2.x/pr-5867 branch July 2, 2025 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant