HttpResponse enum -> HttpResponseCode

Also removed initial CbPackage API HttpServer changes as I have decided to take a different approach

1 files changed, 8 insertions, 34 deletions

diff --git a/zenhttp/include/zenhttp/httpserver.h b/zenhttp/include/zenhttp/httpserver.h
index 24ba615f3..4267903ae 100644
--- a/zenhttp/include/zenhttp/httpserver.h
+++ b/zenhttp/include/zenhttp/httpserver.h
@@ -40,7 +40,7 @@ enum class HttpVerb
 
 gsl_DEFINE_ENUM_BITMASK_OPERATORS(HttpVerb);
 
-enum class HttpResponse
+enum class HttpResponseCode
 {
 	// 1xx - Informational
 
@@ -239,14 +239,14 @@ public:
 		Note that this is destructive in the sense that the IoBuffer instances referred to by Blobs will be
 		moved into our response handler array where they are kept alive, in order to reduce ref-counting storms
 	  */
-	virtual void WriteResponse(HttpResponse HttpResponseCode, HttpContentType ContentType, std::span<IoBuffer> Blobs)		  = 0;
-	virtual void WriteResponse(HttpResponse HttpResponseCode)																  = 0;
-	virtual void WriteResponse(HttpResponse HttpResponseCode, HttpContentType ContentType, std::u8string_view ResponseString) = 0;
+	virtual void WriteResponse(HttpResponseCode ResponseCode, HttpContentType ContentType, std::span<IoBuffer> Blobs)		  = 0;
+	virtual void WriteResponse(HttpResponseCode ResponseCode)																  = 0;
+	virtual void WriteResponse(HttpResponseCode ResponseCode, HttpContentType ContentType, std::u8string_view ResponseString) = 0;
 
-	void WriteResponse(HttpResponse HttpResponseCode, CbObject Data);
-	void WriteResponse(HttpResponse HttpResponseCode, CbPackage Package);
-	void WriteResponse(HttpResponse HttpResponseCode, HttpContentType ContentType, std::string_view ResponseString);
-	void WriteResponse(HttpResponse HttpResponseCode, HttpContentType ContentType, IoBuffer Blob);
+	void WriteResponse(HttpResponseCode ResponseCode, CbObject Data);
+	void WriteResponse(HttpResponseCode ResponseCode, CbPackage Package);
+	void WriteResponse(HttpResponseCode ResponseCode, HttpContentType ContentType, std::string_view ResponseString);
+	void WriteResponse(HttpResponseCode ResponseCode, HttpContentType ContentType, IoBuffer Blob);
 
 protected:
 	bool						 m_IsHandled	 = false;
@@ -339,25 +339,6 @@ HttpRouterRequest::GetCapture(uint32_t Index) const
 	return m_Match[Index];
 }
 
-//////////////////////////////////////////////////////////////////////////
-
-class PackageRequestContext
-{
-public:
-	PackageRequestContext();
-	~PackageRequestContext();
-
-private:
-};
-
-class PackageEndpointHandler
-{
-public:
-	virtual void HandleRequest(HttpRouterRequest& Request) = 0;
-
-private:
-};
-
 /** HTTP request router helper
  *
  * This helper class allows a service implementer to register one or more
@@ -388,13 +369,6 @@ public:
 	 * @param SupportedVerbs Supported HTTP verbs for this handler
 	 */
 	void RegisterRoute(const char* Regex, HandlerFunc_t&& HandlerFunc, HttpVerb SupportedVerbs);
-	/**
-	 * @brief Register CbPackage endpoint handler
-	 * @param Regex Regular expression used to match the handler to a request. This may
-	 *		  contain pattern aliases registered via AddPattern
-	 * @param Handler Package handler instance
-	 */
-	void RegisterRoute(const char* Regex, PackageEndpointHandler& Handler);
 
 	void ProcessRegexSubstitutions(const char* Regex, StringBuilderBase& ExpandedRegex);