Fix changes after rebase

Signed-off-by: Lucia Echevarria <luciaechevarria@eprosima.com>
eProsima · Sep 19, 2024 · 101604b · 101604b
1 parent 5086a11
commit 101604b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 81 deletions.
diff --git a/ddspipe_yaml/src/cpp/YamlReader_features.cpp b/ddspipe_yaml/src/cpp/YamlReader_features.cpp
@@ -238,7 +238,7 @@ core::TopicRoutesConfiguration YamlReader::get(
     return object;
 }
 
-/**************************
+/*************************
 * Monitor Configuration  *
 **************************/
 
@@ -308,8 +308,7 @@ void YamlReader::fill(
         MONITOR_PERIOD_TAG,
         DDS_PUBLISHING_ENABLE_TAG,
         DDS_PUBLISHING_DOMAIN_TAG,
-        DDS_PUBLISHING_TOPIC_NAME_TAG,
-        DDS_PUBLISHING_PUBLISH_TYPE_TAG};
+        DDS_PUBLISHING_TOPIC_NAME_TAG};
 
     /////
     // Get optional monitor status tag

diff --git a/ddspipe_yaml/src/cpp/YamlReader_generic.cpp b/ddspipe_yaml/src/cpp/YamlReader_generic.cpp
@@ -25,16 +25,12 @@
 #include <ddspipe_core/types/dds/GuidPrefix.hpp>
 #include <ddspipe_core/types/participant/ParticipantId.hpp>
 
-#include <ddspipe_participants/types/address/Address.hpp>
-#include <ddspipe_participants/types/security/tls/TlsConfiguration.hpp>
-
 #include <ddspipe_participants/configuration/DiscoveryServerParticipantConfiguration.hpp>
+#include <ddspipe_participants/configuration/EchoParticipantConfiguration.hpp>
 #include <ddspipe_participants/configuration/InitialPeersParticipantConfiguration.hpp>
 #include <ddspipe_participants/configuration/ParticipantConfiguration.hpp>
-#include <ddspipe_participants/configuration/EchoParticipantConfiguration.hpp>
 #include <ddspipe_participants/configuration/SimpleParticipantConfiguration.hpp>
 #include <ddspipe_participants/types/address/Address.hpp>
-#include <ddspipe_participants/types/address/DiscoveryServerConnectionAddress.hpp>
 #include <ddspipe_participants/types/security/tls/TlsConfiguration.hpp>
 
 #include <ddspipe_yaml/Yaml.hpp>

diff --git a/ddspipe_yaml/src/cpp/YamlReader_participants.cpp b/ddspipe_yaml/src/cpp/YamlReader_participants.cpp
@@ -24,17 +24,13 @@
 #include <ddspipe_core/types/dds/GuidPrefix.hpp>
 #include <ddspipe_core/types/participant/ParticipantId.hpp>
 
-#include <ddspipe_participants/types/address/Address.hpp>
-#include <ddspipe_participants/types/security/tls/TlsConfiguration.hpp>
-
 #include <ddspipe_participants/configuration/DiscoveryServerParticipantConfiguration.hpp>
+#include <ddspipe_participants/configuration/EchoParticipantConfiguration.hpp>
 #include <ddspipe_participants/configuration/InitialPeersParticipantConfiguration.hpp>
-#include <ddspipe_participants/configuration/XmlParticipantConfiguration.hpp>
 #include <ddspipe_participants/configuration/ParticipantConfiguration.hpp>
-#include <ddspipe_participants/configuration/EchoParticipantConfiguration.hpp>
 #include <ddspipe_participants/configuration/SimpleParticipantConfiguration.hpp>
+#include <ddspipe_participants/configuration/XmlParticipantConfiguration.hpp>
 #include <ddspipe_participants/types/address/Address.hpp>
-#include <ddspipe_participants/types/address/DiscoveryServerConnectionAddress.hpp>
 #include <ddspipe_participants/types/security/tls/TlsConfiguration.hpp>
 
 #include <ddspipe_yaml/Yaml.hpp>

diff --git a/ddspipe_yaml/src/cpp/YamlReader_types.cpp b/ddspipe_yaml/src/cpp/YamlReader_types.cpp
@@ -340,69 +340,6 @@ Address YamlReader::get<Address>(
     }
 }
 
-DiscoveryServerConnectionAddress _get_discovery_server_connection_address_v1(
-        const Yaml& yml,
-        const YamlReaderVersion version)
-{
-    // GuidPrefix required
-    GuidPrefix server_guid = YamlReader::get<GuidPrefix>(yml, version);
-
-    // Addresses required
-    std::set<Address> addresses = YamlReader::get_set<Address>(yml, COLLECTION_ADDRESSES_TAG, version);
-
-    // Create Connection Address
-    return DiscoveryServerConnectionAddress(server_guid, addresses);
-}
-
-DiscoveryServerConnectionAddress _get_discovery_server_connection_address_latest(
-        const Yaml& yml,
-        const YamlReaderVersion version)
-{
-    // GuidPrefix required
-    GuidPrefix server_guid = YamlReader::get<GuidPrefix>(yml, DISCOVERY_SERVER_GUID_PREFIX_TAG, version);
-
-    // Addresses required
-    std::set<Address> addresses = YamlReader::get_set<Address>(yml, COLLECTION_ADDRESSES_TAG, version);
-
-    // Create Connection Address
-    return DiscoveryServerConnectionAddress(server_guid, addresses);
-}
-
-template <>
-DDSPIPE_YAML_DllAPI
-bool YamlValidator::validate<DiscoveryServerConnectionAddress>(
-        const Yaml& yml,
-        const YamlReaderVersion& version)
-{
-    std::set<TagType> tags{
-        COLLECTION_ADDRESSES_TAG};
-
-    if (version != V_1_0)
-    {
-        tags.insert(DISCOVERY_SERVER_GUID_PREFIX_TAG);
-    }
-
-    return YamlValidator::validate_tags(yml, tags);
-}
-
-template <>
-DDSPIPE_YAML_DllAPI
-DiscoveryServerConnectionAddress YamlReader::get<DiscoveryServerConnectionAddress>(
-        const Yaml& yml,
-        const YamlReaderVersion version)
-{
-    YamlValidator::validate<DiscoveryServerConnectionAddress>(yml, version);
-
-    switch (version)
-    {
-        case V_1_0:
-            return _get_discovery_server_connection_address_v1(yml, version);
-
-        default:
-            return _get_discovery_server_connection_address_latest(yml, version);
-    }
-}
-
 template <>
 DDSPIPE_YAML_DllAPI
 void YamlReader::fill(
@@ -435,8 +372,7 @@ bool YamlValidator::validate<core::DdsPublishingConfiguration>(
     static const std::set<TagType> tags{
         DDS_PUBLISHING_ENABLE_TAG,
         DDS_PUBLISHING_DOMAIN_TAG,
-        DDS_PUBLISHING_TOPIC_NAME_TAG,
-        DDS_PUBLISHING_PUBLISH_TYPE_TAG};
+        DDS_PUBLISHING_TOPIC_NAME_TAG};
 
     return YamlValidator::validate_tags(yml, tags);
 }

diff --git a/ddspipe_yaml/src/cpp/YamlValidator.cpp b/ddspipe_yaml/src/cpp/YamlValidator.cpp
@@ -46,7 +46,7 @@ bool YamlValidator::validate_tags(
         // Check if the tag is valid
         if (!valid_tags.count(tag_name))
         {
-            logWarning(DDSPIPE_YAML, "Tag <" << tag_name << "> is not a valid tag (" << get_position_(tag) << ").");
+            EPROSIMA_LOG_WARNING(DDSPIPE_YAML, "Tag <" << tag_name << "> is not a valid tag (" << get_position_(tag) << ").");
             is_valid = false;
         }
 
@@ -55,7 +55,7 @@ bool YamlValidator::validate_tags(
 
         if (tags_count[tag_name] > 1)
         {
-            logWarning(DDSPIPE_YAML, "Tag <" << tag_name << "> is repeated (" << get_position_(tag) << ").");
+            EPROSIMA_LOG_WARNING(DDSPIPE_YAML, "Tag <" << tag_name << "> is repeated (" << get_position_(tag) << ").");
             is_valid = false;
         }
     }