Fix uncrustify

Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>

Author: David-LP99

ddspipe_yaml/include/ddspipe_yaml/YamlValidator.hpp

@@ -60,7 +60,7 @@ class DDSPIPE_YAML_DllAPI YamlValidator
             const std::string& value);
 
 public:
-    
+
     enum class InputType
     {
         FROM_STRING,
@@ -98,7 +98,8 @@ class DDSPIPE_YAML_DllAPI YamlValidator
      * @brief Move assignment operator. Needed because \c std::unique_ptr needs the full definition
      * of \c nlohmann::json_schema::json_validator when move-assigning (the old value is destroyed).
      */
-    YamlValidator& operator=(YamlValidator&&);
+    YamlValidator& operator =(
+            YamlValidator&&);
 
     /**
      * @brief Set or replace the root schema of the validator.

ddspipe_yaml/src/cpp/YamlValidator.cpp

@@ -58,16 +58,17 @@ YamlValidator::YamlValidator()
 }
 
 YamlValidator::YamlValidator(
-            InputType input_type,
-            const std::string& schema_string)
+        InputType input_type,
+        const std::string& schema_string)
     : validator(std::make_unique<nlohmann::json_schema::json_validator>(nullptr, format_checker))
 {
     this->set_schema(input_type, schema_string);
 }
 
 YamlValidator::~YamlValidator() = default;
 
-YamlValidator& YamlValidator::operator=(YamlValidator&&) = default;
+YamlValidator& YamlValidator::operator =(
+        YamlValidator&&) = default;
 
 void YamlValidator::set_schema(
         InputType input_type,
@@ -77,34 +78,34 @@ void YamlValidator::set_schema(
 
     switch (input_type)
     {
-    case InputType::FROM_FILE: // Treat input string as the path to the file with the schema
-        try
-        {
-            std::ifstream schema_file;
-            schema_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
-            schema_file.open(schema_string);
-            schema = nlohmann::json::parse(schema_file);
-        }
-        catch (const std::exception& e)
-        {
-            throw eprosima::utils::ConfigurationException(
-                    utils::Formatter() << "Error occured while loading JSON schema from file: "
-                                       << schema_string << " :\n" << e.what());
-        }
-        break;
-    
-    case InputType::FROM_STRING: // Treat input string as the raw schema
-        try
-        {
-            schema = nlohmann::json::parse(schema_string);
-        }
-        catch (const std::exception& e)
-        {
-            throw eprosima::utils::ConfigurationException(
-                    utils::Formatter() << "Error occured while loading JSON schema from input string:\n"
-                                       << e.what());
-        }
-        break;
+        case InputType::FROM_FILE: // Treat input string as the path to the file with the schema
+            try
+            {
+                std::ifstream schema_file;
+                schema_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
+                schema_file.open(schema_string);
+                schema = nlohmann::json::parse(schema_file);
+            }
+            catch (const std::exception& e)
+            {
+                throw eprosima::utils::ConfigurationException(
+                          utils::Formatter() << "Error occured while loading JSON schema from file: "
+                                             << schema_string << " :\n" << e.what());
+            }
+            break;
+
+        case InputType::FROM_STRING: // Treat input string as the raw schema
+            try
+            {
+                schema = nlohmann::json::parse(schema_string);
+            }
+            catch (const std::exception& e)
+            {
+                throw eprosima::utils::ConfigurationException(
+                          utils::Formatter() << "Error occured while loading JSON schema from input string:\n"
+                                             << e.what());
+            }
+            break;
     }
 
     // Set the validator schema
@@ -149,77 +150,78 @@ bool YamlValidator::validate_YAML(
 
     // Create lambda function to convert from YAML to JSON
     auto yaml_to_json = [](auto&& self, const Yaml& yml) -> nlohmann::json
-    {
-        if (yml.IsNull())
-        {
-            return nullptr;
-        }
-
-        if (yml.IsScalar())
-        {
-            // The only allowed scalar types are: boolean, integer, number (double) and string
-            const std::string value = yml.as<std::string>();
-
-            if (value == "true")
             {
-                return true;
-            }
-            if (value == "false")
-            {
-                return false;
-            }
-
-            try
-            {
-                return yml.as<int>();
-            } catch (...)
-            {
-            }
-            try
-            {
-                return yml.as<double>();
-            } catch (...)
-            {
-            }
-
-            return value;
-        }
-
-        if (yml.IsSequence())
-        {
-            nlohmann::json array = nlohmann::json::array();
-            for (const auto& item : yml)
-            {
-                array.push_back(self(self, item));
-            }
-            return array;
-        }
-
-        if (yml.IsMap())
-        {
-            nlohmann::json object = nlohmann::json::object();
-            for (const auto& item : yml)
-            {
-                std::string key = item.first.as<std::string>();
-                object[key] = self(self, item.second);
-            }
-            return object;
-        }
-
-        std::string yml_as_string;
-        try
-        {
-            yml_as_string = yml.as<std::string>();
-        }
-        catch (...)
-        {
-            throw eprosima::utils::ConfigurationException("Unsupported YAML file, cannot be converted to JSON.");
-        }
-
-        throw eprosima::utils::ConfigurationException(
-                utils::Formatter() << "Unsupported YAML file, cannot be converted to JSON.\n"
-                                    << "Error in node: " << yml_as_string);
-    };
+                if (yml.IsNull())
+                {
+                    return nullptr;
+                }
+
+                if (yml.IsScalar())
+                {
+                    // The only allowed scalar types are: boolean, integer, number (double) and string
+                    const std::string value = yml.as<std::string>();
+
+                    if (value == "true")
+                    {
+                        return true;
+                    }
+                    if (value == "false")
+                    {
+                        return false;
+                    }
+
+                    try
+                    {
+                        return yml.as<int>();
+                    } catch (...)
+                    {
+                    }
+                    try
+                    {
+                        return yml.as<double>();
+                    } catch (...)
+                    {
+                    }
+
+                    return value;
+                }
+
+                if (yml.IsSequence())
+                {
+                    nlohmann::json array = nlohmann::json::array();
+                    for (const auto& item : yml)
+                    {
+                        array.push_back(self(self, item));
+                    }
+                    return array;
+                }
+
+                if (yml.IsMap())
+                {
+                    nlohmann::json object = nlohmann::json::object();
+                    for (const auto& item : yml)
+                    {
+                        std::string key = item.first.as<std::string>();
+                        object[key] = self(self, item.second);
+                    }
+                    return object;
+                }
+
+                std::string yml_as_string;
+                try
+                {
+                    yml_as_string = yml.as<std::string>();
+                }
+                catch (...)
+                {
+                    throw eprosima::utils::ConfigurationException(
+                              "Unsupported YAML file, cannot be converted to JSON.");
+                }
+
+                throw eprosima::utils::ConfigurationException(
+                          utils::Formatter() << "Unsupported YAML file, cannot be converted to JSON.\n"
+                                             << "Error in node: " << yml_as_string);
+            };
 
     // Covert YAML to JSON
     nlohmann::json instance = yaml_to_json(yaml_to_json, yml);

ddspipe_yaml/test/unittest/yaml_validator/YamlValidatorTest.cpp

@@ -34,7 +34,8 @@ std::string invalid_schema_path_1 = "./test_yaml_files/valid_draft07_schema.json
 std::string invalid_schema_path_2 = "./invalid_json_schema.json";
 std::string invalid_schema_path_3 = "./invalid_draft07_schema.json";
 
-std::string valid_schema_string= R"(
+std::string valid_schema_string =
+        R"(
 {
     "$schema":"http://json-schema.org/draft-07/schema#",
     "type":"object",
@@ -54,7 +55,8 @@ std::string valid_schema_string= R"(
 }
 )";
 
-std::string invalid_schema_string= R"(
+std::string invalid_schema_string =
+        R"(
 {
     "$schema":"http://json-schema.org/draft-07/schema#",
     "properties":["not", "an", "object"]
@@ -88,7 +90,7 @@ std::vector<std::string> invalid_files = {
  *  constructor with path to file: invalid path                                    -> ConfigurationException
  *  constructor with path to file: valid path and invalid file                     -> ConfigurationException
  *  constructor with path to file: valid path and valid file, but not json draft07 -> ConfigurationException
- * 
+ *
  *  constructor with string with file content: valid file                          -> no exception
  *  constructor with string with file content: valid file, but not json draft07    -> ConfigurationException
  */
@@ -99,22 +101,25 @@ TEST(YamlValidatorTest, constructors)
 
     // constructor with path to file: valid path and file
     {
-        ASSERT_NO_THROW(validator = YamlValidator(YamlValidator::InputType::FROM_FILE, test::valid_schema_path););
+        ASSERT_NO_THROW(validator = YamlValidator(YamlValidator::InputType::FROM_FILE, test::valid_schema_path));
     }
 
     // constructor with path to file: invalid path
     {
-        ASSERT_THROW(validator = YamlValidator(YamlValidator::InputType::FROM_FILE, test::invalid_schema_path_1), utils::ConfigurationException);
+        ASSERT_THROW(validator = YamlValidator(YamlValidator::InputType::FROM_FILE, test::invalid_schema_path_1),
+                utils::ConfigurationException);
     }
 
     // constructor with path to file: valid path and invalid file
     {
-        ASSERT_THROW(validator = YamlValidator(YamlValidator::InputType::FROM_FILE, test::invalid_schema_path_2), utils::ConfigurationException);
+        ASSERT_THROW(validator = YamlValidator(YamlValidator::InputType::FROM_FILE, test::invalid_schema_path_2),
+                utils::ConfigurationException);
     }
 
     // constructor with path to file: valid path and valid file, but not json draft07
     {
-        ASSERT_THROW(validator = YamlValidator(YamlValidator::InputType::FROM_FILE, test::invalid_schema_path_3), utils::ConfigurationException);
+        ASSERT_THROW(validator = YamlValidator(YamlValidator::InputType::FROM_FILE, test::invalid_schema_path_3),
+                utils::ConfigurationException);
     }
 
     // constructor with string with file content: valid file
@@ -124,7 +129,8 @@ TEST(YamlValidatorTest, constructors)
 
     // constructor with string with file content: valid file, but not json draft07
     {
-        ASSERT_THROW(validator = YamlValidator(YamlValidator::InputType::FROM_STRING, test::invalid_schema_string), utils::ConfigurationException);
+        ASSERT_THROW(validator = YamlValidator(YamlValidator::InputType::FROM_STRING, test::invalid_schema_string),
+                utils::ConfigurationException);
     }
 }