[21266] Example refactor: Security

examples/CMakeLists.txt

@@ -23,3 +23,7 @@ add_subdirectory(cpp/discovery_server)
 add_subdirectory(cpp/hello_world)
 add_subdirectory(cpp/rtps)
 add_subdirectory(cpp/xtypes)
+
+if (SECURITY)
+    add_subdirectory(cpp/security)
+endif()

examples/cpp/configuration/Application.hpp

@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_CONFIGURATION_APPLICATION_HPP_
-#define _FASTDDS_CONFIGURATION_APPLICATION_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CONFIGURATION__APPLICATION_HPP
+#define FASTDDS_EXAMPLES_CPP_CONFIGURATION__APPLICATION_HPP
 
 #include <atomic>
 
@@ -52,4 +52,4 @@ class Application
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_CONFIGURATION_APPLICATION_HPP_ */
+#endif // FASTDDS_EXAMPLES_CPP_CONFIGURATION__APPLICATION_HPP

examples/cpp/configuration/CLIParser.hpp

@@ -21,8 +21,8 @@
 #include <fastdds/rtps/attributes/BuiltinTransports.hpp>
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 
-#ifndef _FASTDDS_CONFIGURATION_CLI_PARSER_HPP_
-#define _FASTDDS_CONFIGURATION_CLI_PARSER_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CONFIGURATION__CLIPARSER_HPP
+#define FASTDDS_EXAMPLES_CPP_CONFIGURATION__CLIPARSER_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -1137,4 +1137,4 @@ class CLIParser
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_CONFIGURATION_CLI_PARSER_HPP_
+#endif // FASTDDS_EXAMPLES_CPP_CONFIGURATION__CLIPARSER_HPP

examples/cpp/configuration/PublisherApp.cpp

@@ -35,6 +35,8 @@
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
 
+#include "ConfigurationPubSubTypes.hpp"
+
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
 

examples/cpp/configuration/PublisherApp.hpp

@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_CONFIGURATION_PUBLISHER_APP_HPP_
-#define _FASTDDS_CONFIGURATION_PUBLISHER_APP_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CONFIGURATION__PUBLISHERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_CONFIGURATION__PUBLISHERAPP_HPP
 
 
 #include <condition_variable>
@@ -29,7 +29,7 @@
 
 #include "Application.hpp"
 #include "CLIParser.hpp"
-#include "ConfigurationPubSubTypes.hpp"
+#include "Configuration.hpp"
 
 using namespace eprosima::fastdds::dds;
 
@@ -118,4 +118,4 @@ class PublisherApp : public Application, public DataWriterListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_CONFIGURATION_PUBLISHER_APP_HPP_ */
+#endif // FASTDDS_EXAMPLES_CPP_CONFIGURATION__PUBLISHERAPP_HPP

examples/cpp/configuration/SubscriberApp.hpp

@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_CONFIGURATION_SUBSCRIBER_APP_HPP_
-#define _FASTDDS_CONFIGURATION_SUBSCRIBER_APP_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CONFIGURATION__SUBSCRIBERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_CONFIGURATION__SUBSCRIBERAPP_HPP
 
 #include <atomic>
 #include <condition_variable>
@@ -32,7 +32,7 @@
 
 #include "Application.hpp"
 #include "CLIParser.hpp"
-#include "ConfigurationPubSubTypes.hpp"
+#include "Configuration.hpp"
 
 using namespace eprosima::fastdds::dds;
 
@@ -123,4 +123,4 @@ class SubscriberApp : public Application,  public DataReaderListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_CONFIGURATION_SUBSCRIBER_APP_HPP_ */
+#endif // FASTDDS_EXAMPLES_CPP_CONFIGURATION__SUBSCRIBERAPP_HPP

examples/cpp/content_filter/Application.hpp

@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_CONTENT_FILTER_APPLICATION_HPP_
-#define _FASTDDS_CONTENT_FILTER_APPLICATION_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__APPLICATION_HPP
+#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__APPLICATION_HPP
 
 #include <atomic>
 
@@ -53,4 +53,4 @@ class Application
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_CONTEN_FILTER_APPLICATION_HPP_ */
+#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__APPLICATION_HPP

examples/cpp/content_filter/CLIParser.hpp

@@ -19,8 +19,8 @@
 
 #include <fastdds/dds/log/Log.hpp>
 
-#ifndef _FASTDDS_CONTENT_FILTER_CLI_PARSER_HPP_
-#define _FASTDDS_CONTENT_FILTER_CLI_PARSER_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CLIPARSER_HPP
+#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CLIPARSER_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -465,4 +465,4 @@ class CLIParser
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_CONTENT_FILTER_CLI_PARSER_HPP_
+#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CLIPARSER_HPP

examples/cpp/content_filter/CustomContentFilter.hpp

@@ -1,5 +1,5 @@
-#ifndef _FASTDDS_CONTENT_FILTER_CUSTOM_FILTER_HPP_
-#define _FASTDDS_CONTENT_FILTER_CUSTOM_FILTER_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTER_HPP
+#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTER_HPP
 
 #include <fastcdr/Cdr.h>
 
@@ -78,4 +78,4 @@ class CustomContentFilter : public eprosima::fastdds::dds::IContentFilter
 
 };
 
-#endif // _FASTDDS_CONTENT_FILTER_CUSTOM_FILTER_HPP_
+#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTER_HPP

examples/cpp/content_filter/CustomContentFilterFactory.hpp

@@ -1,5 +1,5 @@
-#ifndef _FASTDDS_CONTENT_FILTER_CUSTOM_FILTER_FACTORY_HPP_
-#define _FASTDDS_CONTENT_FILTER_CUSTOM_FILTER_FACTORY_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTERFACTORY_HPP
+#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTERFACTORY_HPP
 
 #include <fastdds/dds/topic/IContentFilter.hpp>
 #include <fastdds/dds/topic/IContentFilterFactory.hpp>
@@ -88,4 +88,4 @@ class CustomContentFilterFactory : public eprosima::fastdds::dds::IContentFilter
     }
 
 };
-#endif // _FASTDDS_CONTENT_FILTER_CUSTOM_FILTER_FACTORY_HPP_
+#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTERFACTORY_HPP

examples/cpp/content_filter/PublisherApp.cpp

@@ -31,6 +31,7 @@
 #include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
+#include "HelloWorldPubSubTypes.hpp"
 #include "HelloWorldTypeObjectSupport.hpp"
 
 namespace eprosima {

examples/cpp/content_filter/PublisherApp.hpp

@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_CONTENT_FILTER_PUBLISHER_APP_HPP_
-#define _FASTDDS_CONTENT_FILTER_PUBLISHER_APP_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__PUBLISHERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__PUBLISHERAPP_HPP
 
 #include <condition_variable>
 
@@ -28,7 +28,7 @@
 
 #include "Application.hpp"
 #include "CLIParser.hpp"
-#include "HelloWorldPubSubTypes.hpp"
+#include "HelloWorld.hpp"
 
 using namespace eprosima::fastdds::dds;
 
@@ -95,4 +95,4 @@ class PublisherApp : public Application, public DataWriterListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_CONTENT_FILTER_PUBLISHER_APP_HPP_
+#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__PUBLISHERAPP_HPP

examples/cpp/content_filter/SubscriberApp.cpp

@@ -31,6 +31,7 @@
 #include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
+#include "HelloWorldPubSubTypes.hpp"
 #include "HelloWorldTypeObjectSupport.hpp"
 
 namespace eprosima {

examples/cpp/content_filter/SubscriberApp.hpp

@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_CONTENT_FILTER_SUBSCRIBER_APP_HPP_
-#define _FASTDDS_CONTENT_FILTER_SUBSCRIBER_APP_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__SUBSCRIBERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__SUBSCRIBERAPP_HPP
 
 #include <atomic>
 #include <condition_variable>
@@ -35,8 +35,8 @@
 
 #include "Application.hpp"
 #include "CLIParser.hpp"
-#include "HelloWorldPubSubTypes.hpp"
 #include "CustomContentFilterFactory.hpp"
+#include "HelloWorld.hpp"
 
 using namespace eprosima::fastdds::dds;
 namespace eprosima {
@@ -107,4 +107,4 @@ class SubscriberApp : public Application, public DataReaderListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_CONTENT_FILTER_SUBSCRIBER_APP_HPP_
+#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__SUBSCRIBERAPP_HPP

examples/cpp/custom_payload_pool/Application.hpp

@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_CUSTOM_PAYLOAD_POOL_APPLICATION_HPP_
-#define _FASTDDS_CUSTOM_PAYLOAD_POOL_APPLICATION_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__APPLICATION_HPP
+#define FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__APPLICATION_HPP
 
 #include <atomic>
 
@@ -53,4 +53,4 @@ class Application
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_CUSTOM_PAYLOAD_POOL_APPLICATION_HPP_ */
+#endif // FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__APPLICATION_HPP

examples/cpp/custom_payload_pool/CLIParser.hpp

@@ -18,8 +18,8 @@
 
 #include <fastdds/dds/log/Log.hpp>
 
-#ifndef _FASTDDS_CUSTOM_PAYLOAD_POOL_CLI_PARSER_HPP_
-#define _FASTDDS_CUSTOM_PAYLOAD_POOL_CLI_PARSER_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CLIPARSER_HPP
+#define FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CLIPARSER_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -329,4 +329,4 @@ class CLIParser
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_CUSTOM_PAYLOAD_POOL_CLI_PARSER_HPP_
+#endif // FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CLIPARSER_HPP

examples/cpp/custom_payload_pool/CustomPayloadPool.hpp

@@ -16,8 +16,8 @@
  * @file CustomPayloadPool.hpp
  */
 
-#ifndef _FASTDDS_CUSTOM_PAYLOAD_POOL_HPP_
-#define _FASTDDS_CUSTOM_PAYLOAD_POOL_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CUSTOMPAYLOADPOOL_HPP
+#define FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CUSTOMPAYLOADPOOL_HPP
 
 #include <assert.h>
 #include <stdio.h>
@@ -97,4 +97,4 @@ class CustomPayloadPool : public eprosima::fastdds::rtps::IPayloadPool
 
 };
 
-#endif  // _FASTDDS_CUSTOM_PAYLOAD_POOL_HPP_
+#endif  // FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CUSTOMPAYLOADPOOL_HPP

examples/cpp/custom_payload_pool/PublisherApp.cpp

@@ -28,6 +28,8 @@
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/publisher/qos/PublisherQos.hpp>
 
+#include "HelloWorldPubSubTypes.hpp"
+
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
 

examples/cpp/custom_payload_pool/PublisherApp.hpp

@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_CUSTOM_PAYLOAD_POOL_PUBLISHER_HPP_
-#define _FASTDDS_CUSTOM_PAYLOAD_POOL_PUBLISHER_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__PUBLISHERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__PUBLISHERAPP_HPP
 
 #include <condition_variable>
 #include <mutex>
@@ -30,7 +30,7 @@
 #include "Application.hpp"
 #include "CLIParser.hpp"
 #include "CustomPayloadPool.hpp"
-#include "HelloWorldPubSubTypes.hpp"
+#include "HelloWorld.hpp"
 
 using namespace eprosima::fastdds::dds;
 
@@ -103,4 +103,4 @@ class PublisherApp : public Application, public DataWriterListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_CUSTOM_PAYLOAD_POOL_PUBLISHER_H_ */
+#endif // FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__PUBLISHERAPP_HPP

examples/cpp/custom_payload_pool/SubscriberApp.cpp

@@ -30,6 +30,8 @@
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 
+#include "HelloWorldPubSubTypes.hpp"
+
 using namespace eprosima::fastdds::dds;
 namespace eprosima {
 namespace fastdds {

examples/cpp/custom_payload_pool/SubscriberApp.hpp

@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_CUSTOM_PAYLOAD_POOL_SUBSCRIBER_HPP_
-#define _FASTDDS_CUSTOM_PAYLOAD_POOL_SUBSCRIBER_HPP_
+#ifndef FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__SUBSCRIBERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__SUBSCRIBERAPP_HPP
 
 #include <condition_variable>
 #include <mutex>
@@ -31,7 +31,7 @@
 #include "Application.hpp"
 #include "CLIParser.hpp"
 #include "CustomPayloadPool.hpp"
-#include "HelloWorldPubSubTypes.hpp"
+#include "HelloWorld.hpp"
 
 using namespace eprosima::fastdds::dds;
 namespace eprosima {
@@ -101,4 +101,4 @@ class SubscriberApp : public Application,  public DataReaderListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_CUSTOM_PAYLOAD_POOL_SUBSCRIBER_HPP_ */
+#endif // FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__SUBSCRIBERAPP_HPP

examples/cpp/dds/CMakeLists.txt

@@ -22,7 +22,3 @@ add_subdirectory(RequestReplyExample)
 add_subdirectory(StaticHelloWorldExample)
 add_subdirectory(WriterLoansExample)
 add_subdirectory(ZeroCopyExample)
-
-if(SECURITY)
-    add_subdirectory(SecureHelloWorldExample)
-endif()

examples/cpp/dds/DynamicHelloWorldExample/HelloWorldPublisher.h

@@ -17,11 +17,10 @@
  *
  */
 
-#ifndef HELLOWORLDPUBLISHER_H_
-#define HELLOWORLDPUBLISHER_H_
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLOWORLDPUBLISHER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLOWORLDPUBLISHER_H
 
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
-
 #include <fastdds/dds/publisher/DataWriterListener.hpp>
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 
@@ -90,4 +89,4 @@ class HelloWorldPublisher
 
 
 
-#endif /* HELLOWORLDPUBLISHER_H_ */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLOWORLDPUBLISHER_H

examples/cpp/dds/DynamicHelloWorldExample/HelloWorldSubscriber.h

@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef HELLOWORLDSUBSCRIBER_H_
-#define HELLOWORLDSUBSCRIBER_H_
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLOWORLDSUBSCRIBER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLOWORLDSUBSCRIBER_H
 
 #include <atomic>
 #include <condition_variable>
@@ -112,4 +112,4 @@ class HelloWorldSubscriber
 
 };
 
-#endif /* HELLOWORLDSUBSCRIBER_H_ */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLOWORLDSUBSCRIBER_H