Merge pull request #127 from andacata/correct_some_property_types

fix(domain): Correct some property types
IZIVIA · Aug 2, 2024 · c083557 · c083557
2 parents 31d452c + 112adff
commit c083557
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/....2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/commands/domain/CancelReservation.kt b/....2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/commands/domain/CancelReservation.kt
@@ -1,6 +1,7 @@
 package com.izivia.ocpi.toolkit.modules.commands.domain
 
 import com.izivia.ocpi.toolkit.common.CiString
+import com.izivia.ocpi.toolkit.common.URL
 
 /**
  * @property responseUrl (max-length=255) URL that the CommandResult POST should be sent to. This URL might contain a
@@ -10,6 +11,6 @@ import com.izivia.ocpi.toolkit.common.CiString
  * a reservation that matches this reservationId the Charge Point will replace the reservation.
  */
 data class CancelReservation(
-    val responseUrl: CiString,
+    val responseUrl: URL,
     val reservationId: CiString
 )
diff --git a/...olkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/commands/domain/ReserveNow.kt b/...olkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/commands/domain/ReserveNow.kt
@@ -1,6 +1,7 @@
 package com.izivia.ocpi.toolkit.modules.commands.domain
 
 import com.izivia.ocpi.toolkit.common.CiString
+import com.izivia.ocpi.toolkit.common.URL
 import com.izivia.ocpi.toolkit.modules.tokens.domain.Token
 import java.time.Instant
 
@@ -25,7 +26,7 @@ import java.time.Instant
  * reference will be provided in the relevant Session and/or CDR.
  */
 data class ReserveNow(
-    val responseUrl: CiString,
+    val responseUrl: URL,
     val token: Token,
     val expiryDate: Instant,
     val reservationId: CiString,

diff --git a/...kit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/commands/domain/StartSession.kt b/...kit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/commands/domain/StartSession.kt
@@ -1,6 +1,7 @@
 package com.izivia.ocpi.toolkit.modules.commands.domain
 
 import com.izivia.ocpi.toolkit.common.CiString
+import com.izivia.ocpi.toolkit.common.URL
 import com.izivia.ocpi.toolkit.modules.tokens.domain.Token
 
 /**
@@ -23,7 +24,7 @@ import com.izivia.ocpi.toolkit.modules.tokens.domain.Token
  * reference will be provided in the relevant Session and/or CDR.
  */
 data class StartSession(
-    val responseUrl: CiString,
+    val responseUrl: URL,
     val token: Token,
     val locationId: CiString,
     val evseUid: CiString?,

diff --git a/...lkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/commands/domain/StopSession.kt b/...lkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/commands/domain/StopSession.kt
@@ -1,6 +1,7 @@
 package com.izivia.ocpi.toolkit.modules.commands.domain
 
 import com.izivia.ocpi.toolkit.common.CiString
+import com.izivia.ocpi.toolkit.common.URL
 
 /**
  * @property responseUrl (max-length-255) URL that the CommandResult POST should be sent to. This URL might contain a
@@ -9,6 +10,6 @@ import com.izivia.ocpi.toolkit.common.CiString
  * @property sessionId (max-length-36) Session.id of the Session that is requested to be stopped.
  */
 data class StopSession(
-    val responseUrl: CiString,
+    val responseUrl: URL,
     val sessionId: CiString
 )
diff --git a/...-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/commands/domain/UnlockConnector.kt b/...-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/commands/domain/UnlockConnector.kt
@@ -1,6 +1,7 @@
 package com.izivia.ocpi.toolkit.modules.commands.domain
 
 import com.izivia.ocpi.toolkit.common.CiString
+import com.izivia.ocpi.toolkit.common.URL
 
 /**
  * @property responseUrl (max-length=255) URL that the CommandResult POST should be sent to. This URL might contain a
@@ -16,7 +17,7 @@ import com.izivia.ocpi.toolkit.common.CiString
  * unlock.
  */
 data class UnlockConnector(
-    val responseUrl: CiString,
+    val responseUrl: URL,
     val locationId: CiString,
     val evseUid: CiString,
     val connectorId: CiString

diff --git a/....2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/domain/PublishTokenType.kt b/....2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/locations/domain/PublishTokenType.kt
@@ -26,5 +26,5 @@ data class PublishTokenType(
     val type: TokenType?,
     val visualNumber: String?,
     val issuer: String?,
-    val groupId: CiString
+    val groupId: CiString?
 )
diff --git a/ocpi-toolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tariff/domain/Tariff.kt b/ocpi-toolkit-2.2.1/src/main/kotlin/com/izivia/ocpi/toolkit/modules/tariff/domain/Tariff.kt
@@ -2,6 +2,7 @@ package com.izivia.ocpi.toolkit.modules.tariff.domain
 
 import com.izivia.ocpi.toolkit.annotations.Partial
 import com.izivia.ocpi.toolkit.common.CiString
+import com.izivia.ocpi.toolkit.common.URL
 import com.izivia.ocpi.toolkit.modules.locations.domain.EnergyMix
 import com.izivia.ocpi.toolkit.modules.types.DisplayText
 import com.izivia.ocpi.toolkit.modules.types.Price
@@ -47,7 +48,7 @@ data class Tariff(
     val countryCode: CiString,
     val currency: String,
     val tariffAltText: List<DisplayText>? = null,
-    val tariffAltUrl: CiString? = null,
+    val tariffAltUrl: URL? = null,
     val minPrice: Price? = null,
     val maxPrice: Price? = null,
     val elements: List<TariffElement>,