Refs #20820: Make logging private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
eProsima · May 16, 2024 · e6960f2 · e6960f2
1 parent fc82ae5
commit e6960f2
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/src/cpp/rtps/security/ISecurityPluginFactory.h b/src/cpp/rtps/security/ISecurityPluginFactory.h
@@ -19,10 +19,10 @@
 #define _RTPS_SECURITY_ISECURITYPLUGINFACTORY_H_
 
 #include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/security/logging/Logging.h>
 #include <rtps/security/accesscontrol/AccessControl.h>
 #include <rtps/security/authentication/Authentication.h>
 #include <rtps/security/cryptography/Cryptography.h>
+#include <rtps/security/logging/Logging.h>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/src/cpp/rtps/security/SecurityPluginFactory.h b/src/cpp/rtps/security/SecurityPluginFactory.h
@@ -20,11 +20,11 @@
 
 
 #include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/security/logging/Logging.h>
 #include <rtps/security/accesscontrol/AccessControl.h>
 #include <rtps/security/authentication/Authentication.h>
 #include <rtps/security/cryptography/Cryptography.h>
 #include <rtps/security/ISecurityPluginFactory.h>
+#include <rtps/security/logging/Logging.h>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/...tps/security/logging/BuiltinLoggingType.h → ...tps/security/logging/BuiltinLoggingType.h b/...tps/security/logging/BuiltinLoggingType.h → ...tps/security/logging/BuiltinLoggingType.h
@@ -20,8 +20,8 @@
 
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/security/logging/LoggingLevel.h>
-#include <fastdds/rtps/security/logging/NameValuePair.h>
+#include <rtps/security/logging/LoggingLevel.h>
+#include <rtps/security/logging/NameValuePair.h>
 
 #include <map>
 

diff --git a/...astdds/rtps/security/logging/LogOptions.h → src/cpp/rtps/security/logging/LogOptions.h b/...astdds/rtps/security/logging/LogOptions.h → src/cpp/rtps/security/logging/LogOptions.h
@@ -20,7 +20,7 @@
 
 #include <string>
 
-#include <fastdds/rtps/security/logging/LoggingLevel.h>
+#include <rtps/security/logging/LoggingLevel.h>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/src/cpp/rtps/security/logging/Logging.cpp b/src/cpp/rtps/security/logging/Logging.cpp
@@ -1,4 +1,4 @@
-#include <fastdds/rtps/security/logging/Logging.h>
+#include <rtps/security/logging/Logging.h>
 
 namespace eprosima {
 namespace fastrtps {

diff --git a/...e/fastdds/rtps/security/logging/Logging.h → src/cpp/rtps/security/logging/Logging.h b/...e/fastdds/rtps/security/logging/Logging.h → src/cpp/rtps/security/logging/Logging.h
@@ -23,8 +23,8 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/security/logging/BuiltinLoggingType.h>
-#include <fastdds/rtps/security/logging/LogOptions.h>
+#include <rtps/security/logging/BuiltinLoggingType.h>
+#include <rtps/security/logging/LogOptions.h>
 #include <rtps/security/exceptions/SecurityException.h>
 
 namespace eprosima {

diff --git a/...tdds/rtps/security/logging/LoggingLevel.h → src/cpp/rtps/security/logging/LoggingLevel.h b/...tdds/rtps/security/logging/LoggingLevel.h → src/cpp/rtps/security/logging/LoggingLevel.h
diff --git a/...dds/rtps/security/logging/NameValuePair.h → ...cpp/rtps/security/logging/NameValuePair.h b/...dds/rtps/security/logging/NameValuePair.h → ...cpp/rtps/security/logging/NameValuePair.h
diff --git a/src/cpp/security/authentication/PKIDH.cpp b/src/cpp/security/authentication/PKIDH.cpp
@@ -20,12 +20,12 @@
 // suppresses the warnings until true OpenSSL 3.0 APIs can be used.
 #define OPENSSL_API_COMPAT 10101
 
-#include <security/authentication/PKIDH.h>
-#include <security/authentication/PKIIdentityHandle.h>
-#include <fastdds/rtps/security/logging/Logging.h>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/messages/CDRMessage.h>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
+#include <fastdds/rtps/messages/CDRMessage.h>
+#include <rtps/security/logging/Logging.h>
+#include <security/authentication/PKIDH.h>
+#include <security/authentication/PKIIdentityHandle.h>
 
 #include <openssl/opensslv.h>
 

diff --git a/src/cpp/security/logging/LogTopic.h b/src/cpp/security/logging/LogTopic.h
@@ -23,8 +23,8 @@
 #include <memory>
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/security/logging/Logging.h>
-#include <fastdds/rtps/security/logging/BuiltinLoggingType.h>
+#include <rtps/security/logging/Logging.h>
+#include <rtps/security/logging/BuiltinLoggingType.h>
 
 #include <utils/collections/concurrent_queue.h>
 #include <utils/thread.hpp>

diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.h
@@ -20,11 +20,11 @@
 
 
 #include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/security/logging/Logging.h>
 #include <rtps/security/accesscontrol/AccessControl.h>
 #include <rtps/security/authentication/Authentication.h>
 #include <rtps/security/cryptography/Cryptography.h>
 #include <rtps/security/ISecurityPluginFactory.h>
+#include <rtps/security/logging/Logging.h>
 
 namespace eprosima {
 namespace fastrtps {