From 91879d26385ecf9aca5d1c371c9ece17f56f83dc Mon Sep 17 00:00:00 2001 From: Quinten Date: Tue, 7 Oct 2025 17:11:17 +0200 Subject: [PATCH] format --- webserv/config/directive/DirectiveFactory.cpp | 3 ++- webserv/config/validation/ConfigValidator.cpp | 3 ++- webserv/config/validation/ValidationEngine.cpp | 3 ++- .../directive_rules/CgiExtValidationRule.cpp | 8 ++++---- .../directive_rules/CgiExtValidationRule.hpp | 2 +- .../validation/directive_rules/DirectiveRules.hpp | 8 ++++---- .../validation/directive_rules/FolderExistsRule.cpp | 10 +++++----- .../validation/directive_rules/FolderExistsRule.hpp | 6 +++--- .../validation/directive_rules/HostValidationRule.cpp | 10 +++++----- .../structural_rules/AStructuralValidationRule.hpp | 2 +- .../structural_rules/MinimumServerBlocksRule.cpp | 6 +++--- .../structural_rules/MinimumServerBlocksRule.hpp | 2 +- .../structural_rules/RequiredLocationBlocksRule.cpp | 6 +++--- .../structural_rules/RequiredLocationBlocksRule.hpp | 2 +- .../validation/structural_rules/StructuralRules.hpp | 8 ++++---- .../structural_rules/UniqueServerNamesRule.cpp | 8 ++++---- .../structural_rules/UniqueServerNamesRule.hpp | 2 +- webserv/handler/URIParser.cpp | 1 - webserv/router/Router.cpp | 5 +++-- 19 files changed, 49 insertions(+), 46 deletions(-) diff --git a/webserv/config/directive/DirectiveFactory.cpp b/webserv/config/directive/DirectiveFactory.cpp index 4610769..c891f24 100644 --- a/webserv/config/directive/DirectiveFactory.cpp +++ b/webserv/config/directive/DirectiveFactory.cpp @@ -1,5 +1,6 @@ -#include // for BoolDirective #include // for DirectiveFactory + +#include // for BoolDirective #include // for IntDirective #include // for IntStringDirective #include // for SizeDirective diff --git a/webserv/config/validation/ConfigValidator.cpp b/webserv/config/validation/ConfigValidator.cpp index ac2da42..67b4c3e 100644 --- a/webserv/config/validation/ConfigValidator.cpp +++ b/webserv/config/validation/ConfigValidator.cpp @@ -1,5 +1,6 @@ -#include "webserv/config/validation/directive_rules/CgiExtValidationRule.hpp" #include + +#include #include // for ValidationEngine #include // for AValidationRule #include // for AllowedValuesRule diff --git a/webserv/config/validation/ValidationEngine.cpp b/webserv/config/validation/ValidationEngine.cpp index a26741b..c562a7f 100644 --- a/webserv/config/validation/ValidationEngine.cpp +++ b/webserv/config/validation/ValidationEngine.cpp @@ -1,8 +1,9 @@ +#include + #include // for AConfig #include // for GlobalConfig #include // for LocationConfig #include // for ServerConfig -#include #include // for ValidationResult #include // for AValidationRule #include // for Log, LOCATION diff --git a/webserv/config/validation/directive_rules/CgiExtValidationRule.cpp b/webserv/config/validation/directive_rules/CgiExtValidationRule.cpp index 7eb270b..5abc5ab 100644 --- a/webserv/config/validation/directive_rules/CgiExtValidationRule.cpp +++ b/webserv/config/validation/directive_rules/CgiExtValidationRule.cpp @@ -1,9 +1,9 @@ -#include "webserv/config/AConfig.hpp" -#include "webserv/config/validation/ValidationResult.hpp" -#include "webserv/utils/FileUtils.hpp" - #include +#include +#include +#include + #include #include diff --git a/webserv/config/validation/directive_rules/CgiExtValidationRule.hpp b/webserv/config/validation/directive_rules/CgiExtValidationRule.hpp index 6303a45..45afbf8 100644 --- a/webserv/config/validation/directive_rules/CgiExtValidationRule.hpp +++ b/webserv/config/validation/directive_rules/CgiExtValidationRule.hpp @@ -1,6 +1,6 @@ #pragma once -#include "webserv/config/validation/directive_rules/AValidationRule.hpp" +#include #include // for ValidationResult class CgiExtValidationRule : public AValidationRule diff --git a/webserv/config/validation/directive_rules/DirectiveRules.hpp b/webserv/config/validation/directive_rules/DirectiveRules.hpp index 2c3f8e1..9357ac8 100644 --- a/webserv/config/validation/directive_rules/DirectiveRules.hpp +++ b/webserv/config/validation/directive_rules/DirectiveRules.hpp @@ -1,5 +1,5 @@ -#include "webserv/config/validation/directive_rules/AValidationRule.hpp" +#include -#include "webserv/config/validation/directive_rules/AllowedValuesRule.hpp" -#include "webserv/config/validation/directive_rules/PortValidationRule.hpp" -#include "webserv/config/validation/directive_rules/RequiredDirectiveRule.hpp" \ No newline at end of file +#include +#include +#include \ No newline at end of file diff --git a/webserv/config/validation/directive_rules/FolderExistsRule.cpp b/webserv/config/validation/directive_rules/FolderExistsRule.cpp index b88f2a3..fb44455 100644 --- a/webserv/config/validation/directive_rules/FolderExistsRule.cpp +++ b/webserv/config/validation/directive_rules/FolderExistsRule.cpp @@ -1,10 +1,10 @@ -#include "webserv/config/directive/ADirective.hpp" -#include "webserv/config/validation/ValidationResult.hpp" -#include "webserv/log/Log.hpp" -#include "webserv/utils/FileUtils.hpp" - #include +#include +#include +#include +#include + FolderExistsRule::FolderExistsRule(bool requiresValue) : AValidationRule("FolderExists", "Ensures the specified folder exists", requiresValue) { diff --git a/webserv/config/validation/directive_rules/FolderExistsRule.hpp b/webserv/config/validation/directive_rules/FolderExistsRule.hpp index 3af0055..942b00f 100644 --- a/webserv/config/validation/directive_rules/FolderExistsRule.hpp +++ b/webserv/config/validation/directive_rules/FolderExistsRule.hpp @@ -1,8 +1,8 @@ #pragma once -#include "webserv/config/AConfig.hpp" -#include "webserv/config/validation/ValidationResult.hpp" -#include "webserv/config/validation/directive_rules/AValidationRule.hpp" +#include +#include +#include class FolderExistsRule : public AValidationRule { diff --git a/webserv/config/validation/directive_rules/HostValidationRule.cpp b/webserv/config/validation/directive_rules/HostValidationRule.cpp index fe196ec..7341952 100644 --- a/webserv/config/validation/directive_rules/HostValidationRule.cpp +++ b/webserv/config/validation/directive_rules/HostValidationRule.cpp @@ -1,10 +1,10 @@ -#include "webserv/config/AConfig.hpp" -#include "webserv/config/directive/ADirective.hpp" -#include "webserv/config/validation/ValidationResult.hpp" -#include "webserv/utils/utils.hpp" - #include +#include +#include +#include +#include + #include #include #include diff --git a/webserv/config/validation/structural_rules/AStructuralValidationRule.hpp b/webserv/config/validation/structural_rules/AStructuralValidationRule.hpp index 49a6c73..7ad8ed3 100644 --- a/webserv/config/validation/structural_rules/AStructuralValidationRule.hpp +++ b/webserv/config/validation/structural_rules/AStructuralValidationRule.hpp @@ -1,6 +1,6 @@ #pragma once -#include "webserv/config/validation/ValidationResult.hpp" +#include #include diff --git a/webserv/config/validation/structural_rules/MinimumServerBlocksRule.cpp b/webserv/config/validation/structural_rules/MinimumServerBlocksRule.cpp index 11d3fb8..f864675 100644 --- a/webserv/config/validation/structural_rules/MinimumServerBlocksRule.cpp +++ b/webserv/config/validation/structural_rules/MinimumServerBlocksRule.cpp @@ -1,7 +1,7 @@ -#include "webserv/config/validation/structural_rules/MinimumServerBlocksRule.hpp" +#include -#include "webserv/config/GlobalConfig.hpp" -#include "webserv/log/Log.hpp" +#include +#include #include diff --git a/webserv/config/validation/structural_rules/MinimumServerBlocksRule.hpp b/webserv/config/validation/structural_rules/MinimumServerBlocksRule.hpp index 177e110..4c24c3f 100644 --- a/webserv/config/validation/structural_rules/MinimumServerBlocksRule.hpp +++ b/webserv/config/validation/structural_rules/MinimumServerBlocksRule.hpp @@ -1,6 +1,6 @@ #pragma once -#include "webserv/config/validation/structural_rules/AStructuralValidationRule.hpp" +#include #include diff --git a/webserv/config/validation/structural_rules/RequiredLocationBlocksRule.cpp b/webserv/config/validation/structural_rules/RequiredLocationBlocksRule.cpp index 80a6bdb..3203fe6 100644 --- a/webserv/config/validation/structural_rules/RequiredLocationBlocksRule.cpp +++ b/webserv/config/validation/structural_rules/RequiredLocationBlocksRule.cpp @@ -1,7 +1,7 @@ -#include "webserv/config/validation/structural_rules/RequiredLocationBlocksRule.hpp" +#include -#include "webserv/config/ServerConfig.hpp" -#include "webserv/log/Log.hpp" +#include +#include #include diff --git a/webserv/config/validation/structural_rules/RequiredLocationBlocksRule.hpp b/webserv/config/validation/structural_rules/RequiredLocationBlocksRule.hpp index ba1d241..c7779ba 100644 --- a/webserv/config/validation/structural_rules/RequiredLocationBlocksRule.hpp +++ b/webserv/config/validation/structural_rules/RequiredLocationBlocksRule.hpp @@ -1,6 +1,6 @@ #pragma once -#include "webserv/config/validation/structural_rules/AStructuralValidationRule.hpp" +#include #include diff --git a/webserv/config/validation/structural_rules/StructuralRules.hpp b/webserv/config/validation/structural_rules/StructuralRules.hpp index be9bb1e..9ffa791 100644 --- a/webserv/config/validation/structural_rules/StructuralRules.hpp +++ b/webserv/config/validation/structural_rules/StructuralRules.hpp @@ -1,9 +1,9 @@ #pragma once // Base class -#include "webserv/config/validation/structural_rules/AStructuralValidationRule.hpp" +#include // Concrete structural validation rules -#include "webserv/config/validation/structural_rules/MinimumServerBlocksRule.hpp" -#include "webserv/config/validation/structural_rules/RequiredLocationBlocksRule.hpp" -#include "webserv/config/validation/structural_rules/UniqueServerNamesRule.hpp" +#include +#include +#include diff --git a/webserv/config/validation/structural_rules/UniqueServerNamesRule.cpp b/webserv/config/validation/structural_rules/UniqueServerNamesRule.cpp index d161674..2e61c4b 100644 --- a/webserv/config/validation/structural_rules/UniqueServerNamesRule.cpp +++ b/webserv/config/validation/structural_rules/UniqueServerNamesRule.cpp @@ -1,8 +1,8 @@ -#include "webserv/config/validation/structural_rules/UniqueServerNamesRule.hpp" +#include -#include "webserv/config/GlobalConfig.hpp" -#include "webserv/config/ServerConfig.hpp" -#include "webserv/log/Log.hpp" +#include +#include +#include #include #include diff --git a/webserv/config/validation/structural_rules/UniqueServerNamesRule.hpp b/webserv/config/validation/structural_rules/UniqueServerNamesRule.hpp index 6fd90b6..5d6f104 100644 --- a/webserv/config/validation/structural_rules/UniqueServerNamesRule.hpp +++ b/webserv/config/validation/structural_rules/UniqueServerNamesRule.hpp @@ -1,6 +1,6 @@ #pragma once -#include "webserv/config/validation/structural_rules/AStructuralValidationRule.hpp" +#include class GlobalConfig; diff --git a/webserv/handler/URIParser.cpp b/webserv/handler/URIParser.cpp index 3b08225..1bff992 100644 --- a/webserv/handler/URIParser.cpp +++ b/webserv/handler/URIParser.cpp @@ -4,7 +4,6 @@ #include // for ServerConfig #include // for optional -#include // for vector #include // for size_t #include // for stat, S_ISDIR, S_ISREG diff --git a/webserv/router/Router.cpp b/webserv/router/Router.cpp index 0db1be3..d70515c 100644 --- a/webserv/router/Router.cpp +++ b/webserv/router/Router.cpp @@ -1,4 +1,6 @@ -#include "webserv/config/directive/ADirective.hpp" +#include + +#include #include // for ConfigManager #include // for ServerConfig @@ -7,7 +9,6 @@ #include // for URIParser #include // for HttpHeaders #include // for LOCATION, Log -#include #include #include // for unique_ptr