fix: change parameter optionality of data classes of queries

open200 · Nov 23, 2023 · 68e619c · 68e619c
1 parent 906b017
commit 68e619c
Show file tree

Hide file tree

Showing 35 changed files with 67 additions and 64 deletions.
diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/XesarConnect.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/XesarConnect.kt
@@ -14,12 +14,12 @@ import com.open200.xesar.connect.messages.command.*
 import com.open200.xesar.connect.messages.query.*
 import com.open200.xesar.connect.messages.query.Calendar
 import com.open200.xesar.connect.messages.session.*
-import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.Channel
-import mu.KotlinLogging
 import java.util.*
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.CopyOnWriteArraySet
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.Channel
+import mu.KotlinLogging
 
 val logger = KotlinLogging.logger {}
 

diff --git a/...r-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/AccessProtocolEvent.kt b/...r-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/AccessProtocolEvent.kt
@@ -4,11 +4,11 @@ import QueryListResource
 import com.open200.xesar.connect.exception.ParsingException
 import com.open200.xesar.connect.utils.LocalDateTimeSerializer
 import com.open200.xesar.connect.utils.UUIDSerializer
+import java.time.LocalDateTime
+import java.util.*
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
-import java.time.LocalDateTime
-import java.util.*
 
 /**
  * Represents an access protocol in the system.
@@ -45,7 +45,8 @@ import java.util.*
 data class AccessProtocolEvent(
     @Serializable(with = UUIDSerializer::class) val id: UUID,
     val entryIdentificator: Int,
-    @Serializable(with = LocalDateTimeSerializer::class) val timestampComponentLocal: LocalDateTime? = null,
+    @Serializable(with = LocalDateTimeSerializer::class)
+    val timestampComponentLocal: LocalDateTime? = null,
     @Serializable(with = LocalDateTimeSerializer::class) val timestampUtc: LocalDateTime? = null,
     @Serializable(with = LocalDateTimeSerializer::class) val receivedAt: LocalDateTime? = null,
     val eventType: EventType,

diff --git a/...-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/AuthorizationProfile.kt b/...-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/AuthorizationProfile.kt
@@ -3,8 +3,8 @@ package com.open200.xesar.connect.messages.query
 import QueryElementResource
 import QueryListResource
 import com.open200.xesar.connect.utils.UUIDSerializer
-import kotlinx.serialization.Serializable
 import java.util.*
+import kotlinx.serialization.Serializable
 
 /**
  * Represents an authorization profile in the system.

diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/Calendar.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/Calendar.kt
@@ -4,9 +4,9 @@ import QueryElementResource
 import QueryListResource
 import com.open200.xesar.connect.utils.LocalDateSerializer
 import com.open200.xesar.connect.utils.UUIDSerializer
-import kotlinx.serialization.Serializable
 import java.time.LocalDate
 import java.util.*
+import kotlinx.serialization.Serializable
 
 /**
  * Represents a calendar in the system.

diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/CodingStation.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/CodingStation.kt
@@ -4,9 +4,9 @@ import QueryElementResource
 import QueryListResource
 import com.open200.xesar.connect.utils.LocalDateTimeSerializer
 import com.open200.xesar.connect.utils.UUIDSerializer
-import kotlinx.serialization.Serializable
 import java.time.LocalDateTime
 import java.util.*
+import kotlinx.serialization.Serializable
 
 /**
  * Represents a coding station in the system.

diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/EvvaComponent.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/EvvaComponent.kt
@@ -4,9 +4,9 @@ import QueryElementResource
 import QueryListResource
 import com.open200.xesar.connect.utils.LocalDateTimeSerializer
 import com.open200.xesar.connect.utils.UUIDSerializer
-import kotlinx.serialization.Serializable
 import java.time.LocalDateTime
 import java.util.*
+import kotlinx.serialization.Serializable
 
 /**
  * Represents an EVVA component in the system.

diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/ExceptionTimeSerie.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/ExceptionTimeSerie.kt
@@ -1,8 +1,8 @@
 package com.open200.xesar.connect.messages.query
 
 import com.open200.xesar.connect.utils.UUIDSerializer
-import kotlinx.serialization.Serializable
 import java.util.*
+import kotlinx.serialization.Serializable
 
 /**
  * Represents a set of time intervals that are valid at exceptional days (defined using a calendar).

diff --git a/...-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/IdentificationMedium.kt b/...-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/IdentificationMedium.kt
@@ -4,9 +4,9 @@ import QueryElementResource
 import QueryListResource
 import com.open200.xesar.connect.utils.LocalDateTimeSerializer
 import com.open200.xesar.connect.utils.UUIDSerializer
-import kotlinx.serialization.Serializable
 import java.time.LocalDateTime
 import java.util.*
+import kotlinx.serialization.Serializable
 
 /**
  * Represents an identification media in the system.
@@ -49,7 +49,6 @@ import java.util.*
  * @param requiredAction The required action for the identification media.
  * @param mediumType The type of the identification media (optional).
  */
-
 @Serializable
 data class IdentificationMedium(
     @Serializable(with = UUIDSerializer::class) val id: UUID,

diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/InstallationPoint.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/InstallationPoint.kt
@@ -3,8 +3,8 @@ package com.open200.xesar.connect.messages.query
 import QueryElementResource
 import QueryListResource
 import com.open200.xesar.connect.utils.UUIDSerializer
-import kotlinx.serialization.Serializable
 import java.util.*
+import kotlinx.serialization.Serializable
 
 /**
  * Represents an installation point in the system.

diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/OfficeMode.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/OfficeMode.kt
@@ -4,9 +4,9 @@ import QueryElementResource
 import QueryListResource
 import com.open200.xesar.connect.utils.LocalTimeSerializer
 import com.open200.xesar.connect.utils.UUIDSerializer
-import kotlinx.serialization.Serializable
 import java.time.LocalTime
 import java.util.*
+import kotlinx.serialization.Serializable
 
 /**
  * Represents an office mode in the system.

diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/Person.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/Person.kt
@@ -3,8 +3,8 @@ package com.open200.xesar.connect.messages.query
 import QueryElementResource
 import QueryListResource
 import com.open200.xesar.connect.utils.UUIDSerializer
-import kotlinx.serialization.Serializable
 import java.util.*
+import kotlinx.serialization.Serializable
 
 /**
  * Represents a person in the system.

diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/TimeProfile.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/TimeProfile.kt
@@ -4,9 +4,9 @@ import QueryElementResource
 import QueryListResource
 import com.open200.xesar.connect.utils.LocalTimeSerializer
 import com.open200.xesar.connect.utils.UUIDSerializer
-import kotlinx.serialization.Serializable
 import java.time.LocalTime
 import java.util.*
+import kotlinx.serialization.Serializable
 
 @Serializable
 data class TimeProfile(

diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/TimeSerie.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/TimeSerie.kt
@@ -1,8 +1,8 @@
 package com.open200.xesar.connect.messages.query
 
 import com.open200.xesar.connect.utils.LocalTimeSerializer
-import kotlinx.serialization.Serializable
 import java.time.LocalTime
+import kotlinx.serialization.Serializable
 
 @Serializable
 data class TimeSerie(val times: List<TimeRange>, val days: List<Weekday>) {

diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/User.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/User.kt
@@ -4,9 +4,9 @@ import QueryElementResource
 import QueryListResource
 import com.open200.xesar.connect.utils.LocalDateTimeSerializer
 import com.open200.xesar.connect.utils.UUIDSerializer
-import kotlinx.serialization.Serializable
 import java.time.LocalDateTime
 import java.util.*
+import kotlinx.serialization.Serializable
 
 /**
  * Represents a user.

diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/Zone.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/messages/query/Zone.kt
@@ -3,8 +3,8 @@ package com.open200.xesar.connect.messages.query
 import QueryElementResource
 import QueryListResource
 import com.open200.xesar.connect.utils.UUIDSerializer
-import kotlinx.serialization.Serializable
 import java.util.*
+import kotlinx.serialization.Serializable
 
 @Serializable
 data class Zone(

diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/utils/LocalDateSerializer.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/utils/LocalDateSerializer.kt
@@ -1,12 +1,12 @@
 package com.open200.xesar.connect.utils
 
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import java.time.LocalDate
-import java.time.format.DateTimeFormatter
 
 object LocalDateSerializer : KSerializer<LocalDate> {
     override val descriptor = PrimitiveSerialDescriptor("LocalDate", PrimitiveKind.STRING)

diff --git a/xesar-connect/src/main/kotlin/com/open200/xesar/connect/utils/LocalTimeSerializer.kt b/xesar-connect/src/main/kotlin/com/open200/xesar/connect/utils/LocalTimeSerializer.kt
@@ -1,12 +1,12 @@
 package com.open200.xesar.connect.utils
 
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import java.time.LocalTime
-import java.time.format.DateTimeFormatter
 
 object LocalTimeSerializer : KSerializer<LocalTime> {
     override val descriptor = PrimitiveSerialDescriptor("LocalTime", PrimitiveKind.STRING)

diff --git a/xesar-connect/src/test/kotlin/com/open200/xesar/connect/DelayUntilCloseTest.kt b/xesar-connect/src/test/kotlin/com/open200/xesar/connect/DelayUntilCloseTest.kt
@@ -16,7 +16,7 @@ class DelayUntilCloseTest :
     FunSpec({
         val container = MosquittoContainer.container()
         val config = MosquittoContainer.config(container)
-        listener(container.perProject(container.containerName))
+        listener(container.perProject())
 
         test("test the delayUntilClose method") {
             val waitingForMessage = CompletableDeferred<Unit>()

diff --git a/...connect/src/test/kotlin/com/open200/xesar/connect/encodingDecoding/CalendarElementTest.kt b/...connect/src/test/kotlin/com/open200/xesar/connect/encodingDecoding/CalendarElementTest.kt
@@ -18,7 +18,7 @@ class CalendarElementTest :
                 CalendarFixture.calendarFixture)
 
         val calendarString =
-            "{\"requestId\":\"d385ab22-0f51-4b97-9ecd-b8ff3fd4fcb6\",\"response\":{\"serialVersionUID\":0,\"partitionId\":\"7b4399a0-21ce-4bee-ba43-e06e291248d2\",\"name\":\"string\",\"specialDays\":[\"2019-08-24\"],\"id\":\"497f6eca-6276-4993-bfeb-53cbbbba6f08\"}}"
+            "{\"requestId\":\"d385ab22-0f51-4b97-9ecd-b8ff3fd4fcb6\",\"response\":{\"partitionId\":\"7b4399a0-21ce-4bee-ba43-e06e291248d2\",\"name\":\"string\",\"specialDays\":[\"2019-08-24\"],\"id\":\"497f6eca-6276-4993-bfeb-53cbbbba6f08\"}}"
 
         test("encoding QueryElement for a calendar") {
             val calendarEncoded = encodeQueryElement(calendar)

diff --git a/xesar-connect/src/test/kotlin/com/open200/xesar/connect/encodingDecoding/CalendarListTest.kt b/xesar-connect/src/test/kotlin/com/open200/xesar/connect/encodingDecoding/CalendarListTest.kt
@@ -25,7 +25,7 @@ class CalendarListTest :
                     2))
 
         val calendarString =
-            "{\"requestId\":\"ffcf5e00-83ad-40cb-b37b-e91abb6f75cd\",\"response\":{\"data\":[{\"serialVersionUID\":0,\"partitionId\":\"7b4399a0-21ce-4bee-ba43-e06e291248d2\",\"name\":\"string\",\"specialDays\":[\"2019-08-24\"],\"id\":\"497f6eca-6276-4993-bfeb-53cbbbba6f08\"},{\"serialVersionUID\":0,\"partitionId\":\"7b4399a0-21ce-4bee-ba43-e06e291248d2\",\"name\":\"string\",\"specialDays\":[\"2019-08-24\"],\"id\":\"555e7d1a-54f1-432a-ade7-80d20a63ee2d\"}],\"totalCount\":2,\"filterCount\":2}}"
+            "{\"requestId\":\"ffcf5e00-83ad-40cb-b37b-e91abb6f75cd\",\"response\":{\"data\":[{\"partitionId\":\"7b4399a0-21ce-4bee-ba43-e06e291248d2\",\"name\":\"string\",\"specialDays\":[\"2019-08-24\"],\"id\":\"497f6eca-6276-4993-bfeb-53cbbbba6f08\"},{\"partitionId\":\"7b4399a0-21ce-4bee-ba43-e06e291248d2\",\"name\":\"string\",\"specialDays\":[\"2019-08-24\"],\"id\":\"555e7d1a-54f1-432a-ade7-80d20a63ee2d\"}],\"totalCount\":2,\"filterCount\":2}}"
 
         test("encoding QueryList for a list of calendars") {
             val calendarEncoded = encodeQueryList(calendarList)

diff --git a/...ect/src/test/kotlin/com/open200/xesar/connect/encodingDecoding/LocalDateSerializerTest.kt b/...ect/src/test/kotlin/com/open200/xesar/connect/encodingDecoding/LocalDateSerializerTest.kt
@@ -3,10 +3,10 @@ package com.open200.xesar.connect.encodingDecoding
 import com.open200.xesar.connect.utils.LocalDateSerializer
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.equals.shouldBeEqual
-import kotlinx.serialization.json.Json
-import org.junit.jupiter.api.assertThrows
 import java.time.LocalDate
 import java.time.format.DateTimeParseException
+import kotlinx.serialization.json.Json
+import org.junit.jupiter.api.assertThrows
 
 class LocalDateSerializerTest :
     FunSpec({

diff --git a/...ect/src/test/kotlin/com/open200/xesar/connect/encodingDecoding/LocalTimeSerializerTest.kt b/...ect/src/test/kotlin/com/open200/xesar/connect/encodingDecoding/LocalTimeSerializerTest.kt
@@ -3,10 +3,10 @@ package com.open200.xesar.connect.encodingDecoding
 import com.open200.xesar.connect.utils.LocalTimeSerializer
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.equals.shouldBeEqual
-import kotlinx.serialization.json.Json
-import org.junit.jupiter.api.assertThrows
 import java.time.LocalTime
 import java.time.format.DateTimeParseException
+import kotlinx.serialization.json.Json
+import org.junit.jupiter.api.assertThrows
 
 class LocalTimeSerializerTest :
     FunSpec({

diff --git a/...-connect/src/test/kotlin/com/open200/xesar/connect/query/QueryAuthorizationProfileTest.kt b/...-connect/src/test/kotlin/com/open200/xesar/connect/query/QueryAuthorizationProfileTest.kt
@@ -12,9 +12,9 @@ import io.kotest.core.spec.style.FunSpec
 import io.kotest.extensions.testcontainers.perProject
 import io.kotest.matchers.equals.shouldBeEqual
 import io.mockk.coEvery
+import java.util.*
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.launch
-import java.util.*
 
 class QueryAuthorizationProfileTest :
     FunSpec({
@@ -80,8 +80,8 @@ class QueryAuthorizationProfileTest :
                             .await()
                         val result = api.queryAuthorizationProfilesListAsync().await()
                         result.totalCount.shouldBeEqual(2)
-                        result.data[0].name?.shouldBeEqual("authorization profile 1 String")
-                        result.data[1].name?.shouldBeEqual("authorization profile 2")
+                        result.data[0].name.shouldBeEqual("authorization profile 1 String")
+                        result.data[1].name.shouldBeEqual("authorization profile 2")
                     }
                 }
             }
@@ -136,7 +136,7 @@ class QueryAuthorizationProfileTest :
                             api.queryAuthorizationProfilesByIdAsync(authorizationProfileFixture.id)
                                 .await()
                         result.id.shouldBeEqual(authorizationProfileFixture.id)
-                        result.name?.shouldBeEqual("authorization profile 1 String")
+                        result.name.shouldBeEqual("authorization profile 1 String")
                     }
                 }
             }

diff --git a/xesar-connect/src/test/kotlin/com/open200/xesar/connect/query/QueryCalendarTest.kt b/xesar-connect/src/test/kotlin/com/open200/xesar/connect/query/QueryCalendarTest.kt
@@ -13,9 +13,9 @@ import io.kotest.core.spec.style.FunSpec
 import io.kotest.extensions.testcontainers.perProject
 import io.kotest.matchers.equals.shouldBeEqual
 import io.mockk.coEvery
+import java.util.*
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.launch
-import java.util.*
 
 class QueryCalendarTest :
     FunSpec({
@@ -82,10 +82,10 @@ class QueryCalendarTest :
                         result.totalCount.shouldBeEqual(2)
                         result.data[0]
                             .partitionId
-                            ?.shouldBeEqual(UUID.fromString("7b4399a0-21ce-4bee-ba43-e06e291248d2"))
+                            .shouldBeEqual(UUID.fromString("7b4399a0-21ce-4bee-ba43-e06e291248d2"))
                         result.data[1]
                             .partitionId
-                            ?.shouldBeEqual(UUID.fromString("6b4399a0-21ce-4bee-ba43-e06e291248d2"))
+                            .shouldBeEqual(UUID.fromString("6b4399a0-21ce-4bee-ba43-e06e291248d2"))
                     }
                 }
             }
@@ -137,7 +137,7 @@ class QueryCalendarTest :
                         val result =
                             api.queryCalendarByIdAsync(CalendarFixture.calendarFixture.id).await()
                         result.id.shouldBeEqual(CalendarFixture.calendarFixture.id)
-                        result.name?.shouldBeEqual("string")
+                        result.name.shouldBeEqual("string")
                     }
                 }
             }

diff --git a/xesar-connect/src/test/kotlin/com/open200/xesar/connect/query/QueryCodingStationTest.kt b/xesar-connect/src/test/kotlin/com/open200/xesar/connect/query/QueryCodingStationTest.kt
@@ -12,9 +12,9 @@ import io.kotest.core.spec.style.FunSpec
 import io.kotest.extensions.testcontainers.perProject
 import io.kotest.matchers.equals.shouldBeEqual
 import io.mockk.coEvery
+import java.util.*
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.launch
-import java.util.*
 
 class QueryCodingStationTest :
     FunSpec({

diff --git a/xesar-connect/src/test/kotlin/com/open200/xesar/connect/query/QueryEvvaComponentTest.kt b/xesar-connect/src/test/kotlin/com/open200/xesar/connect/query/QueryEvvaComponentTest.kt
@@ -12,9 +12,9 @@ import io.kotest.core.spec.style.FunSpec
 import io.kotest.extensions.testcontainers.perProject
 import io.kotest.matchers.equals.shouldBeEqual
 import io.mockk.coEvery
+import java.util.*
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.launch
-import java.util.*
 
 class QueryEvvaComponentTest :
     FunSpec({

diff --git a/...-connect/src/test/kotlin/com/open200/xesar/connect/query/QueryIdentificationMediumTest.kt b/...-connect/src/test/kotlin/com/open200/xesar/connect/query/QueryIdentificationMediumTest.kt
@@ -15,9 +15,9 @@ import io.kotest.extensions.testcontainers.perProject
 import io.kotest.matchers.equals.shouldBeEqual
 import io.kotest.matchers.nulls.shouldBeNull
 import io.mockk.coEvery
+import java.util.*
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.launch
-import java.util.*
 
 class QueryIdentificationMediumTest :
     FunSpec({

diff --git a/xesar-connect/src/test/kotlin/com/open200/xesar/connect/query/QueryInstallationPointTest.kt b/xesar-connect/src/test/kotlin/com/open200/xesar/connect/query/QueryInstallationPointTest.kt
@@ -12,9 +12,9 @@ import io.kotest.core.spec.style.FunSpec
 import io.kotest.extensions.testcontainers.perProject
 import io.kotest.matchers.equals.shouldBeEqual
 import io.mockk.coEvery
+import java.util.*
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.launch
-import java.util.*
 
 class QueryInstallationPointTest :
     FunSpec({
@@ -83,8 +83,8 @@ class QueryInstallationPointTest :
                             .await()
                         val result = api.queryInstallationPointListAsync().await()
                         result.totalCount.shouldBeEqual(2)
-                        result.data[0].name?.shouldBeEqual("door 1 entry point")
-                        result.data[1].name?.shouldBeEqual("door 2 entry point")
+                        result.data[0].name.shouldBeEqual("door 1 entry point")
+                        result.data[1].name.shouldBeEqual("door 2 entry point")
                     }
                 }
             }
@@ -136,7 +136,7 @@ class QueryInstallationPointTest :
                         val result =
                             api.queryInstallationPointByIdAsync(installationPointFixture.id).await()
                         result.id.shouldBeEqual(installationPointFixture.id)
-                        result.name?.shouldBeEqual("door 1 entry point")
+                        result.name.shouldBeEqual("door 1 entry point")
                     }
                 }
             }