From 41545a156bc071e4f75c719dbb82c6a744f020af Mon Sep 17 00:00:00 2001 From: David Kaspar Date: Mon, 18 Aug 2025 10:44:42 +0100 Subject: [PATCH] Use explicit annotation target for constructor params See https://youtrack.jetbrains.com/issue/KT-73255 for more details --- .../nip44Encryption/TestPackageClasses.kt | 40 ++++++++-------- .../quartz/experimental/limits/Limits.kt | 48 +++++++------------ .../quartz/nip01Core/signers/EventTemplate.kt | 2 +- .../quartz/nip47WalletConnect/Response.kt | 2 +- .../quartz/nip59Giftwrap/rumors/Rumor.kt | 4 +- .../nip96FileStorage/actions/UploadResult.kt | 6 +-- .../nip96FileStorage/info/ServerInfo.kt | 39 +++++---------- 7 files changed, 54 insertions(+), 87 deletions(-) diff --git a/quartz/src/androidTest/java/com/vitorpamplona/quartz/nip44Encryption/TestPackageClasses.kt b/quartz/src/androidTest/java/com/vitorpamplona/quartz/nip44Encryption/TestPackageClasses.kt index 40ee511f1..4262d36be 100644 --- a/quartz/src/androidTest/java/com/vitorpamplona/quartz/nip44Encryption/TestPackageClasses.kt +++ b/quartz/src/androidTest/java/com/vitorpamplona/quartz/nip44Encryption/TestPackageClasses.kt @@ -32,61 +32,59 @@ data class V2( ) data class Valid( - @JsonProperty("get_conversation_key") - val getConversationKey: ArrayList = arrayListOf(), - @JsonProperty("get_message_keys") val getMessageKeys: GetMessageKeys? = GetMessageKeys(), - @JsonProperty("calc_padded_len") val calcPaddedLen: ArrayList> = arrayListOf(), - @JsonProperty("encrypt_decrypt") val encryptDecrypt: ArrayList = arrayListOf(), - @JsonProperty("encrypt_decrypt_long_msg") + @field:JsonProperty("get_conversation_key") val getConversationKey: ArrayList = arrayListOf(), + @field:JsonProperty("get_message_keys") val getMessageKeys: GetMessageKeys? = GetMessageKeys(), + @field:JsonProperty("calc_padded_len") val calcPaddedLen: ArrayList> = arrayListOf(), + @field:JsonProperty("encrypt_decrypt") val encryptDecrypt: ArrayList = arrayListOf(), + @field:JsonProperty("encrypt_decrypt_long_msg") val encryptDecryptLongMsg: ArrayList = arrayListOf(), ) data class Invalid( - @JsonProperty("encrypt_msg_lengths") val encryptMsgLengths: ArrayList = arrayListOf(), - @JsonProperty("get_conversation_key") - val getConversationKey: ArrayList = arrayListOf(), - @JsonProperty("decrypt") val decrypt: ArrayList = arrayListOf(), + @field:JsonProperty("encrypt_msg_lengths") val encryptMsgLengths: ArrayList = arrayListOf(), + @field:JsonProperty("get_conversation_key") val getConversationKey: ArrayList = arrayListOf(), + @field:JsonProperty("decrypt") val decrypt: ArrayList = arrayListOf(), ) data class GetConversationKey( val sec1: String? = null, val pub2: String? = null, val note: String? = null, - @JsonProperty("conversation_key") val conversationKey: String? = null, + @field:JsonProperty("conversation_key") val conversationKey: String? = null, ) data class GetMessageKeys( - @JsonProperty("conversation_key") val conversationKey: String? = null, + @field:JsonProperty("conversation_key") val conversationKey: String? = null, val keys: ArrayList = arrayListOf(), ) data class Keys( - @JsonProperty("nonce") val nonce: String? = null, - @JsonProperty("chacha_key") val chachaKey: String? = null, - @JsonProperty("chacha_nonce") val chachaNonce: String? = null, - @JsonProperty("hmac_key") val hmacKey: String? = null, + @field:JsonProperty("nonce") val nonce: String? = null, + @field:JsonProperty("chacha_key") val chachaKey: String? = null, + @field:JsonProperty("chacha_nonce") val chachaNonce: String? = null, + @field:JsonProperty("hmac_key") val hmacKey: String? = null, ) data class EncryptDecrypt( val sec1: String? = null, val sec2: String? = null, - @JsonProperty("conversation_key") val conversationKey: String? = null, + @field:JsonProperty("conversation_key") val conversationKey: String? = null, val nonce: String? = null, val plaintext: String? = null, val payload: String? = null, ) data class EncryptDecryptLongMsg( - @JsonProperty("conversation_key") val conversationKey: String? = null, + @field:JsonProperty("conversation_key") val conversationKey: String? = null, val nonce: String? = null, val pattern: String? = null, val repeat: Int? = null, - @JsonProperty("plaintext_sha256") val plaintextSha256: String? = null, - @JsonProperty("payload_sha256") val payloadSha256: String? = null, + @field:JsonProperty("plaintext_sha256") val plaintextSha256: String? = null, + @field:JsonProperty("payload_sha256") val payloadSha256: String? = null, ) data class Decrypt( - @JsonProperty("conversation_key") val conversationKey: String? = null, + @field:JsonProperty("conversation_key") val conversationKey: String? = null, val nonce: String? = null, val plaintext: String? = null, val payload: String? = null, diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/experimental/limits/Limits.kt b/quartz/src/main/java/com/vitorpamplona/quartz/experimental/limits/Limits.kt index 62d0b6da8..75904c921 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/experimental/limits/Limits.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/experimental/limits/Limits.kt @@ -23,36 +23,20 @@ package com.vitorpamplona.quartz.experimental.limits import com.fasterxml.jackson.annotation.JsonProperty class Limits( - @JsonProperty("can_write") - val canWrite: Boolean?, - @JsonProperty("can_read") - val canRead: Boolean?, - @JsonProperty("accepted_event_kinds") - val acceptedEventKinds: Set?, - @JsonProperty("blocked_event_kinds") - val blockedEventKinds: Set?, - @JsonProperty("min_pow_difficulty") - val minPoW: Int?, - @JsonProperty("max_message_length") - val maxMessageLength: Int?, - @JsonProperty("max_subscriptions") - val maxSubscriptions: Int?, - @JsonProperty("max_filters") - val maxFilters: Int?, - @JsonProperty("max_limit") - val maxLimit: Int?, - @JsonProperty("max_event_tags") - val maxEventTags: Int?, - @JsonProperty("max_content_length") - val maxContentLength: Int?, - @JsonProperty("created_at_msecs_ago") - val createdAtMillisecsAgo: Long?, - @JsonProperty("created_at_msecs_ahead") - val createdAtMillisecsAhead: Long?, - @JsonProperty("filter_rate_limit") - val filterRateLimit: Long?, - @JsonProperty("publishing_rate_limit") - val publishingRateLimit: Long?, - @JsonProperty("required_tags") - val requiredTags: Array>?, + @field:JsonProperty("can_write") val canWrite: Boolean?, + @field:JsonProperty("can_read") val canRead: Boolean?, + @field:JsonProperty("accepted_event_kinds") val acceptedEventKinds: Set?, + @field:JsonProperty("blocked_event_kinds") val blockedEventKinds: Set?, + @field:JsonProperty("min_pow_difficulty") val minPoW: Int?, + @field:JsonProperty("max_message_length") val maxMessageLength: Int?, + @field:JsonProperty("max_subscriptions") val maxSubscriptions: Int?, + @field:JsonProperty("max_filters") val maxFilters: Int?, + @field:JsonProperty("max_limit") val maxLimit: Int?, + @field:JsonProperty("max_event_tags") val maxEventTags: Int?, + @field:JsonProperty("max_content_length") val maxContentLength: Int?, + @field:JsonProperty("created_at_msecs_ago") val createdAtMillisecsAgo: Long?, + @field:JsonProperty("created_at_msecs_ahead") val createdAtMillisecsAhead: Long?, + @field:JsonProperty("filter_rate_limit") val filterRateLimit: Long?, + @field:JsonProperty("publishing_rate_limit") val publishingRateLimit: Long?, + @field:JsonProperty("required_tags") val requiredTags: Array>?, ) diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/signers/EventTemplate.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/signers/EventTemplate.kt index 25a2196d6..3d801e963 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/signers/EventTemplate.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/signers/EventTemplate.kt @@ -30,7 +30,7 @@ import com.vitorpamplona.quartz.nip01Core.jackson.JsonMapper import com.vitorpamplona.quartz.utils.TimeUtils class EventTemplate( - @JsonProperty("created_at") + @field:JsonProperty("created_at") val createdAt: Long, val kind: Int, val tags: TagArray, diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip47WalletConnect/Response.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip47WalletConnect/Response.kt index b895114ed..4968410be 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip47WalletConnect/Response.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip47WalletConnect/Response.kt @@ -26,7 +26,7 @@ import com.vitorpamplona.quartz.utils.pointerSizeInBytes // RESPONSE OBJECTS abstract class Response( - @JsonProperty("result_type") val resultType: String, + @field:JsonProperty("result_type") val resultType: String, ) { abstract fun countMemory(): Long } diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip59Giftwrap/rumors/Rumor.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip59Giftwrap/rumors/Rumor.kt index 1a133acb3..02ad68890 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip59Giftwrap/rumors/Rumor.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip59Giftwrap/rumors/Rumor.kt @@ -30,8 +30,8 @@ import com.vitorpamplona.quartz.nip59Giftwrap.seals.SealedRumorEvent class Rumor( val id: HexKey?, - @JsonProperty("pubkey") val pubKey: HexKey?, - @JsonProperty("created_at") val createdAt: Long?, + @field:JsonProperty("pubkey") val pubKey: HexKey?, + @field:JsonProperty("created_at") val createdAt: Long?, val kind: Int?, val tags: Array>?, val content: String?, diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip96FileStorage/actions/UploadResult.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip96FileStorage/actions/UploadResult.kt index 554210641..a4b2d218b 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip96FileStorage/actions/UploadResult.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip96FileStorage/actions/UploadResult.kt @@ -27,11 +27,9 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper data class UploadResult( val status: String? = null, val message: String? = null, - @JsonProperty("processing_url") - val processingUrl: String? = null, + @field:JsonProperty("processing_url") val processingUrl: String? = null, val percentage: Int? = null, - @JsonProperty("nip94_event") - val nip94Event: PartialEvent? = null, + @field:JsonProperty("nip94_event") val nip94Event: PartialEvent? = null, ) { companion object { fun parse(body: String): UploadResult { diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/nip96FileStorage/info/ServerInfo.kt b/quartz/src/main/java/com/vitorpamplona/quartz/nip96FileStorage/info/ServerInfo.kt index b1bd83846..7d773bf5c 100644 --- a/quartz/src/main/java/com/vitorpamplona/quartz/nip96FileStorage/info/ServerInfo.kt +++ b/quartz/src/main/java/com/vitorpamplona/quartz/nip96FileStorage/info/ServerInfo.kt @@ -27,33 +27,20 @@ typealias PlanName = String typealias MimeType = String data class ServerInfo( - @JsonProperty("api_url") - val apiUrl: String, - @JsonProperty("download_url") - val downloadUrl: String? = null, - @JsonProperty("delegated_to_url") - val delegatedToUrl: String? = null, - @JsonProperty("supported_nips") - val supportedNips: ArrayList = arrayListOf(), - @JsonProperty("tos_url") val - tosUrl: String? = null, - @JsonProperty("content_types") val - contentTypes: ArrayList = arrayListOf(), - @JsonProperty("plans") val - plans: Map = mapOf(), + @field:JsonProperty("api_url") val apiUrl: String, + @field:JsonProperty("download_url") val downloadUrl: String? = null, + @field:JsonProperty("delegated_to_url") val delegatedToUrl: String? = null, + @field:JsonProperty("supported_nips") val supportedNips: ArrayList = arrayListOf(), + @field:JsonProperty("tos_url") val tosUrl: String? = null, + @field:JsonProperty("content_types") val contentTypes: ArrayList = arrayListOf(), + @field:JsonProperty("plans") val plans: Map = mapOf(), ) data class Plan( - @JsonProperty("name") val - name: String? = null, - @JsonProperty("is_nip98_required") val - isNip98Required: Boolean? = null, - @JsonProperty("url") val - url: String? = null, - @JsonProperty("max_byte_size") val - maxByteSize: Long? = null, - @JsonProperty("file_expiration") val - fileExpiration: ArrayList = arrayListOf(), - @JsonProperty("media_transformations") - val mediaTransformations: Map> = emptyMap(), + @field:JsonProperty("name") val name: String? = null, + @field:JsonProperty("is_nip98_required") val isNip98Required: Boolean? = null, + @field:JsonProperty("url") val url: String? = null, + @field:JsonProperty("max_byte_size") val maxByteSize: Long? = null, + @field:JsonProperty("file_expiration") val fileExpiration: ArrayList = arrayListOf(), + @field:JsonProperty("media_transformations") val mediaTransformations: Map> = emptyMap(), )