diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f8964ee6..0172479b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,26 +7,29 @@ add_library(oatpp oatpp/algorithm/CRC.hpp oatpp/codegen/ApiClient_define.hpp oatpp/codegen/ApiClient_undef.hpp - oatpp/codegen/api_controller/base_define.hpp - oatpp/codegen/api_controller/base_undef.hpp - oatpp/codegen/api_controller/auth_define.hpp - oatpp/codegen/api_controller/auth_undef.hpp - oatpp/codegen/api_controller/bundle_define.hpp - oatpp/codegen/api_controller/bundle_undef.hpp - oatpp/codegen/api_controller/cors_define.hpp - oatpp/codegen/api_controller/cors_undef.hpp oatpp/codegen/ApiController_define.hpp oatpp/codegen/ApiController_undef.hpp oatpp/codegen/DbClient_define.hpp oatpp/codegen/DbClient_undef.hpp + oatpp/codegen/DTO_define.hpp + oatpp/codegen/DTO_undef.hpp + oatpp/codegen/api_controller/auth_define.hpp + oatpp/codegen/api_controller/auth_undef.hpp + oatpp/codegen/api_controller/base_define.hpp + oatpp/codegen/api_controller/base_undef.hpp + oatpp/codegen/api_controller/bundle_define.hpp + oatpp/codegen/api_controller/bundle_undef.hpp + oatpp/codegen/api_controller/cors_define.hpp + oatpp/codegen/api_controller/cors_undef.hpp oatpp/codegen/dto/base_define.hpp oatpp/codegen/dto/base_undef.hpp oatpp/codegen/dto/enum_define.hpp oatpp/codegen/dto/enum_undef.hpp - oatpp/codegen/DTO_define.hpp - oatpp/codegen/DTO_undef.hpp + oatpp/core/IODefinitions.cpp + oatpp/core/IODefinitions.hpp oatpp/core/Types.hpp - oatpp/core/async/utils/FastQueue.hpp + oatpp/core/async/ConditionVariable.cpp + oatpp/core/async/ConditionVariable.hpp oatpp/core/async/Coroutine.cpp oatpp/core/async/Coroutine.hpp oatpp/core/async/CoroutineWaitList.cpp @@ -39,17 +42,18 @@ add_library(oatpp oatpp/core/async/Lock.hpp oatpp/core/async/Processor.cpp oatpp/core/async/Processor.hpp - oatpp/core/async/worker/Worker.cpp - oatpp/core/async/worker/Worker.hpp + oatpp/core/async/utils/FastQueue.hpp oatpp/core/async/worker/IOEventWorker_common.cpp - oatpp/core/async/worker/IOEventWorker_kqueue.cpp oatpp/core/async/worker/IOEventWorker_epoll.cpp + oatpp/core/async/worker/IOEventWorker_kqueue.cpp oatpp/core/async/worker/IOEventWorker_stub.cpp oatpp/core/async/worker/IOEventWorker.hpp oatpp/core/async/worker/IOWorker.cpp oatpp/core/async/worker/IOWorker.hpp oatpp/core/async/worker/TimerWorker.cpp oatpp/core/async/worker/TimerWorker.hpp + oatpp/core/async/worker/Worker.cpp + oatpp/core/async/worker/Worker.hpp oatpp/core/base/CommandLineArguments.cpp oatpp/core/base/CommandLineArguments.hpp oatpp/core/base/Config.hpp @@ -62,8 +66,8 @@ add_library(oatpp oatpp/core/concurrency/SpinLock.hpp oatpp/core/concurrency/Thread.cpp oatpp/core/concurrency/Thread.hpp - oatpp/core/IODefinitions.cpp - oatpp/core/IODefinitions.hpp + oatpp/core/data/Bundle.cpp + oatpp/core/data/Bundle.hpp oatpp/core/data/buffer/FIFOBuffer.cpp oatpp/core/data/buffer/FIFOBuffer.hpp oatpp/core/data/buffer/IOBuffer.cpp @@ -82,10 +86,10 @@ add_library(oatpp oatpp/core/data/mapping/type/List.cpp oatpp/core/data/mapping/type/List.hpp oatpp/core/data/mapping/type/Map.hpp - oatpp/core/data/mapping/type/PairList.cpp - oatpp/core/data/mapping/type/PairList.hpp oatpp/core/data/mapping/type/Object.cpp oatpp/core/data/mapping/type/Object.hpp + oatpp/core/data/mapping/type/PairList.cpp + oatpp/core/data/mapping/type/PairList.hpp oatpp/core/data/mapping/type/Primitive.cpp oatpp/core/data/mapping/type/Primitive.hpp oatpp/core/data/mapping/type/Type.cpp @@ -118,8 +122,6 @@ add_library(oatpp oatpp/core/data/stream/Stream.hpp oatpp/core/data/stream/StreamBufferedProxy.cpp oatpp/core/data/stream/StreamBufferedProxy.hpp - oatpp/core/data/Bundle.cpp - oatpp/core/data/Bundle.hpp oatpp/core/macro/basic.hpp oatpp/core/macro/codegen.hpp oatpp/core/macro/component.hpp @@ -144,30 +146,8 @@ add_library(oatpp oatpp/encoding/Hex.hpp oatpp/encoding/Unicode.cpp oatpp/encoding/Unicode.hpp - oatpp/network/monitor/ConnectionInactivityChecker.cpp - oatpp/network/monitor/ConnectionInactivityChecker.hpp - oatpp/network/monitor/ConnectionMaxAgeChecker.cpp - oatpp/network/monitor/ConnectionMaxAgeChecker.hpp - oatpp/network/monitor/ConnectionMonitor.cpp - oatpp/network/monitor/ConnectionMonitor.hpp - oatpp/network/monitor/MetricsChecker.hpp - oatpp/network/monitor/StatCollector.hpp - oatpp/network/tcp/client/ConnectionProvider.cpp - oatpp/network/tcp/client/ConnectionProvider.hpp - oatpp/network/tcp/server/ConnectionProvider.cpp - oatpp/network/tcp/server/ConnectionProvider.hpp - oatpp/network/tcp/Connection.cpp - oatpp/network/tcp/Connection.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/encoding/Url.cpp + oatpp/encoding/Url.hpp oatpp/network/Address.cpp oatpp/network/Address.hpp oatpp/network/ConnectionHandler.hpp @@ -181,6 +161,30 @@ add_library(oatpp oatpp/network/Server.hpp oatpp/network/Url.cpp oatpp/network/Url.hpp + oatpp/network/monitor/ConnectionInactivityChecker.cpp + oatpp/network/monitor/ConnectionInactivityChecker.hpp + oatpp/network/monitor/ConnectionMaxAgeChecker.cpp + oatpp/network/monitor/ConnectionMaxAgeChecker.hpp + oatpp/network/monitor/ConnectionMonitor.cpp + oatpp/network/monitor/ConnectionMonitor.hpp + oatpp/network/monitor/MetricsChecker.hpp + oatpp/network/monitor/StatCollector.hpp + oatpp/network/tcp/Connection.cpp + oatpp/network/tcp/Connection.hpp + oatpp/network/tcp/client/ConnectionProvider.cpp + oatpp/network/tcp/client/ConnectionProvider.hpp + oatpp/network/tcp/server/ConnectionProvider.cpp + oatpp/network/tcp/server/ConnectionProvider.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/orm/Connection.hpp oatpp/orm/DbClient.cpp oatpp/orm/DbClient.hpp @@ -232,6 +236,11 @@ add_library(oatpp oatpp/web/protocol/CommunicationError.hpp oatpp/web/protocol/http/Http.cpp oatpp/web/protocol/http/Http.hpp + oatpp/web/protocol/http/encoding/Chunked.cpp + oatpp/web/protocol/http/encoding/Chunked.hpp + oatpp/web/protocol/http/encoding/EncoderProvider.hpp + oatpp/web/protocol/http/encoding/ProviderCollection.cpp + oatpp/web/protocol/http/encoding/ProviderCollection.hpp oatpp/web/protocol/http/incoming/BodyDecoder.cpp oatpp/web/protocol/http/incoming/BodyDecoder.hpp oatpp/web/protocol/http/incoming/Request.cpp @@ -250,19 +259,14 @@ add_library(oatpp oatpp/web/protocol/http/outgoing/BufferBody.hpp oatpp/web/protocol/http/outgoing/MultipartBody.cpp oatpp/web/protocol/http/outgoing/MultipartBody.hpp - oatpp/web/protocol/http/outgoing/StreamingBody.cpp - oatpp/web/protocol/http/outgoing/StreamingBody.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/protocol/http/encoding/Chunked.cpp - oatpp/web/protocol/http/encoding/Chunked.hpp - oatpp/web/protocol/http/encoding/ProviderCollection.cpp - oatpp/web/protocol/http/encoding/ProviderCollection.hpp - oatpp/web/protocol/http/encoding/EncoderProvider.hpp + oatpp/web/protocol/http/outgoing/StreamingBody.cpp + oatpp/web/protocol/http/outgoing/StreamingBody.hpp oatpp/web/protocol/http/utils/CommunicationUtils.cpp oatpp/web/protocol/http/utils/CommunicationUtils.hpp oatpp/web/server/AsyncHttpConnectionHandler.cpp diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index bb43cc3c..8a202186 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,6 +1,8 @@ add_executable(oatppAllTests oatpp/AllTestsMain.cpp + oatpp/core/async/ConditionVariableTest.cpp + oatpp/core/async/ConditionVariableTest.hpp oatpp/core/async/LockTest.cpp oatpp/core/async/LockTest.hpp oatpp/core/base/CommandLineArgumentsTest.cpp @@ -9,6 +11,8 @@ add_executable(oatppAllTests oatpp/core/base/LoggerTest.hpp oatpp/core/data/buffer/ProcessorTest.cpp oatpp/core/data/buffer/ProcessorTest.hpp + oatpp/core/data/mapping/TypeResolverTest.cpp + oatpp/core/data/mapping/TypeResolverTest.hpp oatpp/core/data/mapping/type/AnyTest.cpp oatpp/core/data/mapping/type/AnyTest.hpp oatpp/core/data/mapping/type/EnumTest.cpp @@ -35,8 +39,6 @@ add_executable(oatppAllTests oatpp/core/data/mapping/type/UnorderedSetTest.hpp oatpp/core/data/mapping/type/VectorTest.cpp oatpp/core/data/mapping/type/VectorTest.hpp - oatpp/core/data/mapping/TypeResolverTest.cpp - oatpp/core/data/mapping/TypeResolverTest.hpp oatpp/core/data/resource/InMemoryDataTest.cpp oatpp/core/data/resource/InMemoryDataTest.hpp oatpp/core/data/share/LazyStringMapTest.cpp @@ -49,69 +51,71 @@ add_executable(oatppAllTests oatpp/core/data/stream/BufferStreamTest.hpp oatpp/core/parser/CaretTest.cpp oatpp/core/parser/CaretTest.hpp - oatpp/core/provider/PoolTest.cpp - oatpp/core/provider/PoolTest.hpp oatpp/core/provider/PoolTemplateTest.cpp oatpp/core/provider/PoolTemplateTest.hpp + oatpp/core/provider/PoolTest.cpp + oatpp/core/provider/PoolTest.hpp oatpp/encoding/Base64Test.cpp oatpp/encoding/Base64Test.hpp oatpp/encoding/UnicodeTest.cpp oatpp/encoding/UnicodeTest.hpp + oatpp/encoding/UrlTest.cpp + oatpp/encoding/UrlTest.hpp + oatpp/network/ConnectionPoolTest.cpp + oatpp/network/ConnectionPoolTest.hpp + oatpp/network/UrlTest.cpp + oatpp/network/UrlTest.hpp oatpp/network/monitor/ConnectionMonitorTest.cpp oatpp/network/monitor/ConnectionMonitorTest.hpp oatpp/network/virtual_/InterfaceTest.cpp oatpp/network/virtual_/InterfaceTest.hpp oatpp/network/virtual_/PipeTest.cpp oatpp/network/virtual_/PipeTest.hpp - oatpp/network/ConnectionPoolTest.cpp - oatpp/network/ConnectionPoolTest.hpp - oatpp/network/UrlTest.cpp - oatpp/network/UrlTest.hpp + oatpp/parser/json/mapping/BooleanTest.cpp + oatpp/parser/json/mapping/BooleanTest.hpp + oatpp/parser/json/mapping/DeserializerTest.cpp + oatpp/parser/json/mapping/DeserializerTest.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/parser/json/mapping/EnumTest.cpp oatpp/parser/json/mapping/EnumTest.hpp - oatpp/parser/json/mapping/BooleanTest.cpp - oatpp/parser/json/mapping/BooleanTest.hpp oatpp/parser/json/mapping/UnorderedSetTest.cpp oatpp/parser/json/mapping/UnorderedSetTest.hpp - oatpp/web/protocol/http/encoding/ChunkedTest.cpp - oatpp/web/protocol/http/encoding/ChunkedTest.hpp - oatpp/web/mime/multipart/StatefulParserTest.cpp - oatpp/web/mime/multipart/StatefulParserTest.hpp - oatpp/web/server/api/ApiControllerTest.cpp - oatpp/web/server/api/ApiControllerTest.hpp - oatpp/web/server/handler/AuthorizationHandlerTest.cpp - oatpp/web/server/handler/AuthorizationHandlerTest.hpp - oatpp/web/server/HttpRouterTest.cpp - oatpp/web/server/HttpRouterTest.hpp - oatpp/web/server/ServerStopTest.cpp - oatpp/web/server/ServerStopTest.hpp oatpp/web/ClientRetryTest.cpp oatpp/web/ClientRetryTest.hpp - oatpp/web/PipelineTest.cpp - oatpp/web/PipelineTest.hpp - oatpp/web/PipelineAsyncTest.cpp - oatpp/web/PipelineAsyncTest.hpp + oatpp/web/FullAsyncClientTest.cpp + oatpp/web/FullAsyncClientTest.hpp oatpp/web/FullAsyncTest.cpp oatpp/web/FullAsyncTest.hpp oatpp/web/FullTest.cpp oatpp/web/FullTest.hpp - oatpp/web/FullAsyncClientTest.cpp - oatpp/web/FullAsyncClientTest.hpp - oatpp/web/app/Client.hpp - oatpp/web/app/BearerAuthorizationController.hpp + oatpp/web/PipelineAsyncTest.cpp + oatpp/web/PipelineAsyncTest.hpp + oatpp/web/PipelineTest.cpp + oatpp/web/PipelineTest.hpp oatpp/web/app/BasicAuthorizationController.hpp + oatpp/web/app/BearerAuthorizationController.hpp + oatpp/web/app/Client.hpp oatpp/web/app/Controller.hpp oatpp/web/app/ControllerAsync.hpp - oatpp/web/app/DTOs.hpp + oatpp/web/app/ControllerWithErrorHandler.hpp oatpp/web/app/ControllerWithInterceptors.hpp oatpp/web/app/ControllerWithInterceptorsAsync.hpp - oatpp/web/app/ControllerWithErrorHandler.hpp + oatpp/web/app/DTOs.hpp + oatpp/web/mime/multipart/StatefulParserTest.cpp + oatpp/web/mime/multipart/StatefulParserTest.hpp + oatpp/web/protocol/http/encoding/ChunkedTest.cpp + oatpp/web/protocol/http/encoding/ChunkedTest.hpp + oatpp/web/server/HttpRouterTest.cpp + oatpp/web/server/HttpRouterTest.hpp + oatpp/web/server/ServerStopTest.cpp + oatpp/web/server/ServerStopTest.hpp + oatpp/web/server/api/ApiControllerTest.cpp + oatpp/web/server/api/ApiControllerTest.hpp + oatpp/web/server/handler/AuthorizationHandlerTest.cpp + oatpp/web/server/handler/AuthorizationHandlerTest.hpp ) target_link_libraries(oatppAllTests PRIVATE oatpp PRIVATE oatpp-test)