move 'oatpp/core/macro/*' --> 'oatpp/macro/*'

This commit is contained in:
Leonid Stryzhevskyi 2024-04-23 02:01:31 +03:00
parent ec1b0523ef
commit f0ae36e086
39 changed files with 70 additions and 57 deletions

View File

@ -51,6 +51,19 @@ OATPP_ASSERT(decoded == data)
## Restructuring ## Restructuring
### Files
| old file | new file |
|----------------------------------------|------------------------------|
| `oatpp/parser/json/*` | `oatpp/json/*` |
| `oatpp/parser/json/mapping/*` | `oatpp/json/*` |
| `oatpp/algorithm/CRC.hpp` | `oatpp/utils/CRC32.hpp` |
| `oatpp/core/utils/*` | `oatpp/utils/*` |
| `oatpp/core/utils/ConversionUtils.hpp` | `oatpp/utils/Conversion.hpp` |
| `oatpp/core/macro/*` | `oatpp/macro/*` |
### Namespaces
| old namespace | new namespace | | old namespace | new namespace |
|-----------------------------------|----------------------| |-----------------------------------|----------------------|
| `oatpp::parser::json::*` | `oatpp::json::*` | | `oatpp::parser::json::*` | `oatpp::json::*` |

View File

@ -1,5 +1,5 @@
#include "oatpp/json/ObjectMapper.hpp" #include "oatpp/json/ObjectMapper.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
typedef oatpp::parser::Caret ParsingCaret; typedef oatpp::parser::Caret ParsingCaret;
typedef oatpp::json::Serializer Serializer; typedef oatpp::json::Serializer Serializer;

View File

@ -3,14 +3,6 @@
## oatpp ## oatpp
add_library(oatpp add_library(oatpp
oatpp/codegen/ApiClient_define.hpp
oatpp/codegen/ApiClient_undef.hpp
oatpp/codegen/ApiController_define.hpp
oatpp/codegen/ApiController_undef.hpp
oatpp/codegen/DbClient_define.hpp
oatpp/codegen/DbClient_undef.hpp
oatpp/codegen/DTO_define.hpp
oatpp/codegen/DTO_undef.hpp
oatpp/codegen/api_controller/auth_define.hpp oatpp/codegen/api_controller/auth_define.hpp
oatpp/codegen/api_controller/auth_undef.hpp oatpp/codegen/api_controller/auth_undef.hpp
oatpp/codegen/api_controller/base_define.hpp oatpp/codegen/api_controller/base_define.hpp
@ -23,6 +15,14 @@ add_library(oatpp
oatpp/codegen/dto/base_undef.hpp oatpp/codegen/dto/base_undef.hpp
oatpp/codegen/dto/enum_define.hpp oatpp/codegen/dto/enum_define.hpp
oatpp/codegen/dto/enum_undef.hpp oatpp/codegen/dto/enum_undef.hpp
oatpp/codegen/ApiClient_define.hpp
oatpp/codegen/ApiClient_undef.hpp
oatpp/codegen/ApiController_define.hpp
oatpp/codegen/ApiController_undef.hpp
oatpp/codegen/DbClient_define.hpp
oatpp/codegen/DbClient_undef.hpp
oatpp/codegen/DTO_define.hpp
oatpp/codegen/DTO_undef.hpp
oatpp/core/IODefinitions.cpp oatpp/core/IODefinitions.cpp
oatpp/core/IODefinitions.hpp oatpp/core/IODefinitions.hpp
oatpp/core/Types.hpp oatpp/core/Types.hpp
@ -120,9 +120,6 @@ add_library(oatpp
oatpp/core/data/stream/Stream.hpp oatpp/core/data/stream/Stream.hpp
oatpp/core/data/stream/StreamBufferedProxy.cpp oatpp/core/data/stream/StreamBufferedProxy.cpp
oatpp/core/data/stream/StreamBufferedProxy.hpp oatpp/core/data/stream/StreamBufferedProxy.hpp
oatpp/core/macro/basic.hpp
oatpp/core/macro/codegen.hpp
oatpp/core/macro/component.hpp
oatpp/core/parser/Caret.cpp oatpp/core/parser/Caret.cpp
oatpp/core/parser/Caret.hpp oatpp/core/parser/Caret.hpp
oatpp/core/parser/ParsingError.cpp oatpp/core/parser/ParsingError.cpp
@ -148,6 +145,9 @@ add_library(oatpp
oatpp/json/Serializer.hpp oatpp/json/Serializer.hpp
oatpp/json/Utils.cpp oatpp/json/Utils.cpp
oatpp/json/Utils.hpp oatpp/json/Utils.hpp
oatpp/macro/basic.hpp
oatpp/macro/codegen.hpp
oatpp/macro/component.hpp
oatpp/network/Address.cpp oatpp/network/Address.cpp
oatpp/network/Address.hpp oatpp/network/Address.hpp
oatpp/network/ConnectionHandler.hpp oatpp/network/ConnectionHandler.hpp

View File

@ -27,7 +27,7 @@
#include <functional> #include <functional>
#include "oatpp/core/base/Environment.hpp" #include "oatpp/core/base/Environment.hpp"
#include "oatpp/core/macro/basic.hpp" #include "oatpp/macro/basic.hpp"
namespace oatpp { namespace test { namespace oatpp { namespace test {

View File

@ -31,7 +31,7 @@
#include "oatpp/network/Server.hpp" #include "oatpp/network/Server.hpp"
#include "oatpp/network/ConnectionProvider.hpp" #include "oatpp/network/ConnectionProvider.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
#include <list> #include <list>
#include <chrono> #include <chrono>

View File

@ -42,8 +42,8 @@
* </ul> * </ul>
*/ */
#include "oatpp/core/macro/basic.hpp" #include "oatpp/macro/basic.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#define OATPP_MACRO_API_CLIENT_PARAM_MACRO(MACRO, TYPE, PARAM_LIST) MACRO(TYPE, PARAM_LIST) #define OATPP_MACRO_API_CLIENT_PARAM_MACRO(MACRO, TYPE, PARAM_LIST) MACRO(TYPE, PARAM_LIST)
#define OATPP_MACRO_API_CLIENT_PARAM_TYPE(MACRO, TYPE, PARAM_LIST) const TYPE& #define OATPP_MACRO_API_CLIENT_PARAM_TYPE(MACRO, TYPE, PARAM_LIST) const TYPE&

View File

@ -42,8 +42,8 @@
* </ul> * </ul>
*/ */
#include "oatpp/core/macro/basic.hpp" #include "oatpp/macro/basic.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "./api_controller/base_define.hpp" #include "./api_controller/base_define.hpp"
#include "./api_controller/auth_define.hpp" #include "./api_controller/auth_define.hpp"

View File

@ -42,8 +42,8 @@
* </ul> * </ul>
*/ */
#include "oatpp/core/macro/basic.hpp" #include "oatpp/macro/basic.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "./dto/base_define.hpp" #include "./dto/base_define.hpp"
#include "./dto/enum_define.hpp" #include "./dto/enum_define.hpp"

View File

@ -22,8 +22,8 @@
* *
***************************************************************************/ ***************************************************************************/
#include "oatpp/core/macro/basic.hpp" #include "oatpp/macro/basic.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#define OATPP_MACRO_DB_CLIENT_PARAM_TYPE(MACRO, TYPE, PARAM_LIST) TYPE #define OATPP_MACRO_DB_CLIENT_PARAM_TYPE(MACRO, TYPE, PARAM_LIST) TYPE
#define OATPP_MACRO_DB_CLIENT_PARAM_NAME(MACRO, TYPE, PARAM_LIST) OATPP_MACRO_FIRSTARG PARAM_LIST #define OATPP_MACRO_DB_CLIENT_PARAM_NAME(MACRO, TYPE, PARAM_LIST) OATPP_MACRO_FIRSTARG PARAM_LIST

View File

@ -28,7 +28,7 @@
#include <oatpp/web/protocol/http/incoming/Request.hpp> #include <oatpp/web/protocol/http/incoming/Request.hpp>
#include "oatpp/web/protocol/http/Http.hpp" #include "oatpp/web/protocol/http/Http.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "oatpp/core/data/mapping/type/Type.hpp" #include "oatpp/core/data/mapping/type/Type.hpp"
namespace oatpp { namespace web { namespace server { namespace handler { namespace oatpp { namespace web { namespace server { namespace handler {

View File

@ -26,7 +26,7 @@
#include "oatpp/core/data/mapping/TypeResolver.hpp" #include "oatpp/core/data/mapping/TypeResolver.hpp"
#include "oatpp/core/Types.hpp" #include "oatpp/core/Types.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace oatpp { namespace test { namespace core { namespace data { namespace mapping {

View File

@ -27,7 +27,7 @@
#include "oatpp/core/data/mapping/type/Any.hpp" #include "oatpp/core/data/mapping/type/Any.hpp"
#include "oatpp/json/ObjectMapper.hpp" #include "oatpp/json/ObjectMapper.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace type { namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace type {

View File

@ -25,7 +25,7 @@
#include "EnumTest.hpp" #include "EnumTest.hpp"
#include "oatpp/core/Types.hpp" #include "oatpp/core/Types.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include <unordered_map> #include <unordered_map>

View File

@ -27,7 +27,7 @@
#include "oatpp/json/ObjectMapper.hpp" #include "oatpp/json/ObjectMapper.hpp"
#include "oatpp/core/data/mapping/TypeResolver.hpp" #include "oatpp/core/data/mapping/TypeResolver.hpp"
#include "oatpp/core/Types.hpp" #include "oatpp/core/Types.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace type { namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace type {

View File

@ -26,7 +26,7 @@
#include "oatpp/json/ObjectMapper.hpp" #include "oatpp/json/ObjectMapper.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "oatpp/core/Types.hpp" #include "oatpp/core/Types.hpp"
#include "oatpp-test/Checker.hpp" #include "oatpp-test/Checker.hpp"

View File

@ -24,7 +24,7 @@
#include "TypeTest.hpp" #include "TypeTest.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "oatpp/core/Types.hpp" #include "oatpp/core/Types.hpp"
namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace type { namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace type {

View File

@ -30,8 +30,8 @@
#include "oatpp/core/data/stream/BufferStream.hpp" #include "oatpp/core/data/stream/BufferStream.hpp"
#include "oatpp/core/macro/basic.hpp" #include "oatpp/macro/basic.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "oatpp-test/Checker.hpp" #include "oatpp-test/Checker.hpp"

View File

@ -34,7 +34,7 @@
#include "oatpp/utils/Conversion.hpp" #include "oatpp/utils/Conversion.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
namespace oatpp { namespace json { namespace test { namespace oatpp { namespace json { namespace test {

View File

@ -27,7 +27,7 @@
#include <cmath> #include <cmath>
#include "oatpp/json/ObjectMapper.hpp" #include "oatpp/json/ObjectMapper.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
namespace oatpp { namespace json { namespace test { namespace oatpp { namespace json { namespace test {

View File

@ -26,7 +26,7 @@
#include "oatpp/json/ObjectMapper.hpp" #include "oatpp/json/ObjectMapper.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
namespace oatpp { namespace json { namespace test { namespace oatpp { namespace json { namespace test {

View File

@ -47,7 +47,7 @@
#include "oatpp/network/ConnectionPool.hpp" #include "oatpp/network/ConnectionPool.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
#include "oatpp-test/web/ClientServerTestRunner.hpp" #include "oatpp-test/web/ClientServerTestRunner.hpp"
#include "oatpp-test/Checker.hpp" #include "oatpp-test/Checker.hpp"

View File

@ -42,7 +42,7 @@
#include "oatpp/network/virtual_/server/ConnectionProvider.hpp" #include "oatpp/network/virtual_/server/ConnectionProvider.hpp"
#include "oatpp/network/virtual_/Interface.hpp" #include "oatpp/network/virtual_/Interface.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
#include "oatpp-test/web/ClientServerTestRunner.hpp" #include "oatpp-test/web/ClientServerTestRunner.hpp"

View File

@ -44,7 +44,7 @@
#include "oatpp/network/virtual_/Interface.hpp" #include "oatpp/network/virtual_/Interface.hpp"
#include "oatpp/core/data/resource/InMemoryData.hpp" #include "oatpp/core/data/resource/InMemoryData.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
#include "oatpp-test/web/ClientServerTestRunner.hpp" #include "oatpp-test/web/ClientServerTestRunner.hpp"

View File

@ -47,7 +47,7 @@
#include "oatpp/network/virtual_/Interface.hpp" #include "oatpp/network/virtual_/Interface.hpp"
#include "oatpp/core/data/resource/InMemoryData.hpp" #include "oatpp/core/data/resource/InMemoryData.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
#include "oatpp-test/web/ClientServerTestRunner.hpp" #include "oatpp-test/web/ClientServerTestRunner.hpp"

View File

@ -39,7 +39,7 @@
#include "oatpp/network/virtual_/Interface.hpp" #include "oatpp/network/virtual_/Interface.hpp"
#include "oatpp/core/data/stream/BufferStream.hpp" #include "oatpp/core/data/stream/BufferStream.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
#include "oatpp-test/web/ClientServerTestRunner.hpp" #include "oatpp-test/web/ClientServerTestRunner.hpp"

View File

@ -39,7 +39,7 @@
#include "oatpp/network/virtual_/Interface.hpp" #include "oatpp/network/virtual_/Interface.hpp"
#include "oatpp/core/data/stream/BufferStream.hpp" #include "oatpp/core/data/stream/BufferStream.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
#include "oatpp-test/web/ClientServerTestRunner.hpp" #include "oatpp-test/web/ClientServerTestRunner.hpp"

View File

@ -30,8 +30,8 @@
#include "oatpp/web/server/api/ApiController.hpp" #include "oatpp/web/server/api/ApiController.hpp"
#include "oatpp/json/ObjectMapper.hpp" #include "oatpp/json/ObjectMapper.hpp"
#include "oatpp/utils/Conversion.hpp" #include "oatpp/utils/Conversion.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
#include <sstream> #include <sstream>

View File

@ -30,8 +30,8 @@
#include "oatpp/web/server/api/ApiController.hpp" #include "oatpp/web/server/api/ApiController.hpp"
#include "oatpp/json/ObjectMapper.hpp" #include "oatpp/json/ObjectMapper.hpp"
#include "oatpp/utils/Conversion.hpp" #include "oatpp/utils/Conversion.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
#include <sstream> #include <sstream>

View File

@ -30,7 +30,7 @@
#include "oatpp/web/client/ApiClient.hpp" #include "oatpp/web/client/ApiClient.hpp"
#include "oatpp/web/protocol/http/outgoing/MultipartBody.hpp" #include "oatpp/web/protocol/http/outgoing/MultipartBody.hpp"
#include "oatpp/encoding/Base64.hpp" #include "oatpp/encoding/Base64.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
namespace oatpp { namespace test { namespace web { namespace app { namespace oatpp { namespace test { namespace web { namespace app {

View File

@ -41,8 +41,8 @@
#include "oatpp/core/data/resource/File.hpp" #include "oatpp/core/data/resource/File.hpp"
#include "oatpp/core/data/stream/FileStream.hpp" #include "oatpp/core/data/stream/FileStream.hpp"
#include "oatpp/utils/Conversion.hpp" #include "oatpp/utils/Conversion.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
#include <sstream> #include <sstream>
#include <thread> #include <thread>

View File

@ -42,8 +42,8 @@
#include "oatpp/core/data/stream/FileStream.hpp" #include "oatpp/core/data/stream/FileStream.hpp"
#include "oatpp/core/data/stream/Stream.hpp" #include "oatpp/core/data/stream/Stream.hpp"
#include "oatpp/utils/Conversion.hpp" #include "oatpp/utils/Conversion.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
namespace oatpp { namespace test { namespace web { namespace app { namespace oatpp { namespace test { namespace web { namespace app {

View File

@ -28,8 +28,8 @@
#include "oatpp/web/server/api/ApiController.hpp" #include "oatpp/web/server/api/ApiController.hpp"
#include "oatpp/json/ObjectMapper.hpp" #include "oatpp/json/ObjectMapper.hpp"
#include "oatpp/utils/Conversion.hpp" #include "oatpp/utils/Conversion.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
#include <sstream> #include <sstream>

View File

@ -28,8 +28,8 @@
#include "oatpp/web/server/api/ApiController.hpp" #include "oatpp/web/server/api/ApiController.hpp"
#include "oatpp/json/ObjectMapper.hpp" #include "oatpp/json/ObjectMapper.hpp"
#include "oatpp/utils/Conversion.hpp" #include "oatpp/utils/Conversion.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
#include <sstream> #include <sstream>

View File

@ -28,8 +28,8 @@
#include "oatpp/web/server/api/ApiController.hpp" #include "oatpp/web/server/api/ApiController.hpp"
#include "oatpp/json/ObjectMapper.hpp" #include "oatpp/json/ObjectMapper.hpp"
#include "oatpp/utils/Conversion.hpp" #include "oatpp/utils/Conversion.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "oatpp/core/macro/component.hpp" #include "oatpp/macro/component.hpp"
#include <sstream> #include <sstream>

View File

@ -25,7 +25,7 @@
#ifndef oatpp_test_web_app_DTOs_hpp #ifndef oatpp_test_web_app_DTOs_hpp
#define oatpp_test_web_app_DTOs_hpp #define oatpp_test_web_app_DTOs_hpp
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
#include "oatpp/core/Types.hpp" #include "oatpp/core/Types.hpp"
namespace oatpp { namespace test { namespace web { namespace app { namespace oatpp { namespace test { namespace web { namespace app {

View File

@ -25,7 +25,7 @@
#include "ApiControllerTest.hpp" #include "ApiControllerTest.hpp"
#include "oatpp/web/server/api/ApiController.hpp" #include "oatpp/web/server/api/ApiController.hpp"
#include "oatpp/core/macro/codegen.hpp" #include "oatpp/macro/codegen.hpp"
namespace oatpp { namespace test { namespace web { namespace server { namespace api { namespace oatpp { namespace test { namespace web { namespace server { namespace api {