diff --git a/src/util/newconfig/ConfigConstraints.cpp b/src/util/newconfig/ConfigConstraints.cpp index 893cc2755..a45fc8185 100644 --- a/src/util/newconfig/ConfigConstraints.cpp +++ b/src/util/newconfig/ConfigConstraints.cpp @@ -22,8 +22,6 @@ #include "util/newconfig/Error.hpp" #include "util/newconfig/Types.hpp" -#include - #include #include #include diff --git a/src/util/newconfig/ConfigConstraints.hpp b/src/util/newconfig/ConfigConstraints.hpp index 7fd6b60be..fdfa6969d 100644 --- a/src/util/newconfig/ConfigConstraints.hpp +++ b/src/util/newconfig/ConfigConstraints.hpp @@ -88,7 +88,7 @@ class Constraint { // see here for more info: // https://stackoverflow.com/questions/72835571/constexpr-c-error-destructor-used-before-its-definition // https://godbolt.org/z/eMdWThaMY - constexpr virtual ~Constraint() noexcept {}; + constexpr virtual ~Constraint() noexcept = default; /** * @brief Check if the value meets the specific constraint. @@ -155,9 +155,8 @@ class Constraint { */ class PortConstraint final : public Constraint { public: - constexpr ~PortConstraint() - { - } + constexpr ~PortConstraint() override + = default; private: /** @@ -187,9 +186,8 @@ class PortConstraint final : public Constraint { */ class ValidIPConstraint final : public Constraint { public: - constexpr ~ValidIPConstraint() - { - } + constexpr ~ValidIPConstraint() override + = default; private: /** @@ -229,9 +227,8 @@ class OneOf final : public Constraint { { } - constexpr ~OneOf() - { - } + constexpr ~OneOf() override + = default; private: /** @@ -285,9 +282,8 @@ class NumberValueConstraint final : public Constraint { { } - constexpr ~NumberValueConstraint() - { - } + constexpr ~NumberValueConstraint() override + = default; private: /** @@ -328,9 +324,8 @@ class NumberValueConstraint final : public Constraint { */ class PositiveDouble final : public Constraint { public: - constexpr ~PositiveDouble() - { - } + constexpr ~PositiveDouble() override + = default; private: /** diff --git a/src/util/newconfig/ConfigFileJson.cpp b/src/util/newconfig/ConfigFileJson.cpp index 4451eccbd..d59671d38 100644 --- a/src/util/newconfig/ConfigFileJson.cpp +++ b/src/util/newconfig/ConfigFileJson.cpp @@ -133,7 +133,7 @@ void ConfigFileJson::flattenJson(boost::json::object const& obj, std::string const& prefix) { for (auto const& [key, value] : obj) { - std::string fullKey = prefix.empty() ? std::string(key) : fmt::format("{}.{}", prefix, std::string(key)); + std::string const fullKey = prefix.empty() ? std::string(key) : fmt::format("{}.{}", prefix, std::string(key)); // In ClioConfigDefinition, value must be a primitive or array if (value.is_object()) { @@ -141,7 +141,7 @@ ConfigFileJson::flattenJson(boost::json::object const& obj, std::string const& p } else if (value.is_array()) { auto const& arr = value.as_array(); for (std::size_t i = 0; i < arr.size(); ++i) { - std::string arrayPrefix = fullKey + ".[]"; + std::string const arrayPrefix = fullKey + ".[]"; if (arr[i].is_object()) { flattenJson(arr[i].as_object(), arrayPrefix); } else { diff --git a/tests/unit/util/newconfig/ArrayTests.cpp b/tests/unit/util/newconfig/ArrayTests.cpp index 98f2ac20a..f3facf2b4 100644 --- a/tests/unit/util/newconfig/ArrayTests.cpp +++ b/tests/unit/util/newconfig/ArrayTests.cpp @@ -47,11 +47,11 @@ TEST(ArrayTest, addAndCheckMultipleValues) EXPECT_EQ(arr.size(), 3); auto const cv = arr.at(0); - ValueView vv{cv}; + ValueView const vv{cv}; EXPECT_EQ(vv.asDouble(), 111.11); auto const cv2 = arr.at(1); - ValueView vv2{cv2}; + ValueView const vv2{cv2}; EXPECT_EQ(vv2.asDouble(), 222.22); EXPECT_EQ(arr.size(), 3); @@ -59,7 +59,7 @@ TEST(ArrayTest, addAndCheckMultipleValues) EXPECT_EQ(arr.size(), 4); auto const cv4 = arr.at(3); - ValueView vv4{cv4}; + ValueView const vv4{cv4}; EXPECT_EQ(vv4.asDouble(), 444.44); } diff --git a/tests/unit/util/newconfig/ClioConfigDefinitionTests.cpp b/tests/unit/util/newconfig/ClioConfigDefinitionTests.cpp index e92a7b38f..a7c4eb935 100644 --- a/tests/unit/util/newconfig/ClioConfigDefinitionTests.cpp +++ b/tests/unit/util/newconfig/ClioConfigDefinitionTests.cpp @@ -25,11 +25,9 @@ #include "util/newconfig/Types.hpp" #include "util/newconfig/ValueView.hpp" -#include #include #include #include -#include #include #include @@ -287,7 +285,7 @@ TEST_F(IncorrectOverrideValues, InvalidJsonErrors) EXPECT_TRUE(errors.has_value()); // Expected error messages - std::unordered_set expectedErrors{ + std::unordered_set const expectedErrors{ "dosguard.whitelist.[] value does not match type string", "higher.[].low.section key is required in user Config", "higher.[].low.admin key is required in user Config",