Refs #20818: Make ResourceEvent private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
eProsima · May 23, 2024 · d2d6584 · d2d6584
1 parent 55fdaf6
commit d2d6584
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 37 deletions.
diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.cpp b/src/cpp/fastdds/publisher/DataWriterImpl.cpp
@@ -37,7 +37,6 @@
 #include <fastdds/publisher/PublisherImpl.hpp>
 #include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
@@ -47,6 +46,7 @@
 #include <rtps/history/CacheChangePool.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/resources/ResourceEvent.h>
 #include <rtps/RTPSDomainImpl.hpp>
 #include <rtps/resources/TimedEvent.h>
 #include <utils/TimeConversion.hpp>

diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp b/src/cpp/fastdds/subscriber/DataReaderImpl.cpp
@@ -38,7 +38,6 @@
 #include <fastdds/domain/DomainParticipantImpl.hpp>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/subscriber/DataReaderImpl.hpp>
 #include <fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp>
@@ -50,6 +49,7 @@
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/resources/TimedEvent.h>
+#include <rtps/resources/ResourceEvent.h>
 #include <utils/TimeConversion.hpp>
 #ifdef FASTDDS_STATISTICS
 #include <statistics/fastdds/domain/DomainParticipantImpl.hpp>

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp
@@ -30,12 +30,11 @@
 
 #include <fastdds/rtps/attributes/ServerAttributes.h>
 #include <fastdds/rtps/history/History.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
-
 #include <rtps/builtin/discovery/database/DiscoveryDataBase.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryDataFilter.hpp>
 #include <rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp>
 #include <rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp>
+#include <rtps/resources/ResourceEvent.h>
 
 namespace eprosima {
 namespace fastdds {

diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp
@@ -19,8 +19,6 @@
 
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
 
-#include <fastdds/rtps/resources/ResourceEvent.h>
-
 #include <rtps/participant/RTPSParticipantImpl.h>
 
 #include <fastdds/dds/log/Log.hpp>
@@ -29,6 +27,7 @@
 #include <rtps/builtin/discovery/endpoint/EDPClient.h>
 #include <rtps/builtin/discovery/participant/PDPClient.h>
 #include <rtps/builtin/discovery/participant/timedevent/DSClientEvent.h>
+#include <rtps/resources/ResourceEvent.h>
 #include <utils/shared_mutex.hpp>
 
 namespace eprosima {

diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp
@@ -19,14 +19,13 @@
 
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
 
-#include <fastdds/rtps/resources/ResourceEvent.h>
-
 #include <rtps/participant/RTPSParticipantImpl.h>
 
 #include <fastdds/dds/log/Log.hpp>
 
 #include <rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp>
 #include <rtps/builtin/discovery/participant/PDPServer.hpp>
+#include <rtps/resources/ResourceEvent.h>
 
 namespace eprosima {
 namespace fastdds {

diff --git a/src/cpp/rtps/builtin/liveliness/WLP.cpp b/src/cpp/rtps/builtin/liveliness/WLP.cpp
@@ -28,8 +28,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
-
 #include <fastdds/rtps/writer/StatefulWriter.h>
 #include <fastdds/rtps/writer/WriterListener.h>
 
@@ -39,6 +37,7 @@
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/resources/TimedEvent.h>
+#include <rtps/resources/ResourceEvent.h>
 #include <rtps/writer/LivelinessManager.hpp>
 #include <utils/TimeConversion.hpp>
 

diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.h b/src/cpp/rtps/participant/RTPSParticipantImpl.h
@@ -44,7 +44,6 @@
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/history/IChangePool.h>
 #include <fastdds/rtps/history/IPayloadPool.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
 #include <fastdds/rtps/transport/SenderResource.h>
 
 #include "../flowcontrol/FlowControllerFactory.hpp"
@@ -53,6 +52,7 @@
 #include <rtps/messages/SendBuffersManager.hpp>
 #include <rtps/network/NetworkFactory.h>
 #include <rtps/network/ReceiverResource.h>
+#include <rtps/resources/ResourceEvent.h>
 #include <statistics/rtps/monitor-service/interfaces/IConnectionsObserver.hpp>
 #include <statistics/rtps/monitor-service/interfaces/IConnectionsQueryable.hpp>
 #include <statistics/rtps/StatisticsBase.hpp>

diff --git a/src/cpp/rtps/reader/RTPSReader.cpp b/src/cpp/rtps/reader/RTPSReader.cpp
@@ -16,29 +16,22 @@
  * RTPSReader.cpp
  *
  */
+#include <fastdds/rtps/reader/RTPSReader.h>
 
 #include <typeinfo>
 #include <algorithm>
 #include <chrono>
 
+#include <fastdds/dds/log/Log.hpp>
+#include <fastdds/rtps/history/ReaderHistory.h>
+#include <fastdds/rtps/reader/ReaderListener.h>
+#include <foonathan/memory/namespace_alias.hpp>
+#include <rtps/resources/ResourceEvent.h>
 #include <rtps/history/BasicPayloadPool.hpp>
 #include <rtps/history/CacheChangePool.h>
-
 #include <rtps/DataSharing/DataSharingListener.hpp>
-
 #include <rtps/participant/RTPSParticipantImpl.h>
-
 #include <rtps/reader/ReaderHistoryState.hpp>
-
-#include <fastdds/dds/log/Log.hpp>
-
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
-
-#include <foonathan/memory/namespace_alias.hpp>
-
 #include <statistics/rtps/StatisticsBase.hpp>
 
 

diff --git a/src/cpp/rtps/resources/ResourceEvent.cpp b/src/cpp/rtps/resources/ResourceEvent.cpp
@@ -16,9 +16,10 @@
  * @file ResourceEvent.cpp
  */
 
+#include <rtps/resources/ResourceEvent.h>
+
 #include <cassert>
 
-#include <fastdds/rtps/resources/ResourceEvent.h>
 #include <fastdds/dds/log/Log.hpp>
 
 #include "TimedEventImpl.h"

diff --git a/...de/fastdds/rtps/resources/ResourceEvent.h → src/cpp/rtps/resources/ResourceEvent.h b/...de/fastdds/rtps/resources/ResourceEvent.h → src/cpp/rtps/resources/ResourceEvent.h
diff --git a/src/cpp/rtps/resources/TimedEvent.cpp b/src/cpp/rtps/resources/TimedEvent.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <rtps/resources/TimedEvent.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
+#include <rtps/resources/ResourceEvent.h>
 
 #include "TimedEventImpl.h"
 

diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp
@@ -30,11 +30,9 @@
 #include <fastdds/rtps/messages/RTPSMessageGroup.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
 #include <fastdds/rtps/writer/ReaderProxy.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
 #include <fastdds/rtps/writer/WriterListener.h>
-#include <utils/TimeConversion.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/liveliness/WLP.h>
@@ -47,7 +45,9 @@
 #include <rtps/network/utils/external_locators.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/resources/TimedEvent.h>
+#include <rtps/resources/ResourceEvent.h>
 #include <rtps/RTPSDomainImpl.hpp>
+#include <utils/TimeConversion.hpp>
 
 #ifdef FASTDDS_STATISTICS
 #include <statistics/types/monitorservice_types.hpp>

diff --git a/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp b/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp
@@ -42,13 +42,13 @@
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/subscriber/SubscriberImpl.hpp>
 #include <fastdds/topic/TopicImpl.hpp>
 #include <fastdds/topic/TopicProxy.hpp>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
+#include <rtps/resources/ResourceEvent.h>
 #include <xmlparser/XMLProfileManager.h>
 
 namespace eprosima {

diff --git a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h
@@ -27,9 +27,9 @@
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
 #include <fastdds/fastdds_dll.hpp>
 
+#include <rtps/resources/ResourceEvent.h>
 #include <statistics/rtps/monitor-service/Interfaces.hpp>
 
 namespace eprosima {

diff --git a/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h b/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
@@ -31,10 +31,10 @@
 #include <fastdds/rtps/history/IChangePool.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 
 #include <rtps/network/NetworkFactory.h>
+#include <rtps/resources/ResourceEvent.h>
 #if HAVE_SECURITY
 #include <rtps/security/SecurityManager.h>
 #endif // if HAVE_SECURITY

diff --git a/...nt/fastdds/rtps/resources/ResourceEvent.h → ...ourceEvent/rtps/resources/ResourceEvent.h b/...nt/fastdds/rtps/resources/ResourceEvent.h → ...ourceEvent/rtps/resources/ResourceEvent.h
diff --git a/test/mock/rtps/StatefulReader/fastdds/rtps/reader/StatefulReader.h b/test/mock/rtps/StatefulReader/fastdds/rtps/reader/StatefulReader.h
@@ -18,7 +18,7 @@
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
+#include <rtps/resources/ResourceEvent.h>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/test/unittest/rtps/reader/WriterProxyStopTest.cpp b/test/unittest/rtps/reader/WriterProxyStopTest.cpp
@@ -20,10 +20,11 @@
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
+
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/WriterProxy.h>
 #include <rtps/reader/WriterProxy.cpp>
+#include <rtps/resources/ResourceEvent.h>
 #include <rtps/resources/TimedEvent.h>
 
 namespace testing {

diff --git a/test/unittest/rtps/resources/timedevent/TimedEventTests.cpp b/test/unittest/rtps/resources/timedevent/TimedEventTests.cpp
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/resources/ResourceEvent.h>
+#include <rtps/resources/ResourceEvent.h>
 
 #include "mock/MockEvent.h"
 

diff --git a/test/unittest/rtps/writer/LivelinessManagerTests.cpp b/test/unittest/rtps/writer/LivelinessManagerTests.cpp
@@ -21,8 +21,7 @@
 #include <gtest/gtest.h>
 
 #include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/resources/ResourceEvent.h>
-
+#include <rtps/resources/ResourceEvent.h>
 #include <rtps/writer/LivelinessManager.hpp>
 
 class LivelinessManagerTests : public ::testing::Test

diff --git a/test/unittest/statistics/rtps/MonitorServiceTests.cpp b/test/unittest/statistics/rtps/MonitorServiceTests.cpp
@@ -17,7 +17,7 @@
 #include <thread>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/resources/ResourceEvent.h>
+#include <rtps/resources/ResourceEvent.h>
 
 #include <statistics/rtps/monitor-service/Interfaces.hpp>
 #include <statistics/rtps/monitor-service/MonitorService.hpp>