diff --git a/src/oatpp-test/UnitTest.hpp b/src/oatpp-test/UnitTest.hpp index 6e8a33cf..3578184e 100644 --- a/src/oatpp-test/UnitTest.hpp +++ b/src/oatpp-test/UnitTest.hpp @@ -25,7 +25,6 @@ #ifndef oatpp_test_UnitTest_hpp #define oatpp_test_UnitTest_hpp -#include #include "oatpp/core/base/Environment.hpp" #include "oatpp/core/macro/basic.hpp" diff --git a/src/oatpp-test/web/ClientServerTestRunner.hpp b/src/oatpp-test/web/ClientServerTestRunner.hpp index a21713b6..70d3f113 100644 --- a/src/oatpp-test/web/ClientServerTestRunner.hpp +++ b/src/oatpp-test/web/ClientServerTestRunner.hpp @@ -25,19 +25,13 @@ #ifndef oatpp_test_web_ClientServerTestRunner_hpp #define oatpp_test_web_ClientServerTestRunner_hpp -#include "oatpp/web/server/api/ApiController.hpp" #include "oatpp/web/server/HttpRouter.hpp" #include "oatpp/network/Server.hpp" -#include "oatpp/network/ConnectionProvider.hpp" #include "oatpp/core/macro/component.hpp" -#include -#include -#include #include -#include namespace oatpp { namespace test { namespace web { diff --git a/src/oatpp/algorithm/CRC.hpp b/src/oatpp/algorithm/CRC.hpp index ce515467..5837a10a 100644 --- a/src/oatpp/algorithm/CRC.hpp +++ b/src/oatpp/algorithm/CRC.hpp @@ -27,8 +27,6 @@ #include "oatpp/core/base/Environment.hpp" -#include "oatpp/encoding/Hex.hpp" - namespace oatpp { namespace algorithm { /** diff --git a/src/oatpp/core/IODefinitions.hpp b/src/oatpp/core/IODefinitions.hpp index 7d706bdb..2b2fe09c 100644 --- a/src/oatpp/core/IODefinitions.hpp +++ b/src/oatpp/core/IODefinitions.hpp @@ -26,7 +26,7 @@ #define oatpp_IODefinitions_hpp #include "oatpp/core/async/Error.hpp" -#include "oatpp/core/Types.hpp" +#include "base/Environment.hpp" namespace oatpp { diff --git a/src/oatpp/core/async/Coroutine.hpp b/src/oatpp/core/async/Coroutine.hpp index 9a6e8aa2..83f76533 100644 --- a/src/oatpp/core/async/Coroutine.hpp +++ b/src/oatpp/core/async/Coroutine.hpp @@ -26,17 +26,9 @@ #ifndef oatpp_async_Coroutine_hpp #define oatpp_async_Coroutine_hpp -#include "./Error.hpp" - #include "oatpp/core/async/utils/FastQueue.hpp" #include "oatpp/core/IODefinitions.hpp" -#include "oatpp/core/base/Environment.hpp" - -#include "oatpp/core/Types.hpp" - -#include -#include namespace oatpp { namespace async { diff --git a/src/oatpp/core/async/CoroutineWaitList.cpp b/src/oatpp/core/async/CoroutineWaitList.cpp index 4632c399..69533716 100644 --- a/src/oatpp/core/async/CoroutineWaitList.cpp +++ b/src/oatpp/core/async/CoroutineWaitList.cpp @@ -27,11 +27,9 @@ #include "./Processor.hpp" #include -#include namespace oatpp { namespace async { - CoroutineWaitList::CoroutineWaitList(CoroutineWaitList&& other) { { std::lock_guard lock{other.m_lock}; diff --git a/src/oatpp/core/async/CoroutineWaitList.hpp b/src/oatpp/core/async/CoroutineWaitList.hpp index 484d9398..40a1f8ca 100644 --- a/src/oatpp/core/async/CoroutineWaitList.hpp +++ b/src/oatpp/core/async/CoroutineWaitList.hpp @@ -31,9 +31,8 @@ #include "oatpp/core/concurrency/SpinLock.hpp" #include -#include -#include -#include + +#include namespace oatpp { namespace async { diff --git a/src/oatpp/core/async/Executor.cpp b/src/oatpp/core/async/Executor.cpp index 95065454..7919d467 100644 --- a/src/oatpp/core/async/Executor.cpp +++ b/src/oatpp/core/async/Executor.cpp @@ -23,6 +23,7 @@ ***************************************************************************/ #include "Executor.hpp" +#include "oatpp/core/concurrency/Thread.hpp" #include "oatpp/core/async/worker/IOEventWorker.hpp" #include "oatpp/core/async/worker/IOWorker.hpp" #include "oatpp/core/async/worker/TimerWorker.hpp" diff --git a/src/oatpp/core/async/Executor.hpp b/src/oatpp/core/async/Executor.hpp index 2e8804f5..953c51d3 100644 --- a/src/oatpp/core/async/Executor.hpp +++ b/src/oatpp/core/async/Executor.hpp @@ -28,13 +28,6 @@ #include "./Processor.hpp" #include "oatpp/core/async/worker/Worker.hpp" -#include "oatpp/core/concurrency/SpinLock.hpp" -#include "oatpp/core/concurrency/Thread.hpp" - -#include -#include -#include - namespace oatpp { namespace async { /** diff --git a/src/oatpp/core/async/Processor.hpp b/src/oatpp/core/async/Processor.hpp index cfce0375..77fdad77 100644 --- a/src/oatpp/core/async/Processor.hpp +++ b/src/oatpp/core/async/Processor.hpp @@ -27,14 +27,14 @@ #define oatpp_async_Processor_hpp #include "./Coroutine.hpp" -#include "./CoroutineWaitList.hpp" +#include "oatpp/core/concurrency/SpinLock.hpp" #include "oatpp/core/async/utils/FastQueue.hpp" #include #include -#include #include #include +#include namespace oatpp { namespace async { diff --git a/src/oatpp/core/async/utils/FastQueue.hpp b/src/oatpp/core/async/utils/FastQueue.hpp index acee2932..a5796972 100644 --- a/src/oatpp/core/async/utils/FastQueue.hpp +++ b/src/oatpp/core/async/utils/FastQueue.hpp @@ -25,7 +25,6 @@ #ifndef oatpp_async_utils_FastQueue_hpp #define oatpp_async_utils_FastQueue_hpp -#include "oatpp/core/concurrency/SpinLock.hpp" #include "oatpp/core/base/Environment.hpp" namespace oatpp { namespace async { namespace utils { diff --git a/src/oatpp/core/async/worker/IOEventWorker.hpp b/src/oatpp/core/async/worker/IOEventWorker.hpp index 90ad9514..f6efaecb 100644 --- a/src/oatpp/core/async/worker/IOEventWorker.hpp +++ b/src/oatpp/core/async/worker/IOEventWorker.hpp @@ -26,10 +26,11 @@ #define oatpp_async_worker_IOEventWorker_hpp #include "./Worker.hpp" +#include "oatpp/core/async/utils/FastQueue.hpp" +#include "oatpp/core/async/Coroutine.hpp" #include "oatpp/core/concurrency/SpinLock.hpp" #include -#include //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/oatpp/core/async/worker/IOEventWorker_epoll.cpp b/src/oatpp/core/async/worker/IOEventWorker_epoll.cpp index 99ac667f..bb841f0f 100644 --- a/src/oatpp/core/async/worker/IOEventWorker_epoll.cpp +++ b/src/oatpp/core/async/worker/IOEventWorker_epoll.cpp @@ -31,7 +31,7 @@ #include "oatpp/core/async/Processor.hpp" -#include +#include #include #include @@ -246,7 +246,6 @@ void IOEventWorker::waitEvents() { break; - default: auto& prevAction = getCoroutineScheduledAction(coroutine); diff --git a/src/oatpp/core/async/worker/IOWorker.cpp b/src/oatpp/core/async/worker/IOWorker.cpp index 2106dc79..b7c56fd7 100644 --- a/src/oatpp/core/async/worker/IOWorker.cpp +++ b/src/oatpp/core/async/worker/IOWorker.cpp @@ -26,8 +26,6 @@ #include "oatpp/core/async/Processor.hpp" -#include - namespace oatpp { namespace async { namespace worker { IOWorker::IOWorker() diff --git a/src/oatpp/core/async/worker/IOWorker.hpp b/src/oatpp/core/async/worker/IOWorker.hpp index c83118e9..7582c12e 100644 --- a/src/oatpp/core/async/worker/IOWorker.hpp +++ b/src/oatpp/core/async/worker/IOWorker.hpp @@ -26,10 +26,11 @@ #define oatpp_async_worker_IOWorker_hpp #include "./Worker.hpp" +#include "oatpp/core/async/Coroutine.hpp" +#include "oatpp/core/async/utils/FastQueue.hpp" #include "oatpp/core/concurrency/SpinLock.hpp" #include -#include #include namespace oatpp { namespace async { namespace worker { diff --git a/src/oatpp/core/async/worker/TimerWorker.cpp b/src/oatpp/core/async/worker/TimerWorker.cpp index a337a63d..eceea520 100644 --- a/src/oatpp/core/async/worker/TimerWorker.cpp +++ b/src/oatpp/core/async/worker/TimerWorker.cpp @@ -26,8 +26,6 @@ #include "oatpp/core/async/Processor.hpp" -#include - namespace oatpp { namespace async { namespace worker { TimerWorker::TimerWorker(const std::chrono::duration& granularity) diff --git a/src/oatpp/core/async/worker/TimerWorker.hpp b/src/oatpp/core/async/worker/TimerWorker.hpp index 89e5e5fe..0aac90cb 100644 --- a/src/oatpp/core/async/worker/TimerWorker.hpp +++ b/src/oatpp/core/async/worker/TimerWorker.hpp @@ -26,10 +26,11 @@ #define oatpp_async_worker_TimerWorker_hpp #include "./Worker.hpp" +#include "oatpp/core/async/utils/FastQueue.hpp" +#include "oatpp/core/async/Coroutine.hpp" #include "oatpp/core/concurrency/SpinLock.hpp" #include -#include #include namespace oatpp { namespace async { namespace worker { diff --git a/src/oatpp/core/async/worker/Worker.cpp b/src/oatpp/core/async/worker/Worker.cpp index b74db639..8e7dd178 100644 --- a/src/oatpp/core/async/worker/Worker.cpp +++ b/src/oatpp/core/async/worker/Worker.cpp @@ -23,6 +23,7 @@ ***************************************************************************/ #include "Worker.hpp" +#include "oatpp/core/async/Coroutine.hpp" namespace oatpp { namespace async { namespace worker { diff --git a/src/oatpp/core/async/worker/Worker.hpp b/src/oatpp/core/async/worker/Worker.hpp index 734b6cd7..db0cbf49 100644 --- a/src/oatpp/core/async/worker/Worker.hpp +++ b/src/oatpp/core/async/worker/Worker.hpp @@ -26,7 +26,7 @@ #define oatpp_async_worker_Worker_hpp #include "oatpp/core/async/Coroutine.hpp" -#include +#include "oatpp/core/base/Environment.hpp" namespace oatpp { namespace async { namespace worker { diff --git a/src/oatpp/core/base/Countable.cpp b/src/oatpp/core/base/Countable.cpp index d396be5d..3bb7378b 100644 --- a/src/oatpp/core/base/Countable.cpp +++ b/src/oatpp/core/base/Countable.cpp @@ -23,6 +23,7 @@ ***************************************************************************/ #include "Countable.hpp" +#include "Environment.hpp" namespace oatpp { namespace base{ diff --git a/src/oatpp/core/base/Countable.hpp b/src/oatpp/core/base/Countable.hpp index fe2f6c26..4017eb09 100644 --- a/src/oatpp/core/base/Countable.hpp +++ b/src/oatpp/core/base/Countable.hpp @@ -25,9 +25,6 @@ #ifndef oatpp_base_Countable #define oatpp_base_Countable -#include -#include "./Environment.hpp" - namespace oatpp { namespace base{ /** @@ -53,7 +50,6 @@ public: Countable& operator = (Countable&) = default; - }; }} diff --git a/src/oatpp/core/base/Environment.cpp b/src/oatpp/core/base/Environment.cpp index f555dd73..a018a874 100644 --- a/src/oatpp/core/base/Environment.cpp +++ b/src/oatpp/core/base/Environment.cpp @@ -26,12 +26,11 @@ #include "Environment.hpp" #include -#include #include -#include -#include #include +#include + #if defined(WIN32) || defined(_WIN32) #include @@ -329,7 +328,6 @@ void Environment::log(v_uint32 priority, const std::string& tag, const std::stri } } - void Environment::logFormatted(v_uint32 priority, const LogCategory& category, const char* message, ...) { if (category.categoryEnabled && (category.enabledPriorities & (1 << priority))) { va_list args; diff --git a/src/oatpp/core/base/Environment.hpp b/src/oatpp/core/base/Environment.hpp index 984afdf2..1f6b3deb 100644 --- a/src/oatpp/core/base/Environment.hpp +++ b/src/oatpp/core/base/Environment.hpp @@ -26,16 +26,10 @@ #ifndef oatpp_base_Environment_hpp #define oatpp_base_Environment_hpp -#include "./Config.hpp" - -#include #include #include -#include #include #include -#include -#include #define OATPP_VERSION "1.3.0" @@ -509,7 +503,6 @@ if(!(EXP)) { \ #define OATPP_LOG_CATEGORY(NAME, TAG, ENABLED) \ oatpp::base::LogCategory NAME = oatpp::base::LogCategory(TAG, ENABLED); - #ifndef OATPP_DISABLE_LOGV /** @@ -592,5 +585,4 @@ if(!(EXP)) { \ }} - #endif /* oatpp_base_Environment_hpp */ diff --git a/src/oatpp/core/base/ObjectHandle.hpp b/src/oatpp/core/base/ObjectHandle.hpp index 8f352c4d..8ce2b89c 100644 --- a/src/oatpp/core/base/ObjectHandle.hpp +++ b/src/oatpp/core/base/ObjectHandle.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_base_ObjectHandle_hpp #define oatpp_base_ObjectHandle_hpp -#include "./Environment.hpp" +#include namespace oatpp { namespace base { diff --git a/src/oatpp/core/concurrency/Thread.cpp b/src/oatpp/core/concurrency/Thread.cpp index d2e575ec..ae7e5b06 100644 --- a/src/oatpp/core/concurrency/Thread.cpp +++ b/src/oatpp/core/concurrency/Thread.cpp @@ -23,6 +23,7 @@ ***************************************************************************/ #include "Thread.hpp" +#include "oatpp/core/base/Environment.hpp" #if defined(_GNU_SOURCE) #include diff --git a/src/oatpp/core/data/buffer/FIFOBuffer.cpp b/src/oatpp/core/data/buffer/FIFOBuffer.cpp index 8cdce8a8..b43f4d21 100644 --- a/src/oatpp/core/data/buffer/FIFOBuffer.cpp +++ b/src/oatpp/core/data/buffer/FIFOBuffer.cpp @@ -23,7 +23,6 @@ ***************************************************************************/ #include "FIFOBuffer.hpp" -#include namespace oatpp { namespace data{ namespace buffer { diff --git a/src/oatpp/core/data/buffer/FIFOBuffer.hpp b/src/oatpp/core/data/buffer/FIFOBuffer.hpp index 82a3355a..607fab42 100644 --- a/src/oatpp/core/data/buffer/FIFOBuffer.hpp +++ b/src/oatpp/core/data/buffer/FIFOBuffer.hpp @@ -26,9 +26,6 @@ #define oatpp_data_buffer_FIFOBuffer_hpp #include "oatpp/core/data/stream/Stream.hpp" -#include "oatpp/core/IODefinitions.hpp" -#include "oatpp/core/async/Coroutine.hpp" -#include "oatpp/core/concurrency/SpinLock.hpp" namespace oatpp { namespace data { namespace buffer { diff --git a/src/oatpp/core/data/buffer/IOBuffer.hpp b/src/oatpp/core/data/buffer/IOBuffer.hpp index fcc14c99..e3e196c7 100644 --- a/src/oatpp/core/data/buffer/IOBuffer.hpp +++ b/src/oatpp/core/data/buffer/IOBuffer.hpp @@ -26,6 +26,7 @@ #define oatpp_data_buffer_IOBuffer_hpp #include "oatpp/core/base/Countable.hpp" +#include "oatpp/core/base/Environment.hpp" namespace oatpp { namespace data{ namespace buffer { diff --git a/src/oatpp/core/data/mapping/ObjectMapper.hpp b/src/oatpp/core/data/mapping/ObjectMapper.hpp index ba11ef56..f8b8a4bd 100644 --- a/src/oatpp/core/data/mapping/ObjectMapper.hpp +++ b/src/oatpp/core/data/mapping/ObjectMapper.hpp @@ -25,9 +25,6 @@ #ifndef oatpp_data_mapping_ObjectMapper_hpp #define oatpp_data_mapping_ObjectMapper_hpp -#include "type/Object.hpp" -#include "type/Type.hpp" - #include "oatpp/core/data/stream/Stream.hpp" #include "oatpp/core/parser/Caret.hpp" diff --git a/src/oatpp/core/data/mapping/TypeResolver.cpp b/src/oatpp/core/data/mapping/TypeResolver.cpp index cc04d940..8ead03f7 100644 --- a/src/oatpp/core/data/mapping/TypeResolver.cpp +++ b/src/oatpp/core/data/mapping/TypeResolver.cpp @@ -23,6 +23,7 @@ ***************************************************************************/ #include "TypeResolver.hpp" +#include "type/Object.hpp" namespace oatpp { namespace data { namespace mapping { diff --git a/src/oatpp/core/data/mapping/TypeResolver.hpp b/src/oatpp/core/data/mapping/TypeResolver.hpp index d6575f90..962a5b6c 100644 --- a/src/oatpp/core/data/mapping/TypeResolver.hpp +++ b/src/oatpp/core/data/mapping/TypeResolver.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_data_mapping_TypeResolver_hpp #define oatpp_data_mapping_TypeResolver_hpp -#include "type/Object.hpp" +#include "type/Type.hpp" namespace oatpp { namespace data { namespace mapping { diff --git a/src/oatpp/core/data/mapping/type/Enum.hpp b/src/oatpp/core/data/mapping/type/Enum.hpp index 5559cd0f..990feeb2 100644 --- a/src/oatpp/core/data/mapping/type/Enum.hpp +++ b/src/oatpp/core/data/mapping/type/Enum.hpp @@ -26,13 +26,8 @@ #define oatpp_data_mapping_type_Enum_hpp #include "./Any.hpp" -#include "./Primitive.hpp" #include "oatpp/core/data/share/MemoryLabel.hpp" -#include -#include -#include - namespace oatpp { namespace data { namespace mapping { namespace type { /** diff --git a/src/oatpp/core/data/mapping/type/List.hpp b/src/oatpp/core/data/mapping/type/List.hpp index d1676bb3..7c9bafc3 100644 --- a/src/oatpp/core/data/mapping/type/List.hpp +++ b/src/oatpp/core/data/mapping/type/List.hpp @@ -26,10 +26,8 @@ #define oatpp_data_mapping_type_List_hpp #include "./Collection.hpp" -#include "./Type.hpp" #include -#include namespace oatpp { namespace data { namespace mapping { namespace type { diff --git a/src/oatpp/core/data/mapping/type/Object.hpp b/src/oatpp/core/data/mapping/type/Object.hpp index 9c277801..5fdbea0c 100644 --- a/src/oatpp/core/data/mapping/type/Object.hpp +++ b/src/oatpp/core/data/mapping/type/Object.hpp @@ -25,10 +25,6 @@ #ifndef oatpp_data_type_Object_hpp #define oatpp_data_type_Object_hpp -#include "./Type.hpp" - -#include "./Any.hpp" -#include "./Primitive.hpp" #include "./Enum.hpp" #include "./UnorderedMap.hpp" #include "./PairList.hpp" @@ -36,10 +32,6 @@ #include "./Vector.hpp" #include "./UnorderedSet.hpp" -#include "oatpp/core/base/Countable.hpp" - -#include - namespace oatpp { namespace data { namespace mapping { namespace type { /** diff --git a/src/oatpp/core/data/mapping/type/PairList.hpp b/src/oatpp/core/data/mapping/type/PairList.hpp index 171eff59..b2cdeebc 100644 --- a/src/oatpp/core/data/mapping/type/PairList.hpp +++ b/src/oatpp/core/data/mapping/type/PairList.hpp @@ -26,11 +26,6 @@ #define oatpp_data_mapping_type_PairList_hpp #include "./Map.hpp" -#include "./Type.hpp" - -#include -#include -#include namespace oatpp { namespace data { namespace mapping { namespace type { diff --git a/src/oatpp/core/data/mapping/type/Primitive.cpp b/src/oatpp/core/data/mapping/type/Primitive.cpp index 347cd019..881fa873 100644 --- a/src/oatpp/core/data/mapping/type/Primitive.cpp +++ b/src/oatpp/core/data/mapping/type/Primitive.cpp @@ -22,11 +22,7 @@ * ***************************************************************************/ -#include "./Primitive.hpp" - #include "oatpp/core/data/stream/BufferStream.hpp" -#include "oatpp/core/utils/ConversionUtils.hpp" -#include "oatpp/core/data/share/MemoryLabel.hpp" #include diff --git a/src/oatpp/core/data/mapping/type/Primitive.hpp b/src/oatpp/core/data/mapping/type/Primitive.hpp index c9528536..37ff4f2f 100644 --- a/src/oatpp/core/data/mapping/type/Primitive.hpp +++ b/src/oatpp/core/data/mapping/type/Primitive.hpp @@ -27,12 +27,6 @@ #include "./Type.hpp" -#include "oatpp/core/base/Countable.hpp" - -#include -#include -#include - namespace oatpp { namespace data { namespace mapping { namespace type { namespace __class { @@ -494,7 +488,6 @@ typedef Primitive Float32; */ typedef Primitive Float64; - template<> struct ObjectWrapperByUnderlyingType { typedef Int8 ObjectWrapper; diff --git a/src/oatpp/core/data/mapping/type/Type.hpp b/src/oatpp/core/data/mapping/type/Type.hpp index dbc26242..9e2fc7d1 100644 --- a/src/oatpp/core/data/mapping/type/Type.hpp +++ b/src/oatpp/core/data/mapping/type/Type.hpp @@ -25,13 +25,9 @@ #ifndef oatpp_data_type_Type_hpp #define oatpp_data_type_Type_hpp -#include "oatpp/core/base/Countable.hpp" #include "oatpp/core/base/Environment.hpp" -#include -#include #include -#include namespace oatpp { namespace data { namespace mapping { namespace type { @@ -88,7 +84,6 @@ public: }; - namespace __class { /** * Void Object Class. @@ -617,7 +612,6 @@ public: \ return *this; \ } \ - }}}} namespace std { diff --git a/src/oatpp/core/data/mapping/type/UnorderedMap.hpp b/src/oatpp/core/data/mapping/type/UnorderedMap.hpp index fb625840..8ea10879 100644 --- a/src/oatpp/core/data/mapping/type/UnorderedMap.hpp +++ b/src/oatpp/core/data/mapping/type/UnorderedMap.hpp @@ -26,11 +26,6 @@ #define oatpp_data_mapping_type_UnorderedMap_hpp #include "./Map.hpp" -#include "./Type.hpp" - -#include -#include -#include namespace oatpp { namespace data { namespace mapping { namespace type { diff --git a/src/oatpp/core/data/mapping/type/UnorderedSet.hpp b/src/oatpp/core/data/mapping/type/UnorderedSet.hpp index ae45aeee..67416b4b 100644 --- a/src/oatpp/core/data/mapping/type/UnorderedSet.hpp +++ b/src/oatpp/core/data/mapping/type/UnorderedSet.hpp @@ -26,10 +26,6 @@ #define oatpp_data_mapping_type_UnorderedSet_hpp #include "./Collection.hpp" -#include "./Type.hpp" - -#include -#include namespace oatpp { namespace data { namespace mapping { namespace type { diff --git a/src/oatpp/core/data/mapping/type/Vector.hpp b/src/oatpp/core/data/mapping/type/Vector.hpp index fdfcc647..6151d537 100644 --- a/src/oatpp/core/data/mapping/type/Vector.hpp +++ b/src/oatpp/core/data/mapping/type/Vector.hpp @@ -26,10 +26,6 @@ #define oatpp_data_mapping_type_Vector_hpp #include "./Collection.hpp" -#include "./Type.hpp" - -#include -#include namespace oatpp { namespace data { namespace mapping { namespace type { diff --git a/src/oatpp/core/data/resource/File.hpp b/src/oatpp/core/data/resource/File.hpp index ea682bab..724738ec 100644 --- a/src/oatpp/core/data/resource/File.hpp +++ b/src/oatpp/core/data/resource/File.hpp @@ -26,7 +26,6 @@ #define oatpp_data_resource_File_hpp #include "./Resource.hpp" -#include "oatpp/core/data/stream/Stream.hpp" namespace oatpp { namespace data { namespace resource { diff --git a/src/oatpp/core/data/resource/InMemoryData.cpp b/src/oatpp/core/data/resource/InMemoryData.cpp index e9770c31..f462318d 100644 --- a/src/oatpp/core/data/resource/InMemoryData.cpp +++ b/src/oatpp/core/data/resource/InMemoryData.cpp @@ -23,6 +23,7 @@ ***************************************************************************/ #include "InMemoryData.hpp" +#include "oatpp/core/data/stream/BufferStream.hpp" namespace oatpp { namespace data { namespace resource { diff --git a/src/oatpp/core/data/resource/Resource.hpp b/src/oatpp/core/data/resource/Resource.hpp index 2e8b209f..c3e19da7 100644 --- a/src/oatpp/core/data/resource/Resource.hpp +++ b/src/oatpp/core/data/resource/Resource.hpp @@ -26,6 +26,7 @@ #define oatpp_data_resource_Resource_hpp #include "oatpp/core/data/stream/Stream.hpp" +#include "oatpp/core/Types.hpp" namespace oatpp { namespace data { namespace resource { diff --git a/src/oatpp/core/data/resource/TemporaryFile.hpp b/src/oatpp/core/data/resource/TemporaryFile.hpp index 1c967e67..cb9a9c60 100644 --- a/src/oatpp/core/data/resource/TemporaryFile.hpp +++ b/src/oatpp/core/data/resource/TemporaryFile.hpp @@ -26,7 +26,6 @@ #define oatpp_data_resource_TemporaryFile_hpp #include "./Resource.hpp" -#include "oatpp/core/Types.hpp" namespace oatpp { namespace data { namespace resource { diff --git a/src/oatpp/core/data/share/LazyStringMap.hpp b/src/oatpp/core/data/share/LazyStringMap.hpp index 049dd886..ae46eeba 100644 --- a/src/oatpp/core/data/share/LazyStringMap.hpp +++ b/src/oatpp/core/data/share/LazyStringMap.hpp @@ -28,8 +28,6 @@ #include "./MemoryLabel.hpp" #include "oatpp/core/concurrency/SpinLock.hpp" -#include - namespace oatpp { namespace data { namespace share { /** diff --git a/src/oatpp/core/data/share/MemoryLabel.cpp b/src/oatpp/core/data/share/MemoryLabel.cpp index 4887aa76..02e334ce 100644 --- a/src/oatpp/core/data/share/MemoryLabel.cpp +++ b/src/oatpp/core/data/share/MemoryLabel.cpp @@ -24,8 +24,6 @@ #include "MemoryLabel.hpp" -#include - namespace oatpp { namespace data { namespace share { MemoryLabel::MemoryLabel(const std::shared_ptr& memHandle, const void* data, v_buff_size size) diff --git a/src/oatpp/core/data/share/MemoryLabel.hpp b/src/oatpp/core/data/share/MemoryLabel.hpp index ca8d0b77..dd0ff990 100644 --- a/src/oatpp/core/data/share/MemoryLabel.hpp +++ b/src/oatpp/core/data/share/MemoryLabel.hpp @@ -29,7 +29,6 @@ #include "oatpp/core/utils/String.hpp" #include -#include namespace oatpp { namespace data { namespace share { diff --git a/src/oatpp/core/data/share/StringTemplate.hpp b/src/oatpp/core/data/share/StringTemplate.hpp index c31a9333..9ac10ef8 100644 --- a/src/oatpp/core/data/share/StringTemplate.hpp +++ b/src/oatpp/core/data/share/StringTemplate.hpp @@ -28,9 +28,6 @@ #include "oatpp/core/data/stream/Stream.hpp" #include "oatpp/core/Types.hpp" -#include -#include - namespace oatpp { namespace data { namespace share { /** diff --git a/src/oatpp/core/data/stream/FIFOStream.hpp b/src/oatpp/core/data/stream/FIFOStream.hpp index a7853d22..05628ca7 100644 --- a/src/oatpp/core/data/stream/FIFOStream.hpp +++ b/src/oatpp/core/data/stream/FIFOStream.hpp @@ -25,12 +25,10 @@ #ifndef oatpp_data_stream_FIFOStream_hpp #define oatpp_data_stream_FIFOStream_hpp -#include "Stream.hpp" #include "oatpp/core/data/buffer/FIFOBuffer.hpp" namespace oatpp { namespace data { namespace stream { - /** * FIFOInputStream */ diff --git a/src/oatpp/core/data/stream/FileStream.hpp b/src/oatpp/core/data/stream/FileStream.hpp index b825420e..5e772b27 100644 --- a/src/oatpp/core/data/stream/FileStream.hpp +++ b/src/oatpp/core/data/stream/FileStream.hpp @@ -27,8 +27,6 @@ #include "Stream.hpp" -#include - namespace oatpp { namespace data{ namespace stream { /** diff --git a/src/oatpp/core/data/stream/Stream.cpp b/src/oatpp/core/data/stream/Stream.cpp index 7a2013e2..0e8d10a8 100644 --- a/src/oatpp/core/data/stream/Stream.cpp +++ b/src/oatpp/core/data/stream/Stream.cpp @@ -23,6 +23,7 @@ ***************************************************************************/ #include "./Stream.hpp" +#include "oatpp/core/data/buffer/IOBuffer.hpp" #include "oatpp/core/utils/ConversionUtils.hpp" namespace oatpp { namespace data{ namespace stream { @@ -426,7 +427,6 @@ v_io_size ConsistentOutputStream::writeAsString(bool value) { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Other functions - ConsistentOutputStream& operator << (ConsistentOutputStream& s, const oatpp::String& str) { if(str) { s.writeSimple(str); diff --git a/src/oatpp/core/data/stream/Stream.hpp b/src/oatpp/core/data/stream/Stream.hpp index 2f5fdf08..cd8907b0 100644 --- a/src/oatpp/core/data/stream/Stream.hpp +++ b/src/oatpp/core/data/stream/Stream.hpp @@ -30,7 +30,7 @@ #include "oatpp/core/data/buffer/IOBuffer.hpp" #include "oatpp/core/data/buffer/Processor.hpp" -#include "oatpp/core/IODefinitions.hpp" +#include "oatpp/core/Types.hpp" namespace oatpp { namespace data{ namespace stream { @@ -51,7 +51,6 @@ enum StreamType : v_int32 { }; - /** * Stream Context. */ diff --git a/src/oatpp/core/data/stream/StreamBufferedProxy.hpp b/src/oatpp/core/data/stream/StreamBufferedProxy.hpp index 1d7a3cfd..1f3662c2 100644 --- a/src/oatpp/core/data/stream/StreamBufferedProxy.hpp +++ b/src/oatpp/core/data/stream/StreamBufferedProxy.hpp @@ -25,10 +25,7 @@ #ifndef oatpp_data_stream_StreamBufferedProxy_hpp #define oatpp_data_stream_StreamBufferedProxy_hpp -#include "Stream.hpp" #include "oatpp/core/data/buffer/FIFOBuffer.hpp" -#include "oatpp/core/data/share/MemoryLabel.hpp" -#include "oatpp/core/async/Coroutine.hpp" namespace oatpp { namespace data{ namespace stream { diff --git a/src/oatpp/core/macro/component.hpp b/src/oatpp/core/macro/component.hpp index e62efb3f..61b2692d 100644 --- a/src/oatpp/core/macro/component.hpp +++ b/src/oatpp/core/macro/component.hpp @@ -38,7 +38,6 @@ #define oatpp_macro_component_hpp #include "./basic.hpp" -#include "oatpp/core/base/Environment.hpp" #define OATPP_MACRO_GET_COMPONENT_1(TYPE) \ (*((TYPE*) oatpp::base::Environment::getComponent(typeid(TYPE).name()))) @@ -49,7 +48,6 @@ #define OATPP_GET_COMPONENT(...) \ OATPP_MACRO_EXPAND(OATPP_MACRO_MACRO_SELECTOR(OATPP_MACRO_GET_COMPONENT_, (__VA_ARGS__)) (__VA_ARGS__)) - #define OATPP_MACRO_COMPONENT_1(TYPE, NAME) \ TYPE& NAME = (*((TYPE*) oatpp::base::Environment::getComponent(typeid(TYPE).name()))) diff --git a/src/oatpp/core/parser/Caret.cpp b/src/oatpp/core/parser/Caret.cpp index ea865ff1..63361f07 100644 --- a/src/oatpp/core/parser/Caret.cpp +++ b/src/oatpp/core/parser/Caret.cpp @@ -24,7 +24,6 @@ #include "Caret.hpp" -#include #include namespace oatpp { namespace parser { @@ -312,7 +311,6 @@ v_int64 Caret::StateSaveGuard::getSavedErrorCode() { return (m_pos + 1 < m_size && m_data[m_pos] == '\r' && m_data[m_pos + 1] == '\n'); } - bool Caret::findROrN() { while(m_pos < m_size) { v_char8 a = m_data[m_pos]; diff --git a/src/oatpp/core/provider/Provider.hpp b/src/oatpp/core/provider/Provider.hpp index a65e903e..a4d684ca 100644 --- a/src/oatpp/core/provider/Provider.hpp +++ b/src/oatpp/core/provider/Provider.hpp @@ -28,7 +28,7 @@ #include "Invalidator.hpp" #include "oatpp/core/async/Coroutine.hpp" -#include "oatpp/core/data/share/MemoryLabel.hpp" +#include "oatpp/core/Types.hpp" namespace oatpp { namespace provider { diff --git a/src/oatpp/core/utils/ConversionUtils.cpp b/src/oatpp/core/utils/ConversionUtils.cpp index a5ef0134..5030662f 100644 --- a/src/oatpp/core/utils/ConversionUtils.cpp +++ b/src/oatpp/core/utils/ConversionUtils.cpp @@ -22,9 +22,7 @@ * ***************************************************************************/ -#include "ConversionUtils.hpp" - -#include +#include "oatpp/core/Types.hpp" namespace oatpp { namespace utils { namespace conversion { diff --git a/src/oatpp/core/utils/ConversionUtils.hpp b/src/oatpp/core/utils/ConversionUtils.hpp index b87f7b22..3a0baf62 100644 --- a/src/oatpp/core/utils/ConversionUtils.hpp +++ b/src/oatpp/core/utils/ConversionUtils.hpp @@ -25,14 +25,9 @@ #ifndef oatpp_utils_ConversionUtils_hpp #define oatpp_utils_ConversionUtils_hpp -#include "oatpp/core/data/mapping/type/Primitive.hpp" #include "oatpp/core/Types.hpp" - -#include "oatpp/core/base/Countable.hpp" -#include "oatpp/core/base/Environment.hpp" - -#include +#include "oatpp/core/base/Config.hpp" namespace oatpp { namespace utils { namespace conversion { diff --git a/src/oatpp/core/utils/Random.hpp b/src/oatpp/core/utils/Random.hpp index 7c318dc2..01b401d3 100644 --- a/src/oatpp/core/utils/Random.hpp +++ b/src/oatpp/core/utils/Random.hpp @@ -25,8 +25,7 @@ #ifndef oatpp_utils_Random_hpp #define oatpp_utils_Random_hpp -#include "oatpp/core/concurrency/SpinLock.hpp" -#include "oatpp/core/Types.hpp" +#include "oatpp/core/base/Environment.hpp" #include namespace oatpp { namespace utils { namespace random { diff --git a/src/oatpp/encoding/Hex.cpp b/src/oatpp/encoding/Hex.cpp index 953db819..4d977100 100644 --- a/src/oatpp/encoding/Hex.cpp +++ b/src/oatpp/encoding/Hex.cpp @@ -23,11 +23,12 @@ ***************************************************************************/ #include "Hex.hpp" +#include "oatpp/core/data/stream/Stream.hpp" #if defined(WIN32) || defined(_WIN32) #include #else - #include + #include #endif namespace oatpp { namespace encoding { diff --git a/src/oatpp/encoding/Hex.hpp b/src/oatpp/encoding/Hex.hpp index ef8013e5..4ee9a5a6 100644 --- a/src/oatpp/encoding/Hex.hpp +++ b/src/oatpp/encoding/Hex.hpp @@ -26,7 +26,7 @@ #define oatpp_encoding_Hex_hpp #include "oatpp/core/data/stream/Stream.hpp" -#include "oatpp/core/Types.hpp" +#include "oatpp/core/base/Environment.hpp" namespace oatpp { namespace encoding { diff --git a/src/oatpp/encoding/Unicode.cpp b/src/oatpp/encoding/Unicode.cpp index 071b7b3b..e80c442f 100644 --- a/src/oatpp/encoding/Unicode.cpp +++ b/src/oatpp/encoding/Unicode.cpp @@ -27,7 +27,7 @@ #if defined(WIN32) || defined(_WIN32) #include #else - #include + #include #endif namespace oatpp { namespace encoding { diff --git a/src/oatpp/network/ConnectionHandler.hpp b/src/oatpp/network/ConnectionHandler.hpp index 1e5468e7..cd95ee1d 100644 --- a/src/oatpp/network/ConnectionHandler.hpp +++ b/src/oatpp/network/ConnectionHandler.hpp @@ -27,7 +27,6 @@ #include "oatpp/core/provider/Provider.hpp" #include "oatpp/core/data/stream/Stream.hpp" -#include namespace oatpp { namespace network { diff --git a/src/oatpp/network/ConnectionProvider.hpp b/src/oatpp/network/ConnectionProvider.hpp index 9bf59fb7..af1bbc31 100644 --- a/src/oatpp/network/ConnectionProvider.hpp +++ b/src/oatpp/network/ConnectionProvider.hpp @@ -25,12 +25,9 @@ #ifndef oatpp_network_ConnectionProvider_hpp #define oatpp_network_ConnectionProvider_hpp -#include "oatpp/core/data/share/MemoryLabel.hpp" #include "oatpp/core/data/stream/Stream.hpp" #include "oatpp/core/provider/Provider.hpp" -#include - namespace oatpp { namespace network { /** diff --git a/src/oatpp/network/ConnectionProviderSwitch.hpp b/src/oatpp/network/ConnectionProviderSwitch.hpp index c66820bc..4a0dc3fa 100644 --- a/src/oatpp/network/ConnectionProviderSwitch.hpp +++ b/src/oatpp/network/ConnectionProviderSwitch.hpp @@ -26,7 +26,6 @@ #define oatpp_network_ConnectionProviderSwitch_hpp #include "ConnectionProvider.hpp" -#include namespace oatpp { namespace network { diff --git a/src/oatpp/network/Server.cpp b/src/oatpp/network/Server.cpp index 33ad8f89..b97e85b9 100644 --- a/src/oatpp/network/Server.cpp +++ b/src/oatpp/network/Server.cpp @@ -24,9 +24,6 @@ #include "Server.hpp" -#include -#include - namespace oatpp { namespace network { const v_int32 Server::STATUS_CREATED = 0; diff --git a/src/oatpp/network/Server.hpp b/src/oatpp/network/Server.hpp index de91a4cd..396e27f5 100644 --- a/src/oatpp/network/Server.hpp +++ b/src/oatpp/network/Server.hpp @@ -28,12 +28,6 @@ #include "oatpp/network/ConnectionHandler.hpp" #include "oatpp/network/ConnectionProvider.hpp" -#include "oatpp/core/Types.hpp" - -#include "oatpp/core/base/Countable.hpp" -#include "oatpp/core/base/Environment.hpp" - -#include #include #include diff --git a/src/oatpp/network/Url.cpp b/src/oatpp/network/Url.cpp index 59e0f9fc..2dacb5d5 100644 --- a/src/oatpp/network/Url.cpp +++ b/src/oatpp/network/Url.cpp @@ -23,8 +23,7 @@ ***************************************************************************/ #include "Url.hpp" - -#include +#include "oatpp/core/parser/Caret.hpp" namespace oatpp { namespace network { diff --git a/src/oatpp/network/monitor/ConnectionInactivityChecker.cpp b/src/oatpp/network/monitor/ConnectionInactivityChecker.cpp index f5b97334..417a1361 100644 --- a/src/oatpp/network/monitor/ConnectionInactivityChecker.cpp +++ b/src/oatpp/network/monitor/ConnectionInactivityChecker.cpp @@ -23,6 +23,7 @@ ***************************************************************************/ #include "ConnectionInactivityChecker.hpp" +#include "StatCollector.hpp" namespace oatpp { namespace network { namespace monitor { diff --git a/src/oatpp/network/monitor/ConnectionMaxAgeChecker.cpp b/src/oatpp/network/monitor/ConnectionMaxAgeChecker.cpp index 138959a4..5fb7d9a7 100644 --- a/src/oatpp/network/monitor/ConnectionMaxAgeChecker.cpp +++ b/src/oatpp/network/monitor/ConnectionMaxAgeChecker.cpp @@ -23,6 +23,7 @@ ***************************************************************************/ #include "ConnectionMaxAgeChecker.hpp" +#include "StatCollector.hpp" namespace oatpp { namespace network { namespace monitor { diff --git a/src/oatpp/network/monitor/ConnectionMonitor.cpp b/src/oatpp/network/monitor/ConnectionMonitor.cpp index 9667ea97..ca1dd4ee 100644 --- a/src/oatpp/network/monitor/ConnectionMonitor.cpp +++ b/src/oatpp/network/monitor/ConnectionMonitor.cpp @@ -24,7 +24,6 @@ #include "ConnectionMonitor.hpp" -#include #include namespace oatpp { namespace network { namespace monitor { diff --git a/src/oatpp/network/monitor/ConnectionMonitor.hpp b/src/oatpp/network/monitor/ConnectionMonitor.hpp index 23bc6a6f..b8648e8a 100644 --- a/src/oatpp/network/monitor/ConnectionMonitor.hpp +++ b/src/oatpp/network/monitor/ConnectionMonitor.hpp @@ -26,11 +26,10 @@ #define oatpp_network_monitor_ConnectionMonitor_hpp #include "MetricsChecker.hpp" +#include "StatCollector.hpp" #include "oatpp/network/ConnectionProvider.hpp" -#include "oatpp/core/data/stream/Stream.hpp" -#include #include namespace oatpp { namespace network { namespace monitor { diff --git a/src/oatpp/network/monitor/MetricsChecker.hpp b/src/oatpp/network/monitor/MetricsChecker.hpp index a206c2db..91b55118 100644 --- a/src/oatpp/network/monitor/MetricsChecker.hpp +++ b/src/oatpp/network/monitor/MetricsChecker.hpp @@ -26,6 +26,7 @@ #define oatpp_network_monitor_MetricsChecker_hpp #include "StatCollector.hpp" +#include "oatpp/core/Types.hpp" namespace oatpp { namespace network { namespace monitor { diff --git a/src/oatpp/network/tcp/Connection.cpp b/src/oatpp/network/tcp/Connection.cpp index ccb278e8..4ea4d958 100644 --- a/src/oatpp/network/tcp/Connection.cpp +++ b/src/oatpp/network/tcp/Connection.cpp @@ -32,8 +32,6 @@ #include #endif -#include -#include #include namespace oatpp { namespace network { namespace tcp { diff --git a/src/oatpp/network/tcp/client/ConnectionProvider.cpp b/src/oatpp/network/tcp/client/ConnectionProvider.cpp index 3eb8c1ba..361ffd0d 100644 --- a/src/oatpp/network/tcp/client/ConnectionProvider.cpp +++ b/src/oatpp/network/tcp/client/ConnectionProvider.cpp @@ -35,8 +35,6 @@ #include #else #include - #include - #include #include #endif diff --git a/src/oatpp/network/tcp/client/ConnectionProvider.hpp b/src/oatpp/network/tcp/client/ConnectionProvider.hpp index ff9aa29b..e1814f94 100644 --- a/src/oatpp/network/tcp/client/ConnectionProvider.hpp +++ b/src/oatpp/network/tcp/client/ConnectionProvider.hpp @@ -28,8 +28,6 @@ #include "oatpp/network/Address.hpp" #include "oatpp/network/ConnectionProvider.hpp" -#include "oatpp/core/provider/Invalidator.hpp" -#include "oatpp/core/Types.hpp" namespace oatpp { namespace network { namespace tcp { namespace client { diff --git a/src/oatpp/network/tcp/server/ConnectionProvider.cpp b/src/oatpp/network/tcp/server/ConnectionProvider.cpp index 0fbc5fa1..09ecc4e1 100644 --- a/src/oatpp/network/tcp/server/ConnectionProvider.cpp +++ b/src/oatpp/network/tcp/server/ConnectionProvider.cpp @@ -35,15 +35,12 @@ #else #include #include - #include - #include #include #if defined(__FreeBSD__) #include #endif #endif - // Workaround for MinGW from: https://www.mail-archive.com/users@ipv6.org/msg02107.html #if defined(__MINGW32__) && _WIN32_WINNT < 0x0600 const char * inet_ntop (int af, const void *src, char *dst, socklen_t cnt) { @@ -116,7 +113,6 @@ void ConnectionProvider::ConnectionInvalidator::invalidate(const std::shared_ptr shutdown(handle, SHUT_RDWR); #endif - } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/oatpp/network/tcp/server/ConnectionProvider.hpp b/src/oatpp/network/tcp/server/ConnectionProvider.hpp index 871fa65d..643dee33 100644 --- a/src/oatpp/network/tcp/server/ConnectionProvider.hpp +++ b/src/oatpp/network/tcp/server/ConnectionProvider.hpp @@ -29,8 +29,6 @@ #include "oatpp/network/ConnectionProvider.hpp" #include "oatpp/network/tcp/Connection.hpp" -#include "oatpp/core/Types.hpp" - namespace oatpp { namespace network { namespace tcp { namespace server { /** diff --git a/src/oatpp/network/virtual_/Interface.hpp b/src/oatpp/network/virtual_/Interface.hpp index 47072ce5..b26f5528 100644 --- a/src/oatpp/network/virtual_/Interface.hpp +++ b/src/oatpp/network/virtual_/Interface.hpp @@ -27,10 +27,6 @@ #include "./Socket.hpp" -#include -#include -#include - namespace oatpp { namespace network { namespace virtual_ { /** diff --git a/src/oatpp/network/virtual_/Pipe.hpp b/src/oatpp/network/virtual_/Pipe.hpp index 571caec5..0ab4d412 100644 --- a/src/oatpp/network/virtual_/Pipe.hpp +++ b/src/oatpp/network/virtual_/Pipe.hpp @@ -27,14 +27,9 @@ #include "oatpp/core/async/CoroutineWaitList.hpp" -#include "oatpp/core/data/stream/Stream.hpp" - #include "oatpp/core/data/buffer/FIFOBuffer.hpp" #include "oatpp/core/data/buffer/IOBuffer.hpp" -#include "oatpp/core/concurrency/SpinLock.hpp" - -#include #include namespace oatpp { namespace network { namespace virtual_ { @@ -270,7 +265,6 @@ public: */ Writer* getWriter(); - /** * Get pointer to &l:Pipe::Reader; for this pipe. * There can be only one &l:Pipe::Reader; per pipe. diff --git a/src/oatpp/network/virtual_/server/ConnectionProvider.cpp b/src/oatpp/network/virtual_/server/ConnectionProvider.cpp index a52e888f..99b941eb 100644 --- a/src/oatpp/network/virtual_/server/ConnectionProvider.cpp +++ b/src/oatpp/network/virtual_/server/ConnectionProvider.cpp @@ -24,8 +24,6 @@ #include "ConnectionProvider.hpp" -#include - namespace oatpp { namespace network { namespace virtual_ { namespace server { void ConnectionProvider::ConnectionInvalidator::invalidate(const std::shared_ptr& connection) { diff --git a/src/oatpp/orm/DbClient.cpp b/src/oatpp/orm/DbClient.cpp index ab5f2220..1b32a826 100644 --- a/src/oatpp/orm/DbClient.cpp +++ b/src/oatpp/orm/DbClient.cpp @@ -23,8 +23,8 @@ ***************************************************************************/ #include "DbClient.hpp" - -#include "oatpp/core/data/stream/BufferStream.hpp" +#include "QueryResult.hpp" +#include "Transaction.hpp" namespace oatpp { namespace orm { diff --git a/src/oatpp/orm/DbClient.hpp b/src/oatpp/orm/DbClient.hpp index 34481c33..c0e1f14e 100644 --- a/src/oatpp/orm/DbClient.hpp +++ b/src/oatpp/orm/DbClient.hpp @@ -28,9 +28,6 @@ #include "Executor.hpp" #include "Transaction.hpp" -#include "oatpp/core/data/stream/Stream.hpp" -#include "oatpp/core/Types.hpp" - namespace oatpp { namespace orm { /** diff --git a/src/oatpp/orm/Executor.cpp b/src/oatpp/orm/Executor.cpp index f208fca1..74c33a2d 100644 --- a/src/oatpp/orm/Executor.cpp +++ b/src/oatpp/orm/Executor.cpp @@ -23,6 +23,9 @@ ***************************************************************************/ #include "Executor.hpp" +#include "QueryResult.hpp" + +#include "Connection.hpp" namespace oatpp { namespace orm { diff --git a/src/oatpp/orm/Executor.hpp b/src/oatpp/orm/Executor.hpp index 69433a44..0f4248e4 100644 --- a/src/oatpp/orm/Executor.hpp +++ b/src/oatpp/orm/Executor.hpp @@ -29,9 +29,8 @@ #include "QueryResult.hpp" #include "oatpp/core/data/mapping/TypeResolver.hpp" -#include "oatpp/core/data/mapping/type/Type.hpp" -#include "oatpp/core/data/share/MemoryLabel.hpp" #include "oatpp/core/data/share/StringTemplate.hpp" +#include "oatpp/core/provider/Provider.hpp" namespace oatpp { namespace orm { diff --git a/src/oatpp/orm/QueryResult.cpp b/src/oatpp/orm/QueryResult.cpp index d1ea2040..e25349ee 100644 --- a/src/oatpp/orm/QueryResult.cpp +++ b/src/oatpp/orm/QueryResult.cpp @@ -22,9 +22,6 @@ * ***************************************************************************/ -#include "QueryResult.hpp" - namespace oatpp { namespace orm { - }} diff --git a/src/oatpp/orm/SchemaMigration.cpp b/src/oatpp/orm/SchemaMigration.cpp index a349659c..e21c4692 100644 --- a/src/oatpp/orm/SchemaMigration.cpp +++ b/src/oatpp/orm/SchemaMigration.cpp @@ -23,6 +23,7 @@ ***************************************************************************/ #include "SchemaMigration.hpp" +#include "Connection.hpp" #include diff --git a/src/oatpp/orm/SchemaMigration.hpp b/src/oatpp/orm/SchemaMigration.hpp index ffbacb29..66e23fad 100644 --- a/src/oatpp/orm/SchemaMigration.hpp +++ b/src/oatpp/orm/SchemaMigration.hpp @@ -26,6 +26,7 @@ #define oatpp_orm_SchemaMigration_hpp #include "Executor.hpp" +#include "oatpp/core/base/ObjectHandle.hpp" namespace oatpp { namespace orm { diff --git a/src/oatpp/orm/Transaction.cpp b/src/oatpp/orm/Transaction.cpp index 61758ff6..0ddd1e48 100644 --- a/src/oatpp/orm/Transaction.cpp +++ b/src/oatpp/orm/Transaction.cpp @@ -23,6 +23,7 @@ ***************************************************************************/ #include "Transaction.hpp" +#include "QueryResult.hpp" namespace oatpp { namespace orm { diff --git a/src/oatpp/orm/Transaction.hpp b/src/oatpp/orm/Transaction.hpp index b04a9f83..711e36fe 100644 --- a/src/oatpp/orm/Transaction.hpp +++ b/src/oatpp/orm/Transaction.hpp @@ -26,6 +26,9 @@ #define oatpp_orm_Transaction_hpp #include "Executor.hpp" +#include "Connection.hpp" + +#include "oatpp/core/base/ObjectHandle.hpp" namespace oatpp { namespace orm { diff --git a/src/oatpp/parser/json/Utils.hpp b/src/oatpp/parser/json/Utils.hpp index e4e4123f..298e0b4a 100644 --- a/src/oatpp/parser/json/Utils.hpp +++ b/src/oatpp/parser/json/Utils.hpp @@ -26,9 +26,6 @@ #define oatpp_parser_json_Utils_hpp #include "oatpp/core/parser/Caret.hpp" -#include "oatpp/core/Types.hpp" - -#include namespace oatpp { namespace parser { namespace json { diff --git a/src/oatpp/parser/json/mapping/Deserializer.cpp b/src/oatpp/parser/json/mapping/Deserializer.cpp index d755a8ef..e91cd061 100644 --- a/src/oatpp/parser/json/mapping/Deserializer.cpp +++ b/src/oatpp/parser/json/mapping/Deserializer.cpp @@ -24,8 +24,6 @@ #include "Deserializer.hpp" -#include "oatpp/core/utils/ConversionUtils.hpp" - namespace oatpp { namespace parser { namespace json { namespace mapping { Deserializer::Deserializer(const std::shared_ptr& config) diff --git a/src/oatpp/parser/json/mapping/Deserializer.hpp b/src/oatpp/parser/json/mapping/Deserializer.hpp index 0d9dee18..e55cb36a 100644 --- a/src/oatpp/parser/json/mapping/Deserializer.hpp +++ b/src/oatpp/parser/json/mapping/Deserializer.hpp @@ -26,10 +26,6 @@ #define oatpp_parser_json_mapping_Deserializer_hpp #include "oatpp/parser/json/Utils.hpp" -#include "oatpp/core/parser/Caret.hpp" -#include "oatpp/core/Types.hpp" - -#include namespace oatpp { namespace parser { namespace json { namespace mapping { diff --git a/src/oatpp/parser/json/mapping/Serializer.cpp b/src/oatpp/parser/json/mapping/Serializer.cpp index 97589a77..9860e9aa 100644 --- a/src/oatpp/parser/json/mapping/Serializer.cpp +++ b/src/oatpp/parser/json/mapping/Serializer.cpp @@ -24,8 +24,7 @@ #include "Serializer.hpp" -#include "oatpp/parser/json/Utils.hpp" -#include "oatpp/core/data/mapping/type/Any.hpp" +#include "oatpp/parser/json/Beautifier.hpp" namespace oatpp { namespace parser { namespace json { namespace mapping { diff --git a/src/oatpp/parser/json/mapping/Serializer.hpp b/src/oatpp/parser/json/mapping/Serializer.hpp index 6795cb4e..dd8020cd 100644 --- a/src/oatpp/parser/json/mapping/Serializer.hpp +++ b/src/oatpp/parser/json/mapping/Serializer.hpp @@ -26,9 +26,7 @@ #define oatpp_parser_json_mapping_Serializer_hpp #include "oatpp/parser/json/Utils.hpp" -#include "oatpp/parser/json/Beautifier.hpp" -#include "oatpp/core/Types.hpp" -#include +#include "oatpp/core/data/stream/Stream.hpp" namespace oatpp { namespace parser { namespace json { namespace mapping { diff --git a/src/oatpp/web/client/ApiClient.cpp b/src/oatpp/web/client/ApiClient.cpp index 99a6cc46..ae046694 100644 --- a/src/oatpp/web/client/ApiClient.cpp +++ b/src/oatpp/web/client/ApiClient.cpp @@ -24,8 +24,6 @@ #include "ApiClient.hpp" -#include "oatpp/core/data/stream/BufferStream.hpp" - namespace oatpp { namespace web { namespace client { std::shared_ptr ApiClient::getConnection() { diff --git a/src/oatpp/web/client/ApiClient.hpp b/src/oatpp/web/client/ApiClient.hpp index 667678ec..3767d336 100644 --- a/src/oatpp/web/client/ApiClient.hpp +++ b/src/oatpp/web/client/ApiClient.hpp @@ -27,21 +27,10 @@ #include "./RequestExecutor.hpp" -#include "oatpp/web/protocol/http/incoming/Response.hpp" -#include "oatpp/web/protocol/http/outgoing/BufferBody.hpp" - -#include "oatpp/encoding/Base64.hpp" - #include "oatpp/core/data/share/StringTemplate.hpp" -#include "oatpp/core/data/mapping/ObjectMapper.hpp" -#include "oatpp/core/Types.hpp" #include "oatpp/core/utils/ConversionUtils.hpp" -#include -#include -#include - namespace oatpp { namespace web { namespace client { /** diff --git a/src/oatpp/web/client/HttpRequestExecutor.cpp b/src/oatpp/web/client/HttpRequestExecutor.cpp index 46bfb954..1d3d422b 100644 --- a/src/oatpp/web/client/HttpRequestExecutor.cpp +++ b/src/oatpp/web/client/HttpRequestExecutor.cpp @@ -27,9 +27,6 @@ #include "oatpp/web/protocol/http/incoming/ResponseHeadersReader.hpp" #include "oatpp/web/protocol/http/outgoing/Request.hpp" -#include "oatpp/network/tcp/Connection.hpp" - -#include "oatpp/core/data/stream/BufferStream.hpp" #include "oatpp/core/data/stream/StreamBufferedProxy.hpp" #if defined(WIN32) || defined(_WIN32) @@ -103,7 +100,6 @@ HttpRequestExecutor::HttpConnectionHandle::HttpConnectionHandle(const std::share : m_connectionProxy(connectionProxy) {} - std::shared_ptr HttpRequestExecutor::HttpConnectionHandle::getConnection() { return m_connectionProxy; } diff --git a/src/oatpp/web/client/HttpRequestExecutor.hpp b/src/oatpp/web/client/HttpRequestExecutor.hpp index bdecd8d6..4e5ad92f 100644 --- a/src/oatpp/web/client/HttpRequestExecutor.hpp +++ b/src/oatpp/web/client/HttpRequestExecutor.hpp @@ -28,8 +28,8 @@ #include "./RequestExecutor.hpp" #include "oatpp/web/protocol/http/incoming/SimpleBodyDecoder.hpp" -#include "oatpp/network/ConnectionPool.hpp" #include "oatpp/network/ConnectionProvider.hpp" +#include "oatpp/core/data/buffer/IOBuffer.hpp" namespace oatpp { namespace web { namespace client { diff --git a/src/oatpp/web/client/RequestExecutor.cpp b/src/oatpp/web/client/RequestExecutor.cpp index e7570c5e..cb1dc2d6 100644 --- a/src/oatpp/web/client/RequestExecutor.cpp +++ b/src/oatpp/web/client/RequestExecutor.cpp @@ -25,7 +25,6 @@ #include "RequestExecutor.hpp" #include -#include namespace oatpp { namespace web { namespace client { diff --git a/src/oatpp/web/client/RequestExecutor.hpp b/src/oatpp/web/client/RequestExecutor.hpp index 56a2525d..a4476bc5 100644 --- a/src/oatpp/web/client/RequestExecutor.hpp +++ b/src/oatpp/web/client/RequestExecutor.hpp @@ -29,7 +29,6 @@ #include "oatpp/web/protocol/http/incoming/Response.hpp" #include "oatpp/web/protocol/http/outgoing/Body.hpp" -#include "oatpp/web/protocol/http/Http.hpp" namespace oatpp { namespace web { namespace client { diff --git a/src/oatpp/web/client/RetryPolicy.hpp b/src/oatpp/web/client/RetryPolicy.hpp index 4a645dba..cb4875df 100644 --- a/src/oatpp/web/client/RetryPolicy.hpp +++ b/src/oatpp/web/client/RetryPolicy.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_web_client_RetryPolicy_hpp #define oatpp_web_client_RetryPolicy_hpp -#include "oatpp/core/Types.hpp" +#include "oatpp/core/base/Environment.hpp" #include diff --git a/src/oatpp/web/mime/multipart/FileProvider.hpp b/src/oatpp/web/mime/multipart/FileProvider.hpp index 837758a4..39c31746 100644 --- a/src/oatpp/web/mime/multipart/FileProvider.hpp +++ b/src/oatpp/web/mime/multipart/FileProvider.hpp @@ -26,7 +26,6 @@ #define oatpp_web_mime_multipart_FileProvider_hpp #include "PartReader.hpp" -#include "Reader.hpp" namespace oatpp { namespace web { namespace mime { namespace multipart { diff --git a/src/oatpp/web/mime/multipart/InMemoryDataProvider.hpp b/src/oatpp/web/mime/multipart/InMemoryDataProvider.hpp index 60f4cde9..77683f29 100644 --- a/src/oatpp/web/mime/multipart/InMemoryDataProvider.hpp +++ b/src/oatpp/web/mime/multipart/InMemoryDataProvider.hpp @@ -26,7 +26,6 @@ #define oatpp_web_mime_multipart_InMemoryDataProvider_hpp #include "PartReader.hpp" -#include "Reader.hpp" namespace oatpp { namespace web { namespace mime { namespace multipart { diff --git a/src/oatpp/web/mime/multipart/Multipart.cpp b/src/oatpp/web/mime/multipart/Multipart.cpp index 19638546..5ddc624d 100644 --- a/src/oatpp/web/mime/multipart/Multipart.cpp +++ b/src/oatpp/web/mime/multipart/Multipart.cpp @@ -23,10 +23,12 @@ ***************************************************************************/ #include "Multipart.hpp" +#include "Part.hpp" #include "oatpp/web/protocol/http/Http.hpp" #include "oatpp/encoding/Base64.hpp" #include "oatpp/core/utils/Random.hpp" +#include "oatpp/core/async/Coroutine.hpp" namespace oatpp { namespace web { namespace mime { namespace multipart { diff --git a/src/oatpp/web/mime/multipart/Multipart.hpp b/src/oatpp/web/mime/multipart/Multipart.hpp index 850ad397..ec92a6c2 100644 --- a/src/oatpp/web/mime/multipart/Multipart.hpp +++ b/src/oatpp/web/mime/multipart/Multipart.hpp @@ -26,7 +26,9 @@ #define oatpp_web_mime_multipart_Multipart_hpp #include "Part.hpp" -#include +#include "oatpp/core/data/share/LazyStringMap.hpp" + +#include "oatpp/core/Types.hpp" namespace oatpp { namespace web { namespace mime { namespace multipart { @@ -105,9 +107,6 @@ public: }; - - }}}} - #endif // oatpp_web_mime_multipart_Multipart_hpp diff --git a/src/oatpp/web/mime/multipart/Part.cpp b/src/oatpp/web/mime/multipart/Part.cpp index 67bda688..06700dbc 100644 --- a/src/oatpp/web/mime/multipart/Part.cpp +++ b/src/oatpp/web/mime/multipart/Part.cpp @@ -25,9 +25,6 @@ #include "Part.hpp" #include "oatpp/web/protocol/http/Http.hpp" -#include "oatpp/core/parser/Caret.hpp" - -#include namespace oatpp { namespace web { namespace mime { namespace multipart { @@ -61,12 +58,10 @@ oatpp::String Part::getName() const { return m_name; } - oatpp::String Part::getFilename() const { return m_filename; } - const Part::Headers& Part::getHeaders() const { return m_headers; } diff --git a/src/oatpp/web/mime/multipart/PartList.hpp b/src/oatpp/web/mime/multipart/PartList.hpp index 6c141ade..81ec2797 100644 --- a/src/oatpp/web/mime/multipart/PartList.hpp +++ b/src/oatpp/web/mime/multipart/PartList.hpp @@ -27,6 +27,7 @@ #define oatpp_web_mime_multipart_PartList_hpp #include "Multipart.hpp" +#include "Part.hpp" namespace oatpp { namespace web { namespace mime { namespace multipart { diff --git a/src/oatpp/web/mime/multipart/PartReader.hpp b/src/oatpp/web/mime/multipart/PartReader.hpp index f3761adb..eebc2e00 100644 --- a/src/oatpp/web/mime/multipart/PartReader.hpp +++ b/src/oatpp/web/mime/multipart/PartReader.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_web_mime_multipart_PartReader_hpp #define oatpp_web_mime_multipart_PartReader_hpp -#include "./Multipart.hpp" +#include "Part.hpp" #include "oatpp/core/data/stream/Stream.hpp" namespace oatpp { namespace web { namespace mime { namespace multipart { diff --git a/src/oatpp/web/mime/multipart/Reader.hpp b/src/oatpp/web/mime/multipart/Reader.hpp index cb83b098..dd914c06 100644 --- a/src/oatpp/web/mime/multipart/Reader.hpp +++ b/src/oatpp/web/mime/multipart/Reader.hpp @@ -29,8 +29,6 @@ #include "Multipart.hpp" #include "StatefulParser.hpp" -#include - namespace oatpp { namespace web { namespace mime { namespace multipart { class Reader; // FWD diff --git a/src/oatpp/web/mime/multipart/StatefulParser.cpp b/src/oatpp/web/mime/multipart/StatefulParser.cpp index d9a67748..8e05247b 100644 --- a/src/oatpp/web/mime/multipart/StatefulParser.cpp +++ b/src/oatpp/web/mime/multipart/StatefulParser.cpp @@ -27,7 +27,6 @@ #include "oatpp/web/protocol/http/Http.hpp" #include "oatpp/core/parser/Caret.hpp" -#include "oatpp/core/parser/ParsingError.hpp" namespace oatpp { namespace web { namespace mime { namespace multipart { diff --git a/src/oatpp/web/mime/multipart/StatefulParser.hpp b/src/oatpp/web/mime/multipart/StatefulParser.hpp index aa6343ec..98cfd5e3 100644 --- a/src/oatpp/web/mime/multipart/StatefulParser.hpp +++ b/src/oatpp/web/mime/multipart/StatefulParser.hpp @@ -26,10 +26,6 @@ #define oatpp_web_mime_multipart_StatefulParser_hpp #include "oatpp/core/data/stream/BufferStream.hpp" -#include "oatpp/core/data/share/LazyStringMap.hpp" -#include "oatpp/core/Types.hpp" - -#include namespace oatpp { namespace web { namespace mime { namespace multipart { diff --git a/src/oatpp/web/mime/multipart/TemporaryFileProvider.hpp b/src/oatpp/web/mime/multipart/TemporaryFileProvider.hpp index 03dd2e8d..154cf2dd 100644 --- a/src/oatpp/web/mime/multipart/TemporaryFileProvider.hpp +++ b/src/oatpp/web/mime/multipart/TemporaryFileProvider.hpp @@ -26,7 +26,6 @@ #define oatpp_web_mime_multipart_TemporaryFileProvider_hpp #include "PartReader.hpp" -#include "Reader.hpp" namespace oatpp { namespace web { namespace mime { namespace multipart { diff --git a/src/oatpp/web/protocol/CommunicationError.hpp b/src/oatpp/web/protocol/CommunicationError.hpp index 7c397ccc..87a57de7 100644 --- a/src/oatpp/web/protocol/CommunicationError.hpp +++ b/src/oatpp/web/protocol/CommunicationError.hpp @@ -26,6 +26,7 @@ #define oatpp_web_protocol_CommunicationError_hpp #include "oatpp/core/IODefinitions.hpp" +#include "oatpp/core/Types.hpp" namespace oatpp { namespace web { namespace protocol { @@ -129,7 +130,6 @@ public: }; - /** * Protocol Error template. * @tparam Status - arbitrary data type. diff --git a/src/oatpp/web/protocol/http/Http.cpp b/src/oatpp/web/protocol/http/Http.cpp index f044398e..bd243e3e 100644 --- a/src/oatpp/web/protocol/http/Http.cpp +++ b/src/oatpp/web/protocol/http/Http.cpp @@ -26,6 +26,7 @@ #include "oatpp/core/data/stream/BufferStream.hpp" #include "oatpp/core/utils/ConversionUtils.hpp" +#include "oatpp/core/parser/Caret.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { @@ -124,7 +125,6 @@ const char* const Header::USER_AGENT = "User-Agent"; const char* const Header::SERVER = "Server"; const char* const Header::UPGRADE = "Upgrade"; - const char* const Header::CORS_ORIGIN = "Access-Control-Allow-Origin"; const char* const Header::CORS_METHODS = "Access-Control-Allow-Methods"; const char* const Header::CORS_HEADERS = "Access-Control-Allow-Headers"; @@ -249,7 +249,6 @@ ContentRange ContentRange::parse(const oatpp::String& str) { return parse(caret); } - oatpp::String HeaderValueData::getTitleParamValue(const data::share::StringKeyLabelCI& key) const { auto it = titleParams.find(key); if(it != titleParams.end()) { diff --git a/src/oatpp/web/protocol/http/Http.hpp b/src/oatpp/web/protocol/http/Http.hpp index 2c5979dd..005ca66c 100644 --- a/src/oatpp/web/protocol/http/Http.hpp +++ b/src/oatpp/web/protocol/http/Http.hpp @@ -25,16 +25,11 @@ #ifndef oatpp_web_protocol_http_Http_hpp #define oatpp_web_protocol_http_Http_hpp -#include "oatpp/network/tcp/Connection.hpp" - #include "oatpp/web/protocol/CommunicationError.hpp" #include "oatpp/core/parser/Caret.hpp" #include "oatpp/core/data/share/LazyStringMap.hpp" -#include "oatpp/core/Types.hpp" - -#include -#include +#include "oatpp/core/data/stream/Stream.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { diff --git a/src/oatpp/web/protocol/http/encoding/ProviderCollection.hpp b/src/oatpp/web/protocol/http/encoding/ProviderCollection.hpp index 0b60b1e9..038bf770 100644 --- a/src/oatpp/web/protocol/http/encoding/ProviderCollection.hpp +++ b/src/oatpp/web/protocol/http/encoding/ProviderCollection.hpp @@ -26,9 +26,6 @@ #define oatpp_web_protocol_http_encoding_ProviderCollection_hpp #include "EncoderProvider.hpp" -#include "oatpp/core/data/share/MemoryLabel.hpp" -#include -#include namespace oatpp { namespace web { namespace protocol { namespace http { namespace encoding { diff --git a/src/oatpp/web/protocol/http/incoming/BodyDecoder.hpp b/src/oatpp/web/protocol/http/incoming/BodyDecoder.hpp index 9bdcef60..4cf16309 100644 --- a/src/oatpp/web/protocol/http/incoming/BodyDecoder.hpp +++ b/src/oatpp/web/protocol/http/incoming/BodyDecoder.hpp @@ -28,7 +28,6 @@ #include "oatpp/web/protocol/http/Http.hpp" #include "oatpp/core/data/mapping/ObjectMapper.hpp" #include "oatpp/core/data/stream/BufferStream.hpp" -#include "oatpp/core/async/Coroutine.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace incoming { diff --git a/src/oatpp/web/protocol/http/incoming/Request.cpp b/src/oatpp/web/protocol/http/incoming/Request.cpp index 819242e8..a76480c5 100644 --- a/src/oatpp/web/protocol/http/incoming/Request.cpp +++ b/src/oatpp/web/protocol/http/incoming/Request.cpp @@ -23,6 +23,7 @@ ***************************************************************************/ #include "Request.hpp" +#include "oatpp/network/Url.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace incoming { diff --git a/src/oatpp/web/protocol/http/incoming/Request.hpp b/src/oatpp/web/protocol/http/incoming/Request.hpp index 65f5e04f..57c1a22e 100644 --- a/src/oatpp/web/protocol/http/incoming/Request.hpp +++ b/src/oatpp/web/protocol/http/incoming/Request.hpp @@ -25,10 +25,8 @@ #ifndef oatpp_web_protocol_http_incoming_Request_hpp #define oatpp_web_protocol_http_incoming_Request_hpp -#include "oatpp/web/protocol/http/Http.hpp" #include "oatpp/web/protocol/http/incoming/BodyDecoder.hpp" #include "oatpp/web/url/mapping/Pattern.hpp" -#include "oatpp/network/Url.hpp" #include "oatpp/core/data/Bundle.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace incoming { diff --git a/src/oatpp/web/protocol/http/incoming/RequestHeadersReader.hpp b/src/oatpp/web/protocol/http/incoming/RequestHeadersReader.hpp index fcf15576..11d10910 100644 --- a/src/oatpp/web/protocol/http/incoming/RequestHeadersReader.hpp +++ b/src/oatpp/web/protocol/http/incoming/RequestHeadersReader.hpp @@ -26,7 +26,7 @@ #define oatpp_web_protocol_http_incoming_RequestHeadersReader_hpp #include "oatpp/web/protocol/http/Http.hpp" -#include "oatpp/core/async/Coroutine.hpp" +#include "oatpp/core/parser/Caret.hpp" #include "oatpp/core/data/stream/StreamBufferedProxy.hpp" #include "oatpp/core/data/stream/BufferStream.hpp" diff --git a/src/oatpp/web/protocol/http/incoming/Response.hpp b/src/oatpp/web/protocol/http/incoming/Response.hpp index 19b56f16..73e47919 100644 --- a/src/oatpp/web/protocol/http/incoming/Response.hpp +++ b/src/oatpp/web/protocol/http/incoming/Response.hpp @@ -25,7 +25,6 @@ #ifndef oatpp_web_protocol_http_incoming_Response_hpp #define oatpp_web_protocol_http_incoming_Response_hpp -#include "oatpp/web/protocol/http/Http.hpp" #include "oatpp/web/protocol/http/incoming/BodyDecoder.hpp" #include "oatpp/core/data/Bundle.hpp" @@ -231,7 +230,6 @@ public: */ async::CoroutineStarter transferBodyAsync(const std::shared_ptr& writeCallback) const; - /** * Same as &l:Response::readBodyToDto (); but Async. * @param toStream - `std::shared_ptr` to &id:oatpp::data::stream::OutputStream;. diff --git a/src/oatpp/web/protocol/http/incoming/ResponseHeadersReader.hpp b/src/oatpp/web/protocol/http/incoming/ResponseHeadersReader.hpp index 5de2d545..282bfb16 100644 --- a/src/oatpp/web/protocol/http/incoming/ResponseHeadersReader.hpp +++ b/src/oatpp/web/protocol/http/incoming/ResponseHeadersReader.hpp @@ -26,7 +26,8 @@ #define oatpp_web_protocol_http_incoming_ResponseHeadersReader_hpp #include "oatpp/web/protocol/http/Http.hpp" -#include "oatpp/core/async/Coroutine.hpp" +#include "oatpp/core/data/stream/Stream.hpp" +#include "oatpp/core/parser/Caret.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace incoming { diff --git a/src/oatpp/web/protocol/http/incoming/SimpleBodyDecoder.cpp b/src/oatpp/web/protocol/http/incoming/SimpleBodyDecoder.cpp index 5a22b75f..06952052 100644 --- a/src/oatpp/web/protocol/http/incoming/SimpleBodyDecoder.cpp +++ b/src/oatpp/web/protocol/http/incoming/SimpleBodyDecoder.cpp @@ -26,8 +26,7 @@ #include "oatpp/web/protocol/http/encoding/Chunked.hpp" #include "oatpp/core/utils/ConversionUtils.hpp" - -#include +#include "oatpp/core/data/buffer/IOBuffer.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace incoming { diff --git a/src/oatpp/web/protocol/http/outgoing/Body.cpp b/src/oatpp/web/protocol/http/outgoing/Body.cpp index 0c85deeb..4f7fa52a 100644 --- a/src/oatpp/web/protocol/http/outgoing/Body.cpp +++ b/src/oatpp/web/protocol/http/outgoing/Body.cpp @@ -22,4 +22,3 @@ * ***************************************************************************/ -#include "Body.hpp" diff --git a/src/oatpp/web/protocol/http/outgoing/Body.hpp b/src/oatpp/web/protocol/http/outgoing/Body.hpp index 5103d6e2..6be1a39e 100644 --- a/src/oatpp/web/protocol/http/outgoing/Body.hpp +++ b/src/oatpp/web/protocol/http/outgoing/Body.hpp @@ -28,7 +28,6 @@ #include "oatpp/web/protocol/http/Http.hpp" #include "oatpp/core/data/stream/Stream.hpp" -#include "oatpp/core/async/Coroutine.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/src/oatpp/web/protocol/http/outgoing/BufferBody.hpp b/src/oatpp/web/protocol/http/outgoing/BufferBody.hpp index 60a6760f..84bd359a 100644 --- a/src/oatpp/web/protocol/http/outgoing/BufferBody.hpp +++ b/src/oatpp/web/protocol/http/outgoing/BufferBody.hpp @@ -26,7 +26,6 @@ #define oatpp_web_protocol_http_outgoing_BufferBody_hpp #include "./Body.hpp" -#include "oatpp/web/protocol/http/Http.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/src/oatpp/web/protocol/http/outgoing/MultipartBody.cpp b/src/oatpp/web/protocol/http/outgoing/MultipartBody.cpp index 194b50a4..08422405 100644 --- a/src/oatpp/web/protocol/http/outgoing/MultipartBody.cpp +++ b/src/oatpp/web/protocol/http/outgoing/MultipartBody.cpp @@ -23,7 +23,6 @@ ***************************************************************************/ #include "MultipartBody.hpp" -#include "oatpp/core/data/stream/BufferStream.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/src/oatpp/web/protocol/http/outgoing/MultipartBody.hpp b/src/oatpp/web/protocol/http/outgoing/MultipartBody.hpp index 476a565c..25f1915b 100644 --- a/src/oatpp/web/protocol/http/outgoing/MultipartBody.hpp +++ b/src/oatpp/web/protocol/http/outgoing/MultipartBody.hpp @@ -28,6 +28,7 @@ #include "./Body.hpp" #include "oatpp/web/mime/multipart/Multipart.hpp" +#include "oatpp/web/mime/multipart/Part.hpp" #include "oatpp/core/data/stream/BufferStream.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/src/oatpp/web/protocol/http/outgoing/Request.cpp b/src/oatpp/web/protocol/http/outgoing/Request.cpp index d581eb9b..b7a94c50 100644 --- a/src/oatpp/web/protocol/http/outgoing/Request.cpp +++ b/src/oatpp/web/protocol/http/outgoing/Request.cpp @@ -25,8 +25,6 @@ #include "Request.hpp" #include "oatpp/web/protocol/http/encoding/Chunked.hpp" -#include "oatpp/core/data/stream/BufferStream.hpp" -#include "oatpp/core/data/buffer/IOBuffer.hpp" #include "oatpp/core/utils/ConversionUtils.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/src/oatpp/web/protocol/http/outgoing/Request.hpp b/src/oatpp/web/protocol/http/outgoing/Request.hpp index 26d0c280..a0f5b0c1 100644 --- a/src/oatpp/web/protocol/http/outgoing/Request.hpp +++ b/src/oatpp/web/protocol/http/outgoing/Request.hpp @@ -26,8 +26,8 @@ #define oatpp_web_protocol_http_outgoing_Request_hpp #include "oatpp/web/protocol/http/outgoing/Body.hpp" -#include "oatpp/web/protocol/http/Http.hpp" #include "oatpp/core/data/Bundle.hpp" +#include "oatpp/core/data/buffer/IOBuffer.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/src/oatpp/web/protocol/http/outgoing/Response.hpp b/src/oatpp/web/protocol/http/outgoing/Response.hpp index ec5fd59d..c40fda5e 100644 --- a/src/oatpp/web/protocol/http/outgoing/Response.hpp +++ b/src/oatpp/web/protocol/http/outgoing/Response.hpp @@ -27,14 +27,13 @@ #include "oatpp/web/protocol/http/outgoing/Body.hpp" #include "oatpp/web/protocol/http/encoding/EncoderProvider.hpp" -#include "oatpp/web/protocol/http/Http.hpp" #include "oatpp/network/ConnectionHandler.hpp" -#include "oatpp/core/async/Coroutine.hpp" #include "oatpp/core/data/stream/BufferStream.hpp" #include "oatpp/core/data/Bundle.hpp" +#include "oatpp/core/data/buffer/IOBuffer.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/src/oatpp/web/protocol/http/outgoing/ResponseFactory.cpp b/src/oatpp/web/protocol/http/outgoing/ResponseFactory.cpp index 54b13f34..e33c0a91 100644 --- a/src/oatpp/web/protocol/http/outgoing/ResponseFactory.cpp +++ b/src/oatpp/web/protocol/http/outgoing/ResponseFactory.cpp @@ -25,6 +25,8 @@ #include "./ResponseFactory.hpp" #include "./BufferBody.hpp" +#include "oatpp/core/data/mapping/ObjectMapper.hpp" +#include "Response.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/src/oatpp/web/protocol/http/outgoing/ResponseFactory.hpp b/src/oatpp/web/protocol/http/outgoing/ResponseFactory.hpp index 6af24f98..9ebe5057 100644 --- a/src/oatpp/web/protocol/http/outgoing/ResponseFactory.hpp +++ b/src/oatpp/web/protocol/http/outgoing/ResponseFactory.hpp @@ -28,7 +28,7 @@ #include "./Response.hpp" #include "oatpp/core/data/mapping/ObjectMapper.hpp" -#include "oatpp/core/data/mapping/type/Type.hpp" +#include "oatpp/core/Types.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/src/oatpp/web/protocol/http/utils/CommunicationUtils.cpp b/src/oatpp/web/protocol/http/utils/CommunicationUtils.cpp index 3665d344..b18750cd 100644 --- a/src/oatpp/web/protocol/http/utils/CommunicationUtils.cpp +++ b/src/oatpp/web/protocol/http/utils/CommunicationUtils.cpp @@ -23,6 +23,10 @@ ***************************************************************************/ #include "CommunicationUtils.hpp" +#include "oatpp/web/protocol/http/outgoing/Response.hpp" + +#include "oatpp/web/protocol/http/encoding/ProviderCollection.hpp" +#include "oatpp/web/protocol/http/incoming/Request.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace utils { diff --git a/src/oatpp/web/protocol/http/utils/CommunicationUtils.hpp b/src/oatpp/web/protocol/http/utils/CommunicationUtils.hpp index 81f6c60c..ddbd42df 100644 --- a/src/oatpp/web/protocol/http/utils/CommunicationUtils.hpp +++ b/src/oatpp/web/protocol/http/utils/CommunicationUtils.hpp @@ -29,6 +29,8 @@ #include "oatpp/web/protocol/http/outgoing/Response.hpp" #include "oatpp/web/protocol/http/encoding/ProviderCollection.hpp" +#include + namespace oatpp { namespace web { namespace protocol { namespace http { namespace utils { /** diff --git a/src/oatpp/web/server/AsyncHttpConnectionHandler.hpp b/src/oatpp/web/server/AsyncHttpConnectionHandler.hpp index 99b4f41b..2ca03dd5 100644 --- a/src/oatpp/web/server/AsyncHttpConnectionHandler.hpp +++ b/src/oatpp/web/server/AsyncHttpConnectionHandler.hpp @@ -26,11 +26,7 @@ #define oatpp_web_server_AsyncHttpConnectionHandler_hpp #include "oatpp/web/server/HttpProcessor.hpp" -#include "oatpp/network/ConnectionHandler.hpp" #include "oatpp/core/async/Executor.hpp" -#include "oatpp/core/concurrency/SpinLock.hpp" - -#include namespace oatpp { namespace web { namespace server { diff --git a/src/oatpp/web/server/HttpConnectionHandler.cpp b/src/oatpp/web/server/HttpConnectionHandler.cpp index 39915497..05dac002 100644 --- a/src/oatpp/web/server/HttpConnectionHandler.cpp +++ b/src/oatpp/web/server/HttpConnectionHandler.cpp @@ -23,17 +23,11 @@ ***************************************************************************/ #include "./HttpConnectionHandler.hpp" - -#include "oatpp/web/protocol/http/incoming/Request.hpp" -#include "oatpp/web/protocol/http/Http.hpp" +#include "handler/ErrorHandler.hpp" #include "oatpp/core/concurrency/Thread.hpp" -#include "oatpp/core/data/buffer/IOBuffer.hpp" - -#include "oatpp/core/data/stream/BufferStream.hpp" -#include "oatpp/core/data/stream/StreamBufferedProxy.hpp" - +#include namespace oatpp { namespace web { namespace server { diff --git a/src/oatpp/web/server/HttpConnectionHandler.hpp b/src/oatpp/web/server/HttpConnectionHandler.hpp index 4c43bdb4..6ff08db6 100644 --- a/src/oatpp/web/server/HttpConnectionHandler.hpp +++ b/src/oatpp/web/server/HttpConnectionHandler.hpp @@ -27,9 +27,7 @@ #include "oatpp/web/server/HttpProcessor.hpp" #include "oatpp/network/ConnectionHandler.hpp" -#include "oatpp/core/concurrency/SpinLock.hpp" - -#include +#include "oatpp/core/provider/Provider.hpp" namespace oatpp { namespace web { namespace server { diff --git a/src/oatpp/web/server/HttpProcessor.cpp b/src/oatpp/web/server/HttpProcessor.cpp index 50e6703f..c3c6587d 100644 --- a/src/oatpp/web/server/HttpProcessor.cpp +++ b/src/oatpp/web/server/HttpProcessor.cpp @@ -23,9 +23,18 @@ ***************************************************************************/ #include "HttpProcessor.hpp" +#include "HttpRouter.hpp" +#include "interceptor/RequestInterceptor.hpp" + +#include "handler/ErrorHandler.hpp" +#include "HttpRequestHandler.hpp" +#include "oatpp/web/url/mapping/Router.hpp" +#include "interceptor/ResponseInterceptor.hpp" #include "oatpp/web/protocol/http/incoming/SimpleBodyDecoder.hpp" -#include "oatpp/core/data/stream/BufferStream.hpp" +#include "oatpp/web/protocol/http/incoming/RequestHeadersReader.hpp" +#include "oatpp/web/protocol/http/utils/CommunicationUtils.hpp" +#include "oatpp/core/provider/Provider.hpp" namespace oatpp { namespace web { namespace server { diff --git a/src/oatpp/web/server/HttpProcessor.hpp b/src/oatpp/web/server/HttpProcessor.hpp index 7f379ee7..92a87ebf 100644 --- a/src/oatpp/web/server/HttpProcessor.hpp +++ b/src/oatpp/web/server/HttpProcessor.hpp @@ -29,18 +29,14 @@ #include "./interceptor/RequestInterceptor.hpp" #include "./interceptor/ResponseInterceptor.hpp" -#include "./handler/ErrorHandler.hpp" #include "oatpp/web/protocol/http/encoding/ProviderCollection.hpp" #include "oatpp/web/protocol/http/incoming/RequestHeadersReader.hpp" -#include "oatpp/web/protocol/http/incoming/Request.hpp" -#include "oatpp/web/protocol/http/outgoing/Response.hpp" #include "oatpp/web/protocol/http/utils/CommunicationUtils.hpp" -#include "oatpp/core/data/stream/StreamBufferedProxy.hpp" -#include "oatpp/core/async/Processor.hpp" +#include "oatpp/core/provider/Provider.hpp" namespace oatpp { namespace web { namespace server { diff --git a/src/oatpp/web/server/HttpRouter.cpp b/src/oatpp/web/server/HttpRouter.cpp index 745ffbdc..1c781ac7 100644 --- a/src/oatpp/web/server/HttpRouter.cpp +++ b/src/oatpp/web/server/HttpRouter.cpp @@ -23,6 +23,9 @@ ***************************************************************************/ #include "HttpRouter.hpp" +#include "api/ApiController.hpp" + +#include "api/Endpoint.hpp" namespace oatpp { namespace web { namespace server { diff --git a/src/oatpp/web/server/HttpRouter.hpp b/src/oatpp/web/server/HttpRouter.hpp index 4ba29f8f..3cfbd1c1 100644 --- a/src/oatpp/web/server/HttpRouter.hpp +++ b/src/oatpp/web/server/HttpRouter.hpp @@ -25,10 +25,7 @@ #ifndef oatpp_web_server_HttpRouter_hpp #define oatpp_web_server_HttpRouter_hpp -#include "./HttpRequestHandler.hpp" - #include "oatpp/web/server/api/ApiController.hpp" -#include "oatpp/web/server/api/Endpoint.hpp" #include "oatpp/web/url/mapping/Router.hpp" namespace oatpp { namespace web { namespace server { diff --git a/src/oatpp/web/server/api/ApiController.cpp b/src/oatpp/web/server/api/ApiController.cpp index aad58b21..fd59b861 100644 --- a/src/oatpp/web/server/api/ApiController.cpp +++ b/src/oatpp/web/server/api/ApiController.cpp @@ -23,7 +23,9 @@ ***************************************************************************/ #include "ApiController.hpp" +#include "Endpoint.hpp" #include "oatpp/web/server/handler/ErrorHandler.hpp" +#include "oatpp/web/server/handler/AuthorizationHandler.hpp" namespace oatpp { namespace web { namespace server { namespace api { diff --git a/src/oatpp/web/server/api/ApiController.hpp b/src/oatpp/web/server/api/ApiController.hpp index caad04dc..d0406b82 100644 --- a/src/oatpp/web/server/api/ApiController.hpp +++ b/src/oatpp/web/server/api/ApiController.hpp @@ -32,13 +32,9 @@ #include "oatpp/web/server/handler/AuthorizationHandler.hpp" #include "oatpp/web/protocol/http/incoming/Response.hpp" #include "oatpp/web/protocol/http/outgoing/Request.hpp" -#include "oatpp/web/protocol/http/outgoing/ResponseFactory.hpp" #include "oatpp/core/utils/ConversionUtils.hpp" -#include -#include - namespace oatpp { namespace web { namespace server { namespace api { /** diff --git a/src/oatpp/web/server/api/Endpoint.hpp b/src/oatpp/web/server/api/Endpoint.hpp index e41ebc47..5e8db072 100644 --- a/src/oatpp/web/server/api/Endpoint.hpp +++ b/src/oatpp/web/server/api/Endpoint.hpp @@ -27,8 +27,6 @@ #include "oatpp/web/server/HttpRequestHandler.hpp" -#include -#include #include namespace oatpp { namespace web { namespace server { namespace api { diff --git a/src/oatpp/web/server/handler/AuthorizationHandler.hpp b/src/oatpp/web/server/handler/AuthorizationHandler.hpp index c670825c..7c4d4b8c 100644 --- a/src/oatpp/web/server/handler/AuthorizationHandler.hpp +++ b/src/oatpp/web/server/handler/AuthorizationHandler.hpp @@ -26,10 +26,8 @@ #ifndef oatpp_web_server_handler_AuthorizationHandler_hpp #define oatpp_web_server_handler_AuthorizationHandler_hpp -#include #include "oatpp/web/protocol/http/Http.hpp" -#include "oatpp/core/macro/codegen.hpp" -#include "oatpp/core/data/mapping/type/Type.hpp" +#include "oatpp/core/data/stream/BufferStream.hpp" namespace oatpp { namespace web { namespace server { namespace handler { diff --git a/src/oatpp/web/server/handler/ErrorHandler.cpp b/src/oatpp/web/server/handler/ErrorHandler.cpp index 82611b5e..a78e7c2f 100644 --- a/src/oatpp/web/server/handler/ErrorHandler.cpp +++ b/src/oatpp/web/server/handler/ErrorHandler.cpp @@ -25,6 +25,7 @@ #include "./ErrorHandler.hpp" #include "oatpp/web/protocol/http/outgoing/BufferBody.hpp" +#include "oatpp/web/protocol/http/outgoing/Response.hpp" namespace oatpp { namespace web { namespace server { namespace handler { diff --git a/src/oatpp/web/server/interceptor/RequestInterceptor.hpp b/src/oatpp/web/server/interceptor/RequestInterceptor.hpp index da5c1ff7..5d2dd9f6 100644 --- a/src/oatpp/web/server/interceptor/RequestInterceptor.hpp +++ b/src/oatpp/web/server/interceptor/RequestInterceptor.hpp @@ -27,7 +27,6 @@ #include "oatpp/web/protocol/http/outgoing/Response.hpp" #include "oatpp/web/protocol/http/incoming/Request.hpp" -#include "oatpp/web/protocol/http/Http.hpp" namespace oatpp { namespace web { namespace server { namespace interceptor { diff --git a/src/oatpp/web/server/interceptor/ResponseInterceptor.hpp b/src/oatpp/web/server/interceptor/ResponseInterceptor.hpp index 2907ea1f..68816fc4 100644 --- a/src/oatpp/web/server/interceptor/ResponseInterceptor.hpp +++ b/src/oatpp/web/server/interceptor/ResponseInterceptor.hpp @@ -27,7 +27,6 @@ #include "oatpp/web/protocol/http/incoming/Request.hpp" #include "oatpp/web/protocol/http/outgoing/Response.hpp" -#include "oatpp/web/protocol/http/Http.hpp" namespace oatpp { namespace web { namespace server { namespace interceptor { diff --git a/src/oatpp/web/url/mapping/Pattern.cpp b/src/oatpp/web/url/mapping/Pattern.cpp index c72d8a02..444eb1e8 100644 --- a/src/oatpp/web/url/mapping/Pattern.cpp +++ b/src/oatpp/web/url/mapping/Pattern.cpp @@ -25,6 +25,7 @@ #include "Pattern.hpp" #include "oatpp/core/data/stream/BufferStream.hpp" +#include "oatpp/core/parser/Caret.hpp" namespace oatpp { namespace web { namespace url { namespace mapping { diff --git a/src/oatpp/web/url/mapping/Pattern.hpp b/src/oatpp/web/url/mapping/Pattern.hpp index 6231c753..40cd998b 100644 --- a/src/oatpp/web/url/mapping/Pattern.hpp +++ b/src/oatpp/web/url/mapping/Pattern.hpp @@ -25,12 +25,8 @@ #ifndef oatpp_web_url_mapping_Pattern_hpp #define oatpp_web_url_mapping_Pattern_hpp -#include "oatpp/core/data/share/MemoryLabel.hpp" - #include "oatpp/core/parser/Caret.hpp" - -#include -#include +#include "oatpp/core/Types.hpp" namespace oatpp { namespace web { namespace url { namespace mapping { diff --git a/src/oatpp/web/url/mapping/Router.hpp b/src/oatpp/web/url/mapping/Router.hpp index d12fd2a1..d0b23a69 100644 --- a/src/oatpp/web/url/mapping/Router.hpp +++ b/src/oatpp/web/url/mapping/Router.hpp @@ -27,11 +27,6 @@ #include "./Pattern.hpp" -#include "oatpp/core/Types.hpp" - -#include -#include - namespace oatpp { namespace web { namespace url { namespace mapping { /** diff --git a/test/oatpp/AllTestsMain.cpp b/test/oatpp/AllTestsMain.cpp index c315451d..4c9d9bfc 100644 --- a/test/oatpp/AllTestsMain.cpp +++ b/test/oatpp/AllTestsMain.cpp @@ -59,12 +59,9 @@ #include "oatpp/core/base/LoggerTest.hpp" #include "oatpp/core/async/Coroutine.hpp" -#include "oatpp/core/Types.hpp" - -#include "oatpp/core/base/Environment.hpp" +#include "oatpp/core/data/mapping/type/Type.hpp" #include -#include namespace { diff --git a/test/oatpp/core/async/LockTest.cpp b/test/oatpp/core/async/LockTest.cpp index abfb3f20..f1a5f631 100644 --- a/test/oatpp/core/async/LockTest.cpp +++ b/test/oatpp/core/async/LockTest.cpp @@ -29,9 +29,6 @@ #include "oatpp/core/async/Executor.hpp" #include "oatpp/core/async/Lock.hpp" -#include -#include - namespace oatpp { namespace test { namespace async { namespace { @@ -164,7 +161,6 @@ bool checkSymbol(char symbol, const oatpp::String& str) { } - void LockTest::onRun() { oatpp::async::Lock lock; diff --git a/test/oatpp/core/data/buffer/ProcessorTest.cpp b/test/oatpp/core/data/buffer/ProcessorTest.cpp index 6cdfa30b..0d6fcd6a 100644 --- a/test/oatpp/core/data/buffer/ProcessorTest.cpp +++ b/test/oatpp/core/data/buffer/ProcessorTest.cpp @@ -25,7 +25,7 @@ #include "ProcessorTest.hpp" #include "oatpp/core/data/stream/BufferStream.hpp" -#include "oatpp/core/data/buffer/Processor.hpp" +#include "oatpp/core/data/buffer/IOBuffer.hpp" #include "oatpp/core/async/Executor.hpp" diff --git a/test/oatpp/core/data/mapping/type/AnyTest.cpp b/test/oatpp/core/data/mapping/type/AnyTest.cpp index e14cac4a..01f5cc71 100644 --- a/test/oatpp/core/data/mapping/type/AnyTest.cpp +++ b/test/oatpp/core/data/mapping/type/AnyTest.cpp @@ -24,10 +24,8 @@ #include "AnyTest.hpp" -#include "oatpp/core/data/mapping/type/Any.hpp" - -#include "oatpp/parser/json/mapping/ObjectMapper.hpp" #include "oatpp/core/macro/codegen.hpp" +#include "oatpp/core/Types.hpp" namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace type { diff --git a/test/oatpp/core/data/mapping/type/EnumTest.cpp b/test/oatpp/core/data/mapping/type/EnumTest.cpp index 0c1ec165..f4416170 100644 --- a/test/oatpp/core/data/mapping/type/EnumTest.cpp +++ b/test/oatpp/core/data/mapping/type/EnumTest.cpp @@ -27,8 +27,6 @@ #include "oatpp/core/Types.hpp" #include "oatpp/core/macro/codegen.hpp" -#include - namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace type { #include OATPP_CODEGEN_BEGIN(DTO) @@ -300,7 +298,6 @@ void EnumTest::onRun() { OATPP_LOGI(TAG, "OK"); } - } }}}}}} diff --git a/test/oatpp/core/data/mapping/type/InterpretationTest.cpp b/test/oatpp/core/data/mapping/type/InterpretationTest.cpp index b951a579..9a1923a7 100644 --- a/test/oatpp/core/data/mapping/type/InterpretationTest.cpp +++ b/test/oatpp/core/data/mapping/type/InterpretationTest.cpp @@ -26,7 +26,6 @@ #include "oatpp/parser/json/mapping/ObjectMapper.hpp" #include "oatpp/core/data/mapping/TypeResolver.hpp" -#include "oatpp/core/Types.hpp" #include "oatpp/core/macro/codegen.hpp" namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace type { diff --git a/test/oatpp/core/data/mapping/type/ObjectTest.cpp b/test/oatpp/core/data/mapping/type/ObjectTest.cpp index ee33fcd9..02cc99d9 100644 --- a/test/oatpp/core/data/mapping/type/ObjectTest.cpp +++ b/test/oatpp/core/data/mapping/type/ObjectTest.cpp @@ -27,7 +27,6 @@ #include "oatpp/parser/json/mapping/ObjectMapper.hpp" #include "oatpp/core/macro/codegen.hpp" -#include "oatpp/core/Types.hpp" #include "oatpp-test/Checker.hpp" diff --git a/test/oatpp/core/data/mapping/type/StringTest.cpp b/test/oatpp/core/data/mapping/type/StringTest.cpp index 07cbc535..8d86c0a5 100644 --- a/test/oatpp/core/data/mapping/type/StringTest.cpp +++ b/test/oatpp/core/data/mapping/type/StringTest.cpp @@ -26,8 +26,6 @@ #include "oatpp/core/Types.hpp" -#include - namespace oatpp { namespace test { namespace core { namespace data { namespace mapping { namespace type { void StringTest::onRun() { diff --git a/test/oatpp/core/data/mapping/type/TypeTest.cpp b/test/oatpp/core/data/mapping/type/TypeTest.cpp index 26164885..ea3af2b0 100644 --- a/test/oatpp/core/data/mapping/type/TypeTest.cpp +++ b/test/oatpp/core/data/mapping/type/TypeTest.cpp @@ -24,7 +24,6 @@ #include "TypeTest.hpp" -#include "oatpp/parser/json/mapping/ObjectMapper.hpp" #include "oatpp/core/macro/codegen.hpp" #include "oatpp/core/Types.hpp" diff --git a/test/oatpp/core/data/resource/InMemoryDataTest.cpp b/test/oatpp/core/data/resource/InMemoryDataTest.cpp index 648f8b45..5de1c6d5 100644 --- a/test/oatpp/core/data/resource/InMemoryDataTest.cpp +++ b/test/oatpp/core/data/resource/InMemoryDataTest.cpp @@ -25,6 +25,7 @@ #include "InMemoryDataTest.hpp" #include "oatpp/core/data/resource/InMemoryData.hpp" +#include "oatpp/core/data/stream/BufferStream.hpp" namespace oatpp { namespace test { namespace core { namespace data { namespace resource { diff --git a/test/oatpp/core/data/share/MemoryLabelTest.cpp b/test/oatpp/core/data/share/MemoryLabelTest.cpp index f7485ee1..db40e2d2 100644 --- a/test/oatpp/core/data/share/MemoryLabelTest.cpp +++ b/test/oatpp/core/data/share/MemoryLabelTest.cpp @@ -24,9 +24,7 @@ #include "MemoryLabelTest.hpp" -#include "oatpp/core/data/share/MemoryLabel.hpp" - -#include +#include "oatpp/core/parser/Caret.hpp" #include "oatpp/web/protocol/http/Http.hpp" #include "oatpp-test/Checker.hpp" @@ -168,7 +166,6 @@ void MemoryLabelTest::onRun() { OATPP_ASSERT(stringMap.find("Key3") == stringMap.end()); OATPP_ASSERT(stringMap.find("Key4") == stringMap.end()); - // CI stringMapCI[key1] = MemoryLabel(sharedData.getPtr(), &sharedData->data()[0], 3); @@ -217,7 +214,6 @@ void MemoryLabelTest::onRun() { OATPP_ASSERT(status.code == 0); OATPP_ASSERT(headers.getSize() == 10); - OATPP_ASSERT(headers.getAsMemoryLabel("header0").equals("value0", 6)); OATPP_ASSERT(headers.getAsMemoryLabel("header1").equals("value1", 6)); OATPP_ASSERT(headers.getAsMemoryLabel("header2").equals("value2", 6)); diff --git a/test/oatpp/core/provider/PoolTest.cpp b/test/oatpp/core/provider/PoolTest.cpp index d40bf2ff..e9747855 100644 --- a/test/oatpp/core/provider/PoolTest.cpp +++ b/test/oatpp/core/provider/PoolTest.cpp @@ -27,8 +27,6 @@ #include "oatpp/core/provider/Pool.hpp" #include "oatpp/core/async/Executor.hpp" -#include - namespace oatpp { namespace test { namespace core { namespace provider { namespace { @@ -114,7 +112,6 @@ public: }; - struct AcquisitionProxy : public oatpp::provider::AcquisitionProxy { AcquisitionProxy(const oatpp::provider::ResourceHandle& resource, @@ -130,7 +127,6 @@ struct AcquisitionProxy : public oatpp::provider::AcquisitionProxy, Resource, AcquisitionProxy> Pool; - class ClientCoroutine : public oatpp::async::Coroutine { private: std::shared_ptr m_pool; @@ -178,7 +174,6 @@ void PoolTest::onRun() { auto provider = std::make_shared(); auto pool = Pool::createShared(provider, 10, std::chrono::seconds(2)); - std::list threads; OATPP_LOGD(TAG, "Run 1"); diff --git a/test/oatpp/encoding/UnicodeTest.cpp b/test/oatpp/encoding/UnicodeTest.cpp index 5f576ca7..54b44c5c 100644 --- a/test/oatpp/encoding/UnicodeTest.cpp +++ b/test/oatpp/encoding/UnicodeTest.cpp @@ -24,7 +24,6 @@ #include "UnicodeTest.hpp" -#include "oatpp/encoding/Hex.hpp" #include "oatpp/encoding/Unicode.hpp" namespace oatpp { namespace test { namespace encoding { diff --git a/test/oatpp/network/UrlTest.cpp b/test/oatpp/network/UrlTest.cpp index 58eeeaef..f4cc58f3 100644 --- a/test/oatpp/network/UrlTest.cpp +++ b/test/oatpp/network/UrlTest.cpp @@ -26,8 +26,6 @@ #include "oatpp/network/Url.hpp" -#include "oatpp-test/Checker.hpp" - namespace oatpp { namespace test { namespace network { void UrlTest::onRun() { diff --git a/test/oatpp/network/monitor/ConnectionMonitorTest.cpp b/test/oatpp/network/monitor/ConnectionMonitorTest.cpp index a7d7be54..0e224390 100644 --- a/test/oatpp/network/monitor/ConnectionMonitorTest.cpp +++ b/test/oatpp/network/monitor/ConnectionMonitorTest.cpp @@ -27,7 +27,6 @@ #include "oatpp/web/client/HttpRequestExecutor.hpp" #include "oatpp/web/server/AsyncHttpConnectionHandler.hpp" #include "oatpp/web/server/HttpConnectionHandler.hpp" -#include "oatpp/web/server/HttpRouter.hpp" #include "oatpp/web/protocol/http/outgoing/StreamingBody.hpp" #include "oatpp/network/monitor/ConnectionMonitor.hpp" @@ -37,8 +36,6 @@ #include "oatpp/network/tcp/client/ConnectionProvider.hpp" #include "oatpp/network/tcp/server/ConnectionProvider.hpp" -#include - namespace oatpp { namespace test { namespace network { namespace monitor { namespace { diff --git a/test/oatpp/network/virtual_/InterfaceTest.cpp b/test/oatpp/network/virtual_/InterfaceTest.cpp index 7504c6fb..ce93885e 100644 --- a/test/oatpp/network/virtual_/InterfaceTest.cpp +++ b/test/oatpp/network/virtual_/InterfaceTest.cpp @@ -29,7 +29,6 @@ #include "oatpp/core/data/stream/BufferStream.hpp" #include -#include namespace oatpp { namespace test { namespace network { namespace virtual_ { diff --git a/test/oatpp/network/virtual_/PipeTest.cpp b/test/oatpp/network/virtual_/PipeTest.cpp index 7482e51d..0ae57e60 100644 --- a/test/oatpp/network/virtual_/PipeTest.cpp +++ b/test/oatpp/network/virtual_/PipeTest.cpp @@ -30,7 +30,6 @@ #include "oatpp-test/Checker.hpp" -#include #include namespace oatpp { namespace test { namespace network { namespace virtual_ { diff --git a/test/oatpp/parser/json/mapping/DTOMapperPerfTest.cpp b/test/oatpp/parser/json/mapping/DTOMapperPerfTest.cpp index 13cefdca..69bb4027 100644 --- a/test/oatpp/parser/json/mapping/DTOMapperPerfTest.cpp +++ b/test/oatpp/parser/json/mapping/DTOMapperPerfTest.cpp @@ -25,12 +25,7 @@ #include "DTOMapperPerfTest.hpp" #include "oatpp/parser/json/mapping/ObjectMapper.hpp" -#include "oatpp/parser/json/mapping/Serializer.hpp" -#include "oatpp/parser/json/mapping/Deserializer.hpp" -#include "oatpp/core/data/stream/BufferStream.hpp" - -#include "oatpp/core/macro/basic.hpp" #include "oatpp/core/macro/codegen.hpp" #include "oatpp-test/Checker.hpp" diff --git a/test/oatpp/parser/json/mapping/DTOMapperTest.cpp b/test/oatpp/parser/json/mapping/DTOMapperTest.cpp index 75bcb7a4..588be901 100644 --- a/test/oatpp/parser/json/mapping/DTOMapperTest.cpp +++ b/test/oatpp/parser/json/mapping/DTOMapperTest.cpp @@ -26,10 +26,6 @@ #include "oatpp/parser/json/mapping/ObjectMapper.hpp" -#include "oatpp/core/data/mapping/type/Object.hpp" -#include "oatpp/core/data/mapping/type/List.hpp" -#include "oatpp/core/data/mapping/type/Primitive.hpp" - #include "oatpp/core/utils/ConversionUtils.hpp" #include "oatpp/core/macro/codegen.hpp" diff --git a/test/oatpp/web/ClientRetryTest.cpp b/test/oatpp/web/ClientRetryTest.cpp index 6c849860..59c502d9 100644 --- a/test/oatpp/web/ClientRetryTest.cpp +++ b/test/oatpp/web/ClientRetryTest.cpp @@ -26,15 +26,11 @@ #include "oatpp/web/app/Client.hpp" -#include "oatpp/web/app/ControllerWithInterceptors.hpp" #include "oatpp/web/app/Controller.hpp" -#include "oatpp/web/app/BasicAuthorizationController.hpp" -#include "oatpp/web/app/BearerAuthorizationController.hpp" #include "oatpp/web/client/HttpRequestExecutor.hpp" #include "oatpp/web/server/HttpConnectionHandler.hpp" -#include "oatpp/web/server/HttpRouter.hpp" #include "oatpp/parser/json/mapping/ObjectMapper.hpp" @@ -43,12 +39,9 @@ #include "oatpp/network/virtual_/client/ConnectionProvider.hpp" #include "oatpp/network/virtual_/server/ConnectionProvider.hpp" -#include "oatpp/network/virtual_/Interface.hpp" #include "oatpp/network/ConnectionPool.hpp" -#include "oatpp/core/macro/component.hpp" - #include "oatpp-test/web/ClientServerTestRunner.hpp" #include "oatpp-test/Checker.hpp" diff --git a/test/oatpp/web/FullAsyncClientTest.cpp b/test/oatpp/web/FullAsyncClientTest.cpp index 6c6fb4c1..1de3e98d 100644 --- a/test/oatpp/web/FullAsyncClientTest.cpp +++ b/test/oatpp/web/FullAsyncClientTest.cpp @@ -31,7 +31,6 @@ #include "oatpp/web/client/HttpRequestExecutor.hpp" #include "oatpp/web/server/AsyncHttpConnectionHandler.hpp" -#include "oatpp/web/server/HttpRouter.hpp" #include "oatpp/parser/json/mapping/ObjectMapper.hpp" @@ -40,9 +39,6 @@ #include "oatpp/network/virtual_/client/ConnectionProvider.hpp" #include "oatpp/network/virtual_/server/ConnectionProvider.hpp" -#include "oatpp/network/virtual_/Interface.hpp" - -#include "oatpp/core/macro/component.hpp" #include "oatpp-test/web/ClientServerTestRunner.hpp" diff --git a/test/oatpp/web/FullAsyncClientTest.hpp b/test/oatpp/web/FullAsyncClientTest.hpp index f2a45626..7cc1f0b9 100644 --- a/test/oatpp/web/FullAsyncClientTest.hpp +++ b/test/oatpp/web/FullAsyncClientTest.hpp @@ -27,6 +27,8 @@ #include "oatpp-test/UnitTest.hpp" +#include + namespace oatpp { namespace test { namespace web { class FullAsyncClientTest : public UnitTest { diff --git a/test/oatpp/web/FullAsyncTest.cpp b/test/oatpp/web/FullAsyncTest.cpp index 125def6d..fc54a621 100644 --- a/test/oatpp/web/FullAsyncTest.cpp +++ b/test/oatpp/web/FullAsyncTest.cpp @@ -32,7 +32,6 @@ #include "oatpp/web/client/HttpRequestExecutor.hpp" #include "oatpp/web/server/AsyncHttpConnectionHandler.hpp" -#include "oatpp/web/server/HttpRouter.hpp" #include "oatpp/parser/json/mapping/ObjectMapper.hpp" @@ -41,10 +40,8 @@ #include "oatpp/network/virtual_/client/ConnectionProvider.hpp" #include "oatpp/network/virtual_/server/ConnectionProvider.hpp" -#include "oatpp/network/virtual_/Interface.hpp" #include "oatpp/core/data/resource/InMemoryData.hpp" -#include "oatpp/core/macro/component.hpp" #include "oatpp-test/web/ClientServerTestRunner.hpp" @@ -291,7 +288,6 @@ void FullAsyncTest::onRun() { }, std::chrono::minutes(10)); - OATPP_COMPONENT(std::shared_ptr, executor); executor->waitTasksFinished(); executor->stop(); diff --git a/test/oatpp/web/FullAsyncTest.hpp b/test/oatpp/web/FullAsyncTest.hpp index 545c89e3..b5681c06 100644 --- a/test/oatpp/web/FullAsyncTest.hpp +++ b/test/oatpp/web/FullAsyncTest.hpp @@ -27,6 +27,8 @@ #include "oatpp-test/UnitTest.hpp" +#include + namespace oatpp { namespace test { namespace web { class FullAsyncTest : public UnitTest { diff --git a/test/oatpp/web/FullTest.cpp b/test/oatpp/web/FullTest.cpp index bf993304..8bd3296e 100644 --- a/test/oatpp/web/FullTest.cpp +++ b/test/oatpp/web/FullTest.cpp @@ -34,7 +34,6 @@ #include "oatpp/web/client/HttpRequestExecutor.hpp" #include "oatpp/web/server/HttpConnectionHandler.hpp" -#include "oatpp/web/server/HttpRouter.hpp" #include "oatpp/parser/json/mapping/ObjectMapper.hpp" @@ -43,10 +42,8 @@ #include "oatpp/network/virtual_/client/ConnectionProvider.hpp" #include "oatpp/network/virtual_/server/ConnectionProvider.hpp" -#include "oatpp/network/virtual_/Interface.hpp" #include "oatpp/core/data/resource/InMemoryData.hpp" -#include "oatpp/core/macro/component.hpp" #include "oatpp-test/web/ClientServerTestRunner.hpp" diff --git a/test/oatpp/web/FullTest.hpp b/test/oatpp/web/FullTest.hpp index c61c8a5c..2bcdde1d 100644 --- a/test/oatpp/web/FullTest.hpp +++ b/test/oatpp/web/FullTest.hpp @@ -27,6 +27,8 @@ #include "oatpp-test/UnitTest.hpp" +#include + namespace oatpp { namespace test { namespace web { class FullTest : public UnitTest { diff --git a/test/oatpp/web/PipelineAsyncTest.cpp b/test/oatpp/web/PipelineAsyncTest.cpp index 2a4e5a08..f3cfe5e4 100644 --- a/test/oatpp/web/PipelineAsyncTest.cpp +++ b/test/oatpp/web/PipelineAsyncTest.cpp @@ -27,7 +27,6 @@ #include "oatpp/web/app/ControllerAsync.hpp" #include "oatpp/web/server/AsyncHttpConnectionHandler.hpp" -#include "oatpp/web/server/HttpRouter.hpp" #include "oatpp/parser/json/mapping/ObjectMapper.hpp" @@ -36,10 +35,6 @@ #include "oatpp/network/virtual_/client/ConnectionProvider.hpp" #include "oatpp/network/virtual_/server/ConnectionProvider.hpp" -#include "oatpp/network/virtual_/Interface.hpp" - -#include "oatpp/core/data/stream/BufferStream.hpp" -#include "oatpp/core/macro/component.hpp" #include "oatpp-test/web/ClientServerTestRunner.hpp" diff --git a/test/oatpp/web/PipelineAsyncTest.hpp b/test/oatpp/web/PipelineAsyncTest.hpp index f20100b5..9430bb05 100644 --- a/test/oatpp/web/PipelineAsyncTest.hpp +++ b/test/oatpp/web/PipelineAsyncTest.hpp @@ -27,6 +27,8 @@ #include "oatpp-test/UnitTest.hpp" +#include + namespace oatpp { namespace test { namespace web { class PipelineAsyncTest : public UnitTest { diff --git a/test/oatpp/web/PipelineTest.cpp b/test/oatpp/web/PipelineTest.cpp index 53feefcf..58845bf3 100644 --- a/test/oatpp/web/PipelineTest.cpp +++ b/test/oatpp/web/PipelineTest.cpp @@ -27,7 +27,6 @@ #include "oatpp/web/app/Controller.hpp" #include "oatpp/web/server/HttpConnectionHandler.hpp" -#include "oatpp/web/server/HttpRouter.hpp" #include "oatpp/parser/json/mapping/ObjectMapper.hpp" @@ -36,10 +35,6 @@ #include "oatpp/network/virtual_/client/ConnectionProvider.hpp" #include "oatpp/network/virtual_/server/ConnectionProvider.hpp" -#include "oatpp/network/virtual_/Interface.hpp" - -#include "oatpp/core/data/stream/BufferStream.hpp" -#include "oatpp/core/macro/component.hpp" #include "oatpp-test/web/ClientServerTestRunner.hpp" diff --git a/test/oatpp/web/PipelineTest.hpp b/test/oatpp/web/PipelineTest.hpp index ca87a1af..98a90840 100644 --- a/test/oatpp/web/PipelineTest.hpp +++ b/test/oatpp/web/PipelineTest.hpp @@ -27,6 +27,8 @@ #include "oatpp-test/UnitTest.hpp" +#include + namespace oatpp { namespace test { namespace web { class PipelineTest : public UnitTest { diff --git a/test/oatpp/web/app/BasicAuthorizationController.hpp b/test/oatpp/web/app/BasicAuthorizationController.hpp index 4157e2ea..408c786a 100644 --- a/test/oatpp/web/app/BasicAuthorizationController.hpp +++ b/test/oatpp/web/app/BasicAuthorizationController.hpp @@ -28,13 +28,11 @@ #include "./DTOs.hpp" #include "oatpp/web/server/api/ApiController.hpp" -#include "oatpp/parser/json/mapping/ObjectMapper.hpp" -#include "oatpp/core/utils/ConversionUtils.hpp" -#include "oatpp/core/macro/codegen.hpp" +#include "oatpp/web/server/handler/AuthorizationHandler.hpp" +#include "oatpp/web/server/api/Endpoint.hpp" +#include "oatpp/web/server/handler/ErrorHandler.hpp" #include "oatpp/core/macro/component.hpp" -#include - namespace oatpp { namespace test { namespace web { namespace app { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/test/oatpp/web/app/BearerAuthorizationController.hpp b/test/oatpp/web/app/BearerAuthorizationController.hpp index e18d524e..19c111bc 100644 --- a/test/oatpp/web/app/BearerAuthorizationController.hpp +++ b/test/oatpp/web/app/BearerAuthorizationController.hpp @@ -28,13 +28,11 @@ #include "./DTOs.hpp" #include "oatpp/web/server/api/ApiController.hpp" -#include "oatpp/parser/json/mapping/ObjectMapper.hpp" -#include "oatpp/core/utils/ConversionUtils.hpp" -#include "oatpp/core/macro/codegen.hpp" +#include "oatpp/web/server/handler/AuthorizationHandler.hpp" +#include "oatpp/web/server/api/Endpoint.hpp" +#include "oatpp/web/server/handler/ErrorHandler.hpp" #include "oatpp/core/macro/component.hpp" -#include - namespace oatpp { namespace test { namespace web { namespace app { class BearerAuthorizationObject : public oatpp::web::server::handler::AuthorizationObject { diff --git a/test/oatpp/web/app/Client.hpp b/test/oatpp/web/app/Client.hpp index 6abbf3f9..4989e884 100644 --- a/test/oatpp/web/app/Client.hpp +++ b/test/oatpp/web/app/Client.hpp @@ -29,8 +29,8 @@ #include "oatpp/web/client/ApiClient.hpp" #include "oatpp/web/protocol/http/outgoing/MultipartBody.hpp" +#include "oatpp/web/protocol/http/outgoing/BufferBody.hpp" #include "oatpp/encoding/Base64.hpp" -#include "oatpp/core/macro/codegen.hpp" namespace oatpp { namespace test { namespace web { namespace app { diff --git a/test/oatpp/web/app/Controller.hpp b/test/oatpp/web/app/Controller.hpp index 8c93d550..d62d7f87 100644 --- a/test/oatpp/web/app/Controller.hpp +++ b/test/oatpp/web/app/Controller.hpp @@ -36,15 +36,12 @@ #include "oatpp/web/protocol/http/outgoing/StreamingBody.hpp" #include "oatpp/web/server/api/ApiController.hpp" -#include "oatpp/parser/json/mapping/ObjectMapper.hpp" +#include "oatpp/web/server/api/Endpoint.hpp" +#include "oatpp/web/server/handler/ErrorHandler.hpp" #include "oatpp/core/data/resource/File.hpp" -#include "oatpp/core/data/stream/FileStream.hpp" -#include "oatpp/core/utils/ConversionUtils.hpp" -#include "oatpp/core/macro/codegen.hpp" #include "oatpp/core/macro/component.hpp" -#include #include namespace oatpp { namespace test { namespace web { namespace app { diff --git a/test/oatpp/web/app/ControllerAsync.hpp b/test/oatpp/web/app/ControllerAsync.hpp index 57bac8e5..950b8b58 100644 --- a/test/oatpp/web/app/ControllerAsync.hpp +++ b/test/oatpp/web/app/ControllerAsync.hpp @@ -35,14 +35,10 @@ #include "oatpp/web/protocol/http/outgoing/MultipartBody.hpp" #include "oatpp/web/protocol/http/outgoing/StreamingBody.hpp" #include "oatpp/web/server/api/ApiController.hpp" - -#include "oatpp/parser/json/mapping/ObjectMapper.hpp" +#include "oatpp/web/server/api/Endpoint.hpp" +#include "oatpp/web/server/handler/ErrorHandler.hpp" #include "oatpp/core/data/resource/File.hpp" -#include "oatpp/core/data/stream/FileStream.hpp" -#include "oatpp/core/data/stream/Stream.hpp" -#include "oatpp/core/utils/ConversionUtils.hpp" -#include "oatpp/core/macro/codegen.hpp" #include "oatpp/core/macro/component.hpp" namespace oatpp { namespace test { namespace web { namespace app { @@ -229,7 +225,6 @@ public: }; - ENDPOINT_ASYNC("POST", "test/multipart-all", MultipartUpload) { ENDPOINT_ASYNC_INIT(MultipartUpload) @@ -286,7 +281,6 @@ public: }; - class MPStream : public oatpp::web::mime::multipart::Multipart { public: typedef oatpp::web::mime::multipart::Part Part; diff --git a/test/oatpp/web/app/ControllerWithInterceptors.hpp b/test/oatpp/web/app/ControllerWithInterceptors.hpp index f2c5ec8d..92ed6a4f 100644 --- a/test/oatpp/web/app/ControllerWithInterceptors.hpp +++ b/test/oatpp/web/app/ControllerWithInterceptors.hpp @@ -26,13 +26,11 @@ #define oatpp_test_web_app_ControllerWithInterceptors_hpp #include "oatpp/web/server/api/ApiController.hpp" -#include "oatpp/parser/json/mapping/ObjectMapper.hpp" -#include "oatpp/core/utils/ConversionUtils.hpp" +#include "oatpp/web/server/api/Endpoint.hpp" +#include "oatpp/web/server/handler/ErrorHandler.hpp" #include "oatpp/core/macro/codegen.hpp" #include "oatpp/core/macro/component.hpp" -#include - namespace oatpp { namespace test { namespace web { namespace app { namespace multipart = oatpp::web::mime::multipart; @@ -110,7 +108,6 @@ public: return response; } - #include OATPP_CODEGEN_END(ApiController) }; diff --git a/test/oatpp/web/app/ControllerWithInterceptorsAsync.hpp b/test/oatpp/web/app/ControllerWithInterceptorsAsync.hpp index f2c1825f..c30031d9 100644 --- a/test/oatpp/web/app/ControllerWithInterceptorsAsync.hpp +++ b/test/oatpp/web/app/ControllerWithInterceptorsAsync.hpp @@ -26,13 +26,11 @@ #define oatpp_test_web_app_ControllerWithInterceptorsAsync_hpp #include "oatpp/web/server/api/ApiController.hpp" -#include "oatpp/parser/json/mapping/ObjectMapper.hpp" -#include "oatpp/core/utils/ConversionUtils.hpp" +#include "oatpp/web/server/api/Endpoint.hpp" +#include "oatpp/web/server/handler/ErrorHandler.hpp" #include "oatpp/core/macro/codegen.hpp" #include "oatpp/core/macro/component.hpp" -#include - namespace oatpp { namespace test { namespace web { namespace app { namespace multipart = oatpp::web::mime::multipart; diff --git a/test/oatpp/web/mime/multipart/StatefulParserTest.cpp b/test/oatpp/web/mime/multipart/StatefulParserTest.cpp index d0805a2f..6caf1ae9 100644 --- a/test/oatpp/web/mime/multipart/StatefulParserTest.cpp +++ b/test/oatpp/web/mime/multipart/StatefulParserTest.cpp @@ -29,10 +29,6 @@ #include "oatpp/web/mime/multipart/InMemoryDataProvider.hpp" #include "oatpp/web/mime/multipart/Reader.hpp" -#include "oatpp/core/data/stream/BufferStream.hpp" - -#include - namespace oatpp { namespace test { namespace web { namespace mime { namespace multipart { namespace { @@ -64,7 +60,6 @@ namespace { "--12345--\r\n" ; - void parseStepByStep(const oatpp::String& text, const oatpp::String& boundary, const std::shared_ptr& listener, diff --git a/test/oatpp/web/protocol/http/encoding/ChunkedTest.cpp b/test/oatpp/web/protocol/http/encoding/ChunkedTest.cpp index d7294625..07e19534 100644 --- a/test/oatpp/web/protocol/http/encoding/ChunkedTest.cpp +++ b/test/oatpp/web/protocol/http/encoding/ChunkedTest.cpp @@ -25,7 +25,6 @@ #include "ChunkedTest.hpp" #include "oatpp/web/protocol/http/encoding/Chunked.hpp" -#include "oatpp/core/data/stream/BufferStream.hpp" namespace oatpp { namespace test { namespace web { namespace protocol { namespace http { namespace encoding { @@ -119,7 +118,6 @@ void ChunkedTest::onRun() { OATPP_ASSERT(result == data); } - } }}}}}} \ No newline at end of file diff --git a/test/oatpp/web/server/HttpRouterTest.cpp b/test/oatpp/web/server/HttpRouterTest.cpp index bf4dba22..dea1f954 100644 --- a/test/oatpp/web/server/HttpRouterTest.cpp +++ b/test/oatpp/web/server/HttpRouterTest.cpp @@ -25,7 +25,7 @@ #include "HttpRouterTest.hpp" #include "oatpp/web/server/HttpRouter.hpp" -#include "oatpp/core/Types.hpp" +#include "oatpp/web/url/mapping/Router.hpp" namespace oatpp { namespace test { namespace web { namespace server { diff --git a/test/oatpp/web/server/ServerStopTest.cpp b/test/oatpp/web/server/ServerStopTest.cpp index b2e9a279..284937b6 100644 --- a/test/oatpp/web/server/ServerStopTest.cpp +++ b/test/oatpp/web/server/ServerStopTest.cpp @@ -27,6 +27,8 @@ #include "oatpp/web/client/HttpRequestExecutor.hpp" #include "oatpp/web/server/AsyncHttpConnectionHandler.hpp" #include "oatpp/web/server/HttpConnectionHandler.hpp" +#include "oatpp/web/server/HttpRouter.hpp" +#include "oatpp/web/server/HttpRequestHandler.hpp" #include "oatpp/web/protocol/http/outgoing/StreamingBody.hpp" #include "oatpp/network/virtual_/server/ConnectionProvider.hpp" @@ -34,6 +36,7 @@ #include "oatpp/network/tcp/server/ConnectionProvider.hpp" #include "oatpp/network/tcp/client/ConnectionProvider.hpp" #include "oatpp/network/Server.hpp" +#include "oatpp/core/async/Executor.hpp" namespace oatpp { namespace test { namespace web { namespace server { diff --git a/test/oatpp/web/server/api/ApiControllerTest.cpp b/test/oatpp/web/server/api/ApiControllerTest.cpp index 4b85739a..d743ea2f 100644 --- a/test/oatpp/web/server/api/ApiControllerTest.cpp +++ b/test/oatpp/web/server/api/ApiControllerTest.cpp @@ -25,6 +25,8 @@ #include "ApiControllerTest.hpp" #include "oatpp/web/server/api/ApiController.hpp" +#include "oatpp/web/server/api/Endpoint.hpp" +#include "oatpp/web/server/handler/ErrorHandler.hpp" #include "oatpp/core/macro/codegen.hpp" namespace oatpp { namespace test { namespace web { namespace server { namespace api { diff --git a/test/oatpp/web/server/handler/AuthorizationHandlerTest.hpp b/test/oatpp/web/server/handler/AuthorizationHandlerTest.hpp index d868c614..bd3932d8 100644 --- a/test/oatpp/web/server/handler/AuthorizationHandlerTest.hpp +++ b/test/oatpp/web/server/handler/AuthorizationHandlerTest.hpp @@ -26,7 +26,6 @@ #ifndef oatpp_test_encoding_AuthorizationHandlerTest_hpp #define oatpp_test_encoding_AuthorizationHandlerTest_hpp -#include #include "oatpp-test/UnitTest.hpp" namespace oatpp { namespace test { namespace web { namespace server { namespace handler {