[#24061] Removed non-standard DDS writer content_filteredtopic functions

Danipiza · Danipiza · commit 890abf9cc3e5 · 2026-02-17T08:27:29.000+01:00
Signed-off-by: danipiza &lt;dpizarrogallego@gmail.com&gt;
diff --git a/ddspipe_core/include/ddspipe_core/interface/IWriter.hpp b/ddspipe_core/include/ddspipe_core/interface/IWriter.hpp
@@ -90,11 +90,6 @@ class IWriter
     virtual void update_partitions(
             const std::set<std::string>& partitions_set) = 0;
 
-    //! Update method to change the expression in the content_topicfilter
-    DDSPIPE_CORE_DllAPI
-    virtual void update_content_topic_filter(
-            const std::string& expression) = 0;
-
     //! Update method to change the topic_partitions
     DDSPIPE_CORE_DllAPI
     virtual void update_topic_partitions(
diff --git a/ddspipe_participants/include/ddspipe_participants/testing/entities/mock_entities.hpp b/ddspipe_participants/include/ddspipe_participants/testing/entities/mock_entities.hpp
@@ -141,11 +141,6 @@ class MockWriter : public BaseWriter
     virtual void update_partitions(
             const std::set<std::string>& partitions_set) override;
 
-    //! Update method to change the expression in the content_topicfilter
-    DDSPIPE_PARTICIPANTS_DllAPI
-    virtual void update_content_topic_filter(
-            const std::string& expression) override;
-
     //! Update method to change the topic_partitions
     DDSPIPE_PARTICIPANTS_DllAPI
     void update_topic_partitions(
diff --git a/ddspipe_participants/include/ddspipe_participants/writer/auxiliar/BaseWriter.hpp b/ddspipe_participants/include/ddspipe_participants/writer/auxiliar/BaseWriter.hpp
@@ -94,11 +94,6 @@ class BaseWriter : public core::IWriter
     virtual void update_partitions(
             const std::set<std::string>& partitions_set) override;
 
-    //! Update method to change the expression in the content_topicfilter
-    DDSPIPE_PARTICIPANTS_DllAPI
-    virtual void update_content_topic_filter(
-            const std::string& expression) override;
-
     //! Update method to change the topic_partitions
     DDSPIPE_PARTICIPANTS_DllAPI
     void update_topic_partitions(
diff --git a/ddspipe_participants/include/ddspipe_participants/writer/auxiliar/BlankWriter.hpp b/ddspipe_participants/include/ddspipe_participants/writer/auxiliar/BlankWriter.hpp
@@ -48,11 +48,6 @@ class BlankWriter : public core::IWriter
     virtual void update_partitions(
             const std::set<std::string>& partitions_set) override;
 
-    //! Update method to change the expression in the content_topicfilter
-    DDSPIPE_PARTICIPANTS_DllAPI
-    virtual void update_content_topic_filter(
-            const std::string& expression) override;
-
     //! Update method to change the topic_partitions
     DDSPIPE_PARTICIPANTS_DllAPI
     void update_topic_partitions(
diff --git a/ddspipe_participants/include/ddspipe_participants/writer/auxiliar/InternalWriter.hpp b/ddspipe_participants/include/ddspipe_participants/writer/auxiliar/InternalWriter.hpp
@@ -45,11 +45,6 @@ class InternalWriter : public BaseWriter
     virtual void update_partitions(
             const std::set<std::string>& partitions_set) override;
 
-    //! Update method to change the expression in the content_topicfilter
-    DDSPIPE_PARTICIPANTS_DllAPI
-    virtual void update_content_topic_filter(
-            const std::string& expression) override;
-
     //! Update method to change the topic_partitions
     virtual void update_topic_partitions(
             const std::map<std::string, std::string>& partition_name) override;
diff --git a/ddspipe_participants/include/ddspipe_participants/writer/auxiliar/RtpsEchoWriter.hpp b/ddspipe_participants/include/ddspipe_participants/writer/auxiliar/RtpsEchoWriter.hpp
@@ -56,10 +56,6 @@ class RtpsEchoWriter : public BlankWriter
     virtual void update_partitions(
             const std::set<std::string>& partitions_set) override;
 
-    //! Update method to change the expression in the content_topicfilter
-    virtual void update_content_topic_filter(
-            const std::string& expression) override;
-
     //! Update method to change the topic_partitions
     virtual void update_topic_partitions(
             const std::map<std::string, std::string>& partition_name) override;
diff --git a/ddspipe_participants/include/ddspipe_participants/writer/dds/CommonWriter.hpp b/ddspipe_participants/include/ddspipe_participants/writer/dds/CommonWriter.hpp
@@ -75,8 +75,7 @@ class CommonWriter : public BaseWriter
      */
     DDSPIPE_PARTICIPANTS_DllAPI
     void init(
-            const std::set<std::string>& partitions_set,
-            const std::string& content_topicfilter_expression);
+            const std::set<std::string>& partitions_set);
 
     /////////////////////
     // STATIC ATTRIBUTES
@@ -171,11 +170,6 @@ class CommonWriter : public BaseWriter
     virtual void update_partitions(
             const std::set<std::string>& partitions_set) override;
 
-    //! Update method to change the expression in the content_topicfilter
-    DDSPIPE_PARTICIPANTS_DllAPI
-    virtual void update_content_topic_filter(
-            const std::string& expression) override;
-
     //! Update method to change the topic_partitions
     DDSPIPE_PARTICIPANTS_DllAPI
     virtual void update_topic_partitions(
@@ -196,7 +190,6 @@ class CommonWriter : public BaseWriter
     std::shared_ptr<core::PayloadPoolMediator> payload_pool_;
 
     core::types::DdsTopic topic_;
-    eprosima::fastdds::dds::ContentFilteredTopic* filtered_topic_;
 
     fastdds::dds::Publisher* dds_publisher_;
     fastdds::dds::DataWriter* writer_;
diff --git a/ddspipe_participants/include/ddspipe_participants/writer/dds/MultiWriter.hpp b/ddspipe_participants/include/ddspipe_participants/writer/dds/MultiWriter.hpp
@@ -90,10 +90,6 @@ class MultiWriter : public BaseWriter
     virtual void update_partitions(
             const std::set<std::string>& partitions_set) override;
 
-    //! Update method to change the expression in the content_topicfilter
-    virtual void update_content_topic_filter(
-            const std::string& expression) override;
-
     //! Update method to change the topic_partitions
     virtual void update_topic_partitions(
             const std::map<std::string, std::string>& partition_name) override;
diff --git a/ddspipe_participants/include/ddspipe_participants/writer/dynamic_types/SchemaWriter.hpp b/ddspipe_participants/include/ddspipe_participants/writer/dynamic_types/SchemaWriter.hpp
@@ -50,11 +50,6 @@ class SchemaWriter : public BaseWriter
     virtual void update_partitions(
             const std::set<std::string>& partitions_set) override;
 
-    //! Update method to change the expression in the content_topicfilter
-    DDSPIPE_PARTICIPANTS_DllAPI
-    virtual void update_content_topic_filter(
-            const std::string& expression) override;
-
     //! Update method to change the topic_partitions
     DDSPIPE_PARTICIPANTS_DllAPI
     void update_topic_partitions(
diff --git a/ddspipe_participants/include/ddspipe_participants/writer/dynamic_types/TypeObjectWriter.hpp b/ddspipe_participants/include/ddspipe_participants/writer/dynamic_types/TypeObjectWriter.hpp
@@ -59,11 +59,6 @@ class TypeObjectWriter : public BaseWriter
     virtual void update_partitions(
             const std::set<std::string>& partitions_set) override;
 
-    //! Update method to change the expression in the content_topicfilter
-    DDSPIPE_PARTICIPANTS_DllAPI
-    virtual void update_content_topic_filter(
-            const std::string& expression) override;
-
     //! Update method to change the topic_partitions
     void update_topic_partitions(
             const std::map<std::string, std::string>& partition_name) override;
diff --git a/ddspipe_participants/include/ddspipe_participants/writer/rtps/CommonWriter.hpp b/ddspipe_participants/include/ddspipe_participants/writer/rtps/CommonWriter.hpp
@@ -211,11 +211,6 @@ class CommonWriter : public BaseWriter, public fastdds::rtps::WriterListener
     virtual void update_partitions(
             const std::set<std::string>& partitions_set) override;
 
-    //! Update method to change the expression in the content_topicfilter
-    DDSPIPE_PARTICIPANTS_DllAPI
-    virtual void update_content_topic_filter(
-            const std::string& expression) override;
-
     //! Update method to change the topic_partitions
     DDSPIPE_PARTICIPANTS_DllAPI
     virtual void update_topic_partitions(
diff --git a/ddspipe_participants/include/ddspipe_participants/writer/rtps/MultiWriter.hpp b/ddspipe_participants/include/ddspipe_participants/writer/rtps/MultiWriter.hpp
@@ -87,11 +87,6 @@ class MultiWriter : public BaseWriter
     virtual void update_partitions(
             const std::set<std::string>& partitions_set) override;
 
-    //! Update method to change the expression in the content_topicfilter
-    DDSPIPE_PARTICIPANTS_DllAPI
-    virtual void update_content_topic_filter(
-            const std::string& expression) override;
-
     //! Update method to change the topic_partitions
     virtual void update_topic_partitions(
             const std::map<std::string, std::string>& partition_name) override;
diff --git a/ddspipe_participants/src/cpp/participant/dds/CommonParticipant.cpp b/ddspipe_participants/src/cpp/participant/dds/CommonParticipant.cpp
@@ -171,7 +171,7 @@ std::shared_ptr<core::IWriter> CommonParticipant::create_writer(
             dds_participant_,
             fastdds_topic,
             configuration_->is_repeater);
-        writer->init(partition_filter_set_, content_topic_filter_expr);
+        writer->init(partition_filter_set_);
 
         return writer;
     }
diff --git a/ddspipe_participants/src/cpp/testing/entities/mock_entities.cpp b/ddspipe_participants/src/cpp/testing/entities/mock_entities.cpp
@@ -190,12 +190,6 @@ void MockWriter::update_partitions(
     // Nothing
 }
 
-void MockWriter::update_content_topic_filter(
-        const std::string& /* expression */)
-{
-    // Nothing
-}
-
 void MockWriter::update_topic_partitions(
         const std::map<std::string, std::string>& partition_name)
 {
diff --git a/ddspipe_participants/src/cpp/writer/auxiliar/BaseWriter.cpp b/ddspipe_participants/src/cpp/writer/auxiliar/BaseWriter.cpp
@@ -125,12 +125,6 @@ void BaseWriter::update_partitions(
     // Nothing
 }
 
-void BaseWriter::update_content_topic_filter(
-        const std::string& /* expression */)
-{
-    // Nothing
-}
-
 void BaseWriter::update_topic_partitions(
         const std::map<std::string, std::string>& /* partition_name */)
 {
diff --git a/ddspipe_participants/src/cpp/writer/auxiliar/BlankWriter.cpp b/ddspipe_participants/src/cpp/writer/auxiliar/BlankWriter.cpp
@@ -39,12 +39,6 @@ void BlankWriter::update_partitions(
     // Nothing
 }
 
-void BlankWriter::update_content_topic_filter(
-        const std::string& /* expression */)
-{
-    // Nothing
-}
-
 void BlankWriter::update_topic_partitions(
         const std::map<std::string, std::string>& /* partition_name */)
 {
diff --git a/ddspipe_participants/src/cpp/writer/auxiliar/InternalWriter.cpp b/ddspipe_participants/src/cpp/writer/auxiliar/InternalWriter.cpp
@@ -39,12 +39,6 @@ void InternalWriter::update_partitions(
     // Nothing
 }
 
-void InternalWriter::update_content_topic_filter(
-        const std::string& /* expression */)
-{
-    // Nothing
-}
-
 void InternalWriter::update_topic_partitions(
         const std::map<std::string, std::string>& partition_name)
 {
diff --git a/ddspipe_participants/src/cpp/writer/auxiliar/RtpsEchoWriter.cpp b/ddspipe_participants/src/cpp/writer/auxiliar/RtpsEchoWriter.cpp
@@ -72,12 +72,6 @@ void RtpsEchoWriter::update_partitions(
     // Nothing
 }
 
-void RtpsEchoWriter::update_content_topic_filter(
-        const std::string& /* expression */)
-{
-    // Nothing
-}
-
 void RtpsEchoWriter::update_topic_partitions(
         const std::map<std::string, std::string>& partition_name)
 {
diff --git a/ddspipe_participants/src/cpp/writer/dds/CommonWriter.cpp b/ddspipe_participants/src/cpp/writer/dds/CommonWriter.cpp
@@ -57,8 +57,7 @@ CommonWriter::~CommonWriter()
 }
 
 void CommonWriter::init(
-        const std::set<std::string>& partitions_set,
-        const std::string& content_topicfilter_expression
+        const std::set<std::string>& partitions_set
 )
 {
     EPROSIMA_LOG_INFO(DDSPIPE_DDS_WRITER,
@@ -95,21 +94,8 @@ void CommonWriter::init(
 
     auto topic_tmp = dds_participant_->find_topic(topic_.topic_name(), 10);
 
-    // Create the filtered topic with the expression given
-    // if any filter is active the expression will be ""
-    // no contentfilter is being applied
-    filtered_topic_ = dds_participant_->create_contentfilteredtopic(
-        topic_.topic_name() + "_filtered", topic_tmp,
-        content_topicfilter_expression, {});
-    if (nullptr == filtered_topic_)
-    {
-        throw utils::InitializationException(
-                  utils::Formatter() << "Error creating ContenTopicFilter for Participant "
-                                     << participant_id_ << " in topic " << topic_ << ".");
-    }
-
     writer_ = dds_publisher_->create_datawriter(
-        dds_topic_, //filtered_topic_, //TODO. danip
+        dds_topic_,
         reckon_writer_qos_(),
         nullptr,
         eprosima::fastdds::dds::StatusMask::all(),
@@ -200,13 +186,6 @@ void CommonWriter::update_partitions(
     dds_publisher_->set_qos(pub_qos);
 }
 
-void CommonWriter::update_content_topic_filter(
-        const std::string& expression)
-{
-    // content_topicfilter
-    filtered_topic_->set_filter_expression(expression, {});
-}
-
 void CommonWriter::update_topic_partitions(
         const std::map<std::string, std::string>& partition_name)
 {
diff --git a/ddspipe_participants/src/cpp/writer/dds/MultiWriter.cpp b/ddspipe_participants/src/cpp/writer/dds/MultiWriter.cpp
@@ -108,12 +108,6 @@ void MultiWriter::update_partitions(
     // Nothing
 }
 
-void MultiWriter::update_content_topic_filter(
-        const std::string& expression)
-{
-    // Nothing
-}
-
 QoSSpecificWriter* MultiWriter::get_writer_or_create_(
         const core::types::SpecificEndpointQoS& data_qos)
 {
@@ -154,7 +148,7 @@ QoSSpecificWriter* MultiWriter::create_writer_nts_(
         this->dds_topic_,
         repeater_);
     // No filters
-    writer->init(std::set<std::string>(), "");
+    writer->init(std::set<std::string>());
 
     return writer;
 }
diff --git a/ddspipe_participants/src/cpp/writer/dynamic_types/SchemaWriter.cpp b/ddspipe_participants/src/cpp/writer/dynamic_types/SchemaWriter.cpp
@@ -50,12 +50,6 @@ void SchemaWriter::update_partitions(
     // Nothing
 }
 
-void SchemaWriter::update_content_topic_filter(
-        const std::string& /* expression */)
-{
-    // Nothing
-}
-
 void SchemaWriter::update_topic_partitions(
         const std::map<std::string, std::string>& partition_name)
 {
diff --git a/ddspipe_participants/src/cpp/writer/dynamic_types/TypeObjectWriter.cpp b/ddspipe_participants/src/cpp/writer/dynamic_types/TypeObjectWriter.cpp
@@ -73,12 +73,6 @@ void TypeObjectWriter::update_partitions(
     // Nothing
 }
 
-void TypeObjectWriter::update_content_topic_filter(
-        const std::string& /* expression */)
-{
-    // Nothing
-}
-
 void TypeObjectWriter::update_topic_partitions(
         const std::map<std::string, std::string>& partition_name)
 {
diff --git a/ddspipe_participants/src/cpp/writer/rtps/CommonWriter.cpp b/ddspipe_participants/src/cpp/writer/rtps/CommonWriter.cpp
@@ -232,12 +232,6 @@ void CommonWriter::update_partitions(
     rtps_participant_->update_writer(rtps_writer_, writer_qos_);
 }
 
-void CommonWriter::update_content_topic_filter(
-        const std::string& /* expression */)
-{
-    // Nothing
-}
-
 void CommonWriter::update_topic_partitions(
         const std::map<std::string, std::string>& partition_name)
 {
diff --git a/ddspipe_participants/src/cpp/writer/rtps/MultiWriter.cpp b/ddspipe_participants/src/cpp/writer/rtps/MultiWriter.cpp
@@ -167,12 +167,6 @@ void MultiWriter::update_partitions(
     // Nothing
 }
 
-void MultiWriter::update_content_topic_filter(
-        const std::string& expression)
-{
-    // Nothing
-}
-
 void MultiWriter::update_topic_partitions(
         const std::map<std::string, std::string>& partition_name)
 {
