highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-28 21:53:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use explicit annotation target for constructor params

Browse Source 
See https://youtrack.jetbrains.com/issue/KT-73255 for more details
This commit is contained in:
David Kaspar
2025-08-18 10:44:42 +01:00
parent 45ec9e3a62
commit 41545a156b
7 changed files with 54 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
quartz/src/androidTest/java/com/vitorpamplona/quartz/nip44Encryption/TestPackageClasses.kt
View File

@@ -32,61 +32,59 @@ data class V2(
) )
data class Valid( data class Valid(
@JsonProperty("get_conversation_key") @field:JsonProperty("get_conversation_key") val getConversationKey: ArrayList<GetConversationKey> = arrayListOf(),
val getConversationKey: ArrayList<GetConversationKey> = arrayListOf(), @field:JsonProperty("get_message_keys") val getMessageKeys: GetMessageKeys? = GetMessageKeys(),
@JsonProperty("get_message_keys") val getMessageKeys: GetMessageKeys? = GetMessageKeys(), @field:JsonProperty("calc_padded_len") val calcPaddedLen: ArrayList<ArrayList<Int>> = arrayListOf(),
@JsonProperty("calc_padded_len") val calcPaddedLen: ArrayList<ArrayList<Int>> = arrayListOf(), @field:JsonProperty("encrypt_decrypt") val encryptDecrypt: ArrayList<EncryptDecrypt> = arrayListOf(),
@JsonProperty("encrypt_decrypt") val encryptDecrypt: ArrayList<EncryptDecrypt> = arrayListOf(), @field:JsonProperty("encrypt_decrypt_long_msg")
@JsonProperty("encrypt_decrypt_long_msg")
val encryptDecryptLongMsg: ArrayList<EncryptDecryptLongMsg> = arrayListOf(), val encryptDecryptLongMsg: ArrayList<EncryptDecryptLongMsg> = arrayListOf(),
) )
data class Invalid( data class Invalid(
@JsonProperty("encrypt_msg_lengths") val encryptMsgLengths: ArrayList<Int> = arrayListOf(), @field:JsonProperty("encrypt_msg_lengths") val encryptMsgLengths: ArrayList<Int> = arrayListOf(),
@JsonProperty("get_conversation_key") @field:JsonProperty("get_conversation_key") val getConversationKey: ArrayList<GetConversationKey> = arrayListOf(),
val getConversationKey: ArrayList<GetConversationKey> = arrayListOf(), @field:JsonProperty("decrypt") val decrypt: ArrayList<Decrypt> = arrayListOf(),
@JsonProperty("decrypt") val decrypt: ArrayList<Decrypt> = arrayListOf(),
) )
data class GetConversationKey( data class GetConversationKey(
val sec1: String? = null, val sec1: String? = null,
val pub2: String? = null, val pub2: String? = null,
val note: String? = null, val note: String? = null,
@JsonProperty("conversation_key") val conversationKey: String? = null, @field:JsonProperty("conversation_key") val conversationKey: String? = null,
) )
data class GetMessageKeys( data class GetMessageKeys(
@JsonProperty("conversation_key") val conversationKey: String? = null, @field:JsonProperty("conversation_key") val conversationKey: String? = null,
val keys: ArrayList<Keys> = arrayListOf(), val keys: ArrayList<Keys> = arrayListOf(),
) )
data class Keys( data class Keys(
@JsonProperty("nonce") val nonce: String? = null, @field:JsonProperty("nonce") val nonce: String? = null,
@JsonProperty("chacha_key") val chachaKey: String? = null, @field:JsonProperty("chacha_key") val chachaKey: String? = null,
@JsonProperty("chacha_nonce") val chachaNonce: String? = null, @field:JsonProperty("chacha_nonce") val chachaNonce: String? = null,
@JsonProperty("hmac_key") val hmacKey: String? = null, @field:JsonProperty("hmac_key") val hmacKey: String? = null,
) )
data class EncryptDecrypt( data class EncryptDecrypt(
val sec1: String? = null, val sec1: String? = null,
val sec2: 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 nonce: String? = null,
val plaintext: String? = null, val plaintext: String? = null,
val payload: String? = null, val payload: String? = null,
) )
data class EncryptDecryptLongMsg( data class EncryptDecryptLongMsg(
@JsonProperty("conversation_key") val conversationKey: String? = null, @field:JsonProperty("conversation_key") val conversationKey: String? = null,
val nonce: String? = null, val nonce: String? = null,
val pattern: String? = null, val pattern: String? = null,
val repeat: Int? = null, val repeat: Int? = null,
@JsonProperty("plaintext_sha256") val plaintextSha256: String? = null, @field:JsonProperty("plaintext_sha256") val plaintextSha256: String? = null,
@JsonProperty("payload_sha256") val payloadSha256: String? = null, @field:JsonProperty("payload_sha256") val payloadSha256: String? = null,
) )
data class Decrypt( data class Decrypt(
@JsonProperty("conversation_key") val conversationKey: String? = null, @field:JsonProperty("conversation_key") val conversationKey: String? = null,
val nonce: String? = null, val nonce: String? = null,
val plaintext: String? = null, val plaintext: String? = null,
val payload: String? = null, val payload: String? = null,

48
quartz/src/main/java/com/vitorpamplona/quartz/experimental/limits/Limits.kt
View File

@@ -23,36 +23,20 @@ package com.vitorpamplona.quartz.experimental.limits
import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonProperty
class Limits( class Limits(
@JsonProperty("can_write") @field:JsonProperty("can_write") val canWrite: Boolean?,
val canWrite: Boolean?, @field:JsonProperty("can_read") val canRead: Boolean?,
@JsonProperty("can_read") @field:JsonProperty("accepted_event_kinds") val acceptedEventKinds: Set<Int>?,
val canRead: Boolean?, @field:JsonProperty("blocked_event_kinds") val blockedEventKinds: Set<Int>?,
@JsonProperty("accepted_event_kinds") @field:JsonProperty("min_pow_difficulty") val minPoW: Int?,
val acceptedEventKinds: Set<Int>?, @field:JsonProperty("max_message_length") val maxMessageLength: Int?,
@JsonProperty("blocked_event_kinds") @field:JsonProperty("max_subscriptions") val maxSubscriptions: Int?,
val blockedEventKinds: Set<Int>?, @field:JsonProperty("max_filters") val maxFilters: Int?,
@JsonProperty("min_pow_difficulty") @field:JsonProperty("max_limit") val maxLimit: Int?,
val minPoW: Int?, @field:JsonProperty("max_event_tags") val maxEventTags: Int?,
@JsonProperty("max_message_length") @field:JsonProperty("max_content_length") val maxContentLength: Int?,
val maxMessageLength: Int?, @field:JsonProperty("created_at_msecs_ago") val createdAtMillisecsAgo: Long?,
@JsonProperty("max_subscriptions") @field:JsonProperty("created_at_msecs_ahead") val createdAtMillisecsAhead: Long?,
val maxSubscriptions: Int?, @field:JsonProperty("filter_rate_limit") val filterRateLimit: Long?,
@JsonProperty("max_filters") @field:JsonProperty("publishing_rate_limit") val publishingRateLimit: Long?,
val maxFilters: Int?, @field:JsonProperty("required_tags") val requiredTags: Array<Array<String>>?,
@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<Array<String>>?,
) )

2
quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/signers/EventTemplate.kt
View File

@@ -30,7 +30,7 @@ import com.vitorpamplona.quartz.nip01Core.jackson.JsonMapper
import com.vitorpamplona.quartz.utils.TimeUtils import com.vitorpamplona.quartz.utils.TimeUtils
class EventTemplate<T : Event>( class EventTemplate<T : Event>(
@JsonProperty("created_at") @field:JsonProperty("created_at")
val createdAt: Long, val createdAt: Long,
val kind: Int, val kind: Int,
val tags: TagArray, val tags: TagArray,

2
quartz/src/main/java/com/vitorpamplona/quartz/nip47WalletConnect/Response.kt
View File

@@ -26,7 +26,7 @@ import com.vitorpamplona.quartz.utils.pointerSizeInBytes
// RESPONSE OBJECTS // RESPONSE OBJECTS
abstract class Response( abstract class Response(
@JsonProperty("result_type") val resultType: String, @field:JsonProperty("result_type") val resultType: String,
) { ) {
abstract fun countMemory(): Long abstract fun countMemory(): Long
} }

4
quartz/src/main/java/com/vitorpamplona/quartz/nip59Giftwrap/rumors/Rumor.kt
View File

@@ -30,8 +30,8 @@ import com.vitorpamplona.quartz.nip59Giftwrap.seals.SealedRumorEvent
class Rumor( class Rumor(
val id: HexKey?, val id: HexKey?,
@JsonProperty("pubkey") val pubKey: HexKey?, @field:JsonProperty("pubkey") val pubKey: HexKey?,
@JsonProperty("created_at") val createdAt: Long?, @field:JsonProperty("created_at") val createdAt: Long?,
val kind: Int?, val kind: Int?,
val tags: Array<Array<String>>?, val tags: Array<Array<String>>?,
val content: String?, val content: String?,

6
quartz/src/main/java/com/vitorpamplona/quartz/nip96FileStorage/actions/UploadResult.kt
View File

@@ -27,11 +27,9 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
data class UploadResult( data class UploadResult(
val status: String? = null, val status: String? = null,
val message: String? = null, val message: String? = null,
@JsonProperty("processing_url") @field:JsonProperty("processing_url") val processingUrl: String? = null,
val processingUrl: String? = null,
val percentage: Int? = null, val percentage: Int? = null,
@JsonProperty("nip94_event") @field:JsonProperty("nip94_event") val nip94Event: PartialEvent? = null,
val nip94Event: PartialEvent? = null,
) { ) {
companion object { companion object {
fun parse(body: String): UploadResult { fun parse(body: String): UploadResult {

39
quartz/src/main/java/com/vitorpamplona/quartz/nip96FileStorage/info/ServerInfo.kt
View File

@@ -27,33 +27,20 @@ typealias PlanName = String
typealias MimeType = String typealias MimeType = String
data class ServerInfo( data class ServerInfo(
@JsonProperty("api_url") @field:JsonProperty("api_url") val apiUrl: String,
val apiUrl: String, @field:JsonProperty("download_url") val downloadUrl: String? = null,
@JsonProperty("download_url") @field:JsonProperty("delegated_to_url") val delegatedToUrl: String? = null,
val downloadUrl: String? = null, @field:JsonProperty("supported_nips") val supportedNips: ArrayList<Int> = arrayListOf(),
@JsonProperty("delegated_to_url") @field:JsonProperty("tos_url") val tosUrl: String? = null,
val delegatedToUrl: String? = null, @field:JsonProperty("content_types") val contentTypes: ArrayList<MimeType> = arrayListOf(),
@JsonProperty("supported_nips") @field:JsonProperty("plans") val plans: Map<PlanName, Plan> = mapOf(),
val supportedNips: ArrayList<Int> = arrayListOf(),
@JsonProperty("tos_url") val
tosUrl: String? = null,
@JsonProperty("content_types") val
contentTypes: ArrayList<MimeType> = arrayListOf(),
@JsonProperty("plans") val
plans: Map<PlanName, Plan> = mapOf(),
) )
data class Plan( data class Plan(
@JsonProperty("name") val @field:JsonProperty("name") val name: String? = null,
name: String? = null, @field:JsonProperty("is_nip98_required") val isNip98Required: Boolean? = null,
@JsonProperty("is_nip98_required") val @field:JsonProperty("url") val url: String? = null,
isNip98Required: Boolean? = null, @field:JsonProperty("max_byte_size") val maxByteSize: Long? = null,
@JsonProperty("url") val @field:JsonProperty("file_expiration") val fileExpiration: ArrayList<Int> = arrayListOf(),
url: String? = null, @field:JsonProperty("media_transformations") val mediaTransformations: Map<MimeType, Array<String>> = emptyMap(),
@JsonProperty("max_byte_size") val
maxByteSize: Long? = null,
@JsonProperty("file_expiration") val
fileExpiration: ArrayList<Int> = arrayListOf(),
@JsonProperty("media_transformations")
val mediaTransformations: Map<MimeType, Array<String>> = emptyMap(),
) )