[20817] Remove unnecessary header and make private SecurityException and Exception

examples/cpp/rtps/AsSocket/TestReaderSocket.h

@@ -21,7 +21,16 @@
 #define TESTREADERSOCKET_H_
 
 #include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/rtps_fwd.h>
+
+namespace eprosima {
+namespace fastrtps {
+namespace rtps {
+class RTPSParticipant;
+class ReaderHistory;
+class RTPSReader;
+} // namespace rtps
+} // namespace fastrtps
+} // namespace eprosima
 
 class TestReaderSocket
 {

examples/cpp/rtps/AsSocket/TestWriterSocket.h

@@ -24,7 +24,15 @@
 #include <cstdio>
 #include <string>
 
-#include <fastdds/rtps/rtps_fwd.h>
+namespace eprosima {
+namespace fastrtps {
+namespace rtps {
+class RTPSParticipant;
+class WriterHistory;
+class RTPSWriter;
+} // namespace rtps
+} // namespace fastrtps
+} // namespace eprosima
 
 class TestWriterSocket
 {

examples/cpp/rtps/Persistent/TestReaderPersistent.h

@@ -21,7 +21,16 @@
 #define TESTREADERPERSISTENT_H_
 
 #include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/rtps_fwd.h>
+
+namespace eprosima {
+namespace fastrtps {
+namespace rtps {
+class RTPSParticipant;
+class ReaderHistory;
+class RTPSReader;
+} // namespace rtps
+} // namespace fastrtps
+} // namespace eprosima
 
 class TestReaderPersistent
 {

examples/cpp/rtps/Persistent/TestWriterPersistent.h

@@ -20,9 +20,18 @@
 #ifndef TESTWRITERPERSISTENT_H_
 #define TESTWRITERPERSISTENT_H_
 
-#include <fastdds/rtps/rtps_fwd.h>
 #include <fastdds/rtps/writer/WriterListener.h>
 
+namespace eprosima {
+namespace fastrtps {
+namespace rtps {
+class RTPSParticipant;
+class WriterHistory;
+class RTPSWriter;
+} // namespace rtps
+} // namespace fastrtps
+} // namespace eprosima
+
 class TestWriterPersistent
 {
 public:

examples/cpp/rtps/Registered/TestReaderRegistered.h

@@ -21,7 +21,17 @@
 #define TESTREADERREGISTERED_H_
 
 #include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/rtps_fwd.h>
+
+
+namespace eprosima {
+namespace fastrtps {
+namespace rtps {
+class RTPSParticipant;
+class ReaderHistory;
+class RTPSReader;
+} // namespace rtps
+} // namespace fastrtps
+} // namespace eprosima
 
 class TestReaderRegistered
 {

examples/cpp/rtps/Registered/TestWriterRegistered.h

@@ -20,9 +20,17 @@
 #ifndef TESTWRITERREGISTERED_H_
 #define TESTWRITERREGISTERED_H_
 
-#include <fastdds/rtps/rtps_fwd.h>
 #include <fastdds/rtps/writer/WriterListener.h>
 
+namespace eprosima {
+namespace fastrtps {
+namespace rtps {
+class RTPSParticipant;
+class WriterHistory;
+} // namespace rtps
+} // namespace fastrtps
+} // namespace eprosima
+
 class TestWriterRegistered
 {
 public:

include/fastdds/dds/core/policy/ParameterTypes.hpp

@@ -21,12 +21,17 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
+#include <atomic>
 #include <string>
 #include <vector>
 
 #include <fastcdr/cdr/fixed_size_string.hpp>
 
-#include <fastdds/rtps/common/all_common.h>
+#include <fastdds/rtps/common/InstanceHandle.h>
+#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/SampleIdentity.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/common/Token.h>
 
 #if HAVE_SECURITY

include/fastdds/dds/domain/DomainParticipant.hpp

@@ -833,15 +833,6 @@ class DomainParticipant : public Entity
             uint16_t userId,
             fastrtps::rtps::EndpointKind_t kind);
 
-    /**
-     * @brief Getter for the resource event
-     *
-     * @pre The DomainParticipant is enabled.
-     *
-     * @return A reference to the resource event
-     */
-    FASTDDS_EXPORTED_API fastrtps::rtps::ResourceEvent& get_resource_event() const;
-
     /**
      * Register a custom content filter factory, which can be used to create a ContentFilteredTopic.
      *

include/fastdds/rtps/common/Property.h

@@ -23,8 +23,6 @@
 #include <string>
 #include <vector>
 
-#include <fastdds/rtps/exceptions/Exception.h>
-
 namespace eprosima {
 namespace fastrtps {
 namespace rtps {

include/fastrtps/qos/ParameterTypes.h

@@ -23,7 +23,7 @@
 #include <fastcdr/cdr/fixed_size_string.hpp>
 
 #include <fastdds/dds/core/policy/ParameterTypes.hpp>
-#include <fastdds/rtps/common/all_common.h>
+#include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/common/Token.h>
 
 #if HAVE_SECURITY

src/cpp/CMakeLists.txt

@@ -263,6 +263,7 @@ set(${PROJECT_NAME}_security_source_files
     rtps/security/exceptions/SecurityException.cpp
     rtps/security/common/SharedSecretHandle.cpp
     rtps/security/logging/Logging.cpp
+    rtps/security/logging/LoggingLevel.cpp
     rtps/security/SecurityManager.cpp
     rtps/security/SecurityPluginFactory.cpp
     rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp

src/cpp/fastdds/domain/DomainParticipant.cpp

@@ -492,11 +492,6 @@ bool DomainParticipant::new_remote_endpoint_discovered(
     return impl_->new_remote_endpoint_discovered(partguid, userId, kind);
 }
 
-fastrtps::rtps::ResourceEvent& DomainParticipant::get_resource_event() const
-{
-    return impl_->get_resource_event();
-}
-
 bool DomainParticipant::has_active_entities()
 {
     return impl_->has_active_entities();

src/cpp/fastdds/publisher/DataWriterImpl.cpp

@@ -398,14 +398,14 @@ ReturnCode_t DataWriterImpl::enable()
     // In case it has been loaded from the persistence DB, rebuild instances on history
     history_.rebuild_instances();
 
-    deadline_timer_ = new TimedEvent(publisher_->get_participant()->get_resource_event(),
+    deadline_timer_ = new TimedEvent(publisher_->rtps_participant()->get_resource_event(),
                     [&]() -> bool
                     {
                         return deadline_missed();
                     },
                     qos_.deadline().period.to_ns() * 1e-6);
 
-    lifespan_timer_ = new TimedEvent(publisher_->get_participant()->get_resource_event(),
+    lifespan_timer_ = new TimedEvent(publisher_->rtps_participant()->get_resource_event(),
                     [&]() -> bool
                     {
                         return lifespan_expired();

src/cpp/fastdds/subscriber/DataReaderImpl.cpp

@@ -258,14 +258,14 @@ ReturnCode_t DataReaderImpl::enable()
 
     reader_ = reader;
 
-    deadline_timer_ = new TimedEvent(subscriber_->get_participant()->get_resource_event(),
+    deadline_timer_ = new TimedEvent(subscriber_->rtps_participant()->get_resource_event(),
                     [&]() -> bool
                     {
                         return deadline_missed();
                     },
                     qos_.deadline().period.to_ns() * 1e-6);
 
-    lifespan_timer_ = new TimedEvent(subscriber_->get_participant()->get_resource_event(),
+    lifespan_timer_ = new TimedEvent(subscriber_->rtps_participant()->get_resource_event(),
                     [&]() -> bool
                     {
                         return lifespan_expired();

src/cpp/rtps/exceptions/Exception.cpp

@@ -12,34 +12,49 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <fastdds/rtps/exceptions/Exception.h>
+#include "Exception.h"
 
 using namespace eprosima::fastrtps::rtps;
 
-Exception::Exception(const char* const& message) : message_(message), minor_(0)
+Exception::Exception(
+        const char* const& message)
+    : message_(message)
+    , minor_(0)
 {
 }
 
-Exception::Exception(const Exception &ex) : message_(ex.message_), minor_(ex.minor_)
+Exception::Exception(
+        const Exception& ex)
+    : message_(ex.message_)
+    , minor_(ex.minor_)
 {
 }
 
-Exception::Exception(Exception&& ex) : message_(std::move(ex.message_)), minor_(ex.minor_)
+Exception::Exception(
+        Exception&& ex)
+    : message_(std::move(ex.message_))
+    , minor_(ex.minor_)
 {
 }
 
-Exception::Exception(const  char* const& message, const int32_t minor) : message_(message), minor_(minor)
+Exception::Exception(
+        const char* const& message,
+        const int32_t minor)
+    : message_(message)
+    , minor_(minor)
 {
 }
 
-Exception& Exception::operator=(const Exception &ex)
+Exception& Exception::operator =(
+        const Exception& ex)
 {
     message_ = ex.message_;
     minor_ = ex.minor_;
     return *this;
 }
 
-Exception& Exception::operator=(Exception&& ex)
+Exception& Exception::operator =(
+        Exception&& ex)
 {
     message_ = std::move(ex.message_);
     minor_ = ex.minor_;
@@ -55,7 +70,8 @@ const int32_t& Exception::minor() const
     return minor_;
 }
 
-void Exception::minor(const int32_t &minor)
+void Exception::minor(
+        const int32_t& minor)
 {
     minor_ = minor;
 }

src/cpp/rtps/messages/MessageReceiver.h

@@ -23,7 +23,12 @@
 #include <functional>
 #include <unordered_map>
 
-#include <fastdds/rtps/common/all_common.h>
+#include <fastdds/rtps/common/CDRMessage_t.h>
+#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/MatchingInfo.h>
+#include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 
 #include <utils/shared_mutex.hpp>