usbharu
/
Hideout
mirror of https://github.com/usbharu/Hideout.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: tmpから正式なパッケージに移動

This commit is contained in:
usbharu 2023-11-26 15:47:40 +09:00
parent 9171e3a063
commit 14998f514d
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/impl/CreateActivityProcessor.kt → src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/CreateActivityProcessor.kt
View File

@ -1,11 +1,11 @@
package dev.usbharu.hideout.activitypub.service.tmp.impl package dev.usbharu.hideout.activitypub.service.activity.create
import dev.usbharu.hideout.activitypub.domain.model.Create import dev.usbharu.hideout.activitypub.domain.model.Create
import dev.usbharu.hideout.activitypub.domain.model.Note import dev.usbharu.hideout.activitypub.domain.model.Note
import dev.usbharu.hideout.activitypub.service.common.AbstractActivityPubProcessor
import dev.usbharu.hideout.activitypub.service.common.ActivityPubProcessContext
import dev.usbharu.hideout.activitypub.service.common.ActivityType import dev.usbharu.hideout.activitypub.service.common.ActivityType
import dev.usbharu.hideout.activitypub.service.objects.note.APNoteService import dev.usbharu.hideout.activitypub.service.objects.note.APNoteService
import dev.usbharu.hideout.activitypub.service.tmp.AbstractActivityPubProcessor
import dev.usbharu.hideout.activitypub.service.tmp.ActivityPubProcessContext
import dev.usbharu.hideout.application.external.Transaction import dev.usbharu.hideout.application.external.Transaction
import org.springframework.stereotype.Service import org.springframework.stereotype.Service

2
src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/AbstractActivityPubProcessor.kt → src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/AbstractActivityPubProcessor.kt
View File

@ -1,4 +1,4 @@
package dev.usbharu.hideout.activitypub.service.tmp package dev.usbharu.hideout.activitypub.service.common
import dev.usbharu.hideout.activitypub.domain.exception.ActivityPubProcessException import dev.usbharu.hideout.activitypub.domain.exception.ActivityPubProcessException
import dev.usbharu.hideout.activitypub.domain.exception.FailedProcessException import dev.usbharu.hideout.activitypub.domain.exception.FailedProcessException

2
src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/ActivityPubProcessContext.kt → src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessContext.kt
View File

@ -1,4 +1,4 @@
package dev.usbharu.hideout.activitypub.service.tmp package dev.usbharu.hideout.activitypub.service.common
import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.JsonNode
import dev.usbharu.hideout.activitypub.domain.model.objects.Object import dev.usbharu.hideout.activitypub.domain.model.objects.Object

3
src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/ActivityPubProcessor.kt → src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessor.kt
View File

@ -1,7 +1,6 @@
package dev.usbharu.hideout.activitypub.service.tmp package dev.usbharu.hideout.activitypub.service.common
import dev.usbharu.hideout.activitypub.domain.model.objects.Object import dev.usbharu.hideout.activitypub.domain.model.objects.Object
import dev.usbharu.hideout.activitypub.service.common.ActivityType
interface ActivityPubProcessor<T : Object> { interface ActivityPubProcessor<T : Object> {
suspend fun process(activity: ActivityPubProcessContext<T>) suspend fun process(activity: ActivityPubProcessContext<T>)

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

@ -3,8 +3,8 @@ package dev.usbharu.hideout.activitypub.service.common
import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.ObjectMapper
import dev.usbharu.hideout.activitypub.service.activity.follow.APReceiveFollowJobService import dev.usbharu.hideout.activitypub.service.activity.follow.APReceiveFollowJobService
import dev.usbharu.hideout.activitypub.service.activity.like.ApReactionJobService import dev.usbharu.hideout.activitypub.service.activity.like.ApReactionJobService
import dev.usbharu.hideout.activitypub.service.inbox.InboxJobProcessor
import dev.usbharu.hideout.activitypub.service.objects.note.ApNoteJobService import dev.usbharu.hideout.activitypub.service.objects.note.ApNoteJobService
import dev.usbharu.hideout.activitypub.service.tmp.InboxJobProcessor
import dev.usbharu.hideout.core.external.job.* import dev.usbharu.hideout.core.external.job.*
import kjob.core.dsl.JobContextWithProps import kjob.core.dsl.JobContextWithProps
import kjob.core.job.JobProps import kjob.core.job.JobProps

10
src/main/kotlin/dev/usbharu/hideout/activitypub/service/tmp/InboxJobProcessor.kt → src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt
View File

@ -1,10 +1,13 @@
package dev.usbharu.hideout.activitypub.service.tmp package dev.usbharu.hideout.activitypub.service.inbox
import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue import com.fasterxml.jackson.module.kotlin.readValue
import dev.usbharu.hideout.activitypub.domain.model.objects.Object import dev.usbharu.hideout.activitypub.domain.model.objects.Object
import dev.usbharu.hideout.activitypub.service.common.ActivityPubProcessContext
import dev.usbharu.hideout.activitypub.service.common.ActivityPubProcessor
import dev.usbharu.hideout.activitypub.service.common.ActivityType import dev.usbharu.hideout.activitypub.service.common.ActivityType
import dev.usbharu.hideout.activitypub.service.objects.user.APUserService import dev.usbharu.hideout.activitypub.service.objects.user.APUserService
import dev.usbharu.hideout.application.external.Transaction
import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException import dev.usbharu.hideout.core.domain.exception.FailedToGetResourcesException
import dev.usbharu.hideout.core.external.job.InboxJob import dev.usbharu.hideout.core.external.job.InboxJob
import dev.usbharu.hideout.core.external.job.InboxJobParam import dev.usbharu.hideout.core.external.job.InboxJobParam
@ -28,7 +31,8 @@ class InboxJobProcessor(
private val signatureHeaderParser: SignatureHeaderParser, private val signatureHeaderParser: SignatureHeaderParser,
private val signatureVerifier: HttpSignatureVerifier, private val signatureVerifier: HttpSignatureVerifier,
private val userQueryService: UserQueryService, private val userQueryService: UserQueryService,
private val apUserService: APUserService private val apUserService: APUserService,
private val transaction: Transaction
) : JobProcessor<InboxJobParam, InboxJob> { ) : JobProcessor<InboxJobParam, InboxJob> {
suspend fun process(props: JobProps<InboxJob>) { suspend fun process(props: JobProps<InboxJob>) {
@ -92,7 +96,7 @@ class InboxJobProcessor(
} }
} }
override suspend fun process(param: InboxJobParam) { override suspend fun process(param: InboxJobParam) = transaction.transaction {
val jsonNode = objectMapper.readTree(param.json) val jsonNode = objectMapper.readTree(param.json)
logger.info("START Process inbox. type: {}", param.type) logger.info("START Process inbox. type: {}", param.type)