From 2aa01f98ad86d0f6cc05c289909ad42cb7e70fbc Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:10:40 +0900 Subject: [PATCH] =?UTF-8?q?reafactor:=20=E3=81=9D=E3=81=AE=E4=BB=96?= =?UTF-8?q?=E3=81=AE=E9=83=A8=E5=88=86=E3=82=82Null-safe=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activitypub/domain/model/Accept.kt | 4 +- .../activitypub/domain/model/Create.kt | 6 +-- .../activitypub/domain/model/Delete.kt | 6 +-- .../activitypub/domain/model/Document.kt | 7 +--- .../hideout/activitypub/domain/model/Emoji.kt | 4 +- .../activitypub/domain/model/Follow.kt | 22 ++++------- .../hideout/activitypub/domain/model/Image.kt | 18 ++++----- .../hideout/activitypub/domain/model/Key.kt | 26 +++++-------- .../hideout/activitypub/domain/model/Like.kt | 38 ++++++------------- .../hideout/activitypub/domain/model/Note.kt | 16 ++++---- .../activitypub/domain/model/Person.kt | 6 +-- .../hideout/activitypub/domain/model/Undo.kt | 27 ++++--------- 12 files changed, 64 insertions(+), 116 deletions(-) diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt index d1b0936b..15eaf20f 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt @@ -8,9 +8,7 @@ import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer open class Accept @JsonCreator constructor( type: List = emptyList(), override val name: String, - @JsonDeserialize(using = ObjectDeserializer::class) - @Suppress("VariableNaming") - var `object`: Object?, + @JsonDeserialize(using = ObjectDeserializer::class) @Suppress("VariableNaming") var `object`: Object?, override val actor: String ) : Object( type = add(type, "Accept") diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt index df22045c..6b6bb810 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt @@ -9,11 +9,11 @@ open class Create( override val name: String, @JsonDeserialize(using = ObjectDeserializer::class) @Suppress("VariableNaming") - var `object`: Object?, + val `object`: Object, override val actor: String, override val id: String, - var to: List = emptyList(), - var cc: List = emptyList() + val to: List = emptyList(), + val cc: List = emptyList() ) : Object( type = add(type, "Create") ), diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt index 10b919c5..e4e8ccb0 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt @@ -7,8 +7,8 @@ import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer open class Delete : Object, HasId, HasActor { @JsonDeserialize(using = ObjectDeserializer::class) @Suppress("VariableNaming") - var `object`: Object? = null - var published: String? = null + val `object`: Object + val published: String override val actor: String override val id: String @@ -17,7 +17,7 @@ open class Delete : Object, HasId, HasActor { actor: String, id: String, `object`: Object, - published: String? + published: String ) : super(add(type, "Delete")) { this.`object` = `object` this.published = published diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt index 480c6011..a9b3e8c9 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt @@ -5,16 +5,13 @@ import dev.usbharu.hideout.activitypub.domain.model.objects.Object open class Document( type: List = emptyList(), override val name: String = "", - mediaType: String, - url: String + val mediaType: String, + val url: String ) : Object( type = add(type, "Document") ), HasName { - var mediaType: String? = mediaType - var url: String? = url - override fun equals(other: Any?): Boolean { if (this === other) return true if (javaClass != other?.javaClass) return false diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt index 0a91be60..d46edc8a 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt @@ -6,8 +6,8 @@ open class Emoji( type: List, override val name: String, override val id: String, - var updated: String?, - var icon: Image? + val updated: String, + val icon: Image ) : Object( type = add(type, "Emoji") ), diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt index 73ff75f3..2689ccb5 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt @@ -2,22 +2,14 @@ package dev.usbharu.hideout.activitypub.domain.model import dev.usbharu.hideout.activitypub.domain.model.objects.Object -open class Follow : Object, HasActor { - @Suppress("VariableNaming") - var `object`: String? = null - +open class Follow( + type: List = emptyList(), + @Suppress("VariableNaming") val `object`: String, override val actor: String - - constructor( - type: List = emptyList(), - `object`: String?, - actor: String - ) : super( - type = add(type, "Follow") - ) { - this.`object` = `object` - this.actor = actor - } +) : Object( + type = add(type, "Follow") +), + HasActor { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt index 60b0c8ac..6353692b 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt @@ -2,17 +2,13 @@ package dev.usbharu.hideout.activitypub.domain.model import dev.usbharu.hideout.activitypub.domain.model.objects.Object -open class Image : Object { - private var mediaType: String? = null - private var url: String? = null - - protected constructor() : super() - constructor(type: List = emptyList(), mediaType: String?, url: String?) : super( - add(type, "Image") - ) { - this.mediaType = mediaType - this.url = url - } +open class Image( + type: List = emptyList(), + val mediaType: String, + val url: String +) : Object( + add(type, "Image") +) { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt index 993d4af9..4a13ba56 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt @@ -2,23 +2,15 @@ package dev.usbharu.hideout.activitypub.domain.model import dev.usbharu.hideout.activitypub.domain.model.objects.Object -open class Key : Object, HasId { - var owner: String? = null - var publicKeyPem: String? = null - override val id: String - - constructor( - type: List, - id: String, - owner: String?, - publicKeyPem: String? - ) : super( - type = add(list = type, type = "Key") - ) { - this.owner = owner - this.publicKeyPem = publicKeyPem - this.id = id - } +open class Key( + type: List, + override val id: String, + val owner: String, + val publicKeyPem: String +) : Object( + type = add(list = type, type = "Key") +), + HasId { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt index 2400eeff..f4eaa13f 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt @@ -4,32 +4,18 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize import dev.usbharu.hideout.activitypub.domain.model.objects.Object import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer -open class Like : Object, HasId, HasActor { - @Suppress("VariableNaming") - var `object`: String? = null - var content: String? = null - - @JsonDeserialize(contentUsing = ObjectDeserializer::class) - var tag: List = emptyList() - override val actor: String - override val id: String - - constructor( - type: List = emptyList(), - actor: String, - id: String, - `object`: String?, - content: String?, - tag: List = emptyList() - ) : super( - type = add(type, "Like") - ) { - this.`object` = `object` - this.content = content - this.tag = tag - this.actor = actor - this.id = id - } +open class Like( + type: List = emptyList(), + override val actor: String, + override val id: String, + @Suppress("VariableNaming") val `object`: String, + val content: String, + @JsonDeserialize(contentUsing = ObjectDeserializer::class) val tag: List = emptyList() +) : Object( + type = add(type, "Like") +), + HasId, + HasActor { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt index 74d5ce7a..889c8776 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt @@ -7,14 +7,14 @@ open class Note constructor( type: List = emptyList(), override val id: String, - var attributedTo: String, - var content: String, - var published: String, - var to: List = emptyList(), - var cc: List = emptyList(), - var sensitive: Boolean = false, - var inReplyTo: String? = null, - var attachment: List = emptyList() + val attributedTo: String, + val content: String, + val published: String, + val to: List = emptyList(), + val cc: List = emptyList(), + val sensitive: Boolean = false, + val inReplyTo: String? = null, + val attachment: List = emptyList() ) : Object( type = add(type, "Note") ), diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt index e94cc9b1..58165a81 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt @@ -10,9 +10,9 @@ constructor( override val id: String, var preferredUsername: String?, var summary: String?, - var inbox: String?, - var outbox: String?, - var url: String?, + var inbox: String, + var outbox: String, + var url: String, private var icon: Image?, var publicKey: Key?, var endpoints: Map = emptyMap(), diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt index 857416ef..d02ccc4d 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt @@ -4,27 +4,14 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize import dev.usbharu.hideout.activitypub.domain.model.objects.Object import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer -open class Undo : Object, HasId, HasActor { - +open class Undo( + type: List = emptyList(), + override val actor: String, + override val id: String, @JsonDeserialize(using = ObjectDeserializer::class) - @Suppress("VariableNaming") - var `object`: Object? = null - var published: String? = null - override val actor: String - override val id: String - - constructor( - type: List = emptyList(), - actor: String, - id: String, - `object`: Object, - published: String - ) : super(add(type, "Undo")) { - this.`object` = `object` - this.published = published - this.id = id - this.actor = actor - } + @Suppress("VariableNaming") val `object`: Object, + val published: String +) : Object(add(type, "Undo")), HasId, HasActor { override fun equals(other: Any?): Boolean { if (this === other) return true