Skip to content

Remove usage of deprecated code #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nodh wants to merge 1 commit into
base: release/6.0.0
Choose a base branch
from
Open

Remove usage of deprecated code #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions openid-data-classes/src/commonTest/kotlin/at/asitplus/wallet/lib/data/TestJson.kt
View file
Open in desktop

This file was deleted.

17 changes: 8 additions & 9 deletions ...t/asitplus/wallet/lib/data/rfc/tokenStatusList/StatusListTokenPayloadSerializationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -96,7 +95,7 @@ val StatusListTokenPayloadSerializationTest by matrixSuite {

"JSON serialization rejects identifier lists" {
shouldThrow<SerializationException> {
vckJsonSerializer.encodeToString(StatusListTokenPayload.serializer(), identifierListPayload)
joseCompliantSerializer.encodeToString(StatusListTokenPayload.serializer(), identifierListPayload)
}
}

Expand All @@ -110,20 +109,20 @@ val StatusListTokenPayloadSerializationTest by matrixSuite {
""".trimIndent()

shouldThrow<SerializationException> {
vckJsonSerializer.decodeFromString<StatusListTokenPayload>(json)
joseCompliantSerializer.decodeFromString<StatusListTokenPayload>(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(
validStatusListJson + (StatusListTokenPayloadSurrogate.SerialNames.IDENTIFIER_LIST to JsonObject(emptyMap()))
)

shouldThrow<SerializationException> {
vckJsonSerializer.decodeFromString<StatusListTokenPayload>(invalidJson.toString())
joseCompliantSerializer.decodeFromString<StatusListTokenPayload>(invalidJson.toString())
}
}

Expand Down
9 changes: 4 additions & 5 deletions ...us/wallet/lib/data/rfc/tokenStatusList/primitives/PositiveDurationFormatSerializerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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<PositiveDuration>(encoded) shouldBe value
joseCompliantSerializer.decodeFromString<PositiveDuration>(encoded) shouldBe value
}
}

Expand All @@ -39,7 +38,7 @@ val PositiveDurationFormatSerializerTest by matrixSuite {
"negative fractional seconds" to "-1.5",
).asData(nameFn = { (name, _) -> name }) test { (_, encoded) ->
shouldThrow<SerializationException> {
vckJsonSerializer.decodeFromString<PositiveDuration>(encoded)
joseCompliantSerializer.decodeFromString<PositiveDuration>(encoded)
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions vck/src/commonMain/kotlin/at/asitplus/wallet/lib/LibraryInitializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
* }
* ```
Expand Down Expand Up @@ -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
* }
* ```
Expand Down
Loading