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

* Allow creation of built-in content filters with different type name (#5867)

* Refs #23265. Add unit test.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23265. Add blackbox test.

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

* Refs #23265. Refactor for readability.

Signed-off-by: Miguel Company <[email protected]>

* Refs #23265. Apply review suggestion.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>

* Fix uncrustify

Signed-off-by: Miguel Company <[email protected]>

* Ensure type object registration in blackbox test.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: Miguel Company <[email protected]>

Author: mergify[bot]

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

@@ -449,6 +449,20 @@ DDSFilterFactory::~DDSFilterFactory()
     pool.clear();
 }
 
+static const eprosima::fastrtps::types::TypeIdentifier* get_complete_type_identifier(
+        const char* type_name,
+        const TopicDataType* data_type)
+{
+    using eprosima::fastrtps::types::TypeObjectFactory;
+    auto type_id = TypeObjectFactory::get_instance()->get_type_identifier(type_name, true);
+    if (!type_id)
+    {
+        type_id = TypeObjectFactory::get_instance()->get_type_identifier(data_type->getName(), true);
+    }
+
+    return type_id;
+}
+
 IContentFilterFactory::ReturnCode_t DDSFilterFactory::create_content_filter(
         const char* filter_class_name,
         const char* type_name,
@@ -459,8 +473,6 @@ IContentFilterFactory::ReturnCode_t DDSFilterFactory::create_content_filter(
 {
     using eprosima::fastrtps::types::TypeObjectFactory;
 
-    static_cast<void>(data_type);
-
     ReturnCode_t ret = ReturnCode_t::RETCODE_UNSUPPORTED;
 
     if (nullptr == filter_expression)
@@ -517,18 +529,18 @@ IContentFilterFactory::ReturnCode_t DDSFilterFactory::create_content_filter(
     }
     else
     {
-        auto type_object = TypeObjectFactory::get_instance()->get_type_object(type_name, true);
-        if (!type_object)
+        auto type_id = get_complete_type_identifier(type_name, data_type);
+        if (!type_id)
         {
             EPROSIMA_LOG_ERROR(DDSSQLFILTER, "No TypeObject found for type " << type_name);
             ret = ReturnCode_t::RETCODE_BAD_PARAMETER;
         }
         else
         {
+            auto type_object = TypeObjectFactory::get_instance()->get_type_object(type_id);
             auto node = parser::parse_filter_expression(filter_expression, type_object);
             if (node)
             {
-                auto type_id = TypeObjectFactory::get_instance()->get_type_identifier(type_name, true);
                 auto dyn_type = TypeObjectFactory::get_instance()->build_dynamic_type(type_name, type_id, type_object);
                 DDSFilterExpression* expr = get_expression();
                 expr->set_type(dyn_type);

test/blackbox/common/DDSBlackboxTestsContentFilter.cpp

@@ -288,7 +288,8 @@ class DDSContentFilter : public testing::TestWithParam<communication_type>
                 {
                     std::this_thread::sleep_for(std::chrono::milliseconds(100));
                     reader->get_subscription_matched_status(status);
-                } while (status.current_count < 1);
+                }
+                while (status.current_count < 1);
             }
 
             return reader;
@@ -755,6 +756,39 @@ TEST(DDSContentFilter, OnlyFilterAliveChanges)
     ASSERT_EQ(reader.get_sample_lost_status().total_count, 0);
 }
 
+/*
+ * Regression test for https://eprosima.easyredmine.com/issues/23265
+ *
+ * This test checks that a DDSSQL content filter can be created with a type name that is different from the one
+ * in the generated type support.
+ */
+TEST(DDSContentFilter, filter_other_type_name)
+{
+    using namespace eprosima::fastdds;
+
+    // Ensure type object registration
+    registerHelloWorldTypes();
+
+    // Create a DomainParticipant
+    DomainParticipant* participant =
+            dds::DomainParticipantFactory::get_instance()->create_participant(0, PARTICIPANT_QOS_DEFAULT);
+    ASSERT_NE(participant, nullptr);
+
+    // Create a ContentFilteredTopic with a different type name
+    dds::TypeSupport type_support(new HelloWorldPubSubType());
+    ASSERT_EQ(type_support.register_type(participant, "CustomType"), ReturnCode_t::RETCODE_OK);
+    dds::Topic* topic = participant->create_topic(
+        "TestTopic", "CustomType", TOPIC_QOS_DEFAULT);
+    ASSERT_NE(topic, nullptr);
+    dds::ContentFilteredTopic* filtered_topic = participant->create_contentfilteredtopic(
+        "FilteredTopic", topic, "index <= %0", { "6" });
+    ASSERT_NE(filtered_topic, nullptr);
+
+    // Delete all entities
+    ASSERT_EQ(participant->delete_contained_entities(), ReturnCode_t::RETCODE_OK);
+    ASSERT_EQ(dds::DomainParticipantFactory::get_instance()->delete_participant(participant), ReturnCode_t::RETCODE_OK);
+}
+
 #ifdef INSTANTIATE_TEST_SUITE_P
 #define GTEST_INSTANTIATE_TEST_MACRO(x, y, z, w) INSTANTIATE_TEST_SUITE_P(x, y, z, w)
 #else

test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp

@@ -553,6 +553,27 @@ TEST_F(DDSSQLFilterTests, type_compatibility_compare_operand_op_operand)
     }
 }
 
+/*
+ * Regression test for https://eprosima.easyredmine.com/issues/23265
+ *
+ * This test checks that a DDSSQL content filter can be created with a type name that is different from the one
+ * used to register the type object representation.
+ */
+TEST_F(DDSSQLFilterTests, different_type_name)
+{
+    ContentFilterTestTypePubSubType type;
+
+    IContentFilter* filter_instance = nullptr;
+    DDSFilterFactory factory;
+    StackAllocatedSequence<const char*, 10> params;
+
+    EXPECT_EQ(factory.create_content_filter("DDSSQL", "MyCustomType", &type,
+            "uint16_field = 3", params, filter_instance), ReturnCode_t::RETCODE_OK);
+
+    EXPECT_EQ(ReturnCode_t::RETCODE_OK,
+            factory.delete_content_filter("DDSSQL", filter_instance));
+}
+
 /**
  * Singleton that holds the serialized payloads to be evaluated
  */