Skip to content

Commit 77e88cb

Browse files
matth-xmatth-x
authored
Remove SimpleRequestFactory (matth-x#351)
* move Request factory functions into Request.h/cpp * add missing Request include * update changelog
1 parent 211c745 commit 77e88cb

33 files changed

Lines changed: 41 additions & 69 deletions

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
- ESP32 built-in HTTP OTA ([#313](https://github.com/matth-x/MicroOcpp/pull/313))
2626
- Operation store (files op-*.jsn and opstore.jsn) ([#345](https://github.com/matth-x/MicroOcpp/pull/345))
2727
- Explicit tracking of txNr (file txstore.jsn) ([#345](https://github.com/matth-x/MicroOcpp/pull/345))
28+
- SimpleRequestFactory ([#351](https://github.com/matth-x/MicroOcpp/pull/351))
2829

2930
### Fixed
3031

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ set(MO_SRC
6363
src/MicroOcpp/Operations/UpdateFirmware.cpp
6464
src/MicroOcpp/Debug.cpp
6565
src/MicroOcpp/Platform.cpp
66-
src/MicroOcpp/Core/SimpleRequestFactory.cpp
6766
src/MicroOcpp/Core/OperationRegistry.cpp
6867
src/MicroOcpp/Model/Authorization/AuthorizationData.cpp
6968
src/MicroOcpp/Model/Authorization/AuthorizationList.cpp

‎src/MicroOcpp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <MicroOcpp/Model/Transactions/TransactionService.h>
2222
#include <MicroOcpp/Model/Certificates/CertificateService.h>
2323
#include <MicroOcpp/Model/Certificates/CertificateMbedTLS.h>
24-
#include <MicroOcpp/Core/SimpleRequestFactory.h>
24+
#include <MicroOcpp/Core/Request.h>
2525
#include <MicroOcpp/Core/OperationRegistry.h>
2626
#include <MicroOcpp/Core/FilesystemAdapter.h>
2727
#include <MicroOcpp/Core/FilesystemUtils.h>

‎src/MicroOcpp/Core/Request.cpp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,3 +286,18 @@ void Request::setRequestSent() {
286286
bool Request::isRequestSent() {
287287
return requestSent;
288288
}
289+
290+
namespace MicroOcpp {
291+
292+
std::unique_ptr<Request> makeRequest(std::unique_ptr<Operation> operation){
293+
if (operation == nullptr) {
294+
return nullptr;
295+
}
296+
return std::unique_ptr<Request>(new Request(std::move(operation)));
297+
}
298+
299+
std::unique_ptr<Request> makeRequest(Operation *operation) {
300+
return makeRequest(std::unique_ptr<Operation>(operation));
301+
}
302+
303+
} //end namespace MicroOcpp

‎src/MicroOcpp/Core/Request.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ class Request {
116116
bool isRequestSent();
117117
};
118118

119+
/*
120+
* Simple factory functions
121+
*/
122+
std::unique_ptr<Request> makeRequest(std::unique_ptr<Operation> op);
123+
std::unique_ptr<Request> makeRequest(Operation *op); //takes ownership of op
124+
119125
} //end namespace MicroOcpp
120126

121127
#endif

‎src/MicroOcpp/Core/RequestQueue.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <MicroOcpp/Core/RequestQueue.h>
88
#include <MicroOcpp/Core/Request.h>
99
#include <MicroOcpp/Core/Connection.h>
10-
#include <MicroOcpp/Core/SimpleRequestFactory.h>
1110
#include <MicroOcpp/Core/OcppError.h>
1211
#include <MicroOcpp/Core/OperationRegistry.h>
1312
#include <MicroOcpp/Operations/StatusNotification.h>

‎src/MicroOcpp/Core/SimpleRequestFactory.cpp‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/MicroOcpp/Core/SimpleRequestFactory.h‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/MicroOcpp/Model/Authorization/AuthorizationService.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <MicroOcpp/Core/Context.h>
1313
#include <MicroOcpp/Model/Model.h>
1414
#include <MicroOcpp/Core/OperationRegistry.h>
15-
#include <MicroOcpp/Core/SimpleRequestFactory.h>
15+
#include <MicroOcpp/Core/Request.h>
1616
#include <MicroOcpp/Operations/GetLocalListVersion.h>
1717
#include <MicroOcpp/Operations/SendLocalList.h>
1818
#include <MicroOcpp/Operations/StatusNotification.h>

‎src/MicroOcpp/Model/Boot/BootService.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <MicroOcpp/Core/Context.h>
99
#include <MicroOcpp/Model/Model.h>
1010
#include <MicroOcpp/Core/Configuration.h>
11-
#include <MicroOcpp/Core/SimpleRequestFactory.h>
11+
#include <MicroOcpp/Core/Request.h>
1212
#include <MicroOcpp/Core/FilesystemUtils.h>
1313
#include <MicroOcpp/Operations/BootNotification.h>
1414
#include <MicroOcpp/Platform.h>

0 commit comments

Comments
 (0)