Some code cleanups

Author: mathieucarbou

examples/HTTPMethodsWithArduino/HTTPMethodsWithArduino.ino

@@ -101,16 +101,16 @@ void setup() {
 
   server.begin();
 
-  WebRequestMethodComposite composite1 = WebRequestMethod::HTTP_GET | WebRequestMethod::HTTP_POST;
-  WebRequestMethodComposite composite2 = WebRequestMethod::HTTP_GET | WebRequestMethod::HTTP_POST;
-  WebRequestMethodComposite composite3 = WebRequestMethod::HTTP_HEAD | WebRequestMethod::HTTP_OPTIONS;
+  WebRequestMethodComposite composite1 = AsyncWebRequestMethod::HTTP_GET | AsyncWebRequestMethod::HTTP_POST;
+  WebRequestMethodComposite composite2 = AsyncWebRequestMethod::HTTP_GET | AsyncWebRequestMethod::HTTP_POST;
+  WebRequestMethodComposite composite3 = AsyncWebRequestMethod::HTTP_HEAD | AsyncWebRequestMethod::HTTP_OPTIONS;
   WebRequestMethodComposite composite4 = composite3;
-  WebRequestMethodComposite composite5 = WebRequestMethod::HTTP_GET;
+  WebRequestMethodComposite composite5 = AsyncWebRequestMethod::HTTP_GET;
 
-  assert(composite1.matches(WebRequestMethod::HTTP_GET));
-  assert(composite1.matches(WebRequestMethod::HTTP_POST));
-  assert(!composite1.matches(WebRequestMethod::HTTP_HEAD));
-  assert(!composite3.matches(WebRequestMethod::HTTP_GET));
+  assert(composite1.matches(AsyncWebRequestMethod::HTTP_GET));
+  assert(composite1.matches(AsyncWebRequestMethod::HTTP_POST));
+  assert(!composite1.matches(AsyncWebRequestMethod::HTTP_HEAD));
+  assert(!composite3.matches(AsyncWebRequestMethod::HTTP_GET));
 
   assert(composite1 == composite2);
   assert(composite3 == composite4);

examples/HTTPMethodsWithESPIDF/HTTPMethodsWithESPIDF.ino

@@ -104,16 +104,16 @@ void setup() {
 
   server.begin();
 
-  WebRequestMethodComposite composite1 = WebRequestMethod::HTTP_GET | WebRequestMethod::HTTP_POST;
-  WebRequestMethodComposite composite2 = WebRequestMethod::HTTP_GET | WebRequestMethod::HTTP_POST;
-  WebRequestMethodComposite composite3 = WebRequestMethod::HTTP_HEAD | WebRequestMethod::HTTP_OPTIONS;
+  WebRequestMethodComposite composite1 = AsyncWebRequestMethod::HTTP_GET | AsyncWebRequestMethod::HTTP_POST;
+  WebRequestMethodComposite composite2 = AsyncWebRequestMethod::HTTP_GET | AsyncWebRequestMethod::HTTP_POST;
+  WebRequestMethodComposite composite3 = AsyncWebRequestMethod::HTTP_HEAD | AsyncWebRequestMethod::HTTP_OPTIONS;
   WebRequestMethodComposite composite4 = composite3;
-  WebRequestMethodComposite composite5 = WebRequestMethod::HTTP_GET;
+  WebRequestMethodComposite composite5 = AsyncWebRequestMethod::HTTP_GET;
 
-  assert(composite1.matches(WebRequestMethod::HTTP_GET));
-  assert(composite1.matches(WebRequestMethod::HTTP_POST));
-  assert(!composite1.matches(WebRequestMethod::HTTP_HEAD));
-  assert(!composite3.matches(WebRequestMethod::HTTP_GET));
+  assert(composite1.matches(AsyncWebRequestMethod::HTTP_GET));
+  assert(composite1.matches(AsyncWebRequestMethod::HTTP_POST));
+  assert(!composite1.matches(AsyncWebRequestMethod::HTTP_HEAD));
+  assert(!composite3.matches(AsyncWebRequestMethod::HTTP_GET));
 
   assert(composite1 == composite2);
   assert(composite3 == composite4);

src/AsyncJson.h

@@ -6,6 +6,8 @@
 #include <ESPAsyncWebServer.h>
 #include "ChunkPrint.h"
 
+#include <utility>
+
 #if ASYNC_JSON_SUPPORT == 1
 
 #if ARDUINOJSON_VERSION_MAJOR == 6
@@ -104,7 +106,7 @@ class AsyncCallbackJsonWebHandler : public AsyncWebHandler {
 #endif
 
   void setMethod(WebRequestMethodComposite method) {
-    _method = method;
+    _method = std::move(method);
   }
   void setMaxContentLength(int maxContentLength) {
     _maxContentLength = maxContentLength;

src/ESPAsyncWebServer.h

@@ -154,19 +154,37 @@ class WebRequestMethodComposite {
   constexpr WebRequestMethodComposite(uint32_t m) : mask(m){};
 
 public:
+  WebRequestMethodComposite(const WebRequestMethodComposite &other) = default;
+  WebRequestMethodComposite(WebRequestMethodComposite &&other) = default;
+
   // Constructor: allows implicit conversion from WebRequestMethod
   constexpr WebRequestMethodComposite(WebRequestMethod m) : mask(static_cast<uint32_t>(m)){};
 
   // Combine composites
-  constexpr inline WebRequestMethodComposite operator|(WebRequestMethodComposite r) const {
+  constexpr inline WebRequestMethodComposite operator|(const WebRequestMethodComposite &r) const {
     return WebRequestMethodComposite(mask | r.mask);
   };
 
+  WebRequestMethodComposite &operator=(const WebRequestMethodComposite &r) {
+    mask = r.mask;
+    return *this;
+  }
+
+  WebRequestMethodComposite &operator=(WebRequestMethodComposite &&r) {
+    mask = r.mask;
+    r.mask = 0;
+    return *this;
+  }
+
   // == operator for composite
-  constexpr inline bool operator==(WebRequestMethodComposite r) const {
+  constexpr inline bool operator==(const WebRequestMethodComposite &r) const {
     return mask == r.mask;
   };
 
+  constexpr inline bool operator!=(const WebRequestMethodComposite &r) const {
+    return mask != r.mask;
+  };
+
   // Check for a match
   constexpr inline bool matches(WebRequestMethod m) const {
     return mask & static_cast<uint32_t>(m);

src/WebHandlerImpl.h

@@ -7,6 +7,7 @@
 #include <time.h>
 
 #include <string>
+#include <utility>
 
 class AsyncStaticWebHandler : public AsyncWebHandler {
   using File = fs::File;
@@ -65,7 +66,7 @@ class AsyncCallbackWebHandler : public AsyncWebHandler {
   AsyncCallbackWebHandler() : _uri(), _method(AsyncWebRequestMethod::HTTP_ALL), _onRequest(NULL), _onUpload(NULL), _onBody(NULL), _isRegex(false) {}
   void setUri(AsyncURIMatcher uri);
   void setMethod(WebRequestMethodComposite method) {
-    _method = method;
+    _method = std::move(method);
   }
   void onRequest(ArRequestHandlerFunction fn) {
     _onRequest = fn;

src/WebServer.cpp

@@ -158,7 +158,7 @@ AsyncCallbackWebHandler &AsyncWebServer::on(
 ) {
   AsyncCallbackWebHandler *handler = new AsyncCallbackWebHandler();
   handler->setUri(std::move(uri));
-  handler->setMethod(method);
+  handler->setMethod(std::move(method));
   handler->onRequest(onRequest);
   handler->onUpload(onUpload);
   handler->onBody(onBody);
@@ -169,7 +169,7 @@ AsyncCallbackWebHandler &AsyncWebServer::on(
 #if ASYNC_JSON_SUPPORT == 1
 AsyncCallbackJsonWebHandler &AsyncWebServer::on(AsyncURIMatcher uri, WebRequestMethodComposite method, ArJsonRequestHandlerFunction onBody) {
   AsyncCallbackJsonWebHandler *handler = new AsyncCallbackJsonWebHandler(std::move(uri), onBody);
-  handler->setMethod(method);
+  handler->setMethod(std::move(method));
   addHandler(handler);
   return *handler;
 }