refactor: Refactor handleJson function parameters in NetworkManager code

- stop passing JsonVariant by ref
ZanzyTHEbar · Apr 6, 2024 · 46e6513 · 46e6513
1 parent 2541372
commit 46e6513
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/NetworkManager/examples/customHandlers.cpp b/NetworkManager/examples/customHandlers.cpp
@@ -51,7 +51,7 @@ void setupServer() {
     // made to /api/customJson
     async_server.server.addHandler(new AsyncCallbackJsonWebHandler(
         "/api/customJson",
-        [&](AsyncWebServerRequest* request, JsonVariant& json) {
+        [&](AsyncWebServerRequest* request, JsonVariant json) {
             JsonDocument doc;
             doc["hello"] = "world";
             doc["number"] = 42;

diff --git a/NetworkManager/examples/main.cpp b/NetworkManager/examples/main.cpp
@@ -136,7 +136,7 @@ void setupServer() {
 
     async_server.server.addHandler(new AsyncCallbackJsonWebHandler(
         "/api/customJson",
-        [&](AsyncWebServerRequest* request, JsonVariant& json) {
+        [&](AsyncWebServerRequest* request, JsonVariant json) {
             JsonDocument doc;
             doc["hello"] = "world";
             doc["number"] = 42;

diff --git a/NetworkManager/include/api/base_api.hpp b/NetworkManager/include/api/base_api.hpp
@@ -27,7 +27,7 @@ class BaseAPI : public API_Utilities {
     void save(AsyncWebServerRequest* request);
     void rssi(AsyncWebServerRequest* request);
 
-    void handleJson(AsyncWebServerRequest* request, JsonVariant& jsonData);
+    void handleJson(AsyncWebServerRequest* request, JsonVariant jsonData);
 
     using route_method = void (BaseAPI::*)(AsyncWebServerRequest*);
     using route_t = std::unordered_map<std::string, route_method>;

diff --git a/NetworkManager/src/api/base_api.cpp b/NetworkManager/src/api/base_api.cpp
@@ -111,8 +111,7 @@ void BaseAPI::setWiFiTXPower(AsyncWebServerRequest* request) {
     }
 }
 
-void BaseAPI::handleJson(AsyncWebServerRequest* request,
-                         JsonVariant& jsonData) {
+void BaseAPI::handleJson(AsyncWebServerRequest* request, JsonVariant jsonData) {
     switch (_networkMethodsMap_enum[request->method()]) {
         case POST: {
             auto jsonObj = jsonData.as<JsonObject>();

diff --git a/NetworkManager/src/api/rest_api_handler.cpp b/NetworkManager/src/api/rest_api_handler.cpp
@@ -6,7 +6,7 @@
 
 APIServer::APIServer(ProjectConfig& configManager, AsyncServer_t& async_server,
                      AsyncOTA* async_ota)
-    : BaseAPI(configManager), async_ota(nullptr), async_server(async_server) {
+    : BaseAPI(configManager), async_server(async_server), async_ota(nullptr) {
     if (async_ota != nullptr) {
         this->async_ota = async_ota;
     }
@@ -49,7 +49,7 @@ void APIServer::begin() {
 
     async_server.server.addHandler(new AsyncCallbackJsonWebHandler(
         json_url.c_str(),
-        [&](AsyncWebServerRequest* request, JsonVariant& json) {
+        [&](AsyncWebServerRequest* request, JsonVariant json) {
             handleJson(request, json);
         }));
 

diff --git a/NetworkManager/wokwi.toml b/NetworkManager/wokwi.toml
@@ -1,7 +1,7 @@
 [wokwi]
 version = 1
-elf = ".pio/build/esp32s3_debug/EasyNetworkManager-v5.4.0-esp32s3_debug-1b133b5-main.elf"
-firmware = ".pio/build/esp32s3_debug/EasyNetworkManager-v5.4.0-esp32s3_debug-1b133b5-main.bin"
+elf = ".pio/build/esp32s3_debug/EasyNetworkManager-v5.4.1-esp32s3_debug-2541372-main.elf"
+firmware = ".pio/build/esp32s3_debug/EasyNetworkManager-v5.4.1-esp32s3_debug-2541372-main.bin"
 [[net.forward]]
 from = "localhost:8180"
 to = "target:80"