Merge pull request #7 from usbharu/feature/refactor-ap-model

refactor: AP関係のモデルを移動

src/main/kotlin/dev/usbharu/hideout/domain/model/ActivityPubStringResponse.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.domain.model
 
-import dev.usbharu.hideout.ap.JsonLd
+import dev.usbharu.hideout.domain.model.ap.JsonLd
 import dev.usbharu.hideout.util.HttpUtil.Activity
 import io.ktor.http.*
 

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

@@ -1,7 +1,7 @@
-package dev.usbharu.hideout.ap
+package dev.usbharu.hideout.domain.model.ap
 
 open class Accept : Object {
-    public var `object`:Object? = null
+    public var `object`: Object? = null
     public var actor:String? = null
     protected constructor() : super()
     constructor(

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

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.ap
+package dev.usbharu.hideout.domain.model.ap
 
-open class Follow : Object{
+open class Follow : Object {
     public var `object`:String? = null
     public var actor:String? = null
     protected constructor() : super()

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

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.ap
+package dev.usbharu.hideout.domain.model.ap
 
 open class Image : Object {
     private var mediaType: String? = null

src/main/kotlin/dev/usbharu/hideout/domain/model/ap/JsonLd.kt

@@ -1,10 +1,9 @@
-package dev.usbharu.hideout.ap
+package dev.usbharu.hideout.domain.model.ap
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.core.JsonGenerator
-import com.fasterxml.jackson.core.TreeNode
 import com.fasterxml.jackson.databind.JsonDeserializer
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.JsonSerializer

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

@@ -1,6 +1,6 @@
-package dev.usbharu.hideout.ap
+package dev.usbharu.hideout.domain.model.ap
 
-open class Key : Object{
+open class Key : Object {
     var id:String? = null
     var owner:String? = null
     var publicKeyPem:String? = null

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

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

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

@@ -1,4 +1,4 @@
-package dev.usbharu.hideout.ap
+package dev.usbharu.hideout.domain.model.ap
 
 open class Person : Object {
     private var id:String? = null
@@ -7,8 +7,8 @@ open class Person : Object {
     var inbox:String? = null
     var outbox:String? = null
     private var url:String? = null
-    private var icon:Image? = null
+    private var icon: Image? = null
-    var publicKey:Key? = null
+    var publicKey: Key? = null
     protected constructor() : super()
     constructor(
         type: List<String> = emptyList(),

src/main/kotlin/dev/usbharu/hideout/plugins/ActivityPub.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.plugins
 
-import dev.usbharu.hideout.ap.JsonLd
+import dev.usbharu.hideout.domain.model.ap.JsonLd
 import dev.usbharu.hideout.config.Config
 import dev.usbharu.hideout.service.IUserAuthService
 import dev.usbharu.hideout.service.impl.UserAuthService

src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubFollowService.kt

@@ -1,11 +1,11 @@
 package dev.usbharu.hideout.service.activitypub
 
-import dev.usbharu.hideout.ap.Follow
+import dev.usbharu.hideout.domain.model.ap.Follow
 import dev.usbharu.hideout.domain.model.ActivityPubResponse
 import dev.usbharu.hideout.domain.model.job.ReceiveFollowJob
 import kjob.core.job.JobProps
 
 interface ActivityPubFollowService {
-    suspend fun receiveFollow(follow:Follow):ActivityPubResponse
+    suspend fun receiveFollow(follow: Follow):ActivityPubResponse
     suspend fun receiveFollowJob(props: JobProps<ReceiveFollowJob>)
 }

src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubFollowServiceImpl.kt

@@ -1,8 +1,8 @@
 package dev.usbharu.hideout.service.activitypub
 
 import com.fasterxml.jackson.module.kotlin.readValue
-import dev.usbharu.hideout.ap.Accept
+import dev.usbharu.hideout.domain.model.ap.Accept
-import dev.usbharu.hideout.ap.Follow
+import dev.usbharu.hideout.domain.model.ap.Follow
 import dev.usbharu.hideout.config.Config
 import dev.usbharu.hideout.domain.model.ActivityPubResponse
 import dev.usbharu.hideout.domain.model.ActivityPubStringResponse

src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubServiceImpl.kt

@@ -1,18 +1,15 @@
 package dev.usbharu.hideout.service.activitypub
 
 import com.fasterxml.jackson.databind.JsonNode
-import dev.usbharu.hideout.ap.Follow
+import dev.usbharu.hideout.domain.model.ap.Follow
 import dev.usbharu.hideout.config.Config
 import dev.usbharu.hideout.domain.model.ActivityPubResponse
 import dev.usbharu.hideout.domain.model.job.HideoutJob
 import dev.usbharu.hideout.domain.model.job.ReceiveFollowJob
 import dev.usbharu.hideout.exception.JsonParseException
-import kjob.core.Job
 import kjob.core.dsl.JobContextWithProps
 import kjob.core.job.JobProps
 import org.slf4j.LoggerFactory
-import kotlin.reflect.full.createInstance
-import kotlin.reflect.full.primaryConstructor
 
 class ActivityPubServiceImpl(private val activityPubFollowService: ActivityPubFollowService) : ActivityPubService {
 

src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubUserService.kt

@@ -1,9 +1,9 @@
 package dev.usbharu.hideout.service.activitypub
 
-import dev.usbharu.hideout.ap.Person
+import dev.usbharu.hideout.domain.model.ap.Person
 
 interface ActivityPubUserService {
-    suspend fun getPersonByName(name:String):Person
+    suspend fun getPersonByName(name:String): Person
 
-    suspend fun fetchPerson(url:String):Person
+    suspend fun fetchPerson(url:String): Person
 }

src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubUserServiceImpl.kt

@@ -1,9 +1,9 @@
 package dev.usbharu.hideout.service.activitypub
 
 import com.fasterxml.jackson.module.kotlin.readValue
-import dev.usbharu.hideout.ap.Image
+import dev.usbharu.hideout.domain.model.ap.Image
-import dev.usbharu.hideout.ap.Key
+import dev.usbharu.hideout.domain.model.ap.Key
-import dev.usbharu.hideout.ap.Person
+import dev.usbharu.hideout.domain.model.ap.Person
 import dev.usbharu.hideout.config.Config
 import dev.usbharu.hideout.domain.model.User
 import dev.usbharu.hideout.domain.model.UserAuthentication

src/test/kotlin/dev/usbharu/hideout/ap/ContextDeserializerTest.kt

@@ -3,7 +3,7 @@ package dev.usbharu.hideout.ap
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import org.junit.jupiter.api.Assertions.*
+import dev.usbharu.hideout.domain.model.ap.Follow
 
 class ContextDeserializerTest {
 

src/test/kotlin/dev/usbharu/hideout/ap/ContextSerializerTest.kt

@@ -1,7 +1,8 @@
 package dev.usbharu.hideout.ap
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import org.junit.jupiter.api.Assertions.*
+import dev.usbharu.hideout.domain.model.ap.Accept
+import dev.usbharu.hideout.domain.model.ap.Follow
 import org.junit.jupiter.api.Test
 
 class ContextSerializerTest{

src/test/kotlin/dev/usbharu/hideout/plugins/ActivityPubKtTest.kt

@@ -1,6 +1,6 @@
 package dev.usbharu.hideout.plugins
 
-import dev.usbharu.hideout.ap.JsonLd
+import dev.usbharu.hideout.domain.model.ap.JsonLd
 import dev.usbharu.hideout.domain.model.User
 import dev.usbharu.hideout.domain.model.UserAuthentication
 import dev.usbharu.hideout.domain.model.UserAuthenticationEntity

src/test/kotlin/dev/usbharu/hideout/routing/activitypub/UsersAPTest.kt

@@ -6,9 +6,9 @@ import com.fasterxml.jackson.annotation.Nulls
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import dev.usbharu.hideout.ap.Image
+import dev.usbharu.hideout.domain.model.ap.Image
-import dev.usbharu.hideout.ap.Key
+import dev.usbharu.hideout.domain.model.ap.Key
-import dev.usbharu.hideout.ap.Person
+import dev.usbharu.hideout.domain.model.ap.Person
 import dev.usbharu.hideout.plugins.configureRouting
 import dev.usbharu.hideout.plugins.configureSerialization
 import dev.usbharu.hideout.service.activitypub.ActivityPubService

src/test/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubFollowServiceImplTest.kt

@@ -4,10 +4,10 @@
 package dev.usbharu.hideout.service.activitypub
 
 import com.fasterxml.jackson.module.kotlin.readValue
-import dev.usbharu.hideout.ap.*
 import dev.usbharu.hideout.config.Config
 import dev.usbharu.hideout.config.ConfigData
 import dev.usbharu.hideout.domain.model.UserEntity
+import dev.usbharu.hideout.domain.model.ap.*
 import dev.usbharu.hideout.domain.model.job.ReceiveFollowJob
 import dev.usbharu.hideout.service.impl.UserService
 import dev.usbharu.hideout.service.job.JobQueueParentService