Moved a few classes to a new http folder.

2024-11-14 04:57:21 +01:00 · 2021-06-20 15:49:31 +02:00 · 2021-06-20 15:49:31 +02:00 · d1196eb051
commit d1196eb051
parent 70fb51ca3e
53 changed files with 82 additions and 81 deletions
--- a/modules/drogon/SCsub
+++ b/modules/drogon/SCsub
@ -6,6 +6,7 @@ Import("env")
 env_mod.core_sources = []

 env_mod.add_source_files(env_mod.core_sources, "drogon/lib/src/*.cc")
+env_mod.add_source_files(env_mod.core_sources, "drogon/lib/inc/http/*.cc")
 env_mod.add_source_files(env_mod.core_sources, "drogon/lib/src/ssl_funcs/*.cc")

 env_mod.add_source_files(env_mod.core_sources, "trantor/net/*.cc")
--- a/modules/drogon/drogon/lib/inc/drogon/HttpAppFramework.h
+++ b/modules/drogon/drogon/lib/inc/drogon/HttpAppFramework.h
@ -14,12 +14,12 @@

 #pragma once

-#include <drogon/CacheMap.h>
-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
+#include <http/CacheMap.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
 #include <drogon/IntranetIpFilter.h>
 #include <drogon/LocalHostFilter.h>
-#include <drogon/MultiPart.h>
+#include <http/MultiPart.h>
 #include <drogon/drogon_callbacks.h>

 #include <drogon/plugins/Plugin.h>
--- a/modules/drogon/drogon/lib/inc/drogon/HttpClient.h
+++ b/modules/drogon/drogon/lib/inc/drogon/HttpClient.h
@ -14,9 +14,9 @@
 */
 #pragma once

-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
-#include <drogon/HttpTypes.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
+#include <http/HttpTypes.h>
 #include <drogon/drogon_callbacks.h>

 #include <trantor/net/EventLoop.h>
--- a/modules/drogon/drogon/lib/inc/drogon/HttpFilter.h
+++ b/modules/drogon/drogon/lib/inc/drogon/HttpFilter.h
@ -14,8 +14,8 @@

 #pragma once

-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
 #include <drogon/drogon_callbacks.h>
 #include <memory>

--- a/modules/drogon/drogon/lib/inc/drogon/WebSocketClient.h
+++ b/modules/drogon/drogon/lib/inc/drogon/WebSocketClient.h
@ -14,9 +14,9 @@

 #pragma once

-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
-#include <drogon/HttpTypes.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
+#include <http/HttpTypes.h>
 #include <drogon/WebSocketConnection.h>
 #ifdef __cpp_impl_coroutine
 #include <drogon/utils/coroutine.h>
--- a/modules/drogon/drogon/lib/inc/drogon/WebSocketConnection.h
+++ b/modules/drogon/drogon/lib/inc/drogon/WebSocketConnection.h
@ -14,7 +14,7 @@

 #pragma once

-#include <drogon/HttpTypes.h>
+#include <http/HttpTypes.h>
 #include <trantor/net/InetAddress.h>
 #include <trantor/utils/NonCopyable.h>
 #include <memory>
--- a/modules/drogon/drogon/lib/inc/drogon/drogon.h
+++ b/modules/drogon/drogon/lib/inc/drogon/drogon.h
@ -19,14 +19,14 @@
 #include <trantor/utils/Date.h>
 #include <trantor/utils/Logger.h>

-#include <drogon/CacheMap.h>
-#include <drogon/Cookie.h>
+#include <http/CacheMap.h>
+#include <http/Cookie.h>
 #include <drogon/HttpAppFramework.h>
 #include <drogon/HttpClient.h>
 #include <drogon/IOThreadStorage.h>
-#include <drogon/MultiPart.h>
-#include <drogon/Session.h>
-#include <drogon/UploadFile.h>
+#include <http/MultiPart.h>
+#include <http/Session.h>
+#include <http/UploadFile.h>
 #include <drogon/plugins/AccessLogger.h>
 #include <drogon/plugins/Plugin.h>
 #include <drogon/plugins/SecureSSLRedirector.h>
--- a/modules/drogon/drogon/lib/inc/drogon/drogon_callbacks.h
+++ b/modules/drogon/drogon/lib/inc/drogon/drogon_callbacks.h
@ -14,7 +14,7 @@

 #pragma once

-#include <drogon/HttpTypes.h>
+#include <http/HttpTypes.h>
 #include <functional>
 #include <memory>

--- a/modules/drogon/drogon/lib/inc/drogon/plugins/AccessLogger.h
+++ b/modules/drogon/drogon/lib/inc/drogon/plugins/AccessLogger.h
@ -6,8 +6,8 @@

 #pragma once

-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
 #include <drogon/plugins/Plugin.h>
 #include <trantor/utils/AsyncFileLogger.h>
 #include <vector>
--- a/modules/drogon/drogon/lib/inc/drogon/utils/HttpConstraint.h
+++ b/modules/drogon/drogon/lib/inc/drogon/utils/HttpConstraint.h
@ -14,7 +14,7 @@

 #pragma once

-#include <drogon/HttpTypes.h>
+#include <http/HttpTypes.h>
 #include <string>
 namespace drogon {
 namespace internal {
--- a/modules/drogon/drogon/lib/inc/drogon/Attribute.h
+++ b/modules/drogon/drogon/lib/inc/drogon/Attribute.h
--- a/modules/drogon/drogon/lib/inc/http/CacheFile.cc
+++ b/modules/drogon/drogon/lib/inc/http/CacheFile.cc
--- a/modules/drogon/drogon/lib/inc/http/CacheFile.h
+++ b/modules/drogon/drogon/lib/inc/http/CacheFile.h
--- a/modules/drogon/drogon/lib/inc/drogon/CacheMap.h
+++ b/modules/drogon/drogon/lib/inc/drogon/CacheMap.h
--- a/modules/drogon/drogon/lib/inc/http/Cookie.cc
+++ b/modules/drogon/drogon/lib/inc/http/Cookie.cc
@ -12,7 +12,7 @@
 *
 */

-#include <drogon/Cookie.h>
+#include "Cookie.h"
 #include <drogon/utils/Utilities.h>
 using namespace drogon;
 std::string Cookie::cookieString() const {
--- a/modules/drogon/drogon/lib/inc/drogon/Cookie.h
+++ b/modules/drogon/drogon/lib/inc/drogon/Cookie.h
--- a/modules/drogon/drogon/lib/inc/http/HttpFileImpl.cc
+++ b/modules/drogon/drogon/lib/inc/http/HttpFileImpl.cc
@ -13,8 +13,8 @@
 */

 #include "HttpFileImpl.h"
-#include "HttpAppFrameworkImpl.h"
-#include <drogon/MultiPart.h>
+#include "../src/HttpAppFrameworkImpl.h"
+#include <http/MultiPart.h>
 #include <fstream>
 #include <iostream>

--- a/modules/drogon/drogon/lib/inc/http/HttpFileImpl.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpFileImpl.h
@ -14,7 +14,7 @@

 #pragma once
 #include "HttpUtils.h"
-#include <drogon/HttpRequest.h>
+#include <http/HttpRequest.h>
 #include <drogon/utils/string_view.h>

 #include <map>
--- a/modules/drogon/drogon/lib/inc/http/HttpFileUploadRequest.cc
+++ b/modules/drogon/drogon/lib/inc/http/HttpFileUploadRequest.cc
@ -13,7 +13,7 @@
 */

 #include "HttpFileUploadRequest.h"
-#include <drogon/UploadFile.h>
+#include <http/UploadFile.h>
 #include <drogon/utils/Utilities.h>

 using namespace drogon;
--- a/modules/drogon/drogon/lib/inc/http/HttpFileUploadRequest.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpFileUploadRequest.h
--- a/modules/drogon/drogon/lib/inc/http/HttpMessageBody.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpMessageBody.h
--- a/modules/drogon/drogon/lib/inc/drogon/HttpRequest.h
+++ b/modules/drogon/drogon/lib/inc/drogon/HttpRequest.h
@ -14,10 +14,10 @@

 #pragma once

-#include <drogon/Attribute.h>
-#include <drogon/HttpTypes.h>
-#include <drogon/Session.h>
-#include <drogon/UploadFile.h>
+#include "Attribute.h"
+#include "HttpTypes.h"
+#include "Session.h"
+#include "UploadFile.h"

 #include <drogon/utils/string_view.h>
 #include <json/json.h>
--- a/modules/drogon/drogon/lib/inc/http/HttpRequestImpl.cc
+++ b/modules/drogon/drogon/lib/inc/http/HttpRequestImpl.cc
@ -13,7 +13,7 @@
 */

 #include "HttpRequestImpl.h"
-#include "HttpAppFrameworkImpl.h"
+#include "../src/HttpAppFrameworkImpl.h"
 #include "HttpFileUploadRequest.h"

 #include <drogon/utils/Utilities.h>
--- a/modules/drogon/drogon/lib/inc/http/HttpRequestImpl.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpRequestImpl.h
@ -17,7 +17,7 @@
 #include "CacheFile.h"
 #include "HttpUtils.h"
 #include <assert.h>
-#include <drogon/HttpRequest.h>
+#include <http/HttpRequest.h>
 #include <drogon/utils/Utilities.h>
 #include <stdio.h>
 #include <trantor/net/EventLoop.h>
--- a/modules/drogon/drogon/lib/inc/http/HttpRequestParser.cc
+++ b/modules/drogon/drogon/lib/inc/http/HttpRequestParser.cc
@ -13,11 +13,11 @@
 */

 #include "HttpRequestParser.h"
-#include "HttpAppFrameworkImpl.h"
+#include "../src/HttpAppFrameworkImpl.h"
 #include "HttpRequestImpl.h"
 #include "HttpResponseImpl.h"
 #include "HttpUtils.h"
-#include <drogon/HttpTypes.h>
+#include <http/HttpTypes.h>
 #include <trantor/utils/Logger.h>
 #include <trantor/utils/MsgBuffer.h>
 #include <iostream>
--- a/modules/drogon/drogon/lib/inc/http/HttpRequestParser.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpRequestParser.h
@ -14,8 +14,8 @@

 #pragma once

-#include "impl_forwards.h"
-#include <drogon/HttpTypes.h>
+#include "../src/impl_forwards.h"
+#include <http/HttpTypes.h>
 #include <trantor/net/TcpConnection.h>
 #include <trantor/utils/MsgBuffer.h>
 #include <trantor/utils/NonCopyable.h>
--- a/modules/drogon/drogon/lib/inc/drogon/HttpResponse.h
+++ b/modules/drogon/drogon/lib/inc/drogon/HttpResponse.h
@ -13,8 +13,8 @@

 #pragma once

-#include <drogon/Cookie.h>
-#include <drogon/HttpTypes.h>
+#include "Cookie.h"
+#include "HttpTypes.h"
 #include <drogon/HttpViewData.h>

 #include <drogon/utils/string_view.h>
--- a/modules/drogon/drogon/lib/inc/http/HttpResponseImpl.cc
+++ b/modules/drogon/drogon/lib/inc/http/HttpResponseImpl.cc
@ -13,7 +13,7 @@
 */

 #include "HttpResponseImpl.h"
-#include "HttpAppFrameworkImpl.h"
+#include "../src/HttpAppFrameworkImpl.h"
 #include "HttpUtils.h"
 #include <drogon/HttpViewData.h>
 #include <drogon/IOThreadStorage.h>
--- a/modules/drogon/drogon/lib/inc/http/HttpResponseImpl.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpResponseImpl.h
@ -16,7 +16,7 @@

 #include "HttpMessageBody.h"
 #include "HttpUtils.h"
-#include <drogon/HttpResponse.h>
+#include <http/HttpResponse.h>

 #include <drogon/utils/Utilities.h>
 #include <trantor/net/InetAddress.h>
--- a/modules/drogon/drogon/lib/inc/http/HttpResponseParser.cc
+++ b/modules/drogon/drogon/lib/inc/http/HttpResponseParser.cc
--- a/modules/drogon/drogon/lib/inc/http/HttpResponseParser.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpResponseParser.h
@ -14,7 +14,7 @@

 #pragma once

-#include "impl_forwards.h"
+#include "../src/impl_forwards.h"
 #include <trantor/net/TcpConnection.h>
 #include <trantor/utils/MsgBuffer.h>
 #include <trantor/utils/NonCopyable.h>
--- a/modules/drogon/drogon/lib/inc/drogon/HttpTypes.h
+++ b/modules/drogon/drogon/lib/inc/drogon/HttpTypes.h
--- a/modules/drogon/drogon/lib/inc/http/HttpUtils.cc
+++ b/modules/drogon/drogon/lib/inc/http/HttpUtils.cc
--- a/modules/drogon/drogon/lib/inc/http/HttpUtils.h
+++ b/modules/drogon/drogon/lib/inc/http/HttpUtils.h
@ -14,7 +14,7 @@

 #pragma once

-#include <drogon/HttpTypes.h>
+#include "HttpTypes.h"
 #include <drogon/utils/string_view.h>
 #include <trantor/utils/MsgBuffer.h>
 #include <string>
--- a/modules/drogon/drogon/lib/inc/http/MultiPart.cc
+++ b/modules/drogon/drogon/lib/inc/http/MultiPart.cc
@ -12,11 +12,11 @@
 *
 */

-#include "HttpAppFrameworkImpl.h"
+#include "../src/HttpAppFrameworkImpl.h"
 #include "HttpFileImpl.h"
 #include "HttpRequestImpl.h"
 #include "HttpUtils.h"
-#include <drogon/MultiPart.h>
+#include <http/MultiPart.h>

 #include <drogon/utils/Utilities.h>
 #include <fcntl.h>
--- a/modules/drogon/drogon/lib/inc/drogon/MultiPart.h
+++ b/modules/drogon/drogon/lib/inc/drogon/MultiPart.h
@ -14,7 +14,7 @@

 #pragma once

-#include <drogon/HttpRequest.h>
+#include "HttpRequest.h"

 #include <drogon/utils/string_view.h>
 #include <map>
--- a/modules/drogon/drogon/lib/inc/drogon/Session.h
+++ b/modules/drogon/drogon/lib/inc/drogon/Session.h
--- a/modules/drogon/drogon/lib/inc/http/SessionManager.cc
+++ b/modules/drogon/drogon/lib/inc/http/SessionManager.cc
--- a/modules/drogon/drogon/lib/inc/http/SessionManager.h
+++ b/modules/drogon/drogon/lib/inc/http/SessionManager.h
@ -14,8 +14,8 @@

 #pragma once

-#include <drogon/CacheMap.h>
-#include <drogon/Session.h>
+#include "CacheMap.h"
+#include "Session.h"
 #include <trantor/net/EventLoop.h>
 #include <trantor/utils/NonCopyable.h>
 #include <memory>
--- a/modules/drogon/drogon/lib/inc/drogon/UploadFile.h
+++ b/modules/drogon/drogon/lib/inc/drogon/UploadFile.h
--- a/modules/drogon/drogon/lib/src/AOPAdvice.cc
+++ b/modules/drogon/drogon/lib/src/AOPAdvice.cc
@ -13,8 +13,8 @@
 */

 #include "AOPAdvice.h"
-#include "HttpRequestImpl.h"
-#include "HttpResponseImpl.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpResponseImpl.h"

 namespace drogon {
 void doAdvicesChain(
--- a/modules/drogon/drogon/lib/src/AccessLogger.cc
+++ b/modules/drogon/drogon/lib/src/AccessLogger.cc
@ -12,7 +12,7 @@
 *
 */

-#include "HttpUtils.h"
+#include <http/HttpUtils.h>
 #include <drogon/drogon.h>
 #include <drogon/plugins/AccessLogger.h>
 #include <regex>
--- a/modules/drogon/drogon/lib/src/HttpAppFrameworkImpl.cc
+++ b/modules/drogon/drogon/lib/src/HttpAppFrameworkImpl.cc
@ -16,21 +16,21 @@
 #include "AOPAdvice.h"
 #include "ConfigLoader.h"
 #include "HttpClientImpl.h"
-#include "HttpRequestImpl.h"
-#include "HttpResponseImpl.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpResponseImpl.h"
 #include "HttpServer.h"
 #include "ListenerManager.h"
 #include "PluginsManager.h"
-#include "SessionManager.h"
+#include "http/SessionManager.h"
 #include "SharedLibManager.h"
 #include "StaticFileRouter.h"
 #include "WebSocketConnectionImpl.h"
 #include "WebsocketControllersRouter.h"
-#include <drogon/CacheMap.h>
-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
-#include <drogon/HttpTypes.h>
-#include <drogon/Session.h>
+#include <http/CacheMap.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
+#include <http/HttpTypes.h>
+#include <http/Session.h>

 #include <drogon/utils/Utilities.h>
 #include <json/json.h>
--- a/modules/drogon/drogon/lib/src/HttpClientImpl.cc
+++ b/modules/drogon/drogon/lib/src/HttpClientImpl.cc
@ -14,9 +14,9 @@

 #include "HttpClientImpl.h"
 #include "HttpAppFrameworkImpl.h"
-#include "HttpRequestImpl.h"
-#include "HttpResponseImpl.h"
-#include "HttpResponseParser.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpResponseImpl.h"
+#include "http/HttpResponseParser.h"

 #include <stdlib.h>
 #include <algorithm>
--- a/modules/drogon/drogon/lib/src/HttpClientImpl.h
+++ b/modules/drogon/drogon/lib/src/HttpClientImpl.h
@ -15,7 +15,7 @@
 #pragma once

 #include "impl_forwards.h"
-#include <drogon/Cookie.h>
+#include <http/Cookie.h>
 #include <drogon/HttpClient.h>
 #include <trantor/net/EventLoop.h>
 #include <trantor/net/Resolver.h>
--- a/modules/drogon/drogon/lib/src/HttpServer.cc
+++ b/modules/drogon/drogon/lib/src/HttpServer.cc
@ -14,12 +14,12 @@

 #include "HttpServer.h"
 #include "HttpAppFrameworkImpl.h"
-#include "HttpRequestImpl.h"
-#include "HttpRequestParser.h"
-#include "HttpResponseImpl.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpRequestParser.h"
+#include "http/HttpResponseImpl.h"
 #include "WebSocketConnectionImpl.h"
-#include <drogon/HttpRequest.h>
-#include <drogon/HttpResponse.h>
+#include <http/HttpRequest.h>
+#include <http/HttpResponse.h>
 #include <drogon/utils/Utilities.h>
 #include <trantor/utils/Logger.h>
 #include <functional>
--- a/modules/drogon/drogon/lib/src/IntranetIpFilter.cc
+++ b/modules/drogon/drogon/lib/src/IntranetIpFilter.cc
@ -12,7 +12,7 @@
 *
 */

-#include "HttpResponseImpl.h"
+#include "http/HttpResponseImpl.h"
 #include <drogon/IntranetIpFilter.h>
 using namespace drogon;
 void IntranetIpFilter::doFilter(const HttpRequestPtr &req,
--- a/modules/drogon/drogon/lib/src/LocalHostFilter.cc
+++ b/modules/drogon/drogon/lib/src/LocalHostFilter.cc
@ -12,7 +12,7 @@
 *
 */

-#include "HttpResponseImpl.h"
+#include "http/HttpResponseImpl.h"
 #include <drogon/LocalHostFilter.h>
 using namespace drogon;
 void LocalHostFilter::doFilter(const HttpRequestPtr &req,
--- a/modules/drogon/drogon/lib/src/StaticFileRouter.cc
+++ b/modules/drogon/drogon/lib/src/StaticFileRouter.cc
@ -14,8 +14,8 @@

 #include "StaticFileRouter.h"
 #include "HttpAppFrameworkImpl.h"
-#include "HttpRequestImpl.h"
-#include "HttpResponseImpl.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpResponseImpl.h"
 #include <fcntl.h>
 #include <algorithm>
 #include <fstream>
--- a/modules/drogon/drogon/lib/src/StaticFileRouter.h
+++ b/modules/drogon/drogon/lib/src/StaticFileRouter.h
@ -15,7 +15,7 @@
 #pragma once

 #include "impl_forwards.h"
-#include <drogon/CacheMap.h>
+#include <http/CacheMap.h>
 #include <drogon/IOThreadStorage.h>
 #include <functional>
 #include <memory>
--- a/modules/drogon/drogon/lib/src/WebSocketClientImpl.cc
+++ b/modules/drogon/drogon/lib/src/WebSocketClientImpl.cc
@ -14,10 +14,10 @@

 #include "WebSocketClientImpl.h"
 #include "HttpAppFrameworkImpl.h"
-#include "HttpRequestImpl.h"
-#include "HttpResponseImpl.h"
-#include "HttpResponseParser.h"
-#include "HttpUtils.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpResponseImpl.h"
+#include "http/HttpResponseParser.h"
+#include "http/HttpUtils.h"
 #include "WebSocketConnectionImpl.h"

 #include <drogon/utils/Utilities.h>
--- a/modules/drogon/drogon/lib/src/WebsocketControllersRouter.cc
+++ b/modules/drogon/drogon/lib/src/WebsocketControllersRouter.cc
@ -14,8 +14,8 @@

 #include "WebsocketControllersRouter.h"
 #include "AOPAdvice.h"
-#include "HttpRequestImpl.h"
-#include "HttpResponseImpl.h"
+#include "http/HttpRequestImpl.h"
+#include "http/HttpResponseImpl.h"
 #include "WebSocketConnectionImpl.h"
 #include <drogon/HttpFilter.h>

@ -137,7 +137,7 @@ void WebsocketControllersRouter::route(
 										std::move(*callbackPtr),
 										wsConnPtr);
 							});
-				} else {
+				} edrogonlse {
 					doControllerHandler(
 							ctrlInfo, wsKey, req, std::move(callback), wsConnPtr);
 				}
--- a/modules/drogon/drogon/lib/src/WebsocketControllersRouter.h
+++ b/modules/drogon/drogon/lib/src/WebsocketControllersRouter.h
@ -15,7 +15,7 @@
 #pragma once

 #include "impl_forwards.h"
-#include <drogon/HttpTypes.h>
+#include <http/HttpTypes.h>
 #include <drogon/drogon_callbacks.h>
 #include <drogon/utils/HttpConstraint.h>
 #include <trantor/utils/NonCopyable.h>