de-dupe define names

remove unused defines

Author: rjwats

lib/framework/MQTTSettingsService.h

@@ -10,9 +10,6 @@
 #define MQTT_SETTINGS_FILE "/config/mqttSettings.json"
 #define MQTT_SETTINGS_SERVICE_PATH "/rest/mqttSettings"
 
-#define MAX_MQTT_STATUS_SIZE 1024
-#define MQTT_STATUS_SERVICE_PATH "/rest/mqttStatus"
-
 #define MQTT_SETTINGS_SERVICE_DEFAULT_ENABLED false
 #define MQTT_SETTINGS_SERVICE_DEFAULT_HOST "test.mosquitto.org"
 #define MQTT_SETTINGS_SERVICE_DEFAULT_PORT 1883

lib/framework/SettingsBroker.h

@@ -6,7 +6,7 @@
 #include <SettingsDeserializer.h>
 #include <AsyncMqttClient.h>
 
-#define MAX_SETTINGS_SIZE 1024
+#define MAX_MESSAGE_SIZE 1024
 #define SETTINGS_BROKER_ORIGIN_ID "broker"
 
 /**
@@ -70,7 +70,7 @@ class SettingsBroker {
   void publish() {
     if (_stateTopic.length() > 0 && _mqttClient->connected()) {
       // serialize to json doc
-      DynamicJsonDocument json(MAX_SETTINGS_SIZE);
+      DynamicJsonDocument json(MAX_MESSAGE_SIZE);
       _settingsService->read([&](T& settings) { _settingsSerializer->serialize(settings, json.to<JsonObject>()); });
 
       // serialize to string
@@ -94,7 +94,7 @@ class SettingsBroker {
     }
 
     // deserialize from string
-    DynamicJsonDocument json(MAX_SETTINGS_SIZE);
+    DynamicJsonDocument json(MAX_MESSAGE_SIZE);
     DeserializationError error = deserializeJson(json, payload, len);
     if (!error && json.is<JsonObject>()) {
       _settingsService->update(

lib/framework/SettingsEndpoint.h

@@ -11,7 +11,7 @@
 #include <SettingsSerializer.h>
 #include <SettingsDeserializer.h>
 
-#define MAX_SETTINGS_SIZE 1024
+#define MAX_CONTENT_LENGTH 1024
 #define SETTINGS_ENDPOINT_ORIGIN_ID "endpoint"
 
 template <class T>
@@ -37,7 +37,7 @@ class SettingsEndpoint {
                securityManager->wrapRequest(std::bind(&SettingsEndpoint::fetchSettings, this, std::placeholders::_1),
                                             authenticationPredicate));
     _updateHandler.setMethod(HTTP_POST);
-    _updateHandler.setMaxContentLength(MAX_SETTINGS_SIZE);
+    _updateHandler.setMaxContentLength(MAX_CONTENT_LENGTH);
     server->addHandler(&_updateHandler);
   }
 
@@ -53,7 +53,7 @@ class SettingsEndpoint {
                      std::bind(&SettingsEndpoint::updateSettings, this, std::placeholders::_1, std::placeholders::_2)) {
     server->on(servicePath.c_str(), HTTP_GET, std::bind(&SettingsEndpoint::fetchSettings, this, std::placeholders::_1));
     _updateHandler.setMethod(HTTP_POST);
-    _updateHandler.setMaxContentLength(MAX_SETTINGS_SIZE);
+    _updateHandler.setMaxContentLength(MAX_CONTENT_LENGTH);
     server->addHandler(&_updateHandler);
   }
 
@@ -64,7 +64,7 @@ class SettingsEndpoint {
   AsyncCallbackJsonWebHandler _updateHandler;
 
   void fetchSettings(AsyncWebServerRequest* request) {
-    AsyncJsonResponse* response = new AsyncJsonResponse(false, MAX_SETTINGS_SIZE);
+    AsyncJsonResponse* response = new AsyncJsonResponse(false, MAX_CONTENT_LENGTH);
     _settingsService->read(
         [&](T& settings) { _settingsSerializer->serialize(settings, response->getRoot().to<JsonObject>()); });
     response->setLength();
@@ -73,7 +73,7 @@ class SettingsEndpoint {
 
   void updateSettings(AsyncWebServerRequest* request, JsonVariant& json) {
     if (json.is<JsonObject>()) {
-      AsyncJsonResponse* response = new AsyncJsonResponse(false, MAX_SETTINGS_SIZE);
+      AsyncJsonResponse* response = new AsyncJsonResponse(false, MAX_CONTENT_LENGTH);
 
       // use callback to update the settings once the response is complete
       request->onDisconnect([this]() { _settingsService->callUpdateHandlers(SETTINGS_ENDPOINT_ORIGIN_ID); });

lib/framework/SettingsPersistence.h

@@ -6,7 +6,7 @@
 #include <SettingsDeserializer.h>
 #include <FS.h>
 
-#define MAX_SETTINGS_SIZE 1024
+#define MAX_FILE_SIZE 1024
 
 /**
  * SettingsPersistance takes care of loading and saving settings when they change.
@@ -34,8 +34,8 @@ class SettingsPersistence {
     File settingsFile = _fs->open(_filePath, "r");
 
     if (settingsFile) {
-      if (settingsFile.size() <= MAX_SETTINGS_SIZE) {
-        DynamicJsonDocument jsonDocument = DynamicJsonDocument(MAX_SETTINGS_SIZE);
+      if (settingsFile.size() <= MAX_FILE_SIZE) {
+        DynamicJsonDocument jsonDocument = DynamicJsonDocument(MAX_FILE_SIZE);
         DeserializationError error = deserializeJson(jsonDocument, settingsFile);
         if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) {
           readSettings(jsonDocument.as<JsonObject>());
@@ -53,7 +53,7 @@ class SettingsPersistence {
 
   bool writeToFS() {
     // create and populate a new json object
-    DynamicJsonDocument jsonDocument = DynamicJsonDocument(MAX_SETTINGS_SIZE);
+    DynamicJsonDocument jsonDocument = DynamicJsonDocument(MAX_FILE_SIZE);
     _settingsService->read(
         [&](T& settings) { _settingsSerializer->serialize(settings, jsonDocument.to<JsonObject>()); });
 
@@ -101,7 +101,7 @@ class SettingsPersistence {
   // We assume the readFromJsonObject supplies sensible defaults if an empty object
   // is supplied, this virtual function allows that to be changed.
   virtual void readDefaults() {
-    DynamicJsonDocument jsonDocument = DynamicJsonDocument(MAX_SETTINGS_SIZE);
+    DynamicJsonDocument jsonDocument = DynamicJsonDocument(MAX_FILE_SIZE);
     readSettings(jsonDocument.to<JsonObject>());
   }
 };

lib/framework/SettingsSocket.h

@@ -6,7 +6,7 @@
 #include <SettingsDeserializer.h>
 #include <ESPAsyncWebServer.h>
 
-#define MAX_SIMPLE_MSG_SIZE 1024
+#define MAX_SETTINGS_SOCKET_MSG_SIZE 1024
 
 #define SETTINGS_SOCKET_CLIENT_ID_MSG_SIZE 128
 #define SETTINGS_SOCKET_ORIGIN "socket"
@@ -67,7 +67,7 @@ class SettingsSocket {
       AwsFrameInfo* info = (AwsFrameInfo*)arg;
       if (info->final && info->index == 0 && info->len == len) {
         if (info->opcode == WS_TEXT) {
-          DynamicJsonDocument jsonDocument = DynamicJsonDocument(MAX_SIMPLE_MSG_SIZE);
+          DynamicJsonDocument jsonDocument = DynamicJsonDocument(MAX_SETTINGS_SOCKET_MSG_SIZE);
           DeserializationError error = deserializeJson(jsonDocument, (char*)data);
           if (!error && jsonDocument.is<JsonObject>()) {
             _settingsService->update(
@@ -104,7 +104,7 @@ class SettingsSocket {
    * simplifies the client and the server implementation but may not be sufficent for all use-cases.
    */
   void transmitData(AsyncWebSocketClient* client, String originId) {
-    DynamicJsonDocument jsonDocument = DynamicJsonDocument(MAX_SIMPLE_MSG_SIZE);
+    DynamicJsonDocument jsonDocument = DynamicJsonDocument(MAX_SETTINGS_SOCKET_MSG_SIZE);
     JsonObject root = jsonDocument.to<JsonObject>();
     root["type"] = "payload";
     root["origin_id"] = originId;