repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanups uneeded encapsulating methods
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
ocpp
/
OCPPResponseService.ts
diff --git
a/src/charging-station/ocpp/OCPPResponseService.ts
b/src/charging-station/ocpp/OCPPResponseService.ts
index 905d972a3bc2348eee28bc6d9d347e4e8ec9e6b7..3f69655ec82dfaa573bb04b269e244c45c3a4102 100644
(file)
--- a/
src/charging-station/ocpp/OCPPResponseService.ts
+++ b/
src/charging-station/ocpp/OCPPResponseService.ts
@@
-1,27
+1,29
@@
-import { JSONSchemaType } from 'ajv';
+import
type
{ JSONSchemaType } from 'ajv';
import Ajv from 'ajv-draft-04';
import ajvFormats from 'ajv-formats';
import OCPPError from '../../exception/OCPPError';
import Ajv from 'ajv-draft-04';
import ajvFormats from 'ajv-formats';
import OCPPError from '../../exception/OCPPError';
-import { JsonType } from '../../types/JsonType';
-import { ErrorType } from '../../types/ocpp/ErrorType';
-import { RequestCommand } from '../../types/ocpp/Requests';
+import type { JsonType } from '../../types/JsonType';
+import type { RequestCommand } from '../../types/ocpp/Requests';
import logger from '../../utils/Logger';
import type ChargingStation from '../ChargingStation';
import logger from '../../utils/Logger';
import type ChargingStation from '../ChargingStation';
+import { OCPPServiceUtils } from './OCPPServiceUtils';
const moduleName = 'OCPPResponseService';
export default abstract class OCPPResponseService {
private static instance: OCPPResponseService | null = null;
const moduleName = 'OCPPResponseService';
export default abstract class OCPPResponseService {
private static instance: OCPPResponseService | null = null;
- private ajv: Ajv;
+ private
readonly
ajv: Ajv;
protected constructor() {
this.ajv = new Ajv();
ajvFormats(this.ajv);
protected constructor() {
this.ajv = new Ajv();
ajvFormats(this.ajv);
+ this.responseHandler.bind(this);
+ this.validateResponsePayload.bind(this);
}
public static getInstance<T extends OCPPResponseService>(this: new () => T): T {
}
public static getInstance<T extends OCPPResponseService>(this: new () => T): T {
- if (
!OCPPResponseService.instance
) {
+ if (
OCPPResponseService.instance === null
) {
OCPPResponseService.instance = new this();
}
return OCPPResponseService.instance as T;
OCPPResponseService.instance = new this();
}
return OCPPResponseService.instance as T;
@@
-33,7
+35,7
@@
export default abstract class OCPPResponseService {
schema: JSONSchemaType<T>,
payload: T
): boolean {
schema: JSONSchemaType<T>,
payload: T
): boolean {
- if (
!chargingStation.getPayloadSchemaValidation()
) {
+ if (
chargingStation.getPayloadSchemaValidation() === false
) {
return true;
}
const validate = this.ajv.compile(schema);
return true;
}
const validate = this.ajv.compile(schema);
@@
-45,13
+47,17
@@
export default abstract class OCPPResponseService {
validate.errors
);
throw new OCPPError(
validate.errors
);
throw new OCPPError(
-
ErrorType.FORMATION_VIOLATION
,
+
OCPPServiceUtils.ajvErrorsToErrorType(validate.errors)
,
'Response PDU is invalid',
commandName,
JSON.stringify(validate.errors, null, 2)
);
}
'Response PDU is invalid',
commandName,
JSON.stringify(validate.errors, null, 2)
);
}
+ protected emptyResponseHandler() {
+ /* This is intentional */
+ }
+
public abstract responseHandler(
chargingStation: ChargingStation,
commandName: RequestCommand,
public abstract responseHandler(
chargingStation: ChargingStation,
commandName: RequestCommand,