Skip to content

Commit 7fad64a

Browse files
matth-xmatth-x
committed
fix renaming
1 parent 5566652 commit 7fad64a

20 files changed

Lines changed: 66 additions & 62 deletions

‎src/ArduinoOcpp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ bool startTransaction(const char *idTag, OnReceiveConfListener onConf, OnAbortLi
746746
}
747747
auto transaction = connector->getTransaction();
748748
if (transaction) {
749-
if (transaction->getStartRpcData().isRequested()) {
749+
if (transaction->getStartRpcSync().isRequested()) {
750750
AO_DBG_ERR("Transaction already in progress. Must call stopTransaction()");
751751
return false;
752752
}

‎src/ArduinoOcpp/Core/OperationRegistry.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ OperationCreator *OperationRegistry::findCreator(const char *operationType) {
2424
return nullptr;
2525
}
2626

27-
void OperationRegistry::registerRequest(const char *operationType, std::function<Operation*()> creator) {
27+
void OperationRegistry::registerOperation(const char *operationType, std::function<Operation*()> creator) {
2828
registry.erase(std::remove_if(registry.begin(), registry.end(),
2929
[operationType] (const OperationCreator& el) {
3030
return !strcmp(operationType, el.operationType);
@@ -64,6 +64,7 @@ std::unique_ptr<Request> OperationRegistry::deserializeOperation(const char *ope
6464
auto result = std::unique_ptr<Request>(new Request(
6565
std::unique_ptr<Operation>(payload)));
6666
result->setOnReceiveReqListener(entry->onRequest);
67+
result->setOnSendConfListener(entry->onResponse);
6768
return result;
6869
}
6970
}

‎src/ArduinoOcpp/Core/OperationRegistry.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class OperationRegistry {
3131
public:
3232
OperationRegistry();
3333

34-
void registerRequest(const char *operationType, std::function<Operation*()> creator);
34+
void registerOperation(const char *operationType, std::function<Operation*()> creator);
3535
void setOnRequest(const char *operationType, OnReceiveReqListener onRequest);
3636
void setOnResponse(const char *operationType, OnSendConfListener onResponse);
3737

‎src/ArduinoOcpp/Core/Request.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,10 @@ std::unique_ptr<DynamicJsonDocument> Request::createResponse(){
204204
response->add(MESSAGE_TYPE_CALLRESULT); //MessageType
205205
response->add(messageID); //Unique message ID
206206
response->add(*payload); //Payload
207+
208+
if (onSendConfListener) {
209+
onSendConfListener(payload->as<JsonObject>());
210+
}
207211
} else {
208212
//operation failure. Send error message instead
209213

‎src/ArduinoOcpp/MessagesV16/StartTransaction.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <ArduinoOcpp/Debug.h>
1313

1414
using ArduinoOcpp::Ocpp16::StartTransaction;
15-
using ArduinoOcpp::TransactionRPC;
1615

1716

1817
StartTransaction::StartTransaction(Model& model, std::shared_ptr<Transaction> transaction) : model(model), transaction(transaction) {
@@ -28,7 +27,7 @@ const char* StartTransaction::getOperationType() {
2827
}
2928

3029
void StartTransaction::initiate(StoredOperationHandler *opStore) {
31-
if (!transaction || transaction->getStartRpcData().isRequested()) {
30+
if (!transaction || transaction->getStartRpcSync().isRequested()) {
3231
AO_DBG_ERR("initialization error");
3332
return;
3433
}
@@ -42,7 +41,7 @@ void StartTransaction::initiate(StoredOperationHandler *opStore) {
4241
opStore->commit();
4342
}
4443

45-
transaction->getStartRpcData().setRequested();
44+
transaction->getStartRpcSync().setRequested();
4645

4746
transaction->commit();
4847

@@ -134,7 +133,7 @@ void StartTransaction::processConf(JsonObject payload) {
134133
int transactionId = payload["transactionId"] | -1;
135134
transaction->setTransactionId(transactionId);
136135

137-
transaction->getStartRpcData().confirm();
136+
transaction->getStartRpcSync().confirm();
138137
transaction->commit();
139138

140139
if (auto authService = model.getAuthorizationService()) {

‎src/ArduinoOcpp/MessagesV16/StopTransaction.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <ArduinoOcpp/Debug.h>
1414

1515
using ArduinoOcpp::Ocpp16::StopTransaction;
16-
using ArduinoOcpp::TransactionRPC;
1716

1817
StopTransaction::StopTransaction(Model& model, std::shared_ptr<Transaction> transaction)
1918
: model(model), transaction(transaction) {
@@ -30,7 +29,7 @@ const char* StopTransaction::getOperationType() {
3029
}
3130

3231
void StopTransaction::initiate(StoredOperationHandler *opStore) {
33-
if (!transaction || transaction->getStopRpcData().isRequested()) {
32+
if (!transaction || transaction->getStopRpcSync().isRequested()) {
3433
AO_DBG_ERR("initialization error");
3534
return;
3635
}
@@ -44,7 +43,7 @@ void StopTransaction::initiate(StoredOperationHandler *opStore) {
4443
opStore->commit();
4544
}
4645

47-
transaction->getStopRpcData().setRequested();
46+
transaction->getStopRpcSync().setRequested();
4847

4948
transaction->commit();
5049

@@ -153,7 +152,7 @@ std::unique_ptr<DynamicJsonDocument> StopTransaction::createReq() {
153152
void StopTransaction::processConf(JsonObject payload) {
154153

155154
if (transaction) {
156-
transaction->getStopRpcData().confirm();
155+
transaction->getStopRpcSync().confirm();
157156
transaction->commit();
158157
}
159158

@@ -167,7 +166,7 @@ void StopTransaction::processConf(JsonObject payload) {
167166
bool StopTransaction::processErr(const char *code, const char *description, JsonObject details) {
168167

169168
if (transaction) {
170-
transaction->getStopRpcData().confirm(); //no retry behavior for now; consider data "arrived" at server
169+
transaction->getStopRpcSync().confirm(); //no retry behavior for now; consider data "arrived" at server
171170
transaction->commit();
172171
}
173172

‎src/ArduinoOcpp/Tasks/Authorization/AuthorizationService.cpp‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,20 @@
55
#include <ArduinoOcpp/Tasks/Authorization/AuthorizationService.h>
66
#include <ArduinoOcpp/Tasks/ChargeControl/Connector.h>
77
#include <ArduinoOcpp/Core/FilesystemUtils.h>
8-
#include <ArduinoOcpp/Core/OcppEngine.h>
9-
#include <ArduinoOcpp/Core/OcppModel.h>
8+
#include <ArduinoOcpp/Core/Context.h>
9+
#include <ArduinoOcpp/Core/Model.h>
10+
#include <ArduinoOcpp/Core/OperationRegistry.h>
11+
#include <ArduinoOcpp/Core/SimpleRequestFactory.h>
1012
#include <ArduinoOcpp/MessagesV16/GetLocalListVersion.h>
1113
#include <ArduinoOcpp/MessagesV16/SendLocalList.h>
1214
#include <ArduinoOcpp/MessagesV16/StatusNotification.h>
13-
#include <ArduinoOcpp/SimpleOcppOperationFactory.h>
1415
#include <ArduinoOcpp/Debug.h>
1516

1617
#define AO_LOCALAUTHORIZATIONLIST_FN (AO_FILENAME_PREFIX "localauth.jsn")
1718

1819
using namespace ArduinoOcpp;
1920

20-
AuthorizationService::AuthorizationService(OcppEngine& context, std::shared_ptr<FilesystemAdapter> filesystem) : context(context), filesystem(filesystem) {
21+
AuthorizationService::AuthorizationService(Context& context, std::shared_ptr<FilesystemAdapter> filesystem) : context(context), filesystem(filesystem) {
2122

2223
localAuthorizeOffline = declareConfiguration<bool>("LocalAuthorizeOffline", true, CONFIGURATION_FN, true, true, true, false);
2324
localAuthListEnabled = declareConfiguration<bool>("LocalAuthListEnabled", true, CONFIGURATION_FN, true, true, true, false);
@@ -39,10 +40,10 @@ AuthorizationService::AuthorizationService(OcppEngine& context, std::shared_ptr<
3940
fProfile->setValue(fProfilePlus.c_str(), fProfilePlus.length() + 1);
4041
}
4142

42-
context.getOperationDeserializer().registerOcppOperation("GetLocalListVersion", [&context] () {
43-
return new Ocpp16::GetLocalListVersion(context.getOcppModel());});
44-
context.getOperationDeserializer().registerOcppOperation("SendLocalList", [&context] () {
45-
return new Ocpp16::SendLocalList(context.getOcppModel());});
43+
context.getOperationRegistry().registerOperation("GetLocalListVersion", [&context] () {
44+
return new Ocpp16::GetLocalListVersion(context.getModel());});
45+
context.getOperationRegistry().registerOperation("SendLocalList", [&context] () {
46+
return new Ocpp16::SendLocalList(context.getModel());});
4647

4748
loadLists();
4849
}
@@ -149,7 +150,7 @@ void AuthorizationService::notifyAuthorization(const char *idTag, JsonObject idT
149150
}
150151

151152
if (localStatus == AuthorizationStatus::Accepted && localInfo->getExpiryDate()) { //check for expiry
152-
auto& t_now = context.getOcppModel().getOcppTime().getOcppTimestampNow();
153+
auto& t_now = context.getModel().getTime().getTimestampNow();
153154
if (t_now > *localInfo->getExpiryDate()) {
154155
AO_DBG_DEBUG("local auth expired");
155156
localStatus = AuthorizationStatus::Expired;
@@ -176,18 +177,18 @@ void AuthorizationService::notifyAuthorization(const char *idTag, JsonObject idT
176177
//send error code "LocalListConflict" to server
177178

178179
OcppEvseState cpStatus = OcppEvseState::NOT_SET;
179-
if (context.getOcppModel().getNumConnectors() > 0) {
180-
cpStatus = context.getOcppModel().getConnector(0)->inferenceStatus();
180+
if (context.getModel().getNumConnectors() > 0) {
181+
cpStatus = context.getModel().getConnector(0)->inferenceStatus();
181182
}
182183

183-
auto statusNotification = makeOcppOperation(new Ocpp16::StatusNotification(
184+
auto statusNotification = makeRequest(new Ocpp16::StatusNotification(
184185
0,
185186
cpStatus, //will be determined in StatusNotification::initiate
186-
context.getOcppModel().getOcppTime().getOcppTimestampNow(),
187+
context.getModel().getTime().getTimestampNow(),
187188
"LocalListConflict"));
188189

189190
statusNotification->setTimeout(60000);
190191

191-
context.initiateOperation(std::move(statusNotification));
192+
context.initiateRequest(std::move(statusNotification));
192193
}
193194
}

‎src/ArduinoOcpp/Tasks/Boot/BootService.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ BootService::BootService(Context& context) : context(context) {
3737
}
3838

3939
//Register message handler for TriggerMessage operation
40-
context.getOperationRegistry().registerRequest("BootNotification", [this] () {
40+
context.getOperationRegistry().registerOperation("BootNotification", [this] () {
4141
return new Ocpp16::BootNotification(this->context.getModel(), getChargePointCredentials());});
4242
}
4343

‎src/ArduinoOcpp/Tasks/ChargeControl/ChargeControlCommon.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,37 +57,37 @@ ChargeControlCommon::ChargeControlCommon(Context& context, unsigned int numConn,
5757
declareConfiguration<bool>("AuthorizeRemoteTxRequests",false,CONFIGURATION_VOLATILE,false,true,false,false);
5858
declareConfiguration<int>("GetConfigurationMaxKeys",30,CONFIGURATION_VOLATILE,false,true,false,false);
5959

60-
context.getOperationRegistry().registerRequest("ChangeAvailability", [&context] () {
60+
context.getOperationRegistry().registerOperation("ChangeAvailability", [&context] () {
6161
return new Ocpp16::ChangeAvailability(context.getModel());});
62-
context.getOperationRegistry().registerRequest("ChangeConfiguration", [] () {
62+
context.getOperationRegistry().registerOperation("ChangeConfiguration", [] () {
6363
return new Ocpp16::ChangeConfiguration();});
64-
context.getOperationRegistry().registerRequest("ClearCache", [filesystem] () {
64+
context.getOperationRegistry().registerOperation("ClearCache", [filesystem] () {
6565
return new Ocpp16::ClearCache(filesystem);});
66-
context.getOperationRegistry().registerRequest("GetConfiguration", [] () {
66+
context.getOperationRegistry().registerOperation("GetConfiguration", [] () {
6767
return new Ocpp16::GetConfiguration();});
68-
context.getOperationRegistry().registerRequest("RemoteStartTransaction", [&context] () {
68+
context.getOperationRegistry().registerOperation("RemoteStartTransaction", [&context] () {
6969
return new Ocpp16::RemoteStartTransaction(context.getModel());});
70-
context.getOperationRegistry().registerRequest("RemoteStopTransaction", [&context] () {
70+
context.getOperationRegistry().registerOperation("RemoteStopTransaction", [&context] () {
7171
return new Ocpp16::RemoteStopTransaction(context.getModel());});
72-
context.getOperationRegistry().registerRequest("Reset", [&context] () {
72+
context.getOperationRegistry().registerOperation("Reset", [&context] () {
7373
return new Ocpp16::Reset(context.getModel());});
74-
context.getOperationRegistry().registerRequest("TriggerMessage", [&context] () {
74+
context.getOperationRegistry().registerOperation("TriggerMessage", [&context] () {
7575
return new Ocpp16::TriggerMessage(context.getModel());});
76-
context.getOperationRegistry().registerRequest("UnlockConnector", [&context] () {
76+
context.getOperationRegistry().registerOperation("UnlockConnector", [&context] () {
7777
return new Ocpp16::UnlockConnector(context.getModel());});
7878

7979
/*
8080
* Register further message handlers to support echo mode: when this library
8181
* is connected with a WebSocket echo server, let it reply to its own requests.
8282
* Mocking an OCPP Server on the same device makes running (unit) tests easier.
8383
*/
84-
context.getOperationRegistry().registerRequest("Authorize", [&context] () {
84+
context.getOperationRegistry().registerOperation("Authorize", [&context] () {
8585
return new Ocpp16::Authorize(context.getModel(), nullptr);});
86-
context.getOperationRegistry().registerRequest("StartTransaction", [&context] () {
86+
context.getOperationRegistry().registerOperation("StartTransaction", [&context] () {
8787
return new Ocpp16::StartTransaction(context.getModel(), nullptr);});
88-
context.getOperationRegistry().registerRequest("StatusNotification", [&context] () {
88+
context.getOperationRegistry().registerOperation("StatusNotification", [&context] () {
8989
return new Ocpp16::StatusNotification(-1, OcppEvseState::NOT_SET, Timestamp());});
90-
context.getOperationRegistry().registerRequest("StopTransaction", [&context] () {
90+
context.getOperationRegistry().registerOperation("StopTransaction", [&context] () {
9191
return new Ocpp16::StopTransaction(context.getModel(), nullptr);});
9292
}
9393

‎src/ArduinoOcpp/Tasks/Diagnostics/DiagnosticsService.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ DiagnosticsService::DiagnosticsService(Context& context) : context(context) {
2626
fProfile->setValue(fProfilePlus.c_str(), fProfilePlus.length() + 1);
2727
}
2828

29-
context.getOperationRegistry().registerRequest("GetDiagnostics", [&context] () {
29+
context.getOperationRegistry().registerOperation("GetDiagnostics", [&context] () {
3030
return new Ocpp16::GetDiagnostics(context.getModel());});
3131

3232
//Register message handler for TriggerMessage operation
33-
context.getOperationRegistry().registerRequest("DiagnosticsStatusNotification", [this] () {
33+
context.getOperationRegistry().registerOperation("DiagnosticsStatusNotification", [this] () {
3434
return new Ocpp16::DiagnosticsStatusNotification(getDiagnosticsStatus());});
3535
}
3636

0 commit comments

Comments
 (0)