Minor fixes to YAML version

Signed-off-by: tempate <[email protected]>
eProsima · Nov 7, 2023 · eb78b59 · eb78b59
1 parent be486bc
commit eb78b59
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/ddsrouter_test/compose/test_cases/repeater/ddsrouter_edge_2.yaml b/ddsrouter_test/compose/test_cases/repeater/ddsrouter_edge_2.yaml
@@ -2,8 +2,6 @@ version: v4.0
 
 participants:
 
-
-
   - name: Simple_Participant
     kind: local
     domain: 0

diff --git a/ddsrouter_yaml/src/cpp/YamlReaderConfiguration.cpp b/ddsrouter_yaml/src/cpp/YamlReaderConfiguration.cpp
@@ -40,19 +40,19 @@ YamlReaderConfiguration::load_ddsrouter_configuration(
 
             switch (version)
             {
+                case ddspipe::yaml::YamlReaderVersion::V_4_0:
+                case ddspipe::yaml::YamlReaderVersion::LATEST:
+                    break;
+
                 case ddspipe::yaml::YamlReaderVersion::V_1_0:
                 case ddspipe::yaml::YamlReaderVersion::V_2_0:
                 case ddspipe::yaml::YamlReaderVersion::V_3_0:
                 case ddspipe::yaml::YamlReaderVersion::V_3_1:
+                default:
 
                     throw eprosima::utils::ConfigurationException(
                           utils::Formatter() <<
-                              "The specified yaml configuration version is no longer supported. Please update to v4.0.");
-                    break;
-
-                case ddspipe::yaml::YamlReaderVersion::V_4_0:
-                default:
-
+                              "The yaml configuration version " << version << " is no longer supported. Please update to v4.0.");
                     break;
             }
         }
@@ -111,7 +111,7 @@ YamlReaderConfiguration::load_ddsrouter_configuration_from_file(
 
 ddspipe::yaml::YamlReaderVersion YamlReaderConfiguration::default_yaml_version()
 {
-    return ddspipe::yaml::V_3_1;
+    return ddspipe::yaml::V_4_0;
 }
 
 } // namespace yaml