X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPRequestService.ts;h=17fc548438ac612c6fe6274d12a9d88c338a70fb;hb=5a6bab3beacdd3b357e7e624c37e4e414d493f6f;hp=f956d381b30109d14c708b06fae9c7637830d7f5;hpb=24d15716245469249b57e5aa790147d703d60a4e;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPRequestService.ts b/src/charging-station/ocpp/OCPPRequestService.ts index f956d381..17fc5484 100644 --- a/src/charging-station/ocpp/OCPPRequestService.ts +++ b/src/charging-station/ocpp/OCPPRequestService.ts @@ -47,7 +47,7 @@ export abstract class OCPPRequestService { private readonly version: OCPPVersion private readonly ocppResponseService: OCPPResponseService protected readonly ajv: Ajv - protected abstract jsonSchemasValidateFunction: Map> + protected abstract payloadValidateFunctions: Map> protected constructor (version: OCPPVersion, ocppResponseService: OCPPResponseService) { this.version = version @@ -158,13 +158,13 @@ export abstract class OCPPRequestService { if (chargingStation.stationInfo?.ocppStrictCompliance === false) { return true } - if (!this.jsonSchemasValidateFunction.has(commandName as RequestCommand)) { + if (!this.payloadValidateFunctions.has(commandName as RequestCommand)) { logger.warn( `${chargingStation.logPrefix()} ${moduleName}.validateRequestPayload: No JSON schema found for command '${commandName}' PDU validation` ) return true } - const validate = this.jsonSchemasValidateFunction.get(commandName as RequestCommand) + const validate = this.payloadValidateFunctions.get(commandName as RequestCommand) payload = clone(payload) OCPPServiceUtils.convertDateToISOString(payload) if (validate?.(payload) === true) { @@ -192,7 +192,7 @@ export abstract class OCPPRequestService { return true } if ( - !this.ocppResponseService.jsonSchemasIncomingRequestResponseValidateFunction.has( + !this.ocppResponseService.incomingRequestResponsePayloadValidateFunctions.has( commandName as IncomingRequestCommand ) ) { @@ -201,10 +201,9 @@ export abstract class OCPPRequestService { ) return true } - const validate = - this.ocppResponseService.jsonSchemasIncomingRequestResponseValidateFunction.get( - commandName as IncomingRequestCommand - ) + const validate = this.ocppResponseService.incomingRequestResponsePayloadValidateFunctions.get( + commandName as IncomingRequestCommand + ) payload = clone(payload) OCPPServiceUtils.convertDateToISOString(payload) if (validate?.(payload) === true) {