From d074febe131dfb77dabc16b4ecf81bf846faceac Mon Sep 17 00:00:00 2001
From: pe-jot <oe5pjn@oevsv.at>
Date: Tue, 10 Sep 2024 21:21:03 +0200
Subject: [PATCH] Use JsonDocument instead of DynamicJsonDocument

---
 src/ConfigurationManagement/configuration.cpp | 4 ++--
 src/ConfigurationManagement/configuration.h   | 4 ++--
 src/TaskMQTT.cpp                              | 2 +-
 src/project_configuration.cpp                 | 4 ++--
 src/project_configuration.h                   | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/ConfigurationManagement/configuration.cpp b/src/ConfigurationManagement/configuration.cpp
index 6eff722..0cdb441 100644
--- a/src/ConfigurationManagement/configuration.cpp
+++ b/src/ConfigurationManagement/configuration.cpp
@@ -23,7 +23,7 @@ void ConfigurationManagement::readConfiguration(logging::Logger &logger, Configu
     logger.log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, MODULE_NAME, "Failed to open file for reading, using default configuration.");
     return;
   }
-  DynamicJsonDocument  data(2048);
+  JsonDocument  data;
   DeserializationError error = deserializeJson(data, file);
   if (error) {
     logger.log(logging::LoggerLevel::LOGGER_LEVEL_WARN, MODULE_NAME, "Failed to read file, using default configuration.");
@@ -44,7 +44,7 @@ void ConfigurationManagement::writeConfiguration(logging::Logger &logger, Config
     logger.log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, MODULE_NAME, "Failed to open file for writing...");
     return;
   }
-  DynamicJsonDocument data(2048);
+  JsonDocument data;
 
   writeProjectConfiguration(conf, data);
 
diff --git a/src/ConfigurationManagement/configuration.h b/src/ConfigurationManagement/configuration.h
index 4d988cb..d2b6608 100644
--- a/src/ConfigurationManagement/configuration.h
+++ b/src/ConfigurationManagement/configuration.h
@@ -22,8 +22,8 @@ public:
   void writeConfiguration(logging::Logger &logger, Configuration &conf);
 
 private:
-  virtual void readProjectConfiguration(DynamicJsonDocument &data, Configuration &conf)  = 0;
-  virtual void writeProjectConfiguration(Configuration &conf, DynamicJsonDocument &data) = 0;
+  virtual void readProjectConfiguration(JsonDocument &data, Configuration &conf)  = 0;
+  virtual void writeProjectConfiguration(Configuration &conf, JsonDocument &data) = 0;
 
   const String mFilePath;
 };
diff --git a/src/TaskMQTT.cpp b/src/TaskMQTT.cpp
index 1509aca..b6393ba 100644
--- a/src/TaskMQTT.cpp
+++ b/src/TaskMQTT.cpp
@@ -29,7 +29,7 @@ bool MQTTTask::loop(System &system) {
   if (!_toMQTT.empty()) {
     std::shared_ptr<APRSMessage> msg = _toMQTT.getElement();
 
-    DynamicJsonDocument data(1024);
+    JsonDocument data;
     data["source"]      = msg->getSource();
     data["destination"] = msg->getDestination();
     data["path"]        = msg->getPath();
diff --git a/src/project_configuration.cpp b/src/project_configuration.cpp
index 592b482..d473728 100644
--- a/src/project_configuration.cpp
+++ b/src/project_configuration.cpp
@@ -4,7 +4,7 @@
 
 #include "project_configuration.h"
 
-void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocument &data, Configuration &conf) {
+void ProjectConfigurationManagement::readProjectConfiguration(JsonDocument &data, Configuration &conf) {
   if (data.containsKey("callsign"))
     conf.callsign = data["callsign"].as<String>();
 
@@ -119,7 +119,7 @@ void ProjectConfigurationManagement::readProjectConfiguration(DynamicJsonDocumen
     conf.board = data["board"].as<String>();
 }
 
-void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &conf, DynamicJsonDocument &data) {
+void ProjectConfigurationManagement::writeProjectConfiguration(Configuration &conf, JsonDocument &data) {
   data["callsign"] = conf.callsign;
 
   if (!conf.network.DHCP) {
diff --git a/src/project_configuration.h b/src/project_configuration.h
index de0d383..f153f1b 100644
--- a/src/project_configuration.h
+++ b/src/project_configuration.h
@@ -176,8 +176,8 @@ public:
   }
 
 private:
-  virtual void readProjectConfiguration(DynamicJsonDocument &data, Configuration &conf) override;
-  virtual void writeProjectConfiguration(Configuration &conf, DynamicJsonDocument &data) override;
+  virtual void readProjectConfiguration(JsonDocument &data, Configuration &conf) override;
+  virtual void writeProjectConfiguration(Configuration &conf, JsonDocument &data) override;
 };
 
 #endif