From e556069fdb5101631bd9bde2a99e9040d8bad478 Mon Sep 17 00:00:00 2001 From: Christian Kollmann4~ Date: Tue, 23 Jun 2026 15:46:33 +0200 Subject: [PATCH] Remove usage of deprecated code --- .../at/asitplus/wallet/lib/data/TestJson.kt | 10 ---------- .../StatusListTokenPayloadSerializationTest.kt | 17 ++++++++--------- .../PositiveDurationFormatSerializerTest.kt | 9 ++++----- .../asitplus/wallet/lib/LibraryInitializer.kt | 8 ++++---- 4 files changed, 16 insertions(+), 28 deletions(-) delete mode 100644 openid-data-classes/src/commonTest/kotlin/at/asitplus/wallet/lib/data/TestJson.kt diff --git a/openid-data-classes/src/commonTest/kotlin/at/asitplus/wallet/lib/data/TestJson.kt b/openid-data-classes/src/commonTest/kotlin/at/asitplus/wallet/lib/data/TestJson.kt deleted file mode 100644 index 3ea041db3..000000000 --- a/openid-data-classes/src/commonTest/kotlin/at/asitplus/wallet/lib/data/TestJson.kt +++ /dev/null @@ -1,10 +0,0 @@ -package at.asitplus.wallet.lib.data - -import kotlinx.serialization.json.Json - -internal val vckJsonSerializer = Json { - prettyPrint = false - encodeDefaults = false - classDiscriminator = "type" - ignoreUnknownKeys = true -} diff --git a/openid-data-classes/src/commonTest/kotlin/at/asitplus/wallet/lib/data/rfc/tokenStatusList/StatusListTokenPayloadSerializationTest.kt b/openid-data-classes/src/commonTest/kotlin/at/asitplus/wallet/lib/data/rfc/tokenStatusList/StatusListTokenPayloadSerializationTest.kt index f15308a75..633cf698e 100644 --- a/openid-data-classes/src/commonTest/kotlin/at/asitplus/wallet/lib/data/rfc/tokenStatusList/StatusListTokenPayloadSerializationTest.kt +++ b/openid-data-classes/src/commonTest/kotlin/at/asitplus/wallet/lib/data/rfc/tokenStatusList/StatusListTokenPayloadSerializationTest.kt @@ -2,16 +2,15 @@ package at.asitplus.wallet.lib.data.rfc.tokenStatusList import at.asitplus.signum.indispensable.cosef.io.Base16Strict import at.asitplus.signum.indispensable.cosef.io.coseCompliantSerializer -import at.asitplus.testballoon.matrix.* -import at.asitplus.wallet.lib.data.vckJsonSerializer +import at.asitplus.signum.indispensable.josef.io.joseCompliantSerializer +import at.asitplus.testballoon.matrix.matrixSuite import at.asitplus.wallet.lib.data.rfc.tokenStatusList.iso18013.Identifier import at.asitplus.wallet.lib.data.rfc.tokenStatusList.iso18013.IdentifierInfo import at.asitplus.wallet.lib.data.rfc.tokenStatusList.primitives.PositiveDuration import at.asitplus.wallet.lib.data.rfc.tokenStatusList.primitives.TokenStatusBitSize import at.asitplus.wallet.lib.data.rfc3986.UniformResourceIdentifier -import at.asitplus.testballoon.matrix.matrixSuite -import io.kotest.assertions.throwables.shouldThrowAny import io.kotest.assertions.throwables.shouldThrow +import io.kotest.assertions.throwables.shouldThrowAny import io.kotest.matchers.shouldBe import io.matthewnelson.encoding.core.Decoder.Companion.decodeToByteArray import io.matthewnelson.encoding.core.Encoder.Companion.encodeToString @@ -82,7 +81,7 @@ private val expectedPrefix = """ val StatusListTokenPayloadSerializationTest by matrixSuite { "JSON serialization uses the expected claim names and ttl number format" { - val json = vckJsonSerializer + val json = joseCompliantSerializer .encodeToJsonElement(StatusListTokenPayload.serializer(), statusListPayload) .jsonObject @@ -96,7 +95,7 @@ val StatusListTokenPayloadSerializationTest by matrixSuite { "JSON serialization rejects identifier lists" { shouldThrow { - vckJsonSerializer.encodeToString(StatusListTokenPayload.serializer(), identifierListPayload) + joseCompliantSerializer.encodeToString(StatusListTokenPayload.serializer(), identifierListPayload) } } @@ -110,12 +109,12 @@ val StatusListTokenPayloadSerializationTest by matrixSuite { """.trimIndent() shouldThrow { - vckJsonSerializer.decodeFromString(json) + joseCompliantSerializer.decodeFromString(json) } } "JSON deserialization rejects identifier_list even when status_list is present" { - val validStatusListJson = vckJsonSerializer + val validStatusListJson = joseCompliantSerializer .encodeToJsonElement(StatusListTokenPayload.serializer(), statusListPayload) .jsonObject val invalidJson = JsonObject( @@ -123,7 +122,7 @@ val StatusListTokenPayloadSerializationTest by matrixSuite { ) shouldThrow { - vckJsonSerializer.decodeFromString(invalidJson.toString()) + joseCompliantSerializer.decodeFromString(invalidJson.toString()) } } diff --git a/openid-data-classes/src/commonTest/kotlin/at/asitplus/wallet/lib/data/rfc/tokenStatusList/primitives/PositiveDurationFormatSerializerTest.kt b/openid-data-classes/src/commonTest/kotlin/at/asitplus/wallet/lib/data/rfc/tokenStatusList/primitives/PositiveDurationFormatSerializerTest.kt index c12d56846..5067a4219 100644 --- a/openid-data-classes/src/commonTest/kotlin/at/asitplus/wallet/lib/data/rfc/tokenStatusList/primitives/PositiveDurationFormatSerializerTest.kt +++ b/openid-data-classes/src/commonTest/kotlin/at/asitplus/wallet/lib/data/rfc/tokenStatusList/primitives/PositiveDurationFormatSerializerTest.kt @@ -2,8 +2,7 @@ package at.asitplus.wallet.lib.data.rfc.tokenStatusList.primitives import at.asitplus.signum.indispensable.cosef.io.Base16Strict import at.asitplus.signum.indispensable.cosef.io.coseCompliantSerializer -import at.asitplus.testballoon.matrix.* -import at.asitplus.wallet.lib.data.vckJsonSerializer +import at.asitplus.signum.indispensable.josef.io.joseCompliantSerializer import at.asitplus.testballoon.matrix.matrixSuite import io.kotest.assertions.throwables.shouldThrow import io.kotest.matchers.shouldBe @@ -25,10 +24,10 @@ val PositiveDurationFormatSerializerTest by matrixSuite { ).asData(nameFn = { (name, _) -> name }) test { (_, expected) -> val (duration, expectedJson) = expected val value = PositiveDuration(duration) - val encoded = vckJsonSerializer.encodeToString(value) + val encoded = joseCompliantSerializer.encodeToString(value) encoded shouldBe expectedJson - vckJsonSerializer.decodeFromString(encoded) shouldBe value + joseCompliantSerializer.decodeFromString(encoded) shouldBe value } } @@ -39,7 +38,7 @@ val PositiveDurationFormatSerializerTest by matrixSuite { "negative fractional seconds" to "-1.5", ).asData(nameFn = { (name, _) -> name }) test { (_, encoded) -> shouldThrow { - vckJsonSerializer.decodeFromString(encoded) + joseCompliantSerializer.decodeFromString(encoded) } } } diff --git a/vck/src/commonMain/kotlin/at/asitplus/wallet/lib/LibraryInitializer.kt b/vck/src/commonMain/kotlin/at/asitplus/wallet/lib/LibraryInitializer.kt index 2f5de6994..a02d883ae 100644 --- a/vck/src/commonMain/kotlin/at/asitplus/wallet/lib/LibraryInitializer.kt +++ b/vck/src/commonMain/kotlin/at/asitplus/wallet/lib/LibraryInitializer.kt @@ -33,9 +33,9 @@ object LibraryInitializer { * Example for [jsonValueEncoder]: * ``` * when (it) { - * is DrivingPrivilege -> vckJsonSerializer.encodeToJsonElement(it) - * is LocalDate -> vckJsonSerializer.encodeToJsonElement(it) - * is UInt -> vckJsonSerializer.encodeToJsonElement(it) + * is DrivingPrivilege -> joseCompliantSerializer.encodeToJsonElement(it) + * is LocalDate -> joseCompliantSerializer.encodeToJsonElement(it) + * is UInt -> joseCompliantSerializer.encodeToJsonElement(it) * else -> null * } * ``` @@ -69,7 +69,7 @@ object LibraryInitializer { * Used to encode any value into a [JsonElement], implementation may be * ``` * when (it) { - * is DrivingPrivilege -> vckJsonSerializer.encodeToJsonElement(it) + * is DrivingPrivilege -> joseCompliantSerializer.encodeToJsonElement(it) * else -> null * } * ```