From 822b0b1cb3868fdfc2b7159cdbf11c3df776c9dd Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Sun, 12 Sep 2021 11:51:29 +0200 Subject: HttpResponse enum -> HttpResponseCode Also removed initial CbPackage API HttpServer changes as I have decided to take a different approach --- zenhttp/httpserver.cpp | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) (limited to 'zenhttp/httpserver.cpp') diff --git a/zenhttp/httpserver.cpp b/zenhttp/httpserver.cpp index b11feacd5..e283f31c9 100644 --- a/zenhttp/httpserver.cpp +++ b/zenhttp/httpserver.cpp @@ -80,7 +80,7 @@ struct CbAttachmentEntry }; void -HttpServerRequest::WriteResponse(HttpResponse HttpResponseCode, CbPackage Data) +HttpServerRequest::WriteResponse(HttpResponseCode ResponseCode, CbPackage Data) { const std::span& Attachments = Data.GetAttachments(); @@ -128,28 +128,28 @@ HttpServerRequest::WriteResponse(HttpResponse HttpResponseCode, CbPackage Data) } } - return WriteResponse(HttpResponseCode, HttpContentType::kCbPackage, ResponseBuffers); + return WriteResponse(ResponseCode, HttpContentType::kCbPackage, ResponseBuffers); } void -HttpServerRequest::WriteResponse(HttpResponse HttpResponseCode, CbObject Data) +HttpServerRequest::WriteResponse(HttpResponseCode ResponseCode, CbObject Data) { SharedBuffer Buf = Data.GetBuffer(); std::array Buffers{IoBufferBuilder::MakeCloneFromMemory(Buf.GetData(), Buf.GetSize())}; - return WriteResponse(HttpResponseCode, HttpContentType::kCbObject, Buffers); + return WriteResponse(ResponseCode, HttpContentType::kCbObject, Buffers); } void -HttpServerRequest::WriteResponse(HttpResponse HttpResponseCode, HttpContentType ContentType, std::string_view ResponseString) +HttpServerRequest::WriteResponse(HttpResponseCode ResponseCode, HttpContentType ContentType, std::string_view ResponseString) { - return WriteResponse(HttpResponseCode, ContentType, std::u8string_view{(char8_t*)ResponseString.data(), ResponseString.size()}); + return WriteResponse(ResponseCode, ContentType, std::u8string_view{(char8_t*)ResponseString.data(), ResponseString.size()}); } void -HttpServerRequest::WriteResponse(HttpResponse HttpResponseCode, HttpContentType ContentType, IoBuffer Blob) +HttpServerRequest::WriteResponse(HttpResponseCode ResponseCode, HttpContentType ContentType, IoBuffer Blob) { std::array Buffers{Blob}; - return WriteResponse(HttpResponseCode, ContentType, Buffers); + return WriteResponse(ResponseCode, ContentType, Buffers); } HttpServerRequest::QueryParams @@ -298,19 +298,6 @@ HttpRequestRouter::RegisterRoute(const char* Regex, HttpRequestRouter::HandlerFu m_Handlers.emplace_back(ExpandedRegex.c_str(), SupportedVerbs, std::move(HandlerFunc), Regex); } -void -HttpRequestRouter::RegisterRoute(const char* Regex, PackageEndpointHandler& Handler) -{ - ExtendableStringBuilder<128> ExpandedRegex; - ProcessRegexSubstitutions(Regex, ExpandedRegex); - - m_Handlers.emplace_back( - ExpandedRegex.c_str(), - HttpVerb::kPost, - [&Handler](HttpRouterRequest& Request) { Handler.HandleRequest(Request); }, - Regex); -} - void HttpRequestRouter::ProcessRegexSubstitutions(const char* Regex, StringBuilderBase& OutExpandedRegex) { -- cgit v1.2.3