From cd9c1247a1ff99b69dc029c7c195df83eb642a63 Mon Sep 17 00:00:00 2001
From: JesusPoderoso <jesuspoderoso@eprosima.com>
Date: Tue, 18 Jun 2024 10:49:28 +0200
Subject: [PATCH] Refs #21130: Migrate ResourceManagement to rtps attributes
 API and update guards and .hpp format

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
---
 include/fastdds/dds/core/policy/QosPolicies.hpp        |  2 +-
 include/fastdds/rtps/attributes/HistoryAttributes.h    |  2 +-
 .../rtps/attributes/RTPSParticipantAttributes.h        |  2 +-
 .../ResourceManagement.hpp}                            | 10 +++++-----
 src/cpp/fastdds/publisher/DataWriterHistory.hpp        |  2 +-
 .../fastdds/subscriber/history/DataReaderHistory.hpp   |  2 +-
 src/cpp/rtps/DataSharing/ReaderPool.hpp                |  2 +-
 src/cpp/rtps/DataSharing/WriterPool.hpp                |  2 +-
 src/cpp/rtps/history/CacheChangePool.h                 |  2 +-
 src/cpp/rtps/history/PoolConfig.h                      |  2 +-
 src/cpp/rtps/history/TopicPayloadPool.hpp              |  2 +-
 .../fastdds/subscriber/qos/DataReaderQos.cpp           |  2 +-
 src/cpp/xmlparser/attributes/PublisherAttributes.hpp   |  2 +-
 src/cpp/xmlparser/attributes/SubscriberAttributes.hpp  |  2 +-
 .../fastdds/publisher/DataWriterHistory.hpp            |  2 +-
 .../rtps/attributes/RTPSParticipantAttributes.h        |  2 +-
 .../Publisher/fastdds/publisher/DataWriterHistory.hpp  |  2 +-
 17 files changed, 21 insertions(+), 21 deletions(-)
 rename include/fastdds/rtps/{resources/ResourceManagement.h => attributes/ResourceManagement.hpp} (87%)

diff --git a/include/fastdds/dds/core/policy/QosPolicies.hpp b/include/fastdds/dds/core/policy/QosPolicies.hpp
index f3753cb6913..3ab39e79600 100644
--- a/include/fastdds/dds/core/policy/QosPolicies.hpp
+++ b/include/fastdds/dds/core/policy/QosPolicies.hpp
@@ -35,7 +35,7 @@
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/flowcontrol/FlowControllerConsts.hpp>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
 
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
diff --git a/include/fastdds/rtps/attributes/HistoryAttributes.h b/include/fastdds/rtps/attributes/HistoryAttributes.h
index c5b0b72bcb5..ea114100dbb 100644
--- a/include/fastdds/rtps/attributes/HistoryAttributes.h
+++ b/include/fastdds/rtps/attributes/HistoryAttributes.h
@@ -20,7 +20,7 @@
 #ifndef _FASTDDS_HISTORYATTRIBUTES_H_
 #define _FASTDDS_HISTORYATTRIBUTES_H_
 
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/fastdds_dll.hpp>
 
 #include <cstdint>
diff --git a/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h b/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
index cce436b31eb..89eed265066 100644
--- a/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
+++ b/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
@@ -35,7 +35,7 @@
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
 #include <fastdds/rtps/transport/TransportInterface.h>
 #include <fastdds/fastdds_dll.hpp>
diff --git a/include/fastdds/rtps/resources/ResourceManagement.h b/include/fastdds/rtps/attributes/ResourceManagement.hpp
similarity index 87%
rename from include/fastdds/rtps/resources/ResourceManagement.h
rename to include/fastdds/rtps/attributes/ResourceManagement.hpp
index c21f5bc77b0..54712469ab0 100644
--- a/include/fastdds/rtps/resources/ResourceManagement.h
+++ b/include/fastdds/rtps/attributes/ResourceManagement.hpp
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 /**
- * @file ResourceManagement.h
+ * @file ResourceManagement.hpp
  *
  */
 
-#ifndef _FASTDDS_RTPS_RESOURCE_MANAGEMENT_H_
-#define _FASTDDS_RTPS_RESOURCE_MANAGEMENT_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__RESOURCEMANAGEMENT_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__RESOURCEMANAGEMENT_HPP
 
 
 namespace eprosima {
@@ -38,8 +38,8 @@ typedef enum MemoryManagementPolicy
 }MemoryManagementPolicy_t;
 
 
-} // end namespaces
+} // namespace rtps
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_RESOURCE_MANAGEMENT_H_ */
+#endif // FASTDDS_RTPS_ATTRIBUTES__RESOURCEMANAGEMENT_HPP
diff --git a/src/cpp/fastdds/publisher/DataWriterHistory.hpp b/src/cpp/fastdds/publisher/DataWriterHistory.hpp
index 8159e09847d..d826f494a92 100644
--- a/src/cpp/fastdds/publisher/DataWriterHistory.hpp
+++ b/src/cpp/fastdds/publisher/DataWriterHistory.hpp
@@ -27,7 +27,7 @@
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 #include <fastdds/publisher/history/DataWriterInstance.hpp>
 
diff --git a/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp b/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp
index c66abf41552..d0c3ce2263e 100644
--- a/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp
+++ b/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp
@@ -40,7 +40,7 @@
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SequenceNumber.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 #include <fastdds/subscriber/DataReaderImpl/StateFilter.hpp>
 
diff --git a/src/cpp/rtps/DataSharing/ReaderPool.hpp b/src/cpp/rtps/DataSharing/ReaderPool.hpp
index a3c28d00eae..eb0dbcc62ce 100644
--- a/src/cpp/rtps/DataSharing/ReaderPool.hpp
+++ b/src/cpp/rtps/DataSharing/ReaderPool.hpp
@@ -20,7 +20,7 @@
 #define RTPS_DATASHARING_READERPOOL_HPP
 
 #include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <rtps/DataSharing/DataSharingPayloadPool.hpp>
 
diff --git a/src/cpp/rtps/DataSharing/WriterPool.hpp b/src/cpp/rtps/DataSharing/WriterPool.hpp
index ad1224cd7f3..65ce8370aba 100644
--- a/src/cpp/rtps/DataSharing/WriterPool.hpp
+++ b/src/cpp/rtps/DataSharing/WriterPool.hpp
@@ -21,7 +21,7 @@
 
 #include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <rtps/DataSharing/DataSharingPayloadPool.hpp>
 #include <utils/collections/FixedSizeQueue.hpp>
diff --git a/src/cpp/rtps/history/CacheChangePool.h b/src/cpp/rtps/history/CacheChangePool.h
index ac7f6148b2c..e532ce35eac 100644
--- a/src/cpp/rtps/history/CacheChangePool.h
+++ b/src/cpp/rtps/history/CacheChangePool.h
@@ -21,7 +21,7 @@
 
 #include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/history/IChangePool.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 #include <rtps/history/PoolConfig.h>
 
diff --git a/src/cpp/rtps/history/PoolConfig.h b/src/cpp/rtps/history/PoolConfig.h
index 8120bb27d5d..dc87f6adae3 100644
--- a/src/cpp/rtps/history/PoolConfig.h
+++ b/src/cpp/rtps/history/PoolConfig.h
@@ -20,7 +20,7 @@
 #define RTPS_HISTORY_POOLCONFIG_H_
 
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/history/TopicPayloadPool.hpp b/src/cpp/rtps/history/TopicPayloadPool.hpp
index 563fc899715..d9b32546b40 100644
--- a/src/cpp/rtps/history/TopicPayloadPool.hpp
+++ b/src/cpp/rtps/history/TopicPayloadPool.hpp
@@ -21,7 +21,7 @@
 
 #include <fastdds/rtps/common/SerializedPayload.h>
 #include <fastdds/rtps/history/IPayloadPool.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <rtps/history/PoolConfig.h>
 #include <rtps/history/ITopicPayloadPool.h>
diff --git a/src/cpp/statistics/fastdds/subscriber/qos/DataReaderQos.cpp b/src/cpp/statistics/fastdds/subscriber/qos/DataReaderQos.cpp
index 211c6b59521..7f8f19568e9 100644
--- a/src/cpp/statistics/fastdds/subscriber/qos/DataReaderQos.cpp
+++ b/src/cpp/statistics/fastdds/subscriber/qos/DataReaderQos.cpp
@@ -19,7 +19,7 @@
 #include <fastdds/statistics/dds/subscriber/qos/DataReaderQos.hpp>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/xmlparser/attributes/PublisherAttributes.hpp b/src/cpp/xmlparser/attributes/PublisherAttributes.hpp
index bbc4a51b517..e04b5dcb52a 100644
--- a/src/cpp/xmlparser/attributes/PublisherAttributes.hpp
+++ b/src/cpp/xmlparser/attributes/PublisherAttributes.hpp
@@ -19,7 +19,7 @@
 #ifndef _FASTDDS_PUBLISHERATTRIBUTES_H_
 #define _FASTDDS_PUBLISHERATTRIBUTES_H_
 
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>
diff --git a/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp b/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp
index 3416f7704a9..3b6d02e0966 100644
--- a/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp
+++ b/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp
@@ -26,7 +26,7 @@
 #include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/common/Locator.h>
 #include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp b/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp
index b8e42c28160..4bd387f0ca3 100644
--- a/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp
+++ b/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp
@@ -29,7 +29,7 @@
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 
 #include <fastdds/publisher/history/DataWriterInstance.hpp>
diff --git a/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h b/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h
index db4947966c5..e2a9cb2893a 100644
--- a/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h
+++ b/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h
@@ -35,7 +35,7 @@
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
 #include <fastdds/rtps/transport/TransportInterface.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
diff --git a/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp b/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp
index b9cbca05ac0..5797ceb7552 100644
--- a/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp
+++ b/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp
@@ -22,7 +22,7 @@
 #include <gmock/gmock.h>
 
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/resources/ResourceManagement.h>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 
 namespace eprosima {