Adding content filter interfaces (#2359)

* Adding content filter interfaces (#2286) * Refs 12663. Adding ContentFilteredTopic header. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. Adding ContentFilteredTopic basic code. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. Moving code to DomainParticipantImpl. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. Adding filtered_topics_ to DomainParticipantImpl. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. Implementing create_contentfilteredtopic. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. Implementing delete_contentfilteredtopic. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. ContentFilteredTopicImpl moved to its own header. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. ContentFilteredTopicImpl implements IReaderDataFilter. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. Adding data_filter_ to RTPSReader. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. Link filter on RTPS reader creation. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. Filtering data on StatefulReader. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. Filtering data on StatelessReader. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. Fixed unit test build error. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. Use topic name from related topic. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Adding filter_name. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Adding content filter interfaces. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Using IContentFilterFactory. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Adding get_descriptor to type support. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Use filter factory and instance on ContentFilteredTopicImpl. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Moved IReaderDataFilter to base rtps folder. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Added custom filter interfaces to DomainParticipant. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Added DynamicPubSubType::get_descriptor. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Linters. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12663. Fixed warning Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Add reader_guid to IContentFilter. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Fix method names, Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Use constexpr for default filter name. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Fix warnings. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Include what you use on DomainParticipant.hpp. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Adressed some review comments on DomainParticipant. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. More review comments addressed. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Custom filter methods renamed. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Add implementation for create_contentfilteredtopic overload. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Fail when filter_name is nullptr. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Parameter filter_name renamed to filter_class_name. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Fixing build of statistics tests. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Add get_content_filter to RTPSReader. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. IReaderDataFilter.hpp moved to interfaces folder. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Adding some error messages. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Allowing a factory to manage several filter classes. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Adding empty implementation of custom factory registry methods. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Adding implementation of custom factory registry methods. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Lookup factory on create_contentfilteredtopic. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Apply suggestions from code review Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com> * Refs 12540. Suggestions on ContentFilteredTopic header. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Add alias for GUID_t on IContentFilter. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Additional RETCODE_PRECONDITION_NOT_MET on register_content_filter_factory doxydoc. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Interfaces don't have destructors. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Apply suggestions from code review Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com> Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com> * Updating content filter interfaces (#2351) * Refs 12540. Update IContentFilterFactory::create_content_filter. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Use updated IContentFilterFactory::create_content_filter. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Rename parameter. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 12540. Remove get_descriptor() from TopicDataType. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Added new test to ParticipantTests. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Added negative tests for create/delete contentfilteredtopic Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Added custom filter mock class. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Added negative tests for register_content_filter_factory. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Check for nullptr on register_content_filter_factory. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Added negative tests for lookup_content_filter_factory. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Added negative tests for unregister_content_filter_factory. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Added tests for custom filter factory registration. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Added tests for custom filtered topic creation. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Fixed generation of filter_parameters. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Added more checks on tests. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Added second participant and topic. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Added cross-participant checks. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Added lookup_topicdescription checks. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Avoid deleting the same entity twice. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. No need to check participant (implicit check when not found in collection) Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Fixed link issues on unit tests. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Linters. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs 13290. Additional checks to ensure collection traversal. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Co-authored-by: Eduardo Ponz Segrelles <eduardoponz@eprosima.com>
eProsima · Dec 21, 2021 · b084f8b · b084f8b
1 parent 5fd0462
commit b084f8b
Show file tree

Hide file tree

Showing 31 changed files with 1,167 additions and 104 deletions.
diff --git a/include/fastdds/dds/domain/DomainParticipant.hpp b/include/fastdds/dds/domain/DomainParticipant.hpp
@@ -20,23 +20,26 @@
 #ifndef _FASTDDS_DOMAIN_PARTICIPANT_HPP_
 #define _FASTDDS_DOMAIN_PARTICIPANT_HPP_
 
-#include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/dds/topic/Topic.hpp>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastrtps/types/TypeIdentifier.h>
+#include <functional>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp>
 #include <fastdds/dds/builtin/topic/TopicBuiltinTopicData.hpp>
 #include <fastdds/dds/core/status/StatusMask.hpp>
 #include <fastdds/dds/core/Entity.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
+#include <fastdds/dds/topic/ContentFilteredTopic.hpp>
+#include <fastdds/dds/topic/IContentFilterFactory.hpp>
+#include <fastdds/dds/topic/TypeSupport.hpp>
+#include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/common/SampleIdentity.h>
+#include <fastdds/rtps/common/Time_t.h>
 #include <fastrtps/types/TypesBase.h>
-
-
-#include <utility>
+#include <fastrtps/types/TypeIdentifier.h>
 
 using eprosima::fastrtps::types::ReturnCode_t;
 
@@ -76,7 +79,6 @@ class SubscriberListener;
 class TopicQos;
 
 // Not implemented classes
-class ContentFilteredTopic;
 class MultiTopic;
 
 /**
@@ -262,14 +264,40 @@ class DomainParticipant : public Entity
      * @param related_topic Related Topic to being subscribed
      * @param filter_expression Logic expression to create filter
      * @param expression_parameters Parameters to filter content
-     * @return Pointer to the created ContentFilteredTopic, nullptr in error case
+     * @return Pointer to the created ContentFilteredTopic.
+     * @return nullptr if @c related_topic does not belong to this participant.
+     * @return nullptr if a topic with the specified @c name has already been created.
+     * @return nullptr if a filter cannot be created with the specified @c filter_expression and
+     *                 @c expression_parameters.
      */
     RTPS_DllAPI ContentFilteredTopic* create_contentfilteredtopic(
             const std::string& name,
-            const Topic* related_topic,
+            Topic* related_topic,
             const std::string& filter_expression,
             const std::vector<std::string>& expression_parameters);
 
+    /**
+     * Create a ContentFilteredTopic in this Participant using a custom filter.
+     * @param name Name of the ContentFilteredTopic
+     * @param related_topic Related Topic to being subscribed
+     * @param filter_expression Logic expression to create filter
+     * @param expression_parameters Parameters to filter content
+     * @param filter_class_name Name of the filter class to use
+     *
+     * @return Pointer to the created ContentFilteredTopic.
+     * @return nullptr if @c related_topic does not belong to this participant.
+     * @return nullptr if a topic with the specified @c name has already been created.
+     * @return nullptr if a filter cannot be created with the specified @c filter_expression and
+     *                 @c expression_parameters.
+     * @return nullptr if the specified @c filter_class_name has not been registered.
+     */
+    RTPS_DllAPI ContentFilteredTopic* create_contentfilteredtopic(
+            const std::string& name,
+            Topic* related_topic,
+            const std::string& filter_expression,
+            const std::vector<std::string>& expression_parameters,
+            const char* filter_class_name);
+
     /**
      * Deletes an existing ContentFilteredTopic.
      * @param a_contentfilteredtopic ContentFilteredTopic to be deleted
@@ -720,6 +748,71 @@ class DomainParticipant : public Entity
             const std::string& type_name,
             std::function<void(const std::string& name, const fastrtps::types::DynamicType_ptr type)>& callback);
 
+    /**
+     * Register a custom content filter factory, which can be used to create a ContentFilteredTopic.
+     *
+     * DDS specifies a SQL-like content filter to be used by content filtered topics.
+     * If this filter does not meet your filtering requirements, you can register a custom filter factory.
+     *
+     * To use a custom filter, a factory for it must be registered in the following places:
+     * - In any application that uses the custom filter factory to create a ContentFilteredTopic and the corresponding
+     *   DataReader.
+     * - In each application that writes the data to the applications mentioned above.
+     *
+     * For example, suppose Application A on the subscription side creates a Topic named X and a ContentFilteredTopic
+     * named filteredX (and a corresponding DataReader), using a previously registered content filter factory, myFilterFactory.
+     * With only that, you will have filtering at the subscription side.
+     * If you also want to perform filtering in any application that publishes Topic X, then you also need to register
+     * the same definition of the ContentFilterFactory myFilterFactory in that application.
+     *
+     * Each @c filter_class_name can only be used to register a content filter factory once per DomainParticipant.
+     *
+     * @param filter_class_name Name of the filter class. Cannot be nullptr, must not exceed 255 characters, and must
+     *                          be unique within this DomainParticipant.
+     * @param filter_factory    Factory of content filters to be registered. Cannot be nullptr.
+     *
+     * @return RETCODE_BAD_PARAMETER if any parameter is nullptr, or the filter_class_name exceeds 255 characters.
+     * @return RETCODE_PRECONDITION_NOT_MET if the filter_class_name has been already registered.
+     * @return RETCODE_PRECONDITION_NOT_MET if filter_class_name is FASTDDS_SQLFILTER_NAME.
+     * @return RETCODE_OK if the filter is correctly registered.
+     */
+    RTPS_DllAPI ReturnCode_t register_content_filter_factory(
+            const char* filter_class_name,
+            IContentFilterFactory* const filter_factory);
+
+    /**
+     * Lookup a custom content filter factory previously registered with register_content_filter_factory.
+     *
+     * @param filter_class_name Name of the filter class. Cannot be nullptr.
+     *
+     * @return nullptr if the given filter_class_name has not been previously registered on this DomainParticipant.
+     *         Otherwise, the content filter factory previously registered with the given filter_class_name.
+     */
+    RTPS_DllAPI IContentFilterFactory* lookup_content_filter_factory(
+            const char* filter_class_name);
+
+    /**
+     * Unregister a custom content filter factory previously registered with register_content_filter_factory.
+     *
+     * A filter_class_name can be unregistered only if it has been previously registered to the DomainParticipant with
+     * register_content_filter_factory.
+     *
+     * The unregistration of filter is not allowed if there are any existing ContentFilteredTopic objects that are
+     * using the filter.
+     *
+     * If there is any existing discovered DataReader with the same filter_class_name, filtering on the writer side will be
+     * stopped, but this operation will not fail.
+     *
+     * @param filter_class_name Name of the filter class. Cannot be nullptr.
+     *
+     * @return RETCODE_BAD_PARAMETER if the filter_class_name is nullptr.
+     * @return RERCODE_PRECONDITION_NOT_MET if the filter_class_name has not been previously registered.
+     * @return RERCODE_PRECONDITION_NOT_MET if there is any ContentFilteredTopic referencing the filter.
+     * @return RETCODE_OK if the filter is correctly unregistered.
+     */
+    RTPS_DllAPI ReturnCode_t unregister_content_filter_factory(
+            const char* filter_class_name);
+
     /**
      * @brief Check if the Participant has any Publisher, Subscriber or Topic
      * @return true if any, false otherwise.

diff --git a/include/fastdds/dds/topic/ContentFilteredTopic.hpp b/include/fastdds/dds/topic/ContentFilteredTopic.hpp
@@ -0,0 +1,104 @@
+// Copyright 2021 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @file ContentFilteredTopic.hpp
+ */
+
+#ifndef _FASTDDS_DDS_TOPIC_CONTENTFILTEREDTOPIC_HPP_
+#define _FASTDDS_DDS_TOPIC_CONTENTFILTEREDTOPIC_HPP_
+
+#include <fastrtps/fastrtps_dll.h>
+#include <fastdds/dds/topic/TopicDescription.hpp>
+#include <fastdds/dds/topic/Topic.hpp>
+
+#define FASTDDS_SQLFILTER_NAME eprosima::fastdds::dds::sqlfilter_name
+
+using eprosima::fastrtps::types::ReturnCode_t;
+
+namespace eprosima {
+namespace fastdds {
+namespace dds {
+
+class DomainParticipant;
+class DomainParticipantImpl;
+class ContentFilteredTopicImpl;
+
+constexpr const char* const sqlfilter_name = "DDSSQL";
+
+/**
+ * Specialization of TopicDescription that allows for content-based subscriptions
+ * @ingroup FASTDDS_MODULE
+ */
+class ContentFilteredTopic : public TopicDescription
+{
+    friend class DomainParticipantImpl;
+
+private:
+
+    RTPS_DllAPI ContentFilteredTopic(
+            const std::string& name,
+            Topic* related_topic,
+            const std::string& filter_expression,
+            const std::vector<std::string>& expression_parameters);
+
+public:
+
+    /**
+     * @brief Destructor
+     */
+    RTPS_DllAPI virtual ~ContentFilteredTopic();
+
+    /**
+     * @brief Getter for the related topic.
+     * This operation returns the Topic associated with the ContentFilteredTopic.
+     * That is, the Topic specified when the ContentFilteredTopic was created.
+     */
+    RTPS_DllAPI Topic* get_related_topic() const;
+
+    RTPS_DllAPI const std::string& get_filter_expression() const;
+
+    RTPS_DllAPI ReturnCode_t get_expression_parameters(
+            std::vector<std::string>& expression_parameters) const;
+
+    RTPS_DllAPI ReturnCode_t set_expression_parameters(
+            const std::vector<std::string>& expression_parameters);
+
+    RTPS_DllAPI ReturnCode_t set_filter_expression(
+            const std::string& filter_expression,
+            const std::vector<std::string>& expression_parameters);
+
+    /**
+     * @brief Getter for the DomainParticipant
+     * @return DomainParticipant pointer
+     */
+    virtual DomainParticipant* get_participant() const override;
+
+    /**
+     * @brief Getter for the TopicDescriptionImpl
+     * @return pointer to TopicDescriptionImpl
+     */
+    TopicDescriptionImpl* get_impl() const override;
+
+protected:
+
+    ContentFilteredTopicImpl* impl_;
+
+};
+
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
+
+#endif  // _FASTDDS_DDS_TOPIC_CONTENTFILTEREDTOPIC_HPP_
diff --git a/include/fastdds/dds/topic/IContentFilter.hpp b/include/fastdds/dds/topic/IContentFilter.hpp
@@ -0,0 +1,60 @@
+// Copyright 2021 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @file IContentFilter.hpp
+ */
+
+#ifndef _FASTDDS_DDS_TOPIC_ICONTENTFILTER_HPP_
+#define _FASTDDS_DDS_TOPIC_ICONTENTFILTER_HPP_
+
+#include <fastrtps/fastrtps_dll.h>
+
+#include <fastdds/dds/core/LoanableTypedCollection.hpp>
+
+#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/SampleIdentity.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+
+#include <fastrtps/types/TypesBase.h>
+#include <fastrtps/types/TypeDescriptor.h>
+
+namespace eprosima {
+namespace fastdds {
+namespace dds {
+
+struct IContentFilter
+{
+    using SerializedPayload = eprosima::fastrtps::rtps::SerializedPayload_t;
+    using GUID_t = fastrtps::rtps::GUID_t;
+
+    struct FilterSampleInfo
+    {
+        using SampleIdentity = eprosima::fastrtps::rtps::SampleIdentity;
+
+        SampleIdentity sample_identity;
+        SampleIdentity related_sample_identity;
+    };
+
+    virtual bool evaluate(
+            const SerializedPayload& payload,
+            const FilterSampleInfo& sample_info,
+            const GUID_t& reader_guid) const = 0;
+};
+
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
+
+#endif  // _FASTDDS_DDS_TOPIC_ICONTENTFILTER_HPP_
diff --git a/include/fastdds/dds/topic/IContentFilterFactory.hpp b/include/fastdds/dds/topic/IContentFilterFactory.hpp
@@ -0,0 +1,57 @@
+// Copyright 2021 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @file IContentFilter.hpp
+ */
+
+#ifndef _FASTDDS_DDS_TOPIC_ICONTENTFILTERFACTORY_HPP_
+#define _FASTDDS_DDS_TOPIC_ICONTENTFILTERFACTORY_HPP_
+
+#include <fastrtps/fastrtps_dll.h>
+
+#include <fastdds/dds/core/LoanableTypedCollection.hpp>
+#include <fastdds/dds/topic/IContentFilter.hpp>
+#include <fastdds/dds/topic/TopicDataType.hpp>
+
+#include <fastrtps/types/TypesBase.h>
+
+namespace eprosima {
+namespace fastdds {
+namespace dds {
+
+struct IContentFilterFactory
+{
+    using ReturnCode_t = eprosima::fastrtps::types::ReturnCode_t;
+    using ParameterSeq = LoanableTypedCollection<const char*>;
+    using TypeDescriptor = eprosima::fastrtps::types::TypeDescriptor;
+
+    virtual ReturnCode_t create_content_filter(
+            const char* filter_class_name,
+            const char* type_name,
+            const TopicDataType* data_type,
+            const char* filter_expression,
+            const ParameterSeq& filter_parameters,
+            IContentFilter*& filter_instance) = 0;
+
+    virtual ReturnCode_t delete_content_filter(
+            const char* filter_class_name,
+            IContentFilter* filter_instance) = 0;
+};
+
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
+
+#endif  // _FASTDDS_DDS_TOPIC_ICONTENTFILTERFACTORY_HPP_
diff --git a/include/fastdds/dds/topic/TopicDataType.hpp b/include/fastdds/dds/topic/TopicDataType.hpp
@@ -19,8 +19,9 @@
 #ifndef _FASTDDS_TOPICDATATYPE_HPP_
 #define _FASTDDS_TOPICDATATYPE_HPP_
 
-#include <string>
 #include <functional>
+#include <memory>
+#include <string>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>