Upgrades ArduinoJson from version 6 to 7

2024-05-07 10:36:16 +02:00
parent 2b4d196e7c
commit a150caad9d
39 changed files with 241 additions and 561 deletions
@@ -15,58 +15,55 @@
 *   the terms of the LGPL v3 license. See the LICENSE file for details.
 **/

-#include <StatefulService.h>
 #include <FS.h>
+#include <StatefulService.h>

 template <class T>
-class FSPersistence
-{
-public:
+class FSPersistence {
+   public:
    FSPersistence(JsonStateReader<T> stateReader,
                  JsonStateUpdater<T> stateUpdater,
-                  StatefulService<T> *statefulService,
-                  FS *fs,
-                  const char *filePath,
-                  size_t bufferSize = DEFAULT_BUFFER_SIZE) : _stateReader(stateReader),
-                                                             _stateUpdater(stateUpdater),
-                                                             _statefulService(statefulService),
-                                                             _fs(fs),
-                                                             _filePath(filePath),
-                                                             _bufferSize(bufferSize),
-                                                             _updateHandlerId(0)
-    {
+                  StatefulService<T> *statefulService, FS *fs,
+                  const char *filePath)
+        : _stateReader(stateReader),
+          _stateUpdater(stateUpdater),
+          _statefulService(statefulService),
+          _fs(fs),
+          _filePath(filePath),
+          _updateHandlerId(0) {
        enableUpdateHandler();
    }

-    void readFromFS()
-    {
+    void readFromFS() {
        File settingsFile = _fs->open(_filePath, "r");

-        if (settingsFile)
-        {
-            DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
-            DeserializationError error = deserializeJson(jsonDocument, settingsFile);
-            if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>())
-            {
+        if (settingsFile) {
+            JsonDocument jsonDocument;
+            DeserializationError error =
+                deserializeJson(jsonDocument, settingsFile);
+            if (error == DeserializationError::Ok &&
+                jsonDocument.is<JsonObject>()) {
                JsonObject jsonObject = jsonDocument.as<JsonObject>();
-                _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
+                _statefulService->updateWithoutPropagation(jsonObject,
+                                                           _stateUpdater);
                settingsFile.close();
                return;
            }
            settingsFile.close();
        }

-        // If we reach here we have not been successful in loading the config and hard-coded defaults are now applied.
-        // The settings are then written back to the file system so the defaults persist between resets. This last step is
-        // required as in some cases defaults contain randomly generated values which would otherwise be modified on reset.
+        // If we reach here we have not been successful in loading the config
+        // and hard-coded defaults are now applied. The settings are then
+        // written back to the file system so the defaults persist between
+        // resets. This last step is required as in some cases defaults contain
+        // randomly generated values which would otherwise be modified on reset.
        applyDefaults();
        writeToFS();
    }

-    bool writeToFS()
-    {
+    bool writeToFS() {
        // create and populate a new json object
-        DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
+        JsonDocument jsonDocument;
        JsonObject jsonObject = jsonDocument.to<JsonObject>();
        _statefulService->read(jsonObject, _stateReader);

@@ -77,8 +74,7 @@ public:
        File settingsFile = _fs->open(_filePath, "w");

        // failed to open file, return false
-        if (!settingsFile)
-        {
+        if (!settingsFile) {
            return false;
        }

@@ -88,25 +84,21 @@ public:
        return true;
    }

-    void disableUpdateHandler()
-    {
-        if (_updateHandlerId)
-        {
+    void disableUpdateHandler() {
+        if (_updateHandlerId) {
            _statefulService->removeUpdateHandler(_updateHandlerId);
            _updateHandlerId = 0;
        }
    }

-    void enableUpdateHandler()
-    {
-        if (!_updateHandlerId)
-        {
-            _updateHandlerId = _statefulService->addUpdateHandler([&](const String &originId)
-                                                                  { writeToFS(); });
+    void enableUpdateHandler() {
+        if (!_updateHandlerId) {
+            _updateHandlerId = _statefulService->addUpdateHandler(
+                [&](const String &originId) { writeToFS(); });
        }
    }

-private:
+   private:
    JsonStateReader<T> _stateReader;
    JsonStateUpdater<T> _stateUpdater;
    StatefulService<T> *_statefulService;
@@ -115,31 +107,28 @@ private:
    size_t _bufferSize;
    update_handler_id_t _updateHandlerId;

-    // We assume we have a _filePath with format "/directory1/directory2/filename"
-    // We create a directory for each missing parent
-    void mkdirs()
-    {
+    // We assume we have a _filePath with format
+    // "/directory1/directory2/filename" We create a directory for each missing
+    // parent
+    void mkdirs() {
        String path(_filePath);
        int index = 0;
-        while ((index = path.indexOf('/', index + 1)) != -1)
-        {
+        while ((index = path.indexOf('/', index + 1)) != -1) {
            String segment = path.substring(0, index);
-            if (!_fs->exists(segment))
-            {
+            if (!_fs->exists(segment)) {
                _fs->mkdir(segment);
            }
        }
    }

-protected:
+   protected:
    // We assume the updater supplies sensible defaults if an empty object
    // is supplied, this virtual function allows that to be changed.
-    virtual void applyDefaults()
-    {
-        DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
+    virtual void applyDefaults() {
+        JsonDocument jsonDocument;
        JsonObject jsonObject = jsonDocument.as<JsonObject>();
        _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
    }
 };

-#endif // end FSPersistence
+#endif  // end FSPersistence