events kotlin serialization

infra/config-store/src/test/java/com/simprints/infra/config/store/local/migrations/ProjectConfigSharedPrefsMigrationTest.kt

@@ -711,9 +711,22 @@ class ProjectConfigSharedPrefsMigrationTest {
                 "{\"FaceQualityThreshold\":\"-1\"}",
             )
         private val JSON_FACE_CONFIGURATION_WITH_UNEXPECTED_FIELD =
-            JsonHelper.fromJson<Map<String, JsonElement>>(
-                "{\"FaceMatchThreshold\":30, \"FaceConfidenceThresholds\":\"{\\\"LOW\\\":\\\"1\\\",\\\"MEDIUM\\\":\\\"20\\\",\\\"HIGH\\\":\\\"100\\\"}\",\"FaceNbOfFramesCaptured\":\"2\",\"FaceQualityThreshold\":\"-1\",\"SaveFaceImages\":\"true\"}",
+            JsonHelper.json.decodeFromString<Map<String, JsonElement>>(
+                """
+                {
+                  "FaceMatchThreshold": 30,
+                  "FaceConfidenceThresholds": {
+                    "LOW": 1,
+                    "MEDIUM": 20,
+                    "HIGH": 100
+                  },
+                  "FaceNbOfFramesCaptured": 2,
+                  "FaceQualityThreshold": -1,
+                  "SaveFaceImages": true
+                }
+                """.trimIndent(),
             )
+
         private val PROTO_FACE_CONFIGURATION = ProtoFaceConfiguration
             .newBuilder()
             .addAllowedSdks(ProtoFaceConfiguration.ProtoBioSdk.RANK_ONE)

infra/core/src/main/java/com/simprints/core/tools/json/JsonHelper.kt

@@ -3,7 +3,6 @@ package com.simprints.core.tools.json
 import com.fasterxml.jackson.annotation.JsonInclude.Include
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.JavaType
 import com.fasterxml.jackson.databind.Module
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.registerKotlinModule
@@ -53,11 +52,6 @@ object JsonHelper {
         return jackson.readValue(json, type)
     }
 
-    inline fun <reified T> fromJson(
-        json: String,
-        type: JavaType,
-    ): T = jackson.readValue(json, type)
-
     inline fun <reified T> fromJson(json: String): T = jackson.readValue(json, T::class.java)
 
     /**

infra/core/src/main/java/com/simprints/core/tools/utils/ExtractCommCareCaseIdUseCase.kt

@@ -1,12 +1,18 @@
 package com.simprints.core.tools.utils
 
 import com.simprints.core.tools.json.JsonHelper
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.jsonPrimitive
 import javax.inject.Inject
 
 class ExtractCommCareCaseIdUseCase @Inject constructor() {
     operator fun invoke(metadata: String?): String? = metadata?.takeUnless { it.isBlank() }?.let {
         try {
-            JsonHelper.fromJson<Map<String, Any>>(it)[ARG_CASE_ID] as? String
+            JsonHelper.json
+                .decodeFromString<Map<String, JsonElement>>(it)[ARG_CASE_ID]
+                ?.jsonPrimitive
+                ?.takeIf { jsonPrimitive -> jsonPrimitive.isString }
+                ?.content
         } catch (_: Exception) {
             null
         }

infra/core/src/main/java/com/simprints/core/tools/utils/SimNetworkUtils.kt

@@ -1,6 +1,7 @@
 package com.simprints.core.tools.utils
 
 import androidx.annotation.Keep
+import kotlinx.serialization.Serializable
 
 @Keep
 interface SimNetworkUtils {
@@ -17,6 +18,7 @@ interface SimNetworkUtils {
     }
 
     @Keep
+    @Serializable
     data class Connection(
         val type: ConnectionType,
         val state: ConnectionState,

infra/core/src/test/java/com/simprints/core/domain/tokenization/serialization/TokenizationSerializerTest.kt

@@ -10,7 +10,6 @@ import com.simprints.core.domain.tokenization.asTokenizableRaw
 import com.simprints.core.tools.json.JsonHelper.json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
-import org.junit.Ignore
 import org.junit.Test
 
 class TokenizationSerializerTest {

infra/enrolment-records/repository/src/main/java/com/simprints/infra/enrolment/records/repository/commcare/CommCareCandidateRecordDataSource.kt

@@ -4,16 +4,11 @@ import android.content.Context
 import android.database.Cursor
 import android.net.Uri
 import androidx.core.net.toUri
-import com.fasterxml.jackson.core.type.TypeReference
-import com.fasterxml.jackson.databind.module.SimpleModule
 import com.simprints.core.AvailableProcessors
 import com.simprints.core.DispatcherBG
 import com.simprints.core.domain.common.Modality
 import com.simprints.core.domain.reference.BiometricTemplate
 import com.simprints.core.domain.reference.CandidateRecord
-import com.simprints.core.domain.tokenization.TokenizableString
-import com.simprints.core.domain.tokenization.serialization.TokenizationClassNameDeserializer
-import com.simprints.core.domain.tokenization.serialization.TokenizationClassNameSerializer
 import com.simprints.core.tools.json.JsonHelper
 import com.simprints.core.tools.time.TimeHelper
 import com.simprints.core.tools.utils.EncodingUtils
@@ -25,7 +20,6 @@ import com.simprints.infra.enrolment.records.repository.domain.models.BiometricD
 import com.simprints.infra.enrolment.records.repository.domain.models.CandidateRecordBatch
 import com.simprints.infra.enrolment.records.repository.domain.models.EnrolmentRecordQuery
 import com.simprints.infra.enrolment.records.repository.usecases.CompareImplicitTokenizedStringsUseCase
-import com.simprints.infra.events.event.cosync.CoSyncEnrolmentRecordCreationEventDeserializer
 import com.simprints.infra.events.event.cosync.CoSyncEnrolmentRecordEvents
 import com.simprints.infra.events.event.domain.models.EnrolmentRecordCreationEvent
 import com.simprints.infra.events.event.domain.models.FaceReference
@@ -255,32 +249,13 @@ internal class CommCareCandidateRecordDataSource @Inject constructor(
 
     private fun parseRecordEvents(subjectActions: String) = subjectActions.takeIf(String::isNotEmpty)?.let {
         try {
-            jsonHelper.fromJson<CoSyncEnrolmentRecordEvents>(
-                json = it,
-                module = coSyncSerializationModule,
-                type = object : TypeReference<CoSyncEnrolmentRecordEvents>() {},
-            )
+            jsonHelper.json.decodeFromString<CoSyncEnrolmentRecordEvents>(it)
         } catch (e: Exception) {
             Simber.e("Error while parsing subjectActions", e)
             null
         }
     }
 
-    private val coSyncSerializationModule = SimpleModule().apply {
-        addSerializer(
-            TokenizableString::class.java,
-            TokenizationClassNameSerializer(),
-        )
-        addDeserializer(
-            TokenizableString::class.java,
-            TokenizationClassNameDeserializer(),
-        )
-        addDeserializer(
-            EnrolmentRecordCreationEvent::class.java,
-            CoSyncEnrolmentRecordCreationEventDeserializer(),
-        )
-    }
-
     override suspend fun count(
         query: EnrolmentRecordQuery,
         dataSource: BiometricDataSource,

infra/events/src/main/java/com/simprints/infra/events/event/domain/EventCount.kt

@@ -1,8 +1,10 @@
 package com.simprints.infra.events.event.domain
 
 import androidx.annotation.Keep
+import kotlinx.serialization.Serializable
 
 @Keep
+@Serializable
 data class EventCount(
     val count: Int,
     val isLowerBound: Boolean,

infra/events/src/main/java/com/simprints/infra/events/event/domain/models/AgeGroupSelectionEvent.kt

@@ -5,9 +5,14 @@ import com.simprints.core.domain.tokenization.TokenizableString
 import com.simprints.core.tools.time.Timestamp
 import com.simprints.infra.config.store.models.TokenKeyType
 import com.simprints.infra.events.event.domain.models.EventType.AGE_GROUP_SELECTION
+import com.simprints.infra.events.event.domain.models.EventType.Companion.AGE_GROUP_SELECTION_KEY
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import java.util.UUID
 
 @Keep
+@Serializable
+@SerialName(AGE_GROUP_SELECTION_KEY)
 data class AgeGroupSelectionEvent(
     override val id: String = UUID.randomUUID().toString(),
     override val payload: AgeGroupSelectionPayload,
@@ -30,6 +35,7 @@ data class AgeGroupSelectionEvent(
     override fun setTokenizedFields(map: Map<TokenKeyType, TokenizableString>) = this // No tokenized fields
 
     @Keep
+    @Serializable
     data class AgeGroupSelectionPayload(
         override val createdAt: Timestamp,
         override val eventVersion: Int,
@@ -41,6 +47,7 @@ data class AgeGroupSelectionEvent(
     }
 
     @Keep
+    @Serializable
     data class AgeGroup(
         val startInclusive: Int,
         val endExclusive: Int?,

infra/events/src/main/java/com/simprints/infra/events/event/domain/models/AlertScreenEvent.kt

@@ -5,9 +5,14 @@ import com.simprints.core.domain.tokenization.TokenizableString
 import com.simprints.core.tools.time.Timestamp
 import com.simprints.infra.config.store.models.TokenKeyType
 import com.simprints.infra.events.event.domain.models.EventType.ALERT_SCREEN
+import com.simprints.infra.events.event.domain.models.EventType.Companion.ALERT_SCREEN_KEY
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import java.util.UUID
 
 @Keep
+@Serializable
+@SerialName(ALERT_SCREEN_KEY)
 data class AlertScreenEvent(
     override val id: String = UUID.randomUUID().toString(),
     override val payload: AlertScreenPayload,
@@ -29,6 +34,7 @@ data class AlertScreenEvent(
     override fun setTokenizedFields(map: Map<TokenKeyType, TokenizableString>) = this // No tokenized fields
 
     @Keep
+    @Serializable
     data class AlertScreenPayload(
         override val createdAt: Timestamp,
         override val eventVersion: Int,

infra/events/src/main/java/com/simprints/infra/events/event/domain/models/AuthenticationEvent.kt

@@ -7,9 +7,14 @@ import com.simprints.infra.config.store.models.TokenKeyType
 import com.simprints.infra.events.event.domain.models.AuthenticationEvent.AuthenticationPayload.Result
 import com.simprints.infra.events.event.domain.models.AuthenticationEvent.AuthenticationPayload.UserInfo
 import com.simprints.infra.events.event.domain.models.EventType.AUTHENTICATION
+import com.simprints.infra.events.event.domain.models.EventType.Companion.AUTHENTICATION_KEY
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import java.util.UUID
 
 @Keep
+@Serializable
+@SerialName(AUTHENTICATION_KEY)
 data class AuthenticationEvent(
     override val id: String = UUID.randomUUID().toString(),
     override val payload: AuthenticationPayload,
@@ -39,6 +44,7 @@ data class AuthenticationEvent(
     )
 
     @Keep
+    @Serializable
     data class AuthenticationPayload(
         override val createdAt: Timestamp,
         override val eventVersion: Int,
@@ -50,12 +56,14 @@ data class AuthenticationEvent(
         override fun toSafeString(): String = "result: $result"
 
         @Keep
+        @Serializable
         data class UserInfo(
             val projectId: String,
             val userId: TokenizableString,
         )
 
         @Keep
+        @Serializable
         enum class Result {
             AUTHENTICATED,
             BAD_CREDENTIALS,

infra/events/src/main/java/com/simprints/infra/events/event/domain/models/AuthorizationEvent.kt

@@ -7,9 +7,14 @@ import com.simprints.infra.config.store.models.TokenKeyType
 import com.simprints.infra.events.event.domain.models.AuthorizationEvent.AuthorizationPayload.AuthorizationResult
 import com.simprints.infra.events.event.domain.models.AuthorizationEvent.AuthorizationPayload.UserInfo
 import com.simprints.infra.events.event.domain.models.EventType.AUTHORIZATION
+import com.simprints.infra.events.event.domain.models.EventType.Companion.AUTHORIZATION_KEY
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import java.util.UUID
 
 @Keep
+@Serializable
+@SerialName(AUTHORIZATION_KEY)
 data class AuthorizationEvent(
     override val id: String = UUID.randomUUID().toString(),
     override val payload: AuthorizationPayload,
@@ -42,6 +47,7 @@ data class AuthorizationEvent(
     )
 
     @Keep
+    @Serializable
     data class AuthorizationPayload(
         override val createdAt: Timestamp,
         override val eventVersion: Int,
@@ -53,12 +59,14 @@ data class AuthorizationEvent(
         override fun toSafeString(): String = "result: $result"
 
         @Keep
+        @Serializable
         enum class AuthorizationResult {
             AUTHORIZED,
             NOT_AUTHORIZED,
         }
 
         @Keep
+        @Serializable
         data class UserInfo(
             val projectId: String,
             val userId: TokenizableString,

infra/events/src/main/java/com/simprints/infra/events/event/domain/models/BiometricDataSource.kt

@@ -1,8 +1,10 @@
 package com.simprints.infra.events.event.domain.models
 
 import androidx.annotation.Keep
+import kotlinx.serialization.Serializable
 
 @Keep
+@Serializable
 enum class BiometricDataSource {
     SIMPRINTS,
     COMMCARE,

infra/events/src/main/java/com/simprints/infra/events/event/domain/models/BiometricReference.kt

@@ -1,18 +1,10 @@
 package com.simprints.infra.events.event.domain.models
 
 import androidx.annotation.Keep
-import com.fasterxml.jackson.annotation.JsonSubTypes
-import com.fasterxml.jackson.annotation.JsonTypeInfo
 import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-@ExcludedFromGeneratedTestCoverageReports("Domain model")
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "type")
-@JsonSubTypes(
-    JsonSubTypes.Type(value = FaceReference::class, name = BiometricReferenceType.Companion.FACE_REFERENCE_KEY),
-    JsonSubTypes.Type(value = FingerprintReference::class, name = BiometricReferenceType.Companion.FINGERPRINT_REFERENCE_KEY),
-)
 @Keep
 @Serializable
 sealed class BiometricReference {