Refs #21709: Minor changes to be coherent with latest design updates

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
eProsima · Sep 30, 2024 · 828275f · 828275f
1 parent e369c22
commit 828275f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/include/fastdds/rtps/participant/RTPSParticipant.h b/include/fastdds/rtps/participant/RTPSParticipant.h
@@ -317,8 +317,8 @@ class RTPS_DllAPI RTPSParticipant
      * @return True if the writer was found and the data was filled.
      */
     bool get_publication_info(
-            const GUID_t& writer_guid,
-            fastdds::dds::builtin::PublicationBuiltinTopicData& data) const;
+            fastdds::dds::builtin::PublicationBuiltinTopicData& data,
+            const GUID_t& writer_guid) const;
 
     /**
      * @brief Fills the provided SubscriptionBuiltinTopicData with the information of the
@@ -329,8 +329,8 @@ class RTPS_DllAPI RTPSParticipant
      * @return True if the reader was found and the data was filled.
      */
     bool get_subscription_info(
-            const GUID_t& reader_guid,
-            fastdds::dds::builtin::SubscriptionBuiltinTopicData& data) const;
+            fastdds::dds::builtin::SubscriptionBuiltinTopicData& data,
+            const GUID_t& reader_guid) const;
 
 #if HAVE_SECURITY
 

diff --git a/src/cpp/rtps/participant/RTPSParticipant.cpp b/src/cpp/rtps/participant/RTPSParticipant.cpp
@@ -202,15 +202,15 @@ std::vector<fastdds::rtps::TransportNetmaskFilterInfo> RTPSParticipant::get_netm
 }
 
 bool RTPSParticipant::get_publication_info(
-        const GUID_t&,
-        fastdds::dds::builtin::PublicationBuiltinTopicData&) const
+        fastdds::dds::builtin::PublicationBuiltinTopicData&,
+        const GUID_t&) const
 {
     return false;
 }
 
 bool RTPSParticipant::get_subscription_info(
-        const GUID_t&,
-        fastdds::dds::builtin::SubscriptionBuiltinTopicData&) const
+        fastdds::dds::builtin::SubscriptionBuiltinTopicData&,
+        const GUID_t&) const
 {
     return false;
 }

diff --git a/test/blackbox/common/RTPSBlackboxTestsBasic.cpp b/test/blackbox/common/RTPSBlackboxTestsBasic.cpp
@@ -1426,14 +1426,14 @@ TEST_P(RTPS, rtps_participant_get_pubsub_info)
     eprosima::fastdds::dds::builtin::SubscriptionBuiltinTopicData subdata;
 
     // Get publication info from the reader participant and validate it
-    bool ret = reader.get_rtps_participant()->get_publication_info(writer.guid(), pubdata);
+    bool ret = reader.get_rtps_participant()->get_publication_info(pubdata, writer.guid());
     ASSERT_TRUE(ret);
     ASSERT_TRUE(validate_publication_builtin_topic_data(pubdata, writer.get_native_writer(),
             writer.get_topic_attributes(),
             writer.get_writerqos(), reader.get_rtps_participant()->getGuid()));
 
     // Get subscription info from the reader participant and validate it
-    ret = writer.get_rtps_participant()->get_subscription_info(reader.guid(), subdata);
+    ret = writer.get_rtps_participant()->get_subscription_info(subdata, reader.guid());
     ASSERT_TRUE(ret);
     ASSERT_TRUE(validate_subscription_builtin_topic_data(subdata, reader.get_native_reader(),
             reader.get_topic_attributes(),

diff --git a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h
@@ -229,13 +229,13 @@ class RTPS_DllAPI RTPSParticipant
 
     MOCK_METHOD2(
         get_publication_info, bool(
-            const GUID_t& writer_guid,
-            fastdds::dds::builtin::PublicationBuiltinTopicData& data));
+            fastdds::dds::builtin::PublicationBuiltinTopicData& data,
+            const GUID_t& writer_guid));
 
     MOCK_METHOD2(
         get_subscription_info, bool(
-            const GUID_t& writer_guid,
-            fastdds::dds::builtin::SubscriptionBuiltinTopicData& data));
+            fastdds::dds::builtin::SubscriptionBuiltinTopicData& data,
+            const GUID_t& reader_guid));
 
     const RTPSParticipantAttributes& getRTPSParticipantAttributes()
     {