Move global utility methods in asyncsrv namespace to avoid conflict with existing usr code

Author: mathieucarbou

examples/HTTPMethods/HTTPMethods.ino

@@ -27,6 +27,11 @@
 
 static AsyncWebServer server(80);
 
+// user defined functions that turns out to have similar signatures to the ones in global header
+int stringToMethod(const String &) { return 0; }
+const char *methodToString(WebRequestMethod) { return "METHOD"; }
+bool methodMatches(WebRequestMethodComposite c, WebRequestMethod m) { return false; };
+
 void setup() {
   Serial.begin(115200);
 

src/AsyncJson.cpp

@@ -124,7 +124,7 @@ AsyncCallbackJsonWebHandler::AsyncCallbackJsonWebHandler(AsyncURIMatcher uri, Ar
 #endif
 
 bool AsyncCallbackJsonWebHandler::canHandle(AsyncWebServerRequest *request) const {
-  if (!_onRequest || !request->isHTTP() || !methodMatches(_method, request->method())) {
+  if (!_onRequest || !request->isHTTP() || !asyncsrv::methodMatches(_method, request->method())) {
     return false;
   }
 

src/ESPAsyncWebServer.h

@@ -172,13 +172,17 @@ constexpr inline WebRequestMethodComposite operator|(WebRequestMethodComposite l
 constexpr inline WebRequestMethodComposite operator|(WebRequestMethod l, WebRequestMethod r) {
   return static_cast<WebRequestMethodComposite>(l) | r;
 };
+
+namespace asyncsrv {
+// utility method to check if a WebRequestMethod matches a WebRequestMethodComposite
 constexpr inline bool methodMatches(WebRequestMethodComposite c, WebRequestMethod m) {
   return c & static_cast<WebRequestMethodComposite>(m);
 };
 
 // WebRequestMethod string conversion functions
 WebRequestMethod stringToMethod(const String &);
 const char *methodToString(WebRequestMethod);
+} // namespace asyncsrv
 
 #if !defined(ASYNCWEBSERVER_NO_GLOBAL_HTTP_METHODS)
 // Import the method enum values to the global namespace
@@ -443,7 +447,7 @@ class AsyncWebServerRequest {
   }
 
   inline const char *methodToString() const {
-    return ::methodToString(_method);
+    return asyncsrv::methodToString(_method);
   };
   const char *requestedConnTypeToString() const;
 

src/WebHandlers.cpp

@@ -300,7 +300,7 @@ void AsyncCallbackWebHandler::setUri(AsyncURIMatcher uri) {
 }
 
 bool AsyncCallbackWebHandler::canHandle(AsyncWebServerRequest *request) const {
-  if (!_onRequest || !request->isHTTP() || !methodMatches(_method, request->method())) {
+  if (!_onRequest || !request->isHTTP() || !asyncsrv::methodMatches(_method, request->method())) {
     return false;
   }
   return _uri.matches(request);

src/WebRequest.cpp

@@ -314,7 +314,7 @@ bool AsyncWebServerRequest::_parseReqHead() {
   String u = _temp.substring(m.length() + 1, index);
   _temp = _temp.substring(index + 1);
 
-  _method = stringToMethod(m);
+  _method = asyncsrv::stringToMethod(m);
   if (_method == HTTP_INVALID) {
     return false;
   }
@@ -1306,6 +1306,7 @@ AsyncClient *AsyncWebServerRequest::clientRelease() {
   return c;
 }
 
+namespace asyncsrv {
 // WebRequestMethod conversions
 WebRequestMethod stringToMethod(const String &m) {
   if (m == T_GET) {
@@ -1395,3 +1396,4 @@ const char *methodToString(WebRequestMethod method) {
     default:                                    return T_UNKNOWN;
   }
 }
+} // namespace asyncsrv