refactor: 予約語を使っていたパッケージ名を修正

detekt.yml

@@ -47,6 +47,9 @@ style:
   UseRequire:
     active: false
 
+  VarCouldBeVal:
+    ignoreLateinitVar: true
+
 complexity:
   CognitiveComplexMethod:
     active: true

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt

@@ -1,8 +1,8 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
-import dev.usbharu.hideout.activitypub.domain.model.`object`.ObjectDeserializer
+import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer
 
 open class Accept : Object {
     @JsonDeserialize(using = ObjectDeserializer::class)

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt

@@ -1,8 +1,8 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
-import dev.usbharu.hideout.activitypub.domain.model.`object`.ObjectDeserializer
+import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer
 
 open class Create : Object {
     @JsonDeserialize(using = ObjectDeserializer::class)

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Document : Object {
 

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Emoji : Object {
     var updated: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Follow : Object {
     var `object`: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Image : Object {
     private var mediaType: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Key : Object {
     var owner: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt

@@ -1,8 +1,8 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
-import dev.usbharu.hideout.activitypub.domain.model.`object`.ObjectDeserializer
+import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer
 
 open class Like : Object {
     var `object`: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Note : Object {
     var attributedTo: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 open class Person : Object {
     var preferredUsername: String? = null

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt

@@ -1,8 +1,8 @@
 package dev.usbharu.hideout.activitypub.domain.model
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
-import dev.usbharu.hideout.activitypub.domain.model.`object`.ObjectDeserializer
+import dev.usbharu.hideout.activitypub.domain.model.objects.ObjectDeserializer
 import java.time.Instant
 
 open class Undo : Object {

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/Object.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.domain.model.`object`
+package dev.usbharu.hideout.activitypub.domain.model.objects
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.JsonSerializer

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectDeserializer.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.domain.model.`object`
+package dev.usbharu.hideout.activitypub.domain.model.objects
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.DeserializationContext

src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.domain.model.`object`
+package dev.usbharu.hideout.activitypub.domain.model.objects
 
 open class ObjectValue : Object {
 

src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/NoteQueryServiceImpl.kt

@@ -3,7 +3,7 @@ package dev.usbharu.hideout.activitypub.infrastructure.exposedquery
 import dev.usbharu.hideout.activitypub.domain.model.Document
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.query.NoteQueryService
-import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteServiceImpl.Companion.public
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteServiceImpl.Companion.public
 import dev.usbharu.hideout.application.infrastructure.exposed.QueryMapper
 import dev.usbharu.hideout.core.domain.model.post.Post
 import dev.usbharu.hideout.core.domain.model.post.PostRepository

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt

@@ -1,7 +1,7 @@
 package dev.usbharu.hideout.activitypub.interfaces.api.actor
 
 import dev.usbharu.hideout.activitypub.domain.model.Person
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.RestController

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/common/ActivityPubStringResponse.kt

@@ -25,9 +25,7 @@ sealed class ActivityPubResponse(
         return result
     }
 
-    override fun toString(): String {
+    override fun toString(): String = "ActivityPubResponse(httpStatusCode=$httpStatusCode, contentType=$contentType)"
-        return "ActivityPubResponse(httpStatusCode=$httpStatusCode, contentType=$contentType)"
-    }
 }
 
 class ActivityPubStringResponse(
@@ -45,13 +43,9 @@ class ActivityPubStringResponse(
         return true
     }
 
-    override fun hashCode(): Int {
+    override fun hashCode(): Int = message.hashCode()
-        return message.hashCode()
-    }
 
-    override fun toString(): String {
+    override fun toString(): String = "ActivityPubStringResponse(message='$message') ${super.toString()}"
-        return "ActivityPubStringResponse(message='$message') ${super.toString()}"
-    }
 }
 
 class ActivityPubObjectResponse(
@@ -68,11 +62,7 @@ class ActivityPubObjectResponse(
         return true
     }
 
-    override fun hashCode(): Int {
+    override fun hashCode(): Int = message.hashCode()
-        return message.hashCode()
-    }
 
-    override fun toString(): String {
+    override fun toString(): String = "ActivityPubObjectResponse(message=$message) ${super.toString()}"
-        return "ActivityPubObjectResponse(message=$message) ${super.toString()}"
-    }
 }

src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImpl.kt

@@ -1,7 +1,7 @@
 package dev.usbharu.hideout.activitypub.interfaces.api.note
 
 import dev.usbharu.hideout.activitypub.domain.model.Note
-import dev.usbharu.hideout.activitypub.service.`object`.note.NoteApApiService
+import dev.usbharu.hideout.activitypub.service.objects.note.NoteApApiService
 import dev.usbharu.hideout.core.infrastructure.springframework.httpsignature.HttpSignatureUser
 import org.springframework.http.ResponseEntity
 import org.springframework.security.core.annotation.CurrentSecurityContext

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateService.kt

@@ -5,7 +5,7 @@ import dev.usbharu.hideout.activitypub.domain.model.Create
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubResponse
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteService
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteService
 import dev.usbharu.hideout.application.external.Transaction
 import io.ktor.http.*
 import org.slf4j.LoggerFactory

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobServiceImpl.kt

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.module.kotlin.readValue
 import dev.usbharu.hideout.activitypub.domain.model.Accept
 import dev.usbharu.hideout.activitypub.domain.model.Follow
 import dev.usbharu.hideout.activitypub.service.common.APRequestService
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.application.external.Transaction
 import dev.usbharu.hideout.core.external.job.ReceiveFollowJob
 import dev.usbharu.hideout.core.query.UserQueryService

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeService.kt

@@ -5,8 +5,8 @@ import dev.usbharu.hideout.activitypub.domain.exception.IllegalActivityPubObject
 import dev.usbharu.hideout.activitypub.domain.model.Like
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubResponse
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteService
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteService
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.application.external.Transaction
 import dev.usbharu.hideout.core.query.PostQueryService
 import dev.usbharu.hideout.core.service.reaction.ReactionService

src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoService.kt

@@ -4,7 +4,7 @@ import dev.usbharu.hideout.activitypub.domain.model.Follow
 import dev.usbharu.hideout.activitypub.domain.model.Undo
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubResponse
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.application.external.Transaction
 import dev.usbharu.hideout.core.query.UserQueryService
 import dev.usbharu.hideout.core.service.user.UserService

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestService.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.core.domain.model.user.User
 
 interface APRequestService {

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImpl.kt

@@ -1,7 +1,7 @@
 package dev.usbharu.hideout.activitypub.service.common
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.core.domain.model.user.User
 import dev.usbharu.hideout.util.Base64Util
 import dev.usbharu.hideout.util.HttpUtil.Activity

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveService.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.core.domain.model.user.User
 
 interface APResourceResolveService {

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.core.domain.model.user.User
 import dev.usbharu.hideout.core.domain.model.user.UserRepository
 import org.springframework.stereotype.Service

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ApJobServiceImpl.kt

@@ -2,7 +2,7 @@ package dev.usbharu.hideout.activitypub.service.common
 
 import dev.usbharu.hideout.activitypub.service.activity.follow.APReceiveFollowJobService
 import dev.usbharu.hideout.activitypub.service.activity.like.ApReactionJobService
-import dev.usbharu.hideout.activitypub.service.`object`.note.ApNoteJobService
+import dev.usbharu.hideout.activitypub.service.objects.note.ApNoteJobService
 import dev.usbharu.hideout.core.external.job.*
 import kjob.core.dsl.JobContextWithProps
 import kjob.core.job.JobProps

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/CacheManager.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 
 interface CacheManager {
 

src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/InMemoryCacheManager.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.activitypub.service.common
 
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object
 import dev.usbharu.hideout.util.LruCache
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.sync.Mutex

src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import dev.usbharu.hideout.activitypub.domain.exception.FailedToGetActivityPubResourceException
@@ -6,7 +6,7 @@ import dev.usbharu.hideout.activitypub.domain.exception.IllegalActivityPubObject
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.service.common.APResourceResolveService
 import dev.usbharu.hideout.activitypub.service.common.resolve
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
 import dev.usbharu.hideout.core.domain.model.post.Post
 import dev.usbharu.hideout.core.domain.model.post.PostRepository

src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobService.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import dev.usbharu.hideout.core.external.job.DeliverPostJob
 import kjob.core.job.JobProps

src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImpl.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue

src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiService.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import dev.usbharu.hideout.activitypub.domain.model.Note
 

src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiServiceImpl.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.query.NoteQueryService

src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/user/APUserService.kt

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.activitypub.service.`object`.user
+package dev.usbharu.hideout.activitypub.service.objects.user
 
 import dev.usbharu.hideout.activitypub.domain.exception.IllegalActivityPubObjectException
 import dev.usbharu.hideout.activitypub.domain.model.Image

src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt

@@ -25,7 +25,8 @@ class MediaServiceImpl(
 ) : MediaService {
     override suspend fun uploadLocalMedia(mediaRequest: MediaRequest): EntityMedia {
         logger.info(
-            "Media upload. filename:${mediaRequest.file.name} size:${mediaRequest.file.size} contentType:${mediaRequest.file.contentType}"
+            "Media upload. filename:${mediaRequest.file.name} size:${mediaRequest.file.size} " +
+                    "contentType:${mediaRequest.file.contentType}"
         )
 
         if (mediaRequest.file.size == 0L) {

src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateServiceImplTest.kt

@@ -5,7 +5,7 @@ import dev.usbharu.hideout.activitypub.domain.model.Create
 import dev.usbharu.hideout.activitypub.domain.model.Like
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteService
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteService
 import io.ktor.http.*
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Assertions.assertEquals

src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowServiceImplTest.kt

@@ -7,7 +7,7 @@ import dev.usbharu.hideout.activitypub.domain.model.Follow
 import dev.usbharu.hideout.activitypub.domain.model.Image
 import dev.usbharu.hideout.activitypub.domain.model.Key
 import dev.usbharu.hideout.activitypub.domain.model.Person
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.application.config.ApplicationConfig
 import dev.usbharu.hideout.application.config.CharacterLimit
 import dev.usbharu.hideout.core.domain.model.post.Post

src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeServiceImplTest.kt

@@ -5,8 +5,8 @@ import dev.usbharu.hideout.activitypub.domain.model.Like
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.domain.model.Person
 import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse
-import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteService
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteService
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.core.query.PostQueryService
 import dev.usbharu.hideout.core.service.reaction.ReactionService
 import io.ktor.http.*

src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt

@@ -9,7 +9,7 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.kotlin.*
 import utils.UserBuilder
-import dev.usbharu.hideout.activitypub.domain.model.`object`.Object as APObject
+import dev.usbharu.hideout.activitypub.domain.model.objects.Object as APObject
 
 @ExtendWith(MockitoExtension::class)
 

src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteServiceImplTest.kt

@@ -1,6 +1,6 @@
 @file:OptIn(ExperimentalCoroutinesApi::class) @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import dev.usbharu.hideout.activitypub.domain.exception.FailedToGetActivityPubResourceException
 import dev.usbharu.hideout.activitypub.domain.model.Image
@@ -8,8 +8,8 @@ import dev.usbharu.hideout.activitypub.domain.model.Key
 import dev.usbharu.hideout.activitypub.domain.model.Note
 import dev.usbharu.hideout.activitypub.domain.model.Person
 import dev.usbharu.hideout.activitypub.service.common.APResourceResolveService
-import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteServiceImpl.Companion.public
+import dev.usbharu.hideout.activitypub.service.objects.note.APNoteServiceImpl.Companion.public
-import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService
+import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
 import dev.usbharu.hideout.application.config.ApplicationConfig
 import dev.usbharu.hideout.application.config.CharacterLimit
 import dev.usbharu.hideout.application.service.id.TwitterSnowflakeIdGenerateService

src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImplTest.kt

@@ -1,6 +1,6 @@
 @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 
-package dev.usbharu.hideout.activitypub.service.`object`.note
+package dev.usbharu.hideout.activitypub.service.objects.note
 
 import dev.usbharu.hideout.activitypub.domain.model.Create
 import dev.usbharu.hideout.activitypub.domain.model.Note