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

changelog/1.4.0.md

@@ -51,6 +51,19 @@ OATPP_ASSERT(decoded == data)
 
 ## 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        |
 |-----------------------------------|----------------------|
 | `oatpp::parser::json::*`          | `oatpp::json::*`     |

fuzzers/oatpp/json/ObjectMapper.cpp

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

src/CMakeLists.txt

@@ -3,14 +3,6 @@
 ## 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_undef.hpp
         oatpp/codegen/api_controller/base_define.hpp
@@ -23,6 +15,14 @@ add_library(oatpp
         oatpp/codegen/dto/base_undef.hpp
         oatpp/codegen/dto/enum_define.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.hpp
         oatpp/core/Types.hpp
@@ -120,9 +120,6 @@ add_library(oatpp
         oatpp/core/data/stream/Stream.hpp
         oatpp/core/data/stream/StreamBufferedProxy.cpp
         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.hpp
         oatpp/core/parser/ParsingError.cpp
@@ -148,6 +145,9 @@ add_library(oatpp
 		oatpp/json/Serializer.hpp
 		oatpp/json/Utils.cpp
 		oatpp/json/Utils.hpp
+		oatpp/macro/basic.hpp
+		oatpp/macro/codegen.hpp
+		oatpp/macro/component.hpp
         oatpp/network/Address.cpp
         oatpp/network/Address.hpp
         oatpp/network/ConnectionHandler.hpp

src/oatpp-test/UnitTest.hpp

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

src/oatpp-test/web/ClientServerTestRunner.hpp

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

src/oatpp/codegen/ApiClient_define.hpp

@@ -42,8 +42,8 @@
  * </ul>
  */
 
-#include "oatpp/core/macro/basic.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/basic.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_TYPE(MACRO, TYPE, PARAM_LIST) const TYPE&

src/oatpp/codegen/ApiController_define.hpp

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

src/oatpp/codegen/DTO_define.hpp

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

src/oatpp/codegen/DbClient_define.hpp

@@ -22,8 +22,8 @@
  *
  ***************************************************************************/
 
-#include "oatpp/core/macro/basic.hpp"
-#include "oatpp/core/macro/codegen.hpp"
+#include "oatpp/macro/basic.hpp"
+#include "oatpp/macro/codegen.hpp"
 
 #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

src/oatpp/web/server/handler/AuthorizationHandler.hpp

@@ -28,7 +28,7 @@
 
 #include <oatpp/web/protocol/http/incoming/Request.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"
 
 namespace oatpp { namespace web { namespace server { namespace handler {

test/oatpp/core/data/mapping/TypeResolverTest.cpp

@@ -26,7 +26,7 @@
 
 #include "oatpp/core/data/mapping/TypeResolver.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 {
 

test/oatpp/core/data/mapping/type/AnyTest.cpp

@@ -27,7 +27,7 @@
 #include "oatpp/core/data/mapping/type/Any.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 {
 

test/oatpp/core/data/mapping/type/EnumTest.cpp

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

test/oatpp/core/data/mapping/type/InterpretationTest.cpp

@@ -27,7 +27,7 @@
 #include "oatpp/json/ObjectMapper.hpp"
 #include "oatpp/core/data/mapping/TypeResolver.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 {
 

test/oatpp/core/data/mapping/type/ObjectTest.cpp

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

test/oatpp/core/data/mapping/type/TypeTest.cpp

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

test/oatpp/json/DTOMapperPerfTest.cpp

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

test/oatpp/json/DTOMapperTest.cpp

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

test/oatpp/json/DeserializerTest.cpp

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

test/oatpp/json/EnumTest.cpp

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

test/oatpp/web/ClientRetryTest.cpp

@@ -47,7 +47,7 @@
 
 #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/Checker.hpp"

test/oatpp/web/FullAsyncClientTest.cpp

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

test/oatpp/web/FullAsyncTest.cpp

@@ -44,7 +44,7 @@
 #include "oatpp/network/virtual_/Interface.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"
 

test/oatpp/web/FullTest.cpp

@@ -47,7 +47,7 @@
 #include "oatpp/network/virtual_/Interface.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"
 

test/oatpp/web/PipelineAsyncTest.cpp

@@ -39,7 +39,7 @@
 #include "oatpp/network/virtual_/Interface.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"
 

test/oatpp/web/PipelineTest.cpp

@@ -39,7 +39,7 @@
 #include "oatpp/network/virtual_/Interface.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"
 

test/oatpp/web/app/BasicAuthorizationController.hpp

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

test/oatpp/web/app/BearerAuthorizationController.hpp

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

test/oatpp/web/app/Client.hpp

@@ -30,7 +30,7 @@
 #include "oatpp/web/client/ApiClient.hpp"
 #include "oatpp/web/protocol/http/outgoing/MultipartBody.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 {
   

test/oatpp/web/app/Controller.hpp

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

test/oatpp/web/app/ControllerAsync.hpp

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

test/oatpp/web/app/ControllerWithErrorHandler.hpp

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

test/oatpp/web/app/ControllerWithInterceptors.hpp

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

test/oatpp/web/app/ControllerWithInterceptorsAsync.hpp

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

test/oatpp/web/app/DTOs.hpp

@@ -25,7 +25,7 @@
 #ifndef 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"
 
 namespace oatpp { namespace test { namespace web { namespace app {

test/oatpp/web/server/api/ApiControllerTest.cpp

@@ -25,7 +25,7 @@
 #include "ApiControllerTest.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 {