Apply clang-format to config code

Author: orshemesh-grok

src/core/config/config_registry.h

@@ -74,22 +74,19 @@ class config_registry {
      * @param key Configuration parameter key
      * @return Default value for the parameter
      */
-    template <typename T>
-    T get_default_value(const std::string &key) const
+    template <typename T> T get_default_value(const std::string &key) const
     {
         return get_value_impl<T>(
             key, [this](const std::string &k) { return get_default_value_as_any(k); });
     }
 
-
     /**
      * @brief Gets configured value. For integer types, also does bounds checking
      * @tparam T Value type
      * @param key Configuration parameter key
      * @return Current value for the parameter
      */
-    template <typename T>
-    T get_value(const std::string &key) const
+    template <typename T> T get_value(const std::string &key) const
     {
         return get_value_impl<T>(key, [this](const std::string &k) { return get_value_as_any(k); });
     }
@@ -99,12 +96,9 @@ class config_registry {
      * @param key Configuration parameter key
      * @return Current value for the parameter, as any
      */
-     std::experimental::any get_value_as_any(const std::string &key) const;
+    std::experimental::any get_value_as_any(const std::string &key) const;
 
-    const config_descriptor& get_config_descriptor() const
-    {
-        return m_config_descriptor;
-    }
+    const config_descriptor &get_config_descriptor() const { return m_config_descriptor; }
 
 private:
     std::map<std::string, std::experimental::any> m_config_data;

src/core/config/descriptor_providers/json_descriptor_provider.cpp

@@ -151,7 +151,7 @@ std::unique_ptr<parameter_descriptor> json_descriptor_provider::create_descripto
 
     // Create parameter descriptor with default value
     auto descriptor = std::make_unique<parameter_descriptor>(*analysis.default_value);
-    
+
     descriptor->set_title(analysis.title);
 
     // Apply constraints if present

src/core/config/descriptor_providers/schema_analyzer.cpp

@@ -13,7 +13,6 @@
 #include <algorithm>
 #include "vlogger/vlogger.h"
 
-
 static void for_each_oneof_option(json_object *one_of_field,
                                   std::function<void(json_object *)> func)
 {
@@ -168,10 +167,16 @@ std::string schema_analyzer::determine_title()
     json_object *title_field =
         json_utils::try_get_field(m_property_obj, config_strings::schema::JSON_TITLE);
     if (!title_field) {
+        // Enforce title definition only for leafs and arrays. Objects are exempt.
+        if (determine_value_type() != typeid(json_object *)) {
+            throw_xlio_exception("Title must be a defined for: " + m_path + " - " +
+                                 std::to_string(json_object_get_type(title_field)));
+        }
         return "TITLE-NOT-SET";
     }
     if (json_object_get_type(title_field) != json_type_string) {
-        throw_xlio_exception("Title must be a string for: " + m_path + " - " + std::to_string(json_object_get_type(title_field)));
+        throw_xlio_exception("Title must be a string for: " + m_path + " - " +
+                             std::to_string(json_object_get_type(title_field)));
     }
     return json_object_get_string(title_field);
 }

src/core/config/descriptors/config_descriptor.cpp

@@ -80,7 +80,7 @@ std::type_index config_descriptor::get_parent_expected_type(const std::string &k
     return typeid(std::map<std::string, std::experimental::any>);
 }
 
-const config_descriptor::parameter_map_t& config_descriptor::get_parameter_map() const
+const config_descriptor::parameter_map_t &config_descriptor::get_parameter_map() const
 {
     return parameter_map;
 }

src/core/config/descriptors/config_descriptor.h

@@ -21,7 +21,7 @@
 class config_descriptor {
 public:
     typedef std::map<std::string, parameter_descriptor> parameter_map_t;
-    
+
     /**
      * @brief Default constructor
      */
@@ -58,17 +58,17 @@ class config_descriptor {
     std::type_index get_parent_expected_type(const std::string &key) const;
 
     /**
-     * @brief Gets the parameter map, allowing external users to iterate 
+     * @brief Gets the parameter map, allowing external users to iterate
      *        over all parameters
      * @return The parameter map
      */
-    const parameter_map_t& get_parameter_map() const;
+    const parameter_map_t &get_parameter_map() const;
 
 private:
     /**
      * @brief Map from parameter name to its descriptor
      */
-     parameter_map_t parameter_map;
+    parameter_map_t parameter_map;
 
     /**
      * @brief Set of all parameter keys for efficient prefix-based lookups

src/core/config/descriptors/parameter_descriptor.cpp

@@ -12,13 +12,14 @@
 #include <climits>
 #include <sstream>
 #include <cctype>
+#include <numeric>
 
-void parameter_descriptor::set_title(const std::string& title)
+void parameter_descriptor::set_title(const std::string &title)
 {
     m_title = title;
 }
 
-const std::string& parameter_descriptor::get_title() const
+const std::string &parameter_descriptor::get_title() const
 {
     return m_title;
 }
@@ -207,23 +208,19 @@ std::experimental::any parameter_descriptor::convert_string_to_int64(const std::
         return it->second;
     }
 
-    // If no string mappings are defined, throw an exception which has no further information 
+    // If no string mappings are defined, throw an exception which has no further information
     if (m_string_mapping.empty()) {
         throw std::experimental::bad_any_cast();
     }
 
-    // We have string mappings but value is not one of them - make an effort and create a nice error message
-    std::string valid_values;
+    // We have string mappings but value is not one of them - make an effort and create a nice error
+    // message
+    std::string valid_values = std::accumulate(
+        next(m_string_mapping.begin()), m_string_mapping.end(), m_string_mapping.begin()->first,
+        [](const std::string &a, const auto &b) { return a + "," + b.first; });
 
-    for (it = m_string_mapping.begin(); it != m_string_mapping.end(); ++it) {
-        valid_values += it->first;
-        if (std::next(it) != m_string_mapping.end()) { // avoid trailing delimiter
-            valid_values += ",";
-        }
-    }
-
-    //throw std::runtime_error so we can supply a usefull error message
-    throw std::runtime_error("Invalid value for " + m_title + ": " + val + ", not one of: [" + valid_values + "]");
+    throw std::runtime_error("Invalid value for " + m_title + ": " + val + ", not one of: [" +
+                             valid_values + "]");
 }
 
 std::experimental::any parameter_descriptor::get_value(bool val) const
@@ -258,14 +255,17 @@ std::string parameter_descriptor::convert_int64_to_mapped_string(int64_t val) co
     if (m_string_mapping.empty()) {
         return std::string();
     }
-    
+
     for (const auto &mapping : m_string_mapping) {
         if ((mapping.second.type() == typeid(int64_t)) &&
             (std::experimental::any_cast<int64_t>(mapping.second) == val)) {
             return mapping.first;
         }
     }
-    return std::to_string(val) + " (Invalid value)";
+
+    //throw std::runtime_error so we can supply a usefull error message
+    throw std::runtime_error("Invalid value for " + m_title + ": " + std::to_string(val) +
+                             " is not valid");
 }
 
 std::experimental::any parameter_descriptor::get_value(int64_t val) const

src/core/config/descriptors/parameter_descriptor.h

@@ -89,12 +89,12 @@ class parameter_descriptor {
      * @param title Title of the parameter
      */
 
-    void set_title(const std::string& title);
+    void set_title(const std::string &title);
     /**
      * @brief Gets the title of the parameter
      * @return Title of the parameter
      */
-    const std::string& get_title() const;
+    const std::string &get_title() const;
 
     /**
      * @brief Validates a value against all constraints
@@ -154,8 +154,8 @@ class parameter_descriptor {
      * @brief Converts an integer to a string per the string mappings set by set_string_mappings().
      * @param val Integer value to convert
      * @return Converted value. Empty string means no string mappings were set.
-               If mappings were set, but the value is not in the mappings, returns the value as a string
-               followed by "(Invalid value)".
+               If mappings were set, but the value is not in the mappings, returns the value as a
+     string followed by "(Invalid value)".
      */
     std::string convert_int64_to_mapped_string(int64_t val) const;
 
@@ -183,7 +183,7 @@ class parameter_descriptor {
     std::map<std::string, std::experimental::any> m_string_mapping; /**< String-to-value mappings */
     value_transformer_t m_value_transformer; /**< Value transformation function */
     std::type_index m_type;
-    std::string m_title;   /**< Title of the parameter as defined in schema */
+    std::string m_title; /**< Title of the parameter as defined in schema */
 
     /**
      * @brief Parses a memory size string with suffixes (KB, MB, GB)