Format fix

src/configuration/actions_parser.cpp

@@ -15,8 +15,8 @@
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
 #include "configuration/common/configuration_collector.hpp"
-#include "log.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "log.hpp"
 #include "uri_utils.hpp"
 
 namespace ddwaf {

src/configuration/common/common.hpp

@@ -8,8 +8,8 @@
 
 #include <string>
 
-#include "exception.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "exception.hpp"
 #include "ruleset_info.hpp"
 
 using base_section_info = ddwaf::base_ruleset_info::base_section_info;

src/configuration/common/expression_parser.cpp

@@ -21,6 +21,7 @@
 #include "configuration/common/common.hpp"
 #include "configuration/common/expression_parser.hpp"
 #include "configuration/common/matcher_parser.hpp"
+#include "configuration/common/raw_configuration.hpp"
 #include "configuration/common/transformer_parser.hpp"
 #include "exception.hpp"
 #include "expression.hpp"
@@ -34,7 +35,6 @@
 #include "matcher/lower_than.hpp"
 #include "matcher/phrase_match.hpp"
 #include "matcher/regex_match.hpp"
-#include "configuration/common/raw_configuration.hpp"
 #include "target_address.hpp"
 #include "transformer/base.hpp"
 #include "utils.hpp"

src/configuration/common/expression_parser.hpp

@@ -7,8 +7,8 @@
 #pragma once
 
 #include "configuration/common/common.hpp"
-#include "expression.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "expression.hpp"
 
 namespace ddwaf {
 

src/configuration/common/matcher_parser.cpp

@@ -18,6 +18,7 @@
 
 #include "configuration/common/common.hpp"
 #include "configuration/common/matcher_parser.hpp" // IWYU pragma: keep
+#include "configuration/common/raw_configuration.hpp"
 #include "ddwaf.h"
 #include "exception.hpp"
 #include "matcher/base.hpp"
@@ -30,7 +31,6 @@
 #include "matcher/lower_than.hpp"
 #include "matcher/phrase_match.hpp"
 #include "matcher/regex_match.hpp"
-#include "configuration/common/raw_configuration.hpp"
 
 namespace ddwaf {
 

src/configuration/common/matcher_parser.hpp

@@ -10,6 +10,7 @@
 #include <string>
 #include <utility>
 
+#include "configuration/common/raw_configuration.hpp"
 #include "matcher/base.hpp"
 #include "matcher/equals.hpp"
 #include "matcher/exact_match.hpp"
@@ -20,7 +21,6 @@
 #include "matcher/lower_than.hpp"
 #include "matcher/phrase_match.hpp"
 #include "matcher/regex_match.hpp"
-#include "configuration/common/raw_configuration.hpp"
 
 namespace ddwaf {
 

src/configuration/common/raw_configuration.cpp

@@ -13,9 +13,9 @@
 #include <utility>
 #include <vector>
 
+#include "configuration/common/raw_configuration.hpp"
 #include "ddwaf.h"
 #include "exception.hpp"
-#include "configuration/common/raw_configuration.hpp"
 #include "semver.hpp"
 #include "utils.hpp"
 

src/configuration/common/reference_parser.cpp

@@ -10,8 +10,8 @@
 
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
-#include "configuration/common/reference_parser.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "configuration/common/reference_parser.hpp"
 
 namespace ddwaf {
 

src/configuration/common/transformer_parser.cpp

@@ -10,9 +10,9 @@
 #include <vector>
 
 #include "condition/base.hpp"
+#include "configuration/common/raw_configuration.hpp"
 #include "configuration/common/transformer_parser.hpp"
 #include "exception.hpp"
-#include "configuration/common/raw_configuration.hpp"
 #include "transformer/base.hpp"
 
 namespace ddwaf {

src/configuration/configuration_manager.cpp

@@ -15,6 +15,7 @@
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
 #include "configuration/common/configuration_collector.hpp"
+#include "configuration/common/raw_configuration.hpp"
 #include "configuration/configuration_manager.hpp"
 #include "configuration/data_parser.hpp"
 #include "configuration/exclusion_parser.hpp"
@@ -24,7 +25,6 @@
 #include "configuration/rule_parser.hpp"
 #include "configuration/scanner_parser.hpp"
 #include "log.hpp"
-#include "configuration/common/raw_configuration.hpp"
 #include "ruleset_info.hpp"
 
 namespace ddwaf {

src/configuration/data_parser.cpp

@@ -13,10 +13,10 @@
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
 #include "configuration/common/configuration_collector.hpp"
+#include "configuration/common/raw_configuration.hpp"
 #include "configuration/data_parser.hpp"
 #include "exception.hpp"
 #include "log.hpp"
-#include "configuration/common/raw_configuration.hpp"
 #include "uuid.hpp"
 
 namespace ddwaf {

src/configuration/exclusion_parser.cpp

@@ -16,13 +16,13 @@
 #include "configuration/common/configuration.hpp"
 #include "configuration/common/configuration_collector.hpp"
 #include "configuration/common/expression_parser.hpp"
+#include "configuration/common/raw_configuration.hpp"
 #include "configuration/common/reference_parser.hpp"
 #include "configuration/exclusion_parser.hpp"
 #include "exception.hpp"
 #include "exclusion/common.hpp"
 #include "exclusion/object_filter.hpp"
 #include "log.hpp"
-#include "configuration/common/raw_configuration.hpp"
 #include "semver.hpp"
 #include "target_address.hpp"
 #include "utils.hpp"

src/configuration/legacy_rule_parser.cpp

@@ -19,6 +19,7 @@
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
 #include "configuration/common/configuration_collector.hpp"
+#include "configuration/common/raw_configuration.hpp"
 #include "configuration/common/transformer_parser.hpp"
 #include "configuration/legacy_rule_parser.hpp"
 #include "ddwaf.h"
@@ -30,7 +31,6 @@
 #include "matcher/is_xss.hpp"
 #include "matcher/phrase_match.hpp"
 #include "matcher/regex_match.hpp"
-#include "configuration/common/raw_configuration.hpp"
 #include "rule.hpp"
 #include "target_address.hpp"
 #include "transformer/base.hpp"

src/configuration/processor_parser.cpp

@@ -14,11 +14,11 @@
 #include "configuration/common/configuration.hpp"
 #include "configuration/common/configuration_collector.hpp"
 #include "configuration/common/expression_parser.hpp"
+#include "configuration/common/raw_configuration.hpp"
 #include "configuration/common/reference_parser.hpp"
 #include "configuration/processor_parser.hpp"
 #include "exception.hpp"
 #include "log.hpp"
-#include "configuration/common/raw_configuration.hpp"
 #include "processor/base.hpp"
 #include "processor/extract_schema.hpp"
 #include "processor/fingerprint.hpp"

src/configuration/rule_override_parser.cpp

@@ -12,11 +12,11 @@
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
 #include "configuration/common/configuration_collector.hpp"
+#include "configuration/common/raw_configuration.hpp"
 #include "configuration/common/reference_parser.hpp"
 #include "configuration/rule_override_parser.hpp"
 #include "exception.hpp"
 #include "log.hpp"
-#include "configuration/common/raw_configuration.hpp"
 #include "ruleset_info.hpp"
 #include "uuid.hpp"
 

src/configuration/rule_parser.cpp

@@ -14,11 +14,11 @@
 #include "configuration/common/configuration.hpp"
 #include "configuration/common/configuration_collector.hpp"
 #include "configuration/common/expression_parser.hpp"
+#include "configuration/common/raw_configuration.hpp"
 #include "configuration/common/transformer_parser.hpp"
 #include "configuration/rule_parser.hpp"
 #include "exception.hpp"
 #include "log.hpp"
-#include "configuration/common/raw_configuration.hpp"
 #include "rule.hpp"
 #include "semver.hpp"
 #include "transformer/base.hpp"

src/configuration/scanner_parser.cpp

@@ -14,11 +14,11 @@
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration_collector.hpp"
 #include "configuration/common/matcher_parser.hpp"
+#include "configuration/common/raw_configuration.hpp"
 #include "configuration/scanner_parser.hpp"
 #include "exception.hpp"
 #include "log.hpp"
 #include "matcher/base.hpp"
-#include "configuration/common/raw_configuration.hpp"
 #include "ruleset_info.hpp"
 #include "scanner.hpp"
 #include "semver.hpp"

src/interface.cpp

@@ -14,11 +14,11 @@
 #include <string_view>
 
 #include "builder/waf_builder.hpp"
+#include "configuration/common/raw_configuration.hpp"
 #include "context.hpp"
 #include "ddwaf.h"
 #include "log.hpp"
 #include "obfuscator.hpp"
-#include "configuration/common/raw_configuration.hpp"
 #include "ruleset_info.hpp"
 #include "utils.hpp"
 #include "version.hpp"

src/waf.hpp

@@ -7,9 +7,9 @@
 
 #include <memory>
 
+#include "configuration/common/raw_configuration.hpp"
 #include "context.hpp"
 #include "ddwaf.h"
-#include "configuration/common/raw_configuration.hpp"
 #include "ruleset.hpp"
 #include "ruleset_info.hpp"
 #include "utils.hpp"

tests/integration/diagnostics/v2/test.cpp

@@ -7,8 +7,8 @@
 #include "common/gtest_utils.hpp"
 
 #include "configuration/common/common.hpp"
-#include "ddwaf.h"
 #include "configuration/common/raw_configuration.hpp"
+#include "ddwaf.h"
 
 using namespace ddwaf;
 

tests/unit/builder/rule_builder_test.cpp

@@ -7,8 +7,8 @@
 #include "builder/rule_builder.hpp"
 #include "common/gtest_utils.hpp"
 #include "configuration/common/configuration.hpp"
-#include "matcher/ip_match.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "matcher/ip_match.hpp"
 
 using namespace ddwaf;
 

tests/unit/configuration/action_parser_test.cpp

@@ -9,8 +9,8 @@
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
 #include "configuration/common/configuration_collector.hpp"
-#include "fmt/core.h"
 #include "configuration/common/raw_configuration.hpp"
+#include "fmt/core.h"
 
 using namespace ddwaf;
 

tests/unit/configuration/base_rule_parser_test.cpp

@@ -7,8 +7,8 @@
 #include "common/gtest_utils.hpp"
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
-#include "configuration/rule_parser.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "configuration/rule_parser.hpp"
 
 using namespace ddwaf;
 

tests/unit/configuration/configuration_manager_test.cpp

@@ -7,8 +7,8 @@
 #include "common/gtest_utils.hpp"
 #include "configuration/actions_parser.hpp"
 #include "configuration/common/common.hpp"
-#include "configuration/configuration_manager.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "configuration/configuration_manager.hpp"
 
 using namespace ddwaf;
 

tests/unit/configuration/exclusion_data_parser_test.cpp

@@ -7,8 +7,8 @@
 #include "common/gtest_utils.hpp"
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
-#include "configuration/data_parser.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "configuration/data_parser.hpp"
 
 using namespace ddwaf;
 

tests/unit/configuration/input_filter_parser_test.cpp

@@ -7,8 +7,8 @@
 #include "common/gtest_utils.hpp"
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
-#include "configuration/exclusion_parser.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "configuration/exclusion_parser.hpp"
 
 using namespace ddwaf;
 

tests/unit/configuration/processor_parser_test.cpp

@@ -7,8 +7,8 @@
 #include "common/gtest_utils.hpp"
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
-#include "configuration/processor_parser.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "configuration/processor_parser.hpp"
 
 using namespace ddwaf;
 

tests/unit/configuration/rule_data_parser_test.cpp

@@ -7,8 +7,8 @@
 #include "common/gtest_utils.hpp"
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
-#include "configuration/data_parser.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "configuration/data_parser.hpp"
 
 using namespace ddwaf;
 

tests/unit/configuration/rule_filter_parser_test.cpp

@@ -7,8 +7,8 @@
 #include "common/gtest_utils.hpp"
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
-#include "configuration/exclusion_parser.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "configuration/exclusion_parser.hpp"
 
 using namespace ddwaf;
 

tests/unit/configuration/rule_override_parser_test.cpp

@@ -7,8 +7,8 @@
 #include "common/gtest_utils.hpp"
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
-#include "configuration/rule_override_parser.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "configuration/rule_override_parser.hpp"
 
 using namespace ddwaf;
 

tests/unit/configuration/scanner_parser_test.cpp

@@ -7,8 +7,8 @@
 #include "common/gtest_utils.hpp"
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
-#include "configuration/scanner_parser.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "configuration/scanner_parser.hpp"
 
 using namespace ddwaf;
 

tests/unit/configuration/user_rule_parser_test.cpp

@@ -7,8 +7,8 @@
 #include "common/gtest_utils.hpp"
 #include "configuration/common/common.hpp"
 #include "configuration/common/configuration.hpp"
-#include "configuration/rule_parser.hpp"
 #include "configuration/common/raw_configuration.hpp"
+#include "configuration/rule_parser.hpp"
 
 using namespace ddwaf;