Skip to content

Commit fd2a807

Browse files
authored
Fix(API): Unify API internal/external enum conversion error messages (EVerest#1902)
Signed-off-by: Christoph Burandt <christoph.burandt@pionix.de>
1 parent 16bc99b commit fd2a807

File tree

7 files changed

+87
-53
lines changed

7 files changed

+87
-53
lines changed

lib/everest/everest_api_types/src/everest_api_types/auth/wrapper.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ CertificateStatus_Internal to_internal_api(CertificateStatus_External const& val
135135
case SrcT::ContractCancelled:
136136
return TarT::ContractCancelled;
137137
}
138-
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::auth::CertifgicateStatus_External");
138+
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::auth::CertificateStatus_External");
139139
}
140140
CertificateStatus_External to_external_api(CertificateStatus_Internal const& val) {
141141
using SrcT = CertificateStatus_Internal;
@@ -156,7 +156,7 @@ CertificateStatus_External to_external_api(CertificateStatus_Internal const& val
156156
case SrcT::ContractCancelled:
157157
return TarT::ContractCancelled;
158158
}
159-
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::auth::CertifgicateStatus_Internal");
159+
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::auth::CertificateStatus_Internal");
160160
}
161161

162162
TokenValidationStatus_Internal to_internal_api(TokenValidationStatus_External const& val) {
@@ -215,7 +215,7 @@ SelectionAlgorithm_Internal to_internal_api(SelectionAlgorithm_External const& v
215215
case SrcT::FindFirst:
216216
return TarT::FindFirst;
217217
}
218-
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::auth::SelectedAlgorithm_External");
218+
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::auth::SelectionAlgorithm_External");
219219
}
220220
SelectionAlgorithm_External to_external_api(SelectionAlgorithm_Internal const& val) {
221221
using SrcT = SelectionAlgorithm_Internal;
@@ -228,7 +228,7 @@ SelectionAlgorithm_External to_external_api(SelectionAlgorithm_Internal const& v
228228
case SrcT::FindFirst:
229229
return TarT::FindFirst;
230230
}
231-
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::auth::SelectedAlgorithm_Internal");
231+
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::auth::SelectionAlgorithm_Internal");
232232
}
233233

234234
AuthorizationType_Internal to_internal_api(AuthorizationType_External const& val) {
@@ -246,7 +246,7 @@ AuthorizationType_Internal to_internal_api(AuthorizationType_External const& val
246246
case SrcT::BankCard:
247247
return TarT::BankCard;
248248
}
249-
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::auth::AuthoriozationType_External");
249+
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::auth::AuthorizationType_External");
250250
}
251251

252252
AuthorizationType_External to_external_api(AuthorizationType_Internal const& val) {
@@ -264,7 +264,7 @@ AuthorizationType_External to_external_api(AuthorizationType_Internal const& val
264264
case SrcT::BankCard:
265265
return TarT::BankCard;
266266
}
267-
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::auth::AuthoriozationType_Internal");
267+
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::auth::AuthorizationType_Internal");
268268
}
269269

270270
IdTokenType_Internal to_internal_api(IdTokenType_External const& val) {

lib/everest/everest_api_types/src/everest_api_types/evse_manager/wrapper.cpp

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ StopTransactionReason_Internal to_internal_api(StopTransactionReason_External co
8585
case SrcT::ReqEnergyTransferRejected:
8686
return TarT::ReqEnergyTransferRejected;
8787
}
88-
throw std::out_of_range("Unexpected value for StopTransactionReason_External");
88+
throw std::out_of_range(
89+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::StopTransactionReason_External");
8990
}
9091

9192
StopTransactionReason_External to_external_api(StopTransactionReason_Internal const& val) {
@@ -138,7 +139,8 @@ StopTransactionReason_External to_external_api(StopTransactionReason_Internal co
138139
case SrcT::ReqEnergyTransferRejected:
139140
return TarT::ReqEnergyTransferRejected;
140141
}
141-
throw std::out_of_range("Unexpected value for StopTransactionReason_Internal");
142+
throw std::out_of_range(
143+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::StopTransactionReason_Internal");
142144
}
143145

144146
StopTransactionRequest_Internal to_internal_api(StopTransactionRequest_External const& val) {
@@ -165,7 +167,8 @@ StartSessionReason_Internal to_internal_api(StartSessionReason_External const& v
165167
return TarT::Authorized;
166168
}
167169

168-
throw std::out_of_range("Unexpected value for StartSessionReason_External");
170+
throw std::out_of_range(
171+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::StartSessionReason_External");
169172
}
170173

171174
StartSessionReason_External to_external_api(StartSessionReason_Internal const& val) {
@@ -179,7 +182,8 @@ StartSessionReason_External to_external_api(StartSessionReason_Internal const& v
179182
return TarT::Authorized;
180183
}
181184

182-
throw std::out_of_range("Unexpected value for StartSessionReason_Internal");
185+
throw std::out_of_range(
186+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::StartSessionReason_Internal");
183187
}
184188

185189
SessionEventEnum_Internal to_internal_api(SessionEventEnum_External const& val) {
@@ -237,7 +241,8 @@ SessionEventEnum_Internal to_internal_api(SessionEventEnum_External const& val)
237241
return TarT::SessionResumed;
238242
}
239243

240-
throw std::out_of_range("Unexpected value for SessionEventEnum_Internal");
244+
throw std::out_of_range(
245+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::SessionEventEnum_External");
241246
}
242247

243248
SessionEventEnum_External to_external_api(SessionEventEnum_Internal const& val) {
@@ -295,7 +300,8 @@ SessionEventEnum_External to_external_api(SessionEventEnum_Internal const& val)
295300
return TarT::SessionResumed;
296301
}
297302

298-
throw std::out_of_range("Unexpected value for SessionEventEnum_Internal");
303+
throw std::out_of_range(
304+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::SessionEventEnum_Internal");
299305
}
300306

301307
SessionEvent_Internal to_internal_api(SessionEvent_External const& val) {
@@ -402,7 +408,8 @@ CarManufacturer_External to_external_api(CarManufacturer_Internal const& val) {
402408
return TarT::Unknown;
403409
}
404410

405-
throw std::out_of_range("Unexpected value for CarManufacturer_Internal");
411+
throw std::out_of_range(
412+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::CarManufacturer_Internal");
406413
}
407414

408415
CarManufacturer_Internal to_external_api(CarManufacturer_External const& val) {
@@ -418,7 +425,8 @@ CarManufacturer_Internal to_external_api(CarManufacturer_External const& val) {
418425
return TarT::Unknown;
419426
}
420427

421-
throw std::out_of_range("Unexpected value for CarManufacturer_Internal");
428+
throw std::out_of_range(
429+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::CarManufacturer_External");
422430
}
423431

424432
SessionStarted_Internal to_internal_api(SessionStarted_External const& val) {
@@ -571,7 +579,8 @@ ConnectorTypeEnum_Internal to_internal_api(ConnectorTypeEnum_External const& val
571579
case SrcT::Unknown:
572580
return TarT::Unknown;
573581
}
574-
throw std::out_of_range("Unexpected value for ConnectorTypeEnum_External");
582+
throw std::out_of_range(
583+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::ConnectorTypeEnum_External");
575584
}
576585

577586
ConnectorTypeEnum_External to_external_api(ConnectorTypeEnum_Internal const& val) {
@@ -626,7 +635,8 @@ ConnectorTypeEnum_External to_external_api(ConnectorTypeEnum_Internal const& val
626635
case SrcT::Unknown:
627636
return TarT::Unknown;
628637
}
629-
throw std::out_of_range("Unexpected value for ConnectorTypeEnum_External");
638+
throw std::out_of_range(
639+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::ConnectorTypeEnum_Internal");
630640
}
631641

632642
Connector_Internal to_internal_api(Connector_External const& val) {
@@ -684,7 +694,8 @@ EnableSourceEnum_Internal to_internal_api(EnableSourceEnum_External const& val)
684694
case SrcT::CSMS:
685695
return TarT::CSMS;
686696
}
687-
throw std::out_of_range("Unexpected value for EnableSourceEnum_External");
697+
throw std::out_of_range(
698+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::EnableSourceEnum_External");
688699
}
689700

690701
EnableSourceEnum_External to_external_api(EnableSourceEnum_Internal const& val) {
@@ -709,7 +720,8 @@ EnableSourceEnum_External to_external_api(EnableSourceEnum_Internal const& val)
709720
case SrcT::CSMS:
710721
return TarT::CSMS;
711722
}
712-
throw std::out_of_range("Unexpected value for EnableSourceEnum_Internal");
723+
throw std::out_of_range(
724+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::EnableSourceEnum_Internal");
713725
}
714726

715727
EnableStateEnum_Internal to_internal_api(EnableStateEnum_External const& val) {
@@ -724,7 +736,8 @@ EnableStateEnum_Internal to_internal_api(EnableStateEnum_External const& val) {
724736
case SrcT::Enable:
725737
return TarT::Enable;
726738
}
727-
throw std::out_of_range("Unexpected value for EnableStateEnum_External");
739+
throw std::out_of_range(
740+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::EnableStateEnum_External");
728741
}
729742

730743
EnableStateEnum_External to_external_api(EnableStateEnum_Internal const& val) {
@@ -739,7 +752,8 @@ EnableStateEnum_External to_external_api(EnableStateEnum_Internal const& val) {
739752
case SrcT::Enable:
740753
return TarT::Enable;
741754
}
742-
throw std::out_of_range("Unexpected value for EnableStateEnum_Internal");
755+
throw std::out_of_range(
756+
"Unexpected value for everest::lib::API::V1_0::types::evse_manager::EnableStateEnum_Internal");
743757
}
744758

745759
EnableDisableSource_Internal to_internal_api(EnableDisableSource_External const& val) {

lib/everest/everest_api_types/src/everest_api_types/iso15118_charger/wrapper.cpp

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ CertificateActionEnum_Internal to_internal_api(CertificateActionEnum_External co
5959
return TarT::Update;
6060
}
6161

62-
throw std::out_of_range("Unexpected value for CertificateActionEnum_External");
62+
throw std::out_of_range(
63+
"Unexpected value for everest::lib::API::V1_0::types::iso15118_charger::CertificateActionEnum_External");
6364
}
6465

6566
CertificateActionEnum_External to_external_api(CertificateActionEnum_Internal const& val) {
@@ -73,7 +74,8 @@ CertificateActionEnum_External to_external_api(CertificateActionEnum_Internal co
7374
return TarT::Update;
7475
}
7576

76-
throw std::out_of_range("Unexpected value for CertificateActionEnum_Internal");
77+
throw std::out_of_range(
78+
"Unexpected value for everest::lib::API::V1_0::types::iso15118_charger::CertificateActionEnum_Internal");
7779
}
7880

7981
EnergyTransferMode_Internal to_internal_api(EnergyTransferMode_External const& val) {
@@ -117,7 +119,8 @@ EnergyTransferMode_Internal to_internal_api(EnergyTransferMode_External const& v
117119
return TarT::MCS_BPT;
118120
}
119121

120-
throw std::out_of_range("Unexpected value for EnergyTransferMode_External");
122+
throw std::out_of_range(
123+
"Unexpected value for everest::lib::API::V1_0::types::iso15118_charger::EnergyTransferMode_External");
121124
}
122125

123126
EnergyTransferMode_External to_external_api(EnergyTransferMode_Internal const& val) {
@@ -161,7 +164,8 @@ EnergyTransferMode_External to_external_api(EnergyTransferMode_Internal const& v
161164
return TarT::MCS_BPT;
162165
}
163166

164-
throw std::out_of_range("Unexpected value for EnergyTransferMode_Internal");
167+
throw std::out_of_range(
168+
"Unexpected value for everest::lib::API::V1_0::types::iso15118_charger::EnergyTransferMode_Internal");
165169
}
166170

167171
Status_Internal to_internal_api(Status_External const& val) {
@@ -175,7 +179,7 @@ Status_Internal to_internal_api(Status_External const& val) {
175179
return TarT::Failed;
176180
}
177181

178-
throw std::out_of_range("Unexpected value for Status_External");
182+
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::iso15118_charger::Status_External");
179183
}
180184

181185
Status_External to_external_api(Status_Internal const& val) {
@@ -189,7 +193,7 @@ Status_External to_external_api(Status_Internal const& val) {
189193
return TarT::Failed;
190194
}
191195

192-
throw std::out_of_range("Unexpected value for Status_Internal");
196+
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::iso15118_charger::Status_Internal");
193197
}
194198

195199
RequestExiStreamSchema_Internal to_internal_api(RequestExiStreamSchema_External const& val) {

lib/everest/everest_api_types/src/everest_api_types/ocpp/wrapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ OperationMode_External to_external_api(OperationMode_Internal const& val) {
655655
enum_case(LocalFrequency);
656656
enum_case(LocalLoadBalancing);
657657
}
658-
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::ocpp::Operation_mode");
658+
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::ocpp::OperationMode_Internal");
659659
}
660660

661661
ChargingSchedulePeriod_Internal to_internal_api(ChargingSchedulePeriod_External const& val) {

lib/everest/everest_api_types/src/everest_api_types/power_supply_DC/wrapper.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Mode_External to_external_api(Mode_Internal mode_internal) {
6262
return Mode::Fault;
6363
}
6464

65-
throw std::out_of_range("No know conversion between internal and external mode API");
65+
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::power_supply_DC::Mode_Internal");
6666
}
6767

6868
Mode_Internal to_internal_api(Mode_External mode_external) {
@@ -77,7 +77,7 @@ Mode_Internal to_internal_api(Mode_External mode_external) {
7777
return Mode_Internal::Fault;
7878
}
7979

80-
throw std::out_of_range("No know conversion between internal and external mode API");
80+
throw std::out_of_range("Unexpected value for everest::lib::API::V1_0::types::power_supply_DC::Mode_External");
8181
}
8282

8383
ChargingPhase_External to_external_api(ChargingPhase_Internal val) {
@@ -92,7 +92,8 @@ ChargingPhase_External to_external_api(ChargingPhase_Internal val) {
9292
return ChargingPhase_External::Charging;
9393
}
9494

95-
throw std::out_of_range("No know conversion from internal to external ChargingPhase API");
95+
throw std::out_of_range(
96+
"Unexpected value for everest::lib::API::V1_0::types::power_supply_DC::ChargingPhase_Internal");
9697
}
9798

9899
ChargingPhase_Internal to_internal_api(ChargingPhase_External val) {
@@ -107,7 +108,8 @@ ChargingPhase_Internal to_internal_api(ChargingPhase_External val) {
107108
return ChargingPhase_Internal::Charging;
108109
}
109110

110-
throw std::out_of_range("No know conversion from external and internal ChargingPhase API");
111+
throw std::out_of_range(
112+
"Unexpected value for everest::lib::API::V1_0::types::power_supply_DC::ChargingPhase_External");
111113
}
112114

113115
VoltageCurrent_External to_external_api(VoltageCurrent_Internal const& internal) {

lib/everest/everest_api_types/src/everest_api_types/powermeter/wrapper.cpp

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ OCMFUserIdentificationStatus_Internal to_internal_api(OCMFUserIdentificationStat
3939
case OCMFUserIdentificationStatus_External::NOT_ASSIGNED:
4040
return OCMFUserIdentificationStatus_Internal::NOT_ASSIGNED;
4141
}
42-
throw std::out_of_range("No know conversion between internal and external OCMFUserIdentificationStatus API");
42+
throw std::out_of_range(
43+
"Unexpected value for everest::lib::API::V1_0::types::powermeter::OCMFUserIdentificationStatus_External");
4344
}
4445

4546
OCMFUserIdentificationStatus_External to_external_api(OCMFUserIdentificationStatus_Internal const& val) {
@@ -49,7 +50,8 @@ OCMFUserIdentificationStatus_External to_external_api(OCMFUserIdentificationStat
4950
case OCMFUserIdentificationStatus_Internal::NOT_ASSIGNED:
5051
return OCMFUserIdentificationStatus_External::NOT_ASSIGNED;
5152
}
52-
throw std::out_of_range("No know conversion between internal and external OCMFUserIdentificationStatus API");
53+
throw std::out_of_range(
54+
"Unexpected value for everest::lib::API::V1_0::types::powermeter::OCMFUserIdentificationStatus_Internal");
5355
}
5456

5557
OCMFIdentificationFlags_Internal to_internal_api(OCMFIdentificationFlags_External const& val) {
@@ -89,7 +91,8 @@ OCMFIdentificationFlags_Internal to_internal_api(OCMFIdentificationFlags_Externa
8991
case OCMFIdentificationFlags_External::PLMN_SMS:
9092
return OCMFIdentificationFlags_Internal::PLMN_SMS;
9193
}
92-
throw std::out_of_range("No know conversion between internal and external OCMFIdentificationFlags API");
94+
throw std::out_of_range(
95+
"Unexpected value for everest::lib::API::V1_0::types::powermeter::OCMFIdentificationFlags_External");
9396
}
9497

9598
OCMFIdentificationFlags_External to_external_api(OCMFIdentificationFlags_Internal const& val) {
@@ -129,7 +132,8 @@ OCMFIdentificationFlags_External to_external_api(OCMFIdentificationFlags_Interna
129132
case OCMFIdentificationFlags_Internal::PLMN_SMS:
130133
return OCMFIdentificationFlags_External::PLMN_SMS;
131134
}
132-
throw std::out_of_range("No know conversion between internal and external OCMFIdentificationFlags API");
135+
throw std::out_of_range(
136+
"Unexpected value for everest::lib::API::V1_0::types::powermeter::OCMFIdentificationFlags_Internal");
133137
}
134138

135139
OCMFIdentificationType_Internal to_internal_api(OCMFIdentificationType_External const& val) {
@@ -171,7 +175,8 @@ OCMFIdentificationType_Internal to_internal_api(OCMFIdentificationType_External
171175
case OCMFIdentificationType_External::KEY_CODE:
172176
return OCMFIdentificationType_Internal::KEY_CODE;
173177
}
174-
throw std::out_of_range("No know conversion between internal and external OCMFIdentificationType API");
178+
throw std::out_of_range(
179+
"Unexpected value for everest::lib::API::V1_0::types::powermeter::OCMFIdentificationType_External");
175180
}
176181

177182
OCMFIdentificationType_External to_external_api(OCMFIdentificationType_Internal const& val) {
@@ -213,7 +218,8 @@ OCMFIdentificationType_External to_external_api(OCMFIdentificationType_Internal
213218
case OCMFIdentificationType_Internal::KEY_CODE:
214219
return OCMFIdentificationType_External::KEY_CODE;
215220
}
216-
throw std::out_of_range("No know conversion between internal and external OCMFIdentificationType API");
221+
throw std::out_of_range(
222+
"Unexpected value for everest::lib::API::V1_0::types::powermeter::OCMFIdentificationType_Internal");
217223
}
218224

219225
OCMFIdentificationLevel_Internal to_internal_api(OCMFIdentificationLevel_External const& val) {
@@ -240,7 +246,8 @@ OCMFIdentificationLevel_Internal to_internal_api(OCMFIdentificationLevel_Externa
240246
return OCMFIdentificationLevel_Internal::UNKNOWN;
241247
}
242248

243-
throw std::out_of_range("No know conversion between internal and external OCMFIdentificationLevel API");
249+
throw std::out_of_range(
250+
"Unexpected value for everest::lib::API::V1_0::types::powermeter::OCMFIdentificationLevel_External");
244251
}
245252

246253
OCMFIdentificationLevel_External to_external_api(OCMFIdentificationLevel_Internal const& val) {
@@ -267,7 +274,8 @@ OCMFIdentificationLevel_External to_external_api(OCMFIdentificationLevel_Interna
267274
return OCMFIdentificationLevel_External::UNKNOWN;
268275
}
269276

270-
throw std::out_of_range("No know conversion between internal and external OCMFIdentificationLevel API");
277+
throw std::out_of_range(
278+
"Unexpected value for everest::lib::API::V1_0::types::powermeter::OCMFIdentificationLevel_Internal");
271279
}
272280

273281
Temperature_Internal to_internal_api(Temperature_External const& val) {
@@ -592,7 +600,8 @@ TransactionStatus_Internal to_internal_api(TransactionStatus_External const& val
592600
return TransactionStatus_Internal::UNEXPECTED_ERROR;
593601
}
594602

595-
throw std::out_of_range("No known conversion from external to internal TransactionStatus API");
603+
throw std::out_of_range(
604+
"Unexpected value for everest::lib::API::V1_0::types::powermeter::TransactionStatus_External");
596605
}
597606

598607
TransactionStatus_External to_external_api(TransactionStatus_Internal const& val) {
@@ -605,7 +614,8 @@ TransactionStatus_External to_external_api(TransactionStatus_Internal const& val
605614
return TransactionStatus_External::UNEXPECTED_ERROR;
606615
}
607616

608-
throw std::out_of_range("No known conversion from internal to external TransactionStatus API");
617+
throw std::out_of_range(
618+
"Unexpected value for everest::lib::API::V1_0::types::powermeter::TransactionStatus_Internal");
609619
}
610620

611621
ReplyStartTransaction_Internal to_internal_api(ReplyStartTransaction_External const& val) {

0 commit comments

Comments
 (0)