Fix DELETE macro issue on Windows

Author: lordgamez

core-framework/include/http/BaseHTTPClient.h

@@ -29,6 +29,31 @@
 #include "utils/ByteArrayCallback.h"
 #include "utils/gsl.h"
 
+namespace org::apache::nifi::minifi::http {
+enum class HttpRequestMethod {
+  Get, Post, Put, Patch, Delete, Connect, Head, Options, Trace
+};
+}  // namespace org::apache::nifi::minifi::http
+
+namespace magic_enum::customize {
+using HttpRequestMethod = org::apache::nifi::minifi::http::HttpRequestMethod;
+template<>
+constexpr customize_t enum_name<HttpRequestMethod>(HttpRequestMethod type) noexcept {
+  switch (type) {
+    case HttpRequestMethod::Get: return "GET";
+    case HttpRequestMethod::Post: return "POST";
+    case HttpRequestMethod::Put: return "PUT";
+    case HttpRequestMethod::Patch: return "PATCH";
+    case HttpRequestMethod::Delete: return "DELETE";
+    case HttpRequestMethod::Connect: return "CONNECT";
+    case HttpRequestMethod::Head: return "HEAD";
+    case HttpRequestMethod::Options: return "OPTIONS";
+    case HttpRequestMethod::Trace: return "TRACE";
+  }
+  return invalid_tag;
+}
+}  // namespace magic_enum::customize
+
 namespace org::apache::nifi::minifi::http {
 
 struct HTTPProxy {
@@ -177,12 +202,6 @@ namespace HTTPRequestResponse {
   int seek_callback(void *p, int64_t offset, int);
 }
 
-#undef DELETE  // this is a macro in winnt.h
-
-enum class HttpRequestMethod {
-  GET, POST, PUT, PATCH, DELETE, CONNECT, HEAD, OPTIONS, TRACE
-};
-
 class BaseHTTPClient {
  public:
   BaseHTTPClient() = default;

core-framework/src/http/BaseHTTPClient.cpp

@@ -66,7 +66,7 @@ std::string get_token(BaseHTTPClient* client, const std::string& username, const
 
   client->setContentType("application/x-www-form-urlencoded");
 
-  client->set_request_method(HttpRequestMethod::POST);
+  client->set_request_method(HttpRequestMethod::Post);
 
   std::string payload = "username=" + username + "&" + "password=" + password;
 

core-framework/src/http/HTTPClient.cpp

@@ -255,7 +255,7 @@ void HTTPClient::setReadCallback(std::unique_ptr<HTTPReadCallback> callback) {
 void HTTPClient::setUploadCallback(std::unique_ptr<HTTPUploadCallback> callback) {
   logger_->log_debug("Setting callback for {}", url_);
   write_callback_ = std::move(callback);
-  if (method_ == http::HttpRequestMethod::PUT) {
+  if (method_ == http::HttpRequestMethod::Put) {
     curl_easy_setopt(http_session_.get(), CURLOPT_INFILESIZE_LARGE, (curl_off_t) write_callback_->size());
   }
   curl_easy_setopt(http_session_.get(), CURLOPT_READFUNCTION, &HTTPRequestResponse::send_write);
@@ -412,19 +412,19 @@ void HTTPClient::set_request_method(http::HttpRequestMethod method) {
     return;
   method_ = method;
   switch (*method_) {
-    case http::HttpRequestMethod::POST:
+    case http::HttpRequestMethod::Post:
       curl_easy_setopt(http_session_.get(), CURLOPT_POST, 1L);
       curl_easy_setopt(http_session_.get(), CURLOPT_CUSTOMREQUEST, nullptr);
       break;
-    case http::HttpRequestMethod::HEAD:
+    case http::HttpRequestMethod::Head:
       curl_easy_setopt(http_session_.get(), CURLOPT_NOBODY, 1L);
       curl_easy_setopt(http_session_.get(), CURLOPT_CUSTOMREQUEST, nullptr);
       break;
-    case http::HttpRequestMethod::GET:
+    case http::HttpRequestMethod::Get:
       curl_easy_setopt(http_session_.get(), CURLOPT_HTTPGET, 1L);
       curl_easy_setopt(http_session_.get(), CURLOPT_CUSTOMREQUEST, nullptr);
       break;
-    case http::HttpRequestMethod::PUT:
+    case http::HttpRequestMethod::Put:
       curl_easy_setopt(http_session_.get(), CURLOPT_UPLOAD, 1L);
       curl_easy_setopt(http_session_.get(), CURLOPT_CUSTOMREQUEST, nullptr);
       break;