Merge pull request #72 from KamlinneBebora-ly4sh/feat/add-request-res…

…ponse-interface-in-messages

feat: add Request and Response interface

ocpp-1-6-api-adapter/src/main/kotlin/com/izivia/ocpp/adapter16/mapper/SetChargingProfileMapper.kt

@@ -29,4 +29,4 @@ abstract class SetChargingProfileMapper {
     )
     abstract fun coreToGenReq(setChargingProfileReq: SetChargingProfileReq): SetChargingProfileReqGen
 
-}
+}

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/Request.kt

@@ -0,0 +1,3 @@
+package com.izivia.ocpp.core16.model
+
+interface Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/Response.kt

@@ -0,0 +1,3 @@
+package com.izivia.ocpp.core16.model
+
+interface Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/authorize/AuthorizeReq.kt

@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.authorize
 
+import com.izivia.ocpp.core16.model.Request
+
 data class AuthorizeReq(
     val idTag: String
-)
+) : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/authorize/AuthorizeResp.kt

@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.authorize
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.common.IdTagInfo
 
 data class AuthorizeResp(
     val idTagInfo: IdTagInfo
-)
+) : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/bootnotification/BootNotificationReq.kt

@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.bootnotification
 
+import com.izivia.ocpp.core16.model.Request
+
 data class BootNotificationReq(
     val chargePointModel: String,
     val chargePointVendor: String,
@@ -10,4 +12,4 @@ data class BootNotificationReq(
     val imsi: String? = null,
     val meterSerialNumber: String? = null,
     val meterType: String? = null
-)
+) : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/bootnotification/BootNotificationResp.kt

@@ -1,10 +1,11 @@
 package com.izivia.ocpp.core16.model.bootnotification
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.bootnotification.enumeration.RegistrationStatus
 import kotlinx.datetime.Instant
 
 data class BootNotificationResp(
     val currentTime: Instant,
     val interval: Int,
     val status: RegistrationStatus
-)
+) : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/cancelreservation/CancelReservationReq.kt

@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.cancelreservation
 
+import com.izivia.ocpp.core16.model.Request
+
 data class CancelReservationReq(
     val reservationId: Int
-)
+) : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/cancelreservation/CancelReservationResp.kt

@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.cancelreservation
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.cancelreservation.enumeration.CancelReservationStatus
 
 data class CancelReservationResp(
     val status: CancelReservationStatus
-)
+) : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/certificatesigned/CertificateSignedReq.kt

@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.certificatesigned
 
+import com.izivia.ocpp.core16.model.Request
+
 data class CertificateSignedReq(
     val certificateChain: String
-)
+) : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/certificatesigned/CertificateSignedResp.kt

@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.certificatesigned
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.certificatesigned.enumeration.DeleteCertificateStatusEnumType
 
 data class CertificateSignedResp(
     val status: DeleteCertificateStatusEnumType
-)
+) : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeavailability/ChangeAvailabilityReq.kt

@@ -1,8 +1,9 @@
 package com.izivia.ocpp.core16.model.changeavailability
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.changeavailability.enumeration.AvailabilityType
 
 data class ChangeAvailabilityReq(
     val connectorId: Int,
     val type: AvailabilityType
-)
+) : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeavailability/ChangeAvailabilityResp.kt

@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.changeavailability
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.changeavailability.enumeration.AvailabilityStatus
 
 data class ChangeAvailabilityResp(
     val status: AvailabilityStatus
-)
+) : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeconfiguration/ChangeConfigurationReq.kt

@@ -1,6 +1,8 @@
 package com.izivia.ocpp.core16.model.changeconfiguration
 
+import com.izivia.ocpp.core16.model.Request
+
 data class ChangeConfigurationReq(
     val key: String,
     val value: String
-)
+) : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/changeconfiguration/ChangeConfigurationResp.kt

@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.changeconfiguration
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.changeconfiguration.enumeration.ConfigurationStatus
 
 data class ChangeConfigurationResp(
     val status: ConfigurationStatus
-)
+) : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearcache/ClearCacheReq.kt

@@ -1,3 +1,5 @@
 package com.izivia.ocpp.core16.model.clearcache
 
-class ClearCacheReq
+import com.izivia.ocpp.core16.model.Request
+
+class ClearCacheReq : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearcache/ClearCacheResp.kt

@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.clearcache
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.clearcache.enumeration.ClearCacheStatus
 
 data class ClearCacheResp(
     val status: ClearCacheStatus
-)
+) : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearchargingprofile/ClearChargingProfileReq.kt

@@ -1,10 +1,11 @@
 package com.izivia.ocpp.core16.model.clearchargingprofile
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.common.enumeration.ChargingProfilePurposeType
 
 data class ClearChargingProfileReq(
     val id: Int? = null,
     val connectorId: Int? = null,
     val chargingProfilePurpose: ChargingProfilePurposeType? = null,
     val stackLevel: Int? = null
-)
+) : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/clearchargingprofile/ClearChargingProfileResp.kt

@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.clearchargingprofile
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.clearchargingprofile.enumeration.ClearChargingProfileStatus
 
 data class ClearChargingProfileResp(
     val status: ClearChargingProfileStatus
-)
+) : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/common/enumeration/Actions.kt

@@ -8,7 +8,7 @@ import com.izivia.ocpp.core16.model.cancelreservation.CancelReservationReq
 import com.izivia.ocpp.core16.model.cancelreservation.CancelReservationResp
 import com.izivia.ocpp.core16.model.certificatesigned.CertificateSignedReq
 import com.izivia.ocpp.core16.model.certificatesigned.CertificateSignedResp
-import com.izivia.ocpp.core16.model.certificatesigned.DeleteCertificateResp
+import com.izivia.ocpp.core16.model.deletecertificate.DeleteCertificateResp
 import com.izivia.ocpp.core16.model.changeavailability.ChangeAvailabilityReq
 import com.izivia.ocpp.core16.model.changeavailability.ChangeAvailabilityResp
 import com.izivia.ocpp.core16.model.changeconfiguration.ChangeConfigurationReq
@@ -24,8 +24,8 @@ import com.izivia.ocpp.core16.model.diagnosticsstatusnotification.DiagnosticsSta
 import com.izivia.ocpp.core16.model.diagnosticsstatusnotification.DiagnosticsStatusNotificationResp
 import com.izivia.ocpp.core16.model.firmwarestatusnotification.FirmwareStatusNotificationReq
 import com.izivia.ocpp.core16.model.firmwarestatusnotification.FirmwareStatusNotificationResp
-import com.izivia.ocpp.core16.model.firmwarestatusnotification.SignedFirmwareStatusNotificationReq
-import com.izivia.ocpp.core16.model.firmwarestatusnotification.SignedFirmwareStatusNotificationResp
+import com.izivia.ocpp.core16.model.signedfirmwarestatusnotification.SignedFirmwareStatusNotificationReq
+import com.izivia.ocpp.core16.model.signedfirmwarestatusnotification.SignedFirmwareStatusNotificationResp
 import com.izivia.ocpp.core16.model.getcompositeschedule.GetCompositeScheduleReq
 import com.izivia.ocpp.core16.model.getcompositeschedule.GetCompositeScheduleResp
 import com.izivia.ocpp.core16.model.getconfiguration.GetConfigurationReq
@@ -68,14 +68,14 @@ import com.izivia.ocpp.core16.model.statusnotification.StatusNotificationReq
 import com.izivia.ocpp.core16.model.statusnotification.StatusNotificationResp
 import com.izivia.ocpp.core16.model.stoptransaction.StopTransactionReq
 import com.izivia.ocpp.core16.model.stoptransaction.StopTransactionResp
-import com.izivia.ocpp.core16.model.triggermessage.ExtendedTriggerMessageReq
-import com.izivia.ocpp.core16.model.triggermessage.ExtendedTriggerMessageResp
+import com.izivia.ocpp.core16.model.extendedtriggermessage.ExtendedTriggerMessageReq
+import com.izivia.ocpp.core16.model.extendedtriggermessage.ExtendedTriggerMessageResp
 import com.izivia.ocpp.core16.model.triggermessage.TriggerMessageReq
 import com.izivia.ocpp.core16.model.triggermessage.TriggerMessageResp
 import com.izivia.ocpp.core16.model.unlockconnector.UnlockConnectorReq
 import com.izivia.ocpp.core16.model.unlockconnector.UnlockConnectorResp
-import com.izivia.ocpp.core16.model.updatefirmware.SignedUpdateFirmwareReq
-import com.izivia.ocpp.core16.model.updatefirmware.SignedUpdateFirmwareResp
+import com.izivia.ocpp.core16.model.signedupdatefirmware.SignedUpdateFirmwareReq
+import com.izivia.ocpp.core16.model.signedupdatefirmware.SignedUpdateFirmwareResp
 import com.izivia.ocpp.core16.model.updatefirmware.UpdateFirmwareReq
 import com.izivia.ocpp.core16.model.updatefirmware.UpdateFirmwareResp
 import com.izivia.ocpp.utils.IActions

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/datatransfer/DataTransferReq.kt

@@ -1,7 +1,9 @@
 package com.izivia.ocpp.core16.model.datatransfer
 
+import com.izivia.ocpp.core16.model.Request
+
 data class DataTransferReq(
     val vendorId: String,
     val messageId: String? = null,
     val data: String? = null
-)
+) : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/datatransfer/DataTransferResp.kt

@@ -1,8 +1,9 @@
 package com.izivia.ocpp.core16.model.datatransfer
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.datatransfer.enumeration.DataTransferStatus
 
 data class DataTransferResp(
     val status: DataTransferStatus,
     val data: String? = null
-)
+) : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/deletecertificate/DeleteCertificateReq.kt

@@ -1,10 +1,11 @@
 package com.izivia.ocpp.core16.model.deletecertificate
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.deletecertificate.enumeration.HashAlgorithmEnumType
 
 data class DeleteCertificateReq(
     val certificateHashData: CertificateHashDataType
-)
+) : Request
 
 data class CertificateHashDataType(
     val hashAlgorithm: HashAlgorithmEnumType,

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/deletecertificate/DeleteCertificateResp.kt

@@ -1,7 +1,8 @@
-package com.izivia.ocpp.core16.model.certificatesigned
+package com.izivia.ocpp.core16.model.deletecertificate
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.certificatesigned.enumeration.DeleteCertificateStatusEnumType
 
 data class DeleteCertificateResp(
     val status: DeleteCertificateStatusEnumType
-)
+) : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/diagnosticsstatusnotification/DiagnosticsStatusNotificationReq.kt

@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.diagnosticsstatusnotification
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.diagnosticsstatusnotification.enumeration.DiagnosticsStatus
 
 data class DiagnosticsStatusNotificationReq(
-        val status: DiagnosticsStatus
-)
+    val status: DiagnosticsStatus
+) : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/diagnosticsstatusnotification/DiagnosticsStatusNotificationResp.kt

@@ -1,3 +1,5 @@
 package com.izivia.ocpp.core16.model.diagnosticsstatusnotification
 
-class DiagnosticsStatusNotificationResp
+import com.izivia.ocpp.core16.model.Response
+
+class DiagnosticsStatusNotificationResp : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/extendedtriggermessage/ExtendedTriggerMessageReq.kt

@@ -1,8 +1,9 @@
-package com.izivia.ocpp.core16.model.triggermessage
+package com.izivia.ocpp.core16.model.extendedtriggermessage
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.triggermessage.enumeration.MessageTrigger
 
 data class ExtendedTriggerMessageReq(
     val requestedMessage: MessageTrigger,
     val connectorId: Int? = null
-)
+) : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/extendedtriggermessage/ExtendedTriggerMessageResp.kt

@@ -1,7 +1,8 @@
-package com.izivia.ocpp.core16.model.triggermessage
+package com.izivia.ocpp.core16.model.extendedtriggermessage
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.triggermessage.enumeration.TriggerMessageStatus
 
 data class ExtendedTriggerMessageResp(
     val status: TriggerMessageStatus
-)
+) : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/firmwarestatusnotification/FirmwareStatusNotificationReq.kt

@@ -1,7 +1,8 @@
 package com.izivia.ocpp.core16.model.firmwarestatusnotification
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.firmwarestatusnotification.enumeration.FirmwareStatus
 
 data class FirmwareStatusNotificationReq(
-        val status: FirmwareStatus
-)
+    val status: FirmwareStatus
+) : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/firmwarestatusnotification/FirmwareStatusNotificationResp.kt

@@ -1,3 +1,5 @@
 package com.izivia.ocpp.core16.model.firmwarestatusnotification
 
-class FirmwareStatusNotificationResp
+import com.izivia.ocpp.core16.model.Response
+
+class FirmwareStatusNotificationResp : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getcompositeschedule/GetCompositeScheduleReq.kt

@@ -1,9 +1,10 @@
 package com.izivia.ocpp.core16.model.getcompositeschedule
 
+import com.izivia.ocpp.core16.model.Request
 import com.izivia.ocpp.core16.model.common.enumeration.ChargingRateUnitType
 
 data class GetCompositeScheduleReq(
     val connectorId: Int,
     val duration: Int,
     val chargingRateUnit: ChargingRateUnitType? = null
-)
+) : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getcompositeschedule/GetCompositeScheduleResp.kt

@@ -1,5 +1,6 @@
 package com.izivia.ocpp.core16.model.getcompositeschedule
 
+import com.izivia.ocpp.core16.model.Response
 import com.izivia.ocpp.core16.model.common.ChargingSchedule
 import com.izivia.ocpp.core16.model.getcompositeschedule.enumeration.GetCompositeScheduleStatus
 import kotlinx.datetime.Instant
@@ -9,4 +10,4 @@ data class GetCompositeScheduleResp(
     val connectorId: Int? = null,
     val scheduleStart: Instant? = null,
     val chargingSchedule: ChargingSchedule? = null
-)
+) : Response

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getconfiguration/GetConfigurationReq.kt

@@ -1,5 +1,7 @@
 package com.izivia.ocpp.core16.model.getconfiguration
 
+import com.izivia.ocpp.core16.model.Request
+
 data class GetConfigurationReq(
     val key: List<String>? = null
-)
+) : Request

ocpp-1-6-core/src/main/kotlin/com/izivia/ocpp/core16/model/getconfiguration/GetConfigurationResp.kt

@@ -1,6 +1,8 @@
 package com.izivia.ocpp.core16.model.getconfiguration
 
+import com.izivia.ocpp.core16.model.Response
+
 data class GetConfigurationResp(
     val configurationKey: List<KeyValue>? = null,
     val unknownKey: List<String>? = null
-)
+) : Response