From fc4745738b3d2a7ad02ab98aea7a88e2c8e451f8 Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Tue, 9 Apr 2024 16:23:05 +0200
Subject: [PATCH] Refs #20765: Make StatelessReader private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
---
 .../participant/DS/DiscoveryServerPDPEndpointsSecure.hpp       | 3 +--
 src/cpp/rtps/builtin/discovery/participant/PDP.cpp             | 2 +-
 src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp       | 2 +-
 .../discovery/participant/simple/SimplePDPEndpoints.hpp        | 3 +--
 src/cpp/rtps/participant/RTPSParticipantImpl.cpp               | 2 +-
 src/cpp/rtps/reader/StatelessPersistentReader.h                | 2 +-
 src/cpp/rtps/reader/StatelessReader.cpp                        | 2 +-
 {include/fastdds => src/cpp}/rtps/reader/StatelessReader.h     | 0
 src/cpp/rtps/security/SecurityManager.cpp                      | 2 +-
 .../{fastdds => }/rtps/reader/StatelessReader.h                | 0
 test/unittest/dds/subscriber/DataReaderHistoryTests.cpp        | 2 +-
 test/unittest/rtps/security/SecurityTests.hpp                  | 2 +-
 12 files changed, 10 insertions(+), 12 deletions(-)
 rename {include/fastdds => src/cpp}/rtps/reader/StatelessReader.h (100%)
 rename test/mock/rtps/StatelessReader/{fastdds => }/rtps/reader/StatelessReader.h (100%)

diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp
index 150167ac954..a8ec878e3bf 100644
--- a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp
@@ -23,10 +23,9 @@
 
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
 #include <fastdds/rtps/common/EntityId_t.hpp>
-#include <fastdds/rtps/reader/StatelessReader.h>
-
 #include <rtps/builtin/BuiltinReader.hpp>
 #include <rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp>
+#include <rtps/reader/StatelessReader.h>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
index 5e4c1b8069b..5094f2cfbaa 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -33,7 +33,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/writer/StatelessWriter.h>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
@@ -50,6 +49,7 @@
 #include <rtps/resources/TimedEvent.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatelessReader.h>
 #include <utils/shared_mutex.hpp>
 #include <utils/TimeConversion.hpp>
 
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
index 7c9265af0fb..73dda8f7099 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -27,7 +27,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/writer/StatelessWriter.h>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
@@ -45,6 +44,7 @@
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.h>
 #include <rtps/resources/TimedEvent.h>
+#include <rtps/reader/StatelessReader.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp
index 4e1caeea91a..a405b501426 100644
--- a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp
@@ -22,13 +22,12 @@
 #include <memory>
 
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
-#include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/writer/StatelessWriter.h>
-
 #include <rtps/builtin/BuiltinReader.hpp>
 #include <rtps/builtin/BuiltinWriter.hpp>
 #include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
 #include <rtps/history/ITopicPayloadPool.h>
+#include <rtps/reader/StatelessReader.h>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
index eaf8b8553da..51cff850fa9 100644
--- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
+++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -36,7 +36,6 @@
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
@@ -64,6 +63,7 @@
 #include <rtps/reader/StatefulPersistentReader.h>
 #include <rtps/reader/StatelessPersistentReader.h>
 #include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatelessReader.h>
 #include <statistics/rtps/GuidUtils.hpp>
 #include <utils/Semaphore.hpp>
 #include <utils/string_utilities.hpp>
diff --git a/src/cpp/rtps/reader/StatelessPersistentReader.h b/src/cpp/rtps/reader/StatelessPersistentReader.h
index 71371f6f00c..cb775976999 100644
--- a/src/cpp/rtps/reader/StatelessPersistentReader.h
+++ b/src/cpp/rtps/reader/StatelessPersistentReader.h
@@ -21,7 +21,7 @@
 #define _FASTDDS_RTPS_STATELESSPERSISTENTREADER_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatelessReader.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/reader/StatelessReader.cpp b/src/cpp/rtps/reader/StatelessReader.cpp
index 750eae24afb..e535e1c58f9 100644
--- a/src/cpp/rtps/reader/StatelessReader.cpp
+++ b/src/cpp/rtps/reader/StatelessReader.cpp
@@ -26,13 +26,13 @@
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/reader/StatelessReader.h>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/DataSharing/DataSharingListener.hpp>
 #include <rtps/DataSharing/ReaderPool.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatelessReader.h>
 #include <rtps/writer/LivelinessManager.hpp>
 
 #include "rtps/RTPSDomainImpl.hpp"
diff --git a/include/fastdds/rtps/reader/StatelessReader.h b/src/cpp/rtps/reader/StatelessReader.h
similarity index 100%
rename from include/fastdds/rtps/reader/StatelessReader.h
rename to src/cpp/rtps/reader/StatelessReader.h
diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp
index 1c37ca74b85..6daca9e4a49 100644
--- a/src/cpp/rtps/security/SecurityManager.cpp
+++ b/src/cpp/rtps/security/SecurityManager.cpp
@@ -31,7 +31,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/security/accesscontrol/AccessControl.h>
 #include <fastdds/rtps/security/accesscontrol/EndpointSecurityAttributes.h>
 #include <fastdds/rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
@@ -47,6 +46,7 @@
 #include <rtps/network/NetworkFactory.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatelessReader.h>
 #include <security/OpenSSLInit.hpp>
 
 #define BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_WRITER (1 << 20)
diff --git a/test/mock/rtps/StatelessReader/fastdds/rtps/reader/StatelessReader.h b/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.h
similarity index 100%
rename from test/mock/rtps/StatelessReader/fastdds/rtps/reader/StatelessReader.h
rename to test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.h
diff --git a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
index 3fd9fc0c827..f62c6f52d51 100644
--- a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
+++ b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
@@ -3,7 +3,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
-#include <fastdds/rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatelessReader.h>
 
 
 #include <gmock/gmock.h>
diff --git a/test/unittest/rtps/security/SecurityTests.hpp b/test/unittest/rtps/security/SecurityTests.hpp
index 644e22881ab..eee75639488 100644
--- a/test/unittest/rtps/security/SecurityTests.hpp
+++ b/test/unittest/rtps/security/SecurityTests.hpp
@@ -20,7 +20,6 @@
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
 #include <fastdds/rtps/security/common/Handle.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
@@ -29,6 +28,7 @@
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatelessReader.h>
 #include <rtps/security/MockAuthenticationPlugin.h>
 #include <rtps/security/MockCryptographyPlugin.h>
 #include <rtps/security/SecurityManager.h>