diff options
author | claiff <claiff@mail.ru> | 2022-10-06 12:26:56 +0300 |
---|---|---|
committer | claiff <claiff@mail.ru> | 2022-10-06 12:26:56 +0300 |
commit | 04e97b30880c1c3252fe900ccac268267539e424 (patch) | |
tree | 1f4cd2d1e2f8cf2442d055c519d06c6e0692febc /src/converter | |
parent | 8edef99a5b52643e0b919c424357752cbbc9a8dd (diff) | |
parent | da5f91a0ce15351a82beb061c3ccc965164529bc (diff) | |
download | obmc-sila-smtp-04e97b30880c1c3252fe900ccac268267539e424.tar.xz |
Merge branch 'bugfix/proxy_file_reader'
Diffstat (limited to 'src/converter')
-rw-r--r-- | src/converter/file_to_string.cpp | 2 | ||||
-rw-r--r-- | src/converter/file_to_string.hpp | 4 | ||||
-rw-r--r-- | src/converter/file_to_struct.cpp | 20 | ||||
-rw-r--r-- | src/converter/file_to_struct.hpp | 20 | ||||
-rw-r--r-- | src/converter/struct_to_file.cpp | 16 | ||||
-rw-r--r-- | src/converter/struct_to_file.hpp | 16 | ||||
-rw-r--r-- | src/converter/struct_to_string.cpp | 14 | ||||
-rw-r--r-- | src/converter/struct_to_string.hpp | 16 |
8 files changed, 54 insertions, 54 deletions
diff --git a/src/converter/file_to_string.cpp b/src/converter/file_to_string.cpp index 3d8860e..8d136f6 100644 --- a/src/converter/file_to_string.cpp +++ b/src/converter/file_to_string.cpp @@ -3,7 +3,7 @@ namespace smtp::converter { - std::list<std::string> FileToString::Convert( manage::SettingsFileDataType const& from) const + std::list<std::string> FileToString::Convert( general::SettingsFileDataType const& from) const { std::list<std::string> result; for(auto const& settings_line : from) diff --git a/src/converter/file_to_string.hpp b/src/converter/file_to_string.hpp index 14e1633..9b7b357 100644 --- a/src/converter/file_to_string.hpp +++ b/src/converter/file_to_string.hpp @@ -1,6 +1,6 @@ #pragma once -#include "management/general.hpp" +#include "general/struct.hpp" namespace smtp::converter { @@ -10,7 +10,7 @@ namespace smtp::converter FileToString() = default; ~FileToString() = default; - std::list<std::string> Convert( manage::SettingsFileDataType const& from ) const; + std::list<std::string> Convert( general::SettingsFileDataType const& from ) const; private: std::string BuildParam( std::pair < std::string, std::string > const& data ) const; }; diff --git a/src/converter/file_to_struct.cpp b/src/converter/file_to_struct.cpp index 4c4bec8..4cb588c 100644 --- a/src/converter/file_to_struct.cpp +++ b/src/converter/file_to_struct.cpp @@ -2,9 +2,9 @@ namespace smtp::converter { - manage::SettingsFields FileToStruct::Convert( manage::SettingsFileDataType const& from ) const + general::SettingsFields FileToStruct::Convert( general::SettingsFileDataType const& from ) const { - manage::SettingsFields result; + general::SettingsFields result; ApplyAuth( result, from ); ApplySsl( result, from ); @@ -16,21 +16,21 @@ namespace smtp::converter return result; } - void FileToStruct::ApplyAuth( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const + void FileToStruct::ApplyAuth( general::SettingsFields &result, general::SettingsFileDataType const& from ) const { static const std::string FIELD = "is_need_auth"; ApplyBool(from, FIELD, result.is_need_auth); } - void FileToStruct::ApplySsl( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const + void FileToStruct::ApplySsl( general::SettingsFields &result, general::SettingsFileDataType const& from ) const { static const std::string FIELD = "is_need_ssl"; ApplyBool(from, FIELD, result.is_need_ssl); } - void FileToStruct::ApplyBool( manage::SettingsFileDataType const& from, std::string const& search_field, bool& field ) const + void FileToStruct::ApplyBool( general::SettingsFileDataType const& from, std::string const& search_field, bool& field ) const { static const std::string TRUE_AS_STRING = "true"; static const std::string FALSE_AS_STRING = "false"; @@ -47,35 +47,35 @@ namespace smtp::converter field = (find->second == TRUE_AS_STRING); } - void FileToStruct::ApplyUsername( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const + void FileToStruct::ApplyUsername( general::SettingsFields &result, general::SettingsFileDataType const& from ) const { static const std::string FIELD = "username"; ApplyString( from, FIELD, result.username ); } - void FileToStruct::ApplyPassword( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const + void FileToStruct::ApplyPassword( general::SettingsFields &result, general::SettingsFileDataType const& from ) const { static const std::string FIELD = "password"; ApplyString( from, FIELD, result.password ); } - void FileToStruct::ApplyHost( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const + void FileToStruct::ApplyHost( general::SettingsFields &result, general::SettingsFileDataType const& from ) const { static const std::string FIELD = "host"; ApplyString( from, FIELD, result.host ); } - void FileToStruct::ApplyPort( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const + void FileToStruct::ApplyPort( general::SettingsFields &result, general::SettingsFileDataType const& from ) const { static const std::string FIELD = "port"; ApplyString(from, FIELD, result.port); } - void FileToStruct::ApplyString( manage::SettingsFileDataType const& from, std::string const& search_field, std::string& field ) const + void FileToStruct::ApplyString( general::SettingsFileDataType const& from, std::string const& search_field, std::string& field ) const { auto find = from.find( search_field ); if( find == from.end() ) diff --git a/src/converter/file_to_struct.hpp b/src/converter/file_to_struct.hpp index 1eb7fce..4375ce2 100644 --- a/src/converter/file_to_struct.hpp +++ b/src/converter/file_to_struct.hpp @@ -3,7 +3,7 @@ #include <unordered_map> #include <string> -#include "management/general.hpp" +#include "general/struct.hpp" namespace smtp::converter { @@ -13,17 +13,17 @@ namespace smtp::converter FileToStruct() = default; ~FileToStruct() = default; - manage::SettingsFields Convert( manage::SettingsFileDataType const& from ) const; + general::SettingsFields Convert( general::SettingsFileDataType const& from ) const; private: - void ApplyAuth( manage::SettingsFields& result, manage::SettingsFileDataType const& from ) const; - void ApplySsl( manage::SettingsFields& result, manage::SettingsFileDataType const& from ) const; - void ApplyBool( manage::SettingsFileDataType const& from, std::string const& search_field, bool& field ) const; + void ApplyAuth( general::SettingsFields& result, general::SettingsFileDataType const& from ) const; + void ApplySsl( general::SettingsFields& result, general::SettingsFileDataType const& from ) const; + void ApplyBool( general::SettingsFileDataType const& from, std::string const& search_field, bool& field ) const; - void ApplyUsername( manage::SettingsFields& result, manage::SettingsFileDataType const& from ) const; - void ApplyPassword( manage::SettingsFields& result, manage::SettingsFileDataType const& from ) const; - void ApplyHost( manage::SettingsFields& result, manage::SettingsFileDataType const& from ) const; - void ApplyPort( manage::SettingsFields& result, manage::SettingsFileDataType const& from ) const; - void ApplyString( manage::SettingsFileDataType const& from, std::string const& search_field, std::string& field ) const; + void ApplyUsername( general::SettingsFields& result, general::SettingsFileDataType const& from ) const; + void ApplyPassword( general::SettingsFields& result, general::SettingsFileDataType const& from ) const; + void ApplyHost( general::SettingsFields& result, general::SettingsFileDataType const& from ) const; + void ApplyPort( general::SettingsFields& result, general::SettingsFileDataType const& from ) const; + void ApplyString( general::SettingsFileDataType const& from, std::string const& search_field, std::string& field ) const; }; } diff --git a/src/converter/struct_to_file.cpp b/src/converter/struct_to_file.cpp index f21cffb..6e28ead 100644 --- a/src/converter/struct_to_file.cpp +++ b/src/converter/struct_to_file.cpp @@ -3,9 +3,9 @@ namespace smtp::converter { - manage::SettingsFileDataType StructToFile::Convert( manage::SettingsFields const& from ) const + general::SettingsFileDataType StructToFile::Convert( general::SettingsFields const& from ) const { - manage::SettingsFileDataType result; + general::SettingsFileDataType result; ApplyPort( from, result ); ApplyHost( from, result ); @@ -17,7 +17,7 @@ namespace smtp::converter return result; } - void StructToFile::ApplyAuth( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const + void StructToFile::ApplyAuth( general::SettingsFields const& from, general::SettingsFileDataType& result ) const { static const std::string FIELD = "is_need_auth"; static const std::string TRUE_AS_STRING = "true"; @@ -26,7 +26,7 @@ namespace smtp::converter from.is_need_auth ? result.insert({FIELD, TRUE_AS_STRING}) : result.insert({FIELD, FALSE_AS_STRING}); } - void StructToFile::ApplySsl( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const + void StructToFile::ApplySsl( general::SettingsFields const& from, general::SettingsFileDataType& result ) const { static const std::string FIELD = "is_need_ssl"; static const std::string TRUE_AS_STRING = "true"; @@ -35,28 +35,28 @@ namespace smtp::converter from.is_need_ssl ? result.insert({FIELD, TRUE_AS_STRING}) : result.insert({FIELD, FALSE_AS_STRING}); } - void StructToFile::ApplyUsername( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const + void StructToFile::ApplyUsername( general::SettingsFields const& from, general::SettingsFileDataType& result ) const { static const std::string FIELD = "username"; result.insert({FIELD, from.username}); } - void StructToFile::ApplyPassword( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const + void StructToFile::ApplyPassword( general::SettingsFields const& from, general::SettingsFileDataType& result ) const { static const std::string FIELD = "password"; result.insert({FIELD, from.password}); } - void StructToFile::ApplyHost( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const + void StructToFile::ApplyHost( general::SettingsFields const& from, general::SettingsFileDataType& result ) const { static const std::string FIELD = "host"; result.insert({FIELD, from.host}); } - void StructToFile::ApplyPort( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const + void StructToFile::ApplyPort( general::SettingsFields const& from, general::SettingsFileDataType& result ) const { static const std::string FIELD = "port"; diff --git a/src/converter/struct_to_file.hpp b/src/converter/struct_to_file.hpp index 67a9f96..641e693 100644 --- a/src/converter/struct_to_file.hpp +++ b/src/converter/struct_to_file.hpp @@ -1,6 +1,6 @@ #pragma once -#include "management/general.hpp" +#include "general/struct.hpp" namespace smtp::converter { @@ -10,15 +10,15 @@ namespace smtp::converter StructToFile() = default; ~StructToFile() = default; - manage::SettingsFileDataType Convert( manage::SettingsFields const& from ) const; + general::SettingsFileDataType Convert( general::SettingsFields const& from ) const; private: - void ApplyAuth( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const; - void ApplySsl( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const; + void ApplyAuth( general::SettingsFields const& from, general::SettingsFileDataType& result ) const; + void ApplySsl( general::SettingsFields const& from, general::SettingsFileDataType& result ) const; - void ApplyUsername( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const; - void ApplyPassword( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const; - void ApplyHost( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const; - void ApplyPort( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const; + void ApplyUsername( general::SettingsFields const& from, general::SettingsFileDataType& result ) const; + void ApplyPassword( general::SettingsFields const& from, general::SettingsFileDataType& result ) const; + void ApplyHost( general::SettingsFields const& from, general::SettingsFileDataType& result ) const; + void ApplyPort( general::SettingsFields const& from, general::SettingsFileDataType& result ) const; }; } diff --git a/src/converter/struct_to_string.cpp b/src/converter/struct_to_string.cpp index c86a6c8..ea3df67 100644 --- a/src/converter/struct_to_string.cpp +++ b/src/converter/struct_to_string.cpp @@ -2,7 +2,7 @@ namespace smtp::converter { - std::string StructToString::Convert( manage::SettingsFields const& from ) const + std::string StructToString::Convert( general::SettingsFields const& from ) const { std::string result; @@ -16,42 +16,42 @@ namespace smtp::converter return result; } - void StructToString::ApplyAuth( manage::SettingsFields const& from, std::string& result ) const + void StructToString::ApplyAuth( general::SettingsFields const& from, std::string& result ) const { static const std::string FIELD = "is_need_auth"; result += GetBoolParam( FIELD, from.is_need_auth); } - void StructToString::ApplySsl( manage::SettingsFields const& from, std::string& result ) const + void StructToString::ApplySsl( general::SettingsFields const& from, std::string& result ) const { static const std::string FIELD = "is_need_ssl"; result += GetBoolParam( FIELD, from.is_need_ssl); } - void StructToString::ApplyUsername( manage::SettingsFields const& from, std::string& result ) const + void StructToString::ApplyUsername( general::SettingsFields const& from, std::string& result ) const { static const std::string FIELD = "username"; result += GetStringParam( FIELD, from.username ); } - void StructToString::ApplyPassword( manage::SettingsFields const& from, std::string& result ) const + void StructToString::ApplyPassword( general::SettingsFields const& from, std::string& result ) const { static const std::string FIELD = "password"; result += GetStringParam( FIELD, from.password ); } - void StructToString::ApplyHost( manage::SettingsFields const& from, std::string& result ) const + void StructToString::ApplyHost( general::SettingsFields const& from, std::string& result ) const { static const std::string FIELD = "host"; result += GetStringParam( FIELD, from.host ); } - void StructToString::ApplyPort( manage::SettingsFields const& from, std::string& result ) const + void StructToString::ApplyPort( general::SettingsFields const& from, std::string& result ) const { static const std::string FIELD = "port"; diff --git a/src/converter/struct_to_string.hpp b/src/converter/struct_to_string.hpp index 0a08327..9d6b418 100644 --- a/src/converter/struct_to_string.hpp +++ b/src/converter/struct_to_string.hpp @@ -3,7 +3,7 @@ #include <unordered_map> #include <string> -#include "management/general.hpp" +#include "general/struct.hpp" namespace smtp::converter { @@ -13,15 +13,15 @@ namespace smtp::converter StructToString() = default; ~StructToString() = default; - std::string Convert( manage::SettingsFields const& from ) const; + std::string Convert( general::SettingsFields const& from ) const; private: - void ApplyAuth( manage::SettingsFields const& from, std::string& result ) const; - void ApplySsl( manage::SettingsFields const& from, std::string& result ) const; + void ApplyAuth( general::SettingsFields const& from, std::string& result ) const; + void ApplySsl( general::SettingsFields const& from, std::string& result ) const; - void ApplyUsername( manage::SettingsFields const& from, std::string& result ) const; - void ApplyPassword( manage::SettingsFields const& from, std::string& result ) const; - void ApplyHost( manage::SettingsFields const& from, std::string& result ) const; - void ApplyPort( manage::SettingsFields const& from, std::string& result ) const; + void ApplyUsername( general::SettingsFields const& from, std::string& result ) const; + void ApplyPassword( general::SettingsFields const& from, std::string& result ) const; + void ApplyHost( general::SettingsFields const& from, std::string& result ) const; + void ApplyPort( general::SettingsFields const& from, std::string& result ) const; std::string GetStringParam( std::string const& field, std::string const& param ) const; std::string GetBoolParam( std::string const& field, bool param ) const; |