From 6dc0898ef7154862d9ea5e0e595cc4075df65180 Mon Sep 17 00:00:00 2001 From: lganzzzo Date: Mon, 21 Jan 2019 05:03:23 +0200 Subject: [PATCH] module restructuring --- .gitignore | 9 + CMakeLists.txt | 294 +----------------- src/CMakeLists.txt | 260 ++++++++++++++++ {test => src/oatpp-test}/Checker.cpp | 0 {test => src/oatpp-test}/Checker.hpp | 0 {test => src/oatpp-test}/UnitTest.cpp | 0 {test => src/oatpp-test}/UnitTest.hpp | 2 +- {algorithm => src/oatpp/algorithm}/CRC.cpp | 0 {algorithm => src/oatpp/algorithm}/CRC.hpp | 0 .../codegen}/codegen_define_ApiClient_.hpp | 0 .../codegen_define_ApiController_.hpp | 0 .../oatpp/codegen}/codegen_define_DTO_.hpp | 0 .../codegen}/codegen_undef_ApiClient_.hpp | 0 .../codegen}/codegen_undef_ApiController_.hpp | 0 .../oatpp/codegen}/codegen_undef_DTO_.hpp | 0 {core => src/oatpp/core}/Types.cpp | 0 {core => src/oatpp/core}/Types.hpp | 0 {core => src/oatpp/core}/async/Coroutine.cpp | 0 {core => src/oatpp/core}/async/Coroutine.hpp | 0 {core => src/oatpp/core}/async/Executor.cpp | 0 {core => src/oatpp/core}/async/Executor.hpp | 0 {core => src/oatpp/core}/async/Processor.cpp | 0 {core => src/oatpp/core}/async/Processor.hpp | 0 .../oatpp/core}/base/CommandLineArguments.cpp | 0 .../oatpp/core}/base/CommandLineArguments.hpp | 0 {core => src/oatpp/core}/base/Config.hpp | 0 .../oatpp/core}/base/Controllable.cpp | 0 .../oatpp/core}/base/Controllable.hpp | 0 {core => src/oatpp/core}/base/Environment.cpp | 0 {core => src/oatpp/core}/base/Environment.hpp | 14 +- {core => src/oatpp/core}/base/StrBuffer.cpp | 0 {core => src/oatpp/core}/base/StrBuffer.hpp | 0 .../oatpp/core}/base/memory/Allocator.cpp | 0 .../oatpp/core}/base/memory/Allocator.hpp | 0 .../oatpp/core}/base/memory/MemoryPool.cpp | 0 .../oatpp/core}/base/memory/MemoryPool.hpp | 0 .../oatpp/core}/base/memory/ObjectPool.cpp | 0 .../oatpp/core}/base/memory/ObjectPool.hpp | 0 .../oatpp/core}/collection/FastQueue.cpp | 0 .../oatpp/core}/collection/FastQueue.hpp | 0 .../oatpp/core}/collection/LinkedList.cpp | 0 .../oatpp/core}/collection/LinkedList.hpp | 0 .../oatpp/core}/collection/ListMap.cpp | 0 .../oatpp/core}/collection/ListMap.hpp | 0 .../oatpp/core}/concurrency/Runnable.cpp | 0 .../oatpp/core}/concurrency/Runnable.hpp | 0 .../oatpp/core}/concurrency/SpinLock.cpp | 0 .../oatpp/core}/concurrency/SpinLock.hpp | 0 .../oatpp/core}/concurrency/Thread.cpp | 0 .../oatpp/core}/concurrency/Thread.hpp | 0 .../oatpp/core}/data/buffer/FIFOBuffer.cpp | 0 .../oatpp/core}/data/buffer/FIFOBuffer.hpp | 0 .../oatpp/core}/data/buffer/IOBuffer.cpp | 0 .../oatpp/core}/data/buffer/IOBuffer.hpp | 0 .../oatpp/core}/data/mapping/ObjectMapper.cpp | 0 .../oatpp/core}/data/mapping/ObjectMapper.hpp | 0 .../oatpp/core}/data/mapping/type/List.cpp | 0 .../oatpp/core}/data/mapping/type/List.hpp | 0 .../oatpp/core}/data/mapping/type/ListMap.cpp | 0 .../oatpp/core}/data/mapping/type/ListMap.hpp | 0 .../oatpp/core}/data/mapping/type/Object.cpp | 0 .../oatpp/core}/data/mapping/type/Object.hpp | 0 .../core}/data/mapping/type/Primitive.cpp | 0 .../core}/data/mapping/type/Primitive.hpp | 0 .../oatpp/core}/data/mapping/type/Type.cpp | 0 .../oatpp/core}/data/mapping/type/Type.hpp | 0 .../oatpp/core}/data/share/MemoryLabel.cpp | 0 .../oatpp/core}/data/share/MemoryLabel.hpp | 0 .../oatpp/core}/data/stream/ChunkedBuffer.cpp | 0 .../oatpp/core}/data/stream/ChunkedBuffer.hpp | 0 .../oatpp/core}/data/stream/Delegate.cpp | 0 .../oatpp/core}/data/stream/Delegate.hpp | 0 .../oatpp/core}/data/stream/Stream.cpp | 0 .../oatpp/core}/data/stream/Stream.hpp | 0 .../core}/data/stream/StreamBufferedProxy.cpp | 0 .../core}/data/stream/StreamBufferedProxy.hpp | 0 {core => src/oatpp/core}/macro/basic.hpp | 0 {core => src/oatpp/core}/macro/codegen.hpp | 0 {core => src/oatpp/core}/macro/component.hpp | 0 {core => src/oatpp/core}/os/io/Library.cpp | 0 {core => src/oatpp/core}/os/io/Library.hpp | 0 .../oatpp/core}/parser/ParsingCaret.cpp | 0 .../oatpp/core}/parser/ParsingCaret.hpp | 0 .../oatpp/core}/utils/ConversionUtils.cpp | 0 .../oatpp/core}/utils/ConversionUtils.hpp | 0 {encoding => src/oatpp/encoding}/Base64.cpp | 0 {encoding => src/oatpp/encoding}/Base64.hpp | 0 {encoding => src/oatpp/encoding}/Hex.cpp | 0 {encoding => src/oatpp/encoding}/Hex.hpp | 0 {encoding => src/oatpp/encoding}/Unicode.cpp | 0 {encoding => src/oatpp/encoding}/Unicode.hpp | 0 {network => src/oatpp/network}/Connection.cpp | 0 {network => src/oatpp/network}/Connection.hpp | 0 .../oatpp/network}/ConnectionProvider.cpp | 0 .../oatpp/network}/ConnectionProvider.hpp | 0 {network => src/oatpp/network}/Url.cpp | 0 {network => src/oatpp/network}/Url.hpp | 0 .../client/SimpleTCPConnectionProvider.cpp | 1 - .../client/SimpleTCPConnectionProvider.hpp | 0 .../network}/server/ConnectionHandler.cpp | 0 .../network}/server/ConnectionHandler.hpp | 0 .../oatpp/network}/server/Server.cpp | 2 - .../oatpp/network}/server/Server.hpp | 0 .../server/SimpleTCPConnectionProvider.cpp | 1 - .../server/SimpleTCPConnectionProvider.hpp | 0 .../oatpp/network}/virtual_/Interface.cpp | 0 .../oatpp/network}/virtual_/Interface.hpp | 0 .../oatpp/network}/virtual_/Pipe.cpp | 0 .../oatpp/network}/virtual_/Pipe.hpp | 0 .../oatpp/network}/virtual_/Socket.cpp | 0 .../oatpp/network}/virtual_/Socket.hpp | 0 .../virtual_/client/ConnectionProvider.cpp | 0 .../virtual_/client/ConnectionProvider.hpp | 0 .../virtual_/server/ConnectionProvider.cpp | 0 .../virtual_/server/ConnectionProvider.hpp | 0 {parser => src/oatpp/parser}/json/Utils.cpp | 0 {parser => src/oatpp/parser}/json/Utils.hpp | 0 .../parser}/json/mapping/Deserializer.cpp | 0 .../parser}/json/mapping/Deserializer.hpp | 0 .../parser}/json/mapping/ObjectMapper.cpp | 0 .../parser}/json/mapping/ObjectMapper.hpp | 0 .../oatpp/parser}/json/mapping/Serializer.cpp | 0 .../oatpp/parser}/json/mapping/Serializer.hpp | 0 {web => src/oatpp/web}/client/ApiClient.cpp | 0 {web => src/oatpp/web}/client/ApiClient.hpp | 0 .../oatpp/web}/client/HttpRequestExecutor.cpp | 0 .../oatpp/web}/client/HttpRequestExecutor.hpp | 0 .../oatpp/web}/client/RequestExecutor.cpp | 0 .../oatpp/web}/client/RequestExecutor.hpp | 0 .../web}/protocol/CommunicationError.cpp | 0 .../web}/protocol/CommunicationError.hpp | 0 {web => src/oatpp/web}/protocol/http/Http.cpp | 1 - {web => src/oatpp/web}/protocol/http/Http.hpp | 0 .../protocol/http/incoming/BodyDecoder.cpp | 0 .../protocol/http/incoming/BodyDecoder.hpp | 0 .../web}/protocol/http/incoming/Request.cpp | 0 .../web}/protocol/http/incoming/Request.hpp | 0 .../http/incoming/RequestHeadersReader.cpp | 0 .../http/incoming/RequestHeadersReader.hpp | 0 .../web}/protocol/http/incoming/Response.cpp | 0 .../web}/protocol/http/incoming/Response.hpp | 0 .../http/incoming/ResponseHeadersReader.cpp | 0 .../http/incoming/ResponseHeadersReader.hpp | 0 .../http/incoming/SimpleBodyDecoder.cpp | 0 .../http/incoming/SimpleBodyDecoder.hpp | 0 .../web}/protocol/http/outgoing/Body.cpp | 0 .../web}/protocol/http/outgoing/Body.hpp | 0 .../protocol/http/outgoing/BufferBody.cpp | 0 .../protocol/http/outgoing/BufferBody.hpp | 0 .../http/outgoing/ChunkedBufferBody.cpp | 0 .../http/outgoing/ChunkedBufferBody.hpp | 0 .../http/outgoing/CommunicationUtils.cpp | 0 .../http/outgoing/CommunicationUtils.hpp | 0 .../web}/protocol/http/outgoing/DtoBody.cpp | 0 .../web}/protocol/http/outgoing/DtoBody.hpp | 0 .../web}/protocol/http/outgoing/Request.cpp | 0 .../web}/protocol/http/outgoing/Request.hpp | 0 .../web}/protocol/http/outgoing/Response.cpp | 0 .../web}/protocol/http/outgoing/Response.hpp | 0 .../http/outgoing/ResponseFactory.cpp | 0 .../http/outgoing/ResponseFactory.hpp | 0 .../server/AsyncHttpConnectionHandler.cpp | 1 - .../server/AsyncHttpConnectionHandler.hpp | 0 .../web}/server/HttpConnectionHandler.cpp | 0 .../web}/server/HttpConnectionHandler.hpp | 0 .../oatpp/web}/server/HttpProcessor.cpp | 0 .../oatpp/web}/server/HttpProcessor.hpp | 0 {web => src/oatpp/web}/server/HttpRouter.cpp | 0 {web => src/oatpp/web}/server/HttpRouter.hpp | 0 .../oatpp/web}/server/api/ApiController.cpp | 0 .../oatpp/web}/server/api/ApiController.hpp | 0 .../oatpp/web}/server/api/Endpoint.cpp | 0 .../oatpp/web}/server/api/Endpoint.hpp | 0 .../web}/server/handler/ErrorHandler.cpp | 0 .../web}/server/handler/ErrorHandler.hpp | 0 .../oatpp/web}/server/handler/Interceptor.cpp | 0 .../oatpp/web}/server/handler/Interceptor.hpp | 0 .../oatpp/web}/url/mapping/Pattern.cpp | 0 .../oatpp/web}/url/mapping/Pattern.hpp | 0 {web => src/oatpp/web}/url/mapping/Router.cpp | 0 {web => src/oatpp/web}/url/mapping/Router.hpp | 0 .../oatpp/web}/url/mapping/Subscriber.cpp | 0 .../oatpp/web}/url/mapping/Subscriber.hpp | 0 test/CMakeLists.txt | 55 ++++ test/{ => oatpp}/AllTestsMain.cpp | 32 +- .../core/base/CommandLineArgumentsTest.cpp | 0 .../core/base/CommandLineArgumentsTest.hpp | 2 +- test/{ => oatpp}/core/base/RegRuleTest.cpp | 0 test/{ => oatpp}/core/base/RegRuleTest.hpp | 2 +- .../core/base/collection/LinkedListTest.cpp | 2 +- .../core/base/collection/LinkedListTest.hpp | 2 +- .../core/base/memory/MemoryPoolTest.cpp | 2 +- .../core/base/memory/MemoryPoolTest.hpp | 2 +- .../{ => oatpp}/core/base/memory/PerfTest.cpp | 0 .../{ => oatpp}/core/base/memory/PerfTest.hpp | 2 +- .../core/data/mapping/type/TypeTest.cpp | 0 .../core/data/mapping/type/TypeTest.hpp | 2 +- .../core/data/share/MemoryLabelTest.cpp | 3 +- .../core/data/share/MemoryLabelTest.hpp | 2 +- test/{ => oatpp}/encoding/Base64Test.cpp | 0 test/{ => oatpp}/encoding/Base64Test.hpp | 2 +- test/{ => oatpp}/encoding/UnicodeTest.cpp | 0 test/{ => oatpp}/encoding/UnicodeTest.hpp | 2 +- .../network/virtual_/InterfaceTest.cpp | 0 .../network/virtual_/InterfaceTest.hpp | 2 +- .../{ => oatpp}/network/virtual_/PipeTest.cpp | 2 +- .../{ => oatpp}/network/virtual_/PipeTest.hpp | 2 +- .../parser/json/mapping/DTOMapperPerfTest.cpp | 2 +- .../parser/json/mapping/DTOMapperPerfTest.hpp | 2 +- .../parser/json/mapping/DTOMapperTest.cpp | 0 .../parser/json/mapping/DTOMapperTest.hpp | 2 +- .../parser/json/mapping/DeserializerTest.cpp | 0 .../parser/json/mapping/DeserializerTest.hpp | 2 +- test/{ => oatpp}/web/FullAsyncTest.cpp | 4 +- test/{ => oatpp}/web/FullAsyncTest.hpp | 2 +- test/{ => oatpp}/web/FullTest.cpp | 6 +- test/{ => oatpp}/web/FullTest.hpp | 2 +- test/{ => oatpp}/web/app/Client.hpp | 0 test/{ => oatpp}/web/app/Controller.hpp | 0 test/{ => oatpp}/web/app/ControllerAsync.hpp | 0 test/{ => oatpp}/web/app/DTOs.hpp | 0 221 files changed, 377 insertions(+), 348 deletions(-) create mode 100644 src/CMakeLists.txt rename {test => src/oatpp-test}/Checker.cpp (100%) rename {test => src/oatpp-test}/Checker.hpp (100%) rename {test => src/oatpp-test}/UnitTest.cpp (100%) rename {test => src/oatpp-test}/UnitTest.hpp (99%) rename {algorithm => src/oatpp/algorithm}/CRC.cpp (100%) rename {algorithm => src/oatpp/algorithm}/CRC.hpp (100%) rename {codegen => src/oatpp/codegen}/codegen_define_ApiClient_.hpp (100%) rename {codegen => src/oatpp/codegen}/codegen_define_ApiController_.hpp (100%) rename {codegen => src/oatpp/codegen}/codegen_define_DTO_.hpp (100%) rename {codegen => src/oatpp/codegen}/codegen_undef_ApiClient_.hpp (100%) rename {codegen => src/oatpp/codegen}/codegen_undef_ApiController_.hpp (100%) rename {codegen => src/oatpp/codegen}/codegen_undef_DTO_.hpp (100%) rename {core => src/oatpp/core}/Types.cpp (100%) rename {core => src/oatpp/core}/Types.hpp (100%) rename {core => src/oatpp/core}/async/Coroutine.cpp (100%) rename {core => src/oatpp/core}/async/Coroutine.hpp (100%) rename {core => src/oatpp/core}/async/Executor.cpp (100%) rename {core => src/oatpp/core}/async/Executor.hpp (100%) rename {core => src/oatpp/core}/async/Processor.cpp (100%) rename {core => src/oatpp/core}/async/Processor.hpp (100%) rename {core => src/oatpp/core}/base/CommandLineArguments.cpp (100%) rename {core => src/oatpp/core}/base/CommandLineArguments.hpp (100%) rename {core => src/oatpp/core}/base/Config.hpp (100%) rename {core => src/oatpp/core}/base/Controllable.cpp (100%) rename {core => src/oatpp/core}/base/Controllable.hpp (100%) rename {core => src/oatpp/core}/base/Environment.cpp (100%) rename {core => src/oatpp/core}/base/Environment.hpp (99%) rename {core => src/oatpp/core}/base/StrBuffer.cpp (100%) rename {core => src/oatpp/core}/base/StrBuffer.hpp (100%) rename {core => src/oatpp/core}/base/memory/Allocator.cpp (100%) rename {core => src/oatpp/core}/base/memory/Allocator.hpp (100%) rename {core => src/oatpp/core}/base/memory/MemoryPool.cpp (100%) rename {core => src/oatpp/core}/base/memory/MemoryPool.hpp (100%) rename {core => src/oatpp/core}/base/memory/ObjectPool.cpp (100%) rename {core => src/oatpp/core}/base/memory/ObjectPool.hpp (100%) rename {core => src/oatpp/core}/collection/FastQueue.cpp (100%) rename {core => src/oatpp/core}/collection/FastQueue.hpp (100%) rename {core => src/oatpp/core}/collection/LinkedList.cpp (100%) rename {core => src/oatpp/core}/collection/LinkedList.hpp (100%) rename {core => src/oatpp/core}/collection/ListMap.cpp (100%) rename {core => src/oatpp/core}/collection/ListMap.hpp (100%) rename {core => src/oatpp/core}/concurrency/Runnable.cpp (100%) rename {core => src/oatpp/core}/concurrency/Runnable.hpp (100%) rename {core => src/oatpp/core}/concurrency/SpinLock.cpp (100%) rename {core => src/oatpp/core}/concurrency/SpinLock.hpp (100%) rename {core => src/oatpp/core}/concurrency/Thread.cpp (100%) rename {core => src/oatpp/core}/concurrency/Thread.hpp (100%) rename {core => src/oatpp/core}/data/buffer/FIFOBuffer.cpp (100%) rename {core => src/oatpp/core}/data/buffer/FIFOBuffer.hpp (100%) rename {core => src/oatpp/core}/data/buffer/IOBuffer.cpp (100%) rename {core => src/oatpp/core}/data/buffer/IOBuffer.hpp (100%) rename {core => src/oatpp/core}/data/mapping/ObjectMapper.cpp (100%) rename {core => src/oatpp/core}/data/mapping/ObjectMapper.hpp (100%) rename {core => src/oatpp/core}/data/mapping/type/List.cpp (100%) rename {core => src/oatpp/core}/data/mapping/type/List.hpp (100%) rename {core => src/oatpp/core}/data/mapping/type/ListMap.cpp (100%) rename {core => src/oatpp/core}/data/mapping/type/ListMap.hpp (100%) rename {core => src/oatpp/core}/data/mapping/type/Object.cpp (100%) rename {core => src/oatpp/core}/data/mapping/type/Object.hpp (100%) rename {core => src/oatpp/core}/data/mapping/type/Primitive.cpp (100%) rename {core => src/oatpp/core}/data/mapping/type/Primitive.hpp (100%) rename {core => src/oatpp/core}/data/mapping/type/Type.cpp (100%) rename {core => src/oatpp/core}/data/mapping/type/Type.hpp (100%) rename {core => src/oatpp/core}/data/share/MemoryLabel.cpp (100%) rename {core => src/oatpp/core}/data/share/MemoryLabel.hpp (100%) rename {core => src/oatpp/core}/data/stream/ChunkedBuffer.cpp (100%) rename {core => src/oatpp/core}/data/stream/ChunkedBuffer.hpp (100%) rename {core => src/oatpp/core}/data/stream/Delegate.cpp (100%) rename {core => src/oatpp/core}/data/stream/Delegate.hpp (100%) rename {core => src/oatpp/core}/data/stream/Stream.cpp (100%) rename {core => src/oatpp/core}/data/stream/Stream.hpp (100%) rename {core => src/oatpp/core}/data/stream/StreamBufferedProxy.cpp (100%) rename {core => src/oatpp/core}/data/stream/StreamBufferedProxy.hpp (100%) rename {core => src/oatpp/core}/macro/basic.hpp (100%) rename {core => src/oatpp/core}/macro/codegen.hpp (100%) rename {core => src/oatpp/core}/macro/component.hpp (100%) rename {core => src/oatpp/core}/os/io/Library.cpp (100%) rename {core => src/oatpp/core}/os/io/Library.hpp (100%) rename {core => src/oatpp/core}/parser/ParsingCaret.cpp (100%) rename {core => src/oatpp/core}/parser/ParsingCaret.hpp (100%) rename {core => src/oatpp/core}/utils/ConversionUtils.cpp (100%) rename {core => src/oatpp/core}/utils/ConversionUtils.hpp (100%) rename {encoding => src/oatpp/encoding}/Base64.cpp (100%) rename {encoding => src/oatpp/encoding}/Base64.hpp (100%) rename {encoding => src/oatpp/encoding}/Hex.cpp (100%) rename {encoding => src/oatpp/encoding}/Hex.hpp (100%) rename {encoding => src/oatpp/encoding}/Unicode.cpp (100%) rename {encoding => src/oatpp/encoding}/Unicode.hpp (100%) rename {network => src/oatpp/network}/Connection.cpp (100%) rename {network => src/oatpp/network}/Connection.hpp (100%) rename {network => src/oatpp/network}/ConnectionProvider.cpp (100%) rename {network => src/oatpp/network}/ConnectionProvider.hpp (100%) rename {network => src/oatpp/network}/Url.cpp (100%) rename {network => src/oatpp/network}/Url.hpp (100%) rename {network => src/oatpp/network}/client/SimpleTCPConnectionProvider.cpp (99%) rename {network => src/oatpp/network}/client/SimpleTCPConnectionProvider.hpp (100%) rename {network => src/oatpp/network}/server/ConnectionHandler.cpp (100%) rename {network => src/oatpp/network}/server/ConnectionHandler.hpp (100%) rename {network => src/oatpp/network}/server/Server.cpp (98%) rename {network => src/oatpp/network}/server/Server.hpp (100%) rename {network => src/oatpp/network}/server/SimpleTCPConnectionProvider.cpp (99%) rename {network => src/oatpp/network}/server/SimpleTCPConnectionProvider.hpp (100%) rename {network => src/oatpp/network}/virtual_/Interface.cpp (100%) rename {network => src/oatpp/network}/virtual_/Interface.hpp (100%) rename {network => src/oatpp/network}/virtual_/Pipe.cpp (100%) rename {network => src/oatpp/network}/virtual_/Pipe.hpp (100%) rename {network => src/oatpp/network}/virtual_/Socket.cpp (100%) rename {network => src/oatpp/network}/virtual_/Socket.hpp (100%) rename {network => src/oatpp/network}/virtual_/client/ConnectionProvider.cpp (100%) rename {network => src/oatpp/network}/virtual_/client/ConnectionProvider.hpp (100%) rename {network => src/oatpp/network}/virtual_/server/ConnectionProvider.cpp (100%) rename {network => src/oatpp/network}/virtual_/server/ConnectionProvider.hpp (100%) rename {parser => src/oatpp/parser}/json/Utils.cpp (100%) rename {parser => src/oatpp/parser}/json/Utils.hpp (100%) rename {parser => src/oatpp/parser}/json/mapping/Deserializer.cpp (100%) rename {parser => src/oatpp/parser}/json/mapping/Deserializer.hpp (100%) rename {parser => src/oatpp/parser}/json/mapping/ObjectMapper.cpp (100%) rename {parser => src/oatpp/parser}/json/mapping/ObjectMapper.hpp (100%) rename {parser => src/oatpp/parser}/json/mapping/Serializer.cpp (100%) rename {parser => src/oatpp/parser}/json/mapping/Serializer.hpp (100%) rename {web => src/oatpp/web}/client/ApiClient.cpp (100%) rename {web => src/oatpp/web}/client/ApiClient.hpp (100%) rename {web => src/oatpp/web}/client/HttpRequestExecutor.cpp (100%) rename {web => src/oatpp/web}/client/HttpRequestExecutor.hpp (100%) rename {web => src/oatpp/web}/client/RequestExecutor.cpp (100%) rename {web => src/oatpp/web}/client/RequestExecutor.hpp (100%) rename {web => src/oatpp/web}/protocol/CommunicationError.cpp (100%) rename {web => src/oatpp/web}/protocol/CommunicationError.hpp (100%) rename {web => src/oatpp/web}/protocol/http/Http.cpp (99%) rename {web => src/oatpp/web}/protocol/http/Http.hpp (100%) rename {web => src/oatpp/web}/protocol/http/incoming/BodyDecoder.cpp (100%) rename {web => src/oatpp/web}/protocol/http/incoming/BodyDecoder.hpp (100%) rename {web => src/oatpp/web}/protocol/http/incoming/Request.cpp (100%) rename {web => src/oatpp/web}/protocol/http/incoming/Request.hpp (100%) rename {web => src/oatpp/web}/protocol/http/incoming/RequestHeadersReader.cpp (100%) rename {web => src/oatpp/web}/protocol/http/incoming/RequestHeadersReader.hpp (100%) rename {web => src/oatpp/web}/protocol/http/incoming/Response.cpp (100%) rename {web => src/oatpp/web}/protocol/http/incoming/Response.hpp (100%) rename {web => src/oatpp/web}/protocol/http/incoming/ResponseHeadersReader.cpp (100%) rename {web => src/oatpp/web}/protocol/http/incoming/ResponseHeadersReader.hpp (100%) rename {web => src/oatpp/web}/protocol/http/incoming/SimpleBodyDecoder.cpp (100%) rename {web => src/oatpp/web}/protocol/http/incoming/SimpleBodyDecoder.hpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/Body.cpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/Body.hpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/BufferBody.cpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/BufferBody.hpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/ChunkedBufferBody.cpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/ChunkedBufferBody.hpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/CommunicationUtils.cpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/CommunicationUtils.hpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/DtoBody.cpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/DtoBody.hpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/Request.cpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/Request.hpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/Response.cpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/Response.hpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/ResponseFactory.cpp (100%) rename {web => src/oatpp/web}/protocol/http/outgoing/ResponseFactory.hpp (100%) rename {web => src/oatpp/web}/server/AsyncHttpConnectionHandler.cpp (98%) rename {web => src/oatpp/web}/server/AsyncHttpConnectionHandler.hpp (100%) rename {web => src/oatpp/web}/server/HttpConnectionHandler.cpp (100%) rename {web => src/oatpp/web}/server/HttpConnectionHandler.hpp (100%) rename {web => src/oatpp/web}/server/HttpProcessor.cpp (100%) rename {web => src/oatpp/web}/server/HttpProcessor.hpp (100%) rename {web => src/oatpp/web}/server/HttpRouter.cpp (100%) rename {web => src/oatpp/web}/server/HttpRouter.hpp (100%) rename {web => src/oatpp/web}/server/api/ApiController.cpp (100%) rename {web => src/oatpp/web}/server/api/ApiController.hpp (100%) rename {web => src/oatpp/web}/server/api/Endpoint.cpp (100%) rename {web => src/oatpp/web}/server/api/Endpoint.hpp (100%) rename {web => src/oatpp/web}/server/handler/ErrorHandler.cpp (100%) rename {web => src/oatpp/web}/server/handler/ErrorHandler.hpp (100%) rename {web => src/oatpp/web}/server/handler/Interceptor.cpp (100%) rename {web => src/oatpp/web}/server/handler/Interceptor.hpp (100%) rename {web => src/oatpp/web}/url/mapping/Pattern.cpp (100%) rename {web => src/oatpp/web}/url/mapping/Pattern.hpp (100%) rename {web => src/oatpp/web}/url/mapping/Router.cpp (100%) rename {web => src/oatpp/web}/url/mapping/Router.hpp (100%) rename {web => src/oatpp/web}/url/mapping/Subscriber.cpp (100%) rename {web => src/oatpp/web}/url/mapping/Subscriber.hpp (100%) create mode 100644 test/CMakeLists.txt rename test/{ => oatpp}/AllTestsMain.cpp (72%) rename test/{ => oatpp}/core/base/CommandLineArgumentsTest.cpp (100%) rename test/{ => oatpp}/core/base/CommandLineArgumentsTest.hpp (97%) rename test/{ => oatpp}/core/base/RegRuleTest.cpp (100%) rename test/{ => oatpp}/core/base/RegRuleTest.hpp (97%) rename test/{ => oatpp}/core/base/collection/LinkedListTest.cpp (98%) rename test/{ => oatpp}/core/base/collection/LinkedListTest.hpp (97%) rename test/{ => oatpp}/core/base/memory/MemoryPoolTest.cpp (99%) rename test/{ => oatpp}/core/base/memory/MemoryPoolTest.hpp (97%) rename test/{ => oatpp}/core/base/memory/PerfTest.cpp (100%) rename test/{ => oatpp}/core/base/memory/PerfTest.hpp (97%) rename test/{ => oatpp}/core/data/mapping/type/TypeTest.cpp (100%) rename test/{ => oatpp}/core/data/mapping/type/TypeTest.hpp (97%) rename test/{ => oatpp}/core/data/share/MemoryLabelTest.cpp (99%) rename test/{ => oatpp}/core/data/share/MemoryLabelTest.hpp (97%) rename test/{ => oatpp}/encoding/Base64Test.cpp (100%) rename test/{ => oatpp}/encoding/Base64Test.hpp (97%) rename test/{ => oatpp}/encoding/UnicodeTest.cpp (100%) rename test/{ => oatpp}/encoding/UnicodeTest.hpp (97%) rename test/{ => oatpp}/network/virtual_/InterfaceTest.cpp (100%) rename test/{ => oatpp}/network/virtual_/InterfaceTest.hpp (97%) rename test/{ => oatpp}/network/virtual_/PipeTest.cpp (99%) rename test/{ => oatpp}/network/virtual_/PipeTest.hpp (97%) rename test/{ => oatpp}/parser/json/mapping/DTOMapperPerfTest.cpp (98%) rename test/{ => oatpp}/parser/json/mapping/DTOMapperPerfTest.hpp (97%) rename test/{ => oatpp}/parser/json/mapping/DTOMapperTest.cpp (100%) rename test/{ => oatpp}/parser/json/mapping/DTOMapperTest.hpp (97%) rename test/{ => oatpp}/parser/json/mapping/DeserializerTest.cpp (100%) rename test/{ => oatpp}/parser/json/mapping/DeserializerTest.hpp (97%) rename test/{ => oatpp}/web/FullAsyncTest.cpp (97%) rename test/{ => oatpp}/web/FullAsyncTest.hpp (97%) rename test/{ => oatpp}/web/FullTest.cpp (96%) rename test/{ => oatpp}/web/FullTest.hpp (97%) rename test/{ => oatpp}/web/app/Client.hpp (100%) rename test/{ => oatpp}/web/app/Controller.hpp (100%) rename test/{ => oatpp}/web/app/ControllerAsync.hpp (100%) rename test/{ => oatpp}/web/app/DTOs.hpp (100%) diff --git a/.gitignore b/.gitignore index 259148fa..c6a30523 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,12 @@ *.exe *.out *.app + +#idea +.idea/ +cmake-build-debug/ + +#local build +build/ +srt/build/ +test/build/ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index ab12c458..615a99a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) -file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/core/base/Environment.hpp" OATPP_VERSION_MACRO REGEX "#define OATPP_VERSION \"[0-9]+.[0-9]+.[0-9]+\"$") +file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/src/oatpp/core/base/Environment.hpp" OATPP_VERSION_MACRO REGEX "#define OATPP_VERSION \"[0-9]+.[0-9]+.[0-9]+\"$") string(REGEX REPLACE "#define OATPP_VERSION \"([0-9]+.[0-9]+.[0-9]+)\"$" "\\1" oatpp_VERSION "${OATPP_VERSION_MACRO}") project(oatpp VERSION ${oatpp_VERSION} LANGUAGES CXX) @@ -9,297 +9,9 @@ option(BUILD_SHARED_LIBS "Build shared libraries" OFF) option(OATPP_INSTALL "Create installation target for oat++" ON) option(OATPP_BUILD_TESTS "Create test target for oat++" ON) -add_library(oatpp - algorithm/CRC.cpp - algorithm/CRC.hpp - codegen/codegen_define_ApiClient_.hpp - codegen/codegen_define_ApiController_.hpp - codegen/codegen_define_DTO_.hpp - codegen/codegen_undef_ApiClient_.hpp - codegen/codegen_undef_ApiController_.hpp - codegen/codegen_undef_DTO_.hpp - core/Types.cpp - core/Types.hpp - core/async/Coroutine.cpp - core/async/Coroutine.hpp - core/async/Processor.cpp - core/async/Processor.hpp - core/async/Executor.cpp - core/async/Executor.hpp - core/base/CommandLineArguments.cpp - core/base/CommandLineArguments.hpp - core/base/Config.hpp - core/base/Controllable.cpp - core/base/Controllable.hpp - core/base/Environment.cpp - core/base/Environment.hpp - core/base/StrBuffer.cpp - core/base/StrBuffer.hpp - core/base/memory/Allocator.cpp - core/base/memory/Allocator.hpp - core/base/memory/MemoryPool.cpp - core/base/memory/MemoryPool.hpp - core/base/memory/ObjectPool.cpp - core/base/memory/ObjectPool.hpp - core/collection/FastQueue.cpp - core/collection/FastQueue.hpp - core/collection/LinkedList.cpp - core/collection/LinkedList.hpp - core/collection/ListMap.cpp - core/collection/ListMap.hpp - core/concurrency/Runnable.cpp - core/concurrency/Runnable.hpp - core/concurrency/SpinLock.cpp - core/concurrency/SpinLock.hpp - core/concurrency/Thread.cpp - core/concurrency/Thread.hpp - core/data/buffer/FIFOBuffer.cpp - core/data/buffer/FIFOBuffer.hpp - core/data/buffer/IOBuffer.cpp - core/data/buffer/IOBuffer.hpp - core/data/mapping/ObjectMapper.cpp - core/data/mapping/ObjectMapper.hpp - core/data/mapping/type/List.cpp - core/data/mapping/type/List.hpp - core/data/mapping/type/ListMap.cpp - core/data/mapping/type/ListMap.hpp - core/data/mapping/type/Object.cpp - core/data/mapping/type/Object.hpp - core/data/mapping/type/Primitive.cpp - core/data/mapping/type/Primitive.hpp - core/data/mapping/type/Type.cpp - core/data/mapping/type/Type.hpp - core/data/share/MemoryLabel.cpp - core/data/share/MemoryLabel.hpp - core/data/stream/ChunkedBuffer.cpp - core/data/stream/ChunkedBuffer.hpp - core/data/stream/Delegate.cpp - core/data/stream/Delegate.hpp - core/data/stream/Stream.cpp - core/data/stream/Stream.hpp - core/data/stream/StreamBufferedProxy.cpp - core/data/stream/StreamBufferedProxy.hpp - core/macro/basic.hpp - core/macro/codegen.hpp - core/macro/component.hpp - core/os/io/Library.cpp - core/os/io/Library.hpp - core/parser/ParsingCaret.cpp - core/parser/ParsingCaret.hpp - core/utils/ConversionUtils.cpp - core/utils/ConversionUtils.hpp - encoding/Base64.cpp - encoding/Base64.hpp - encoding/Hex.cpp - encoding/Hex.hpp - encoding/Unicode.cpp - encoding/Unicode.hpp - network/Connection.cpp - network/Connection.hpp - network/ConnectionProvider.cpp - network/ConnectionProvider.hpp - network/Url.cpp - network/Url.hpp - network/client/SimpleTCPConnectionProvider.cpp - network/client/SimpleTCPConnectionProvider.hpp - network/server/ConnectionHandler.cpp - network/server/ConnectionHandler.hpp - network/server/Server.cpp - network/server/Server.hpp - network/server/SimpleTCPConnectionProvider.cpp - network/server/SimpleTCPConnectionProvider.hpp - network/virtual_/Interface.cpp - network/virtual_/Interface.hpp - network/virtual_/Pipe.cpp - network/virtual_/Pipe.hpp - network/virtual_/Socket.cpp - network/virtual_/Socket.hpp - network/virtual_/client/ConnectionProvider.cpp - network/virtual_/client/ConnectionProvider.hpp - network/virtual_/server/ConnectionProvider.cpp - network/virtual_/server/ConnectionProvider.hpp - parser/json/Utils.cpp - parser/json/Utils.hpp - parser/json/mapping/Deserializer.cpp - parser/json/mapping/Deserializer.hpp - parser/json/mapping/ObjectMapper.cpp - parser/json/mapping/ObjectMapper.hpp - parser/json/mapping/Serializer.cpp - parser/json/mapping/Serializer.hpp - web/client/ApiClient.cpp - web/client/ApiClient.hpp - web/client/HttpRequestExecutor.cpp - web/client/HttpRequestExecutor.hpp - web/client/RequestExecutor.cpp - web/client/RequestExecutor.hpp - web/protocol/CommunicationError.cpp - web/protocol/CommunicationError.hpp - web/protocol/http/Http.cpp - web/protocol/http/Http.hpp - web/protocol/http/incoming/BodyDecoder.cpp - web/protocol/http/incoming/BodyDecoder.hpp - web/protocol/http/incoming/Request.cpp - web/protocol/http/incoming/Request.hpp - web/protocol/http/incoming/RequestHeadersReader.cpp - web/protocol/http/incoming/RequestHeadersReader.hpp - web/protocol/http/incoming/Response.cpp - web/protocol/http/incoming/Response.hpp - web/protocol/http/incoming/ResponseHeadersReader.cpp - web/protocol/http/incoming/ResponseHeadersReader.hpp - web/protocol/http/incoming/SimpleBodyDecoder.cpp - web/protocol/http/incoming/SimpleBodyDecoder.hpp - web/protocol/http/outgoing/Body.cpp - web/protocol/http/outgoing/Body.hpp - web/protocol/http/outgoing/BufferBody.cpp - web/protocol/http/outgoing/BufferBody.hpp - web/protocol/http/outgoing/ChunkedBufferBody.cpp - web/protocol/http/outgoing/ChunkedBufferBody.hpp - web/protocol/http/outgoing/CommunicationUtils.cpp - web/protocol/http/outgoing/CommunicationUtils.hpp - web/protocol/http/outgoing/DtoBody.cpp - web/protocol/http/outgoing/DtoBody.hpp - web/protocol/http/outgoing/Request.cpp - web/protocol/http/outgoing/Request.hpp - web/protocol/http/outgoing/Response.cpp - web/protocol/http/outgoing/Response.hpp - web/protocol/http/outgoing/ResponseFactory.cpp - web/protocol/http/outgoing/ResponseFactory.hpp - web/server/AsyncHttpConnectionHandler.cpp - web/server/AsyncHttpConnectionHandler.hpp - web/server/HttpConnectionHandler.cpp - web/server/HttpConnectionHandler.hpp - web/server/HttpProcessor.cpp - web/server/HttpProcessor.hpp - web/server/HttpRouter.cpp - web/server/HttpRouter.hpp - web/server/api/ApiController.cpp - web/server/api/ApiController.hpp - web/server/api/Endpoint.cpp - web/server/api/Endpoint.hpp - web/server/handler/ErrorHandler.cpp - web/server/handler/ErrorHandler.hpp - web/server/handler/Interceptor.cpp - web/server/handler/Interceptor.hpp - web/url/mapping/Pattern.cpp - web/url/mapping/Pattern.hpp - web/url/mapping/Router.cpp - web/url/mapping/Router.hpp - web/url/mapping/Subscriber.cpp - web/url/mapping/Subscriber.hpp -) - -set(CMAKE_THREAD_PREFER_PTHREAD ON) -find_package(Threads REQUIRED) -target_link_libraries(oatpp PUBLIC ${CMAKE_THREAD_LIBS_INIT}) -target_include_directories(oatpp PUBLIC - $ - $ -) -set_target_properties(oatpp PROPERTIES - CXX_STANDARD 11 - CXX_EXTENSIONS OFF - CXX_STANDARD_REQUIRED ON -) -add_library(oatpp::oatpp ALIAS oatpp) - -if(OATPP_INSTALL) - include(GNUInstallDirs) - - install(TARGETS oatpp - EXPORT oatpp-targets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ) - install(DIRECTORY algorithm codegen core encoding network parser web - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/oatpp - FILES_MATCHING PATTERN "*.hpp" - ) - install(EXPORT oatpp-targets - FILE oatppTargets.cmake - NAMESPACE oatpp:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/oatpp - ) - include(CMakePackageConfigHelpers) - string(CONCAT oatppConfig_cmake_in - "@PACKAGE_INIT@\n" - "\n" - "set_and_check(oatpp_INCLUDE_DIRS \"\$\{PACKAGE_PREFIX_DIR\}/include\")\n" - "if(NOT TARGET oatpp::oatpp)\n" - " include(\"\$\{CMAKE_CURRENT_LIST_DIR\}/oatppTargets.cmake\")\n" - "endif()\n" - "set(oatpp_LIBRARIES \"oatpp::oatpp\")\n" - ) - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/oatppConfig.cmake.in" "${oatppConfig_cmake_in}") - - configure_package_config_file(${CMAKE_CURRENT_BINARY_DIR}/oatppConfig.cmake.in - oatppConfig.cmake - INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/oatpp" - NO_CHECK_REQUIRED_COMPONENTS_MACRO - ) - write_basic_package_version_file(oatppConfigVersion.cmake - VERSION ${oatpp_VERSION} - COMPATIBILITY SameMajorVersion - ) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/oatppConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/oatppConfigVersion.cmake" - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/oatpp" - ) -endif() +add_subdirectory(src) if(OATPP_BUILD_TESTS) enable_testing() - - add_executable(oatppAllTests - test/AllTestsMain.cpp - test/Checker.cpp - test/Checker.hpp - test/UnitTest.cpp - test/UnitTest.hpp - test/core/base/CommandLineArgumentsTest.cpp - test/core/base/CommandLineArgumentsTest.hpp - test/core/base/RegRuleTest.cpp - test/core/base/RegRuleTest.hpp - test/core/base/collection/LinkedListTest.cpp - test/core/base/collection/LinkedListTest.hpp - test/core/base/memory/MemoryPoolTest.cpp - test/core/base/memory/MemoryPoolTest.hpp - test/core/base/memory/PerfTest.cpp - test/core/base/memory/PerfTest.hpp - test/core/data/mapping/type/TypeTest.cpp - test/core/data/mapping/type/TypeTest.hpp - test/core/data/share/MemoryLabelTest.cpp - test/core/data/share/MemoryLabelTest.hpp - test/encoding/Base64Test.cpp - test/encoding/Base64Test.hpp - test/encoding/UnicodeTest.cpp - test/encoding/UnicodeTest.hpp - test/network/virtual_/InterfaceTest.cpp - test/network/virtual_/InterfaceTest.hpp - test/network/virtual_/PipeTest.cpp - test/network/virtual_/PipeTest.hpp - test/parser/json/mapping/DTOMapperPerfTest.cpp - test/parser/json/mapping/DTOMapperPerfTest.hpp - test/parser/json/mapping/DTOMapperTest.cpp - test/parser/json/mapping/DTOMapperTest.hpp - test/parser/json/mapping/DeserializerTest.cpp - test/parser/json/mapping/DeserializerTest.hpp - test/web/FullAsyncTest.cpp - test/web/FullAsyncTest.hpp - test/web/FullTest.cpp - test/web/FullTest.hpp - test/web/app/Client.hpp - test/web/app/Controller.hpp - test/web/app/ControllerAsync.hpp - test/web/app/DTOs.hpp - ) - target_link_libraries(oatppAllTests PRIVATE oatpp) - set_target_properties(oatppAllTests PROPERTIES - CXX_STANDARD 11 - CXX_EXTENSIONS OFF - CXX_STANDARD_REQUIRED ON - ) - target_compile_definitions(oatppAllTests - PRIVATE OATPP_ENABLE_ALL_TESTS_MAIN - ) - add_test(oatppAllTests oatppAllTests) + add_subdirectory(test) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 00000000..02f7cb96 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,260 @@ + +add_library(oatpp + oatpp/algorithm/CRC.cpp + oatpp/algorithm/CRC.hpp + oatpp/codegen/codegen_define_ApiClient_.hpp + oatpp/codegen/codegen_define_ApiController_.hpp + oatpp/codegen/codegen_define_DTO_.hpp + oatpp/codegen/codegen_undef_ApiClient_.hpp + oatpp/codegen/codegen_undef_ApiController_.hpp + oatpp/codegen/codegen_undef_DTO_.hpp + oatpp/core/Types.cpp + oatpp/core/Types.hpp + oatpp/core/async/Coroutine.cpp + oatpp/core/async/Coroutine.hpp + oatpp/core/async/Executor.cpp + oatpp/core/async/Executor.hpp + oatpp/core/async/Processor.cpp + oatpp/core/async/Processor.hpp + oatpp/core/base/CommandLineArguments.cpp + oatpp/core/base/CommandLineArguments.hpp + oatpp/core/base/Config.hpp + oatpp/core/base/Controllable.cpp + oatpp/core/base/Controllable.hpp + oatpp/core/base/Environment.cpp + oatpp/core/base/Environment.hpp + oatpp/core/base/StrBuffer.cpp + oatpp/core/base/StrBuffer.hpp + oatpp/core/base/memory/Allocator.cpp + oatpp/core/base/memory/Allocator.hpp + oatpp/core/base/memory/MemoryPool.cpp + oatpp/core/base/memory/MemoryPool.hpp + oatpp/core/base/memory/ObjectPool.cpp + oatpp/core/base/memory/ObjectPool.hpp + oatpp/core/collection/FastQueue.cpp + oatpp/core/collection/FastQueue.hpp + oatpp/core/collection/LinkedList.cpp + oatpp/core/collection/LinkedList.hpp + oatpp/core/collection/ListMap.cpp + oatpp/core/collection/ListMap.hpp + oatpp/core/concurrency/Runnable.cpp + oatpp/core/concurrency/Runnable.hpp + oatpp/core/concurrency/SpinLock.cpp + oatpp/core/concurrency/SpinLock.hpp + oatpp/core/concurrency/Thread.cpp + oatpp/core/concurrency/Thread.hpp + oatpp/core/data/buffer/FIFOBuffer.cpp + oatpp/core/data/buffer/FIFOBuffer.hpp + oatpp/core/data/buffer/IOBuffer.cpp + oatpp/core/data/buffer/IOBuffer.hpp + oatpp/core/data/mapping/ObjectMapper.cpp + oatpp/core/data/mapping/ObjectMapper.hpp + oatpp/core/data/mapping/type/List.cpp + oatpp/core/data/mapping/type/List.hpp + oatpp/core/data/mapping/type/ListMap.cpp + oatpp/core/data/mapping/type/ListMap.hpp + oatpp/core/data/mapping/type/Object.cpp + oatpp/core/data/mapping/type/Object.hpp + oatpp/core/data/mapping/type/Primitive.cpp + oatpp/core/data/mapping/type/Primitive.hpp + oatpp/core/data/mapping/type/Type.cpp + oatpp/core/data/mapping/type/Type.hpp + oatpp/core/data/share/MemoryLabel.cpp + oatpp/core/data/share/MemoryLabel.hpp + oatpp/core/data/stream/ChunkedBuffer.cpp + oatpp/core/data/stream/ChunkedBuffer.hpp + oatpp/core/data/stream/Delegate.cpp + oatpp/core/data/stream/Delegate.hpp + oatpp/core/data/stream/Stream.cpp + 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/os/io/Library.cpp + oatpp/core/os/io/Library.hpp + oatpp/core/parser/ParsingCaret.cpp + oatpp/core/parser/ParsingCaret.hpp + oatpp/core/utils/ConversionUtils.cpp + oatpp/core/utils/ConversionUtils.hpp + oatpp/encoding/Base64.cpp + oatpp/encoding/Base64.hpp + oatpp/encoding/Hex.cpp + oatpp/encoding/Hex.hpp + oatpp/encoding/Unicode.cpp + oatpp/encoding/Unicode.hpp + oatpp/network/Connection.cpp + oatpp/network/Connection.hpp + oatpp/network/ConnectionProvider.cpp + oatpp/network/ConnectionProvider.hpp + oatpp/network/Url.cpp + oatpp/network/Url.hpp + oatpp/network/client/SimpleTCPConnectionProvider.cpp + oatpp/network/client/SimpleTCPConnectionProvider.hpp + oatpp/network/server/ConnectionHandler.cpp + oatpp/network/server/ConnectionHandler.hpp + oatpp/network/server/Server.cpp + oatpp/network/server/Server.hpp + oatpp/network/server/SimpleTCPConnectionProvider.cpp + oatpp/network/server/SimpleTCPConnectionProvider.hpp + oatpp/network/virtual_/Interface.cpp + oatpp/network/virtual_/Interface.hpp + oatpp/network/virtual_/Pipe.cpp + oatpp/network/virtual_/Pipe.hpp + oatpp/network/virtual_/Socket.cpp + oatpp/network/virtual_/Socket.hpp + oatpp/network/virtual_/client/ConnectionProvider.cpp + oatpp/network/virtual_/client/ConnectionProvider.hpp + oatpp/network/virtual_/server/ConnectionProvider.cpp + oatpp/network/virtual_/server/ConnectionProvider.hpp + oatpp/parser/json/Utils.cpp + oatpp/parser/json/Utils.hpp + oatpp/parser/json/mapping/Deserializer.cpp + oatpp/parser/json/mapping/Deserializer.hpp + oatpp/parser/json/mapping/ObjectMapper.cpp + oatpp/parser/json/mapping/ObjectMapper.hpp + oatpp/parser/json/mapping/Serializer.cpp + oatpp/parser/json/mapping/Serializer.hpp + oatpp/web/client/ApiClient.cpp + oatpp/web/client/ApiClient.hpp + oatpp/web/client/HttpRequestExecutor.cpp + oatpp/web/client/HttpRequestExecutor.hpp + oatpp/web/client/RequestExecutor.cpp + oatpp/web/client/RequestExecutor.hpp + oatpp/web/protocol/CommunicationError.cpp + oatpp/web/protocol/CommunicationError.hpp + oatpp/web/protocol/http/Http.cpp + oatpp/web/protocol/http/Http.hpp + oatpp/web/protocol/http/incoming/BodyDecoder.cpp + oatpp/web/protocol/http/incoming/BodyDecoder.hpp + oatpp/web/protocol/http/incoming/Request.cpp + oatpp/web/protocol/http/incoming/Request.hpp + oatpp/web/protocol/http/incoming/RequestHeadersReader.cpp + oatpp/web/protocol/http/incoming/RequestHeadersReader.hpp + oatpp/web/protocol/http/incoming/Response.cpp + oatpp/web/protocol/http/incoming/Response.hpp + oatpp/web/protocol/http/incoming/ResponseHeadersReader.cpp + oatpp/web/protocol/http/incoming/ResponseHeadersReader.hpp + oatpp/web/protocol/http/incoming/SimpleBodyDecoder.cpp + oatpp/web/protocol/http/incoming/SimpleBodyDecoder.hpp + oatpp/web/protocol/http/outgoing/Body.cpp + oatpp/web/protocol/http/outgoing/Body.hpp + oatpp/web/protocol/http/outgoing/BufferBody.cpp + oatpp/web/protocol/http/outgoing/BufferBody.hpp + oatpp/web/protocol/http/outgoing/ChunkedBufferBody.cpp + oatpp/web/protocol/http/outgoing/ChunkedBufferBody.hpp + oatpp/web/protocol/http/outgoing/CommunicationUtils.cpp + oatpp/web/protocol/http/outgoing/CommunicationUtils.hpp + oatpp/web/protocol/http/outgoing/DtoBody.cpp + oatpp/web/protocol/http/outgoing/DtoBody.hpp + oatpp/web/protocol/http/outgoing/Request.cpp + oatpp/web/protocol/http/outgoing/Request.hpp + oatpp/web/protocol/http/outgoing/Response.cpp + oatpp/web/protocol/http/outgoing/Response.hpp + oatpp/web/protocol/http/outgoing/ResponseFactory.cpp + oatpp/web/protocol/http/outgoing/ResponseFactory.hpp + oatpp/web/server/AsyncHttpConnectionHandler.cpp + oatpp/web/server/AsyncHttpConnectionHandler.hpp + oatpp/web/server/HttpConnectionHandler.cpp + oatpp/web/server/HttpConnectionHandler.hpp + oatpp/web/server/HttpProcessor.cpp + oatpp/web/server/HttpProcessor.hpp + oatpp/web/server/HttpRouter.cpp + oatpp/web/server/HttpRouter.hpp + oatpp/web/server/api/ApiController.cpp + oatpp/web/server/api/ApiController.hpp + oatpp/web/server/api/Endpoint.cpp + oatpp/web/server/api/Endpoint.hpp + oatpp/web/server/handler/ErrorHandler.cpp + oatpp/web/server/handler/ErrorHandler.hpp + oatpp/web/server/handler/Interceptor.cpp + oatpp/web/server/handler/Interceptor.hpp + oatpp/web/url/mapping/Pattern.cpp + oatpp/web/url/mapping/Pattern.hpp + oatpp/web/url/mapping/Router.cpp + oatpp/web/url/mapping/Router.hpp + oatpp/web/url/mapping/Subscriber.cpp + oatpp/web/url/mapping/Subscriber.hpp +) + +set(CMAKE_THREAD_PREFER_PTHREAD ON) +find_package(Threads REQUIRED) +target_link_libraries(oatpp PUBLIC ${CMAKE_THREAD_LIBS_INIT}) +target_include_directories(oatpp PUBLIC + $ + $ +) +set_target_properties(oatpp PROPERTIES + CXX_STANDARD 11 + CXX_EXTENSIONS OFF + CXX_STANDARD_REQUIRED ON +) +add_library(oatpp::oatpp ALIAS oatpp) + +add_library(oatpp-test + oatpp-test/Checker.cpp + oatpp-test/Checker.hpp + oatpp-test/UnitTest.cpp + oatpp-test/UnitTest.hpp +) + +target_link_libraries(oatpp-test PUBLIC oatpp) +set_target_properties(oatpp-test PROPERTIES + CXX_STANDARD 11 + CXX_EXTENSIONS OFF + CXX_STANDARD_REQUIRED ON +) +target_include_directories(oatpp-test PUBLIC + $ + $ +) + +add_dependencies(oatpp-test oatpp) +add_library(oatpp::oatpp-test ALIAS oatpp-test) + +if(OATPP_INSTALL) + include(GNUInstallDirs) + + install(TARGETS oatpp + EXPORT oatpp-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + install(DIRECTORY oatpp oatpp-test + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING PATTERN "*.hpp" + ) + install(EXPORT oatpp-targets + FILE oatppTargets.cmake + NAMESPACE oatpp:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/oatpp + ) + include(CMakePackageConfigHelpers) + string(CONCAT oatppConfig_cmake_in + "@PACKAGE_INIT@\n" + "\n" + "set_and_check(oatpp_INCLUDE_DIRS \"\$\{PACKAGE_PREFIX_DIR\}/include\")\n" + "if(NOT TARGET oatpp::oatpp)\n" + " include(\"\$\{CMAKE_CURRENT_LIST_DIR\}/oatppTargets.cmake\")\n" + "endif()\n" + "set(oatpp_LIBRARIES \"oatpp::oatpp\")\n" + ) + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/oatppConfig.cmake.in" "${oatppConfig_cmake_in}") + + configure_package_config_file(${CMAKE_CURRENT_BINARY_DIR}/oatppConfig.cmake.in + oatppConfig.cmake + INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/oatpp" + NO_CHECK_REQUIRED_COMPONENTS_MACRO + ) + write_basic_package_version_file(oatppConfigVersion.cmake + VERSION ${oatpp_VERSION} + COMPATIBILITY SameMajorVersion + ) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/oatppConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/oatppConfigVersion.cmake" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/oatpp" + ) +endif() + + diff --git a/test/Checker.cpp b/src/oatpp-test/Checker.cpp similarity index 100% rename from test/Checker.cpp rename to src/oatpp-test/Checker.cpp diff --git a/test/Checker.hpp b/src/oatpp-test/Checker.hpp similarity index 100% rename from test/Checker.hpp rename to src/oatpp-test/Checker.hpp diff --git a/test/UnitTest.cpp b/src/oatpp-test/UnitTest.cpp similarity index 100% rename from test/UnitTest.cpp rename to src/oatpp-test/UnitTest.cpp diff --git a/test/UnitTest.hpp b/src/oatpp-test/UnitTest.hpp similarity index 99% rename from test/UnitTest.hpp rename to src/oatpp-test/UnitTest.hpp index f70aa50a..d3943740 100644 --- a/test/UnitTest.hpp +++ b/src/oatpp-test/UnitTest.hpp @@ -58,7 +58,7 @@ public: } }; - + #define OATPP_RUN_TEST(TEST) oatpp::test::UnitTest::runTest(1) }} diff --git a/algorithm/CRC.cpp b/src/oatpp/algorithm/CRC.cpp similarity index 100% rename from algorithm/CRC.cpp rename to src/oatpp/algorithm/CRC.cpp diff --git a/algorithm/CRC.hpp b/src/oatpp/algorithm/CRC.hpp similarity index 100% rename from algorithm/CRC.hpp rename to src/oatpp/algorithm/CRC.hpp diff --git a/codegen/codegen_define_ApiClient_.hpp b/src/oatpp/codegen/codegen_define_ApiClient_.hpp similarity index 100% rename from codegen/codegen_define_ApiClient_.hpp rename to src/oatpp/codegen/codegen_define_ApiClient_.hpp diff --git a/codegen/codegen_define_ApiController_.hpp b/src/oatpp/codegen/codegen_define_ApiController_.hpp similarity index 100% rename from codegen/codegen_define_ApiController_.hpp rename to src/oatpp/codegen/codegen_define_ApiController_.hpp diff --git a/codegen/codegen_define_DTO_.hpp b/src/oatpp/codegen/codegen_define_DTO_.hpp similarity index 100% rename from codegen/codegen_define_DTO_.hpp rename to src/oatpp/codegen/codegen_define_DTO_.hpp diff --git a/codegen/codegen_undef_ApiClient_.hpp b/src/oatpp/codegen/codegen_undef_ApiClient_.hpp similarity index 100% rename from codegen/codegen_undef_ApiClient_.hpp rename to src/oatpp/codegen/codegen_undef_ApiClient_.hpp diff --git a/codegen/codegen_undef_ApiController_.hpp b/src/oatpp/codegen/codegen_undef_ApiController_.hpp similarity index 100% rename from codegen/codegen_undef_ApiController_.hpp rename to src/oatpp/codegen/codegen_undef_ApiController_.hpp diff --git a/codegen/codegen_undef_DTO_.hpp b/src/oatpp/codegen/codegen_undef_DTO_.hpp similarity index 100% rename from codegen/codegen_undef_DTO_.hpp rename to src/oatpp/codegen/codegen_undef_DTO_.hpp diff --git a/core/Types.cpp b/src/oatpp/core/Types.cpp similarity index 100% rename from core/Types.cpp rename to src/oatpp/core/Types.cpp diff --git a/core/Types.hpp b/src/oatpp/core/Types.hpp similarity index 100% rename from core/Types.hpp rename to src/oatpp/core/Types.hpp diff --git a/core/async/Coroutine.cpp b/src/oatpp/core/async/Coroutine.cpp similarity index 100% rename from core/async/Coroutine.cpp rename to src/oatpp/core/async/Coroutine.cpp diff --git a/core/async/Coroutine.hpp b/src/oatpp/core/async/Coroutine.hpp similarity index 100% rename from core/async/Coroutine.hpp rename to src/oatpp/core/async/Coroutine.hpp diff --git a/core/async/Executor.cpp b/src/oatpp/core/async/Executor.cpp similarity index 100% rename from core/async/Executor.cpp rename to src/oatpp/core/async/Executor.cpp diff --git a/core/async/Executor.hpp b/src/oatpp/core/async/Executor.hpp similarity index 100% rename from core/async/Executor.hpp rename to src/oatpp/core/async/Executor.hpp diff --git a/core/async/Processor.cpp b/src/oatpp/core/async/Processor.cpp similarity index 100% rename from core/async/Processor.cpp rename to src/oatpp/core/async/Processor.cpp diff --git a/core/async/Processor.hpp b/src/oatpp/core/async/Processor.hpp similarity index 100% rename from core/async/Processor.hpp rename to src/oatpp/core/async/Processor.hpp diff --git a/core/base/CommandLineArguments.cpp b/src/oatpp/core/base/CommandLineArguments.cpp similarity index 100% rename from core/base/CommandLineArguments.cpp rename to src/oatpp/core/base/CommandLineArguments.cpp diff --git a/core/base/CommandLineArguments.hpp b/src/oatpp/core/base/CommandLineArguments.hpp similarity index 100% rename from core/base/CommandLineArguments.hpp rename to src/oatpp/core/base/CommandLineArguments.hpp diff --git a/core/base/Config.hpp b/src/oatpp/core/base/Config.hpp similarity index 100% rename from core/base/Config.hpp rename to src/oatpp/core/base/Config.hpp diff --git a/core/base/Controllable.cpp b/src/oatpp/core/base/Controllable.cpp similarity index 100% rename from core/base/Controllable.cpp rename to src/oatpp/core/base/Controllable.cpp diff --git a/core/base/Controllable.hpp b/src/oatpp/core/base/Controllable.hpp similarity index 100% rename from core/base/Controllable.hpp rename to src/oatpp/core/base/Controllable.hpp diff --git a/core/base/Environment.cpp b/src/oatpp/core/base/Environment.cpp similarity index 100% rename from core/base/Environment.cpp rename to src/oatpp/core/base/Environment.cpp diff --git a/core/base/Environment.hpp b/src/oatpp/core/base/Environment.hpp similarity index 99% rename from core/base/Environment.hpp rename to src/oatpp/core/base/Environment.hpp index 2543042b..3fb4005b 100644 --- a/core/base/Environment.hpp +++ b/src/oatpp/core/base/Environment.hpp @@ -38,12 +38,6 @@ #define OATPP_VERSION "0.18.12" -#define OATPP_ASSERT(EXP) \ -if(!(EXP)) { \ - OATPP_LOGE("ASSERT[FAILED]", #EXP); \ - exit(EXIT_FAILURE); \ -} - typedef unsigned char v_char8; typedef v_char8 *p_char8; @@ -80,7 +74,7 @@ namespace oatpp { namespace base{ class Logger { public: - virtual ~Logger(){}; + virtual ~Logger() = default; virtual void log(v_int32 priority, const std::string& tag, const std::string& message) = 0; }; @@ -159,6 +153,12 @@ public: static v_int64 getMicroTickCount(); }; + +#define OATPP_ASSERT(EXP) \ +if(!(EXP)) { \ + OATPP_LOGE("ASSERT[FAILED]", #EXP); \ + exit(EXIT_FAILURE); \ +} #ifndef OATPP_DISABLE_LOGV #define OATPP_LOGV(TAG, ...) oatpp::base::Environment::logFormatted(0, TAG, __VA_ARGS__); diff --git a/core/base/StrBuffer.cpp b/src/oatpp/core/base/StrBuffer.cpp similarity index 100% rename from core/base/StrBuffer.cpp rename to src/oatpp/core/base/StrBuffer.cpp diff --git a/core/base/StrBuffer.hpp b/src/oatpp/core/base/StrBuffer.hpp similarity index 100% rename from core/base/StrBuffer.hpp rename to src/oatpp/core/base/StrBuffer.hpp diff --git a/core/base/memory/Allocator.cpp b/src/oatpp/core/base/memory/Allocator.cpp similarity index 100% rename from core/base/memory/Allocator.cpp rename to src/oatpp/core/base/memory/Allocator.cpp diff --git a/core/base/memory/Allocator.hpp b/src/oatpp/core/base/memory/Allocator.hpp similarity index 100% rename from core/base/memory/Allocator.hpp rename to src/oatpp/core/base/memory/Allocator.hpp diff --git a/core/base/memory/MemoryPool.cpp b/src/oatpp/core/base/memory/MemoryPool.cpp similarity index 100% rename from core/base/memory/MemoryPool.cpp rename to src/oatpp/core/base/memory/MemoryPool.cpp diff --git a/core/base/memory/MemoryPool.hpp b/src/oatpp/core/base/memory/MemoryPool.hpp similarity index 100% rename from core/base/memory/MemoryPool.hpp rename to src/oatpp/core/base/memory/MemoryPool.hpp diff --git a/core/base/memory/ObjectPool.cpp b/src/oatpp/core/base/memory/ObjectPool.cpp similarity index 100% rename from core/base/memory/ObjectPool.cpp rename to src/oatpp/core/base/memory/ObjectPool.cpp diff --git a/core/base/memory/ObjectPool.hpp b/src/oatpp/core/base/memory/ObjectPool.hpp similarity index 100% rename from core/base/memory/ObjectPool.hpp rename to src/oatpp/core/base/memory/ObjectPool.hpp diff --git a/core/collection/FastQueue.cpp b/src/oatpp/core/collection/FastQueue.cpp similarity index 100% rename from core/collection/FastQueue.cpp rename to src/oatpp/core/collection/FastQueue.cpp diff --git a/core/collection/FastQueue.hpp b/src/oatpp/core/collection/FastQueue.hpp similarity index 100% rename from core/collection/FastQueue.hpp rename to src/oatpp/core/collection/FastQueue.hpp diff --git a/core/collection/LinkedList.cpp b/src/oatpp/core/collection/LinkedList.cpp similarity index 100% rename from core/collection/LinkedList.cpp rename to src/oatpp/core/collection/LinkedList.cpp diff --git a/core/collection/LinkedList.hpp b/src/oatpp/core/collection/LinkedList.hpp similarity index 100% rename from core/collection/LinkedList.hpp rename to src/oatpp/core/collection/LinkedList.hpp diff --git a/core/collection/ListMap.cpp b/src/oatpp/core/collection/ListMap.cpp similarity index 100% rename from core/collection/ListMap.cpp rename to src/oatpp/core/collection/ListMap.cpp diff --git a/core/collection/ListMap.hpp b/src/oatpp/core/collection/ListMap.hpp similarity index 100% rename from core/collection/ListMap.hpp rename to src/oatpp/core/collection/ListMap.hpp diff --git a/core/concurrency/Runnable.cpp b/src/oatpp/core/concurrency/Runnable.cpp similarity index 100% rename from core/concurrency/Runnable.cpp rename to src/oatpp/core/concurrency/Runnable.cpp diff --git a/core/concurrency/Runnable.hpp b/src/oatpp/core/concurrency/Runnable.hpp similarity index 100% rename from core/concurrency/Runnable.hpp rename to src/oatpp/core/concurrency/Runnable.hpp diff --git a/core/concurrency/SpinLock.cpp b/src/oatpp/core/concurrency/SpinLock.cpp similarity index 100% rename from core/concurrency/SpinLock.cpp rename to src/oatpp/core/concurrency/SpinLock.cpp diff --git a/core/concurrency/SpinLock.hpp b/src/oatpp/core/concurrency/SpinLock.hpp similarity index 100% rename from core/concurrency/SpinLock.hpp rename to src/oatpp/core/concurrency/SpinLock.hpp diff --git a/core/concurrency/Thread.cpp b/src/oatpp/core/concurrency/Thread.cpp similarity index 100% rename from core/concurrency/Thread.cpp rename to src/oatpp/core/concurrency/Thread.cpp diff --git a/core/concurrency/Thread.hpp b/src/oatpp/core/concurrency/Thread.hpp similarity index 100% rename from core/concurrency/Thread.hpp rename to src/oatpp/core/concurrency/Thread.hpp diff --git a/core/data/buffer/FIFOBuffer.cpp b/src/oatpp/core/data/buffer/FIFOBuffer.cpp similarity index 100% rename from core/data/buffer/FIFOBuffer.cpp rename to src/oatpp/core/data/buffer/FIFOBuffer.cpp diff --git a/core/data/buffer/FIFOBuffer.hpp b/src/oatpp/core/data/buffer/FIFOBuffer.hpp similarity index 100% rename from core/data/buffer/FIFOBuffer.hpp rename to src/oatpp/core/data/buffer/FIFOBuffer.hpp diff --git a/core/data/buffer/IOBuffer.cpp b/src/oatpp/core/data/buffer/IOBuffer.cpp similarity index 100% rename from core/data/buffer/IOBuffer.cpp rename to src/oatpp/core/data/buffer/IOBuffer.cpp diff --git a/core/data/buffer/IOBuffer.hpp b/src/oatpp/core/data/buffer/IOBuffer.hpp similarity index 100% rename from core/data/buffer/IOBuffer.hpp rename to src/oatpp/core/data/buffer/IOBuffer.hpp diff --git a/core/data/mapping/ObjectMapper.cpp b/src/oatpp/core/data/mapping/ObjectMapper.cpp similarity index 100% rename from core/data/mapping/ObjectMapper.cpp rename to src/oatpp/core/data/mapping/ObjectMapper.cpp diff --git a/core/data/mapping/ObjectMapper.hpp b/src/oatpp/core/data/mapping/ObjectMapper.hpp similarity index 100% rename from core/data/mapping/ObjectMapper.hpp rename to src/oatpp/core/data/mapping/ObjectMapper.hpp diff --git a/core/data/mapping/type/List.cpp b/src/oatpp/core/data/mapping/type/List.cpp similarity index 100% rename from core/data/mapping/type/List.cpp rename to src/oatpp/core/data/mapping/type/List.cpp diff --git a/core/data/mapping/type/List.hpp b/src/oatpp/core/data/mapping/type/List.hpp similarity index 100% rename from core/data/mapping/type/List.hpp rename to src/oatpp/core/data/mapping/type/List.hpp diff --git a/core/data/mapping/type/ListMap.cpp b/src/oatpp/core/data/mapping/type/ListMap.cpp similarity index 100% rename from core/data/mapping/type/ListMap.cpp rename to src/oatpp/core/data/mapping/type/ListMap.cpp diff --git a/core/data/mapping/type/ListMap.hpp b/src/oatpp/core/data/mapping/type/ListMap.hpp similarity index 100% rename from core/data/mapping/type/ListMap.hpp rename to src/oatpp/core/data/mapping/type/ListMap.hpp diff --git a/core/data/mapping/type/Object.cpp b/src/oatpp/core/data/mapping/type/Object.cpp similarity index 100% rename from core/data/mapping/type/Object.cpp rename to src/oatpp/core/data/mapping/type/Object.cpp diff --git a/core/data/mapping/type/Object.hpp b/src/oatpp/core/data/mapping/type/Object.hpp similarity index 100% rename from core/data/mapping/type/Object.hpp rename to src/oatpp/core/data/mapping/type/Object.hpp diff --git a/core/data/mapping/type/Primitive.cpp b/src/oatpp/core/data/mapping/type/Primitive.cpp similarity index 100% rename from core/data/mapping/type/Primitive.cpp rename to src/oatpp/core/data/mapping/type/Primitive.cpp diff --git a/core/data/mapping/type/Primitive.hpp b/src/oatpp/core/data/mapping/type/Primitive.hpp similarity index 100% rename from core/data/mapping/type/Primitive.hpp rename to src/oatpp/core/data/mapping/type/Primitive.hpp diff --git a/core/data/mapping/type/Type.cpp b/src/oatpp/core/data/mapping/type/Type.cpp similarity index 100% rename from core/data/mapping/type/Type.cpp rename to src/oatpp/core/data/mapping/type/Type.cpp diff --git a/core/data/mapping/type/Type.hpp b/src/oatpp/core/data/mapping/type/Type.hpp similarity index 100% rename from core/data/mapping/type/Type.hpp rename to src/oatpp/core/data/mapping/type/Type.hpp diff --git a/core/data/share/MemoryLabel.cpp b/src/oatpp/core/data/share/MemoryLabel.cpp similarity index 100% rename from core/data/share/MemoryLabel.cpp rename to src/oatpp/core/data/share/MemoryLabel.cpp diff --git a/core/data/share/MemoryLabel.hpp b/src/oatpp/core/data/share/MemoryLabel.hpp similarity index 100% rename from core/data/share/MemoryLabel.hpp rename to src/oatpp/core/data/share/MemoryLabel.hpp diff --git a/core/data/stream/ChunkedBuffer.cpp b/src/oatpp/core/data/stream/ChunkedBuffer.cpp similarity index 100% rename from core/data/stream/ChunkedBuffer.cpp rename to src/oatpp/core/data/stream/ChunkedBuffer.cpp diff --git a/core/data/stream/ChunkedBuffer.hpp b/src/oatpp/core/data/stream/ChunkedBuffer.hpp similarity index 100% rename from core/data/stream/ChunkedBuffer.hpp rename to src/oatpp/core/data/stream/ChunkedBuffer.hpp diff --git a/core/data/stream/Delegate.cpp b/src/oatpp/core/data/stream/Delegate.cpp similarity index 100% rename from core/data/stream/Delegate.cpp rename to src/oatpp/core/data/stream/Delegate.cpp diff --git a/core/data/stream/Delegate.hpp b/src/oatpp/core/data/stream/Delegate.hpp similarity index 100% rename from core/data/stream/Delegate.hpp rename to src/oatpp/core/data/stream/Delegate.hpp diff --git a/core/data/stream/Stream.cpp b/src/oatpp/core/data/stream/Stream.cpp similarity index 100% rename from core/data/stream/Stream.cpp rename to src/oatpp/core/data/stream/Stream.cpp diff --git a/core/data/stream/Stream.hpp b/src/oatpp/core/data/stream/Stream.hpp similarity index 100% rename from core/data/stream/Stream.hpp rename to src/oatpp/core/data/stream/Stream.hpp diff --git a/core/data/stream/StreamBufferedProxy.cpp b/src/oatpp/core/data/stream/StreamBufferedProxy.cpp similarity index 100% rename from core/data/stream/StreamBufferedProxy.cpp rename to src/oatpp/core/data/stream/StreamBufferedProxy.cpp diff --git a/core/data/stream/StreamBufferedProxy.hpp b/src/oatpp/core/data/stream/StreamBufferedProxy.hpp similarity index 100% rename from core/data/stream/StreamBufferedProxy.hpp rename to src/oatpp/core/data/stream/StreamBufferedProxy.hpp diff --git a/core/macro/basic.hpp b/src/oatpp/core/macro/basic.hpp similarity index 100% rename from core/macro/basic.hpp rename to src/oatpp/core/macro/basic.hpp diff --git a/core/macro/codegen.hpp b/src/oatpp/core/macro/codegen.hpp similarity index 100% rename from core/macro/codegen.hpp rename to src/oatpp/core/macro/codegen.hpp diff --git a/core/macro/component.hpp b/src/oatpp/core/macro/component.hpp similarity index 100% rename from core/macro/component.hpp rename to src/oatpp/core/macro/component.hpp diff --git a/core/os/io/Library.cpp b/src/oatpp/core/os/io/Library.cpp similarity index 100% rename from core/os/io/Library.cpp rename to src/oatpp/core/os/io/Library.cpp diff --git a/core/os/io/Library.hpp b/src/oatpp/core/os/io/Library.hpp similarity index 100% rename from core/os/io/Library.hpp rename to src/oatpp/core/os/io/Library.hpp diff --git a/core/parser/ParsingCaret.cpp b/src/oatpp/core/parser/ParsingCaret.cpp similarity index 100% rename from core/parser/ParsingCaret.cpp rename to src/oatpp/core/parser/ParsingCaret.cpp diff --git a/core/parser/ParsingCaret.hpp b/src/oatpp/core/parser/ParsingCaret.hpp similarity index 100% rename from core/parser/ParsingCaret.hpp rename to src/oatpp/core/parser/ParsingCaret.hpp diff --git a/core/utils/ConversionUtils.cpp b/src/oatpp/core/utils/ConversionUtils.cpp similarity index 100% rename from core/utils/ConversionUtils.cpp rename to src/oatpp/core/utils/ConversionUtils.cpp diff --git a/core/utils/ConversionUtils.hpp b/src/oatpp/core/utils/ConversionUtils.hpp similarity index 100% rename from core/utils/ConversionUtils.hpp rename to src/oatpp/core/utils/ConversionUtils.hpp diff --git a/encoding/Base64.cpp b/src/oatpp/encoding/Base64.cpp similarity index 100% rename from encoding/Base64.cpp rename to src/oatpp/encoding/Base64.cpp diff --git a/encoding/Base64.hpp b/src/oatpp/encoding/Base64.hpp similarity index 100% rename from encoding/Base64.hpp rename to src/oatpp/encoding/Base64.hpp diff --git a/encoding/Hex.cpp b/src/oatpp/encoding/Hex.cpp similarity index 100% rename from encoding/Hex.cpp rename to src/oatpp/encoding/Hex.cpp diff --git a/encoding/Hex.hpp b/src/oatpp/encoding/Hex.hpp similarity index 100% rename from encoding/Hex.hpp rename to src/oatpp/encoding/Hex.hpp diff --git a/encoding/Unicode.cpp b/src/oatpp/encoding/Unicode.cpp similarity index 100% rename from encoding/Unicode.cpp rename to src/oatpp/encoding/Unicode.cpp diff --git a/encoding/Unicode.hpp b/src/oatpp/encoding/Unicode.hpp similarity index 100% rename from encoding/Unicode.hpp rename to src/oatpp/encoding/Unicode.hpp diff --git a/network/Connection.cpp b/src/oatpp/network/Connection.cpp similarity index 100% rename from network/Connection.cpp rename to src/oatpp/network/Connection.cpp diff --git a/network/Connection.hpp b/src/oatpp/network/Connection.hpp similarity index 100% rename from network/Connection.hpp rename to src/oatpp/network/Connection.hpp diff --git a/network/ConnectionProvider.cpp b/src/oatpp/network/ConnectionProvider.cpp similarity index 100% rename from network/ConnectionProvider.cpp rename to src/oatpp/network/ConnectionProvider.cpp diff --git a/network/ConnectionProvider.hpp b/src/oatpp/network/ConnectionProvider.hpp similarity index 100% rename from network/ConnectionProvider.hpp rename to src/oatpp/network/ConnectionProvider.hpp diff --git a/network/Url.cpp b/src/oatpp/network/Url.cpp similarity index 100% rename from network/Url.cpp rename to src/oatpp/network/Url.cpp diff --git a/network/Url.hpp b/src/oatpp/network/Url.hpp similarity index 100% rename from network/Url.hpp rename to src/oatpp/network/Url.hpp diff --git a/network/client/SimpleTCPConnectionProvider.cpp b/src/oatpp/network/client/SimpleTCPConnectionProvider.cpp similarity index 99% rename from network/client/SimpleTCPConnectionProvider.cpp rename to src/oatpp/network/client/SimpleTCPConnectionProvider.cpp index c6c7b047..8c8fdd05 100644 --- a/network/client/SimpleTCPConnectionProvider.cpp +++ b/src/oatpp/network/client/SimpleTCPConnectionProvider.cpp @@ -27,7 +27,6 @@ #include "oatpp/network/Connection.hpp" #include "oatpp/core/data/stream/ChunkedBuffer.hpp" #include "oatpp/core/utils/ConversionUtils.hpp" -#include "oatpp/test/Checker.hpp" #include #include diff --git a/network/client/SimpleTCPConnectionProvider.hpp b/src/oatpp/network/client/SimpleTCPConnectionProvider.hpp similarity index 100% rename from network/client/SimpleTCPConnectionProvider.hpp rename to src/oatpp/network/client/SimpleTCPConnectionProvider.hpp diff --git a/network/server/ConnectionHandler.cpp b/src/oatpp/network/server/ConnectionHandler.cpp similarity index 100% rename from network/server/ConnectionHandler.cpp rename to src/oatpp/network/server/ConnectionHandler.cpp diff --git a/network/server/ConnectionHandler.hpp b/src/oatpp/network/server/ConnectionHandler.hpp similarity index 100% rename from network/server/ConnectionHandler.hpp rename to src/oatpp/network/server/ConnectionHandler.hpp diff --git a/network/server/Server.cpp b/src/oatpp/network/server/Server.cpp similarity index 98% rename from network/server/Server.cpp rename to src/oatpp/network/server/Server.cpp index 0c4e2913..052c8707 100644 --- a/network/server/Server.cpp +++ b/src/oatpp/network/server/Server.cpp @@ -24,8 +24,6 @@ #include "Server.hpp" -#include "oatpp/test/Checker.hpp" - #include #include diff --git a/network/server/Server.hpp b/src/oatpp/network/server/Server.hpp similarity index 100% rename from network/server/Server.hpp rename to src/oatpp/network/server/Server.hpp diff --git a/network/server/SimpleTCPConnectionProvider.cpp b/src/oatpp/network/server/SimpleTCPConnectionProvider.cpp similarity index 99% rename from network/server/SimpleTCPConnectionProvider.cpp rename to src/oatpp/network/server/SimpleTCPConnectionProvider.cpp index 8b43563c..628df174 100644 --- a/network/server/SimpleTCPConnectionProvider.cpp +++ b/src/oatpp/network/server/SimpleTCPConnectionProvider.cpp @@ -27,7 +27,6 @@ #include "oatpp/network/Connection.hpp" #include "oatpp/core/utils/ConversionUtils.hpp" -#include "oatpp/test/Checker.hpp" #include #include diff --git a/network/server/SimpleTCPConnectionProvider.hpp b/src/oatpp/network/server/SimpleTCPConnectionProvider.hpp similarity index 100% rename from network/server/SimpleTCPConnectionProvider.hpp rename to src/oatpp/network/server/SimpleTCPConnectionProvider.hpp diff --git a/network/virtual_/Interface.cpp b/src/oatpp/network/virtual_/Interface.cpp similarity index 100% rename from network/virtual_/Interface.cpp rename to src/oatpp/network/virtual_/Interface.cpp diff --git a/network/virtual_/Interface.hpp b/src/oatpp/network/virtual_/Interface.hpp similarity index 100% rename from network/virtual_/Interface.hpp rename to src/oatpp/network/virtual_/Interface.hpp diff --git a/network/virtual_/Pipe.cpp b/src/oatpp/network/virtual_/Pipe.cpp similarity index 100% rename from network/virtual_/Pipe.cpp rename to src/oatpp/network/virtual_/Pipe.cpp diff --git a/network/virtual_/Pipe.hpp b/src/oatpp/network/virtual_/Pipe.hpp similarity index 100% rename from network/virtual_/Pipe.hpp rename to src/oatpp/network/virtual_/Pipe.hpp diff --git a/network/virtual_/Socket.cpp b/src/oatpp/network/virtual_/Socket.cpp similarity index 100% rename from network/virtual_/Socket.cpp rename to src/oatpp/network/virtual_/Socket.cpp diff --git a/network/virtual_/Socket.hpp b/src/oatpp/network/virtual_/Socket.hpp similarity index 100% rename from network/virtual_/Socket.hpp rename to src/oatpp/network/virtual_/Socket.hpp diff --git a/network/virtual_/client/ConnectionProvider.cpp b/src/oatpp/network/virtual_/client/ConnectionProvider.cpp similarity index 100% rename from network/virtual_/client/ConnectionProvider.cpp rename to src/oatpp/network/virtual_/client/ConnectionProvider.cpp diff --git a/network/virtual_/client/ConnectionProvider.hpp b/src/oatpp/network/virtual_/client/ConnectionProvider.hpp similarity index 100% rename from network/virtual_/client/ConnectionProvider.hpp rename to src/oatpp/network/virtual_/client/ConnectionProvider.hpp diff --git a/network/virtual_/server/ConnectionProvider.cpp b/src/oatpp/network/virtual_/server/ConnectionProvider.cpp similarity index 100% rename from network/virtual_/server/ConnectionProvider.cpp rename to src/oatpp/network/virtual_/server/ConnectionProvider.cpp diff --git a/network/virtual_/server/ConnectionProvider.hpp b/src/oatpp/network/virtual_/server/ConnectionProvider.hpp similarity index 100% rename from network/virtual_/server/ConnectionProvider.hpp rename to src/oatpp/network/virtual_/server/ConnectionProvider.hpp diff --git a/parser/json/Utils.cpp b/src/oatpp/parser/json/Utils.cpp similarity index 100% rename from parser/json/Utils.cpp rename to src/oatpp/parser/json/Utils.cpp diff --git a/parser/json/Utils.hpp b/src/oatpp/parser/json/Utils.hpp similarity index 100% rename from parser/json/Utils.hpp rename to src/oatpp/parser/json/Utils.hpp diff --git a/parser/json/mapping/Deserializer.cpp b/src/oatpp/parser/json/mapping/Deserializer.cpp similarity index 100% rename from parser/json/mapping/Deserializer.cpp rename to src/oatpp/parser/json/mapping/Deserializer.cpp diff --git a/parser/json/mapping/Deserializer.hpp b/src/oatpp/parser/json/mapping/Deserializer.hpp similarity index 100% rename from parser/json/mapping/Deserializer.hpp rename to src/oatpp/parser/json/mapping/Deserializer.hpp diff --git a/parser/json/mapping/ObjectMapper.cpp b/src/oatpp/parser/json/mapping/ObjectMapper.cpp similarity index 100% rename from parser/json/mapping/ObjectMapper.cpp rename to src/oatpp/parser/json/mapping/ObjectMapper.cpp diff --git a/parser/json/mapping/ObjectMapper.hpp b/src/oatpp/parser/json/mapping/ObjectMapper.hpp similarity index 100% rename from parser/json/mapping/ObjectMapper.hpp rename to src/oatpp/parser/json/mapping/ObjectMapper.hpp diff --git a/parser/json/mapping/Serializer.cpp b/src/oatpp/parser/json/mapping/Serializer.cpp similarity index 100% rename from parser/json/mapping/Serializer.cpp rename to src/oatpp/parser/json/mapping/Serializer.cpp diff --git a/parser/json/mapping/Serializer.hpp b/src/oatpp/parser/json/mapping/Serializer.hpp similarity index 100% rename from parser/json/mapping/Serializer.hpp rename to src/oatpp/parser/json/mapping/Serializer.hpp diff --git a/web/client/ApiClient.cpp b/src/oatpp/web/client/ApiClient.cpp similarity index 100% rename from web/client/ApiClient.cpp rename to src/oatpp/web/client/ApiClient.cpp diff --git a/web/client/ApiClient.hpp b/src/oatpp/web/client/ApiClient.hpp similarity index 100% rename from web/client/ApiClient.hpp rename to src/oatpp/web/client/ApiClient.hpp diff --git a/web/client/HttpRequestExecutor.cpp b/src/oatpp/web/client/HttpRequestExecutor.cpp similarity index 100% rename from web/client/HttpRequestExecutor.cpp rename to src/oatpp/web/client/HttpRequestExecutor.cpp diff --git a/web/client/HttpRequestExecutor.hpp b/src/oatpp/web/client/HttpRequestExecutor.hpp similarity index 100% rename from web/client/HttpRequestExecutor.hpp rename to src/oatpp/web/client/HttpRequestExecutor.hpp diff --git a/web/client/RequestExecutor.cpp b/src/oatpp/web/client/RequestExecutor.cpp similarity index 100% rename from web/client/RequestExecutor.cpp rename to src/oatpp/web/client/RequestExecutor.cpp diff --git a/web/client/RequestExecutor.hpp b/src/oatpp/web/client/RequestExecutor.hpp similarity index 100% rename from web/client/RequestExecutor.hpp rename to src/oatpp/web/client/RequestExecutor.hpp diff --git a/web/protocol/CommunicationError.cpp b/src/oatpp/web/protocol/CommunicationError.cpp similarity index 100% rename from web/protocol/CommunicationError.cpp rename to src/oatpp/web/protocol/CommunicationError.cpp diff --git a/web/protocol/CommunicationError.hpp b/src/oatpp/web/protocol/CommunicationError.hpp similarity index 100% rename from web/protocol/CommunicationError.hpp rename to src/oatpp/web/protocol/CommunicationError.hpp diff --git a/web/protocol/http/Http.cpp b/src/oatpp/web/protocol/http/Http.cpp similarity index 99% rename from web/protocol/http/Http.cpp rename to src/oatpp/web/protocol/http/Http.cpp index f33f7804..e4f6d7ff 100644 --- a/web/protocol/http/Http.cpp +++ b/src/oatpp/web/protocol/http/Http.cpp @@ -24,7 +24,6 @@ #include "./Http.hpp" -#include "oatpp/test/Checker.hpp" #include "oatpp/core/data/stream/ChunkedBuffer.hpp" #include "oatpp/core/utils/ConversionUtils.hpp" diff --git a/web/protocol/http/Http.hpp b/src/oatpp/web/protocol/http/Http.hpp similarity index 100% rename from web/protocol/http/Http.hpp rename to src/oatpp/web/protocol/http/Http.hpp diff --git a/web/protocol/http/incoming/BodyDecoder.cpp b/src/oatpp/web/protocol/http/incoming/BodyDecoder.cpp similarity index 100% rename from web/protocol/http/incoming/BodyDecoder.cpp rename to src/oatpp/web/protocol/http/incoming/BodyDecoder.cpp diff --git a/web/protocol/http/incoming/BodyDecoder.hpp b/src/oatpp/web/protocol/http/incoming/BodyDecoder.hpp similarity index 100% rename from web/protocol/http/incoming/BodyDecoder.hpp rename to src/oatpp/web/protocol/http/incoming/BodyDecoder.hpp diff --git a/web/protocol/http/incoming/Request.cpp b/src/oatpp/web/protocol/http/incoming/Request.cpp similarity index 100% rename from web/protocol/http/incoming/Request.cpp rename to src/oatpp/web/protocol/http/incoming/Request.cpp diff --git a/web/protocol/http/incoming/Request.hpp b/src/oatpp/web/protocol/http/incoming/Request.hpp similarity index 100% rename from web/protocol/http/incoming/Request.hpp rename to src/oatpp/web/protocol/http/incoming/Request.hpp diff --git a/web/protocol/http/incoming/RequestHeadersReader.cpp b/src/oatpp/web/protocol/http/incoming/RequestHeadersReader.cpp similarity index 100% rename from web/protocol/http/incoming/RequestHeadersReader.cpp rename to src/oatpp/web/protocol/http/incoming/RequestHeadersReader.cpp diff --git a/web/protocol/http/incoming/RequestHeadersReader.hpp b/src/oatpp/web/protocol/http/incoming/RequestHeadersReader.hpp similarity index 100% rename from web/protocol/http/incoming/RequestHeadersReader.hpp rename to src/oatpp/web/protocol/http/incoming/RequestHeadersReader.hpp diff --git a/web/protocol/http/incoming/Response.cpp b/src/oatpp/web/protocol/http/incoming/Response.cpp similarity index 100% rename from web/protocol/http/incoming/Response.cpp rename to src/oatpp/web/protocol/http/incoming/Response.cpp diff --git a/web/protocol/http/incoming/Response.hpp b/src/oatpp/web/protocol/http/incoming/Response.hpp similarity index 100% rename from web/protocol/http/incoming/Response.hpp rename to src/oatpp/web/protocol/http/incoming/Response.hpp diff --git a/web/protocol/http/incoming/ResponseHeadersReader.cpp b/src/oatpp/web/protocol/http/incoming/ResponseHeadersReader.cpp similarity index 100% rename from web/protocol/http/incoming/ResponseHeadersReader.cpp rename to src/oatpp/web/protocol/http/incoming/ResponseHeadersReader.cpp diff --git a/web/protocol/http/incoming/ResponseHeadersReader.hpp b/src/oatpp/web/protocol/http/incoming/ResponseHeadersReader.hpp similarity index 100% rename from web/protocol/http/incoming/ResponseHeadersReader.hpp rename to src/oatpp/web/protocol/http/incoming/ResponseHeadersReader.hpp diff --git a/web/protocol/http/incoming/SimpleBodyDecoder.cpp b/src/oatpp/web/protocol/http/incoming/SimpleBodyDecoder.cpp similarity index 100% rename from web/protocol/http/incoming/SimpleBodyDecoder.cpp rename to src/oatpp/web/protocol/http/incoming/SimpleBodyDecoder.cpp diff --git a/web/protocol/http/incoming/SimpleBodyDecoder.hpp b/src/oatpp/web/protocol/http/incoming/SimpleBodyDecoder.hpp similarity index 100% rename from web/protocol/http/incoming/SimpleBodyDecoder.hpp rename to src/oatpp/web/protocol/http/incoming/SimpleBodyDecoder.hpp diff --git a/web/protocol/http/outgoing/Body.cpp b/src/oatpp/web/protocol/http/outgoing/Body.cpp similarity index 100% rename from web/protocol/http/outgoing/Body.cpp rename to src/oatpp/web/protocol/http/outgoing/Body.cpp diff --git a/web/protocol/http/outgoing/Body.hpp b/src/oatpp/web/protocol/http/outgoing/Body.hpp similarity index 100% rename from web/protocol/http/outgoing/Body.hpp rename to src/oatpp/web/protocol/http/outgoing/Body.hpp diff --git a/web/protocol/http/outgoing/BufferBody.cpp b/src/oatpp/web/protocol/http/outgoing/BufferBody.cpp similarity index 100% rename from web/protocol/http/outgoing/BufferBody.cpp rename to src/oatpp/web/protocol/http/outgoing/BufferBody.cpp diff --git a/web/protocol/http/outgoing/BufferBody.hpp b/src/oatpp/web/protocol/http/outgoing/BufferBody.hpp similarity index 100% rename from web/protocol/http/outgoing/BufferBody.hpp rename to src/oatpp/web/protocol/http/outgoing/BufferBody.hpp diff --git a/web/protocol/http/outgoing/ChunkedBufferBody.cpp b/src/oatpp/web/protocol/http/outgoing/ChunkedBufferBody.cpp similarity index 100% rename from web/protocol/http/outgoing/ChunkedBufferBody.cpp rename to src/oatpp/web/protocol/http/outgoing/ChunkedBufferBody.cpp diff --git a/web/protocol/http/outgoing/ChunkedBufferBody.hpp b/src/oatpp/web/protocol/http/outgoing/ChunkedBufferBody.hpp similarity index 100% rename from web/protocol/http/outgoing/ChunkedBufferBody.hpp rename to src/oatpp/web/protocol/http/outgoing/ChunkedBufferBody.hpp diff --git a/web/protocol/http/outgoing/CommunicationUtils.cpp b/src/oatpp/web/protocol/http/outgoing/CommunicationUtils.cpp similarity index 100% rename from web/protocol/http/outgoing/CommunicationUtils.cpp rename to src/oatpp/web/protocol/http/outgoing/CommunicationUtils.cpp diff --git a/web/protocol/http/outgoing/CommunicationUtils.hpp b/src/oatpp/web/protocol/http/outgoing/CommunicationUtils.hpp similarity index 100% rename from web/protocol/http/outgoing/CommunicationUtils.hpp rename to src/oatpp/web/protocol/http/outgoing/CommunicationUtils.hpp diff --git a/web/protocol/http/outgoing/DtoBody.cpp b/src/oatpp/web/protocol/http/outgoing/DtoBody.cpp similarity index 100% rename from web/protocol/http/outgoing/DtoBody.cpp rename to src/oatpp/web/protocol/http/outgoing/DtoBody.cpp diff --git a/web/protocol/http/outgoing/DtoBody.hpp b/src/oatpp/web/protocol/http/outgoing/DtoBody.hpp similarity index 100% rename from web/protocol/http/outgoing/DtoBody.hpp rename to src/oatpp/web/protocol/http/outgoing/DtoBody.hpp diff --git a/web/protocol/http/outgoing/Request.cpp b/src/oatpp/web/protocol/http/outgoing/Request.cpp similarity index 100% rename from web/protocol/http/outgoing/Request.cpp rename to src/oatpp/web/protocol/http/outgoing/Request.cpp diff --git a/web/protocol/http/outgoing/Request.hpp b/src/oatpp/web/protocol/http/outgoing/Request.hpp similarity index 100% rename from web/protocol/http/outgoing/Request.hpp rename to src/oatpp/web/protocol/http/outgoing/Request.hpp diff --git a/web/protocol/http/outgoing/Response.cpp b/src/oatpp/web/protocol/http/outgoing/Response.cpp similarity index 100% rename from web/protocol/http/outgoing/Response.cpp rename to src/oatpp/web/protocol/http/outgoing/Response.cpp diff --git a/web/protocol/http/outgoing/Response.hpp b/src/oatpp/web/protocol/http/outgoing/Response.hpp similarity index 100% rename from web/protocol/http/outgoing/Response.hpp rename to src/oatpp/web/protocol/http/outgoing/Response.hpp diff --git a/web/protocol/http/outgoing/ResponseFactory.cpp b/src/oatpp/web/protocol/http/outgoing/ResponseFactory.cpp similarity index 100% rename from web/protocol/http/outgoing/ResponseFactory.cpp rename to src/oatpp/web/protocol/http/outgoing/ResponseFactory.cpp diff --git a/web/protocol/http/outgoing/ResponseFactory.hpp b/src/oatpp/web/protocol/http/outgoing/ResponseFactory.hpp similarity index 100% rename from web/protocol/http/outgoing/ResponseFactory.hpp rename to src/oatpp/web/protocol/http/outgoing/ResponseFactory.hpp diff --git a/web/server/AsyncHttpConnectionHandler.cpp b/src/oatpp/web/server/AsyncHttpConnectionHandler.cpp similarity index 98% rename from web/server/AsyncHttpConnectionHandler.cpp rename to src/oatpp/web/server/AsyncHttpConnectionHandler.cpp index 8d144ed1..d9ce2470 100644 --- a/web/server/AsyncHttpConnectionHandler.cpp +++ b/src/oatpp/web/server/AsyncHttpConnectionHandler.cpp @@ -30,7 +30,6 @@ #include "oatpp/web/protocol/http/Http.hpp" #include "oatpp/network/Connection.hpp" -#include "oatpp/test/Checker.hpp" #include diff --git a/web/server/AsyncHttpConnectionHandler.hpp b/src/oatpp/web/server/AsyncHttpConnectionHandler.hpp similarity index 100% rename from web/server/AsyncHttpConnectionHandler.hpp rename to src/oatpp/web/server/AsyncHttpConnectionHandler.hpp diff --git a/web/server/HttpConnectionHandler.cpp b/src/oatpp/web/server/HttpConnectionHandler.cpp similarity index 100% rename from web/server/HttpConnectionHandler.cpp rename to src/oatpp/web/server/HttpConnectionHandler.cpp diff --git a/web/server/HttpConnectionHandler.hpp b/src/oatpp/web/server/HttpConnectionHandler.hpp similarity index 100% rename from web/server/HttpConnectionHandler.hpp rename to src/oatpp/web/server/HttpConnectionHandler.hpp diff --git a/web/server/HttpProcessor.cpp b/src/oatpp/web/server/HttpProcessor.cpp similarity index 100% rename from web/server/HttpProcessor.cpp rename to src/oatpp/web/server/HttpProcessor.cpp diff --git a/web/server/HttpProcessor.hpp b/src/oatpp/web/server/HttpProcessor.hpp similarity index 100% rename from web/server/HttpProcessor.hpp rename to src/oatpp/web/server/HttpProcessor.hpp diff --git a/web/server/HttpRouter.cpp b/src/oatpp/web/server/HttpRouter.cpp similarity index 100% rename from web/server/HttpRouter.cpp rename to src/oatpp/web/server/HttpRouter.cpp diff --git a/web/server/HttpRouter.hpp b/src/oatpp/web/server/HttpRouter.hpp similarity index 100% rename from web/server/HttpRouter.hpp rename to src/oatpp/web/server/HttpRouter.hpp diff --git a/web/server/api/ApiController.cpp b/src/oatpp/web/server/api/ApiController.cpp similarity index 100% rename from web/server/api/ApiController.cpp rename to src/oatpp/web/server/api/ApiController.cpp diff --git a/web/server/api/ApiController.hpp b/src/oatpp/web/server/api/ApiController.hpp similarity index 100% rename from web/server/api/ApiController.hpp rename to src/oatpp/web/server/api/ApiController.hpp diff --git a/web/server/api/Endpoint.cpp b/src/oatpp/web/server/api/Endpoint.cpp similarity index 100% rename from web/server/api/Endpoint.cpp rename to src/oatpp/web/server/api/Endpoint.cpp diff --git a/web/server/api/Endpoint.hpp b/src/oatpp/web/server/api/Endpoint.hpp similarity index 100% rename from web/server/api/Endpoint.hpp rename to src/oatpp/web/server/api/Endpoint.hpp diff --git a/web/server/handler/ErrorHandler.cpp b/src/oatpp/web/server/handler/ErrorHandler.cpp similarity index 100% rename from web/server/handler/ErrorHandler.cpp rename to src/oatpp/web/server/handler/ErrorHandler.cpp diff --git a/web/server/handler/ErrorHandler.hpp b/src/oatpp/web/server/handler/ErrorHandler.hpp similarity index 100% rename from web/server/handler/ErrorHandler.hpp rename to src/oatpp/web/server/handler/ErrorHandler.hpp diff --git a/web/server/handler/Interceptor.cpp b/src/oatpp/web/server/handler/Interceptor.cpp similarity index 100% rename from web/server/handler/Interceptor.cpp rename to src/oatpp/web/server/handler/Interceptor.cpp diff --git a/web/server/handler/Interceptor.hpp b/src/oatpp/web/server/handler/Interceptor.hpp similarity index 100% rename from web/server/handler/Interceptor.hpp rename to src/oatpp/web/server/handler/Interceptor.hpp diff --git a/web/url/mapping/Pattern.cpp b/src/oatpp/web/url/mapping/Pattern.cpp similarity index 100% rename from web/url/mapping/Pattern.cpp rename to src/oatpp/web/url/mapping/Pattern.cpp diff --git a/web/url/mapping/Pattern.hpp b/src/oatpp/web/url/mapping/Pattern.hpp similarity index 100% rename from web/url/mapping/Pattern.hpp rename to src/oatpp/web/url/mapping/Pattern.hpp diff --git a/web/url/mapping/Router.cpp b/src/oatpp/web/url/mapping/Router.cpp similarity index 100% rename from web/url/mapping/Router.cpp rename to src/oatpp/web/url/mapping/Router.cpp diff --git a/web/url/mapping/Router.hpp b/src/oatpp/web/url/mapping/Router.hpp similarity index 100% rename from web/url/mapping/Router.hpp rename to src/oatpp/web/url/mapping/Router.hpp diff --git a/web/url/mapping/Subscriber.cpp b/src/oatpp/web/url/mapping/Subscriber.cpp similarity index 100% rename from web/url/mapping/Subscriber.cpp rename to src/oatpp/web/url/mapping/Subscriber.cpp diff --git a/web/url/mapping/Subscriber.hpp b/src/oatpp/web/url/mapping/Subscriber.hpp similarity index 100% rename from web/url/mapping/Subscriber.hpp rename to src/oatpp/web/url/mapping/Subscriber.hpp diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 00000000..eec89128 --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,55 @@ + +add_executable(oatppAllTests + oatpp/AllTestsMain.cpp + oatpp/core/base/CommandLineArgumentsTest.cpp + oatpp/core/base/CommandLineArgumentsTest.hpp + oatpp/core/base/RegRuleTest.cpp + oatpp/core/base/RegRuleTest.hpp + oatpp/core/base/collection/LinkedListTest.cpp + oatpp/core/base/collection/LinkedListTest.hpp + oatpp/core/base/memory/MemoryPoolTest.cpp + oatpp/core/base/memory/MemoryPoolTest.hpp + oatpp/core/base/memory/PerfTest.cpp + oatpp/core/base/memory/PerfTest.hpp + oatpp/core/data/mapping/type/TypeTest.cpp + oatpp/core/data/mapping/type/TypeTest.hpp + oatpp/core/data/share/MemoryLabelTest.cpp + oatpp/core/data/share/MemoryLabelTest.hpp + oatpp/encoding/Base64Test.cpp + oatpp/encoding/Base64Test.hpp + oatpp/encoding/UnicodeTest.cpp + oatpp/encoding/UnicodeTest.hpp + oatpp/network/virtual_/InterfaceTest.cpp + oatpp/network/virtual_/InterfaceTest.hpp + oatpp/network/virtual_/PipeTest.cpp + oatpp/network/virtual_/PipeTest.hpp + oatpp/parser/json/mapping/DTOMapperPerfTest.cpp + oatpp/parser/json/mapping/DTOMapperPerfTest.hpp + oatpp/parser/json/mapping/DTOMapperTest.cpp + oatpp/parser/json/mapping/DTOMapperTest.hpp + oatpp/parser/json/mapping/DeserializerTest.cpp + oatpp/parser/json/mapping/DeserializerTest.hpp + oatpp/web/FullAsyncTest.cpp + oatpp/web/FullAsyncTest.hpp + oatpp/web/FullTest.cpp + oatpp/web/FullTest.hpp + oatpp/web/app/Client.hpp + oatpp/web/app/Controller.hpp + oatpp/web/app/ControllerAsync.hpp + oatpp/web/app/DTOs.hpp +) + +target_link_libraries(oatppAllTests PRIVATE oatpp PRIVATE oatpp-test) + +set_target_properties(oatppAllTests PROPERTIES + CXX_STANDARD 11 + CXX_EXTENSIONS OFF + CXX_STANDARD_REQUIRED ON +) + +target_include_directories(oatppAllTests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +target_compile_definitions(oatppAllTests + PRIVATE OATPP_ENABLE_ALL_TESTS_MAIN +) +add_test(oatppAllTests oatppAllTests) diff --git a/test/AllTestsMain.cpp b/test/oatpp/AllTestsMain.cpp similarity index 72% rename from test/AllTestsMain.cpp rename to test/oatpp/AllTestsMain.cpp index 6d7b05a1..4d454be1 100644 --- a/test/AllTestsMain.cpp +++ b/test/oatpp/AllTestsMain.cpp @@ -1,25 +1,25 @@ -#include "oatpp/test/web/FullTest.hpp" -#include "oatpp/test/web/FullAsyncTest.hpp" +#include "oatpp/web/FullTest.hpp" +#include "oatpp/web/FullAsyncTest.hpp" -#include "oatpp/test/network/virtual_/PipeTest.hpp" -#include "oatpp/test/network/virtual_/InterfaceTest.hpp" +#include "oatpp/network/virtual_/PipeTest.hpp" +#include "oatpp/network/virtual_/InterfaceTest.hpp" -#include "oatpp/test/core/data/share/MemoryLabelTest.hpp" +#include "oatpp/core/data/share/MemoryLabelTest.hpp" -#include "oatpp/test/parser/json/mapping/DeserializerTest.hpp" -#include "oatpp/test/parser/json/mapping/DTOMapperPerfTest.hpp" -#include "oatpp/test/parser/json/mapping/DTOMapperTest.hpp" +#include "oatpp/parser/json/mapping/DeserializerTest.hpp" +#include "oatpp/parser/json/mapping/DTOMapperPerfTest.hpp" +#include "oatpp/parser/json/mapping/DTOMapperTest.hpp" -#include "oatpp/test/encoding/UnicodeTest.hpp" -#include "oatpp/test/encoding/Base64Test.hpp" +#include "oatpp/encoding/UnicodeTest.hpp" +#include "oatpp/encoding/Base64Test.hpp" -#include "oatpp/test/core/data/mapping/type/TypeTest.hpp" -#include "oatpp/test/core/base/collection/LinkedListTest.hpp" -#include "oatpp/test/core/base/memory/MemoryPoolTest.hpp" -#include "oatpp/test/core/base/memory/PerfTest.hpp" -#include "oatpp/test/core/base/CommandLineArgumentsTest.hpp" -#include "oatpp/test/core/base/RegRuleTest.hpp" +#include "oatpp/core/data/mapping/type/TypeTest.hpp" +#include "oatpp/core/base/collection/LinkedListTest.hpp" +#include "oatpp/core/base/memory/MemoryPoolTest.hpp" +#include "oatpp/core/base/memory/PerfTest.hpp" +#include "oatpp/core/base/CommandLineArgumentsTest.hpp" +#include "oatpp/core/base/RegRuleTest.hpp" #include "oatpp/core/concurrency/SpinLock.hpp" #include "oatpp/core/base/Environment.hpp" diff --git a/test/core/base/CommandLineArgumentsTest.cpp b/test/oatpp/core/base/CommandLineArgumentsTest.cpp similarity index 100% rename from test/core/base/CommandLineArgumentsTest.cpp rename to test/oatpp/core/base/CommandLineArgumentsTest.cpp diff --git a/test/core/base/CommandLineArgumentsTest.hpp b/test/oatpp/core/base/CommandLineArgumentsTest.hpp similarity index 97% rename from test/core/base/CommandLineArgumentsTest.hpp rename to test/oatpp/core/base/CommandLineArgumentsTest.hpp index 041888f2..18d45210 100644 --- a/test/core/base/CommandLineArgumentsTest.hpp +++ b/test/oatpp/core/base/CommandLineArgumentsTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_base_CommandLineArgumentsTest_hpp #define oatpp_test_base_CommandLineArgumentsTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace base { diff --git a/test/core/base/RegRuleTest.cpp b/test/oatpp/core/base/RegRuleTest.cpp similarity index 100% rename from test/core/base/RegRuleTest.cpp rename to test/oatpp/core/base/RegRuleTest.cpp diff --git a/test/core/base/RegRuleTest.hpp b/test/oatpp/core/base/RegRuleTest.hpp similarity index 97% rename from test/core/base/RegRuleTest.hpp rename to test/oatpp/core/base/RegRuleTest.hpp index d171b17e..279ae593 100644 --- a/test/core/base/RegRuleTest.hpp +++ b/test/oatpp/core/base/RegRuleTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_base_RegRuleTest_hpp #define oatpp_test_base_RegRuleTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace base { diff --git a/test/core/base/collection/LinkedListTest.cpp b/test/oatpp/core/base/collection/LinkedListTest.cpp similarity index 98% rename from test/core/base/collection/LinkedListTest.cpp rename to test/oatpp/core/base/collection/LinkedListTest.cpp index 61c2886e..4d797ce1 100644 --- a/test/core/base/collection/LinkedListTest.cpp +++ b/test/oatpp/core/base/collection/LinkedListTest.cpp @@ -26,7 +26,7 @@ #include "oatpp/core/Types.hpp" #include "oatpp/core/collection/LinkedList.hpp" -#include "oatpp/test/Checker.hpp" +#include "oatpp-test/Checker.hpp" #include namespace oatpp { namespace test { namespace collection { diff --git a/test/core/base/collection/LinkedListTest.hpp b/test/oatpp/core/base/collection/LinkedListTest.hpp similarity index 97% rename from test/core/base/collection/LinkedListTest.hpp rename to test/oatpp/core/base/collection/LinkedListTest.hpp index 5d25b3bf..d74ad753 100644 --- a/test/core/base/collection/LinkedListTest.hpp +++ b/test/oatpp/core/base/collection/LinkedListTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_base_collection_LinkedListTest_hpp #define oatpp_test_base_collection_LinkedListTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace collection { diff --git a/test/core/base/memory/MemoryPoolTest.cpp b/test/oatpp/core/base/memory/MemoryPoolTest.cpp similarity index 99% rename from test/core/base/memory/MemoryPoolTest.cpp rename to test/oatpp/core/base/memory/MemoryPoolTest.cpp index 62739674..4fd16a48 100644 --- a/test/core/base/memory/MemoryPoolTest.cpp +++ b/test/oatpp/core/base/memory/MemoryPoolTest.cpp @@ -25,7 +25,7 @@ #include "MemoryPoolTest.hpp" #include "oatpp/core/base/memory/MemoryPool.hpp" -#include "oatpp/test/Checker.hpp" +#include "oatpp-test/Checker.hpp" namespace oatpp { namespace test { namespace memory { diff --git a/test/core/base/memory/MemoryPoolTest.hpp b/test/oatpp/core/base/memory/MemoryPoolTest.hpp similarity index 97% rename from test/core/base/memory/MemoryPoolTest.hpp rename to test/oatpp/core/base/memory/MemoryPoolTest.hpp index a2323dfe..09d7e67d 100644 --- a/test/core/base/memory/MemoryPoolTest.hpp +++ b/test/oatpp/core/base/memory/MemoryPoolTest.hpp @@ -25,7 +25,7 @@ #ifndef test_memory_MemoryPoolTest_hpp #define test_memory_MemoryPoolTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace memory { diff --git a/test/core/base/memory/PerfTest.cpp b/test/oatpp/core/base/memory/PerfTest.cpp similarity index 100% rename from test/core/base/memory/PerfTest.cpp rename to test/oatpp/core/base/memory/PerfTest.cpp diff --git a/test/core/base/memory/PerfTest.hpp b/test/oatpp/core/base/memory/PerfTest.hpp similarity index 97% rename from test/core/base/memory/PerfTest.hpp rename to test/oatpp/core/base/memory/PerfTest.hpp index ee2893fd..a61f94be 100644 --- a/test/core/base/memory/PerfTest.hpp +++ b/test/oatpp/core/base/memory/PerfTest.hpp @@ -25,7 +25,7 @@ #ifndef PerfTest_hpp #define PerfTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace memory { diff --git a/test/core/data/mapping/type/TypeTest.cpp b/test/oatpp/core/data/mapping/type/TypeTest.cpp similarity index 100% rename from test/core/data/mapping/type/TypeTest.cpp rename to test/oatpp/core/data/mapping/type/TypeTest.cpp diff --git a/test/core/data/mapping/type/TypeTest.hpp b/test/oatpp/core/data/mapping/type/TypeTest.hpp similarity index 97% rename from test/core/data/mapping/type/TypeTest.hpp rename to test/oatpp/core/data/mapping/type/TypeTest.hpp index 001bf6ae..dbd2597e 100644 --- a/test/core/data/mapping/type/TypeTest.hpp +++ b/test/oatpp/core/data/mapping/type/TypeTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_core_data_mapping_type_TypeTest_hpp #define oatpp_test_core_data_mapping_type_TypeTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace type { diff --git a/test/core/data/share/MemoryLabelTest.cpp b/test/oatpp/core/data/share/MemoryLabelTest.cpp similarity index 99% rename from test/core/data/share/MemoryLabelTest.cpp rename to test/oatpp/core/data/share/MemoryLabelTest.cpp index 49efef71..462e273d 100644 --- a/test/core/data/share/MemoryLabelTest.cpp +++ b/test/oatpp/core/data/share/MemoryLabelTest.cpp @@ -28,9 +28,8 @@ #include - -#include "oatpp/test/Checker.hpp" #include "oatpp/web/protocol/http/Http.hpp" +#include "oatpp-test/Checker.hpp" namespace oatpp { namespace test { namespace core { namespace data { namespace share { diff --git a/test/core/data/share/MemoryLabelTest.hpp b/test/oatpp/core/data/share/MemoryLabelTest.hpp similarity index 97% rename from test/core/data/share/MemoryLabelTest.hpp rename to test/oatpp/core/data/share/MemoryLabelTest.hpp index 1d4a5af6..8c707ec2 100644 --- a/test/core/data/share/MemoryLabelTest.hpp +++ b/test/oatpp/core/data/share/MemoryLabelTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_core_data_share_MemoryLabelTest_hpp #define oatpp_test_core_data_share_MemoryLabelTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace core { namespace data { namespace share { diff --git a/test/encoding/Base64Test.cpp b/test/oatpp/encoding/Base64Test.cpp similarity index 100% rename from test/encoding/Base64Test.cpp rename to test/oatpp/encoding/Base64Test.cpp diff --git a/test/encoding/Base64Test.hpp b/test/oatpp/encoding/Base64Test.hpp similarity index 97% rename from test/encoding/Base64Test.hpp rename to test/oatpp/encoding/Base64Test.hpp index 5c326869..30f0e427 100644 --- a/test/encoding/Base64Test.hpp +++ b/test/oatpp/encoding/Base64Test.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_encoding_Base64Test_hpp #define oatpp_test_encoding_Base64Test_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace encoding { diff --git a/test/encoding/UnicodeTest.cpp b/test/oatpp/encoding/UnicodeTest.cpp similarity index 100% rename from test/encoding/UnicodeTest.cpp rename to test/oatpp/encoding/UnicodeTest.cpp diff --git a/test/encoding/UnicodeTest.hpp b/test/oatpp/encoding/UnicodeTest.hpp similarity index 97% rename from test/encoding/UnicodeTest.hpp rename to test/oatpp/encoding/UnicodeTest.hpp index 5e927e15..f53f8dc0 100644 --- a/test/encoding/UnicodeTest.hpp +++ b/test/oatpp/encoding/UnicodeTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_encoding_UnicodeTest_hpp #define oatpp_test_encoding_UnicodeTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace encoding { diff --git a/test/network/virtual_/InterfaceTest.cpp b/test/oatpp/network/virtual_/InterfaceTest.cpp similarity index 100% rename from test/network/virtual_/InterfaceTest.cpp rename to test/oatpp/network/virtual_/InterfaceTest.cpp diff --git a/test/network/virtual_/InterfaceTest.hpp b/test/oatpp/network/virtual_/InterfaceTest.hpp similarity index 97% rename from test/network/virtual_/InterfaceTest.hpp rename to test/oatpp/network/virtual_/InterfaceTest.hpp index ef445f7b..c3021b7b 100644 --- a/test/network/virtual_/InterfaceTest.hpp +++ b/test/oatpp/network/virtual_/InterfaceTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_network_virtual__InterfaceTest_hpp #define oatpp_test_network_virtual__InterfaceTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace network { namespace virtual_ { diff --git a/test/network/virtual_/PipeTest.cpp b/test/oatpp/network/virtual_/PipeTest.cpp similarity index 99% rename from test/network/virtual_/PipeTest.cpp rename to test/oatpp/network/virtual_/PipeTest.cpp index 35c024fe..973bd278 100644 --- a/test/network/virtual_/PipeTest.cpp +++ b/test/oatpp/network/virtual_/PipeTest.cpp @@ -29,7 +29,7 @@ #include "oatpp/core/data/stream/ChunkedBuffer.hpp" #include "oatpp/core/concurrency/Thread.hpp" -#include "oatpp/test/Checker.hpp" +#include "oatpp-test/Checker.hpp" #include diff --git a/test/network/virtual_/PipeTest.hpp b/test/oatpp/network/virtual_/PipeTest.hpp similarity index 97% rename from test/network/virtual_/PipeTest.hpp rename to test/oatpp/network/virtual_/PipeTest.hpp index a250ded4..abce39e5 100644 --- a/test/network/virtual_/PipeTest.hpp +++ b/test/oatpp/network/virtual_/PipeTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_network_virtual__PipeTest_hpp #define oatpp_test_network_virtual__PipeTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace network { namespace virtual_ { diff --git a/test/parser/json/mapping/DTOMapperPerfTest.cpp b/test/oatpp/parser/json/mapping/DTOMapperPerfTest.cpp similarity index 98% rename from test/parser/json/mapping/DTOMapperPerfTest.cpp rename to test/oatpp/parser/json/mapping/DTOMapperPerfTest.cpp index 3eb9b21d..2e40e5f8 100644 --- a/test/parser/json/mapping/DTOMapperPerfTest.cpp +++ b/test/oatpp/parser/json/mapping/DTOMapperPerfTest.cpp @@ -29,7 +29,7 @@ #include "oatpp/core/macro/basic.hpp" #include "oatpp/core/macro/codegen.hpp" -#include "oatpp/test/Checker.hpp" +#include "oatpp-test/Checker.hpp" namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping { diff --git a/test/parser/json/mapping/DTOMapperPerfTest.hpp b/test/oatpp/parser/json/mapping/DTOMapperPerfTest.hpp similarity index 97% rename from test/parser/json/mapping/DTOMapperPerfTest.hpp rename to test/oatpp/parser/json/mapping/DTOMapperPerfTest.hpp index dafdc36c..d6a43f3a 100644 --- a/test/parser/json/mapping/DTOMapperPerfTest.hpp +++ b/test/oatpp/parser/json/mapping/DTOMapperPerfTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_parser_json_mapping_DTOMapperPerfTest_hpp #define oatpp_test_parser_json_mapping_DTOMapperPerfTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping { diff --git a/test/parser/json/mapping/DTOMapperTest.cpp b/test/oatpp/parser/json/mapping/DTOMapperTest.cpp similarity index 100% rename from test/parser/json/mapping/DTOMapperTest.cpp rename to test/oatpp/parser/json/mapping/DTOMapperTest.cpp diff --git a/test/parser/json/mapping/DTOMapperTest.hpp b/test/oatpp/parser/json/mapping/DTOMapperTest.hpp similarity index 97% rename from test/parser/json/mapping/DTOMapperTest.hpp rename to test/oatpp/parser/json/mapping/DTOMapperTest.hpp index 90eae44f..54fe4504 100644 --- a/test/parser/json/mapping/DTOMapperTest.hpp +++ b/test/oatpp/parser/json/mapping/DTOMapperTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_parser_json_mapping_DTOMapperTest_hpp #define oatpp_test_parser_json_mapping_DTOMapperTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping { diff --git a/test/parser/json/mapping/DeserializerTest.cpp b/test/oatpp/parser/json/mapping/DeserializerTest.cpp similarity index 100% rename from test/parser/json/mapping/DeserializerTest.cpp rename to test/oatpp/parser/json/mapping/DeserializerTest.cpp diff --git a/test/parser/json/mapping/DeserializerTest.hpp b/test/oatpp/parser/json/mapping/DeserializerTest.hpp similarity index 97% rename from test/parser/json/mapping/DeserializerTest.hpp rename to test/oatpp/parser/json/mapping/DeserializerTest.hpp index 4e9b4316..220c1ee9 100644 --- a/test/parser/json/mapping/DeserializerTest.hpp +++ b/test/oatpp/parser/json/mapping/DeserializerTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_parser_json_mapping_DeserializerTest_hpp #define oatpp_test_parser_json_mapping_DeserializerTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping { diff --git a/test/web/FullAsyncTest.cpp b/test/oatpp/web/FullAsyncTest.cpp similarity index 97% rename from test/web/FullAsyncTest.cpp rename to test/oatpp/web/FullAsyncTest.cpp index 58c04c69..b67cc426 100644 --- a/test/web/FullAsyncTest.cpp +++ b/test/oatpp/web/FullAsyncTest.cpp @@ -24,9 +24,9 @@ #include "FullAsyncTest.hpp" -#include "oatpp/test/web/app/Client.hpp" +#include "oatpp/web/app/Client.hpp" -#include "oatpp/test/web/app/ControllerAsync.hpp" +#include "oatpp/web/app/ControllerAsync.hpp" #include "oatpp/web/client/HttpRequestExecutor.hpp" diff --git a/test/web/FullAsyncTest.hpp b/test/oatpp/web/FullAsyncTest.hpp similarity index 97% rename from test/web/FullAsyncTest.hpp rename to test/oatpp/web/FullAsyncTest.hpp index 5c5449f4..e7333cec 100644 --- a/test/web/FullAsyncTest.hpp +++ b/test/oatpp/web/FullAsyncTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_web_FullAsyncTest_hpp #define oatpp_test_web_FullAsyncTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace web { diff --git a/test/web/FullTest.cpp b/test/oatpp/web/FullTest.cpp similarity index 96% rename from test/web/FullTest.cpp rename to test/oatpp/web/FullTest.cpp index ae7a773a..4fab467e 100644 --- a/test/web/FullTest.cpp +++ b/test/oatpp/web/FullTest.cpp @@ -24,10 +24,10 @@ #include "FullTest.hpp" -#include "oatpp/test/web/app/Client.hpp" +#include "oatpp/web/app/Client.hpp" -#include "oatpp/test/web/app/ControllerAsync.hpp" -#include "oatpp/test/web/app/Controller.hpp" +#include "oatpp/web/app/ControllerAsync.hpp" +#include "oatpp/web/app/Controller.hpp" #include "oatpp/web/client/HttpRequestExecutor.hpp" diff --git a/test/web/FullTest.hpp b/test/oatpp/web/FullTest.hpp similarity index 97% rename from test/web/FullTest.hpp rename to test/oatpp/web/FullTest.hpp index 75b9f701..a532bcdb 100644 --- a/test/web/FullTest.hpp +++ b/test/oatpp/web/FullTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_web_FullTest_hpp #define oatpp_test_web_FullTest_hpp -#include "oatpp/test/UnitTest.hpp" +#include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace web { diff --git a/test/web/app/Client.hpp b/test/oatpp/web/app/Client.hpp similarity index 100% rename from test/web/app/Client.hpp rename to test/oatpp/web/app/Client.hpp diff --git a/test/web/app/Controller.hpp b/test/oatpp/web/app/Controller.hpp similarity index 100% rename from test/web/app/Controller.hpp rename to test/oatpp/web/app/Controller.hpp diff --git a/test/web/app/ControllerAsync.hpp b/test/oatpp/web/app/ControllerAsync.hpp similarity index 100% rename from test/web/app/ControllerAsync.hpp rename to test/oatpp/web/app/ControllerAsync.hpp diff --git a/test/web/app/DTOs.hpp b/test/oatpp/web/app/DTOs.hpp similarity index 100% rename from test/web/app/DTOs.hpp rename to test/oatpp/web/app/DTOs.hpp