From fd34e77e82ed5389fffcd0a8a2e3e499b669f7c4 Mon Sep 17 00:00:00 2001 From: matth-x <63792403+matth-x@users.noreply.github.com> Date: Mon, 5 Aug 2024 13:23:37 +0200 Subject: [PATCH 1/4] move Request factory functions into Request.h/cpp --- CMakeLists.txt | 1 - src/MicroOcpp.cpp | 2 +- src/MicroOcpp/Core/Request.cpp | 15 +++++++++++++ src/MicroOcpp/Core/Request.h | 6 ++++++ src/MicroOcpp/Core/RequestQueue.cpp | 1 - src/MicroOcpp/Core/SimpleRequestFactory.cpp | 21 ------------------- src/MicroOcpp/Core/SimpleRequestFactory.h | 20 ------------------ .../Authorization/AuthorizationService.cpp | 2 +- src/MicroOcpp/Model/Boot/BootService.cpp | 2 +- .../Model/ConnectorBase/Connector.cpp | 2 +- .../Model/Diagnostics/DiagnosticsService.cpp | 2 +- .../FirmwareManagement/FirmwareService.cpp | 2 +- .../Model/Heartbeat/HeartbeatService.cpp | 2 +- .../Model/Metering/MeteringService.cpp | 2 +- src/MicroOcpp/Model/Reset/ResetService.cpp | 2 +- .../Model/Transactions/TransactionService.cpp | 1 - .../Model/Variables/VariableService.cpp | 2 +- src/MicroOcpp/Operations/TriggerMessage.cpp | 2 +- tests/Api.cpp | 1 - tests/Certificates.cpp | 1 - tests/ChargePointError.cpp | 1 - tests/ChargingSessions.cpp | 1 - tests/Configuration.cpp | 1 - tests/FirmwareManagement.cpp | 1 - tests/LocalAuthList.cpp | 1 - tests/Metering.cpp | 1 - tests/Reservation.cpp | 1 - tests/Reset.cpp | 1 - tests/SmartCharging.cpp | 1 - tests/TransactionSafety.cpp | 1 - tests/Transactions.cpp | 1 - tests/Variables.cpp | 1 - 32 files changed, 32 insertions(+), 69 deletions(-) delete mode 100644 src/MicroOcpp/Core/SimpleRequestFactory.cpp delete mode 100644 src/MicroOcpp/Core/SimpleRequestFactory.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 8036f3fa..f86ebf25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,6 @@ set(MO_SRC src/MicroOcpp/Operations/UpdateFirmware.cpp src/MicroOcpp/Debug.cpp src/MicroOcpp/Platform.cpp - src/MicroOcpp/Core/SimpleRequestFactory.cpp src/MicroOcpp/Core/OperationRegistry.cpp src/MicroOcpp/Model/Authorization/AuthorizationData.cpp src/MicroOcpp/Model/Authorization/AuthorizationList.cpp diff --git a/src/MicroOcpp.cpp b/src/MicroOcpp.cpp index bfde4634..73231056 100644 --- a/src/MicroOcpp.cpp +++ b/src/MicroOcpp.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/MicroOcpp/Core/Request.cpp b/src/MicroOcpp/Core/Request.cpp index a2cad9b8..a9d63677 100644 --- a/src/MicroOcpp/Core/Request.cpp +++ b/src/MicroOcpp/Core/Request.cpp @@ -286,3 +286,18 @@ void Request::setRequestSent() { bool Request::isRequestSent() { return requestSent; } + +namespace MicroOcpp { + +std::unique_ptr makeRequest(std::unique_ptr operation){ + if (operation == nullptr) { + return nullptr; + } + return std::unique_ptr(new Request(std::move(operation))); +} + +std::unique_ptr makeRequest(Operation *operation) { + return makeRequest(std::unique_ptr(operation)); +} + +} //end namespace MicroOcpp diff --git a/src/MicroOcpp/Core/Request.h b/src/MicroOcpp/Core/Request.h index 300d0d79..fde0eb91 100644 --- a/src/MicroOcpp/Core/Request.h +++ b/src/MicroOcpp/Core/Request.h @@ -116,6 +116,12 @@ class Request { bool isRequestSent(); }; +/* + * Simple factory functions + */ +std::unique_ptr makeRequest(std::unique_ptr op); +std::unique_ptr makeRequest(Operation *op); //takes ownership of op + } //end namespace MicroOcpp #endif diff --git a/src/MicroOcpp/Core/RequestQueue.cpp b/src/MicroOcpp/Core/RequestQueue.cpp index 8f8cc3cb..5f9722c2 100644 --- a/src/MicroOcpp/Core/RequestQueue.cpp +++ b/src/MicroOcpp/Core/RequestQueue.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/src/MicroOcpp/Core/SimpleRequestFactory.cpp b/src/MicroOcpp/Core/SimpleRequestFactory.cpp deleted file mode 100644 index dc0f38c2..00000000 --- a/src/MicroOcpp/Core/SimpleRequestFactory.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// matth-x/MicroOcpp -// Copyright Matthias Akstaller 2019 - 2024 -// MIT License - -#include -#include - -namespace MicroOcpp { - -std::unique_ptr makeRequest(std::unique_ptr operation){ - if (operation == nullptr) { - return nullptr; - } - return std::unique_ptr(new Request(std::move(operation))); -} - -std::unique_ptr makeRequest(Operation *operation) { - return makeRequest(std::unique_ptr(operation)); -} - -} //end namespace MicroOcpp diff --git a/src/MicroOcpp/Core/SimpleRequestFactory.h b/src/MicroOcpp/Core/SimpleRequestFactory.h deleted file mode 100644 index 45c7e0a0..00000000 --- a/src/MicroOcpp/Core/SimpleRequestFactory.h +++ /dev/null @@ -1,20 +0,0 @@ -// matth-x/MicroOcpp -// Copyright Matthias Akstaller 2019 - 2024 -// MIT License - -#ifndef MO_SIMPLEREQUESTFACTORY_H -#define MO_SIMPLEREQUESTFACTORY_H - -#include - -#include - -namespace MicroOcpp { - -class Operation; - -std::unique_ptr makeRequest(std::unique_ptr op); -std::unique_ptr makeRequest(Operation *op); //takes ownership of op - -} //end namespace MicroOcpp -#endif diff --git a/src/MicroOcpp/Model/Authorization/AuthorizationService.cpp b/src/MicroOcpp/Model/Authorization/AuthorizationService.cpp index 74ee7bb8..fd15c0b9 100644 --- a/src/MicroOcpp/Model/Authorization/AuthorizationService.cpp +++ b/src/MicroOcpp/Model/Authorization/AuthorizationService.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/MicroOcpp/Model/Boot/BootService.cpp b/src/MicroOcpp/Model/Boot/BootService.cpp index bf485ad3..d44a4b71 100644 --- a/src/MicroOcpp/Model/Boot/BootService.cpp +++ b/src/MicroOcpp/Model/Boot/BootService.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/MicroOcpp/Model/ConnectorBase/Connector.cpp b/src/MicroOcpp/Model/ConnectorBase/Connector.cpp index db137d26..56eaa7e8 100644 --- a/src/MicroOcpp/Model/ConnectorBase/Connector.cpp +++ b/src/MicroOcpp/Model/ConnectorBase/Connector.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #ifndef MO_TX_CLEAN_ABORTED diff --git a/src/MicroOcpp/Model/Diagnostics/DiagnosticsService.cpp b/src/MicroOcpp/Model/Diagnostics/DiagnosticsService.cpp index a46737df..c4cb6b9a 100644 --- a/src/MicroOcpp/Model/Diagnostics/DiagnosticsService.cpp +++ b/src/MicroOcpp/Model/Diagnostics/DiagnosticsService.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/MicroOcpp/Model/FirmwareManagement/FirmwareService.cpp b/src/MicroOcpp/Model/FirmwareManagement/FirmwareService.cpp index ee59ae47..54cf72ca 100644 --- a/src/MicroOcpp/Model/FirmwareManagement/FirmwareService.cpp +++ b/src/MicroOcpp/Model/FirmwareManagement/FirmwareService.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/MicroOcpp/Model/Heartbeat/HeartbeatService.cpp b/src/MicroOcpp/Model/Heartbeat/HeartbeatService.cpp index da476db1..a77eed0e 100644 --- a/src/MicroOcpp/Model/Heartbeat/HeartbeatService.cpp +++ b/src/MicroOcpp/Model/Heartbeat/HeartbeatService.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/MicroOcpp/Model/Metering/MeteringService.cpp b/src/MicroOcpp/Model/Metering/MeteringService.cpp index bff296d1..169c2e2a 100644 --- a/src/MicroOcpp/Model/Metering/MeteringService.cpp +++ b/src/MicroOcpp/Model/Metering/MeteringService.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/MicroOcpp/Model/Reset/ResetService.cpp b/src/MicroOcpp/Model/Reset/ResetService.cpp index e21b448f..d43436c4 100644 --- a/src/MicroOcpp/Model/Reset/ResetService.cpp +++ b/src/MicroOcpp/Model/Reset/ResetService.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/MicroOcpp/Model/Transactions/TransactionService.cpp b/src/MicroOcpp/Model/Transactions/TransactionService.cpp index 163e252a..a1ccd4aa 100644 --- a/src/MicroOcpp/Model/Transactions/TransactionService.cpp +++ b/src/MicroOcpp/Model/Transactions/TransactionService.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include using namespace MicroOcpp; diff --git a/src/MicroOcpp/Model/Variables/VariableService.cpp b/src/MicroOcpp/Model/Variables/VariableService.cpp index c77b06a6..267a8971 100644 --- a/src/MicroOcpp/Model/Variables/VariableService.cpp +++ b/src/MicroOcpp/Model/Variables/VariableService.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/MicroOcpp/Operations/TriggerMessage.cpp b/src/MicroOcpp/Operations/TriggerMessage.cpp index 7c246e3d..431f2a57 100644 --- a/src/MicroOcpp/Operations/TriggerMessage.cpp +++ b/src/MicroOcpp/Operations/TriggerMessage.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include using MicroOcpp::Ocpp16::TriggerMessage; diff --git a/tests/Api.cpp b/tests/Api.cpp index 9f53aa94..68e7ac39 100644 --- a/tests/Api.cpp +++ b/tests/Api.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include "./catch2/catch.hpp" diff --git a/tests/Certificates.cpp b/tests/Certificates.cpp index b1193380..827866c1 100644 --- a/tests/Certificates.cpp +++ b/tests/Certificates.cpp @@ -13,7 +13,6 @@ #include #include -#include #include #include diff --git a/tests/ChargePointError.cpp b/tests/ChargePointError.cpp index 6ca2498c..3fe9a472 100644 --- a/tests/ChargePointError.cpp +++ b/tests/ChargePointError.cpp @@ -9,7 +9,6 @@ #include #include -#include #include #include diff --git a/tests/ChargingSessions.cpp b/tests/ChargingSessions.cpp index bff8838e..c22bb771 100644 --- a/tests/ChargingSessions.cpp +++ b/tests/ChargingSessions.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/Configuration.cpp b/tests/Configuration.cpp index b4dda74c..bab9a741 100644 --- a/tests/Configuration.cpp +++ b/tests/Configuration.cpp @@ -18,7 +18,6 @@ #include #include -#include #include using namespace MicroOcpp; diff --git a/tests/FirmwareManagement.cpp b/tests/FirmwareManagement.cpp index 2a9425cc..7bf8d36c 100644 --- a/tests/FirmwareManagement.cpp +++ b/tests/FirmwareManagement.cpp @@ -9,7 +9,6 @@ #include #include -#include #include #include diff --git a/tests/LocalAuthList.cpp b/tests/LocalAuthList.cpp index 811d4d00..84cd55ba 100644 --- a/tests/LocalAuthList.cpp +++ b/tests/LocalAuthList.cpp @@ -13,7 +13,6 @@ #include #include -#include #include #include diff --git a/tests/Metering.cpp b/tests/Metering.cpp index 63d744ba..3a542d5c 100644 --- a/tests/Metering.cpp +++ b/tests/Metering.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include "./catch2/catch.hpp" #include "./helpers/testHelper.h" diff --git a/tests/Reservation.cpp b/tests/Reservation.cpp index fbd6894d..3323f94c 100644 --- a/tests/Reservation.cpp +++ b/tests/Reservation.cpp @@ -13,7 +13,6 @@ #include #include -#include #include #include diff --git a/tests/Reset.cpp b/tests/Reset.cpp index 8092a155..d1607eb8 100644 --- a/tests/Reset.cpp +++ b/tests/Reset.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include "./catch2/catch.hpp" diff --git a/tests/SmartCharging.cpp b/tests/SmartCharging.cpp index 19bec8b1..f5b76ae6 100644 --- a/tests/SmartCharging.cpp +++ b/tests/SmartCharging.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include "./catch2/catch.hpp" diff --git a/tests/TransactionSafety.cpp b/tests/TransactionSafety.cpp index fe62a486..03eeb9f6 100644 --- a/tests/TransactionSafety.cpp +++ b/tests/TransactionSafety.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/tests/Transactions.cpp b/tests/Transactions.cpp index bf071e73..e32994be 100644 --- a/tests/Transactions.cpp +++ b/tests/Transactions.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include "./catch2/catch.hpp" diff --git a/tests/Variables.cpp b/tests/Variables.cpp index 156840ea..aed483b3 100644 --- a/tests/Variables.cpp +++ b/tests/Variables.cpp @@ -17,7 +17,6 @@ #include #include -#include using namespace MicroOcpp; From acc62e4b688b41d4f118dd5765b30f1f646ebff5 Mon Sep 17 00:00:00 2001 From: matth-x <63792403+matth-x@users.noreply.github.com> Date: Mon, 5 Aug 2024 13:36:50 +0200 Subject: [PATCH 2/4] add missing Request include --- tests/Api.cpp | 1 + tests/ChargingSessions.cpp | 1 + tests/Configuration.cpp | 1 + tests/FirmwareManagement.cpp | 1 + tests/LocalAuthList.cpp | 1 + tests/Reservation.cpp | 1 + tests/SmartCharging.cpp | 1 + 7 files changed, 7 insertions(+) diff --git a/tests/Api.cpp b/tests/Api.cpp index 68e7ac39..2de67703 100644 --- a/tests/Api.cpp +++ b/tests/Api.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/ChargingSessions.cpp b/tests/ChargingSessions.cpp index c22bb771..5c35362b 100644 --- a/tests/ChargingSessions.cpp +++ b/tests/ChargingSessions.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/tests/Configuration.cpp b/tests/Configuration.cpp index bab9a741..57aa8107 100644 --- a/tests/Configuration.cpp +++ b/tests/Configuration.cpp @@ -18,6 +18,7 @@ #include #include +#include #include using namespace MicroOcpp; diff --git a/tests/FirmwareManagement.cpp b/tests/FirmwareManagement.cpp index 7bf8d36c..20801dd8 100644 --- a/tests/FirmwareManagement.cpp +++ b/tests/FirmwareManagement.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include diff --git a/tests/LocalAuthList.cpp b/tests/LocalAuthList.cpp index 84cd55ba..866567e3 100644 --- a/tests/LocalAuthList.cpp +++ b/tests/LocalAuthList.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include diff --git a/tests/Reservation.cpp b/tests/Reservation.cpp index 3323f94c..1b36f077 100644 --- a/tests/Reservation.cpp +++ b/tests/Reservation.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include diff --git a/tests/SmartCharging.cpp b/tests/SmartCharging.cpp index f5b76ae6..c92c5dcf 100644 --- a/tests/SmartCharging.cpp +++ b/tests/SmartCharging.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include "./catch2/catch.hpp" From f0a03cd3072a69845a9184064ded8e54be75ef2f Mon Sep 17 00:00:00 2001 From: matth-x <63792403+matth-x@users.noreply.github.com> Date: Mon, 5 Aug 2024 13:37:11 +0200 Subject: [PATCH 3/4] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d90671c6..9249bf3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - ESP32 built-in HTTP OTA ([#313](https://github.com/matth-x/MicroOcpp/pull/313)) - Operation store (files op-*.jsn and opstore.jsn) ([#345](https://github.com/matth-x/MicroOcpp/pull/345)) - Explicit tracking of txNr (file txstore.jsn) ([#345](https://github.com/matth-x/MicroOcpp/pull/345)) +- SimpleRequestFactory ([#351](https://github.com/matth-x/MicroOcpp/pull/351)) ### Fixed From 464321869d107a88c139bae2e8f40fe4f84a1909 Mon Sep 17 00:00:00 2001 From: matth-x <63792403+matth-x@users.noreply.github.com> Date: Mon, 5 Aug 2024 13:41:37 +0200 Subject: [PATCH 4/4] add missing Request include --- tests/Certificates.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Certificates.cpp b/tests/Certificates.cpp index 827866c1..9267705a 100644 --- a/tests/Certificates.cpp +++ b/tests/Certificates.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include