Refs #21711: DataReader get_matched_publication_data() get_matched_publications() implementation

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Author: Mario-DL

include/fastdds/dds/subscriber/DataReader.hpp

@@ -977,9 +977,9 @@ class DataReader : public DomainEntity
      *
      * @param[out] publication_data publication data struct
      * @param publication_handle InstanceHandle_t of the publication
-     * @return RETCODE_OK
+     * @return RETCODE_BAD_PARAMETER if the DataReader is not matched with
+     * the given publication handle, RETCODE_OK otherwise.
      *
-     * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED
      */
     RTPS_DllAPI ReturnCode_t get_matched_publication_data(
             builtin::PublicationBuiltinTopicData& publication_data,
@@ -989,9 +989,10 @@ class DataReader : public DomainEntity
      * @brief Fills the given vector with the InstanceHandle_t of matched DataReaders
      *
      * @param[out] publication_handles Vector where the InstanceHandle_t are returned
-     * @return RETCODE_OK
+     * @return RETCODE_OK if the operation succeeds.
+     *
+     * @note Returning an empty list is not an error, it returns RETCODE_OK.
      *
-     * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED
      */
     RTPS_DllAPI ReturnCode_t get_matched_publications(
             std::vector<InstanceHandle_t>& publication_handles) const;

src/cpp/fastdds/subscriber/DataReader.cpp

@@ -395,22 +395,13 @@ ReturnCode_t DataReader::get_matched_publication_data(
         builtin::PublicationBuiltinTopicData& publication_data,
         const fastrtps::rtps::InstanceHandle_t& publication_handle) const
 {
-    static_cast<void> (publication_data);
-    static_cast<void> (publication_handle);
-    return ReturnCode_t::RETCODE_UNSUPPORTED;
-    /*
-       return impl_->get_matched_publication_data(publication_data, publication_handle);
-     */
+    return impl_->get_matched_publication_data(publication_data, publication_handle);
 }
 
 ReturnCode_t DataReader::get_matched_publications(
         std::vector<InstanceHandle_t>& publication_handles) const
 {
-    static_cast<void> (publication_handles);
-    return ReturnCode_t::RETCODE_UNSUPPORTED;
-    /*
-       return impl_->get_matched_publication_data(publication_handles);
-     */
+    return impl_->get_matched_publications(publication_handles);
 }
 
 ReadCondition* DataReader::create_readcondition(

src/cpp/fastdds/subscriber/DataReaderImpl.cpp

@@ -1198,6 +1198,48 @@ ReturnCode_t DataReaderImpl::get_subscription_matched_status(
     return ReturnCode_t::RETCODE_OK;
 }
 
+ReturnCode_t DataReaderImpl::get_matched_publication_data(
+        builtin::PublicationBuiltinTopicData& publication_data,
+        const fastrtps::rtps::InstanceHandle_t& publication_handle) const
+{
+    fastrtps::types::ReturnCode_t ret = ReturnCode_t::RETCODE_BAD_PARAMETER;
+    GUID_t writer_guid = iHandle2GUID(publication_handle);
+
+    if (reader_ && reader_->matched_writer_is_matched(writer_guid))
+    {
+        if (subscriber_)
+        {
+            RTPSParticipant* rtps_participant = subscriber_->rtps_participant();
+            if (rtps_participant &&
+                    rtps_participant->get_publication_info(publication_data, writer_guid))
+            {
+                ret = ReturnCode_t::RETCODE_OK;
+            }
+        }
+    }
+
+    return ret;
+}
+
+ReturnCode_t DataReaderImpl::get_matched_publications(
+        std::vector<InstanceHandle_t>& publication_handles) const
+{
+    ReturnCode_t ret = ReturnCode_t::RETCODE_ERROR;
+    std::vector<GUID_t> matched_writers_guids;
+    publication_handles.clear();
+
+    if (reader_ && reader_->matched_writers_guids(matched_writers_guids))
+    {
+        for (const GUID_t& guid : matched_writers_guids)
+        {
+            publication_handles.push_back(InstanceHandle_t(guid));
+        }
+        ret = ReturnCode_t::RETCODE_OK;
+    }
+
+    return ret;
+}
+
 bool DataReaderImpl::deadline_timer_reschedule()
 {
     assert(qos_.deadline().period != c_TimeInfinite);

src/cpp/fastdds/subscriber/DataReaderImpl.hpp

@@ -75,6 +75,12 @@ class ReadConditionImpl;
 
 } // namespace detail
 
+namespace builtin {
+
+struct PublicationBuiltinTopicData;
+
+} // namespace builtin
+
 /**
  * Class DataReader, contains the actual implementation of the behaviour of the Subscriber.
  *  @ingroup FASTDDS_MODULE
@@ -237,6 +243,31 @@ class DataReaderImpl
     ReturnCode_t get_subscription_matched_status(
             SubscriptionMatchedStatus& status);
 
+    /**
+     * @brief Retrieves in a publication associated with the DataWriter
+     *
+     * @param[out] publication_data publication data struct
+     * @param publication_handle InstanceHandle_t of the publication
+     * @return RETCODE_BAD_PARAMETER if the DataReader is not matched with
+     * the given publication handle, RETCODE_OK otherwise.
+     *
+     */
+    ReturnCode_t get_matched_publication_data(
+            builtin::PublicationBuiltinTopicData& publication_data,
+            const fastrtps::rtps::InstanceHandle_t& publication_handle) const;
+
+    /**
+     * @brief Fills the given vector with the InstanceHandle_t of matched DataReaders
+     *
+     * @param[out] publication_handles Vector where the InstanceHandle_t are returned
+     * @return RETCODE_OK if the operation succeeds.
+     *
+     * @note Returning an empty list is not an error, it returns RETCODE_OK.
+     *
+     */
+    ReturnCode_t get_matched_publications(
+            std::vector<InstanceHandle_t>& publication_handles) const;
+
     ReturnCode_t get_requested_deadline_missed_status(
             fastrtps::RequestedDeadlineMissedStatus& status);