From 1be694e72eff8eb3a047339ab00bf8938ab98096 Mon Sep 17 00:00:00 2001 From: Simon Mueller Date: Mon, 14 Oct 2024 12:14:12 +0200 Subject: [PATCH] serializer package to lower case --- .../commonMain/kotlin/at/asitplus/dif/InputDescriptor.kt | 2 +- .../at/asitplus/dif/rqes/SignatureRequestParameters.kt | 5 ++--- .../at/asitplus/dif/rqes/collection_entries/Document.kt | 6 +----- .../DocumentDigestEntries/CscDocumentDigest.kt | 2 +- .../Asn1EncodableBase64Serializer.kt | 2 +- .../Base64URLTransactionDataSerializer.kt | 2 +- .../rqes/{Serializer => serializers}/HashesSerializer.kt | 2 +- .../SignatureRequestParameterSerializer.kt | 2 +- .../dif/rqes/{Serializer => serializers}/UrlSerializer.kt | 2 +- .../kotlin/at/asitplus/dif/TransactionDataInterop.kt | 2 +- .../at/asitplus/openid/AuthenticationRequestParameters.kt | 2 +- .../at/asitplus/wallet/lib/oidc/AuthenticationRequest.kt | 2 +- 12 files changed, 13 insertions(+), 18 deletions(-) rename dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/{Serializer => serializers}/Asn1EncodableBase64Serializer.kt (96%) rename dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/{Serializer => serializers}/Base64URLTransactionDataSerializer.kt (97%) rename dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/{Serializer => serializers}/HashesSerializer.kt (96%) rename dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/{Serializer => serializers}/SignatureRequestParameterSerializer.kt (94%) rename dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/{Serializer => serializers}/UrlSerializer.kt (94%) diff --git a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/InputDescriptor.kt b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/InputDescriptor.kt index 9a4ee6cf..8bc6ac28 100644 --- a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/InputDescriptor.kt +++ b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/InputDescriptor.kt @@ -2,7 +2,7 @@ package at.asitplus.dif -import at.asitplus.dif.rqes.Serializer.Base64URLTransactionDataSerializer +import at.asitplus.dif.rqes.serializers.Base64URLTransactionDataSerializer import at.asitplus.dif.rqes.collection_entries.TransactionData import com.benasher44.uuid.uuid4 import kotlinx.serialization.SerialName diff --git a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/SignatureRequestParameters.kt b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/SignatureRequestParameters.kt index 648100af..d932ef38 100644 --- a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/SignatureRequestParameters.kt +++ b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/SignatureRequestParameters.kt @@ -2,8 +2,8 @@ package at.asitplus.dif.rqes -import at.asitplus.dif.rqes.Serializer.Asn1EncodableBase64Serializer -import at.asitplus.dif.rqes.Serializer.SignatureRequestParameterSerializer +import at.asitplus.dif.rqes.serializers.Asn1EncodableBase64Serializer +import at.asitplus.dif.rqes.serializers.SignatureRequestParameterSerializer import at.asitplus.dif.rqes.collection_entries.Document import at.asitplus.dif.rqes.collection_entries.DocumentDigestEntries.CscDocumentDigest import at.asitplus.dif.rqes.enums.OperationModeEnum @@ -12,7 +12,6 @@ import at.asitplus.signum.indispensable.Digest import at.asitplus.signum.indispensable.SignatureAlgorithm import at.asitplus.signum.indispensable.asn1.Asn1Element import at.asitplus.signum.indispensable.asn1.ObjectIdentifier -import at.asitplus.signum.indispensable.io.ByteArrayBase64Serializer import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/collection_entries/Document.kt b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/collection_entries/Document.kt index f6ff0bb3..622dd219 100644 --- a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/collection_entries/Document.kt +++ b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/collection_entries/Document.kt @@ -3,16 +3,12 @@ package at.asitplus.dif.rqes.collection_entries import at.asitplus.dif.rqes.enums.ConformanceLevelEnum import at.asitplus.dif.rqes.enums.SignatureFormat import at.asitplus.dif.rqes.enums.SignedEnvelopeProperty -import at.asitplus.dif.rqes.Serializer.Asn1EncodableBase64Serializer +import at.asitplus.dif.rqes.serializers.Asn1EncodableBase64Serializer import at.asitplus.dif.rqes.getSignAlgorithm -import at.asitplus.signum.indispensable.Digest import at.asitplus.signum.indispensable.SignatureAlgorithm -import at.asitplus.signum.indispensable.X509SignatureAlgorithm import at.asitplus.signum.indispensable.asn1.Asn1Element import at.asitplus.signum.indispensable.asn1.ObjectIdentifier -import at.asitplus.signum.indispensable.asn1.encoding.Asn1 import at.asitplus.signum.indispensable.io.ByteArrayBase64Serializer -import io.github.aakira.napier.Napier import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/collection_entries/DocumentDigestEntries/CscDocumentDigest.kt b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/collection_entries/DocumentDigestEntries/CscDocumentDigest.kt index c9dff9ca..1a7b05e4 100644 --- a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/collection_entries/DocumentDigestEntries/CscDocumentDigest.kt +++ b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/collection_entries/DocumentDigestEntries/CscDocumentDigest.kt @@ -1,7 +1,7 @@ package at.asitplus.dif.rqes.collection_entries.DocumentDigestEntries import at.asitplus.dif.rqes.Hashes -import at.asitplus.dif.rqes.Serializer.Asn1EncodableBase64Serializer +import at.asitplus.dif.rqes.serializers.Asn1EncodableBase64Serializer import at.asitplus.dif.rqes.contentEquals import at.asitplus.dif.rqes.contentHashCode import at.asitplus.dif.rqes.enums.ConformanceLevelEnum diff --git a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/Asn1EncodableBase64Serializer.kt b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/Asn1EncodableBase64Serializer.kt similarity index 96% rename from dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/Asn1EncodableBase64Serializer.kt rename to dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/Asn1EncodableBase64Serializer.kt index 4b14a9bf..3b02639f 100644 --- a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/Asn1EncodableBase64Serializer.kt +++ b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/Asn1EncodableBase64Serializer.kt @@ -1,4 +1,4 @@ -package at.asitplus.dif.rqes.Serializer +package at.asitplus.dif.rqes.serializers import at.asitplus.signum.indispensable.asn1.Asn1Element import at.asitplus.signum.indispensable.asn1.encoding.parse diff --git a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/Base64URLTransactionDataSerializer.kt b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/Base64URLTransactionDataSerializer.kt similarity index 97% rename from dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/Base64URLTransactionDataSerializer.kt rename to dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/Base64URLTransactionDataSerializer.kt index 1772f5c3..f951c6bd 100644 --- a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/Base64URLTransactionDataSerializer.kt +++ b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/Base64URLTransactionDataSerializer.kt @@ -1,4 +1,4 @@ -package at.asitplus.dif.rqes.Serializer +package at.asitplus.dif.rqes.serializers import at.asitplus.dif.jsonSerializer import at.asitplus.dif.rqes.collection_entries.TransactionData diff --git a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/HashesSerializer.kt b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/HashesSerializer.kt similarity index 96% rename from dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/HashesSerializer.kt rename to dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/HashesSerializer.kt index 479b23fa..7c8f35dd 100644 --- a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/HashesSerializer.kt +++ b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/HashesSerializer.kt @@ -1,4 +1,4 @@ -package at.asitplus.dif.rqes.Serializer +package at.asitplus.dif.rqes.serializers import at.asitplus.signum.indispensable.io.ByteArrayBase64UrlSerializer import kotlinx.serialization.KSerializer diff --git a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/SignatureRequestParameterSerializer.kt b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/SignatureRequestParameterSerializer.kt similarity index 94% rename from dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/SignatureRequestParameterSerializer.kt rename to dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/SignatureRequestParameterSerializer.kt index a56880d4..22a055d8 100644 --- a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/SignatureRequestParameterSerializer.kt +++ b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/SignatureRequestParameterSerializer.kt @@ -1,4 +1,4 @@ -package at.asitplus.dif.rqes.Serializer +package at.asitplus.dif.rqes.serializers import at.asitplus.dif.rqes.SignDocParameters import at.asitplus.dif.rqes.SignHashParameters diff --git a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/UrlSerializer.kt b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/UrlSerializer.kt similarity index 94% rename from dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/UrlSerializer.kt rename to dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/UrlSerializer.kt index 966e1e7c..793ed595 100644 --- a/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/Serializer/UrlSerializer.kt +++ b/dif-data-classes/src/commonMain/kotlin/at/asitplus/dif/rqes/serializers/UrlSerializer.kt @@ -1,4 +1,4 @@ -package at.asitplus.dif.rqes.Serializer +package at.asitplus.dif.rqes.serializers import io.ktor.http.* import kotlinx.serialization.KSerializer diff --git a/dif-data-classes/src/commonTest/kotlin/at/asitplus/dif/TransactionDataInterop.kt b/dif-data-classes/src/commonTest/kotlin/at/asitplus/dif/TransactionDataInterop.kt index 7e5dcc43..f72033e0 100644 --- a/dif-data-classes/src/commonTest/kotlin/at/asitplus/dif/TransactionDataInterop.kt +++ b/dif-data-classes/src/commonTest/kotlin/at/asitplus/dif/TransactionDataInterop.kt @@ -1,7 +1,7 @@ package at.asitplus.dif import at.asitplus.dif.rqes.collection_entries.TransactionData -import at.asitplus.dif.rqes.Serializer.Base64URLTransactionDataSerializer +import at.asitplus.dif.rqes.serializers.Base64URLTransactionDataSerializer import at.asitplus.signum.indispensable.asn1.KnownOIDs.sha_256 import at.asitplus.signum.indispensable.io.Base64UrlStrict import at.asitplus.signum.indispensable.io.ByteArrayBase64Serializer diff --git a/openid-data-classes/src/commonMain/kotlin/at/asitplus/openid/AuthenticationRequestParameters.kt b/openid-data-classes/src/commonMain/kotlin/at/asitplus/openid/AuthenticationRequestParameters.kt index 73808d75..6ec82113 100644 --- a/openid-data-classes/src/commonMain/kotlin/at/asitplus/openid/AuthenticationRequestParameters.kt +++ b/openid-data-classes/src/commonMain/kotlin/at/asitplus/openid/AuthenticationRequestParameters.kt @@ -3,7 +3,7 @@ package at.asitplus.openid import at.asitplus.KmmResult.Companion.wrap import at.asitplus.dif.PresentationDefinition import at.asitplus.dif.rqes.enums.SignatureQualifierEnum -import at.asitplus.dif.rqes.Serializer.HashesSerializer +import at.asitplus.dif.rqes.serializers.HashesSerializer import at.asitplus.signum.indispensable.asn1.ObjectIdentifier import at.asitplus.signum.indispensable.io.ByteArrayBase64UrlSerializer import at.asitplus.signum.indispensable.josef.JsonWebToken diff --git a/vck-openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oidc/AuthenticationRequest.kt b/vck-openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oidc/AuthenticationRequest.kt index b7bfbfea..b8fdf2ee 100644 --- a/vck-openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oidc/AuthenticationRequest.kt +++ b/vck-openid/src/commonMain/kotlin/at/asitplus/wallet/lib/oidc/AuthenticationRequest.kt @@ -2,7 +2,7 @@ package at.asitplus.wallet.lib.oidc import at.asitplus.catching -import at.asitplus.dif.rqes.Serializer.UrlSerializer +import at.asitplus.dif.rqes.serializers.UrlSerializer import at.asitplus.openid.AuthenticationRequestParameters import at.asitplus.signum.indispensable.josef.JwsSigned import io.ktor.http.*