From 2faef66dc24823e9df1f73cf9c6196f27ad8c8d5 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sun, 9 Apr 2023 23:08:19 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20JobQueue=E9=96=A2=E9=80=A3=E3=81=AE?= =?UTF-8?q?=E5=90=8D=E5=89=8D=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/dev/usbharu/hideout/Application.kt | 6 +++--- .../service/activitypub/ActivityPubFollowServiceImpl.kt | 6 +++--- .../job/{JobQueueService.kt => JobQueueParentService.kt} | 2 +- .../job/{JobWorkerService.kt => JobQueueWorkerService.kt} | 2 +- ...{KJobJobQueueService.kt => KJobJobQueueParentService.kt} | 2 +- ...KJobJobWorkerService.kt => KJobJobQueueWorkerService.kt} | 2 +- ...orkerServiceTest.kt => KJobJobQueueWorkerServiceTest.kt} | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) rename src/main/kotlin/dev/usbharu/hideout/service/job/{JobQueueService.kt => JobQueueParentService.kt} (86%) rename src/main/kotlin/dev/usbharu/hideout/service/job/{JobWorkerService.kt => JobQueueWorkerService.kt} (90%) rename src/main/kotlin/dev/usbharu/hideout/service/job/{KJobJobQueueService.kt => KJobJobQueueParentService.kt} (85%) rename src/main/kotlin/dev/usbharu/hideout/service/job/{KJobJobWorkerService.kt => KJobJobQueueWorkerService.kt} (89%) rename src/test/kotlin/dev/usbharu/hideout/service/job/{KJobJobWorkerServiceTest.kt => KJobJobQueueWorkerServiceTest.kt} (70%) diff --git a/src/main/kotlin/dev/usbharu/hideout/Application.kt b/src/main/kotlin/dev/usbharu/hideout/Application.kt index 127d516d..0850d592 100644 --- a/src/main/kotlin/dev/usbharu/hideout/Application.kt +++ b/src/main/kotlin/dev/usbharu/hideout/Application.kt @@ -15,8 +15,8 @@ import dev.usbharu.hideout.service.IUserAuthService import dev.usbharu.hideout.service.activitypub.* import dev.usbharu.hideout.service.impl.UserAuthService import dev.usbharu.hideout.service.impl.UserService -import dev.usbharu.hideout.service.job.JobQueueService -import dev.usbharu.hideout.service.job.KJobJobQueueService +import dev.usbharu.hideout.service.job.JobQueueParentService +import dev.usbharu.hideout.service.job.KJobJobQueueParentService import dev.usbharu.hideout.service.signature.HttpSignatureVerifyService import dev.usbharu.hideout.service.signature.HttpSignatureVerifyServiceImpl import io.ktor.server.application.* @@ -54,7 +54,7 @@ fun Application.module() { single { UserAuthRepository(get()) } single { UserAuthService(get(), get()) } single { HttpSignatureVerifyServiceImpl(get()) } - single { val kJobJobQueueService = KJobJobQueueService(get()) + single { val kJobJobQueueService = KJobJobQueueParentService(get()) kJobJobQueueService.init(listOf()) kJobJobQueueService } diff --git a/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubFollowServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubFollowServiceImpl.kt index 1fed2d86..3e7a5dc3 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubFollowServiceImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubFollowServiceImpl.kt @@ -4,13 +4,13 @@ import dev.usbharu.hideout.ap.Follow import dev.usbharu.hideout.domain.model.ActivityPubResponse import dev.usbharu.hideout.domain.model.ActivityPubStringResponse import dev.usbharu.hideout.domain.model.job.AcceptFollowJob -import dev.usbharu.hideout.service.job.JobQueueService +import dev.usbharu.hideout.service.job.JobQueueParentService import io.ktor.http.* -class ActivityPubFollowServiceImpl(private val jobQueueService: JobQueueService) : ActivityPubFollowService { +class ActivityPubFollowServiceImpl(private val jobQueueParentService: JobQueueParentService) : ActivityPubFollowService { override suspend fun receiveFollow(follow: Follow): ActivityPubResponse { // TODO: Verify HTTP Signature - jobQueueService.schedule(AcceptFollowJob) + jobQueueParentService.schedule(AcceptFollowJob) return ActivityPubStringResponse(HttpStatusCode.OK,"{}",ContentType.Application.Json) } } diff --git a/src/main/kotlin/dev/usbharu/hideout/service/job/JobQueueService.kt b/src/main/kotlin/dev/usbharu/hideout/service/job/JobQueueParentService.kt similarity index 86% rename from src/main/kotlin/dev/usbharu/hideout/service/job/JobQueueService.kt rename to src/main/kotlin/dev/usbharu/hideout/service/job/JobQueueParentService.kt index 03cc1826..4029514b 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/job/JobQueueService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/job/JobQueueParentService.kt @@ -3,7 +3,7 @@ package dev.usbharu.hideout.service.job import kjob.core.Job import kjob.core.dsl.ScheduleContext -interface JobQueueService { +interface JobQueueParentService { fun init(jobDefines:List) suspend fun schedule(job: J, block: ScheduleContext.(J) -> Unit = {}) diff --git a/src/main/kotlin/dev/usbharu/hideout/service/job/JobWorkerService.kt b/src/main/kotlin/dev/usbharu/hideout/service/job/JobQueueWorkerService.kt similarity index 90% rename from src/main/kotlin/dev/usbharu/hideout/service/job/JobWorkerService.kt rename to src/main/kotlin/dev/usbharu/hideout/service/job/JobQueueWorkerService.kt index 86e8d69c..0d15caae 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/job/JobWorkerService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/job/JobQueueWorkerService.kt @@ -5,6 +5,6 @@ import kjob.core.dsl.JobContextWithProps import kjob.core.dsl.JobRegisterContext import kjob.core.dsl.KJobFunctions -interface JobWorkerService { +interface JobQueueWorkerService { fun init(defines: List>.(Job) -> KJobFunctions>>>) } diff --git a/src/main/kotlin/dev/usbharu/hideout/service/job/KJobJobQueueService.kt b/src/main/kotlin/dev/usbharu/hideout/service/job/KJobJobQueueParentService.kt similarity index 85% rename from src/main/kotlin/dev/usbharu/hideout/service/job/KJobJobQueueService.kt rename to src/main/kotlin/dev/usbharu/hideout/service/job/KJobJobQueueParentService.kt index f09d22d0..1f4178b5 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/job/KJobJobQueueService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/job/KJobJobQueueParentService.kt @@ -7,7 +7,7 @@ import kjob.core.dsl.ScheduleContext import kjob.core.kjob import org.jetbrains.exposed.sql.Database -class KJobJobQueueService(private val database: Database) : JobQueueService { +class KJobJobQueueParentService(private val database: Database) : JobQueueParentService { val kjob: KJob = kjob(ExposedKJob) { connectionDatabase = database diff --git a/src/main/kotlin/dev/usbharu/hideout/service/job/KJobJobWorkerService.kt b/src/main/kotlin/dev/usbharu/hideout/service/job/KJobJobQueueWorkerService.kt similarity index 89% rename from src/main/kotlin/dev/usbharu/hideout/service/job/KJobJobWorkerService.kt rename to src/main/kotlin/dev/usbharu/hideout/service/job/KJobJobQueueWorkerService.kt index 5ee5a6ba..cab3dcc8 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/job/KJobJobWorkerService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/job/KJobJobQueueWorkerService.kt @@ -8,7 +8,7 @@ import kjob.core.dsl.KJobFunctions import kjob.core.kjob import org.jetbrains.exposed.sql.Database -class KJobJobWorkerService(private val database: Database) : JobWorkerService { +class KJobJobQueueWorkerService(private val database: Database) : JobQueueWorkerService { val kjob by lazy { kjob(ExposedKJob) { diff --git a/src/test/kotlin/dev/usbharu/hideout/service/job/KJobJobWorkerServiceTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/job/KJobJobQueueWorkerServiceTest.kt similarity index 70% rename from src/test/kotlin/dev/usbharu/hideout/service/job/KJobJobWorkerServiceTest.kt rename to src/test/kotlin/dev/usbharu/hideout/service/job/KJobJobQueueWorkerServiceTest.kt index 8ba24871..0244399a 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/job/KJobJobWorkerServiceTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/service/job/KJobJobQueueWorkerServiceTest.kt @@ -4,13 +4,13 @@ import kjob.core.Job import org.jetbrains.exposed.sql.Database import org.junit.jupiter.api.Test -class KJobJobWorkerServiceTest { +class KJobJobQueueWorkerServiceTest { object TestJob : Job("test-job") @Test fun init() { - val kJobJobWorkerService = KJobJobWorkerService(Database.connect("jdbc:h2:mem:")) + val kJobJobWorkerService = KJobJobQueueWorkerService(Database.connect("jdbc:h2:mem:")) kJobJobWorkerService.init(listOf(TestJob to { it -> execute { it as TestJob;println(it.propNames) } })) } }