From f34c9ad53ac2fd107ee05c5b8fc348e20b9a3517 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 30 Apr 2024 22:09:05 +0900 Subject: [PATCH 01/24] =?UTF-8?q?chore:=20owl=E3=82=92=E4=BE=9D=E5=AD=98?= =?UTF-8?q?=E9=96=A2=E4=BF=82=E3=81=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.gradle.kts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 76167ae3..d73c9cc5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1,3 @@ -rootProject.name = "hideout" \ No newline at end of file +rootProject.name = "hideout" + +includeBuild("owl") \ No newline at end of file From 297c29f0203921f17a8bb6a0a312c678719e4cb4 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 1 May 2024 00:01:12 +0900 Subject: [PATCH 02/24] wip: embedded producer --- build.gradle.kts | 1 + .../interfaces/grpc/AssignmentTaskService.kt | 10 +- owl/producer/default/build.gradle.kts | 2 +- .../defaultimpl/DefaultOwlProducerBuilder.kt | 4 +- owl/producer/embedded/build.gradle.kts | 25 +++++ .../embedded/EmbeddedGrpcOwlProducer.kt | 99 +++++++++++++++++ .../producer/embedded/EmbeddedOwlProducer.kt | 100 ++++++++++++++++++ owl/settings.gradle.kts | 1 + settings.gradle.kts | 5 +- 9 files changed, 237 insertions(+), 10 deletions(-) create mode 100644 owl/producer/embedded/build.gradle.kts create mode 100644 owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt create mode 100644 owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt diff --git a/build.gradle.kts b/build.gradle.kts index ff7abe9d..adddf5bb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -234,6 +234,7 @@ dependencies { implementation("org.flywaydb:flyway-core") implementation("dev.usbharu:emoji-kt:2.0.0") + implementation("dev.usbharu:default:0.0.1") implementation("org.jsoup:jsoup:1.17.2") implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1") diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt b/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt index a1840588..4004de82 100644 --- a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt +++ b/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt @@ -16,9 +16,9 @@ package dev.usbharu.owl.broker.interfaces.grpc -import dev.usbharu.owl.AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineImplBase + +import dev.usbharu.owl.AssignmentTaskServiceGrpcKt import dev.usbharu.owl.Task -import dev.usbharu.owl.Task.TaskRequest import dev.usbharu.owl.broker.external.toTimestamp import dev.usbharu.owl.broker.external.toUUID import dev.usbharu.owl.broker.service.QueuedTaskAssigner @@ -37,15 +37,15 @@ class AssignmentTaskService( private val queuedTaskAssigner: QueuedTaskAssigner, private val propertySerializerFactory: PropertySerializerFactory ) : - AssignmentTaskServiceCoroutineImplBase(coroutineContext) { + AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineImplBase(coroutineContext) { - override fun ready(requests: Flow): Flow { + override fun ready(requests: Flow): Flow { return requests .flatMapMerge { queuedTaskAssigner.ready(it.consumerId.toUUID(), it.numberOfConcurrent) } .map { - TaskRequest + Task.TaskRequest .newBuilder() .setName(it.task.name) .setId(it.task.id.toUUID()) diff --git a/owl/producer/default/build.gradle.kts b/owl/producer/default/build.gradle.kts index 722c7de8..877dd36e 100644 --- a/owl/producer/default/build.gradle.kts +++ b/owl/producer/default/build.gradle.kts @@ -12,7 +12,7 @@ repositories { dependencies { testImplementation("org.jetbrains.kotlin:kotlin-test") - implementation(project(":producer:api")) + api(project(":producer:api")) implementation("io.grpc:grpc-kotlin-stub:1.4.1") implementation("io.grpc:grpc-protobuf:1.61.1") implementation("com.google.protobuf:protobuf-kotlin:3.25.3") diff --git a/owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt b/owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt index 8100088f..4e45e9f4 100644 --- a/owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt +++ b/owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt @@ -14,11 +14,9 @@ * limitations under the License. */ -package dev.usbharu.dev.usbharu.owl.producer.defaultimpl +package dev.usbharu.owl.producer.defaultimpl import dev.usbharu.owl.producer.api.OwlProducerBuilder -import dev.usbharu.owl.producer.defaultimpl.DefaultOwlProducer -import dev.usbharu.owl.producer.defaultimpl.DefaultOwlProducerConfig import io.grpc.ManagedChannelBuilder class DefaultOwlProducerBuilder : OwlProducerBuilder { diff --git a/owl/producer/embedded/build.gradle.kts b/owl/producer/embedded/build.gradle.kts new file mode 100644 index 00000000..9dbf4c0c --- /dev/null +++ b/owl/producer/embedded/build.gradle.kts @@ -0,0 +1,25 @@ +plugins { + kotlin("jvm") +} + +group = "dev.usbharu" +version = "0.0.1" + +repositories { + mavenCentral() +} + +dependencies { + testImplementation(kotlin("test")) + implementation(project(":producer:api")) + implementation(project(":broker")) + implementation(platform("io.insert-koin:koin-bom:3.5.3")) + implementation("io.insert-koin:koin-core") +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(17) +} \ No newline at end of file diff --git a/owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt b/owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt new file mode 100644 index 00000000..41b6dd85 --- /dev/null +++ b/owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.owl.producer.embedded + +import dev.usbharu.owl.broker.ModuleContext +import dev.usbharu.owl.broker.OwlBrokerApplication +import dev.usbharu.owl.broker.service.* +import dev.usbharu.owl.common.task.PublishedTask +import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition +import dev.usbharu.owl.producer.api.OwlProducer +import org.koin.core.Koin +import org.koin.core.context.GlobalContext.startKoin +import org.koin.dsl.module +import org.koin.ksp.generated.defaultModule +import java.time.Instant +import java.util.* + +class EmbeddedGrpcOwlProducer( + private val moduleContext: ModuleContext, + private val retryPolicyFactory: RetryPolicyFactory, + private val name: String, + private val port: Int, + private val owlProducer: OwlProducer, +) : OwlProducer { + private lateinit var producerId: UUID + + private lateinit var application: Koin + + private val taskMap: MutableMap, TaskDefinition<*>> = mutableMapOf() + + override suspend fun start() { + application = startKoin { + printLogger() + + val module = module { + single { + retryPolicyFactory + } + } + modules(module, defaultModule, moduleContext.module()) + }.koin + + val producerService = application.get() + + producerId = producerService.registerProducer(RegisterProducerRequest(name, name)) + + application.get().start(port) + } + + override suspend fun registerTask(taskDefinition: TaskDefinition) { + application.get() + .registerTask( + dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinition( + name = taskDefinition.name, + priority = taskDefinition.priority, + maxRetry = taskDefinition.maxRetry, + timeoutMilli = taskDefinition.timeoutMilli, + propertyDefinitionHash = taskDefinition.propertyDefinition.hash(), + retryPolicy = taskDefinition.retryPolicy + ) + ) + + taskMap[taskDefinition.type] = taskDefinition + } + + override suspend fun publishTask(task: T): PublishedTask { + + val taskDefinition = taskMap.getValue(task::class.java) as TaskDefinition + + val publishTask = application.get().publishTask( + PublishTask( + taskDefinition.name, + producerId, + taskDefinition.serialize(task) + ) + ) + + return PublishedTask( + task, + publishTask.id, + Instant.now() + ) + } +} \ No newline at end of file diff --git a/owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt b/owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt new file mode 100644 index 00000000..def3b5fb --- /dev/null +++ b/owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.owl.producer.embedded + +import dev.usbharu.owl.broker.ModuleContext +import dev.usbharu.owl.broker.OwlBrokerApplication +import dev.usbharu.owl.broker.service.* +import dev.usbharu.owl.common.task.PublishedTask +import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition +import dev.usbharu.owl.producer.api.OwlProducer +import org.koin.core.Koin +import org.koin.core.context.GlobalContext.startKoin +import org.koin.dsl.module +import org.koin.ksp.generated.defaultModule +import java.time.Instant +import java.util.* +import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinition as BrokerTaskDefinition + +class EmbeddedOwlProducer( + private val moduleContext: ModuleContext, + private val retryPolicyFactory: RetryPolicyFactory, + private val name: String, + private val port: Int, +) : OwlProducer { + + private lateinit var producerId: UUID + + private lateinit var application: Koin + + private val taskMap: MutableMap, TaskDefinition<*>> = mutableMapOf() + + override suspend fun start() { + application = startKoin { + printLogger() + + val module = module { + single { + retryPolicyFactory + } + } + modules(module, defaultModule, moduleContext.module()) + }.koin + + val producerService = application.get() + + producerId = producerService.registerProducer(RegisterProducerRequest(name, name)) + + application.get().start(port) + } + + override suspend fun registerTask(taskDefinition: TaskDefinition) { + application.get() + .registerTask( + BrokerTaskDefinition( + name = taskDefinition.name, + priority = taskDefinition.priority, + maxRetry = taskDefinition.maxRetry, + timeoutMilli = taskDefinition.timeoutMilli, + propertyDefinitionHash = taskDefinition.propertyDefinition.hash(), + retryPolicy = taskDefinition.retryPolicy + ) + ) + + taskMap[taskDefinition.type] = taskDefinition + } + + override suspend fun publishTask(task: T): PublishedTask { + + val taskDefinition = taskMap.getValue(task::class.java) as TaskDefinition + + val publishTask = application.get().publishTask( + PublishTask( + taskDefinition.name, + producerId, + taskDefinition.serialize(task) + ) + ) + + return PublishedTask( + task, + publishTask.id, + Instant.now() + ) + } +} \ No newline at end of file diff --git a/owl/settings.gradle.kts b/owl/settings.gradle.kts index 87d7071c..450172d1 100644 --- a/owl/settings.gradle.kts +++ b/owl/settings.gradle.kts @@ -11,3 +11,4 @@ findProject(":broker:broker-mongodb")?.name = "broker-mongodb" include("producer:default") findProject(":producer:default")?.name = "default" include("consumer") +include("producer:embedded") \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index d73c9cc5..376e901e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,6 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" +} rootProject.name = "hideout" -includeBuild("owl") \ No newline at end of file +includeBuild("owl") From 949b0a935f647dacf4561ebfefd83297e222abb8 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 1 May 2024 22:21:00 +0900 Subject: [PATCH 03/24] =?UTF-8?q?feat:=20EmbeddedOwlProducer=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../embedded/EmbeddedGrpcOwlProducer.kt | 43 ++----------------- 1 file changed, 3 insertions(+), 40 deletions(-) diff --git a/owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt b/owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt index 41b6dd85..3eb12b4f 100644 --- a/owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt +++ b/owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt @@ -18,7 +18,7 @@ package dev.usbharu.owl.producer.embedded import dev.usbharu.owl.broker.ModuleContext import dev.usbharu.owl.broker.OwlBrokerApplication -import dev.usbharu.owl.broker.service.* +import dev.usbharu.owl.broker.service.RetryPolicyFactory import dev.usbharu.owl.common.task.PublishedTask import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition @@ -27,22 +27,16 @@ import org.koin.core.Koin import org.koin.core.context.GlobalContext.startKoin import org.koin.dsl.module import org.koin.ksp.generated.defaultModule -import java.time.Instant -import java.util.* class EmbeddedGrpcOwlProducer( private val moduleContext: ModuleContext, private val retryPolicyFactory: RetryPolicyFactory, - private val name: String, private val port: Int, private val owlProducer: OwlProducer, ) : OwlProducer { - private lateinit var producerId: UUID private lateinit var application: Koin - private val taskMap: MutableMap, TaskDefinition<*>> = mutableMapOf() - override suspend fun start() { application = startKoin { printLogger() @@ -55,45 +49,14 @@ class EmbeddedGrpcOwlProducer( modules(module, defaultModule, moduleContext.module()) }.koin - val producerService = application.get() - - producerId = producerService.registerProducer(RegisterProducerRequest(name, name)) - application.get().start(port) } override suspend fun registerTask(taskDefinition: TaskDefinition) { - application.get() - .registerTask( - dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinition( - name = taskDefinition.name, - priority = taskDefinition.priority, - maxRetry = taskDefinition.maxRetry, - timeoutMilli = taskDefinition.timeoutMilli, - propertyDefinitionHash = taskDefinition.propertyDefinition.hash(), - retryPolicy = taskDefinition.retryPolicy - ) - ) - - taskMap[taskDefinition.type] = taskDefinition + owlProducer.registerTask(taskDefinition) } override suspend fun publishTask(task: T): PublishedTask { - - val taskDefinition = taskMap.getValue(task::class.java) as TaskDefinition - - val publishTask = application.get().publishTask( - PublishTask( - taskDefinition.name, - producerId, - taskDefinition.serialize(task) - ) - ) - - return PublishedTask( - task, - publishTask.id, - Instant.now() - ) + return owlProducer.publishTask(task) } } \ No newline at end of file From b1cba8b7ae7860b73bef6a5760235acba33dd866 Mon Sep 17 00:00:00 2001 From: usbharu Date: Thu, 2 May 2024 11:16:24 +0900 Subject: [PATCH 04/24] =?UTF-8?q?doc:=20=E3=83=89=E3=82=AD=E3=83=A5?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../owl/producer/api/OwlProducerBuilder.kt | 22 +++++++++++++++++++ .../producer/api/OwlProducerBuilderConfig.kt | 9 ++++++++ .../owl/producer/api/OwlProducerConfig.kt | 4 ++++ .../defaultimpl/DefaultOwlProducerConfig.kt | 19 ++++++++++++++++ 4 files changed, 54 insertions(+) diff --git a/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt b/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt index 4d1c21ab..0678266e 100644 --- a/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt +++ b/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt @@ -16,9 +16,31 @@ package dev.usbharu.owl.producer.api +/** + * [OwlProducer]を作成するビルダー + * + * @param P 作成する[OwlProducer] + * @param T [OwlProducer]の構成 + */ interface OwlProducerBuilder

{ + /** + * 現在の構成を返します + * + * @return 現在の構成 + */ fun config(): T + + /** + * 構成を適用します + * + * @param owlProducerConfig 適用する構成 + */ fun apply(owlProducerConfig: T) + /** + * 適用されている構成を使用して[OwlProducer]のインスタンスを作成します。 + * + * @return 作成された[OwlProducer] + */ fun build(): P } \ No newline at end of file diff --git a/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt b/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt index 2b6548f0..97d77812 100644 --- a/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt +++ b/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt @@ -16,6 +16,15 @@ package dev.usbharu.owl.producer.api +/** + * [OwlProducerBuilder]と[OwlProducerConfig]を使用して[OwlProducer]のインスタンスを作成します。 + * + * @param P 作成する[OwlProducer] + * @param T 作成に使用する[OwlProducerBuilder] + * @param C 構成 + * @param owlProducerBuilder 作成に使用する[OwlProducerBuilder] + * @param configBlock 構成 + */ fun

, C : OwlProducerConfig> OWL( owlProducerBuilder: T, configBlock: C.() -> Unit diff --git a/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt b/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt index 557547ce..b9f51498 100644 --- a/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt +++ b/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt @@ -16,5 +16,9 @@ package dev.usbharu.owl.producer.api +/** + * [OwlProducer]の構成 + * + */ interface OwlProducerConfig { } \ No newline at end of file diff --git a/owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt b/owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt index a5eaddf6..ced2695f 100644 --- a/owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt +++ b/owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt @@ -20,9 +20,28 @@ import dev.usbharu.owl.common.property.PropertySerializerFactory import dev.usbharu.owl.producer.api.OwlProducerConfig import io.grpc.Channel +/** + * デフォルトの[dev.usbharu.owl.producer.api.OwlProducer]の構成 + * + */ class DefaultOwlProducerConfig : OwlProducerConfig { + /** + * gRPCで使用する[Channel] + */ lateinit var channel: Channel + + /** + * プロデューサー名 + */ lateinit var name: String + + /** + * プロデューサーのホスト名 + */ lateinit var hostname: String + + /** + * [dev.usbharu.owl.common.property.PropertyValue]のシリアライズに使用するファクトリ + */ lateinit var propertySerializerFactory: PropertySerializerFactory } \ No newline at end of file From 5b627ab1bd18c4db69b32aaea5bbce6eee11a348 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 4 May 2024 02:01:06 +0900 Subject: [PATCH 05/24] =?UTF-8?q?chore:=20=E3=83=97=E3=83=AD=E3=82=B8?= =?UTF-8?q?=E3=82=A7=E3=82=AF=E3=83=88=E6=A7=8B=E6=88=90=E3=82=92=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 11 - gradle/wrapper/gradle-wrapper.jar | Bin 61608 -> 0 bytes .../allowed-licenses.json | 0 .../build.gradle.kts | 0 hideout-core/gradle.properties | 26 ++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes .../gradle}/wrapper/gradle-wrapper.properties | 2 +- gradlew => hideout-core/gradlew | 18 +- gradlew.bat => hideout-core/gradlew.bat | 15 +- .../license-normalizer-bundle.json | 0 hideout-core/settings.gradle.kts | 6 + .../src}/e2eTest/kotlin/AssertionUtil.kt | 0 .../src}/e2eTest/kotlin/KarateUtil.kt | 0 .../kotlin/federation/FollowAcceptTest.kt | 0 .../kotlin/federation/InboxCommonTest.kt | 0 .../e2eTest/kotlin/oauth2/OAuth2LoginTest.kt | 0 .../src}/e2eTest/resources/application.yml | 0 .../federation/FollowAcceptMockServer.feature | 0 .../federation/FollowAcceptTest.feature | 0 .../federation/InboxCommonTest.feature | 0 .../InboxxCommonMockServerTest.feature | 0 .../src}/e2eTest/resources/karate-config.js | 0 .../src}/e2eTest/resources/logback.xml | 0 .../resources/oauth2/Oauth2LoginTest.feature | 0 .../src}/e2eTest/resources/oauth2/user.sql | 0 .../kotlin/activitypub/inbox/InboxTest.kt | 0 .../kotlin/activitypub/note/NoteTest.kt | 0 .../activitypub/webfinger/WebFingerTest.kt | 0 .../account/AccountApiPaginationTest.kt | 0 .../kotlin/mastodon/account/AccountApiTest.kt | 0 .../intTest/kotlin/mastodon/apps/AppTest.kt | 0 .../kotlin/mastodon/filter/FilterTest.kt | 0 .../kotlin/mastodon/media/MediaTest.kt | 0 .../ExposedNotificationsApiPaginationTest.kt | 0 .../MongodbNotificationsApiPaginationTest.kt | 0 .../kotlin/mastodon/status/StatusTest.kt | 0 .../mastodon/timelines/TimelineApiTest.kt | 0 .../kotlin/util/SpringApplicationTestBase.kt | 0 .../intTest/kotlin/util/TestTransaction.kt | 0 .../intTest/kotlin/util/WithHttpSignature.kt | 0 ...WithHttpSignatureSecurityContextFactory.kt | 0 .../kotlin/util/WithMockHttpSignature.kt | 0 ...MockHttpSignatureSecurityContextFactory.kt | 0 .../src}/intTest/resources/application.yml | 0 .../resources/junit-platform.properties | 0 .../src}/intTest/resources/logback.xml | 0 .../src}/intTest/resources/media/400x400.png | Bin ...iV1AccountsIdFollowPost フォローできる.sql | 0 .../sql/accounts/test-accounts-statuses.sql | 0 .../resources/sql/filter/test-filter.sql | 0 ...でフォロワーがfollowers投稿を取得できる.sql | 0 ...証でフォロワーがpublic投稿を取得できる.sql | 0 ...でフォロワーがunlisted投稿を取得できる.sql | 0 ...稿はattachmentにDocumentとして画像が存在する.sql | 0 ...イになっている投稿はinReplyToが存在する.sql | 0 ...でfollowers投稿を取得しようとすると404.sql | 0 .../sql/note/匿名でpublic投稿を取得できる.sql | 0 .../note/匿名でunlisted投稿を取得できる.sql | 0 .../test-mastodon_notifications.sql | 0 .../sql/notification/test-notifications.sql | 0 .../resources/sql/test-custom-emoji.sql | 0 .../src}/intTest/resources/sql/test-post.sql | 0 .../src}/intTest/resources/sql/test-user.sql | 0 .../src}/intTest/resources/sql/test-user2.sql | 0 .../dev/usbharu/hideout/SpringApplication.kt | 0 .../exception/ActivityPubProcessException.kt | 0 .../exception/FailedProcessException.kt | 0 ...FailedToGetActivityPubResourceException.kt | 0 .../HttpSignatureUnauthorizedException.kt | 0 .../IllegalActivityPubObjectException.kt | 0 .../domain/exception/JsonParseException.kt | 0 .../activitypub/domain/model/Accept.kt | 0 .../activitypub/domain/model/Announce.kt | 0 .../hideout/activitypub/domain/model/Block.kt | 0 .../activitypub/domain/model/Create.kt | 0 .../activitypub/domain/model/Delete.kt | 0 .../activitypub/domain/model/Document.kt | 0 .../hideout/activitypub/domain/model/Emoji.kt | 0 .../activitypub/domain/model/Follow.kt | 0 .../activitypub/domain/model/HasActor.kt | 0 .../hideout/activitypub/domain/model/HasId.kt | 0 .../activitypub/domain/model/HasName.kt | 0 .../hideout/activitypub/domain/model/Image.kt | 0 .../activitypub/domain/model/JsonLd.kt | 0 .../hideout/activitypub/domain/model/Key.kt | 0 .../hideout/activitypub/domain/model/Like.kt | 0 .../hideout/activitypub/domain/model/Note.kt | 0 .../activitypub/domain/model/Person.kt | 0 .../activitypub/domain/model/Reject.kt | 0 .../activitypub/domain/model/Tombstone.kt | 0 .../hideout/activitypub/domain/model/Undo.kt | 0 .../domain/model/nodeinfo/Nodeinfo.kt | 0 .../domain/model/nodeinfo/Nodeinfo2_0.kt | 0 .../domain/model/objects/Object.kt | 0 .../model/objects/ObjectDeserializer.kt | 0 .../domain/model/objects/ObjectValue.kt | 0 .../domain/model/webfinger/WebFinger.kt | 0 .../ExposedAnnounceQueryService.kt | 0 .../exposedquery/NoteQueryServiceImpl.kt | 0 .../interfaces/api/actor/UserAPController.kt | 0 .../api/actor/UserAPControllerImpl.kt | 0 .../api/hostmeta/HostMetaController.kt | 0 .../interfaces/api/inbox/InboxController.kt | 0 .../api/inbox/InboxControllerImpl.kt | 0 .../api/nodeinfo/NodeinfoController.kt | 0 .../interfaces/api/note/NoteApController.kt | 0 .../api/note/NoteApControllerImpl.kt | 0 .../interfaces/api/outbox/OutboxController.kt | 0 .../api/outbox/OutboxControllerImpl.kt | 0 .../api/webfinger/WebFingerController.kt | 0 .../activitypub/query/AnnounceQueryService.kt | 0 .../activitypub/query/NoteQueryService.kt | 0 .../accept/APDeliverAcceptJobProcessor.kt | 0 .../activity/accept/ApAcceptProcessor.kt | 0 .../activity/accept/ApSendAcceptService.kt | 0 .../activity/announce/ApAnnounceProcessor.kt | 0 .../block/APDeliverBlockJobProcessor.kt | 0 .../activity/block/APSendBlockService.kt | 0 .../block/BlockActivityPubProcessor.kt | 0 .../activity/create/ApSendCreateService.kt | 0 .../create/ApSendCreateServiceImpl.kt | 0 .../create/CreateActivityProcessor.kt | 0 .../activity/delete/APDeleteProcessor.kt | 0 .../delete/APDeliverDeleteJobProcessor.kt | 0 .../activity/delete/APSendDeleteService.kt | 0 .../activity/follow/APFollowProcessor.kt | 0 .../follow/APReceiveFollowJobProcessor.kt | 0 .../activity/follow/APReceiveFollowService.kt | 0 .../activity/follow/APSendFollowService.kt | 0 .../service/activity/like/APLikeProcessor.kt | 0 .../activity/like/APReactionService.kt | 0 .../activity/like/ApReactionJobProcessor.kt | 0 .../like/ApRemoveReactionJobProcessor.kt | 0 .../reject/APDeliverRejectJobProcessor.kt | 0 .../activity/reject/ApRejectProcessor.kt | 0 .../activity/reject/ApSendRejectService.kt | 0 .../reject/ApSendRejectServiceImpl.kt | 0 .../undo/APDeliverUndoJobProcessor.kt | 0 .../activity/undo/APSendUndoService.kt | 0 .../activity/undo/APSendUndoServiceImpl.kt | 0 .../service/activity/undo/APUndoProcessor.kt | 0 .../service/common/APRequestService.kt | 0 .../service/common/APRequestServiceImpl.kt | 0 .../common/APResourceResolveService.kt | 0 .../common/APResourceResolveServiceImpl.kt | 0 .../activitypub/service/common/APService.kt | 155 +----------- .../common/AbstractActivityPubProcessor.kt | 0 .../common/ActivityPubProcessContext.kt | 0 .../service/common/ActivityPubProcessor.kt | 0 .../service/common/ActivityType.kt | 49 ++++ .../service/common/ActivityVocabulary.kt | 74 ++++++ .../common/ExtendedActivityVocabulary.kt | 75 ++++++ .../service/common/ExtendedVocabulary.kt | 21 ++ .../service/inbox/InboxJobProcessor.kt | 0 .../service/objects/emoji/EmojiService.kt | 0 .../service/objects/emoji/EmojiServiceImpl.kt | 0 .../service/objects/note/APNoteService.kt | 0 .../objects/note/ApNoteJobProcessor.kt | 0 .../service/objects/note/NoteApApiService.kt | 0 .../objects/note/NoteApApiServiceImpl.kt | 0 .../service/objects/user/APUserService.kt | 0 .../service/webfinger/WebFingerApiService.kt | 0 .../application/config/ActivityPubConfig.kt | 0 .../hideout/application/config/AwsConfig.kt | 0 .../application/config/HtmlSanitizeConfig.kt | 0 .../application/config/HttpClientConfig.kt | 0 .../application/config/HttpSignatureConfig.kt | 0 .../application/config/JobQueueRunner.kt | 0 .../application/config/MdcXrequestIdFilter.kt | 0 .../hideout/application/config/MediaConfig.kt | 0 .../application/config/MvcConfigurer.kt | 0 .../application/config/SecurityConfig.kt | 0 .../application/config/SpringConfig.kt | 0 .../application/external/Transaction.kt | 0 .../exposed/ExposedPaginationExtension.kt | 0 .../exposed/ExposedTransaction.kt | 0 .../infrastructure/exposed/Page.kt | 0 .../infrastructure/exposed/PaginationList.kt | 0 .../infrastructure/exposed/QueryMapper.kt | 0 .../infrastructure/exposed/ResultRowMapper.kt | 0 ...oleHierarchyAuthorizationManagerFactory.kt | 0 .../service/id/IdGenerateService.kt | 0 .../service/id/SnowflakeIdGenerateService.kt | 0 .../id/TwitterSnowflakeIdGenerateService.kt | 0 .../application/service/init/MetaService.kt | 0 .../service/init/MetaServiceImpl.kt | 0 .../service/init/ServerInitialiseService.kt | 0 .../init/ServerInitialiseServiceImpl.kt | 0 .../FailedToGetResourcesException.kt | 0 .../core/domain/exception/HideoutException.kt | 0 .../exception/HttpSignatureVerifyException.kt | 0 .../core/domain/exception/NotInitException.kt | 0 .../exception/SQLExceptionTranslator.kt | 0 ...taAccessExceptionSQLExceptionTranslator.kt | 0 .../domain/exception/UserNotFoundException.kt | 0 .../exception/media/MediaConvertException.kt | 0 .../domain/exception/media/MediaException.kt | 0 .../exception/media/MediaFileSizeException.kt | 0 .../media/MediaFileSizeIsZeroException.kt | 0 .../exception/media/MediaProcessException.kt | 0 .../exception/media/MediaSaveException.kt | 0 .../media/RemoteMediaFileSizeException.kt | 0 .../media/UnsupportedMediaException.kt | 0 .../exception/resource/DuplicateException.kt | 0 .../exception/resource/NotFoundException.kt | 0 .../resource/PostNotFoundException.kt | 0 .../resource/ResourceAccessException.kt | 0 .../resource/UserNotFoundException.kt | 0 .../local/LocalUserNotFoundException.kt | 0 .../hideout/core/domain/model/actor/Acct.kt | 0 .../hideout/core/domain/model/actor/Actor.kt | 0 .../domain/model/actor/ActorRepository.kt | 0 .../domain/model/deletedActor/DeletedActor.kt | 0 .../deletedActor/DeletedActorRepository.kt | 0 .../core/domain/model/emoji/CustomEmoji.kt | 0 .../model/emoji/CustomEmojiRepository.kt | 0 .../core/domain/model/filter/Filter.kt | 0 .../core/domain/model/filter/FilterAction.kt | 0 .../core/domain/model/filter/FilterMode.kt | 0 .../domain/model/filter/FilterRepository.kt | 0 .../core/domain/model/filter/FilterType.kt | 0 .../model/filterkeyword/FilterKeyword.kt | 0 .../filterkeyword/FilterKeywordRepository.kt | 0 .../core/domain/model/instance/Instance.kt | 0 .../model/instance/InstanceRepository.kt | 0 .../core/domain/model/instance/Nodeinfo.kt | 0 .../core/domain/model/instance/Nodeinfo2_0.kt | 0 .../hideout/core/domain/model/media/Media.kt | 0 .../domain/model/media/MediaRepository.kt | 0 .../hideout/core/domain/model/meta/Jwt.kt | 0 .../hideout/core/domain/model/meta/Meta.kt | 0 .../core/domain/model/meta/MetaRepository.kt | 0 .../ExposedNotificationRepository.kt | 0 .../domain/model/notification/Notification.kt | 0 .../notification/NotificationRepository.kt | 0 .../hideout/core/domain/model/post/Post.kt | 0 .../core/domain/model/post/PostRepository.kt | 0 .../core/domain/model/post/Visibility.kt | 0 .../core/domain/model/reaction/Reaction.kt | 0 .../model/reaction/ReactionRepository.kt | 0 .../domain/model/relationship/Relationship.kt | 0 .../relationship/RelationshipRepository.kt | 0 .../RelationshipRepositoryImpl.kt | 0 .../core/domain/model/timeline/Timeline.kt | 0 .../model/timeline/TimelineRepository.kt | 0 .../domain/model/userdetails/UserDetail.kt | 0 .../model/userdetails/UserDetailRepository.kt | 0 .../core/external/job/DeliverAcceptJob.kt | 0 .../core/external/job/DeliverBlockJob.kt | 0 .../core/external/job/DeliverDeleteJob.kt | 0 .../core/external/job/DeliverRejectJob.kt | 0 .../core/external/job/DeliverUndoJob.kt | 0 .../hideout/core/external/job/HideoutJob.kt | 0 .../infrastructure/exposed/PostQueryMapper.kt | 0 .../exposed/PostResultRowMapper.kt | 0 .../infrastructure/exposed/UserQueryMapper.kt | 0 .../exposed/UserResultRowMapper.kt | 0 .../exposedquery/FollowerQueryServiceImpl.kt | 0 .../exposedrepository/AbstractRepository.kt | 0 .../exposedrepository/ActorRepositoryImpl.kt | 0 .../CustomEmojiRepositoryImpl.kt | 0 .../DeletedActorRepositoryImpl.kt | 0 .../ExposedFilterKeywordRepository.kt | 0 .../ExposedFilterRepository.kt | 0 .../ExposedTimelineRepository.kt | 0 .../InstanceRepositoryImpl.kt | 0 .../exposedrepository/MediaRepositoryImpl.kt | 0 .../exposedrepository/MetaRepositoryImpl.kt | 0 .../exposedrepository/PostRepositoryImpl.kt | 0 .../ReactionRepositoryImpl.kt | 0 .../UserDetailRepositoryImpl.kt | 0 .../httpsignature/HttpRequestMixIn.kt | 0 .../kjobexposed/ExposedJobRepository.kt | 0 .../infrastructure/kjobexposed/ExposedKJob.kt | 0 .../kjobexposed/ExposedLockRepository.kt | 0 .../kjobexposed/KJobJobQueueParentService.kt | 0 .../kjobexposed/KJobJobQueueWorkerService.kt | 0 .../KJobMongoJobQueueWorkerService.kt | 0 .../KjobMongoJobQueueParentService.kt | 0 .../MongoTimelineRepository.kt | 0 .../MongoTimelineRepositoryWrapper.kt | 0 .../httpsignature/HttpSignatureFilter.kt | 0 .../HttpSignatureHeaderChecker.kt | 0 .../httpsignature/HttpSignatureUser.kt | 0 .../HttpSignatureUserDetailsService.kt | 0 .../HttpSignatureVerifierComposite.kt | 0 ...xposedOAuth2AuthorizationConsentService.kt | 0 .../ExposedOAuth2AuthorizationService.kt | 0 .../oauth2/RegisteredClientRepositoryImpl.kt | 0 .../oauth2/SecureTokenGenerator.kt | 0 .../oauth2/SecureTokenGeneratorImpl.kt | 0 .../springframework/oauth2/UserDetailsImpl.kt | 0 .../oauth2/UserDetailsServiceImpl.kt | 0 .../security/LoginUserContextHolder.kt | 0 .../OAuth2JwtLoginUserContextHolder.kt | 0 .../interfaces/api/auth/AuthController.kt | 0 .../api/media/LocalFileController.kt | 0 .../core/query/FollowerQueryService.kt | 0 .../query/model/ExposedFilterQueryService.kt | 0 .../core/query/model/FilterQueryModel.kt | 0 .../core/query/model/FilterQueryService.kt | 0 .../core/service/filter/FilterKeyword.kt | 0 .../core/service/filter/FilterResult.kt | 0 .../core/service/filter/MuteProcessService.kt | 0 .../service/filter/MuteProcessServiceImpl.kt | 0 .../core/service/filter/MuteService.kt | 0 .../core/service/filter/MuteServiceImpl.kt | 0 .../core/service/follow/SendFollowDto.kt | 0 .../service/instance/InstanceCreateDto.kt | 0 .../core/service/instance/InstanceService.kt | 0 .../hideout/core/service/job/JobProcessor.kt | 0 .../core/service/job/JobQueueParentService.kt | 0 .../core/service/job/JobQueueWorkerService.kt | 0 ...ApatcheTikaFileTypeDeterminationService.kt | 0 .../hideout/core/service/media/FileType.kt | 0 .../media/FileTypeDeterminationService.kt | 0 .../media/LocalFileSystemMediaDataStore.kt | 0 .../service/media/MediaBlurhashService.kt | 0 .../service/media/MediaBlurhashServiceImpl.kt | 0 .../core/service/media/MediaDataStore.kt | 0 .../service/media/MediaFileRenameService.kt | 0 .../hideout/core/service/media/MediaSave.kt | 0 .../core/service/media/MediaSaveRequest.kt | 0 .../core/service/media/MediaService.kt | 0 .../core/service/media/MediaServiceImpl.kt | 0 .../hideout/core/service/media/MimeType.kt | 0 .../core/service/media/ProcessedFile.kt | 0 .../core/service/media/ProcessedMedia.kt | 0 .../core/service/media/ProcessedMediaPath.kt | 0 .../hideout/core/service/media/RemoteMedia.kt | 0 .../media/RemoteMediaDownloadService.kt | 0 .../media/RemoteMediaDownloadServiceImpl.kt | 0 .../core/service/media/S3MediaDataStore.kt | 0 .../hideout/core/service/media/SavedMedia.kt | 0 .../service/media/ThumbnailGenerateService.kt | 0 .../media/ThumbnailGenerateServiceImpl.kt | 0 .../media/UUIDMediaFileRenameService.kt | 0 .../service/media/converter/MediaConverter.kt | 0 .../media/converter/MediaConverterRoot.kt | 0 .../media/converter/MediaConverterRootImpl.kt | 0 .../media/converter/MediaProcessService.kt | 0 .../converter/MediaProcessServiceImpl.kt | 0 .../image/ImageMediaProcessService.kt | 0 .../image/ImageMediaProcessorConfiguration.kt | 0 .../movie/MovieMediaProcessService.kt | 0 .../notification/NotificationRequest.kt | 0 .../notification/NotificationService.kt | 0 .../notification/NotificationServiceImpl.kt | 0 .../service/notification/NotificationStore.kt | 0 ...lationshipNotificationManagementService.kt | 0 ...onshipNotificationManagementServiceImpl.kt | 0 .../post/DefaultPostContentFormatter.kt | 0 .../core/service/post/FormattedPostContent.kt | 0 .../core/service/post/PostContentFormatter.kt | 0 .../core/service/post/PostCreateDto.kt | 0 .../hideout/core/service/post/PostService.kt | 0 .../core/service/post/PostServiceImpl.kt | 0 .../core/service/reaction/ReactionService.kt | 0 .../service/reaction/ReactionServiceImpl.kt | 0 .../relationship/RelationshipService.kt | 0 .../relationship/RelationshipServiceImpl.kt | 0 .../core/service/resource/CacheManager.kt | 0 .../service/resource/InMemoryCacheManager.kt | 0 .../service/resource/KtorResolveResponse.kt | 0 .../resource/KtorResourceResolveService.kt | 0 .../core/service/resource/ResolveResponse.kt | 0 .../resource/ResourceResolveService.kt | 0 .../ExposedGenerateTimelineService.kt | 0 .../timeline/GenerateTimelineService.kt | 0 .../timeline/MongoGenerateTimelineService.kt | 0 .../core/service/timeline/TimelineService.kt | 0 .../core/service/user/RemoteUserCreateDto.kt | 0 .../core/service/user/UpdateUserDto.kt | 0 .../core/service/user/UserAuthService.kt | 0 .../core/service/user/UserAuthServiceImpl.kt | 0 .../core/service/user/UserCreateDto.kt | 0 .../hideout/core/service/user/UserService.kt | 0 .../core/service/user/UserServiceImpl.kt | 0 .../hideout/generate/JsonOrFormBind.kt | 0 .../JsonOrFormModelMethodProcessor.kt | 0 .../config/MastodonApiSecurityConfig.kt | 0 .../exception/AccountNotFoundException.kt | 2 +- .../domain/exception/ClientException.kt | 0 .../domain/exception/MastodonApiException.kt | 0 .../domain/exception/ServerException.kt | 0 .../exception/StatusNotFoundException.kt | 2 +- .../domain/model/MastodonApiErrorResponse.kt | 0 .../domain/model/MastodonNotification.kt | 0 .../model/MastodonNotificationRepository.kt | 0 .../mastodon/domain/model/NotificationType.kt | 0 .../exposedquery/AccountQueryServiceImpl.kt | 0 .../exposedquery/StatusQueryServiceImpl.kt | 0 .../ExposedMastodonNotificationRepository.kt | 0 .../MongoMastodonNotificationRepository.kt | 0 ...goMastodonNotificationRepositoryWrapper.kt | 0 .../springweb/MastodonApiControllerAdvice.kt | 0 .../account/MastodonAccountApiController.kt | 0 .../api/apps/MastodonAppsApiController.kt | 0 .../api/filter/MastodonFilterApiController.kt | 0 .../instance/MastodonInstanceApiController.kt | 0 .../api/media/MastodonMediaApiController.kt | 0 .../interfaces/api/media/MediaRequest.kt | 0 .../MastodonNotificationApiController.kt | 0 .../status/MastodonStatusesApiContoller.kt | 0 .../interfaces/api/status/StatusQuery.kt | 0 .../interfaces/api/status/StatusesRequest.kt | 2 +- .../timeline/MastodonTimelineApiController.kt | 0 .../mastodon/query/AccountQueryService.kt | 0 .../mastodon/query/StatusQueryService.kt | 0 .../service/account/AccountApiService.kt | 0 .../service/account/AccountService.kt | 0 .../mastodon/service/app/AppApiService.kt | 0 .../filter/MastodonFilterApiService.kt | 0 .../service/instance/InstanceApiService.kt | 0 .../mastodon/service/media/MediaApiService.kt | 0 .../service/media/MediaApiServiceImpl.kt | 0 .../notification/MastodonNotificationStore.kt | 0 .../notification/NotificationApiService.kt | 0 .../NotificationApiServiceImpl.kt | 0 .../service/status/StatusesApiService.kt | 0 .../service/timeline/TimelineApiService.kt | 0 .../dev/usbharu/hideout/util/AcctUtil.kt | 0 .../dev/usbharu/hideout/util/Base64Util.kt | 0 .../usbharu/hideout/util/CollectionUtil.kt | 0 .../dev/usbharu/hideout/util/EmojiUtil.kt | 0 .../dev/usbharu/hideout/util/HttpUtil.kt | 0 .../usbharu/hideout/util/InstantParseUtil.kt | 0 .../dev/usbharu/hideout/util/LruCache.kt | 0 .../dev/usbharu/hideout/util/RsaUtil.kt | 0 .../dev/usbharu/hideout/util/ServerUtil.kt | 0 .../dev/usbharu/hideout/util/TempFileUtil.kt | 0 .../META-INF/native-image/jni-config.json | 0 .../predefined-classes-config.json | 0 .../META-INF/native-image/proxy-config.json | 0 .../META-INF/native-image/reflect-config.json | 0 .../native-image/resource-config.json | 0 .../native-image/serialization-config.json | 0 .../src}/main/resources/application.yml | 0 .../db/migration/V1707799249__Filter.sql | 0 .../resources/db/migration/V1__Init_DB.sql | 0 .../src}/main/resources/icon.png | Bin .../src}/main/resources/logback.xml | 0 .../src}/main/resources/openapi/mastodon.yaml | 0 .../main/resources/templates/sign_up.html | 0 .../usbharu/hideout/EqualsAndToStringTest.kt | 0 .../activitypub/domain/model/AnnounceTest.kt | 0 .../activitypub/domain/model/BlockTest.kt | 0 .../activitypub/domain/model/CreateTest.kt | 0 .../domain/model/DeleteSerializeTest.kt | 0 .../activitypub/domain/model/DocumentTest.kt | 0 .../domain/model/JsonLdSerializeTest.kt | 0 .../domain/model/KeySerializeTest.kt | 0 .../domain/model/NoteSerializeTest.kt | 0 .../domain/model/PersonSerializeTest.kt | 0 .../activitypub/domain/model/RejectTest.kt | 0 .../activitypub/domain/model/UndoTest.kt | 0 .../model/objects/ObjectSerializeTest.kt | 0 .../api/actor/ActorAPControllerImplTest.kt | 0 .../api/inbox/InboxControllerImplTest.kt | 0 .../api/note/NoteApControllerImplTest.kt | 0 .../api/outbox/OutboxControllerImplTest.kt | 0 .../api/webfinger/WebFingerControllerTest.kt | 0 .../accept/APDeliverAcceptJobProcessorTest.kt | 0 .../activity/accept/ApAcceptProcessorTest.kt | 0 .../accept/ApSendAcceptServiceImplTest.kt | 0 .../block/APDeliverBlockJobProcessorTest.kt | 0 .../create/ApSendCreateServiceImplTest.kt | 0 .../follow/APSendFollowServiceImplTest.kt | 0 .../like/APReactionServiceImplTest.kt | 0 .../common/APRequestServiceImplTest.kt | 0 .../APResourceResolveServiceImplTest.kt | 0 .../service/common/APServiceImplTest.kt | 0 .../objects/note/APNoteServiceImplTest.kt | 0 .../objects/note/ApNoteJobServiceImplTest.kt | 0 .../hideout/ap/ContextDeserializerTest.kt | 0 .../hideout/ap/ContextSerializerTest.kt | 0 .../ExposedPaginationExtensionKtTest.kt | 0 .../infrastructure/exposed/PageTest.kt | 0 .../exposed/PaginationListKtTest.kt | 0 .../TwitterSnowflakeIdGenerateServiceTest.kt | 0 .../service/init/MetaServiceImplTest.kt | 0 .../init/ServerInitialiseServiceImplTest.kt | 0 .../core/domain/model/actor/ActorTest.kt | 0 .../HttpSignatureHeaderCheckerTest.kt | 0 .../filter/MuteProcessServiceImplTest.kt | 0 .../service/filter/MuteServiceImplTest.kt | 0 ...cheTikaFileTypeDeterminationServiceTest.kt | 0 .../LocalFileSystemMediaDataStoreTest.kt | 0 .../service/media/MediaServiceImplTest.kt | 0 .../FollowNotificationRequestTest.kt | 0 .../FollowRequestNotificationRequestTest.kt | 0 .../MentionNotificationRequestTest.kt | 0 .../NotificationServiceImplTest.kt | 0 .../PostNotificationRequestTest.kt | 0 .../ReactionNotificationRequestTest.kt | 0 ...ipNotificationManagementServiceImplTest.kt | 0 .../RepostNotificationRequestTest.kt | 0 .../post/DefaultPostContentFormatterTest.kt | 0 .../core/service/post/PostServiceImplTest.kt | 0 .../reaction/ReactionServiceImplTest.kt | 0 .../RelationshipServiceImplTest.kt | 0 .../KtorResourceResolveServiceTest.kt | 0 .../service/timeline/TimelineServiceTest.kt | 0 .../core/service/user/ActorServiceTest.kt | 0 .../domain/model/NotificationTypeTest.kt | 0 .../MastodonAccountApiControllerTest.kt | 0 .../api/apps/MastodonAppsApiControllerTest.kt | 0 .../MastodonInstanceApiControllerTest.kt | 0 .../media/MastodonMediaApiControllerTest.kt | 0 .../MastodonStatusesApiControllerTest.kt | 1 + .../MastodonTimelineApiControllerTest.kt | 1 + .../account/AccountApiServiceImplTest.kt | 1 + .../dev/usbharu/hideout/util/EmojiUtilTest.kt | 0 .../test/kotlin/utils/JsonObjectMapper.kt | 0 .../src}/test/kotlin/utils/PostBuilder.kt | 0 .../kotlin/utils/TestApplicationConfig.kt | 0 .../src}/test/kotlin/utils/TestTransaction.kt | 0 .../src}/test/kotlin/utils/UserBuilder.kt | 0 .../src}/test/resources/400x400.png | Bin .../src}/test/resources/empty.conf | 0 .../test/resources/junit-platform.properties | 0 .../templates}/api.mustache | 0 .../templates}/apiController.mustache | 0 .../templates}/apiDelegate.mustache | 0 .../templates}/apiInterface.mustache | 0 .../templates}/apiUtil.mustache | 0 .../templates}/api_test.mustache | 0 .../templates}/beanValidation.mustache | 0 .../templates}/beanValidationModel.mustache | 0 .../templates}/beanValidationPath.mustache | 0 .../beanValidationPathParams.mustache | 0 .../beanValidationQueryParams.mustache | 0 .../templates}/bodyParams.mustache | 0 .../templates}/dataClass.mustache | 0 .../templates}/dataClassOptVar.mustache | 0 .../templates}/dataClassReqVar.mustache | 0 .../templates}/enumClass.mustache | 0 .../templates}/exceptions.mustache | 0 .../templates}/formParams.mustache | 0 .../templates}/generatedAnnotation.mustache | 0 .../templates}/headerParams.mustache | 0 .../templates}/homeController.mustache | 0 .../templates}/interfaceOptVar.mustache | 0 .../templates}/interfaceReqVar.mustache | 0 .../libraries/spring-boot/README.mustache | 0 .../spring-boot/application.mustache | 0 .../spring-boot/buildGradle-sb3-Kts.mustache | 0 .../spring-boot/buildGradleKts.mustache | 0 .../spring-boot/defaultBasePath.mustache | 0 .../libraries/spring-boot/pom-sb3.mustache | 0 .../libraries/spring-boot/pom.mustache | 0 .../spring-boot/settingsGradle.mustache | 0 .../springBootApplication.mustache | 0 .../libraries/spring-boot/swagger-ui.mustache | 0 .../libraries/spring-cloud/README.mustache | 0 .../libraries/spring-cloud/apiClient.mustache | 0 .../apiKeyRequestInterceptor.mustache | 0 .../spring-cloud/buildGradle-sb3-Kts.mustache | 0 .../spring-cloud/buildGradleKts.mustache | 0 .../spring-cloud/clientConfiguration.mustache | 0 .../libraries/spring-cloud/pom-sb3.mustache | 0 .../libraries/spring-cloud/pom.mustache | 0 .../spring-cloud/settingsGradle.mustache | 0 .../templates}/methodBody.mustache | 0 .../templates}/model.mustache | 0 .../templates}/modelMutable.mustache | 0 .../templates}/openapi.mustache | 0 .../templates}/optionalDataType.mustache | 0 .../templates}/pathParams.mustache | 0 .../templates}/queryParams.mustache | 0 .../templates}/returnTypes.mustache | 0 .../templates}/returnValue.mustache | 0 .../templates}/service.mustache | 0 .../templates}/serviceImpl.mustache | 0 .../springdocDocumentationConfig.mustache | 0 .../springfoxDocumentationConfig.mustache | 0 .../templates}/typeInfoAnnotation.mustache | 0 hideout-worker/build.gradle.kts | 21 ++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + hideout-worker/gradlew | 234 ++++++++++++++++++ hideout-worker/gradlew.bat | 89 +++++++ .../settings.gradle.kts | 3 +- hideout-worker/src/main/kotlin/Main.kt | 5 + hideout.iml | 8 + 585 files changed, 634 insertions(+), 193 deletions(-) delete mode 100644 gradle.properties delete mode 100644 gradle/wrapper/gradle-wrapper.jar rename allowed-licenses.json => hideout-core/allowed-licenses.json (100%) rename build.gradle.kts => hideout-core/build.gradle.kts (100%) create mode 100644 hideout-core/gradle.properties create mode 100644 hideout-core/gradle/wrapper/gradle-wrapper.jar rename {gradle => hideout-core/gradle}/wrapper/gradle-wrapper.properties (86%) rename gradlew => hideout-core/gradlew (93%) mode change 100755 => 100644 rename gradlew.bat => hideout-core/gradlew.bat (89%) rename license-normalizer-bundle.json => hideout-core/license-normalizer-bundle.json (100%) create mode 100644 hideout-core/settings.gradle.kts rename {src => hideout-core/src}/e2eTest/kotlin/AssertionUtil.kt (100%) rename {src => hideout-core/src}/e2eTest/kotlin/KarateUtil.kt (100%) rename {src => hideout-core/src}/e2eTest/kotlin/federation/FollowAcceptTest.kt (100%) rename {src => hideout-core/src}/e2eTest/kotlin/federation/InboxCommonTest.kt (100%) rename {src => hideout-core/src}/e2eTest/kotlin/oauth2/OAuth2LoginTest.kt (100%) rename {src => hideout-core/src}/e2eTest/resources/application.yml (100%) rename {src => hideout-core/src}/e2eTest/resources/federation/FollowAcceptMockServer.feature (100%) rename {src => hideout-core/src}/e2eTest/resources/federation/FollowAcceptTest.feature (100%) rename {src => hideout-core/src}/e2eTest/resources/federation/InboxCommonTest.feature (100%) rename {src => hideout-core/src}/e2eTest/resources/federation/InboxxCommonMockServerTest.feature (100%) rename {src => hideout-core/src}/e2eTest/resources/karate-config.js (100%) rename {src => hideout-core/src}/e2eTest/resources/logback.xml (100%) rename {src => hideout-core/src}/e2eTest/resources/oauth2/Oauth2LoginTest.feature (100%) rename {src => hideout-core/src}/e2eTest/resources/oauth2/user.sql (100%) rename {src => hideout-core/src}/intTest/kotlin/activitypub/inbox/InboxTest.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/activitypub/note/NoteTest.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/activitypub/webfinger/WebFingerTest.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/mastodon/account/AccountApiPaginationTest.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/mastodon/account/AccountApiTest.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/mastodon/apps/AppTest.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/mastodon/filter/FilterTest.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/mastodon/media/MediaTest.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/mastodon/notifications/ExposedNotificationsApiPaginationTest.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/mastodon/notifications/MongodbNotificationsApiPaginationTest.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/mastodon/status/StatusTest.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/mastodon/timelines/TimelineApiTest.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/util/SpringApplicationTestBase.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/util/TestTransaction.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/util/WithHttpSignature.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/util/WithHttpSignatureSecurityContextFactory.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/util/WithMockHttpSignature.kt (100%) rename {src => hideout-core/src}/intTest/kotlin/util/WithMockHttpSignatureSecurityContextFactory.kt (100%) rename {src => hideout-core/src}/intTest/resources/application.yml (100%) rename {src => hideout-core/src}/intTest/resources/junit-platform.properties (100%) rename {src => hideout-core/src}/intTest/resources/logback.xml (100%) rename {src => hideout-core/src}/intTest/resources/media/400x400.png (100%) rename {src => hideout-core/src}/intTest/resources/sql/accounts/apiV1AccountsIdFollowPost フォローできる.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/accounts/test-accounts-statuses.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/filter/test-filter.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/note/httpSignature認証でフォロワーがfollowers投稿を取得できる.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/note/httpSignature認証でフォロワーがpublic投稿を取得できる.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/note/httpSignature認証でフォロワーがunlisted投稿を取得できる.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/note/メディア付き投稿はattachmentにDocumentとして画像が存在する.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/note/リプライになっている投稿はinReplyToが存在する.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/note/匿名でfollowers投稿を取得しようとすると404.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/note/匿名でpublic投稿を取得できる.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/note/匿名でunlisted投稿を取得できる.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/notification/test-mastodon_notifications.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/notification/test-notifications.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/test-custom-emoji.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/test-post.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/test-user.sql (100%) rename {src => hideout-core/src}/intTest/resources/sql/test-user2.sql (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/SpringApplication.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/ActivityPubProcessException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/FailedProcessException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/FailedToGetActivityPubResourceException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/HttpSignatureUnauthorizedException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/IllegalActivityPubObjectException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/JsonParseException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Announce.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Block.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasActor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasId.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasName.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLd.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Reject.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Tombstone.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/nodeinfo/Nodeinfo.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/nodeinfo/Nodeinfo2_0.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/Object.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectDeserializer.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/webfinger/WebFinger.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/ExposedAnnounceQueryService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/NoteQueryServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/hostmeta/HostMetaController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/nodeinfo/NodeinfoController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/webfinger/WebFingerController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/query/AnnounceQueryService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/query/NoteQueryService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/announce/ApAnnounceProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APSendBlockService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/BlockActivityPubProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/CreateActivityProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeleteProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeliverDeleteJobProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APSendDeleteService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApRemoveReactionJobProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/APDeliverRejectJobProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApRejectProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APDeliverUndoJobProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APService.kt (61%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/common/AbstractActivityPubProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessContext.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessor.kt (100%) create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityType.kt create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityVocabulary.kt create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedActivityVocabulary.kt create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedVocabulary.kt rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/emoji/EmojiService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/emoji/EmojiServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/user/APUserService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/activitypub/service/webfinger/WebFingerApiService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/config/ActivityPubConfig.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/config/AwsConfig.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/config/HtmlSanitizeConfig.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/config/HttpSignatureConfig.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/config/MdcXrequestIdFilter.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/config/MediaConfig.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/config/MvcConfigurer.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/config/SecurityConfig.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/config/SpringConfig.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/external/Transaction.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtension.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedTransaction.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/Page.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PaginationList.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/QueryMapper.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ResultRowMapper.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/infrastructure/springframework/RoleHierarchyAuthorizationManagerFactory.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/service/id/IdGenerateService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/service/id/SnowflakeIdGenerateService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/service/init/MetaService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/FailedToGetResourcesException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/HideoutException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/HttpSignatureVerifyException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/NotInitException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/SQLExceptionTranslator.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/SpringDataAccessExceptionSQLExceptionTranslator.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/UserNotFoundException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaConvertException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaFileSizeException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaFileSizeIsZeroException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaProcessException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaSaveException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/RemoteMediaFileSizeException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/UnsupportedMediaException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/DuplicateException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/NotFoundException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/PostNotFoundException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/ResourceAccessException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/UserNotFoundException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/local/LocalUserNotFoundException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Acct.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Actor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/deletedActor/DeletedActor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/deletedActor/DeletedActorRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmoji.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmojiRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/Filter.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterAction.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterMode.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterType.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/filterkeyword/FilterKeyword.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/filterkeyword/FilterKeywordRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Instance.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/InstanceRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo2_0.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/media/Media.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/media/MediaRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/Jwt.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/Meta.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/MetaRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/ExposedNotificationRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/Notification.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/NotificationRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Post.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/post/PostRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Visibility.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/reaction/Reaction.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/reaction/ReactionRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/Relationship.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepositoryImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/timeline/Timeline.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/timeline/TimelineRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetail.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetailRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptJob.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteJob.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoJob.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/external/job/HideoutJob.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostQueryMapper.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostResultRowMapper.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/UserQueryMapper.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/UserResultRowMapper.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/FollowerQueryServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/AbstractRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ActorRepositoryImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/CustomEmojiRepositoryImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/DeletedActorRepositoryImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterKeywordRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/MediaRepositoryImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/MetaRepositoryImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/PostRepositoryImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ReactionRepositoryImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/UserDetailRepositoryImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/httpsignature/HttpRequestMixIn.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedJobRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedKJob.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedLockRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueParentService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueWorkerService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KJobMongoJobQueueWorkerService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KjobMongoJobQueueParentService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/mongorepository/MongoTimelineRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/mongorepository/MongoTimelineRepositoryWrapper.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureFilter.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureHeaderChecker.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUser.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUserDetailsService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureVerifierComposite.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationConsentService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/RegisteredClientRepositoryImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/SecureTokenGenerator.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/SecureTokenGeneratorImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/LoginUserContextHolder.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/OAuth2JwtLoginUserContextHolder.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/interfaces/api/auth/AuthController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/interfaces/api/media/LocalFileController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/query/FollowerQueryService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/query/model/ExposedFilterQueryService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/query/model/FilterQueryModel.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/query/model/FilterQueryService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/filter/FilterKeyword.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/filter/FilterResult.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/follow/SendFollowDto.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceCreateDto.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/job/JobProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueParentService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueWorkerService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/ApatcheTikaFileTypeDeterminationService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/FileType.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/FileTypeDeterminationService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStore.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/MediaBlurhashService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/MediaBlurhashServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/MediaDataStore.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/MediaFileRenameService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/MediaSave.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/MediaSaveRequest.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/MediaService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/MimeType.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedFile.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedMedia.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedMediaPath.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMedia.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMediaDownloadService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMediaDownloadServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/S3MediaDataStore.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/SavedMedia.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/ThumbnailGenerateService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/ThumbnailGenerateServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/UUIDMediaFileRenameService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverter.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverterRoot.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverterRootImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaProcessService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaProcessServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessorConfiguration.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/media/converter/movie/MovieMediaProcessService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationRequest.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationStore.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/post/DefaultPostContentFormatter.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/post/FormattedPostContent.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/post/PostContentFormatter.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/post/PostCreateDto.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/post/PostService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/resource/CacheManager.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/resource/InMemoryCacheManager.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/resource/KtorResolveResponse.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/resource/KtorResourceResolveService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/resource/ResolveResponse.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/resource/ResourceResolveService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/timeline/ExposedGenerateTimelineService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/timeline/GenerateTimelineService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/timeline/MongoGenerateTimelineService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/timeline/TimelineService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/user/RemoteUserCreateDto.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/user/UpdateUserDto.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/user/UserAuthService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/user/UserAuthServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/user/UserCreateDto.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/user/UserService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/core/service/user/UserServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/generate/JsonOrFormBind.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/generate/JsonOrFormModelMethodProcessor.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/config/MastodonApiSecurityConfig.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/AccountNotFoundException.kt (96%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/ClientException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/MastodonApiException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/ServerException.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/StatusNotFoundException.kt (96%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonApiErrorResponse.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonNotification.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonNotificationRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/NotificationType.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/AccountQueryServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/StatusQueryServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedrepository/ExposedMastodonNotificationRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepository.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepositoryWrapper.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/springweb/MastodonApiControllerAdvice.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/apps/MastodonAppsApiController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/filter/MastodonFilterApiController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/instance/MastodonInstanceApiController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MastodonMediaApiController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MediaRequest.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/notification/MastodonNotificationApiController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiContoller.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusQuery.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt (98%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiController.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/query/AccountQueryService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/query/StatusQueryService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/service/app/AppApiService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/service/filter/MastodonFilterApiService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/service/instance/InstanceApiService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/service/media/MediaApiService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/service/media/MediaApiServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/MastodonNotificationStore.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiServiceImpl.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/service/status/StatusesApiService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/mastodon/service/timeline/TimelineApiService.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/util/AcctUtil.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/util/Base64Util.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/util/CollectionUtil.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/util/EmojiUtil.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/util/InstantParseUtil.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/util/LruCache.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/util/RsaUtil.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/util/ServerUtil.kt (100%) rename {src => hideout-core/src}/main/kotlin/dev/usbharu/hideout/util/TempFileUtil.kt (100%) rename {src => hideout-core/src}/main/resources/META-INF/native-image/jni-config.json (100%) rename {src => hideout-core/src}/main/resources/META-INF/native-image/predefined-classes-config.json (100%) rename {src => hideout-core/src}/main/resources/META-INF/native-image/proxy-config.json (100%) rename {src => hideout-core/src}/main/resources/META-INF/native-image/reflect-config.json (100%) rename {src => hideout-core/src}/main/resources/META-INF/native-image/resource-config.json (100%) rename {src => hideout-core/src}/main/resources/META-INF/native-image/serialization-config.json (100%) rename {src => hideout-core/src}/main/resources/application.yml (100%) rename {src => hideout-core/src}/main/resources/db/migration/V1707799249__Filter.sql (100%) rename {src => hideout-core/src}/main/resources/db/migration/V1__Init_DB.sql (100%) rename {src => hideout-core/src}/main/resources/icon.png (100%) rename {src => hideout-core/src}/main/resources/logback.xml (100%) rename {src => hideout-core/src}/main/resources/openapi/mastodon.yaml (100%) rename {src => hideout-core/src}/main/resources/templates/sign_up.html (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/EqualsAndToStringTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/AnnounceTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/BlockTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/CreateTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/DeleteSerializeTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/DocumentTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLdSerializeTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/KeySerializeTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/NoteSerializeTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/PersonSerializeTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/RejectTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/UndoTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectSerializeTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/ActorAPControllerImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/webfinger/WebFingerControllerTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessorTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessorTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessorTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/ap/ContextDeserializerTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/ap/ContextSerializerTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtensionKtTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PageTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PaginationListKtTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateServiceTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureHeaderCheckerTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/filter/MuteServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/media/ApatcheTikaFileTypeDeterminationServiceTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStoreTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/notification/FollowNotificationRequestTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/notification/FollowRequestNotificationRequestTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/notification/MentionNotificationRequestTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/notification/NotificationServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/notification/PostNotificationRequestTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/notification/ReactionNotificationRequestTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/notification/RepostNotificationRequestTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/post/DefaultPostContentFormatterTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImplTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/resource/KtorResourceResolveServiceTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/timeline/TimelineServiceTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/core/service/user/ActorServiceTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/mastodon/domain/model/NotificationTypeTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiControllerTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/apps/MastodonAppsApiControllerTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/instance/MastodonInstanceApiControllerTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MastodonMediaApiControllerTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiControllerTest.kt (99%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiControllerTest.kt (99%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiServiceImplTest.kt (99%) rename {src => hideout-core/src}/test/kotlin/dev/usbharu/hideout/util/EmojiUtilTest.kt (100%) rename {src => hideout-core/src}/test/kotlin/utils/JsonObjectMapper.kt (100%) rename {src => hideout-core/src}/test/kotlin/utils/PostBuilder.kt (100%) rename {src => hideout-core/src}/test/kotlin/utils/TestApplicationConfig.kt (100%) rename {src => hideout-core/src}/test/kotlin/utils/TestTransaction.kt (100%) rename {src => hideout-core/src}/test/kotlin/utils/UserBuilder.kt (100%) rename {src => hideout-core/src}/test/resources/400x400.png (100%) rename {src => hideout-core/src}/test/resources/empty.conf (100%) rename {src => hideout-core/src}/test/resources/junit-platform.properties (100%) rename {templates => hideout-core/templates}/api.mustache (100%) rename {templates => hideout-core/templates}/apiController.mustache (100%) rename {templates => hideout-core/templates}/apiDelegate.mustache (100%) rename {templates => hideout-core/templates}/apiInterface.mustache (100%) rename {templates => hideout-core/templates}/apiUtil.mustache (100%) rename {templates => hideout-core/templates}/api_test.mustache (100%) rename {templates => hideout-core/templates}/beanValidation.mustache (100%) rename {templates => hideout-core/templates}/beanValidationModel.mustache (100%) rename {templates => hideout-core/templates}/beanValidationPath.mustache (100%) rename {templates => hideout-core/templates}/beanValidationPathParams.mustache (100%) rename {templates => hideout-core/templates}/beanValidationQueryParams.mustache (100%) rename {templates => hideout-core/templates}/bodyParams.mustache (100%) rename {templates => hideout-core/templates}/dataClass.mustache (100%) rename {templates => hideout-core/templates}/dataClassOptVar.mustache (100%) rename {templates => hideout-core/templates}/dataClassReqVar.mustache (100%) rename {templates => hideout-core/templates}/enumClass.mustache (100%) rename {templates => hideout-core/templates}/exceptions.mustache (100%) rename {templates => hideout-core/templates}/formParams.mustache (100%) rename {templates => hideout-core/templates}/generatedAnnotation.mustache (100%) rename {templates => hideout-core/templates}/headerParams.mustache (100%) rename {templates => hideout-core/templates}/homeController.mustache (100%) rename {templates => hideout-core/templates}/interfaceOptVar.mustache (100%) rename {templates => hideout-core/templates}/interfaceReqVar.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-boot/README.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-boot/application.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-boot/buildGradle-sb3-Kts.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-boot/buildGradleKts.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-boot/defaultBasePath.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-boot/pom-sb3.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-boot/pom.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-boot/settingsGradle.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-boot/springBootApplication.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-boot/swagger-ui.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-cloud/README.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-cloud/apiClient.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-cloud/apiKeyRequestInterceptor.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-cloud/buildGradle-sb3-Kts.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-cloud/buildGradleKts.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-cloud/clientConfiguration.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-cloud/pom-sb3.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-cloud/pom.mustache (100%) rename {templates => hideout-core/templates}/libraries/spring-cloud/settingsGradle.mustache (100%) rename {templates => hideout-core/templates}/methodBody.mustache (100%) rename {templates => hideout-core/templates}/model.mustache (100%) rename {templates => hideout-core/templates}/modelMutable.mustache (100%) rename {templates => hideout-core/templates}/openapi.mustache (100%) rename {templates => hideout-core/templates}/optionalDataType.mustache (100%) rename {templates => hideout-core/templates}/pathParams.mustache (100%) rename {templates => hideout-core/templates}/queryParams.mustache (100%) rename {templates => hideout-core/templates}/returnTypes.mustache (100%) rename {templates => hideout-core/templates}/returnValue.mustache (100%) rename {templates => hideout-core/templates}/service.mustache (100%) rename {templates => hideout-core/templates}/serviceImpl.mustache (100%) rename {templates => hideout-core/templates}/springdocDocumentationConfig.mustache (100%) rename {templates => hideout-core/templates}/springfoxDocumentationConfig.mustache (100%) rename {templates => hideout-core/templates}/typeInfoAnnotation.mustache (100%) create mode 100644 hideout-worker/build.gradle.kts create mode 100644 hideout-worker/gradle/wrapper/gradle-wrapper.jar create mode 100644 hideout-worker/gradle/wrapper/gradle-wrapper.properties create mode 100644 hideout-worker/gradlew create mode 100644 hideout-worker/gradlew.bat rename settings.gradle.kts => hideout-worker/settings.gradle.kts (64%) create mode 100644 hideout-worker/src/main/kotlin/Main.kt create mode 100644 hideout.iml diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index ba87773a..00000000 --- a/gradle.properties +++ /dev/null @@ -1,11 +0,0 @@ -ktor_version=2.3.9 -kotlin_version=1.9.23 -coroutines_version=1.8.0 -serialization_version=1.6.3 -kotlin.code.style=official -exposed_version=0.49.0 -h2_version=2.2.224 -org.gradle.parallel=true -org.gradle.configureondemand=true -org.gradle.caching=true -org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index ccebba7710deaf9f98673a68957ea02138b60d0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 61608 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 diff --git a/allowed-licenses.json b/hideout-core/allowed-licenses.json similarity index 100% rename from allowed-licenses.json rename to hideout-core/allowed-licenses.json diff --git a/build.gradle.kts b/hideout-core/build.gradle.kts similarity index 100% rename from build.gradle.kts rename to hideout-core/build.gradle.kts diff --git a/hideout-core/gradle.properties b/hideout-core/gradle.properties new file mode 100644 index 00000000..cc0a8c74 --- /dev/null +++ b/hideout-core/gradle.properties @@ -0,0 +1,26 @@ +# +# Copyright (C) 2024 usbharu +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +ktor_version=2.3.9 +kotlin_version=1.9.23 +coroutines_version=1.8.0 +serialization_version=1.6.3 +kotlin.code.style=official +exposed_version=0.49.0 +h2_version=2.2.224 +org.gradle.parallel=true +org.gradle.configureondemand=true +org.gradle.caching=true +org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC diff --git a/hideout-core/gradle/wrapper/gradle-wrapper.jar b/hideout-core/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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/dev/null 2>&1 -then - die "xargs is not available" -fi - # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/hideout-core/gradlew.bat similarity index 89% rename from gradlew.bat rename to hideout-core/gradlew.bat index 93e3f59f..107acd32 100644 --- a/gradlew.bat +++ b/hideout-core/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%"=="" @echo off +@if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,8 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused +if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd +if "%ERRORLEVEL%"=="0" goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/license-normalizer-bundle.json b/hideout-core/license-normalizer-bundle.json similarity index 100% rename from license-normalizer-bundle.json rename to hideout-core/license-normalizer-bundle.json diff --git a/hideout-core/settings.gradle.kts b/hideout-core/settings.gradle.kts new file mode 100644 index 00000000..e0db79c9 --- /dev/null +++ b/hideout-core/settings.gradle.kts @@ -0,0 +1,6 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" +} +rootProject.name = "hideout-core" + +includeBuild("../owl") \ No newline at end of file diff --git a/src/e2eTest/kotlin/AssertionUtil.kt b/hideout-core/src/e2eTest/kotlin/AssertionUtil.kt similarity index 100% rename from src/e2eTest/kotlin/AssertionUtil.kt rename to hideout-core/src/e2eTest/kotlin/AssertionUtil.kt diff --git a/src/e2eTest/kotlin/KarateUtil.kt b/hideout-core/src/e2eTest/kotlin/KarateUtil.kt similarity index 100% rename from src/e2eTest/kotlin/KarateUtil.kt rename to hideout-core/src/e2eTest/kotlin/KarateUtil.kt diff --git a/src/e2eTest/kotlin/federation/FollowAcceptTest.kt b/hideout-core/src/e2eTest/kotlin/federation/FollowAcceptTest.kt similarity index 100% rename from src/e2eTest/kotlin/federation/FollowAcceptTest.kt rename to hideout-core/src/e2eTest/kotlin/federation/FollowAcceptTest.kt diff --git a/src/e2eTest/kotlin/federation/InboxCommonTest.kt b/hideout-core/src/e2eTest/kotlin/federation/InboxCommonTest.kt similarity index 100% rename from src/e2eTest/kotlin/federation/InboxCommonTest.kt rename to hideout-core/src/e2eTest/kotlin/federation/InboxCommonTest.kt diff --git a/src/e2eTest/kotlin/oauth2/OAuth2LoginTest.kt b/hideout-core/src/e2eTest/kotlin/oauth2/OAuth2LoginTest.kt similarity index 100% rename from src/e2eTest/kotlin/oauth2/OAuth2LoginTest.kt rename to hideout-core/src/e2eTest/kotlin/oauth2/OAuth2LoginTest.kt diff --git a/src/e2eTest/resources/application.yml b/hideout-core/src/e2eTest/resources/application.yml similarity index 100% rename from src/e2eTest/resources/application.yml rename to hideout-core/src/e2eTest/resources/application.yml diff --git a/src/e2eTest/resources/federation/FollowAcceptMockServer.feature b/hideout-core/src/e2eTest/resources/federation/FollowAcceptMockServer.feature similarity index 100% rename from src/e2eTest/resources/federation/FollowAcceptMockServer.feature rename to hideout-core/src/e2eTest/resources/federation/FollowAcceptMockServer.feature diff --git a/src/e2eTest/resources/federation/FollowAcceptTest.feature b/hideout-core/src/e2eTest/resources/federation/FollowAcceptTest.feature similarity index 100% rename from src/e2eTest/resources/federation/FollowAcceptTest.feature rename to hideout-core/src/e2eTest/resources/federation/FollowAcceptTest.feature diff --git a/src/e2eTest/resources/federation/InboxCommonTest.feature b/hideout-core/src/e2eTest/resources/federation/InboxCommonTest.feature similarity index 100% rename from src/e2eTest/resources/federation/InboxCommonTest.feature rename to hideout-core/src/e2eTest/resources/federation/InboxCommonTest.feature diff --git a/src/e2eTest/resources/federation/InboxxCommonMockServerTest.feature b/hideout-core/src/e2eTest/resources/federation/InboxxCommonMockServerTest.feature similarity index 100% rename from src/e2eTest/resources/federation/InboxxCommonMockServerTest.feature rename to hideout-core/src/e2eTest/resources/federation/InboxxCommonMockServerTest.feature diff --git a/src/e2eTest/resources/karate-config.js b/hideout-core/src/e2eTest/resources/karate-config.js similarity index 100% rename from src/e2eTest/resources/karate-config.js rename to hideout-core/src/e2eTest/resources/karate-config.js diff --git a/src/e2eTest/resources/logback.xml b/hideout-core/src/e2eTest/resources/logback.xml similarity index 100% rename from src/e2eTest/resources/logback.xml rename to hideout-core/src/e2eTest/resources/logback.xml diff --git a/src/e2eTest/resources/oauth2/Oauth2LoginTest.feature b/hideout-core/src/e2eTest/resources/oauth2/Oauth2LoginTest.feature similarity index 100% rename from src/e2eTest/resources/oauth2/Oauth2LoginTest.feature rename to hideout-core/src/e2eTest/resources/oauth2/Oauth2LoginTest.feature diff --git a/src/e2eTest/resources/oauth2/user.sql b/hideout-core/src/e2eTest/resources/oauth2/user.sql similarity index 100% rename from src/e2eTest/resources/oauth2/user.sql rename to hideout-core/src/e2eTest/resources/oauth2/user.sql diff --git a/src/intTest/kotlin/activitypub/inbox/InboxTest.kt b/hideout-core/src/intTest/kotlin/activitypub/inbox/InboxTest.kt similarity index 100% rename from src/intTest/kotlin/activitypub/inbox/InboxTest.kt rename to hideout-core/src/intTest/kotlin/activitypub/inbox/InboxTest.kt diff --git a/src/intTest/kotlin/activitypub/note/NoteTest.kt b/hideout-core/src/intTest/kotlin/activitypub/note/NoteTest.kt similarity index 100% rename from src/intTest/kotlin/activitypub/note/NoteTest.kt rename to hideout-core/src/intTest/kotlin/activitypub/note/NoteTest.kt diff --git a/src/intTest/kotlin/activitypub/webfinger/WebFingerTest.kt b/hideout-core/src/intTest/kotlin/activitypub/webfinger/WebFingerTest.kt similarity index 100% rename from src/intTest/kotlin/activitypub/webfinger/WebFingerTest.kt rename to hideout-core/src/intTest/kotlin/activitypub/webfinger/WebFingerTest.kt diff --git a/src/intTest/kotlin/mastodon/account/AccountApiPaginationTest.kt b/hideout-core/src/intTest/kotlin/mastodon/account/AccountApiPaginationTest.kt similarity index 100% rename from src/intTest/kotlin/mastodon/account/AccountApiPaginationTest.kt rename to hideout-core/src/intTest/kotlin/mastodon/account/AccountApiPaginationTest.kt diff --git a/src/intTest/kotlin/mastodon/account/AccountApiTest.kt b/hideout-core/src/intTest/kotlin/mastodon/account/AccountApiTest.kt similarity index 100% rename from src/intTest/kotlin/mastodon/account/AccountApiTest.kt rename to hideout-core/src/intTest/kotlin/mastodon/account/AccountApiTest.kt diff --git a/src/intTest/kotlin/mastodon/apps/AppTest.kt b/hideout-core/src/intTest/kotlin/mastodon/apps/AppTest.kt similarity index 100% rename from src/intTest/kotlin/mastodon/apps/AppTest.kt rename to hideout-core/src/intTest/kotlin/mastodon/apps/AppTest.kt diff --git a/src/intTest/kotlin/mastodon/filter/FilterTest.kt b/hideout-core/src/intTest/kotlin/mastodon/filter/FilterTest.kt similarity index 100% rename from src/intTest/kotlin/mastodon/filter/FilterTest.kt rename to hideout-core/src/intTest/kotlin/mastodon/filter/FilterTest.kt diff --git a/src/intTest/kotlin/mastodon/media/MediaTest.kt b/hideout-core/src/intTest/kotlin/mastodon/media/MediaTest.kt similarity index 100% rename from src/intTest/kotlin/mastodon/media/MediaTest.kt rename to hideout-core/src/intTest/kotlin/mastodon/media/MediaTest.kt diff --git a/src/intTest/kotlin/mastodon/notifications/ExposedNotificationsApiPaginationTest.kt b/hideout-core/src/intTest/kotlin/mastodon/notifications/ExposedNotificationsApiPaginationTest.kt similarity index 100% rename from src/intTest/kotlin/mastodon/notifications/ExposedNotificationsApiPaginationTest.kt rename to hideout-core/src/intTest/kotlin/mastodon/notifications/ExposedNotificationsApiPaginationTest.kt diff --git a/src/intTest/kotlin/mastodon/notifications/MongodbNotificationsApiPaginationTest.kt b/hideout-core/src/intTest/kotlin/mastodon/notifications/MongodbNotificationsApiPaginationTest.kt similarity index 100% rename from src/intTest/kotlin/mastodon/notifications/MongodbNotificationsApiPaginationTest.kt rename to hideout-core/src/intTest/kotlin/mastodon/notifications/MongodbNotificationsApiPaginationTest.kt diff --git a/src/intTest/kotlin/mastodon/status/StatusTest.kt b/hideout-core/src/intTest/kotlin/mastodon/status/StatusTest.kt similarity index 100% rename from src/intTest/kotlin/mastodon/status/StatusTest.kt rename to hideout-core/src/intTest/kotlin/mastodon/status/StatusTest.kt diff --git a/src/intTest/kotlin/mastodon/timelines/TimelineApiTest.kt b/hideout-core/src/intTest/kotlin/mastodon/timelines/TimelineApiTest.kt similarity index 100% rename from src/intTest/kotlin/mastodon/timelines/TimelineApiTest.kt rename to hideout-core/src/intTest/kotlin/mastodon/timelines/TimelineApiTest.kt diff --git a/src/intTest/kotlin/util/SpringApplicationTestBase.kt b/hideout-core/src/intTest/kotlin/util/SpringApplicationTestBase.kt similarity index 100% rename from src/intTest/kotlin/util/SpringApplicationTestBase.kt rename to hideout-core/src/intTest/kotlin/util/SpringApplicationTestBase.kt diff --git a/src/intTest/kotlin/util/TestTransaction.kt b/hideout-core/src/intTest/kotlin/util/TestTransaction.kt similarity index 100% rename from src/intTest/kotlin/util/TestTransaction.kt rename to hideout-core/src/intTest/kotlin/util/TestTransaction.kt diff --git a/src/intTest/kotlin/util/WithHttpSignature.kt b/hideout-core/src/intTest/kotlin/util/WithHttpSignature.kt similarity index 100% rename from src/intTest/kotlin/util/WithHttpSignature.kt rename to hideout-core/src/intTest/kotlin/util/WithHttpSignature.kt diff --git a/src/intTest/kotlin/util/WithHttpSignatureSecurityContextFactory.kt b/hideout-core/src/intTest/kotlin/util/WithHttpSignatureSecurityContextFactory.kt similarity index 100% rename from src/intTest/kotlin/util/WithHttpSignatureSecurityContextFactory.kt rename to hideout-core/src/intTest/kotlin/util/WithHttpSignatureSecurityContextFactory.kt diff --git a/src/intTest/kotlin/util/WithMockHttpSignature.kt b/hideout-core/src/intTest/kotlin/util/WithMockHttpSignature.kt similarity index 100% rename from src/intTest/kotlin/util/WithMockHttpSignature.kt rename to hideout-core/src/intTest/kotlin/util/WithMockHttpSignature.kt diff --git a/src/intTest/kotlin/util/WithMockHttpSignatureSecurityContextFactory.kt b/hideout-core/src/intTest/kotlin/util/WithMockHttpSignatureSecurityContextFactory.kt similarity index 100% rename from src/intTest/kotlin/util/WithMockHttpSignatureSecurityContextFactory.kt rename to hideout-core/src/intTest/kotlin/util/WithMockHttpSignatureSecurityContextFactory.kt diff --git a/src/intTest/resources/application.yml b/hideout-core/src/intTest/resources/application.yml similarity index 100% rename from src/intTest/resources/application.yml rename to hideout-core/src/intTest/resources/application.yml diff --git a/src/intTest/resources/junit-platform.properties b/hideout-core/src/intTest/resources/junit-platform.properties similarity index 100% rename from src/intTest/resources/junit-platform.properties rename to hideout-core/src/intTest/resources/junit-platform.properties diff --git a/src/intTest/resources/logback.xml b/hideout-core/src/intTest/resources/logback.xml similarity index 100% rename from src/intTest/resources/logback.xml rename to hideout-core/src/intTest/resources/logback.xml diff --git a/src/intTest/resources/media/400x400.png b/hideout-core/src/intTest/resources/media/400x400.png similarity index 100% rename from src/intTest/resources/media/400x400.png rename to hideout-core/src/intTest/resources/media/400x400.png diff --git a/src/intTest/resources/sql/accounts/apiV1AccountsIdFollowPost フォローできる.sql b/hideout-core/src/intTest/resources/sql/accounts/apiV1AccountsIdFollowPost フォローできる.sql similarity index 100% rename from src/intTest/resources/sql/accounts/apiV1AccountsIdFollowPost フォローできる.sql rename to hideout-core/src/intTest/resources/sql/accounts/apiV1AccountsIdFollowPost フォローできる.sql diff --git a/src/intTest/resources/sql/accounts/test-accounts-statuses.sql b/hideout-core/src/intTest/resources/sql/accounts/test-accounts-statuses.sql similarity index 100% rename from src/intTest/resources/sql/accounts/test-accounts-statuses.sql rename to hideout-core/src/intTest/resources/sql/accounts/test-accounts-statuses.sql diff --git a/src/intTest/resources/sql/filter/test-filter.sql b/hideout-core/src/intTest/resources/sql/filter/test-filter.sql similarity index 100% rename from src/intTest/resources/sql/filter/test-filter.sql rename to hideout-core/src/intTest/resources/sql/filter/test-filter.sql diff --git a/src/intTest/resources/sql/note/httpSignature認証でフォロワーがfollowers投稿を取得できる.sql b/hideout-core/src/intTest/resources/sql/note/httpSignature認証でフォロワーがfollowers投稿を取得できる.sql similarity index 100% rename from src/intTest/resources/sql/note/httpSignature認証でフォロワーがfollowers投稿を取得できる.sql rename to hideout-core/src/intTest/resources/sql/note/httpSignature認証でフォロワーがfollowers投稿を取得できる.sql diff --git a/src/intTest/resources/sql/note/httpSignature認証でフォロワーがpublic投稿を取得できる.sql b/hideout-core/src/intTest/resources/sql/note/httpSignature認証でフォロワーがpublic投稿を取得できる.sql similarity index 100% rename from src/intTest/resources/sql/note/httpSignature認証でフォロワーがpublic投稿を取得できる.sql rename to hideout-core/src/intTest/resources/sql/note/httpSignature認証でフォロワーがpublic投稿を取得できる.sql diff --git a/src/intTest/resources/sql/note/httpSignature認証でフォロワーがunlisted投稿を取得できる.sql b/hideout-core/src/intTest/resources/sql/note/httpSignature認証でフォロワーがunlisted投稿を取得できる.sql similarity index 100% rename from src/intTest/resources/sql/note/httpSignature認証でフォロワーがunlisted投稿を取得できる.sql rename to hideout-core/src/intTest/resources/sql/note/httpSignature認証でフォロワーがunlisted投稿を取得できる.sql diff --git a/src/intTest/resources/sql/note/メディア付き投稿はattachmentにDocumentとして画像が存在する.sql b/hideout-core/src/intTest/resources/sql/note/メディア付き投稿はattachmentにDocumentとして画像が存在する.sql similarity index 100% rename from src/intTest/resources/sql/note/メディア付き投稿はattachmentにDocumentとして画像が存在する.sql rename to hideout-core/src/intTest/resources/sql/note/メディア付き投稿はattachmentにDocumentとして画像が存在する.sql diff --git a/src/intTest/resources/sql/note/リプライになっている投稿はinReplyToが存在する.sql b/hideout-core/src/intTest/resources/sql/note/リプライになっている投稿はinReplyToが存在する.sql similarity index 100% rename from src/intTest/resources/sql/note/リプライになっている投稿はinReplyToが存在する.sql rename to hideout-core/src/intTest/resources/sql/note/リプライになっている投稿はinReplyToが存在する.sql diff --git a/src/intTest/resources/sql/note/匿名でfollowers投稿を取得しようとすると404.sql b/hideout-core/src/intTest/resources/sql/note/匿名でfollowers投稿を取得しようとすると404.sql similarity index 100% rename from src/intTest/resources/sql/note/匿名でfollowers投稿を取得しようとすると404.sql rename to hideout-core/src/intTest/resources/sql/note/匿名でfollowers投稿を取得しようとすると404.sql diff --git a/src/intTest/resources/sql/note/匿名でpublic投稿を取得できる.sql b/hideout-core/src/intTest/resources/sql/note/匿名でpublic投稿を取得できる.sql similarity index 100% rename from src/intTest/resources/sql/note/匿名でpublic投稿を取得できる.sql rename to hideout-core/src/intTest/resources/sql/note/匿名でpublic投稿を取得できる.sql diff --git a/src/intTest/resources/sql/note/匿名でunlisted投稿を取得できる.sql b/hideout-core/src/intTest/resources/sql/note/匿名でunlisted投稿を取得できる.sql similarity index 100% rename from src/intTest/resources/sql/note/匿名でunlisted投稿を取得できる.sql rename to hideout-core/src/intTest/resources/sql/note/匿名でunlisted投稿を取得できる.sql diff --git a/src/intTest/resources/sql/notification/test-mastodon_notifications.sql b/hideout-core/src/intTest/resources/sql/notification/test-mastodon_notifications.sql similarity index 100% rename from src/intTest/resources/sql/notification/test-mastodon_notifications.sql rename to hideout-core/src/intTest/resources/sql/notification/test-mastodon_notifications.sql diff --git a/src/intTest/resources/sql/notification/test-notifications.sql b/hideout-core/src/intTest/resources/sql/notification/test-notifications.sql similarity index 100% rename from src/intTest/resources/sql/notification/test-notifications.sql rename to hideout-core/src/intTest/resources/sql/notification/test-notifications.sql diff --git a/src/intTest/resources/sql/test-custom-emoji.sql b/hideout-core/src/intTest/resources/sql/test-custom-emoji.sql similarity index 100% rename from src/intTest/resources/sql/test-custom-emoji.sql rename to hideout-core/src/intTest/resources/sql/test-custom-emoji.sql diff --git a/src/intTest/resources/sql/test-post.sql b/hideout-core/src/intTest/resources/sql/test-post.sql similarity index 100% rename from src/intTest/resources/sql/test-post.sql rename to hideout-core/src/intTest/resources/sql/test-post.sql diff --git a/src/intTest/resources/sql/test-user.sql b/hideout-core/src/intTest/resources/sql/test-user.sql similarity index 100% rename from src/intTest/resources/sql/test-user.sql rename to hideout-core/src/intTest/resources/sql/test-user.sql diff --git a/src/intTest/resources/sql/test-user2.sql b/hideout-core/src/intTest/resources/sql/test-user2.sql similarity index 100% rename from src/intTest/resources/sql/test-user2.sql rename to hideout-core/src/intTest/resources/sql/test-user2.sql diff --git a/src/main/kotlin/dev/usbharu/hideout/SpringApplication.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/SpringApplication.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/SpringApplication.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/SpringApplication.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/ActivityPubProcessException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/ActivityPubProcessException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/ActivityPubProcessException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/ActivityPubProcessException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/FailedProcessException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/FailedProcessException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/FailedProcessException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/FailedProcessException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/FailedToGetActivityPubResourceException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/FailedToGetActivityPubResourceException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/FailedToGetActivityPubResourceException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/FailedToGetActivityPubResourceException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/HttpSignatureUnauthorizedException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/HttpSignatureUnauthorizedException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/HttpSignatureUnauthorizedException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/HttpSignatureUnauthorizedException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/IllegalActivityPubObjectException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/IllegalActivityPubObjectException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/IllegalActivityPubObjectException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/IllegalActivityPubObjectException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/JsonParseException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/JsonParseException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/JsonParseException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/exception/JsonParseException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Accept.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Announce.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Announce.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Announce.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Announce.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Block.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Block.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Block.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Block.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Create.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Delete.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Document.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Emoji.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Follow.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasActor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasActor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasActor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasActor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasId.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasId.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasId.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasId.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasName.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasName.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasName.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/HasName.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLd.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLd.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLd.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLd.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Key.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Like.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Note.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Reject.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Reject.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Reject.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Reject.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Tombstone.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Tombstone.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Tombstone.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Tombstone.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/nodeinfo/Nodeinfo.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/nodeinfo/Nodeinfo.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/nodeinfo/Nodeinfo.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/nodeinfo/Nodeinfo.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/nodeinfo/Nodeinfo2_0.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/nodeinfo/Nodeinfo2_0.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/nodeinfo/Nodeinfo2_0.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/nodeinfo/Nodeinfo2_0.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/Object.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/Object.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/Object.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/Object.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectDeserializer.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectDeserializer.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectDeserializer.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectDeserializer.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectValue.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/webfinger/WebFinger.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/webfinger/WebFinger.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/webfinger/WebFinger.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/webfinger/WebFinger.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/ExposedAnnounceQueryService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/ExposedAnnounceQueryService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/ExposedAnnounceQueryService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/ExposedAnnounceQueryService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/NoteQueryServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/NoteQueryServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/NoteQueryServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/NoteQueryServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/UserAPControllerImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/hostmeta/HostMetaController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/hostmeta/HostMetaController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/hostmeta/HostMetaController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/hostmeta/HostMetaController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/nodeinfo/NodeinfoController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/nodeinfo/NodeinfoController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/nodeinfo/NodeinfoController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/nodeinfo/NodeinfoController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/webfinger/WebFingerController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/webfinger/WebFingerController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/webfinger/WebFingerController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/webfinger/WebFingerController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/query/AnnounceQueryService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/query/AnnounceQueryService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/query/AnnounceQueryService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/query/AnnounceQueryService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/query/NoteQueryService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/query/NoteQueryService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/query/NoteQueryService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/query/NoteQueryService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/announce/ApAnnounceProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/announce/ApAnnounceProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/announce/ApAnnounceProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/announce/ApAnnounceProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APSendBlockService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APSendBlockService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APSendBlockService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APSendBlockService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/BlockActivityPubProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/BlockActivityPubProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/BlockActivityPubProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/BlockActivityPubProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/CreateActivityProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/CreateActivityProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/CreateActivityProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/CreateActivityProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeleteProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeleteProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeleteProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeleteProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeliverDeleteJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeliverDeleteJobProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeliverDeleteJobProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeliverDeleteJobProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APSendDeleteService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APSendDeleteService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APSendDeleteService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APSendDeleteService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApRemoveReactionJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApRemoveReactionJobProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApRemoveReactionJobProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApRemoveReactionJobProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/APDeliverRejectJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/APDeliverRejectJobProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/APDeliverRejectJobProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/APDeliverRejectJobProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApRejectProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApRejectProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApRejectProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApRejectProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APDeliverUndoJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APDeliverUndoJobProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APDeliverUndoJobProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APDeliverUndoJobProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APService.kt similarity index 61% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APService.kt index 67812116..257e57b1 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APService.kt @@ -38,157 +38,6 @@ interface APService { ) } -enum class ActivityType { - Accept, - Add, - Announce, - Arrive, - Block, - Create, - Delete, - Dislike, - Flag, - Follow, - Ignore, - Invite, - Join, - Leave, - Like, - Listen, - Move, - Offer, - Question, - Reject, - Read, - Remove, - TentativeReject, - TentativeAccept, - Travel, - Undo, - Update, - View, - Other -} - -enum class ActivityVocabulary { - Object, - Link, - Activity, - IntransitiveActivity, - Collection, - OrderedCollection, - CollectionPage, - OrderedCollectionPage, - Accept, - Add, - Announce, - Arrive, - Block, - Create, - Delete, - Dislike, - Flag, - Follow, - Ignore, - Invite, - Join, - Leave, - Like, - Listen, - Move, - Offer, - Question, - Reject, - Read, - Remove, - TentativeReject, - TentativeAccept, - Travel, - Undo, - Update, - View, - Application, - Group, - Organization, - Person, - Service, - Article, - Audio, - Document, - Event, - Image, - Note, - Page, - Place, - Profile, - Relationship, - Tombstone, - Video, - Mention, -} - -enum class ExtendedActivityVocabulary { - Object, - Link, - Activity, - IntransitiveActivity, - Collection, - OrderedCollection, - CollectionPage, - OrderedCollectionPage, - Accept, - Add, - Announce, - Arrive, - Block, - Create, - Delete, - Dislike, - Flag, - Follow, - Ignore, - Invite, - Join, - Leave, - Like, - Listen, - Move, - Offer, - Question, - Reject, - Read, - Remove, - TentativeReject, - TentativeAccept, - Travel, - Undo, - Update, - View, - Application, - Group, - Organization, - Person, - Service, - Article, - Audio, - Document, - Event, - Image, - Note, - Page, - Place, - Profile, - Relationship, - Tombstone, - Video, - Mention, - Emoji -} - -enum class ExtendedVocabulary { - Emoji -} - @Service class APServiceImpl( @Qualifier("activitypub") private val objectMapper: ObjectMapper, @@ -221,14 +70,14 @@ class APServiceImpl( if (type.isArray) { try { return type.firstNotNullOf { jsonNode: JsonNode -> - ActivityType.values().firstOrNull { it.name.equals(jsonNode.asText(), true) } + ActivityType.entries.firstOrNull { it.name.equals(jsonNode.asText(), true) } } } catch (e: NoSuchElementException) { throw IllegalArgumentException("No valid TYPE", e) } } try { - return ActivityType.values().first { it.name.equals(type.asText(), true) } + return ActivityType.entries.first { it.name.equals(type.asText(), true) } } catch (e: NoSuchElementException) { throw IllegalArgumentException("No valid TYPE", e) } diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/AbstractActivityPubProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/AbstractActivityPubProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/AbstractActivityPubProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/AbstractActivityPubProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessContext.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessContext.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessContext.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessContext.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityPubProcessor.kt diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityType.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityType.kt new file mode 100644 index 00000000..acd7e3ae --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityType.kt @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.activitypub.service.common + +enum class ActivityType { + Accept, + Add, + Announce, + Arrive, + Block, + Create, + Delete, + Dislike, + Flag, + Follow, + Ignore, + Invite, + Join, + Leave, + Like, + Listen, + Move, + Offer, + Question, + Reject, + Read, + Remove, + TentativeReject, + TentativeAccept, + Travel, + Undo, + Update, + View, + Other +} \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityVocabulary.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityVocabulary.kt new file mode 100644 index 00000000..569b5f66 --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityVocabulary.kt @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.activitypub.service.common + +enum class ActivityVocabulary { + Object, + Link, + Activity, + IntransitiveActivity, + Collection, + OrderedCollection, + CollectionPage, + OrderedCollectionPage, + Accept, + Add, + Announce, + Arrive, + Block, + Create, + Delete, + Dislike, + Flag, + Follow, + Ignore, + Invite, + Join, + Leave, + Like, + Listen, + Move, + Offer, + Question, + Reject, + Read, + Remove, + TentativeReject, + TentativeAccept, + Travel, + Undo, + Update, + View, + Application, + Group, + Organization, + Person, + Service, + Article, + Audio, + Document, + Event, + Image, + Note, + Page, + Place, + Profile, + Relationship, + Tombstone, + Video, + Mention, +} \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedActivityVocabulary.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedActivityVocabulary.kt new file mode 100644 index 00000000..322cb2a3 --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedActivityVocabulary.kt @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.activitypub.service.common + +enum class ExtendedActivityVocabulary { + Object, + Link, + Activity, + IntransitiveActivity, + Collection, + OrderedCollection, + CollectionPage, + OrderedCollectionPage, + Accept, + Add, + Announce, + Arrive, + Block, + Create, + Delete, + Dislike, + Flag, + Follow, + Ignore, + Invite, + Join, + Leave, + Like, + Listen, + Move, + Offer, + Question, + Reject, + Read, + Remove, + TentativeReject, + TentativeAccept, + Travel, + Undo, + Update, + View, + Application, + Group, + Organization, + Person, + Service, + Article, + Audio, + Document, + Event, + Image, + Note, + Page, + Place, + Profile, + Relationship, + Tombstone, + Video, + Mention, + Emoji +} \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedVocabulary.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedVocabulary.kt new file mode 100644 index 00000000..9fe0516a --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedVocabulary.kt @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.activitypub.service.common + +enum class ExtendedVocabulary { + Emoji +} \ No newline at end of file diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/emoji/EmojiService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/emoji/EmojiService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/emoji/EmojiService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/emoji/EmojiService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/emoji/EmojiServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/emoji/EmojiServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/emoji/EmojiServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/emoji/EmojiServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/NoteApApiServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/user/APUserService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/user/APUserService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/user/APUserService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/user/APUserService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/webfinger/WebFingerApiService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/webfinger/WebFingerApiService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/activitypub/service/webfinger/WebFingerApiService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/webfinger/WebFingerApiService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/ActivityPubConfig.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/ActivityPubConfig.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/config/ActivityPubConfig.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/ActivityPubConfig.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/AwsConfig.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/AwsConfig.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/config/AwsConfig.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/AwsConfig.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/HtmlSanitizeConfig.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/HtmlSanitizeConfig.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/config/HtmlSanitizeConfig.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/HtmlSanitizeConfig.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/HttpClientConfig.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/HttpSignatureConfig.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/HttpSignatureConfig.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/config/HttpSignatureConfig.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/HttpSignatureConfig.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/MdcXrequestIdFilter.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/MdcXrequestIdFilter.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/config/MdcXrequestIdFilter.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/MdcXrequestIdFilter.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/MediaConfig.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/MediaConfig.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/config/MediaConfig.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/MediaConfig.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/MvcConfigurer.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/MvcConfigurer.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/config/MvcConfigurer.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/MvcConfigurer.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/SecurityConfig.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/SecurityConfig.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/config/SecurityConfig.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/SecurityConfig.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/SpringConfig.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/SpringConfig.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/config/SpringConfig.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/SpringConfig.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/external/Transaction.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/external/Transaction.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/external/Transaction.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/external/Transaction.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtension.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtension.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtension.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtension.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedTransaction.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedTransaction.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedTransaction.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedTransaction.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/Page.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/Page.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/Page.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/Page.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PaginationList.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PaginationList.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PaginationList.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PaginationList.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/QueryMapper.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/QueryMapper.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/QueryMapper.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/QueryMapper.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ResultRowMapper.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ResultRowMapper.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ResultRowMapper.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ResultRowMapper.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/springframework/RoleHierarchyAuthorizationManagerFactory.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/springframework/RoleHierarchyAuthorizationManagerFactory.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/infrastructure/springframework/RoleHierarchyAuthorizationManagerFactory.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/infrastructure/springframework/RoleHierarchyAuthorizationManagerFactory.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/service/id/IdGenerateService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/id/IdGenerateService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/service/id/IdGenerateService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/id/IdGenerateService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/service/id/SnowflakeIdGenerateService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/id/SnowflakeIdGenerateService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/service/id/SnowflakeIdGenerateService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/id/SnowflakeIdGenerateService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/service/init/MetaService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/init/MetaService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/service/init/MetaService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/init/MetaService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/FailedToGetResourcesException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/FailedToGetResourcesException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/FailedToGetResourcesException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/FailedToGetResourcesException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/HideoutException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/HideoutException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/HideoutException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/HideoutException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/HttpSignatureVerifyException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/HttpSignatureVerifyException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/HttpSignatureVerifyException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/HttpSignatureVerifyException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/NotInitException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/NotInitException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/NotInitException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/NotInitException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/SQLExceptionTranslator.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/SQLExceptionTranslator.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/SQLExceptionTranslator.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/SQLExceptionTranslator.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/SpringDataAccessExceptionSQLExceptionTranslator.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/SpringDataAccessExceptionSQLExceptionTranslator.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/SpringDataAccessExceptionSQLExceptionTranslator.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/SpringDataAccessExceptionSQLExceptionTranslator.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/UserNotFoundException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/UserNotFoundException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/UserNotFoundException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/UserNotFoundException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaConvertException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaConvertException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaConvertException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaConvertException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaFileSizeException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaFileSizeException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaFileSizeException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaFileSizeException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaFileSizeIsZeroException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaFileSizeIsZeroException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaFileSizeIsZeroException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaFileSizeIsZeroException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaProcessException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaProcessException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaProcessException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaProcessException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaSaveException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaSaveException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaSaveException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/MediaSaveException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/RemoteMediaFileSizeException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/RemoteMediaFileSizeException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/RemoteMediaFileSizeException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/RemoteMediaFileSizeException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/UnsupportedMediaException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/UnsupportedMediaException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/UnsupportedMediaException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/media/UnsupportedMediaException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/DuplicateException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/DuplicateException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/DuplicateException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/DuplicateException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/NotFoundException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/NotFoundException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/NotFoundException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/NotFoundException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/PostNotFoundException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/PostNotFoundException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/PostNotFoundException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/PostNotFoundException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/ResourceAccessException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/ResourceAccessException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/ResourceAccessException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/ResourceAccessException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/UserNotFoundException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/UserNotFoundException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/UserNotFoundException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/UserNotFoundException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/local/LocalUserNotFoundException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/local/LocalUserNotFoundException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/local/LocalUserNotFoundException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/exception/resource/local/LocalUserNotFoundException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Acct.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Acct.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Acct.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Acct.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Actor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Actor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Actor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/Actor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/deletedActor/DeletedActor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/deletedActor/DeletedActor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/deletedActor/DeletedActor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/deletedActor/DeletedActor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/deletedActor/DeletedActorRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/deletedActor/DeletedActorRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/deletedActor/DeletedActorRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/deletedActor/DeletedActorRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmoji.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmoji.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmoji.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmoji.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmojiRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmojiRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmojiRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmojiRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/Filter.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/Filter.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/Filter.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/Filter.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterAction.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterAction.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterAction.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterAction.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterMode.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterMode.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterMode.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterMode.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterType.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterType.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterType.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterType.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filterkeyword/FilterKeyword.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filterkeyword/FilterKeyword.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/filterkeyword/FilterKeyword.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filterkeyword/FilterKeyword.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filterkeyword/FilterKeywordRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filterkeyword/FilterKeywordRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/filterkeyword/FilterKeywordRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/filterkeyword/FilterKeywordRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Instance.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Instance.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Instance.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Instance.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/InstanceRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/InstanceRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/InstanceRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/InstanceRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo2_0.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo2_0.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo2_0.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/instance/Nodeinfo2_0.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/media/Media.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/media/Media.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/media/Media.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/media/Media.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/media/MediaRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/media/MediaRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/media/MediaRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/media/MediaRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/Jwt.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/Jwt.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/Jwt.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/Jwt.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/Meta.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/Meta.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/Meta.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/Meta.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/MetaRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/MetaRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/MetaRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/meta/MetaRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/ExposedNotificationRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/ExposedNotificationRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/ExposedNotificationRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/ExposedNotificationRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/Notification.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/Notification.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/Notification.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/Notification.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/NotificationRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/NotificationRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/NotificationRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/notification/NotificationRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Post.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Post.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Post.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Post.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/PostRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/PostRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/PostRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/PostRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Visibility.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Visibility.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Visibility.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/post/Visibility.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/reaction/Reaction.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/reaction/Reaction.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/reaction/Reaction.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/reaction/Reaction.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/reaction/ReactionRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/reaction/ReactionRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/reaction/ReactionRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/reaction/ReactionRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/Relationship.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/Relationship.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/Relationship.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/Relationship.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepositoryImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepositoryImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepositoryImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepositoryImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timeline/Timeline.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timeline/Timeline.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/timeline/Timeline.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timeline/Timeline.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timeline/TimelineRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timeline/TimelineRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/timeline/TimelineRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/timeline/TimelineRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetail.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetail.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetail.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetail.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetailRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetailRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetailRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/domain/model/userdetails/UserDetailRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptJob.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptJob.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptJob.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteJob.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteJob.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteJob.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoJob.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoJob.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoJob.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/external/job/HideoutJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/HideoutJob.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/external/job/HideoutJob.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/HideoutJob.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostQueryMapper.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostQueryMapper.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostQueryMapper.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostQueryMapper.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostResultRowMapper.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostResultRowMapper.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostResultRowMapper.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/PostResultRowMapper.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/UserQueryMapper.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/UserQueryMapper.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/UserQueryMapper.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/UserQueryMapper.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/UserResultRowMapper.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/UserResultRowMapper.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/UserResultRowMapper.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposed/UserResultRowMapper.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/FollowerQueryServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/FollowerQueryServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/FollowerQueryServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/FollowerQueryServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/AbstractRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/AbstractRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/AbstractRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/AbstractRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ActorRepositoryImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ActorRepositoryImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ActorRepositoryImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ActorRepositoryImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/CustomEmojiRepositoryImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/CustomEmojiRepositoryImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/CustomEmojiRepositoryImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/CustomEmojiRepositoryImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/DeletedActorRepositoryImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/DeletedActorRepositoryImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/DeletedActorRepositoryImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/DeletedActorRepositoryImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterKeywordRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterKeywordRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterKeywordRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterKeywordRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/InstanceRepositoryImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/MediaRepositoryImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/MediaRepositoryImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/MediaRepositoryImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/MediaRepositoryImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/MetaRepositoryImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/MetaRepositoryImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/MetaRepositoryImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/MetaRepositoryImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/PostRepositoryImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/PostRepositoryImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/PostRepositoryImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/PostRepositoryImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ReactionRepositoryImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ReactionRepositoryImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ReactionRepositoryImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ReactionRepositoryImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/UserDetailRepositoryImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/UserDetailRepositoryImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/UserDetailRepositoryImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/UserDetailRepositoryImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/httpsignature/HttpRequestMixIn.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/httpsignature/HttpRequestMixIn.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/httpsignature/HttpRequestMixIn.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/httpsignature/HttpRequestMixIn.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedJobRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedJobRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedJobRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedJobRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedKJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedKJob.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedKJob.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedKJob.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedLockRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedLockRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedLockRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedLockRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueParentService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueParentService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueParentService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueParentService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueWorkerService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueWorkerService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueWorkerService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueWorkerService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KJobMongoJobQueueWorkerService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KJobMongoJobQueueWorkerService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KJobMongoJobQueueWorkerService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KJobMongoJobQueueWorkerService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KjobMongoJobQueueParentService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KjobMongoJobQueueParentService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KjobMongoJobQueueParentService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KjobMongoJobQueueParentService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/mongorepository/MongoTimelineRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/mongorepository/MongoTimelineRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/mongorepository/MongoTimelineRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/mongorepository/MongoTimelineRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/mongorepository/MongoTimelineRepositoryWrapper.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/mongorepository/MongoTimelineRepositoryWrapper.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/mongorepository/MongoTimelineRepositoryWrapper.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/mongorepository/MongoTimelineRepositoryWrapper.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureFilter.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureFilter.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureFilter.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureFilter.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureHeaderChecker.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureHeaderChecker.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureHeaderChecker.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureHeaderChecker.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUser.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUser.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUser.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUser.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUserDetailsService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUserDetailsService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUserDetailsService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureUserDetailsService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureVerifierComposite.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureVerifierComposite.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureVerifierComposite.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureVerifierComposite.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationConsentService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationConsentService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationConsentService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationConsentService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/ExposedOAuth2AuthorizationService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/RegisteredClientRepositoryImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/RegisteredClientRepositoryImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/RegisteredClientRepositoryImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/RegisteredClientRepositoryImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/SecureTokenGenerator.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/SecureTokenGenerator.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/SecureTokenGenerator.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/SecureTokenGenerator.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/SecureTokenGeneratorImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/SecureTokenGeneratorImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/SecureTokenGeneratorImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/SecureTokenGeneratorImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/LoginUserContextHolder.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/LoginUserContextHolder.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/LoginUserContextHolder.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/LoginUserContextHolder.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/OAuth2JwtLoginUserContextHolder.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/OAuth2JwtLoginUserContextHolder.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/OAuth2JwtLoginUserContextHolder.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/security/OAuth2JwtLoginUserContextHolder.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/auth/AuthController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/auth/AuthController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/auth/AuthController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/auth/AuthController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/media/LocalFileController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/media/LocalFileController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/media/LocalFileController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/media/LocalFileController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/query/FollowerQueryService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/query/FollowerQueryService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/query/FollowerQueryService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/query/FollowerQueryService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/query/model/ExposedFilterQueryService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/query/model/ExposedFilterQueryService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/query/model/ExposedFilterQueryService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/query/model/ExposedFilterQueryService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/query/model/FilterQueryModel.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/query/model/FilterQueryModel.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/query/model/FilterQueryModel.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/query/model/FilterQueryModel.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/query/model/FilterQueryService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/query/model/FilterQueryService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/query/model/FilterQueryService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/query/model/FilterQueryService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/filter/FilterKeyword.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/filter/FilterKeyword.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/filter/FilterKeyword.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/filter/FilterKeyword.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/filter/FilterResult.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/filter/FilterResult.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/filter/FilterResult.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/filter/FilterResult.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/filter/MuteServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/follow/SendFollowDto.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/follow/SendFollowDto.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/follow/SendFollowDto.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/follow/SendFollowDto.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceCreateDto.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceCreateDto.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceCreateDto.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceCreateDto.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/instance/InstanceService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/job/JobProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueParentService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueParentService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueParentService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueParentService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueWorkerService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueWorkerService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueWorkerService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueWorkerService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/ApatcheTikaFileTypeDeterminationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/ApatcheTikaFileTypeDeterminationService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/ApatcheTikaFileTypeDeterminationService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/ApatcheTikaFileTypeDeterminationService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/FileType.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/FileType.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/FileType.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/FileType.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/FileTypeDeterminationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/FileTypeDeterminationService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/FileTypeDeterminationService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/FileTypeDeterminationService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStore.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStore.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStore.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStore.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaBlurhashService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaBlurhashService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaBlurhashService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaBlurhashService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaBlurhashServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaBlurhashServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaBlurhashServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaBlurhashServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaDataStore.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaDataStore.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaDataStore.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaDataStore.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaFileRenameService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaFileRenameService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaFileRenameService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaFileRenameService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaSave.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaSave.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaSave.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaSave.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaSaveRequest.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaSaveRequest.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaSaveRequest.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaSaveRequest.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/MimeType.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MimeType.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/MimeType.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/MimeType.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedFile.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedFile.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedFile.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedFile.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedMedia.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedMedia.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedMedia.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedMedia.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedMediaPath.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedMediaPath.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedMediaPath.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/ProcessedMediaPath.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMedia.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMedia.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMedia.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMedia.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMediaDownloadService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMediaDownloadService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMediaDownloadService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMediaDownloadService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMediaDownloadServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMediaDownloadServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMediaDownloadServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/RemoteMediaDownloadServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/S3MediaDataStore.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/S3MediaDataStore.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/S3MediaDataStore.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/S3MediaDataStore.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/SavedMedia.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/SavedMedia.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/SavedMedia.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/SavedMedia.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/ThumbnailGenerateService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/ThumbnailGenerateService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/ThumbnailGenerateService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/ThumbnailGenerateService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/ThumbnailGenerateServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/ThumbnailGenerateServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/ThumbnailGenerateServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/ThumbnailGenerateServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/UUIDMediaFileRenameService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/UUIDMediaFileRenameService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/UUIDMediaFileRenameService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/UUIDMediaFileRenameService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverter.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverter.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverter.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverter.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverterRoot.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverterRoot.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverterRoot.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverterRoot.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverterRootImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverterRootImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverterRootImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaConverterRootImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaProcessService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaProcessService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaProcessService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaProcessService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaProcessServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaProcessServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaProcessServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/MediaProcessServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessorConfiguration.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessorConfiguration.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessorConfiguration.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/image/ImageMediaProcessorConfiguration.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/movie/MovieMediaProcessService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/movie/MovieMediaProcessService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/movie/MovieMediaProcessService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/media/converter/movie/MovieMediaProcessService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationRequest.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationRequest.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationRequest.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationRequest.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationStore.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationStore.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationStore.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/notification/NotificationStore.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/post/DefaultPostContentFormatter.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/post/DefaultPostContentFormatter.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/post/DefaultPostContentFormatter.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/post/DefaultPostContentFormatter.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/post/FormattedPostContent.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/post/FormattedPostContent.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/post/FormattedPostContent.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/post/FormattedPostContent.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostContentFormatter.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostContentFormatter.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/post/PostContentFormatter.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostContentFormatter.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostCreateDto.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostCreateDto.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/post/PostCreateDto.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostCreateDto.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/post/PostService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/resource/CacheManager.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/resource/CacheManager.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/resource/CacheManager.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/resource/CacheManager.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/resource/InMemoryCacheManager.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/resource/InMemoryCacheManager.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/resource/InMemoryCacheManager.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/resource/InMemoryCacheManager.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/resource/KtorResolveResponse.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/resource/KtorResolveResponse.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/resource/KtorResolveResponse.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/resource/KtorResolveResponse.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/resource/KtorResourceResolveService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/resource/KtorResourceResolveService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/resource/KtorResourceResolveService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/resource/KtorResourceResolveService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/resource/ResolveResponse.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/resource/ResolveResponse.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/resource/ResolveResponse.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/resource/ResolveResponse.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/resource/ResourceResolveService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/resource/ResourceResolveService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/resource/ResourceResolveService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/resource/ResourceResolveService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/ExposedGenerateTimelineService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/ExposedGenerateTimelineService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/timeline/ExposedGenerateTimelineService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/ExposedGenerateTimelineService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/GenerateTimelineService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/GenerateTimelineService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/timeline/GenerateTimelineService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/GenerateTimelineService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/MongoGenerateTimelineService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/MongoGenerateTimelineService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/timeline/MongoGenerateTimelineService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/MongoGenerateTimelineService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/TimelineService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/TimelineService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/timeline/TimelineService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/timeline/TimelineService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/user/RemoteUserCreateDto.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/RemoteUserCreateDto.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/user/RemoteUserCreateDto.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/RemoteUserCreateDto.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/user/UpdateUserDto.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/UpdateUserDto.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/user/UpdateUserDto.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/UpdateUserDto.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserAuthService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserAuthService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/user/UserAuthService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserAuthService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserAuthServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserAuthServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/user/UserAuthServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserAuthServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserCreateDto.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserCreateDto.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/user/UserCreateDto.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserCreateDto.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/user/UserService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/core/service/user/UserServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/user/UserServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/generate/JsonOrFormBind.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/generate/JsonOrFormBind.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/generate/JsonOrFormBind.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/generate/JsonOrFormBind.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/generate/JsonOrFormModelMethodProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/generate/JsonOrFormModelMethodProcessor.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/generate/JsonOrFormModelMethodProcessor.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/generate/JsonOrFormModelMethodProcessor.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/config/MastodonApiSecurityConfig.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/config/MastodonApiSecurityConfig.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/config/MastodonApiSecurityConfig.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/config/MastodonApiSecurityConfig.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/AccountNotFoundException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/AccountNotFoundException.kt similarity index 96% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/AccountNotFoundException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/AccountNotFoundException.kt index 8f6d5b79..d8bbd1cb 100644 --- a/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/AccountNotFoundException.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/AccountNotFoundException.kt @@ -38,7 +38,7 @@ class AccountNotFoundException : ClientException { ) : super(message, cause, enableSuppression, writableStackTrace, response) fun getTypedResponse(): MastodonApiErrorResponse = - response as MastodonApiErrorResponse + response companion object { fun ofId(id: Long): AccountNotFoundException = AccountNotFoundException( diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/ClientException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/ClientException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/ClientException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/ClientException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/MastodonApiException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/MastodonApiException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/MastodonApiException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/MastodonApiException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/ServerException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/ServerException.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/ServerException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/ServerException.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/StatusNotFoundException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/StatusNotFoundException.kt similarity index 96% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/StatusNotFoundException.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/StatusNotFoundException.kt index 934403ec..667375b5 100644 --- a/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/StatusNotFoundException.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/StatusNotFoundException.kt @@ -40,7 +40,7 @@ class StatusNotFoundException : ClientException { ) : super(message, cause, enableSuppression, writableStackTrace, response) fun getTypedResponse(): MastodonApiErrorResponse = - response as MastodonApiErrorResponse + response companion object { fun ofId(id: Long): StatusNotFoundException = StatusNotFoundException( diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonApiErrorResponse.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonApiErrorResponse.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonApiErrorResponse.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonApiErrorResponse.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonNotification.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonNotification.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonNotification.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonNotification.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonNotificationRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonNotificationRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonNotificationRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/MastodonNotificationRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/NotificationType.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/NotificationType.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/NotificationType.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/model/NotificationType.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/AccountQueryServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/AccountQueryServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/AccountQueryServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/AccountQueryServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/StatusQueryServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/StatusQueryServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/StatusQueryServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/StatusQueryServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedrepository/ExposedMastodonNotificationRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedrepository/ExposedMastodonNotificationRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedrepository/ExposedMastodonNotificationRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedrepository/ExposedMastodonNotificationRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepository.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepository.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepository.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepositoryWrapper.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepositoryWrapper.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepositoryWrapper.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/mongorepository/MongoMastodonNotificationRepositoryWrapper.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/springweb/MastodonApiControllerAdvice.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/springweb/MastodonApiControllerAdvice.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/springweb/MastodonApiControllerAdvice.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/infrastructure/springweb/MastodonApiControllerAdvice.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/apps/MastodonAppsApiController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/apps/MastodonAppsApiController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/apps/MastodonAppsApiController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/apps/MastodonAppsApiController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/filter/MastodonFilterApiController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/filter/MastodonFilterApiController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/filter/MastodonFilterApiController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/filter/MastodonFilterApiController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/instance/MastodonInstanceApiController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/instance/MastodonInstanceApiController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/instance/MastodonInstanceApiController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/instance/MastodonInstanceApiController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MastodonMediaApiController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MastodonMediaApiController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MastodonMediaApiController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MastodonMediaApiController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MediaRequest.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MediaRequest.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MediaRequest.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MediaRequest.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/notification/MastodonNotificationApiController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/notification/MastodonNotificationApiController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/notification/MastodonNotificationApiController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/notification/MastodonNotificationApiController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiContoller.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiContoller.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiContoller.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiContoller.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusQuery.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusQuery.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusQuery.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusQuery.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt similarity index 98% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt index 1005680d..8e49e8b7 100644 --- a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt @@ -16,9 +16,9 @@ package dev.usbharu.hideout.mastodon.interfaces.api.status +import Status import com.fasterxml.jackson.annotation.JsonProperty import dev.usbharu.hideout.core.domain.model.post.Visibility -import dev.usbharu.hideout.domain.mastodon.model.generated.Status import dev.usbharu.hideout.domain.mastodon.model.generated.StatusesRequestPoll import dev.usbharu.hideout.mastodon.interfaces.api.status.StatusesRequest.Visibility.* diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiController.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiController.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiController.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiController.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/query/AccountQueryService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/query/AccountQueryService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/query/AccountQueryService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/query/AccountQueryService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/query/StatusQueryService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/query/StatusQueryService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/query/StatusQueryService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/query/StatusQueryService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/app/AppApiService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/app/AppApiService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/service/app/AppApiService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/app/AppApiService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/filter/MastodonFilterApiService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/filter/MastodonFilterApiService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/service/filter/MastodonFilterApiService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/filter/MastodonFilterApiService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/instance/InstanceApiService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/instance/InstanceApiService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/service/instance/InstanceApiService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/instance/InstanceApiService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/media/MediaApiService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/media/MediaApiService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/service/media/MediaApiService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/media/MediaApiService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/media/MediaApiServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/media/MediaApiServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/service/media/MediaApiServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/media/MediaApiServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/MastodonNotificationStore.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/MastodonNotificationStore.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/MastodonNotificationStore.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/MastodonNotificationStore.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiServiceImpl.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiServiceImpl.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/notification/NotificationApiServiceImpl.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/status/StatusesApiService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/status/StatusesApiService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/service/status/StatusesApiService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/status/StatusesApiService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/timeline/TimelineApiService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/timeline/TimelineApiService.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/mastodon/service/timeline/TimelineApiService.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/service/timeline/TimelineApiService.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/util/AcctUtil.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/util/AcctUtil.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/util/AcctUtil.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/util/AcctUtil.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/util/Base64Util.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/util/Base64Util.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/util/Base64Util.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/util/Base64Util.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/util/CollectionUtil.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/util/CollectionUtil.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/util/CollectionUtil.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/util/CollectionUtil.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/util/EmojiUtil.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/util/EmojiUtil.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/util/EmojiUtil.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/util/EmojiUtil.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/util/HttpUtil.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/util/InstantParseUtil.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/util/InstantParseUtil.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/util/InstantParseUtil.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/util/InstantParseUtil.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/util/LruCache.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/util/LruCache.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/util/LruCache.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/util/LruCache.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/util/RsaUtil.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/util/RsaUtil.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/util/RsaUtil.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/util/RsaUtil.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/util/ServerUtil.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/util/ServerUtil.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/util/ServerUtil.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/util/ServerUtil.kt diff --git a/src/main/kotlin/dev/usbharu/hideout/util/TempFileUtil.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/util/TempFileUtil.kt similarity index 100% rename from src/main/kotlin/dev/usbharu/hideout/util/TempFileUtil.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/util/TempFileUtil.kt diff --git a/src/main/resources/META-INF/native-image/jni-config.json b/hideout-core/src/main/resources/META-INF/native-image/jni-config.json similarity index 100% rename from src/main/resources/META-INF/native-image/jni-config.json rename to hideout-core/src/main/resources/META-INF/native-image/jni-config.json diff --git a/src/main/resources/META-INF/native-image/predefined-classes-config.json b/hideout-core/src/main/resources/META-INF/native-image/predefined-classes-config.json similarity index 100% rename from src/main/resources/META-INF/native-image/predefined-classes-config.json rename to hideout-core/src/main/resources/META-INF/native-image/predefined-classes-config.json diff --git a/src/main/resources/META-INF/native-image/proxy-config.json b/hideout-core/src/main/resources/META-INF/native-image/proxy-config.json similarity index 100% rename from src/main/resources/META-INF/native-image/proxy-config.json rename to hideout-core/src/main/resources/META-INF/native-image/proxy-config.json diff --git a/src/main/resources/META-INF/native-image/reflect-config.json b/hideout-core/src/main/resources/META-INF/native-image/reflect-config.json similarity index 100% rename from src/main/resources/META-INF/native-image/reflect-config.json rename to hideout-core/src/main/resources/META-INF/native-image/reflect-config.json diff --git a/src/main/resources/META-INF/native-image/resource-config.json b/hideout-core/src/main/resources/META-INF/native-image/resource-config.json similarity index 100% rename from src/main/resources/META-INF/native-image/resource-config.json rename to hideout-core/src/main/resources/META-INF/native-image/resource-config.json diff --git a/src/main/resources/META-INF/native-image/serialization-config.json b/hideout-core/src/main/resources/META-INF/native-image/serialization-config.json similarity index 100% rename from src/main/resources/META-INF/native-image/serialization-config.json rename to hideout-core/src/main/resources/META-INF/native-image/serialization-config.json diff --git a/src/main/resources/application.yml b/hideout-core/src/main/resources/application.yml similarity index 100% rename from src/main/resources/application.yml rename to hideout-core/src/main/resources/application.yml diff --git a/src/main/resources/db/migration/V1707799249__Filter.sql b/hideout-core/src/main/resources/db/migration/V1707799249__Filter.sql similarity index 100% rename from src/main/resources/db/migration/V1707799249__Filter.sql rename to hideout-core/src/main/resources/db/migration/V1707799249__Filter.sql diff --git a/src/main/resources/db/migration/V1__Init_DB.sql b/hideout-core/src/main/resources/db/migration/V1__Init_DB.sql similarity index 100% rename from src/main/resources/db/migration/V1__Init_DB.sql rename to hideout-core/src/main/resources/db/migration/V1__Init_DB.sql diff --git a/src/main/resources/icon.png b/hideout-core/src/main/resources/icon.png similarity index 100% rename from src/main/resources/icon.png rename to hideout-core/src/main/resources/icon.png diff --git a/src/main/resources/logback.xml b/hideout-core/src/main/resources/logback.xml similarity index 100% rename from src/main/resources/logback.xml rename to hideout-core/src/main/resources/logback.xml diff --git a/src/main/resources/openapi/mastodon.yaml b/hideout-core/src/main/resources/openapi/mastodon.yaml similarity index 100% rename from src/main/resources/openapi/mastodon.yaml rename to hideout-core/src/main/resources/openapi/mastodon.yaml diff --git a/src/main/resources/templates/sign_up.html b/hideout-core/src/main/resources/templates/sign_up.html similarity index 100% rename from src/main/resources/templates/sign_up.html rename to hideout-core/src/main/resources/templates/sign_up.html diff --git a/src/test/kotlin/dev/usbharu/hideout/EqualsAndToStringTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/EqualsAndToStringTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/EqualsAndToStringTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/EqualsAndToStringTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/AnnounceTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/AnnounceTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/AnnounceTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/AnnounceTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/BlockTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/BlockTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/BlockTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/BlockTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/CreateTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/CreateTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/CreateTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/CreateTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/DeleteSerializeTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/DeleteSerializeTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/DeleteSerializeTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/DeleteSerializeTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/DocumentTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/DocumentTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/DocumentTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/DocumentTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLdSerializeTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLdSerializeTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLdSerializeTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/JsonLdSerializeTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/KeySerializeTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/KeySerializeTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/KeySerializeTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/KeySerializeTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/NoteSerializeTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/NoteSerializeTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/NoteSerializeTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/NoteSerializeTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/PersonSerializeTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/PersonSerializeTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/PersonSerializeTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/PersonSerializeTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/RejectTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/RejectTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/RejectTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/RejectTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/UndoTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/UndoTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/UndoTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/UndoTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectSerializeTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectSerializeTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectSerializeTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/objects/ObjectSerializeTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/ActorAPControllerImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/ActorAPControllerImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/ActorAPControllerImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/actor/ActorAPControllerImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/inbox/InboxControllerImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/note/NoteApControllerImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/outbox/OutboxControllerImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/webfinger/WebFingerControllerTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/webfinger/WebFingerControllerTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/webfinger/WebFingerControllerTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/interfaces/api/webfinger/WebFingerControllerTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessorTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessorTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessorTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessorTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessorTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessorTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessorTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessorTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessorTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessorTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessorTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessorTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/APNoteServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/ap/ContextDeserializerTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/ap/ContextDeserializerTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/ap/ContextDeserializerTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/ap/ContextDeserializerTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/ap/ContextSerializerTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/ap/ContextSerializerTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/ap/ContextSerializerTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/ap/ContextSerializerTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtensionKtTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtensionKtTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtensionKtTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/ExposedPaginationExtensionKtTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PageTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PageTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PageTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PageTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PaginationListKtTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PaginationListKtTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PaginationListKtTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/application/infrastructure/exposed/PaginationListKtTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateServiceTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateServiceTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateServiceTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateServiceTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureHeaderCheckerTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureHeaderCheckerTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureHeaderCheckerTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/httpsignature/HttpSignatureHeaderCheckerTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/filter/MuteProcessServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/filter/MuteServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/filter/MuteServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/filter/MuteServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/filter/MuteServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/media/ApatcheTikaFileTypeDeterminationServiceTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/media/ApatcheTikaFileTypeDeterminationServiceTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/media/ApatcheTikaFileTypeDeterminationServiceTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/media/ApatcheTikaFileTypeDeterminationServiceTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStoreTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStoreTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStoreTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/media/LocalFileSystemMediaDataStoreTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/media/MediaServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/notification/FollowNotificationRequestTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/FollowNotificationRequestTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/notification/FollowNotificationRequestTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/FollowNotificationRequestTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/notification/FollowRequestNotificationRequestTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/FollowRequestNotificationRequestTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/notification/FollowRequestNotificationRequestTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/FollowRequestNotificationRequestTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/notification/MentionNotificationRequestTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/MentionNotificationRequestTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/notification/MentionNotificationRequestTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/MentionNotificationRequestTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/notification/NotificationServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/NotificationServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/notification/NotificationServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/NotificationServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/notification/PostNotificationRequestTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/PostNotificationRequestTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/notification/PostNotificationRequestTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/PostNotificationRequestTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/notification/ReactionNotificationRequestTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/ReactionNotificationRequestTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/notification/ReactionNotificationRequestTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/ReactionNotificationRequestTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/RelationshipNotificationManagementServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/notification/RepostNotificationRequestTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/RepostNotificationRequestTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/notification/RepostNotificationRequestTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/notification/RepostNotificationRequestTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/post/DefaultPostContentFormatterTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/post/DefaultPostContentFormatterTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/post/DefaultPostContentFormatterTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/post/DefaultPostContentFormatterTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/post/PostServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/reaction/ReactionServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImplTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImplTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/resource/KtorResourceResolveServiceTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/resource/KtorResourceResolveServiceTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/resource/KtorResourceResolveServiceTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/resource/KtorResourceResolveServiceTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/timeline/TimelineServiceTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/timeline/TimelineServiceTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/timeline/TimelineServiceTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/timeline/TimelineServiceTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/core/service/user/ActorServiceTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/user/ActorServiceTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/core/service/user/ActorServiceTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/core/service/user/ActorServiceTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/mastodon/domain/model/NotificationTypeTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/domain/model/NotificationTypeTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/mastodon/domain/model/NotificationTypeTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/domain/model/NotificationTypeTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiControllerTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiControllerTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiControllerTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiControllerTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/apps/MastodonAppsApiControllerTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/apps/MastodonAppsApiControllerTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/apps/MastodonAppsApiControllerTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/apps/MastodonAppsApiControllerTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/instance/MastodonInstanceApiControllerTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/instance/MastodonInstanceApiControllerTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/instance/MastodonInstanceApiControllerTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/instance/MastodonInstanceApiControllerTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MastodonMediaApiControllerTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MastodonMediaApiControllerTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MastodonMediaApiControllerTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/media/MastodonMediaApiControllerTest.kt diff --git a/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiControllerTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiControllerTest.kt similarity index 99% rename from src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiControllerTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiControllerTest.kt index ff2047ea..0e6a8d72 100644 --- a/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiControllerTest.kt +++ b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiControllerTest.kt @@ -16,6 +16,7 @@ package dev.usbharu.hideout.mastodon.interfaces.api.status +import Status import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import dev.usbharu.hideout.core.infrastructure.springframework.security.OAuth2JwtLoginUserContextHolder import dev.usbharu.hideout.domain.mastodon.model.generated.Account diff --git a/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiControllerTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiControllerTest.kt similarity index 99% rename from src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiControllerTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiControllerTest.kt index 8302d0cf..9c411699 100644 --- a/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiControllerTest.kt +++ b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiControllerTest.kt @@ -16,6 +16,7 @@ package dev.usbharu.hideout.mastodon.interfaces.api.timeline +import Status import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.application.infrastructure.exposed.PaginationList diff --git a/src/test/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiServiceImplTest.kt similarity index 99% rename from src/test/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiServiceImplTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiServiceImplTest.kt index de1477c6..76936027 100644 --- a/src/test/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiServiceImplTest.kt +++ b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiServiceImplTest.kt @@ -16,6 +16,7 @@ package dev.usbharu.hideout.mastodon.service.account +import Status import dev.usbharu.hideout.application.external.Transaction import dev.usbharu.hideout.application.infrastructure.exposed.Page import dev.usbharu.hideout.application.infrastructure.exposed.PaginationList diff --git a/src/test/kotlin/dev/usbharu/hideout/util/EmojiUtilTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/util/EmojiUtilTest.kt similarity index 100% rename from src/test/kotlin/dev/usbharu/hideout/util/EmojiUtilTest.kt rename to hideout-core/src/test/kotlin/dev/usbharu/hideout/util/EmojiUtilTest.kt diff --git a/src/test/kotlin/utils/JsonObjectMapper.kt b/hideout-core/src/test/kotlin/utils/JsonObjectMapper.kt similarity index 100% rename from src/test/kotlin/utils/JsonObjectMapper.kt rename to hideout-core/src/test/kotlin/utils/JsonObjectMapper.kt diff --git a/src/test/kotlin/utils/PostBuilder.kt b/hideout-core/src/test/kotlin/utils/PostBuilder.kt similarity index 100% rename from src/test/kotlin/utils/PostBuilder.kt rename to hideout-core/src/test/kotlin/utils/PostBuilder.kt diff --git a/src/test/kotlin/utils/TestApplicationConfig.kt b/hideout-core/src/test/kotlin/utils/TestApplicationConfig.kt similarity index 100% rename from src/test/kotlin/utils/TestApplicationConfig.kt rename to hideout-core/src/test/kotlin/utils/TestApplicationConfig.kt diff --git a/src/test/kotlin/utils/TestTransaction.kt b/hideout-core/src/test/kotlin/utils/TestTransaction.kt similarity index 100% rename from src/test/kotlin/utils/TestTransaction.kt rename to hideout-core/src/test/kotlin/utils/TestTransaction.kt diff --git a/src/test/kotlin/utils/UserBuilder.kt b/hideout-core/src/test/kotlin/utils/UserBuilder.kt similarity index 100% rename from src/test/kotlin/utils/UserBuilder.kt rename to hideout-core/src/test/kotlin/utils/UserBuilder.kt diff --git a/src/test/resources/400x400.png b/hideout-core/src/test/resources/400x400.png similarity index 100% rename from src/test/resources/400x400.png rename to hideout-core/src/test/resources/400x400.png diff --git a/src/test/resources/empty.conf b/hideout-core/src/test/resources/empty.conf similarity index 100% rename from src/test/resources/empty.conf rename to hideout-core/src/test/resources/empty.conf diff --git a/src/test/resources/junit-platform.properties b/hideout-core/src/test/resources/junit-platform.properties similarity index 100% rename from src/test/resources/junit-platform.properties rename to hideout-core/src/test/resources/junit-platform.properties diff --git a/templates/api.mustache b/hideout-core/templates/api.mustache similarity index 100% rename from templates/api.mustache rename to hideout-core/templates/api.mustache diff --git a/templates/apiController.mustache b/hideout-core/templates/apiController.mustache similarity index 100% rename from templates/apiController.mustache rename to hideout-core/templates/apiController.mustache diff --git a/templates/apiDelegate.mustache b/hideout-core/templates/apiDelegate.mustache similarity index 100% rename from templates/apiDelegate.mustache rename to hideout-core/templates/apiDelegate.mustache diff --git a/templates/apiInterface.mustache b/hideout-core/templates/apiInterface.mustache similarity index 100% rename from templates/apiInterface.mustache rename to hideout-core/templates/apiInterface.mustache diff --git a/templates/apiUtil.mustache b/hideout-core/templates/apiUtil.mustache similarity index 100% rename from templates/apiUtil.mustache rename to hideout-core/templates/apiUtil.mustache diff --git a/templates/api_test.mustache b/hideout-core/templates/api_test.mustache similarity index 100% rename from templates/api_test.mustache rename to hideout-core/templates/api_test.mustache diff --git a/templates/beanValidation.mustache b/hideout-core/templates/beanValidation.mustache similarity index 100% rename from templates/beanValidation.mustache rename to hideout-core/templates/beanValidation.mustache diff --git a/templates/beanValidationModel.mustache b/hideout-core/templates/beanValidationModel.mustache similarity index 100% rename from templates/beanValidationModel.mustache rename to hideout-core/templates/beanValidationModel.mustache diff --git a/templates/beanValidationPath.mustache b/hideout-core/templates/beanValidationPath.mustache similarity index 100% rename from templates/beanValidationPath.mustache rename to hideout-core/templates/beanValidationPath.mustache diff --git a/templates/beanValidationPathParams.mustache b/hideout-core/templates/beanValidationPathParams.mustache similarity index 100% rename from templates/beanValidationPathParams.mustache rename to hideout-core/templates/beanValidationPathParams.mustache diff --git a/templates/beanValidationQueryParams.mustache b/hideout-core/templates/beanValidationQueryParams.mustache similarity index 100% rename from templates/beanValidationQueryParams.mustache rename to hideout-core/templates/beanValidationQueryParams.mustache diff --git a/templates/bodyParams.mustache b/hideout-core/templates/bodyParams.mustache similarity index 100% rename from templates/bodyParams.mustache rename to hideout-core/templates/bodyParams.mustache diff --git a/templates/dataClass.mustache b/hideout-core/templates/dataClass.mustache similarity index 100% rename from templates/dataClass.mustache rename to hideout-core/templates/dataClass.mustache diff --git a/templates/dataClassOptVar.mustache b/hideout-core/templates/dataClassOptVar.mustache similarity index 100% rename from templates/dataClassOptVar.mustache rename to hideout-core/templates/dataClassOptVar.mustache diff --git a/templates/dataClassReqVar.mustache b/hideout-core/templates/dataClassReqVar.mustache similarity index 100% rename from templates/dataClassReqVar.mustache rename to hideout-core/templates/dataClassReqVar.mustache diff --git a/templates/enumClass.mustache b/hideout-core/templates/enumClass.mustache similarity index 100% rename from templates/enumClass.mustache rename to hideout-core/templates/enumClass.mustache diff --git a/templates/exceptions.mustache b/hideout-core/templates/exceptions.mustache similarity index 100% rename from templates/exceptions.mustache rename to hideout-core/templates/exceptions.mustache diff --git a/templates/formParams.mustache b/hideout-core/templates/formParams.mustache similarity index 100% rename from templates/formParams.mustache rename to hideout-core/templates/formParams.mustache diff --git a/templates/generatedAnnotation.mustache b/hideout-core/templates/generatedAnnotation.mustache similarity index 100% rename from templates/generatedAnnotation.mustache rename to hideout-core/templates/generatedAnnotation.mustache diff --git a/templates/headerParams.mustache b/hideout-core/templates/headerParams.mustache similarity index 100% rename from templates/headerParams.mustache rename to hideout-core/templates/headerParams.mustache diff --git a/templates/homeController.mustache b/hideout-core/templates/homeController.mustache similarity index 100% rename from templates/homeController.mustache rename to hideout-core/templates/homeController.mustache diff --git a/templates/interfaceOptVar.mustache b/hideout-core/templates/interfaceOptVar.mustache similarity index 100% rename from templates/interfaceOptVar.mustache rename to hideout-core/templates/interfaceOptVar.mustache diff --git a/templates/interfaceReqVar.mustache b/hideout-core/templates/interfaceReqVar.mustache similarity index 100% rename from templates/interfaceReqVar.mustache rename to hideout-core/templates/interfaceReqVar.mustache diff --git a/templates/libraries/spring-boot/README.mustache b/hideout-core/templates/libraries/spring-boot/README.mustache similarity index 100% rename from templates/libraries/spring-boot/README.mustache rename to hideout-core/templates/libraries/spring-boot/README.mustache diff --git a/templates/libraries/spring-boot/application.mustache b/hideout-core/templates/libraries/spring-boot/application.mustache similarity index 100% rename from templates/libraries/spring-boot/application.mustache rename to hideout-core/templates/libraries/spring-boot/application.mustache diff --git a/templates/libraries/spring-boot/buildGradle-sb3-Kts.mustache b/hideout-core/templates/libraries/spring-boot/buildGradle-sb3-Kts.mustache similarity index 100% rename from templates/libraries/spring-boot/buildGradle-sb3-Kts.mustache rename to hideout-core/templates/libraries/spring-boot/buildGradle-sb3-Kts.mustache diff --git a/templates/libraries/spring-boot/buildGradleKts.mustache b/hideout-core/templates/libraries/spring-boot/buildGradleKts.mustache similarity index 100% rename from templates/libraries/spring-boot/buildGradleKts.mustache rename to hideout-core/templates/libraries/spring-boot/buildGradleKts.mustache diff --git a/templates/libraries/spring-boot/defaultBasePath.mustache b/hideout-core/templates/libraries/spring-boot/defaultBasePath.mustache similarity index 100% rename from templates/libraries/spring-boot/defaultBasePath.mustache rename to hideout-core/templates/libraries/spring-boot/defaultBasePath.mustache diff --git a/templates/libraries/spring-boot/pom-sb3.mustache b/hideout-core/templates/libraries/spring-boot/pom-sb3.mustache similarity index 100% rename from templates/libraries/spring-boot/pom-sb3.mustache rename to hideout-core/templates/libraries/spring-boot/pom-sb3.mustache diff --git a/templates/libraries/spring-boot/pom.mustache b/hideout-core/templates/libraries/spring-boot/pom.mustache similarity index 100% rename from templates/libraries/spring-boot/pom.mustache rename to hideout-core/templates/libraries/spring-boot/pom.mustache diff --git a/templates/libraries/spring-boot/settingsGradle.mustache b/hideout-core/templates/libraries/spring-boot/settingsGradle.mustache similarity index 100% rename from templates/libraries/spring-boot/settingsGradle.mustache rename to hideout-core/templates/libraries/spring-boot/settingsGradle.mustache diff --git a/templates/libraries/spring-boot/springBootApplication.mustache b/hideout-core/templates/libraries/spring-boot/springBootApplication.mustache similarity index 100% rename from templates/libraries/spring-boot/springBootApplication.mustache rename to hideout-core/templates/libraries/spring-boot/springBootApplication.mustache diff --git a/templates/libraries/spring-boot/swagger-ui.mustache b/hideout-core/templates/libraries/spring-boot/swagger-ui.mustache similarity index 100% rename from templates/libraries/spring-boot/swagger-ui.mustache rename to hideout-core/templates/libraries/spring-boot/swagger-ui.mustache diff --git a/templates/libraries/spring-cloud/README.mustache b/hideout-core/templates/libraries/spring-cloud/README.mustache similarity index 100% rename from templates/libraries/spring-cloud/README.mustache rename to hideout-core/templates/libraries/spring-cloud/README.mustache diff --git a/templates/libraries/spring-cloud/apiClient.mustache b/hideout-core/templates/libraries/spring-cloud/apiClient.mustache similarity index 100% rename from templates/libraries/spring-cloud/apiClient.mustache rename to hideout-core/templates/libraries/spring-cloud/apiClient.mustache diff --git a/templates/libraries/spring-cloud/apiKeyRequestInterceptor.mustache b/hideout-core/templates/libraries/spring-cloud/apiKeyRequestInterceptor.mustache similarity index 100% rename from templates/libraries/spring-cloud/apiKeyRequestInterceptor.mustache rename to hideout-core/templates/libraries/spring-cloud/apiKeyRequestInterceptor.mustache diff --git a/templates/libraries/spring-cloud/buildGradle-sb3-Kts.mustache b/hideout-core/templates/libraries/spring-cloud/buildGradle-sb3-Kts.mustache similarity index 100% rename from templates/libraries/spring-cloud/buildGradle-sb3-Kts.mustache rename to hideout-core/templates/libraries/spring-cloud/buildGradle-sb3-Kts.mustache diff --git a/templates/libraries/spring-cloud/buildGradleKts.mustache b/hideout-core/templates/libraries/spring-cloud/buildGradleKts.mustache similarity index 100% rename from templates/libraries/spring-cloud/buildGradleKts.mustache rename to hideout-core/templates/libraries/spring-cloud/buildGradleKts.mustache diff --git a/templates/libraries/spring-cloud/clientConfiguration.mustache b/hideout-core/templates/libraries/spring-cloud/clientConfiguration.mustache similarity index 100% rename from templates/libraries/spring-cloud/clientConfiguration.mustache rename to hideout-core/templates/libraries/spring-cloud/clientConfiguration.mustache diff --git a/templates/libraries/spring-cloud/pom-sb3.mustache b/hideout-core/templates/libraries/spring-cloud/pom-sb3.mustache similarity index 100% rename from templates/libraries/spring-cloud/pom-sb3.mustache rename to hideout-core/templates/libraries/spring-cloud/pom-sb3.mustache diff --git a/templates/libraries/spring-cloud/pom.mustache b/hideout-core/templates/libraries/spring-cloud/pom.mustache similarity index 100% rename from templates/libraries/spring-cloud/pom.mustache rename to hideout-core/templates/libraries/spring-cloud/pom.mustache diff --git a/templates/libraries/spring-cloud/settingsGradle.mustache b/hideout-core/templates/libraries/spring-cloud/settingsGradle.mustache similarity index 100% rename from templates/libraries/spring-cloud/settingsGradle.mustache rename to hideout-core/templates/libraries/spring-cloud/settingsGradle.mustache diff --git a/templates/methodBody.mustache b/hideout-core/templates/methodBody.mustache similarity index 100% rename from templates/methodBody.mustache rename to hideout-core/templates/methodBody.mustache diff --git a/templates/model.mustache b/hideout-core/templates/model.mustache similarity index 100% rename from templates/model.mustache rename to hideout-core/templates/model.mustache diff --git a/templates/modelMutable.mustache b/hideout-core/templates/modelMutable.mustache similarity index 100% rename from templates/modelMutable.mustache rename to hideout-core/templates/modelMutable.mustache diff --git a/templates/openapi.mustache b/hideout-core/templates/openapi.mustache similarity index 100% rename from templates/openapi.mustache rename to hideout-core/templates/openapi.mustache diff --git a/templates/optionalDataType.mustache b/hideout-core/templates/optionalDataType.mustache similarity index 100% rename from templates/optionalDataType.mustache rename to hideout-core/templates/optionalDataType.mustache diff --git a/templates/pathParams.mustache b/hideout-core/templates/pathParams.mustache similarity index 100% rename from templates/pathParams.mustache rename to hideout-core/templates/pathParams.mustache diff --git a/templates/queryParams.mustache b/hideout-core/templates/queryParams.mustache similarity index 100% rename from templates/queryParams.mustache rename to hideout-core/templates/queryParams.mustache diff --git a/templates/returnTypes.mustache b/hideout-core/templates/returnTypes.mustache similarity index 100% rename from templates/returnTypes.mustache rename to hideout-core/templates/returnTypes.mustache diff --git a/templates/returnValue.mustache b/hideout-core/templates/returnValue.mustache similarity index 100% rename from templates/returnValue.mustache rename to hideout-core/templates/returnValue.mustache diff --git a/templates/service.mustache b/hideout-core/templates/service.mustache similarity index 100% rename from templates/service.mustache rename to hideout-core/templates/service.mustache diff --git a/templates/serviceImpl.mustache b/hideout-core/templates/serviceImpl.mustache similarity index 100% rename from templates/serviceImpl.mustache rename to hideout-core/templates/serviceImpl.mustache diff --git a/templates/springdocDocumentationConfig.mustache b/hideout-core/templates/springdocDocumentationConfig.mustache similarity index 100% rename from templates/springdocDocumentationConfig.mustache rename to hideout-core/templates/springdocDocumentationConfig.mustache diff --git a/templates/springfoxDocumentationConfig.mustache b/hideout-core/templates/springfoxDocumentationConfig.mustache similarity index 100% rename from templates/springfoxDocumentationConfig.mustache rename to hideout-core/templates/springfoxDocumentationConfig.mustache diff --git a/templates/typeInfoAnnotation.mustache b/hideout-core/templates/typeInfoAnnotation.mustache similarity index 100% rename from templates/typeInfoAnnotation.mustache rename to hideout-core/templates/typeInfoAnnotation.mustache diff --git a/hideout-worker/build.gradle.kts b/hideout-worker/build.gradle.kts new file mode 100644 index 00000000..45be2756 --- /dev/null +++ b/hideout-worker/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + kotlin("jvm") version "1.9.23" +} + +group = "dev.usbharu" +version = "1.0-SNAPSHOT" + +repositories { + mavenCentral() +} + +dependencies { + testImplementation(kotlin("test")) +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(21) +} \ No newline at end of file diff --git a/hideout-worker/gradle/wrapper/gradle-wrapper.jar b/hideout-worker/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/hideout-worker/gradlew.bat b/hideout-worker/gradlew.bat new file mode 100644 index 00000000..107acd32 --- /dev/null +++ b/hideout-worker/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/hideout-worker/settings.gradle.kts similarity index 64% rename from settings.gradle.kts rename to hideout-worker/settings.gradle.kts index 376e901e..29deec55 100644 --- a/settings.gradle.kts +++ b/hideout-worker/settings.gradle.kts @@ -1,6 +1,5 @@ plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" } -rootProject.name = "hideout" +rootProject.name = "hideout-worker" -includeBuild("owl") diff --git a/hideout-worker/src/main/kotlin/Main.kt b/hideout-worker/src/main/kotlin/Main.kt new file mode 100644 index 00000000..27f6ee1a --- /dev/null +++ b/hideout-worker/src/main/kotlin/Main.kt @@ -0,0 +1,5 @@ +package dev.usbharu + +fun main() { + println("Hello World!") +} \ No newline at end of file diff --git a/hideout.iml b/hideout.iml new file mode 100644 index 00000000..9a5cfcef --- /dev/null +++ b/hideout.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From 6e1ca49023d21b2675322334281c18d5ec078819 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 4 May 2024 02:16:01 +0900 Subject: [PATCH 06/24] =?UTF-8?q?chore:=20=E3=83=97=E3=83=AD=E3=82=B8?= =?UTF-8?q?=E3=82=A7=E3=82=AF=E3=83=88=E6=A7=8B=E6=88=90=E3=82=92=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hideout-core/build.gradle.kts | 2 +- owl/{broker => owl-broker}/build.gradle.kts | 2 +- .../owl-broker-mongodb}/build.gradle.kts | 4 ++-- .../usbharu/owl/broker/mongodb/MongoModule.kt | 3 +-- .../owl/broker/mongodb/MongoModuleContext.kt | 0 .../mongodb/MongodbConsumerRepository.kt | 0 .../mongodb/MongodbProducerRepository.kt | 0 .../mongodb/MongodbQueuedTaskRepository.kt | 0 .../MongodbTaskDefinitionRepository.kt | 0 .../broker/mongodb/MongodbTaskRepository.kt | 0 .../mongodb/MongodbTaskResultRepository.kt | 0 .../dev.usbharu.owl.broker.ModuleContext | 0 .../mongodb/MongodbConsumerRepositoryTest.kt | 0 .../kotlin/dev/usbharu/owl/broker/Main.kt | 0 .../dev/usbharu/owl/broker/ModuleContext.kt | 0 .../owl/broker/OwlBrokerApplication.kt | 0 .../repository/FailedSaveException.kt | 0 .../repository/RecordNotFoundException.kt | 0 .../service/IncompatibleTaskException.kt | 0 .../service/QueueCannotDequeueException.kt | 0 .../service/RetryPolicyNotFoundException.kt | 0 .../service/TaskNotRegisterException.kt | 0 .../broker/domain/model/consumer/Consumer.kt | 0 .../model/consumer/ConsumerRepository.kt | 0 .../broker/domain/model/producer/Producer.kt | 2 +- .../model/producer/ProducerRepository.kt | 0 .../domain/model/queuedtask/QueuedTask.kt | 0 .../model/queuedtask/QueuedTaskRepository.kt | 0 .../owl/broker/domain/model/task/Task.kt | 0 .../domain/model/task/TaskRepository.kt | 0 .../model/taskdefinition/TaskDefinition.kt | 0 .../TaskDefinitionRepository.kt | 0 .../domain/model/taskresult/TaskResult.kt | 0 .../model/taskresult/TaskResultRepository.kt | 0 .../owl/broker/external/GrpcExtension.kt | 0 .../interfaces/grpc/AssignmentTaskService.kt | 0 .../interfaces/grpc/DefinitionTaskService.kt | 0 .../broker/interfaces/grpc/ProducerService.kt | 0 .../interfaces/grpc/SubscribeTaskService.kt | 0 .../interfaces/grpc/TaskPublishService.kt | 2 +- .../interfaces/grpc/TaskResultService.kt | 0 .../grpc/TaskResultSubscribeService.kt | 0 .../broker/service/AssignQueuedTaskDecider.kt | 0 .../owl/broker/service/ConsumerService.kt | 1 - .../DefaultPropertySerializerFactory.kt | 0 .../owl/broker/service/ProducerService.kt | 0 .../owl/broker/service/QueueScanner.kt | 0 .../usbharu/owl/broker/service/QueueStore.kt | 0 .../owl/broker/service/QueuedTaskAssigner.kt | 0 .../owl/broker/service/RegisterTaskService.kt | 0 .../owl/broker/service/RetryPolicyFactory.kt | 0 .../broker/service/TaskManagementService.kt | 0 .../owl/broker/service/TaskPublishService.kt | 0 .../usbharu/owl/broker/service/TaskResults.kt | 0 .../usbharu/owl/broker/service/TaskScanner.kt | 0 .../src/main/proto/consumer.proto | 0 .../src/main/proto/definition_task.proto | 0 .../src/main/proto/producer.proto | 0 .../src/main/proto/property.proto | 0 .../src/main/proto/publish_task.proto | 0 .../src/main/proto/task.proto | 0 .../src/main/proto/task_result.proto | 0 .../src/main/proto/task_result_producer.proto | 0 .../src/main/proto/uuid.proto | 0 .../src/main/resources/log4j2.xml | 0 owl/{common => owl-common}/build.gradle.kts | 0 .../common/property/BooleanPropertyValue.kt | 0 .../CustomPropertySerializerFactory.kt | 0 .../common/property/DoublePropertyValue.kt | 0 .../common/property/IntegerPropertyValue.kt | 0 .../common/property/PropertySerializeUtils.kt | 0 .../owl/common/property/PropertySerializer.kt | 0 .../property/PropertySerializerFactory.kt | 0 .../owl/common/property/PropertyType.kt | 0 .../owl/common/property/PropertyValue.kt | 0 .../common/property/StringPropertyValue.kt | 0 .../common/retry/ExponentialRetryPolicy.kt | 0 .../usbharu/owl/common/retry/RetryPolicy.kt | 0 .../owl/common/task/PropertyDefinition.kt | 0 .../usbharu/owl/common/task/PublishedTask.kt | 0 .../dev/usbharu/owl/common/task/Task.kt | 3 +-- .../usbharu/owl/common/task/TaskDefinition.kt | 0 .../retry/ExponentialRetryPolicyTest.kt | 0 .../build.gradle.kts | 4 ++-- .../dev/usbharu/owl/consumer/Consumer.kt | 0 .../usbharu/owl/consumer/ConsumerConfig.kt | 0 .../kotlin/dev/usbharu/owl/consumer/Main.kt | 0 .../owl/consumer/StandaloneConsumer.kt | 0 .../owl/consumer/StandaloneConsumerConfig.kt | 0 .../StandaloneConsumerConfigLoader.kt | 0 .../dev/usbharu/owl/consumer/TaskRequest.kt | 0 .../dev/usbharu/owl/consumer/TaskResult.kt | 0 .../dev/usbharu/owl/consumer/TaskRunner.kt | 0 .../owl-producer-api}/build.gradle.kts | 2 +- .../usbharu/owl/producer/api/OwlProducer.kt | 0 .../owl/producer/api/OwlProducerBuilder.kt | 0 .../producer/api/OwlProducerBuilderConfig.kt | 0 .../owl/producer/api/OwlProducerConfig.kt | 3 +-- .../owl-producer-default}/build.gradle.kts | 6 +++--- .../defaultimpl/DefaultOwlProducer.kt | 0 .../defaultimpl/DefaultOwlProducerBuilder.kt | 0 .../defaultimpl/DefaultOwlProducerConfig.kt | 0 .../owl-producer-embedded}/build.gradle.kts | 4 ++-- .../embedded/EmbeddedGrpcOwlProducer.kt | 0 .../producer/embedded/EmbeddedOwlProducer.kt | 0 owl/settings.gradle.kts | 20 +++++++++---------- 106 files changed, 27 insertions(+), 31 deletions(-) rename owl/{broker => owl-broker}/build.gradle.kts (97%) rename owl/{broker/broker-mongodb => owl-broker/owl-broker-mongodb}/build.gradle.kts (89%) rename owl/{broker/broker-mongodb => owl-broker/owl-broker-mongodb}/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModule.kt (97%) rename owl/{broker/broker-mongodb => owl-broker/owl-broker-mongodb}/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt (100%) rename owl/{broker/broker-mongodb => owl-broker/owl-broker-mongodb}/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt (100%) rename owl/{broker/broker-mongodb => owl-broker/owl-broker-mongodb}/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt (100%) rename owl/{broker/broker-mongodb => owl-broker/owl-broker-mongodb}/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt (100%) rename owl/{broker/broker-mongodb => owl-broker/owl-broker-mongodb}/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt (100%) rename owl/{broker/broker-mongodb => owl-broker/owl-broker-mongodb}/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt (100%) rename owl/{broker/broker-mongodb => owl-broker/owl-broker-mongodb}/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskResultRepository.kt (100%) rename owl/{broker/broker-mongodb => owl-broker/owl-broker-mongodb}/src/main/resources/META-INF/services/dev.usbharu.owl.broker.ModuleContext (100%) rename owl/{broker/broker-mongodb => owl-broker/owl-broker-mongodb}/src/test/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepositoryTest.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/Main.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/ModuleContext.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/FailedSaveException.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/RecordNotFoundException.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/IncompatibleTaskException.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/QueueCannotDequeueException.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/RetryPolicyNotFoundException.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/TaskNotRegisterException.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/Consumer.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/ConsumerRepository.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/Producer.kt (97%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/ProducerRepository.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/Task.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinition.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinitionRepository.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResult.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResultRepository.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/external/GrpcExtension.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/DefinitionTaskService.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/ProducerService.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/SubscribeTaskService.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt (98%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/service/ConsumerService.kt (98%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/service/ProducerService.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/service/TaskResults.kt (100%) rename owl/{broker => owl-broker}/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt (100%) rename owl/{broker => owl-broker}/src/main/proto/consumer.proto (100%) rename owl/{broker => owl-broker}/src/main/proto/definition_task.proto (100%) rename owl/{broker => owl-broker}/src/main/proto/producer.proto (100%) rename owl/{broker => owl-broker}/src/main/proto/property.proto (100%) rename owl/{broker => owl-broker}/src/main/proto/publish_task.proto (100%) rename owl/{broker => owl-broker}/src/main/proto/task.proto (100%) rename owl/{broker => owl-broker}/src/main/proto/task_result.proto (100%) rename owl/{broker => owl-broker}/src/main/proto/task_result_producer.proto (100%) rename owl/{broker => owl-broker}/src/main/proto/uuid.proto (100%) rename owl/{broker => owl-broker}/src/main/resources/log4j2.xml (100%) rename owl/{common => owl-common}/build.gradle.kts (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/property/BooleanPropertyValue.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/property/DoublePropertyValue.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/property/StringPropertyValue.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/task/PublishedTask.kt (100%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt (97%) rename owl/{common => owl-common}/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt (100%) rename owl/{common => owl-common}/src/test/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicyTest.kt (100%) rename owl/{consumer => owl-consumer}/build.gradle.kts (88%) rename owl/{consumer => owl-consumer}/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt (100%) rename owl/{consumer => owl-consumer}/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt (100%) rename owl/{consumer => owl-consumer}/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt (100%) rename owl/{consumer => owl-consumer}/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt (100%) rename owl/{consumer => owl-consumer}/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfig.kt (100%) rename owl/{consumer => owl-consumer}/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt (100%) rename owl/{consumer => owl-consumer}/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt (100%) rename owl/{consumer => owl-consumer}/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt (100%) rename owl/{consumer => owl-consumer}/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt (100%) rename owl/{producer/api => owl-producer/owl-producer-api}/build.gradle.kts (85%) rename owl/{producer/api => owl-producer/owl-producer-api}/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt (100%) rename owl/{producer/api => owl-producer/owl-producer-api}/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt (100%) rename owl/{producer/api => owl-producer/owl-producer-api}/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt (100%) rename owl/{producer/api => owl-producer/owl-producer-api}/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt (95%) rename owl/{producer/default => owl-producer/owl-producer-default}/build.gradle.kts (85%) rename owl/{producer/default => owl-producer/owl-producer-default}/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt (100%) rename owl/{producer/default => owl-producer/owl-producer-default}/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt (100%) rename owl/{producer/default => owl-producer/owl-producer-default}/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt (100%) rename owl/{producer/embedded => owl-producer/owl-producer-embedded}/build.gradle.kts (76%) rename owl/{producer/embedded => owl-producer/owl-producer-embedded}/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt (100%) rename owl/{producer/embedded => owl-producer/owl-producer-embedded}/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt (100%) diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index adddf5bb..6ee22a5e 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -234,7 +234,7 @@ dependencies { implementation("org.flywaydb:flyway-core") implementation("dev.usbharu:emoji-kt:2.0.0") - implementation("dev.usbharu:default:0.0.1") + implementation("dev.usbharu:owl-producer-default:0.0.1") implementation("org.jsoup:jsoup:1.17.2") implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1") diff --git a/owl/broker/build.gradle.kts b/owl/owl-broker/build.gradle.kts similarity index 97% rename from owl/broker/build.gradle.kts rename to owl/owl-broker/build.gradle.kts index 1d3d402e..d8f63b93 100644 --- a/owl/broker/build.gradle.kts +++ b/owl/owl-broker/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { implementation("com.google.protobuf:protobuf-kotlin:3.25.3") implementation("io.grpc:grpc-netty:1.61.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") - implementation(project(":common")) + implementation(project(":owl-common")) implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0") implementation(platform("io.insert-koin:koin-bom:3.5.3")) implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1")) diff --git a/owl/broker/broker-mongodb/build.gradle.kts b/owl/owl-broker/owl-broker-mongodb/build.gradle.kts similarity index 89% rename from owl/broker/broker-mongodb/build.gradle.kts rename to owl/owl-broker/owl-broker-mongodb/build.gradle.kts index cd25913e..796c41ec 100644 --- a/owl/broker/broker-mongodb/build.gradle.kts +++ b/owl/owl-broker/owl-broker-mongodb/build.gradle.kts @@ -17,8 +17,8 @@ repositories { dependencies { implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.0.0") - implementation(project(":broker")) - implementation(project(":common")) + implementation(project(":owl-broker")) + implementation(project(":owl-common")) implementation(platform("io.insert-koin:koin-bom:3.5.3")) implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1")) implementation("io.insert-koin:koin-core") diff --git a/owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModule.kt b/owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModule.kt similarity index 97% rename from owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModule.kt rename to owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModule.kt index 33f40868..9b770dde 100644 --- a/owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModule.kt +++ b/owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModule.kt @@ -21,6 +21,5 @@ import org.koin.core.annotation.Module @Module @ComponentScan("dev.usbharu.owl.broker.mongodb") -class MongoModule { -} +class MongoModule diff --git a/owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt b/owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt similarity index 100% rename from owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt rename to owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt diff --git a/owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt b/owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt similarity index 100% rename from owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt rename to owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt diff --git a/owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt b/owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt similarity index 100% rename from owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt rename to owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt diff --git a/owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt b/owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt similarity index 100% rename from owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt rename to owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt diff --git a/owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt b/owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt similarity index 100% rename from owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt rename to owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt diff --git a/owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt b/owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt similarity index 100% rename from owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt rename to owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt diff --git a/owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskResultRepository.kt b/owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskResultRepository.kt similarity index 100% rename from owl/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskResultRepository.kt rename to owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskResultRepository.kt diff --git a/owl/broker/broker-mongodb/src/main/resources/META-INF/services/dev.usbharu.owl.broker.ModuleContext b/owl/owl-broker/owl-broker-mongodb/src/main/resources/META-INF/services/dev.usbharu.owl.broker.ModuleContext similarity index 100% rename from owl/broker/broker-mongodb/src/main/resources/META-INF/services/dev.usbharu.owl.broker.ModuleContext rename to owl/owl-broker/owl-broker-mongodb/src/main/resources/META-INF/services/dev.usbharu.owl.broker.ModuleContext diff --git a/owl/broker/broker-mongodb/src/test/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepositoryTest.kt b/owl/owl-broker/owl-broker-mongodb/src/test/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepositoryTest.kt similarity index 100% rename from owl/broker/broker-mongodb/src/test/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepositoryTest.kt rename to owl/owl-broker/owl-broker-mongodb/src/test/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepositoryTest.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/ModuleContext.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/ModuleContext.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/ModuleContext.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/ModuleContext.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/FailedSaveException.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/FailedSaveException.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/FailedSaveException.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/FailedSaveException.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/RecordNotFoundException.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/RecordNotFoundException.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/RecordNotFoundException.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/repository/RecordNotFoundException.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/IncompatibleTaskException.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/IncompatibleTaskException.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/IncompatibleTaskException.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/IncompatibleTaskException.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/QueueCannotDequeueException.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/QueueCannotDequeueException.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/QueueCannotDequeueException.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/QueueCannotDequeueException.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/RetryPolicyNotFoundException.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/RetryPolicyNotFoundException.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/RetryPolicyNotFoundException.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/RetryPolicyNotFoundException.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/TaskNotRegisterException.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/TaskNotRegisterException.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/TaskNotRegisterException.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/TaskNotRegisterException.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/Consumer.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/Consumer.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/Consumer.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/Consumer.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/ConsumerRepository.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/ConsumerRepository.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/ConsumerRepository.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/consumer/ConsumerRepository.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/Producer.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/Producer.kt similarity index 97% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/Producer.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/Producer.kt index 0a5e4916..eebbafd4 100644 --- a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/Producer.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/Producer.kt @@ -17,7 +17,7 @@ package dev.usbharu.owl.broker.domain.model.producer import java.time.Instant -import java.util.UUID +import java.util.* data class Producer( val id:UUID, diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/ProducerRepository.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/ProducerRepository.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/ProducerRepository.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/producer/ProducerRepository.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTask.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/queuedtask/QueuedTaskRepository.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/Task.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/Task.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/Task.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/Task.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/task/TaskRepository.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinition.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinition.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinition.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinition.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinitionRepository.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinitionRepository.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinitionRepository.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskdefinition/TaskDefinitionRepository.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResult.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResult.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResult.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResult.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResultRepository.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResultRepository.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResultRepository.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/model/taskresult/TaskResultRepository.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/external/GrpcExtension.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/external/GrpcExtension.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/external/GrpcExtension.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/external/GrpcExtension.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/DefinitionTaskService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/DefinitionTaskService.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/DefinitionTaskService.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/DefinitionTaskService.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/ProducerService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/ProducerService.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/ProducerService.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/ProducerService.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/SubscribeTaskService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/SubscribeTaskService.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/SubscribeTaskService.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/SubscribeTaskService.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt similarity index 98% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt index e305cb41..13d2f8ed 100644 --- a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt @@ -62,7 +62,7 @@ class TaskPublishService( } } - override suspend fun publishTasks(request: PublishTaskOuterClass.PublishTasks): PublishTaskOuterClass.PublishedTasks { + override suspend fun publishTasks(request: PublishTaskOuterClass.PublishTasks): PublishedTasks { val tasks = request.propertiesArrayList.map { PublishTask( diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/ConsumerService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/ConsumerService.kt similarity index 98% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/ConsumerService.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/ConsumerService.kt index 62bb6df3..81156832 100644 --- a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/ConsumerService.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/ConsumerService.kt @@ -18,7 +18,6 @@ package dev.usbharu.owl.broker.service import dev.usbharu.owl.broker.domain.model.consumer.Consumer import dev.usbharu.owl.broker.domain.model.consumer.ConsumerRepository -import org.koin.core.annotation.Single import org.koin.core.annotation.Singleton import org.slf4j.LoggerFactory import java.util.* diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/ProducerService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/ProducerService.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/ProducerService.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/ProducerService.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskResults.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskResults.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskResults.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskResults.kt diff --git a/owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt similarity index 100% rename from owl/broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt rename to owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt diff --git a/owl/broker/src/main/proto/consumer.proto b/owl/owl-broker/src/main/proto/consumer.proto similarity index 100% rename from owl/broker/src/main/proto/consumer.proto rename to owl/owl-broker/src/main/proto/consumer.proto diff --git a/owl/broker/src/main/proto/definition_task.proto b/owl/owl-broker/src/main/proto/definition_task.proto similarity index 100% rename from owl/broker/src/main/proto/definition_task.proto rename to owl/owl-broker/src/main/proto/definition_task.proto diff --git a/owl/broker/src/main/proto/producer.proto b/owl/owl-broker/src/main/proto/producer.proto similarity index 100% rename from owl/broker/src/main/proto/producer.proto rename to owl/owl-broker/src/main/proto/producer.proto diff --git a/owl/broker/src/main/proto/property.proto b/owl/owl-broker/src/main/proto/property.proto similarity index 100% rename from owl/broker/src/main/proto/property.proto rename to owl/owl-broker/src/main/proto/property.proto diff --git a/owl/broker/src/main/proto/publish_task.proto b/owl/owl-broker/src/main/proto/publish_task.proto similarity index 100% rename from owl/broker/src/main/proto/publish_task.proto rename to owl/owl-broker/src/main/proto/publish_task.proto diff --git a/owl/broker/src/main/proto/task.proto b/owl/owl-broker/src/main/proto/task.proto similarity index 100% rename from owl/broker/src/main/proto/task.proto rename to owl/owl-broker/src/main/proto/task.proto diff --git a/owl/broker/src/main/proto/task_result.proto b/owl/owl-broker/src/main/proto/task_result.proto similarity index 100% rename from owl/broker/src/main/proto/task_result.proto rename to owl/owl-broker/src/main/proto/task_result.proto diff --git a/owl/broker/src/main/proto/task_result_producer.proto b/owl/owl-broker/src/main/proto/task_result_producer.proto similarity index 100% rename from owl/broker/src/main/proto/task_result_producer.proto rename to owl/owl-broker/src/main/proto/task_result_producer.proto diff --git a/owl/broker/src/main/proto/uuid.proto b/owl/owl-broker/src/main/proto/uuid.proto similarity index 100% rename from owl/broker/src/main/proto/uuid.proto rename to owl/owl-broker/src/main/proto/uuid.proto diff --git a/owl/broker/src/main/resources/log4j2.xml b/owl/owl-broker/src/main/resources/log4j2.xml similarity index 100% rename from owl/broker/src/main/resources/log4j2.xml rename to owl/owl-broker/src/main/resources/log4j2.xml diff --git a/owl/common/build.gradle.kts b/owl/owl-common/build.gradle.kts similarity index 100% rename from owl/common/build.gradle.kts rename to owl/owl-common/build.gradle.kts diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/property/BooleanPropertyValue.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/BooleanPropertyValue.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/property/BooleanPropertyValue.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/BooleanPropertyValue.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/property/DoublePropertyValue.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/DoublePropertyValue.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/property/DoublePropertyValue.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/DoublePropertyValue.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/IntegerPropertyValue.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializer.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializerFactory.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyType.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/property/StringPropertyValue.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/StringPropertyValue.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/property/StringPropertyValue.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/StringPropertyValue.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicy.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicy.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/PropertyDefinition.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/task/PublishedTask.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/PublishedTask.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/task/PublishedTask.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/PublishedTask.kt diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt similarity index 97% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt index 42d8dc03..f29d5d2d 100644 --- a/owl/common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/Task.kt @@ -20,5 +20,4 @@ package dev.usbharu.owl.common.task * タスク * */ -open class Task { -} \ No newline at end of file +open class Task \ No newline at end of file diff --git a/owl/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt similarity index 100% rename from owl/common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt diff --git a/owl/common/src/test/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicyTest.kt b/owl/owl-common/src/test/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicyTest.kt similarity index 100% rename from owl/common/src/test/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicyTest.kt rename to owl/owl-common/src/test/kotlin/dev/usbharu/owl/common/retry/ExponentialRetryPolicyTest.kt diff --git a/owl/consumer/build.gradle.kts b/owl/owl-consumer/build.gradle.kts similarity index 88% rename from owl/consumer/build.gradle.kts rename to owl/owl-consumer/build.gradle.kts index 4137b56a..a2e2fe0e 100644 --- a/owl/consumer/build.gradle.kts +++ b/owl/owl-consumer/build.gradle.kts @@ -17,8 +17,8 @@ dependencies { implementation("com.google.protobuf:protobuf-kotlin:3.25.3") implementation("io.grpc:grpc-netty:1.61.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") - implementation(project(":common")) - protobuf(files(project(":broker").dependencyProject.projectDir.toString() + "/src/main/proto")) + implementation(project(":owl-common")) + protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto")) } tasks.test { diff --git a/owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt similarity index 100% rename from owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt rename to owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt diff --git a/owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt similarity index 100% rename from owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt rename to owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/ConsumerConfig.kt diff --git a/owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt similarity index 100% rename from owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt rename to owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Main.kt diff --git a/owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt similarity index 100% rename from owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt rename to owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt diff --git a/owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfig.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfig.kt similarity index 100% rename from owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfig.kt rename to owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfig.kt diff --git a/owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt similarity index 100% rename from owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt rename to owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumerConfigLoader.kt diff --git a/owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt similarity index 100% rename from owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt rename to owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRequest.kt diff --git a/owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt similarity index 100% rename from owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt rename to owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt diff --git a/owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt similarity index 100% rename from owl/consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt rename to owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunner.kt diff --git a/owl/producer/api/build.gradle.kts b/owl/owl-producer/owl-producer-api/build.gradle.kts similarity index 85% rename from owl/producer/api/build.gradle.kts rename to owl/owl-producer/owl-producer-api/build.gradle.kts index 7e049bf8..2a5f96bc 100644 --- a/owl/producer/api/build.gradle.kts +++ b/owl/owl-producer/owl-producer-api/build.gradle.kts @@ -10,7 +10,7 @@ repositories { } dependencies { - api(project(":common")) + api(project(":owl-common")) } tasks.test { diff --git a/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt b/owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt similarity index 100% rename from owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt rename to owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt diff --git a/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt b/owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt similarity index 100% rename from owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt rename to owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilder.kt diff --git a/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt b/owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt similarity index 100% rename from owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt rename to owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt diff --git a/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt b/owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt similarity index 95% rename from owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt rename to owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt index b9f51498..9334b0fd 100644 --- a/owl/producer/api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt +++ b/owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerConfig.kt @@ -20,5 +20,4 @@ package dev.usbharu.owl.producer.api * [OwlProducer]の構成 * */ -interface OwlProducerConfig { -} \ No newline at end of file +interface OwlProducerConfig \ No newline at end of file diff --git a/owl/producer/default/build.gradle.kts b/owl/owl-producer/owl-producer-default/build.gradle.kts similarity index 85% rename from owl/producer/default/build.gradle.kts rename to owl/owl-producer/owl-producer-default/build.gradle.kts index 877dd36e..5763484c 100644 --- a/owl/producer/default/build.gradle.kts +++ b/owl/owl-producer/owl-producer-default/build.gradle.kts @@ -12,14 +12,14 @@ repositories { dependencies { testImplementation("org.jetbrains.kotlin:kotlin-test") - api(project(":producer:api")) + api(project(":owl-producer:owl-producer-api")) implementation("io.grpc:grpc-kotlin-stub:1.4.1") implementation("io.grpc:grpc-protobuf:1.61.1") implementation("com.google.protobuf:protobuf-kotlin:3.25.3") implementation("io.grpc:grpc-netty:1.61.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") - implementation(project(":common")) - protobuf(files(project(":broker").dependencyProject.projectDir.toString() + "/src/main/proto")) + implementation(project(":owl-common")) + protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto")) } tasks.test { diff --git a/owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt b/owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt similarity index 100% rename from owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt rename to owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt diff --git a/owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt b/owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt similarity index 100% rename from owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt rename to owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerBuilder.kt diff --git a/owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt b/owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt similarity index 100% rename from owl/producer/default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt rename to owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt diff --git a/owl/producer/embedded/build.gradle.kts b/owl/owl-producer/owl-producer-embedded/build.gradle.kts similarity index 76% rename from owl/producer/embedded/build.gradle.kts rename to owl/owl-producer/owl-producer-embedded/build.gradle.kts index 9dbf4c0c..a5c7445f 100644 --- a/owl/producer/embedded/build.gradle.kts +++ b/owl/owl-producer/owl-producer-embedded/build.gradle.kts @@ -11,8 +11,8 @@ repositories { dependencies { testImplementation(kotlin("test")) - implementation(project(":producer:api")) - implementation(project(":broker")) + implementation(project(":owl-producer:owl-producer-api")) + implementation(project(":owl-broker")) implementation(platform("io.insert-koin:koin-bom:3.5.3")) implementation("io.insert-koin:koin-core") } diff --git a/owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt similarity index 100% rename from owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt rename to owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt diff --git a/owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt similarity index 100% rename from owl/producer/embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt rename to owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt diff --git a/owl/settings.gradle.kts b/owl/settings.gradle.kts index 450172d1..bd777009 100644 --- a/owl/settings.gradle.kts +++ b/owl/settings.gradle.kts @@ -2,13 +2,13 @@ plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" } rootProject.name = "owl" -include("common") -include("producer:api") -findProject(":producer:api")?.name = "api" -include("broker") -include("broker:broker-mongodb") -findProject(":broker:broker-mongodb")?.name = "broker-mongodb" -include("producer:default") -findProject(":producer:default")?.name = "default" -include("consumer") -include("producer:embedded") \ No newline at end of file +include("owl-common") +include("owl-producer:owl-producer-api") +findProject(":owl-producer:owl-producer-api")?.name = "owl-producer-api" +include("owl-broker") +include("owl-broker:owl-broker-mongodb") +findProject(":owl-broker:owl-broker-mongodb")?.name = "owl-broker-mongodb" +include("owl-producer:owl-producer-default") +findProject(":owl-producer:owl-producer-default")?.name = "owl-producer-default" +include("owl-consumer") +include("owl-producer:owl-producer-embedded") \ No newline at end of file From 374b5581f6c368a554ff2dbb92de8db36f62a8b4 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 4 May 2024 13:11:49 +0900 Subject: [PATCH 07/24] =?UTF-8?q?chore:=20=E3=83=97=E3=83=AD=E3=82=B8?= =?UTF-8?q?=E3=82=A7=E3=82=AF=E3=83=88=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hideout-core/build.gradle.kts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index 6ee22a5e..e9fa5de1 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -34,12 +34,22 @@ version = "0.0.1" sourceSets { create("intTest") { - compileClasspath += sourceSets.main.get().output - runtimeClasspath += sourceSets.main.get().output + test { + compileClasspath += sourceSets.main.get().output + runtimeClasspath += sourceSets.main.get().output + kotlin.srcDirs("src/intTest/kotlin") + java.srcDirs("src/intTest/java") + resources.srcDirs("src/intTest/resources") + } } create("e2eTest") { - compileClasspath += sourceSets.main.get().output - runtimeClasspath += sourceSets.main.get().output + test { + compileClasspath += sourceSets.main.get().output + runtimeClasspath += sourceSets.main.get().output + kotlin.srcDirs("src/e2eTest/kotlin") + java.srcDirs("src/e2eTest/java") + resources.srcDirs("src/e2eTest/resources") + } } } From c3255af665e363c20c028061d2ebf2e028255aa4 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 4 May 2024 17:31:48 +0900 Subject: [PATCH 08/24] =?UTF-8?q?chore:=20=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=AB=E3=82=BF=E3=83=AD=E3=82=B0=E3=82=92?= =?UTF-8?q?=E5=B0=8E=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hideout-core/build.gradle.kts | 79 +++++++++++------------------- hideout-core/settings.gradle.kts | 14 +++++- hideout-worker/build.gradle.kts | 2 +- hideout-worker/settings.gradle.kts | 11 +++++ libs.versions.toml | 78 +++++++++++++++++++++++++++++ 5 files changed, 131 insertions(+), 53 deletions(-) create mode 100644 libs.versions.toml diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index e9fa5de1..03de7c16 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -15,13 +15,13 @@ val coroutines_version: String by project val serialization_version: String by project plugins { - kotlin("jvm") version "1.9.23" - id("io.gitlab.arturbosch.detekt") version "1.23.6" - id("org.springframework.boot") version "3.2.3" - kotlin("plugin.spring") version "1.9.23" - id("org.openapi.generator") version "7.4.0" - id("org.jetbrains.kotlinx.kover") version "0.7.6" - id("com.github.jk1.dependency-license-report") version "2.5" + alias(libs.plugins.kotlin.jvm) + alias(libs.plugins.detekt) + alias(libs.plugins.spring.boot) + alias(libs.plugins.kotlin.spring) + alias(libs.plugins.openapi.generator) + alias(libs.plugins.kover) + alias(libs.plugins.license.report) } @@ -185,47 +185,36 @@ val os = org.gradle.nativeplatform.platform.internal .DefaultNativePlatform.getCurrentOperatingSystem() dependencies { - implementation("io.ktor:ktor-serialization-jackson:$ktor_version") - implementation("org.jetbrains.exposed:exposed-core:$exposed_version") - implementation("org.jetbrains.exposed:exposed-jdbc:$exposed_version") developmentOnly("com.h2database:h2:$h2_version") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:$serialization_version") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version") + detektPlugins(libs.detekt.formatting) + implementation(libs.bundles.exposed) + implementation(libs.bundles.coroutines) + implementation(libs.bundles.ktor.client) + implementation(libs.bundles.serialization) + implementation(libs.bundles.apache.tika) + implementation(libs.bundles.openapi) + implementation(libs.bundles.kjob) + implementation(libs.bundles.spring.boot.oauth2) + implementation(libs.bundles.spring.boot.data.mongodb) + implementation(libs.bundles.spring.boot.data.mongodb) implementation("org.springframework.boot:spring-boot-starter-actuator") - implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.springframework.boot:spring-boot-starter-thymeleaf") - implementation("org.springframework.boot:spring-boot-starter-oauth2-authorization-server") - implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server") implementation("org.springframework.boot:spring-boot-starter-log4j2") implementation("org.springframework.boot:spring-boot-starter-validation") - implementation("jakarta.validation:jakarta.validation-api") - implementation("jakarta.annotation:jakarta.annotation-api:2.1.0") - implementation("io.swagger.core.v3:swagger-annotations:2.2.6") - implementation("io.swagger.core.v3:swagger-models:2.2.6") - implementation("org.jetbrains.exposed:exposed-java-time:$exposed_version") - testImplementation("org.springframework.boot:spring-boot-starter-test") - implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - implementation("org.springframework.security:spring-security-oauth2-jose") - implementation("org.springframework.boot:spring-boot-starter-data-mongodb") - implementation("org.springframework.boot:spring-boot-starter-data-mongodb-reactive") - implementation("org.jetbrains.exposed:exposed-spring-boot-starter:$exposed_version") + implementation("io.trbl:blurhash:1.0.0") implementation("software.amazon.awssdk:s3:2.25.23") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:$coroutines_version") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:$coroutines_version") - implementation("dev.usbharu:http-signature:1.0.0") - + implementation("org.jsoup:jsoup:1.17.2") + implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1") implementation("org.postgresql:postgresql:42.7.3") implementation("com.twelvemonkeys.imageio:imageio-webp:3.10.1") - implementation("org.apache.tika:tika-core:2.9.1") - implementation("org.apache.tika:tika-parsers:2.9.1") implementation("net.coobird:thumbnailator:0.4.20") - implementation("org.bytedeco:javacv:1.5.10") { + implementation("org.flywaydb:flyway-core") + + implementation(libs.javacv) { exclude(module = "opencv") exclude(module = "flycapture") exclude(module = "artoolkitplus") @@ -237,25 +226,20 @@ dependencies { exclude(module = "libfreenect2") } if (os.isWindows) { - implementation("org.bytedeco", "ffmpeg", "6.1.1-1.5.10", classifier = "windows-x86_64") + implementation(variantOf(libs.javacv.ffmpeg) { classifier("windows-x86_64") }) } else { - implementation("org.bytedeco", "ffmpeg", "6.1.1-1.5.10", classifier = "linux-x86_64") + implementation(variantOf(libs.javacv.ffmpeg) { classifier("linux-x86_64") }) } - implementation("org.flywaydb:flyway-core") + implementation("dev.usbharu:http-signature:1.0.0") implementation("dev.usbharu:emoji-kt:2.0.0") implementation("dev.usbharu:owl-producer-default:0.0.1") - implementation("org.jsoup:jsoup:1.17.2") - implementation("com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1") - implementation("io.ktor:ktor-client-logging-jvm:$ktor_version") + testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version") - implementation("io.ktor:ktor-client-core:$ktor_version") - implementation("io.ktor:ktor-client-cio:$ktor_version") - implementation("io.ktor:ktor-client-content-negotiation:$ktor_version") testImplementation("io.ktor:ktor-client-mock:$ktor_version") testImplementation("com.h2database:h2:$h2_version") @@ -264,11 +248,6 @@ dependencies { testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.6") testImplementation("com.jparams:to-string-verifier:1.4.8") - implementation("org.drewcarlson:kjob-core:0.6.0") - implementation("org.drewcarlson:kjob-mongo:0.6.0") - - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.6") - intTestImplementation("org.springframework.boot:spring-boot-starter-test") intTestImplementation("org.springframework.security:spring-security-test") intTestImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version") @@ -337,7 +316,6 @@ project.gradle.taskGraph.whenReady { } kover { - excludeSourceSets { names("aot", "e2eTest", "intTest") } @@ -370,7 +348,6 @@ springBoot { } licenseReport { - excludeOwnGroup = true importers = arrayOf(XmlReportImporter("hideout", File("$projectDir/license-list.xml"))) diff --git a/hideout-core/settings.gradle.kts b/hideout-core/settings.gradle.kts index e0db79c9..7378ceba 100644 --- a/hideout-core/settings.gradle.kts +++ b/hideout-core/settings.gradle.kts @@ -3,4 +3,16 @@ plugins { } rootProject.name = "hideout-core" -includeBuild("../owl") \ No newline at end of file +includeBuild("../owl") + +dependencyResolutionManagement { + repositories { + mavenCentral() + } + + versionCatalogs { + create("libs") { + from(files("../libs.versions.toml")) + } + } +} \ No newline at end of file diff --git a/hideout-worker/build.gradle.kts b/hideout-worker/build.gradle.kts index 45be2756..e8ddffec 100644 --- a/hideout-worker/build.gradle.kts +++ b/hideout-worker/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.9.23" + alias(libs.plugins.kotlin.jvm) } group = "dev.usbharu" diff --git a/hideout-worker/settings.gradle.kts b/hideout-worker/settings.gradle.kts index 29deec55..97244032 100644 --- a/hideout-worker/settings.gradle.kts +++ b/hideout-worker/settings.gradle.kts @@ -3,3 +3,14 @@ plugins { } rootProject.name = "hideout-worker" +dependencyResolutionManagement { + repositories { + mavenCentral() + } + + versionCatalogs { + create("libs") { + from(files("../libs.versions.toml")) + } + } +} \ No newline at end of file diff --git a/libs.versions.toml b/libs.versions.toml new file mode 100644 index 00000000..acd49b5c --- /dev/null +++ b/libs.versions.toml @@ -0,0 +1,78 @@ +[versions] + +kotlin = "1.9.23" +ktor = "2.3.9" +exposed = "0.49.0" +javacv-ffmpeg = "6.1.1-1.5.10" +detekt = "1.23.5" +coroutines = "1.8.0" +swagger = "2.2.6" +serialization = "1.6.3" +kjob = "0.6.0" +tika = "2.9.1" + +[libraries] + +exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed" } +exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed" } +exposed-spring = { module = "org.jetbrains.exposed:exposed-spring-boot-starter", version.ref = "exposed" } +exposed-java-time = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposed" } + +cotoutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } +cotoutines-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor", version.ref = "coroutines" } +cotoutines-slf4j = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-slf4j", version.ref = "coroutines" } + +javacv = { module = "org.bytedeco:javacv", version = "1.5.10" } +javacv-ffmpeg = { module = "org.bytedeco:ffmpeg", version.ref = "javacv-ffmpeg" } + +detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" } + +ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } +ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } +ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" } +ktor-client-mock = { module = "io.ktor:ktor-client-client-mock", version.ref = "ktor" } +ktor-client-logging-jvm = { module = "io.ktor:ktor-client-logging-jvm", version.ref = "ktor" } +ktor-serialization-jackson = { module = "io.ktor:ktor-serialization-jackson", version.ref = "ktor" } + +spring-boot-oauth2-authorization = { module = "org.springframework.boot:spring-boot-starter-oauth2-authorization-server" } +spring-boot-oauth2-resource = { module = "org.springframework.boot:spring-boot-starter-oauth2-resource-server" } +spring-boot-oauth2-jose = { module = "org.springframework.security:spring-security-oauth2-jose" } + +spring-boot-data-mongodb = { module = "org.springframework.boot:spring-boot-starter-data-mongodb" } +spring-boot-data-mongodb-reactive = { module = "org.springframework.boot:spring-boot-starter-data-mongodb-reactive" } + +jakarta-validation = { module = "jakarta.validation:jakarta.validation-api", version = "3.0.2" } +jakarta-annotation = { module = "jakarta.annotation:jakarta.annotation-api", version = "2.1.0" } +swagger-annotations = { module = "io.swagger.core.v3:swagger-annotations", version.ref = "swagger" } +swagger-models = { module = "io.swagger.core.v3:swagger-models", version.ref = "swagger" } + +serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" } +serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } + +apache-tika-core = { module = "org.apache.tika:tika-core", version.ref = "tika" } +apache-tika-parsers = { module = "org.apache.tika:tika-parsers", version.ref = "tika" } + +kjon-core = { module = "org.drewcarlson:kjob-core", version.ref = "kjob" } +kjon-mongo = { module = "org.drewcarlson:kjob-mongo", version.ref = "kjob" } + +[bundles] + +exposed = ["exposed-core", "exposed-java-time", "exposed-jdbc", "exposed-spring"] +coroutines = ["cotoutines-core", "cotoutines-reactor", "cotoutines-slf4j"] +ktor-client = ["ktor-client-cio", "ktor-client-content-negotiation", "ktor-client-core", "ktor-client-logging-jvm", "ktor-serialization-jackson"] +spring-boot-oauth2 = ["spring-boot-oauth2-authorization", "spring-boot-oauth2-jose", "spring-boot-oauth2-resource"] +spring-boot-data-mongodb = ["spring-boot-data-mongodb", "spring-boot-data-mongodb-reactive"] +openapi = ["jakarta-annotation", "jakarta-validation", "swagger-annotations", "swagger-models"] +serialization = ["serialization-core", "serialization-json"] +apache-tika = ["apache-tika-core", "apache-tika-parsers"] +kjob = ["kjon-core", "kjon-mongo"] + +[plugins] + +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +spring-boot = { id = "org.springframework.boot", version = "3.2.3" } +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } +kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" } +kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.6" } +openapi-generator = { id = "org.openapi.generator", version = "7.4.0" } +license-report = { id = "com.github.jk1.dependency-license-report", version = "2.5" } \ No newline at end of file From 0b29c3356a0ec892d04027143a287facb785947f Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 4 May 2024 17:34:09 +0900 Subject: [PATCH 09/24] =?UTF-8?q?chore:=20=E4=B8=8D=E8=A6=81=E3=81=AA?= =?UTF-8?q?=E3=83=97=E3=83=AD=E3=83=91=E3=83=86=E3=82=A3=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hideout-core/build.gradle.kts | 3 --- hideout-core/gradle.properties | 2 -- 2 files changed, 5 deletions(-) diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index 03de7c16..eee94aa5 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -8,11 +8,8 @@ import org.openapitools.generator.gradle.plugin.tasks.GenerateTask val ktor_version: String by project val kotlin_version: String by project -val exposed_version: String by project val h2_version: String by project -val koin_version: String by project val coroutines_version: String by project -val serialization_version: String by project plugins { alias(libs.plugins.kotlin.jvm) diff --git a/hideout-core/gradle.properties b/hideout-core/gradle.properties index cc0a8c74..265ef85e 100644 --- a/hideout-core/gradle.properties +++ b/hideout-core/gradle.properties @@ -16,9 +16,7 @@ ktor_version=2.3.9 kotlin_version=1.9.23 coroutines_version=1.8.0 -serialization_version=1.6.3 kotlin.code.style=official -exposed_version=0.49.0 h2_version=2.2.224 org.gradle.parallel=true org.gradle.configureondemand=true From 3a541fa4b01e9cac3a9ef04cc23263f3223cbefe Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 4 May 2024 18:28:01 +0900 Subject: [PATCH 10/24] =?UTF-8?q?feat:=20=E3=82=B8=E3=83=A7=E3=83=96?= =?UTF-8?q?=E3=82=AD=E3=83=A5=E3=83=BC=E3=82=92OWL=E3=81=AB=E5=88=87?= =?UTF-8?q?=E3=82=8A=E6=9B=BF=E3=81=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hideout-core/build.gradle.kts | 18 +++----- .../activity/accept/ApSendAcceptService.kt | 8 ++-- .../activity/block/APSendBlockService.kt | 8 ++-- .../create/ApSendCreateServiceImpl.kt | 12 +++--- .../activity/delete/APSendDeleteService.kt | 11 +++-- .../activity/follow/APFollowProcessor.kt | 9 ++-- .../activity/follow/APReceiveFollowService.kt | 15 ++----- .../activity/like/APReactionService.kt | 43 ++++++++++--------- .../reject/ApSendRejectServiceImpl.kt | 8 ++-- .../activity/undo/APSendUndoServiceImpl.kt | 12 +++--- .../activitypub/service/common/APService.kt | 21 ++++----- .../service/common/ActivityType.kt | 2 +- .../service/common/ActivityVocabulary.kt | 2 +- .../common/ExtendedActivityVocabulary.kt | 2 +- .../service/common/ExtendedVocabulary.kt | 2 +- .../core/external/job/DeliverAcceptJob.kt | 5 ++- .../core/external/job/DeliverBlockJob.kt | 5 ++- .../core/external/job/DeliverDeleteJob.kt | 5 ++- .../core/external/job/DeliverPostTask.kt | 26 +++++++++++ .../core/external/job/DeliverReactionTask.kt | 27 ++++++++++++ .../core/external/job/DeliverRejectJob.kt | 5 ++- .../external/job/DeliverRemoveReactionTask.kt | 27 ++++++++++++ .../core/external/job/DeliverUndoJob.kt | 5 ++- .../hideout/core/external/job/HideoutJob.kt | 5 ++- .../hideout/core/external/job/InboxTask.kt | 28 ++++++++++++ .../core/external/job/ReceiveFollowTask.kt | 26 +++++++++++ .../hideout/core/service/job/JobProcessor.kt | 1 + .../core/service/job/JobQueueParentService.kt | 1 + .../core/service/job/JobQueueWorkerService.kt | 1 + .../exception/AccountNotFoundException.kt | 2 +- .../exception/StatusNotFoundException.kt | 2 +- .../interfaces/api/status/StatusesRequest.kt | 2 +- .../like/APReactionServiceImplTest.kt | 2 - hideout-worker/settings.gradle.kts | 4 +- libs.versions.toml | 2 +- 35 files changed, 236 insertions(+), 118 deletions(-) create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverPostTask.kt create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRemoveReactionTask.kt create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index eee94aa5..8fa96834 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -31,22 +31,22 @@ version = "0.0.1" sourceSets { create("intTest") { - test { +// test { compileClasspath += sourceSets.main.get().output runtimeClasspath += sourceSets.main.get().output kotlin.srcDirs("src/intTest/kotlin") java.srcDirs("src/intTest/java") resources.srcDirs("src/intTest/resources") - } +// } } create("e2eTest") { - test { +// test { compileClasspath += sourceSets.main.get().output runtimeClasspath += sourceSets.main.get().output kotlin.srcDirs("src/e2eTest/kotlin") java.srcDirs("src/e2eTest/java") resources.srcDirs("src/e2eTest/resources") - } +// } } } @@ -263,7 +263,7 @@ dependencies { detekt { parallel = true - config = files("detekt.yml") + config = files("../detekt.yml") buildUponDefaultConfig = true basePath = "${rootDir.absolutePath}/src/main/kotlin" autoCorrect = true @@ -286,14 +286,6 @@ tasks.withType().configure exclude("**/org/koin/ksp/generated/**", "**/generated/**") } -configurations.matching { it.name == "detekt" }.all { - resolutionStrategy.eachDependency { - if (requested.group == "org.jetbrains.kotlin") { - useVersion("1.9.22") - } - } -} - configurations { all { exclude("org.springframework.boot", "spring-boot-starter-logging") diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptService.kt index d27016b0..f9487f5d 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptService.kt @@ -19,9 +19,8 @@ package dev.usbharu.hideout.activitypub.service.activity.accept import dev.usbharu.hideout.activitypub.domain.model.Accept import dev.usbharu.hideout.activitypub.domain.model.Follow import dev.usbharu.hideout.core.domain.model.actor.Actor -import dev.usbharu.hideout.core.external.job.DeliverAcceptJob import dev.usbharu.hideout.core.external.job.DeliverAcceptJobParam -import dev.usbharu.hideout.core.service.job.JobQueueParentService +import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service interface ApSendAcceptService { @@ -30,8 +29,7 @@ interface ApSendAcceptService { @Service class ApSendAcceptServiceImpl( - private val jobQueueParentService: JobQueueParentService, - private val deliverAcceptJob: DeliverAcceptJob + private val owlProducer: OwlProducer, ) : ApSendAcceptService { override suspend fun sendAcceptFollow(actor: Actor, target: Actor) { val deliverAcceptJobParam = DeliverAcceptJobParam( @@ -46,6 +44,6 @@ class ApSendAcceptServiceImpl( actor.id ) - jobQueueParentService.scheduleTypeSafe(deliverAcceptJob, deliverAcceptJobParam) + owlProducer.publishTask(deliverAcceptJobParam) } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APSendBlockService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APSendBlockService.kt index 923770c5..50fac669 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APSendBlockService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APSendBlockService.kt @@ -21,9 +21,8 @@ import dev.usbharu.hideout.activitypub.domain.model.Follow import dev.usbharu.hideout.activitypub.domain.model.Reject import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.core.domain.model.actor.Actor -import dev.usbharu.hideout.core.external.job.DeliverBlockJob import dev.usbharu.hideout.core.external.job.DeliverBlockJobParam -import dev.usbharu.hideout.core.service.job.JobQueueParentService +import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service interface APSendBlockService { @@ -33,8 +32,7 @@ interface APSendBlockService { @Service class ApSendBlockServiceImpl( private val applicationConfig: ApplicationConfig, - private val jobQueueParentService: JobQueueParentService, - private val deliverBlockJob: DeliverBlockJob + private val owlProducer: OwlProducer, ) : APSendBlockService { override suspend fun sendBlock(actor: Actor, target: Actor) { val blockJobParam = DeliverBlockJobParam( @@ -54,6 +52,6 @@ class ApSendBlockServiceImpl( ), target.inbox ) - jobQueueParentService.scheduleTypeSafe(deliverBlockJob, blockJobParam) + owlProducer.publishTask(blockJobParam) } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImpl.kt index 0d37ea10..76793b91 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImpl.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImpl.kt @@ -24,9 +24,10 @@ import dev.usbharu.hideout.core.domain.exception.resource.PostNotFoundException import dev.usbharu.hideout.core.domain.exception.resource.UserNotFoundException import dev.usbharu.hideout.core.domain.model.actor.ActorRepository import dev.usbharu.hideout.core.domain.model.post.Post -import dev.usbharu.hideout.core.external.job.DeliverPostJob +import dev.usbharu.hideout.core.external.job.DeliverPostTask import dev.usbharu.hideout.core.query.FollowerQueryService import dev.usbharu.hideout.core.service.job.JobQueueParentService +import dev.usbharu.owl.producer.api.OwlProducer import org.slf4j.LoggerFactory import org.springframework.stereotype.Service @@ -37,7 +38,8 @@ class ApSendCreateServiceImpl( private val jobQueueParentService: JobQueueParentService, private val noteQueryService: NoteQueryService, private val applicationConfig: ApplicationConfig, - private val actorRepository: ActorRepository + private val actorRepository: ActorRepository, + private val owlProducer: OwlProducer, ) : ApSendCreateService { override suspend fun createNote(post: Post) { logger.info("CREATE Create Local Note ${post.url}") @@ -56,11 +58,7 @@ class ApSendCreateServiceImpl( id = "${applicationConfig.url}/create/note/${post.id}" ) followers.forEach { followerEntity -> - jobQueueParentService.schedule(DeliverPostJob) { - props[DeliverPostJob.actor] = userEntity.url - props[DeliverPostJob.inbox] = followerEntity.inbox - props[DeliverPostJob.create] = objectMapper.writeValueAsString(create) - } + owlProducer.publishTask(DeliverPostTask(create, userEntity.url, followerEntity.inbox)) } logger.debug("SUCCESS Create Local Note ${post.url}") diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APSendDeleteService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APSendDeleteService.kt index 55e68c78..a4e8d40c 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APSendDeleteService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APSendDeleteService.kt @@ -24,10 +24,9 @@ import dev.usbharu.hideout.core.domain.exception.resource.UserNotFoundException import dev.usbharu.hideout.core.domain.model.actor.Actor import dev.usbharu.hideout.core.domain.model.actor.ActorRepository import dev.usbharu.hideout.core.domain.model.post.Post -import dev.usbharu.hideout.core.external.job.DeliverDeleteJob import dev.usbharu.hideout.core.external.job.DeliverDeleteJobParam import dev.usbharu.hideout.core.query.FollowerQueryService -import dev.usbharu.hideout.core.service.job.JobQueueParentService +import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service import java.time.Instant @@ -38,11 +37,10 @@ interface APSendDeleteService { @Service class APSendDeleteServiceImpl( - private val jobQueueParentService: JobQueueParentService, - private val delverDeleteJob: DeliverDeleteJob, private val followerQueryService: FollowerQueryService, private val applicationConfig: ApplicationConfig, - private val actorRepository: ActorRepository + private val actorRepository: ActorRepository, + private val owlProducer: OwlProducer, ) : APSendDeleteService { override suspend fun sendDeleteNote(deletedPost: Post) { val actor = @@ -62,7 +60,8 @@ class APSendDeleteServiceImpl( it.inbox, actor.id ) - jobQueueParentService.scheduleTypeSafe(delverDeleteJob, jobProps) + + owlProducer.publishTask(jobProps) } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt index da4fbbbb..62f21276 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt @@ -22,16 +22,15 @@ import dev.usbharu.hideout.activitypub.service.common.AbstractActivityPubProcess import dev.usbharu.hideout.activitypub.service.common.ActivityPubProcessContext import dev.usbharu.hideout.activitypub.service.common.ActivityType import dev.usbharu.hideout.application.external.Transaction -import dev.usbharu.hideout.core.external.job.ReceiveFollowJob import dev.usbharu.hideout.core.external.job.ReceiveFollowJobParam -import dev.usbharu.hideout.core.service.job.JobQueueParentService +import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service @Service class APFollowProcessor( transaction: Transaction, - private val jobQueueParentService: JobQueueParentService, - private val objectMapper: ObjectMapper + private val objectMapper: ObjectMapper, + private val owlProducer: OwlProducer, ) : AbstractActivityPubProcessor(transaction) { override suspend fun internalProcess(activity: ActivityPubProcessContext) { @@ -43,7 +42,7 @@ class APFollowProcessor( objectMapper.writeValueAsString(activity.activity), activity.activity.apObject ) - jobQueueParentService.scheduleTypeSafe(ReceiveFollowJob, jobProps) + owlProducer.publishTask(jobProps) } override fun isSupported(activityType: ActivityType): Boolean = activityType == ActivityType.Follow diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowService.kt index c9afab20..9d69e7be 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowService.kt @@ -16,12 +16,10 @@ package dev.usbharu.hideout.activitypub.service.activity.follow -import com.fasterxml.jackson.databind.ObjectMapper import dev.usbharu.hideout.activitypub.domain.model.Follow -import dev.usbharu.hideout.core.external.job.ReceiveFollowJob -import dev.usbharu.hideout.core.service.job.JobQueueParentService +import dev.usbharu.hideout.core.external.job.ReceiveFollowTask +import dev.usbharu.owl.producer.api.OwlProducer import org.slf4j.LoggerFactory -import org.springframework.beans.factory.annotation.Qualifier import org.springframework.stereotype.Service interface APReceiveFollowService { @@ -30,16 +28,11 @@ interface APReceiveFollowService { @Service class APReceiveFollowServiceImpl( - private val jobQueueParentService: JobQueueParentService, - @Qualifier("activitypub") private val objectMapper: ObjectMapper + private val owlProducer: OwlProducer, ) : APReceiveFollowService { override suspend fun receiveFollow(follow: Follow) { logger.info("FOLLOW from: {} to: {}", follow.actor, follow.apObject) - jobQueueParentService.schedule(ReceiveFollowJob) { - props[ReceiveFollowJob.actor] = follow.actor - props[ReceiveFollowJob.follow] = objectMapper.writeValueAsString(follow) - props[ReceiveFollowJob.targetActor] = follow.apObject - } + owlProducer.publishTask(ReceiveFollowTask(follow.actor, follow, follow.apObject)) return } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt index ea218c6e..08d34f33 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt @@ -16,17 +16,15 @@ package dev.usbharu.hideout.activitypub.service.activity.like -import com.fasterxml.jackson.databind.ObjectMapper import dev.usbharu.hideout.core.domain.exception.resource.PostNotFoundException import dev.usbharu.hideout.core.domain.exception.resource.UserNotFoundException import dev.usbharu.hideout.core.domain.model.actor.ActorRepository import dev.usbharu.hideout.core.domain.model.post.PostRepository import dev.usbharu.hideout.core.domain.model.reaction.Reaction -import dev.usbharu.hideout.core.external.job.DeliverReactionJob -import dev.usbharu.hideout.core.external.job.DeliverRemoveReactionJob +import dev.usbharu.hideout.core.external.job.DeliverReactionTask +import dev.usbharu.hideout.core.external.job.DeliverRemoveReactionTask import dev.usbharu.hideout.core.query.FollowerQueryService -import dev.usbharu.hideout.core.service.job.JobQueueParentService -import org.springframework.beans.factory.annotation.Qualifier +import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service interface APReactionService { @@ -36,11 +34,10 @@ interface APReactionService { @Service class APReactionServiceImpl( - private val jobQueueParentService: JobQueueParentService, private val followerQueryService: FollowerQueryService, private val actorRepository: ActorRepository, - @Qualifier("activitypub") private val objectMapper: ObjectMapper, - private val postRepository: PostRepository + private val postRepository: PostRepository, + private val owlProducer: OwlProducer, ) : APReactionService { override suspend fun reaction(like: Reaction) { val followers = followerQueryService.findFollowersById(like.actorId) @@ -48,13 +45,15 @@ class APReactionServiceImpl( val post = postRepository.findById(like.postId) ?: throw PostNotFoundException.withId(like.postId) followers.forEach { follower -> - jobQueueParentService.schedule(DeliverReactionJob) { - props[DeliverReactionJob.actor] = user.url - props[DeliverReactionJob.reaction] = "❤" - props[DeliverReactionJob.inbox] = follower.inbox - props[DeliverReactionJob.postUrl] = post.url - props[DeliverReactionJob.id] = post.id.toString() - } + owlProducer.publishTask( + DeliverReactionTask( + actor = user.url, + reaction = "❤", + inbox = follower.inbox, + postUrl = post.url, + id = post.id + ) + ) } } @@ -64,12 +63,14 @@ class APReactionServiceImpl( val post = postRepository.findById(like.postId) ?: throw PostNotFoundException.withId(like.postId) followers.forEach { follower -> - jobQueueParentService.schedule(DeliverRemoveReactionJob) { - props[DeliverRemoveReactionJob.actor] = user.url - props[DeliverRemoveReactionJob.inbox] = follower.inbox - props[DeliverRemoveReactionJob.id] = post.id.toString() - props[DeliverRemoveReactionJob.like] = objectMapper.writeValueAsString(like) - } + owlProducer.publishTask( + DeliverRemoveReactionTask( + actor = user.url, + inbox = follower.inbox, + id = post.id, + reaction = like + ) + ) } } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectServiceImpl.kt index 9977be3f..eef398ed 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectServiceImpl.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectServiceImpl.kt @@ -20,16 +20,14 @@ import dev.usbharu.hideout.activitypub.domain.model.Follow import dev.usbharu.hideout.activitypub.domain.model.Reject import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.core.domain.model.actor.Actor -import dev.usbharu.hideout.core.external.job.DeliverRejectJob import dev.usbharu.hideout.core.external.job.DeliverRejectJobParam -import dev.usbharu.hideout.core.service.job.JobQueueParentService +import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service @Service class ApSendRejectServiceImpl( private val applicationConfig: ApplicationConfig, - private val jobQueueParentService: JobQueueParentService, - private val deliverRejectJob: DeliverRejectJob + private val owlProducer: OwlProducer, ) : ApSendRejectService { override suspend fun sendRejectFollow(actor: Actor, target: Actor) { val deliverRejectJobParam = DeliverRejectJobParam( @@ -42,6 +40,6 @@ class ApSendRejectServiceImpl( actor.id ) - jobQueueParentService.scheduleTypeSafe(deliverRejectJob, deliverRejectJobParam) + owlProducer.publishTask(deliverRejectJobParam) } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoServiceImpl.kt index 49444259..342951ec 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoServiceImpl.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoServiceImpl.kt @@ -21,17 +21,15 @@ import dev.usbharu.hideout.activitypub.domain.model.Follow import dev.usbharu.hideout.activitypub.domain.model.Undo import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.core.domain.model.actor.Actor -import dev.usbharu.hideout.core.external.job.DeliverUndoJob import dev.usbharu.hideout.core.external.job.DeliverUndoJobParam -import dev.usbharu.hideout.core.service.job.JobQueueParentService +import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service import java.time.Instant @Service class APSendUndoServiceImpl( - private val jobQueueParentService: JobQueueParentService, - private val deliverUndoJob: DeliverUndoJob, - private val applicationConfig: ApplicationConfig + private val applicationConfig: ApplicationConfig, + private val owlProducer: OwlProducer, ) : APSendUndoService { override suspend fun sendUndoFollow(actor: Actor, target: Actor) { val deliverUndoJobParam = DeliverUndoJobParam( @@ -48,7 +46,7 @@ class APSendUndoServiceImpl( actor.id ) - jobQueueParentService.scheduleTypeSafe(deliverUndoJob, deliverUndoJobParam) + owlProducer.publishTask(deliverUndoJobParam) } override suspend fun sendUndoBlock(actor: Actor, target: Actor) { @@ -67,6 +65,6 @@ class APSendUndoServiceImpl( actor.id ) - jobQueueParentService.scheduleTypeSafe(deliverUndoJob, deliverUndoJobParam) + owlProducer.publishTask(deliverUndoJobParam) } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APService.kt index 257e57b1..64aa581b 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/APService.kt @@ -19,9 +19,9 @@ package dev.usbharu.hideout.activitypub.service.common import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.ObjectMapper import dev.usbharu.hideout.activitypub.domain.exception.JsonParseException -import dev.usbharu.hideout.core.external.job.InboxJob -import dev.usbharu.hideout.core.service.job.JobQueueParentService +import dev.usbharu.hideout.core.external.job.InboxTask import dev.usbharu.httpsignature.common.HttpRequest +import dev.usbharu.owl.producer.api.OwlProducer import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Qualifier @@ -41,7 +41,7 @@ interface APService { @Service class APServiceImpl( @Qualifier("activitypub") private val objectMapper: ObjectMapper, - private val jobQueueParentService: JobQueueParentService + private val owlProducer: OwlProducer, ) : APService { val logger: Logger = LoggerFactory.getLogger(APServiceImpl::class.java) @@ -90,13 +90,14 @@ class APServiceImpl( map: Map> ) { logger.debug("process activity: {}", type) - jobQueueParentService.schedule(InboxJob) { - props[it.json] = json - props[it.type] = type.name - val writeValueAsString = objectMapper.writeValueAsString(httpRequest) - props[it.httpRequest] = writeValueAsString - props[it.headers] = objectMapper.writeValueAsString(map) - } + owlProducer.publishTask( + InboxTask( + json, + type, + httpRequest, + map + ) + ) return } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityType.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityType.kt index acd7e3ae..acd1fcb6 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityType.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityType.kt @@ -46,4 +46,4 @@ enum class ActivityType { Update, View, Other -} \ No newline at end of file +} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityVocabulary.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityVocabulary.kt index 569b5f66..4d42dfff 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityVocabulary.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ActivityVocabulary.kt @@ -71,4 +71,4 @@ enum class ActivityVocabulary { Tombstone, Video, Mention, -} \ No newline at end of file +} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedActivityVocabulary.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedActivityVocabulary.kt index 322cb2a3..b8150064 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedActivityVocabulary.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedActivityVocabulary.kt @@ -72,4 +72,4 @@ enum class ExtendedActivityVocabulary { Video, Mention, Emoji -} \ No newline at end of file +} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedVocabulary.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedVocabulary.kt index 9fe0516a..ef1c06c6 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedVocabulary.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/common/ExtendedVocabulary.kt @@ -18,4 +18,4 @@ package dev.usbharu.hideout.activitypub.service.common enum class ExtendedVocabulary { Emoji -} \ No newline at end of file +} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptJob.kt index 3c8c4b6c..59e10083 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptJob.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptJob.kt @@ -19,6 +19,7 @@ package dev.usbharu.hideout.core.external.job import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import dev.usbharu.hideout.activitypub.domain.model.Accept +import dev.usbharu.owl.common.task.Task import kjob.core.dsl.ScheduleContext import kjob.core.job.JobProps import org.springframework.stereotype.Component @@ -26,8 +27,8 @@ import org.springframework.stereotype.Component data class DeliverAcceptJobParam( val accept: Accept, val inbox: String, - val signer: Long -) + val signer: Long, +) : Task() @Component class DeliverAcceptJob(private val objectMapper: ObjectMapper) : diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt index 3d7f8c54..4b02ff73 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt @@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import dev.usbharu.hideout.activitypub.domain.model.Block import dev.usbharu.hideout.activitypub.domain.model.Reject +import dev.usbharu.owl.common.task.Task import kjob.core.dsl.ScheduleContext import kjob.core.job.JobProps import org.springframework.beans.factory.annotation.Qualifier @@ -37,8 +38,8 @@ data class DeliverBlockJobParam( val signer: Long, val block: Block, val reject: Reject, - val inbox: String -) + val inbox: String, +) : Task() /** * ブロックアクティビティ配送のジョブ diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteJob.kt index d5c1576c..5d3ce8b7 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteJob.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteJob.kt @@ -19,6 +19,7 @@ package dev.usbharu.hideout.core.external.job import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import dev.usbharu.hideout.activitypub.domain.model.Delete +import dev.usbharu.owl.common.task.Task import kjob.core.dsl.ScheduleContext import kjob.core.job.JobProps import org.springframework.beans.factory.annotation.Qualifier @@ -27,8 +28,8 @@ import org.springframework.stereotype.Component data class DeliverDeleteJobParam( val delete: Delete, val inbox: String, - val signer: Long -) + val signer: Long, +) : Task() @Component class DeliverDeleteJob(@Qualifier("activitypub") private val objectMapper: ObjectMapper) : diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverPostTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverPostTask.kt new file mode 100644 index 00000000..3b682831 --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverPostTask.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.core.external.job + +import dev.usbharu.hideout.activitypub.domain.model.Create +import dev.usbharu.owl.common.task.Task + +data class DeliverPostTask( + val create: Create, + val inbox: String, + val actor: String, +) : Task() diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt new file mode 100644 index 00000000..3a11d541 --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.core.external.job + +import dev.usbharu.owl.common.task.Task + +data class DeliverReactionTask( + val actor: String, + val reaction: String, + val inbox: String, + val postUrl: String, + val id: Long, +) : Task() diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt index a57b3093..85baa145 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt @@ -19,6 +19,7 @@ package dev.usbharu.hideout.core.external.job import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import dev.usbharu.hideout.activitypub.domain.model.Reject +import dev.usbharu.owl.common.task.Task import kjob.core.dsl.ScheduleContext import kjob.core.job.JobProps import org.springframework.beans.factory.annotation.Qualifier @@ -27,8 +28,8 @@ import org.springframework.stereotype.Component data class DeliverRejectJobParam( val reject: Reject, val inbox: String, - val signer: Long -) + val signer: Long, +) : Task() @Component class DeliverRejectJob(@Qualifier("activitypub") private val objectMapper: ObjectMapper) : diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRemoveReactionTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRemoveReactionTask.kt new file mode 100644 index 00000000..1f0a5b15 --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRemoveReactionTask.kt @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.core.external.job + +import dev.usbharu.hideout.core.domain.model.reaction.Reaction +import dev.usbharu.owl.common.task.Task + +data class DeliverRemoveReactionTask( + val actor: String, + val inbox: String, + val id: Long, + val reaction: Reaction, +) : Task() diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoJob.kt index a2f5c8d7..f89c6d62 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoJob.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoJob.kt @@ -19,6 +19,7 @@ package dev.usbharu.hideout.core.external.job import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import dev.usbharu.hideout.activitypub.domain.model.Undo +import dev.usbharu.owl.common.task.Task import kjob.core.dsl.ScheduleContext import kjob.core.job.JobProps import org.springframework.beans.factory.annotation.Qualifier @@ -27,8 +28,8 @@ import org.springframework.stereotype.Component data class DeliverUndoJobParam( val undo: Undo, val inbox: String, - val signer: Long -) + val signer: Long, +) : Task() @Component class DeliverUndoJob(@Qualifier("activitypub") private val objectMapper: ObjectMapper) : diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/HideoutJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/HideoutJob.kt index 69737d3f..26d8a1cf 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/HideoutJob.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/HideoutJob.kt @@ -17,6 +17,7 @@ package dev.usbharu.hideout.core.external.job import dev.usbharu.hideout.activitypub.service.common.ActivityType +import dev.usbharu.owl.common.task.Task import kjob.core.Job import kjob.core.Prop import kjob.core.dsl.ScheduleContext @@ -32,8 +33,8 @@ abstract class HideoutJob>(name: String) : Job(n data class ReceiveFollowJobParam( val actor: String, val follow: String, - val targetActor: String -) + val targetActor: String, +) : Task() @Component object ReceiveFollowJob : HideoutJob("ReceiveFollowJob") { diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt new file mode 100644 index 00000000..fc281e2b --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.core.external.job + +import dev.usbharu.hideout.activitypub.service.common.ActivityType +import dev.usbharu.httpsignature.common.HttpRequest +import dev.usbharu.owl.common.task.Task + +data class InboxTask( + val json: String, + val type: ActivityType, + val httpRequest: HttpRequest, + val headers: Map>, +) : Task() diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt new file mode 100644 index 00000000..f11b2b60 --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.core.external.job + +import dev.usbharu.hideout.activitypub.domain.model.Follow +import dev.usbharu.owl.common.task.Task + +data class ReceiveFollowTask( + val actor: String, + val follow: Follow, + val targetActor: String, +) : Task() diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobProcessor.kt index eb6daa17..cd33d1c4 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobProcessor.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobProcessor.kt @@ -18,6 +18,7 @@ package dev.usbharu.hideout.core.service.job import dev.usbharu.hideout.core.external.job.HideoutJob +@Deprecated("use owl") interface JobProcessor> { suspend fun process(param: @UnsafeVariance T) fun job(): R diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueParentService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueParentService.kt index c93c6b61..a302a44b 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueParentService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueParentService.kt @@ -22,6 +22,7 @@ import kjob.core.dsl.ScheduleContext import org.springframework.stereotype.Service @Service +@Deprecated("use owl producer") interface JobQueueParentService { fun init(jobDefines: List) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueWorkerService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueWorkerService.kt index 2fbfceda..d5577ee5 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueWorkerService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueWorkerService.kt @@ -22,6 +22,7 @@ import dev.usbharu.hideout.core.external.job.HideoutJob as HJ import kjob.core.dsl.JobContextWithProps as JCWP import kjob.core.dsl.JobRegisterContext as JRC +@Deprecated("use owl") @Service interface JobQueueWorkerService { fun > init( diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/AccountNotFoundException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/AccountNotFoundException.kt index d8bbd1cb..8f6d5b79 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/AccountNotFoundException.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/AccountNotFoundException.kt @@ -38,7 +38,7 @@ class AccountNotFoundException : ClientException { ) : super(message, cause, enableSuppression, writableStackTrace, response) fun getTypedResponse(): MastodonApiErrorResponse = - response + response as MastodonApiErrorResponse companion object { fun ofId(id: Long): AccountNotFoundException = AccountNotFoundException( diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/StatusNotFoundException.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/StatusNotFoundException.kt index 667375b5..934403ec 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/StatusNotFoundException.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/domain/exception/StatusNotFoundException.kt @@ -40,7 +40,7 @@ class StatusNotFoundException : ClientException { ) : super(message, cause, enableSuppression, writableStackTrace, response) fun getTypedResponse(): MastodonApiErrorResponse = - response + response as MastodonApiErrorResponse companion object { fun ofId(id: Long): StatusNotFoundException = StatusNotFoundException( diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt index 8e49e8b7..1005680d 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/StatusesRequest.kt @@ -16,9 +16,9 @@ package dev.usbharu.hideout.mastodon.interfaces.api.status -import Status import com.fasterxml.jackson.annotation.JsonProperty import dev.usbharu.hideout.core.domain.model.post.Visibility +import dev.usbharu.hideout.domain.mastodon.model.generated.Status import dev.usbharu.hideout.domain.mastodon.model.generated.StatusesRequestPoll import dev.usbharu.hideout.mastodon.interfaces.api.status.StatusesRequest.Visibility.* diff --git a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt index 5bed662e..fa1cd43e 100644 --- a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt +++ b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt @@ -55,11 +55,9 @@ class APReactionServiceImplTest { onBlocking { findById(eq(user.id)) }.doReturn(user) } val apReactionServiceImpl = APReactionServiceImpl( - jobQueueParentService = jobQueueParentService, actorRepository = actorRepository, followerQueryService = followerQueryService, postRepository = postQueryService, - objectMapper = objectMapper ) apReactionServiceImpl.reaction( diff --git a/hideout-worker/settings.gradle.kts b/hideout-worker/settings.gradle.kts index 97244032..861c039e 100644 --- a/hideout-worker/settings.gradle.kts +++ b/hideout-worker/settings.gradle.kts @@ -13,4 +13,6 @@ dependencyResolutionManagement { from(files("../libs.versions.toml")) } } -} \ No newline at end of file +} + +includeBuild("../hideout-core") \ No newline at end of file diff --git a/libs.versions.toml b/libs.versions.toml index acd49b5c..90bf96b5 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -4,7 +4,7 @@ kotlin = "1.9.23" ktor = "2.3.9" exposed = "0.49.0" javacv-ffmpeg = "6.1.1-1.5.10" -detekt = "1.23.5" +detekt = "1.23.6" coroutines = "1.8.0" swagger = "2.2.6" serialization = "1.6.3" From 5ef130c94f07b57a16a4e179f32cfe2c5e6cf8c1 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Mon, 6 May 2024 16:55:57 +0900 Subject: [PATCH 11/24] =?UTF-8?q?feat:=20Producer=E3=81=AEBean=E3=82=92?= =?UTF-8?q?=E4=BD=9C=E6=88=90=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hideout-core/build.gradle.kts | 3 +- .../hideout/application/config/OwlConfig.kt | 68 +++++++++++++++++++ .../src/main/resources/application.yml | 3 + hideout-worker/build.gradle.kts | 1 + hideout-worker/src/main/kotlin/Main.kt | 5 -- .../hideout/worker/DeliverAcceptTaskRunner.kt | 30 ++++++++ libs.versions.toml | 6 ++ .../kotlin/dev/usbharu/owl/broker/Main.kt | 4 +- .../dev/usbharu/owl/broker/ModuleContext.kt | 6 ++ .../broker/service/TaskManagementService.kt | 1 + .../owl/broker/service/TaskPublishService.kt | 1 + .../owl/common/retry}/RetryPolicyFactory.kt | 5 +- .../retry}/RetryPolicyNotFoundException.kt | 2 +- .../producer/api/OwlProducerBuilderConfig.kt | 5 +- .../owl-producer-embedded/build.gradle.kts | 1 + .../embedded/EmbeddedGrpcOwlProducer.kt | 18 ++--- .../EmbeddedGrpcOwlProducerBuilder.kt | 39 +++++++++++ .../embedded/EmbeddedGrpcOwlProducerConfig.kt | 29 ++++++++ .../producer/embedded/EmbeddedOwlProducer.kt | 20 +++--- .../embedded/EmbeddedOwlProducerBuilder.kt | 51 ++++++++++++++ .../embedded/EmbeddedOwlProducerConfig.kt | 28 ++++++++ 21 files changed, 292 insertions(+), 34 deletions(-) create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt delete mode 100644 hideout-worker/src/main/kotlin/Main.kt create mode 100644 hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverAcceptTaskRunner.kt rename owl/{owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service => owl-common/src/main/kotlin/dev/usbharu/owl/common/retry}/RetryPolicyFactory.kt (87%) rename owl/{owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service => owl-common/src/main/kotlin/dev/usbharu/owl/common/retry}/RetryPolicyNotFoundException.kt (94%) create mode 100644 owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducerBuilder.kt create mode 100644 owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducerConfig.kt create mode 100644 owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerBuilder.kt create mode 100644 owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerConfig.kt diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index 8fa96834..2537e715 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -192,6 +192,7 @@ dependencies { implementation(libs.bundles.apache.tika) implementation(libs.bundles.openapi) implementation(libs.bundles.kjob) + implementation(libs.bundles.owl.producer) implementation(libs.bundles.spring.boot.oauth2) implementation(libs.bundles.spring.boot.data.mongodb) implementation(libs.bundles.spring.boot.data.mongodb) @@ -230,7 +231,7 @@ dependencies { implementation("dev.usbharu:http-signature:1.0.0") implementation("dev.usbharu:emoji-kt:2.0.0") - implementation("dev.usbharu:owl-producer-default:0.0.1") + testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt new file mode 100644 index 00000000..a58efc94 --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.application.config + +import dev.usbharu.owl.common.retry.RetryPolicyFactory +import dev.usbharu.owl.producer.api.OWL +import dev.usbharu.owl.producer.api.OwlProducer +import dev.usbharu.owl.producer.defaultimpl.DEFAULT +import dev.usbharu.owl.producer.embedded.EMBEDDED +import dev.usbharu.owl.producer.embedded.EMBEDDED_GRPC +import org.springframework.boot.context.properties.ConfigurationProperties +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration + +@Configuration +class OwlConfig(private val producerConfig: ProducerConfig) { + @Bean + fun producer(retryPolicyFactory: RetryPolicyFactory? = null): OwlProducer { + return when (producerConfig.mode) { + ProducerMode.EMBEDDED -> { + OWL(EMBEDDED) { + if (retryPolicyFactory != null) { + this.retryPolicyFactory = retryPolicyFactory + } + if (producerConfig.port != null) { + this.port = producerConfig.port.toString() + } + + } + } + + ProducerMode.GRPC -> { + OWL(EMBEDDED_GRPC) { + + } + } + + ProducerMode.EMBEDDED_GRPC -> { + OWL(DEFAULT) { + + } + } + } + } +} + +@ConfigurationProperties("hideout.owl.producer") +data class ProducerConfig(val mode: ProducerMode = ProducerMode.EMBEDDED, val port: Int? = null) + +enum class ProducerMode { + GRPC, + EMBEDDED, + EMBEDDED_GRPC +} diff --git a/hideout-core/src/main/resources/application.yml b/hideout-core/src/main/resources/application.yml index 87da1774..425c64f9 100644 --- a/hideout-core/src/main/resources/application.yml +++ b/hideout-core/src/main/resources/application.yml @@ -1,6 +1,9 @@ hideout: url: "https://test-hideout.usbharu.dev" use-mongodb: true + owl: + producer: + standalone: embedded security: jwt: generate: true diff --git a/hideout-worker/build.gradle.kts b/hideout-worker/build.gradle.kts index e8ddffec..8ff28341 100644 --- a/hideout-worker/build.gradle.kts +++ b/hideout-worker/build.gradle.kts @@ -11,6 +11,7 @@ repositories { dependencies { testImplementation(kotlin("test")) + implementation("dev.usbharu:owl-consumer:0.0.1") } tasks.test { diff --git a/hideout-worker/src/main/kotlin/Main.kt b/hideout-worker/src/main/kotlin/Main.kt deleted file mode 100644 index 27f6ee1a..00000000 --- a/hideout-worker/src/main/kotlin/Main.kt +++ /dev/null @@ -1,5 +0,0 @@ -package dev.usbharu - -fun main() { - println("Hello World!") -} \ No newline at end of file diff --git a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverAcceptTaskRunner.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverAcceptTaskRunner.kt new file mode 100644 index 00000000..d8946021 --- /dev/null +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverAcceptTaskRunner.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.worker + +import dev.usbharu.owl.consumer.TaskRequest +import dev.usbharu.owl.consumer.TaskResult +import dev.usbharu.owl.consumer.TaskRunner + +class DeliverAcceptTaskRunner : TaskRunner { + override val name: String + get() = "" + + override suspend fun run(taskRequest: TaskRequest): TaskResult { + TODO("Not yet implemented") + } +} \ No newline at end of file diff --git a/libs.versions.toml b/libs.versions.toml index 90bf96b5..eafb51ec 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -10,6 +10,7 @@ swagger = "2.2.6" serialization = "1.6.3" kjob = "0.6.0" tika = "2.9.1" +owl = "0.0.1" [libraries] @@ -55,6 +56,10 @@ apache-tika-parsers = { module = "org.apache.tika:tika-parsers", version.ref = " kjon-core = { module = "org.drewcarlson:kjob-core", version.ref = "kjob" } kjon-mongo = { module = "org.drewcarlson:kjob-mongo", version.ref = "kjob" } +owl-producer-api = { module = "dev.usbharu:owl-producer-api", version.ref = "owl" } +owl-producer-default = { module = "dev.usbharu:owl-producer-default", version.ref = "owl" } +owl-producer-embedded = { module = "dev.usbharu:owl-producer-embedded", version.ref = "owl" } + [bundles] exposed = ["exposed-core", "exposed-java-time", "exposed-jdbc", "exposed-spring"] @@ -66,6 +71,7 @@ openapi = ["jakarta-annotation", "jakarta-validation", "swagger-annotations", "s serialization = ["serialization-core", "serialization-json"] apache-tika = ["apache-tika-core", "apache-tika-parsers"] kjob = ["kjon-core", "kjon-mongo"] +owl-producer = ["owl-producer-api", "owl-producer-default", "owl-producer-embedded"] [plugins] diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt index 2dd9e400..7f3d71b4 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt @@ -16,9 +16,9 @@ package dev.usbharu.owl.broker -import dev.usbharu.owl.broker.service.DefaultRetryPolicyFactory -import dev.usbharu.owl.broker.service.RetryPolicyFactory +import dev.usbharu.owl.common.retry.DefaultRetryPolicyFactory import dev.usbharu.owl.common.retry.ExponentialRetryPolicy +import dev.usbharu.owl.common.retry.RetryPolicyFactory import kotlinx.coroutines.runBlocking import org.koin.core.context.startKoin import org.koin.dsl.module diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/ModuleContext.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/ModuleContext.kt index 1478f4f9..fbb32f7c 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/ModuleContext.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/ModuleContext.kt @@ -20,4 +20,10 @@ import org.koin.core.module.Module interface ModuleContext { fun module():Module +} + +data object EmptyModuleContext : ModuleContext { + override fun module(): Module { + return org.koin.dsl.module { } + } } \ No newline at end of file diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt index 066dafa3..360fae1a 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt @@ -24,6 +24,7 @@ import dev.usbharu.owl.broker.domain.model.task.TaskRepository import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinitionRepository import dev.usbharu.owl.broker.domain.model.taskresult.TaskResult import dev.usbharu.owl.broker.domain.model.taskresult.TaskResultRepository +import dev.usbharu.owl.common.retry.RetryPolicyFactory import kotlinx.coroutines.* import kotlinx.coroutines.flow.* import org.koin.core.annotation.Singleton diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt index 8446bf48..b6f2efe7 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt @@ -21,6 +21,7 @@ import dev.usbharu.owl.broker.domain.model.task.Task import dev.usbharu.owl.broker.domain.model.task.TaskRepository import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinitionRepository import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.retry.RetryPolicyFactory import org.koin.core.annotation.Singleton import org.slf4j.LoggerFactory import java.time.Instant diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicyFactory.kt similarity index 87% rename from owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicyFactory.kt index 58df5d64..6948e7bf 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/RetryPolicyFactory.kt +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicyFactory.kt @@ -14,10 +14,9 @@ * limitations under the License. */ -package dev.usbharu.owl.broker.service +package dev.usbharu.owl.common.retry + -import dev.usbharu.owl.broker.domain.exception.service.RetryPolicyNotFoundException -import dev.usbharu.owl.common.retry.RetryPolicy import org.slf4j.LoggerFactory interface RetryPolicyFactory { diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/RetryPolicyNotFoundException.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicyNotFoundException.kt similarity index 94% rename from owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/RetryPolicyNotFoundException.kt rename to owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicyNotFoundException.kt index dd6954b0..dba37f35 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/service/RetryPolicyNotFoundException.kt +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/retry/RetryPolicyNotFoundException.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package dev.usbharu.owl.broker.domain.exception.service +package dev.usbharu.owl.common.retry class RetryPolicyNotFoundException : RuntimeException { constructor() : super() diff --git a/owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt b/owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt index 97d77812..efedddf0 100644 --- a/owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt +++ b/owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducerBuilderConfig.kt @@ -27,7 +27,8 @@ package dev.usbharu.owl.producer.api */ fun

, C : OwlProducerConfig> OWL( owlProducerBuilder: T, - configBlock: C.() -> Unit -) { + configBlock: C.() -> Unit = {}, +): P { owlProducerBuilder.apply(owlProducerBuilder.config().apply { configBlock() }) + return owlProducerBuilder.build() } \ No newline at end of file diff --git a/owl/owl-producer/owl-producer-embedded/build.gradle.kts b/owl/owl-producer/owl-producer-embedded/build.gradle.kts index a5c7445f..26ec517e 100644 --- a/owl/owl-producer/owl-producer-embedded/build.gradle.kts +++ b/owl/owl-producer/owl-producer-embedded/build.gradle.kts @@ -15,6 +15,7 @@ dependencies { implementation(project(":owl-broker")) implementation(platform("io.insert-koin:koin-bom:3.5.3")) implementation("io.insert-koin:koin-core") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") } tasks.test { diff --git a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt index 3eb12b4f..2a4e1791 100644 --- a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt +++ b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt @@ -16,9 +16,8 @@ package dev.usbharu.owl.producer.embedded -import dev.usbharu.owl.broker.ModuleContext import dev.usbharu.owl.broker.OwlBrokerApplication -import dev.usbharu.owl.broker.service.RetryPolicyFactory +import dev.usbharu.owl.common.retry.RetryPolicyFactory import dev.usbharu.owl.common.task.PublishedTask import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition @@ -29,10 +28,7 @@ import org.koin.dsl.module import org.koin.ksp.generated.defaultModule class EmbeddedGrpcOwlProducer( - private val moduleContext: ModuleContext, - private val retryPolicyFactory: RetryPolicyFactory, - private val port: Int, - private val owlProducer: OwlProducer, + private val config: EmbeddedGrpcOwlProducerConfig, ) : OwlProducer { private lateinit var application: Koin @@ -43,20 +39,20 @@ class EmbeddedGrpcOwlProducer( val module = module { single { - retryPolicyFactory + config.retryPolicyFactory } } - modules(module, defaultModule, moduleContext.module()) + modules(module, defaultModule, config.moduleContext.module()) }.koin - application.get().start(port) + application.get().start(config.port.toInt()) } override suspend fun registerTask(taskDefinition: TaskDefinition) { - owlProducer.registerTask(taskDefinition) + config.owlProducer.registerTask(taskDefinition) } override suspend fun publishTask(task: T): PublishedTask { - return owlProducer.publishTask(task) + return config.owlProducer.publishTask(task) } } \ No newline at end of file diff --git a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducerBuilder.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducerBuilder.kt new file mode 100644 index 00000000..be8b04c2 --- /dev/null +++ b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducerBuilder.kt @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.owl.producer.embedded + +import dev.usbharu.owl.producer.api.OwlProducerBuilder + +class EmbeddedGrpcOwlProducerBuilder : OwlProducerBuilder { + private var config = config() + + override fun config(): EmbeddedGrpcOwlProducerConfig { + return EmbeddedGrpcOwlProducerConfig() + } + + override fun build(): EmbeddedGrpcOwlProducer { + return EmbeddedGrpcOwlProducer( + config + ) + } + + override fun apply(owlProducerConfig: EmbeddedGrpcOwlProducerConfig) { + this.config = owlProducerConfig + } +} + +val EMBEDDED_GRPC by lazy { EmbeddedGrpcOwlProducerBuilder() } \ No newline at end of file diff --git a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducerConfig.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducerConfig.kt new file mode 100644 index 00000000..1efe8bbe --- /dev/null +++ b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducerConfig.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.owl.producer.embedded + +import dev.usbharu.owl.broker.ModuleContext +import dev.usbharu.owl.common.retry.RetryPolicyFactory +import dev.usbharu.owl.producer.api.OwlProducer +import dev.usbharu.owl.producer.api.OwlProducerConfig + +class EmbeddedGrpcOwlProducerConfig : OwlProducerConfig { + lateinit var moduleContext: ModuleContext + lateinit var retryPolicyFactory: RetryPolicyFactory + lateinit var port: String + lateinit var owlProducer: OwlProducer +} \ No newline at end of file diff --git a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt index def3b5fb..b31890a3 100644 --- a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt +++ b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt @@ -16,9 +16,9 @@ package dev.usbharu.owl.producer.embedded -import dev.usbharu.owl.broker.ModuleContext import dev.usbharu.owl.broker.OwlBrokerApplication import dev.usbharu.owl.broker.service.* +import dev.usbharu.owl.common.retry.RetryPolicyFactory import dev.usbharu.owl.common.task.PublishedTask import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition @@ -32,10 +32,7 @@ import java.util.* import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinition as BrokerTaskDefinition class EmbeddedOwlProducer( - private val moduleContext: ModuleContext, - private val retryPolicyFactory: RetryPolicyFactory, - private val name: String, - private val port: Int, + private val embeddedOwlProducerConfig: EmbeddedOwlProducerConfig, ) : OwlProducer { private lateinit var producerId: UUID @@ -50,17 +47,22 @@ class EmbeddedOwlProducer( val module = module { single { - retryPolicyFactory + embeddedOwlProducerConfig.retryPolicyFactory } } - modules(module, defaultModule, moduleContext.module()) + modules(module, defaultModule, embeddedOwlProducerConfig.moduleContext.module()) }.koin val producerService = application.get() - producerId = producerService.registerProducer(RegisterProducerRequest(name, name)) + producerId = producerService.registerProducer( + RegisterProducerRequest( + embeddedOwlProducerConfig.name, + embeddedOwlProducerConfig.name + ) + ) - application.get().start(port) + application.get().start(embeddedOwlProducerConfig.port.toInt()) } override suspend fun registerTask(taskDefinition: TaskDefinition) { diff --git a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerBuilder.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerBuilder.kt new file mode 100644 index 00000000..3a73cb08 --- /dev/null +++ b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerBuilder.kt @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.owl.producer.embedded + +import dev.usbharu.owl.broker.EmptyModuleContext +import dev.usbharu.owl.common.retry.DefaultRetryPolicyFactory +import dev.usbharu.owl.producer.api.OwlProducerBuilder + +class EmbeddedOwlProducerBuilder : OwlProducerBuilder { + var config: EmbeddedOwlProducerConfig = config() + + override fun config(): EmbeddedOwlProducerConfig { + val embeddedOwlProducerConfig = EmbeddedOwlProducerConfig() + + with(embeddedOwlProducerConfig) { + moduleContext = EmptyModuleContext + retryPolicyFactory = DefaultRetryPolicyFactory(emptyMap()) + name = "embedded-owl-producer" + port = "50051" + } + + return embeddedOwlProducerConfig + } + + override fun build(): EmbeddedOwlProducer { + return EmbeddedOwlProducer( + config + ) + } + + override fun apply(owlProducerConfig: EmbeddedOwlProducerConfig) { + this.config = owlProducerConfig + } + +} + +val EMBEDDED by lazy { EmbeddedOwlProducerBuilder() } \ No newline at end of file diff --git a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerConfig.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerConfig.kt new file mode 100644 index 00000000..086ad5bc --- /dev/null +++ b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerConfig.kt @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.owl.producer.embedded + +import dev.usbharu.owl.broker.ModuleContext +import dev.usbharu.owl.common.retry.RetryPolicyFactory +import dev.usbharu.owl.producer.api.OwlProducerConfig + +class EmbeddedOwlProducerConfig : OwlProducerConfig { + lateinit var moduleContext: ModuleContext + lateinit var retryPolicyFactory: RetryPolicyFactory + lateinit var name: String + lateinit var port: String +} From bb5cef6c22a2fcb3d2535ac251ebcce08794bba7 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 8 May 2024 18:55:12 +0900 Subject: [PATCH 12/24] =?UTF-8?q?feat:=20KJOB=E3=81=AE=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=AE=87=E6=89=80=E3=82=92=E3=81=AA=E3=81=8F=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../activity/accept/ApSendAcceptService.kt | 6 +- .../block/APDeliverBlockJobProcessor.kt | 52 ----- .../activity/block/APSendBlockService.kt | 40 ++-- .../create/ApSendCreateServiceImpl.kt | 8 +- .../delete/APDeliverDeleteJobProcessor.kt | 39 ---- .../activity/delete/APSendDeleteService.kt | 6 +- .../activity/follow/APFollowProcessor.kt | 6 +- .../follow/APReceiveFollowJobProcessor.kt | 63 ------- .../activity/like/APReactionService.kt | 35 +++- .../activity/like/ApReactionJobProcessor.kt | 52 ----- .../like/ApRemoveReactionJobProcessor.kt | 59 ------ .../reject/ApSendRejectServiceImpl.kt | 6 +- .../activity/undo/APSendUndoServiceImpl.kt | 10 +- .../objects/note/ApNoteJobProcessor.kt | 58 ------ .../application/config/JobQueueRunner.kt | 56 ------ .../hideout/application/config/OwlConfig.kt | 3 - .../core/external/job/DeliverAcceptJob.kt | 54 ------ .../core/external/job/DeliverAcceptTask.kt | 54 ++++++ .../core/external/job/DeliverBlockJob.kt | 69 ------- .../core/external/job/DeliverCreateTask.kt | 54 ++++++ .../core/external/job/DeliverDeleteJob.kt | 53 ------ .../core/external/job/DeliverDeleteTask.kt | 54 ++++++ .../core/external/job/DeliverReactionTask.kt | 33 +++- .../core/external/job/DeliverRejectJob.kt | 49 ++--- .../core/external/job/DeliverUndoJob.kt | 55 ------ .../core/external/job/DeliverUndoTask.kt | 54 ++++++ .../hideout/core/external/job/HideoutJob.kt | 178 ------------------ .../hideout/core/external/job/InboxTask.kt | 28 +++ .../core/external/job/ReceiveFollowTask.kt | 28 +++ .../kjobexposed/KJobJobQueueParentService.kt | 58 ------ .../kjobexposed/KJobJobQueueWorkerService.kt | 70 ------- .../KJobMongoJobQueueWorkerService.kt | 84 --------- .../KjobMongoJobQueueParentService.kt | 65 ------- .../hideout/core/service/job/JobProcessor.kt | 25 --- .../core/service/job/JobQueueWorkerService.kt | 31 --- .../accept/APDeliverAcceptJobProcessorTest.kt | 86 --------- .../accept/ApSendAcceptServiceImplTest.kt | 61 ------ .../block/APDeliverBlockJobProcessorTest.kt | 94 --------- .../create/ApSendCreateServiceImplTest.kt | 94 --------- .../like/APReactionServiceImplTest.kt | 114 ----------- .../service/common/APServiceImplTest.kt | 26 +-- .../MastodonStatusesApiControllerTest.kt | 1 - .../MastodonTimelineApiControllerTest.kt | 1 - .../account/AccountApiServiceImplTest.kt | 1 - hideout-worker/build.gradle.kts | 36 ++++ .../hideout/worker/DeliverAcceptTaskRunner.kt | 28 ++- .../hideout/worker/DeliverCreateTaskRunner.kt | 37 ++-- .../hideout/worker/DeliverDeleteTaskRunner.kt | 38 ++++ .../worker/DeliverReactionTaskRunner.kt | 44 +++++ .../hideout/worker/DeliverRejectTaskRunner.kt | 37 ++-- .../hideout/worker/DeliverUndoTaskRunner.kt | 33 ++-- .../usbharu/hideout/worker/InboxTaskRunner.kt | 136 ++++++------- .../hideout/worker/ReceiveFollowTaskRunner.kt | 53 ++++++ libs.versions.toml | 4 + .../owl/consumer/AbstractTaskRunner.kt | 26 +-- .../dev/usbharu/owl/consumer/Consumer.kt | 6 +- .../consumer/ServiceLoaderTaskRunnerLoader.kt | 20 +- .../owl/consumer/StandaloneConsumer.kt | 26 +-- .../dev/usbharu/owl/consumer/TaskResult.kt | 10 +- .../usbharu/owl/consumer/TaskRunnerLoader.kt | 13 +- 61 files changed, 784 insertions(+), 1837 deletions(-) delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessor.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeliverDeleteJobProcessor.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobProcessor.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobProcessor.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApRemoveReactionJobProcessor.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobProcessor.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptJob.kt create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptTask.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteJob.kt create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoJob.kt create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/HideoutJob.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueParentService.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueWorkerService.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KJobMongoJobQueueWorkerService.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KjobMongoJobQueueParentService.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobProcessor.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueWorkerService.kt delete mode 100644 hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessorTest.kt delete mode 100644 hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptServiceImplTest.kt delete mode 100644 hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessorTest.kt delete mode 100644 hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImplTest.kt delete mode 100644 hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt rename hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APDeliverUndoJobProcessor.kt => hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverCreateTaskRunner.kt (51%) create mode 100644 hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverDeleteTaskRunner.kt create mode 100644 hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverReactionTaskRunner.kt rename hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessor.kt => hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverRejectTaskRunner.kt (51%) rename hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/APDeliverRejectJobProcessor.kt => hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverUndoTaskRunner.kt (55%) rename hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt => hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/InboxTaskRunner.kt (79%) create mode 100644 hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/ReceiveFollowTaskRunner.kt rename hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueParentService.kt => owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/AbstractTaskRunner.kt (50%) rename hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRemoveReactionTask.kt => owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/ServiceLoaderTaskRunnerLoader.kt (65%) rename hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverPostTask.kt => owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunnerLoader.kt (70%) diff --git a/.gitignore b/.gitignore index 6654d55e..215512d0 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ out/ /files/ *.log +/hideout-core/files/ diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptService.kt index f9487f5d..ea1793e6 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptService.kt @@ -19,7 +19,7 @@ package dev.usbharu.hideout.activitypub.service.activity.accept import dev.usbharu.hideout.activitypub.domain.model.Accept import dev.usbharu.hideout.activitypub.domain.model.Follow import dev.usbharu.hideout.core.domain.model.actor.Actor -import dev.usbharu.hideout.core.external.job.DeliverAcceptJobParam +import dev.usbharu.hideout.core.external.job.DeliverAcceptTask import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service @@ -32,7 +32,7 @@ class ApSendAcceptServiceImpl( private val owlProducer: OwlProducer, ) : ApSendAcceptService { override suspend fun sendAcceptFollow(actor: Actor, target: Actor) { - val deliverAcceptJobParam = DeliverAcceptJobParam( + val deliverAcceptTask = DeliverAcceptTask( Accept( apObject = Follow( apObject = actor.url, @@ -44,6 +44,6 @@ class ApSendAcceptServiceImpl( actor.id ) - owlProducer.publishTask(deliverAcceptJobParam) + owlProducer.publishTask(deliverAcceptTask) } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessor.kt deleted file mode 100644 index b91b41b8..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessor.kt +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.activitypub.service.activity.block - -import dev.usbharu.hideout.activitypub.service.common.APRequestService -import dev.usbharu.hideout.application.external.Transaction -import dev.usbharu.hideout.core.domain.model.actor.ActorRepository -import dev.usbharu.hideout.core.external.job.DeliverBlockJob -import dev.usbharu.hideout.core.external.job.DeliverBlockJobParam -import dev.usbharu.hideout.core.service.job.JobProcessor -import org.springframework.stereotype.Service - -/** - * ブロックアクティビティ配送を処理します - */ -@Service -class APDeliverBlockJobProcessor( - private val apRequestService: APRequestService, - private val actorRepository: ActorRepository, - private val transaction: Transaction, - private val deliverBlockJob: DeliverBlockJob -) : JobProcessor { - override suspend fun process(param: DeliverBlockJobParam): Unit = transaction.transaction { - val signer = actorRepository.findById(param.signer) - apRequestService.apPost( - param.inbox, - param.reject, - signer - ) - apRequestService.apPost( - param.inbox, - param.block, - signer - ) - } - - override fun job(): DeliverBlockJob = deliverBlockJob -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APSendBlockService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APSendBlockService.kt index 50fac669..fb69f5dd 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APSendBlockService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APSendBlockService.kt @@ -16,12 +16,8 @@ package dev.usbharu.hideout.activitypub.service.activity.block -import dev.usbharu.hideout.activitypub.domain.model.Block -import dev.usbharu.hideout.activitypub.domain.model.Follow -import dev.usbharu.hideout.activitypub.domain.model.Reject import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.core.domain.model.actor.Actor -import dev.usbharu.hideout.core.external.job.DeliverBlockJobParam import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service @@ -35,23 +31,23 @@ class ApSendBlockServiceImpl( private val owlProducer: OwlProducer, ) : APSendBlockService { override suspend fun sendBlock(actor: Actor, target: Actor) { - val blockJobParam = DeliverBlockJobParam( - actor.id, - Block( - actor.url, - "${applicationConfig.url}/block/${actor.id}/${target.id}", - target.url - ), - Reject( - actor.url, - "${applicationConfig.url}/reject/${actor.id}/${target.id}", - Follow( - apObject = actor.url, - actor = target.url - ) - ), - target.inbox - ) - owlProducer.publishTask(blockJobParam) +// val blockJobParam = DeliverBlockJobParam( +// actor.id, +// Block( +// actor.url, +// "${applicationConfig.url}/block/${actor.id}/${target.id}", +// target.url +// ), +// Reject( +// actor.url, +// "${applicationConfig.url}/reject/${actor.id}/${target.id}", +// Follow( +// apObject = actor.url, +// actor = target.url +// ) +// ), +// target.inbox +// ) +// owlProducer.publishTask(blockJobParam) } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImpl.kt index 76793b91..0fb4a1e8 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImpl.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImpl.kt @@ -16,7 +16,6 @@ package dev.usbharu.hideout.activitypub.service.activity.create -import com.fasterxml.jackson.databind.ObjectMapper import dev.usbharu.hideout.activitypub.domain.model.Create import dev.usbharu.hideout.activitypub.query.NoteQueryService import dev.usbharu.hideout.application.config.ApplicationConfig @@ -24,9 +23,8 @@ import dev.usbharu.hideout.core.domain.exception.resource.PostNotFoundException import dev.usbharu.hideout.core.domain.exception.resource.UserNotFoundException import dev.usbharu.hideout.core.domain.model.actor.ActorRepository import dev.usbharu.hideout.core.domain.model.post.Post -import dev.usbharu.hideout.core.external.job.DeliverPostTask +import dev.usbharu.hideout.core.external.job.DeliverCreateTask import dev.usbharu.hideout.core.query.FollowerQueryService -import dev.usbharu.hideout.core.service.job.JobQueueParentService import dev.usbharu.owl.producer.api.OwlProducer import org.slf4j.LoggerFactory import org.springframework.stereotype.Service @@ -34,8 +32,6 @@ import org.springframework.stereotype.Service @Service class ApSendCreateServiceImpl( private val followerQueryService: FollowerQueryService, - private val objectMapper: ObjectMapper, - private val jobQueueParentService: JobQueueParentService, private val noteQueryService: NoteQueryService, private val applicationConfig: ApplicationConfig, private val actorRepository: ActorRepository, @@ -58,7 +54,7 @@ class ApSendCreateServiceImpl( id = "${applicationConfig.url}/create/note/${post.id}" ) followers.forEach { followerEntity -> - owlProducer.publishTask(DeliverPostTask(create, userEntity.url, followerEntity.inbox)) + owlProducer.publishTask(DeliverCreateTask(create, userEntity.url, followerEntity.inbox)) } logger.debug("SUCCESS Create Local Note ${post.url}") diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeliverDeleteJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeliverDeleteJobProcessor.kt deleted file mode 100644 index 53fd000e..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APDeliverDeleteJobProcessor.kt +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.activitypub.service.activity.delete - -import dev.usbharu.hideout.activitypub.service.common.APRequestService -import dev.usbharu.hideout.application.external.Transaction -import dev.usbharu.hideout.core.domain.model.actor.ActorRepository -import dev.usbharu.hideout.core.external.job.DeliverDeleteJob -import dev.usbharu.hideout.core.external.job.DeliverDeleteJobParam -import dev.usbharu.hideout.core.service.job.JobProcessor -import org.springframework.stereotype.Service - -@Service -class APDeliverDeleteJobProcessor( - private val apRequestService: APRequestService, - private val transaction: Transaction, - private val deliverDeleteJob: DeliverDeleteJob, - private val actorRepository: ActorRepository -) : JobProcessor { - override suspend fun process(param: DeliverDeleteJobParam): Unit = transaction.transaction { - apRequestService.apPost(param.inbox, param.delete, actorRepository.findById(param.signer)) - } - - override fun job(): DeliverDeleteJob = deliverDeleteJob -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APSendDeleteService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APSendDeleteService.kt index a4e8d40c..4570808d 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APSendDeleteService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/delete/APSendDeleteService.kt @@ -24,7 +24,7 @@ import dev.usbharu.hideout.core.domain.exception.resource.UserNotFoundException import dev.usbharu.hideout.core.domain.model.actor.Actor import dev.usbharu.hideout.core.domain.model.actor.ActorRepository import dev.usbharu.hideout.core.domain.model.post.Post -import dev.usbharu.hideout.core.external.job.DeliverDeleteJobParam +import dev.usbharu.hideout.core.external.job.DeliverDeleteTask import dev.usbharu.hideout.core.query.FollowerQueryService import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service @@ -55,7 +55,7 @@ class APSendDeleteServiceImpl( ) followersById.forEach { - val jobProps = DeliverDeleteJobParam( + val jobProps = DeliverDeleteTask( delete, it.inbox, actor.id @@ -76,7 +76,7 @@ class APSendDeleteServiceImpl( ) followers.forEach { - DeliverDeleteJobParam( + DeliverDeleteTask( delete = delete, it.inbox, deletedActor.id diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt index 62f21276..751c59f3 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt @@ -22,7 +22,7 @@ import dev.usbharu.hideout.activitypub.service.common.AbstractActivityPubProcess import dev.usbharu.hideout.activitypub.service.common.ActivityPubProcessContext import dev.usbharu.hideout.activitypub.service.common.ActivityType import dev.usbharu.hideout.application.external.Transaction -import dev.usbharu.hideout.core.external.job.ReceiveFollowJobParam +import dev.usbharu.hideout.core.external.job.ReceiveFollowTask import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service @@ -37,9 +37,9 @@ class APFollowProcessor( logger.info("FOLLOW from: {} to {}", activity.activity.actor, activity.activity.apObject) // inboxをジョブキューに乗せているので既に不要だが、フォロー承認制アカウントを実装する際に必要なので残す - val jobProps = ReceiveFollowJobParam( + val jobProps = ReceiveFollowTask( activity.activity.actor, - objectMapper.writeValueAsString(activity.activity), + activity.activity, activity.activity.apObject ) owlProducer.publishTask(jobProps) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobProcessor.kt deleted file mode 100644 index 0feaf7e5..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowJobProcessor.kt +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.activitypub.service.activity.follow - -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue -import dev.usbharu.hideout.activitypub.domain.model.Follow -import dev.usbharu.hideout.activitypub.service.objects.user.APUserService -import dev.usbharu.hideout.application.external.Transaction -import dev.usbharu.hideout.core.domain.exception.resource.UserNotFoundException -import dev.usbharu.hideout.core.domain.model.actor.ActorRepository -import dev.usbharu.hideout.core.external.job.ReceiveFollowJob -import dev.usbharu.hideout.core.external.job.ReceiveFollowJobParam -import dev.usbharu.hideout.core.service.job.JobProcessor -import dev.usbharu.hideout.core.service.relationship.RelationshipService -import org.slf4j.LoggerFactory -import org.springframework.stereotype.Service - -@Service -class APReceiveFollowJobProcessor( - private val transaction: Transaction, - private val apUserService: APUserService, - private val objectMapper: ObjectMapper, - private val relationshipService: RelationshipService, - private val actorRepository: ActorRepository -) : - JobProcessor { - override suspend fun process(param: ReceiveFollowJobParam) = transaction.transaction { - apUserService.fetchPerson(param.actor, param.targetActor) - val follow = objectMapper.readValue(param.follow) - - logger.info("START Follow from: {} to {}", param.targetActor, param.actor) - - val targetEntity = - actorRepository.findByUrl(param.targetActor) ?: throw UserNotFoundException.withUrl(param.targetActor) - val followActorEntity = - actorRepository.findByUrl(follow.actor) ?: throw UserNotFoundException.withUrl(follow.actor) - - relationshipService.followRequest(followActorEntity.id, targetEntity.id) - - logger.info("SUCCESS Follow from: {} to: {}", param.targetActor, param.actor) - } - - override fun job(): ReceiveFollowJob = ReceiveFollowJob - - companion object { - private val logger = LoggerFactory.getLogger(APReceiveFollowJobProcessor::class.java) - } -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt index 08d34f33..fac9ccff 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionService.kt @@ -16,16 +16,20 @@ package dev.usbharu.hideout.activitypub.service.activity.like +import dev.usbharu.hideout.activitypub.domain.model.Like +import dev.usbharu.hideout.activitypub.domain.model.Undo +import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.core.domain.exception.resource.PostNotFoundException import dev.usbharu.hideout.core.domain.exception.resource.UserNotFoundException import dev.usbharu.hideout.core.domain.model.actor.ActorRepository import dev.usbharu.hideout.core.domain.model.post.PostRepository import dev.usbharu.hideout.core.domain.model.reaction.Reaction import dev.usbharu.hideout.core.external.job.DeliverReactionTask -import dev.usbharu.hideout.core.external.job.DeliverRemoveReactionTask +import dev.usbharu.hideout.core.external.job.DeliverUndoTask import dev.usbharu.hideout.core.query.FollowerQueryService import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service +import java.time.Instant interface APReactionService { suspend fun reaction(like: Reaction) @@ -37,6 +41,7 @@ class APReactionServiceImpl( private val followerQueryService: FollowerQueryService, private val actorRepository: ActorRepository, private val postRepository: PostRepository, + private val applicationConfig: ApplicationConfig, private val owlProducer: OwlProducer, ) : APReactionService { override suspend fun reaction(like: Reaction) { @@ -48,10 +53,13 @@ class APReactionServiceImpl( owlProducer.publishTask( DeliverReactionTask( actor = user.url, - reaction = "❤", - inbox = follower.inbox, - postUrl = post.url, - id = post.id + like = Like( + actor = user.url, + id = "${applicationConfig.url}/like/note/${post.id}", + content = "❤", + apObject = post.url + ), + inbox = follower.inbox ) ) } @@ -64,11 +72,20 @@ class APReactionServiceImpl( postRepository.findById(like.postId) ?: throw PostNotFoundException.withId(like.postId) followers.forEach { follower -> owlProducer.publishTask( - DeliverRemoveReactionTask( - actor = user.url, + DeliverUndoTask( + signer = user.id, inbox = follower.inbox, - id = post.id, - reaction = like + undo = Undo( + actor = user.url, + id = "${applicationConfig.url}/undo/like/${post.id}", + apObject = Like( + actor = user.url, + id = "${applicationConfig.url}/like/note/${post.id}", + content = "❤", + apObject = post.url + ), + published = Instant.now().toString(), + ) ) ) } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobProcessor.kt deleted file mode 100644 index 7762964f..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobProcessor.kt +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.activitypub.service.activity.like - -import dev.usbharu.hideout.activitypub.domain.model.Like -import dev.usbharu.hideout.activitypub.service.common.APRequestService -import dev.usbharu.hideout.application.config.ApplicationConfig -import dev.usbharu.hideout.application.external.Transaction -import dev.usbharu.hideout.core.domain.model.actor.ActorRepository -import dev.usbharu.hideout.core.external.job.DeliverReactionJob -import dev.usbharu.hideout.core.external.job.DeliverReactionJobParam -import dev.usbharu.hideout.core.service.job.JobProcessor -import org.springframework.stereotype.Service - -@Service -class ApReactionJobProcessor( - private val apRequestService: APRequestService, - private val applicationConfig: ApplicationConfig, - private val transaction: Transaction, - private val actorRepository: ActorRepository -) : JobProcessor { - override suspend fun process(param: DeliverReactionJobParam): Unit = transaction.transaction { - val signer = actorRepository.findByUrl(param.actor) - - apRequestService.apPost( - param.inbox, - Like( - actor = param.actor, - apObject = param.postUrl, - id = "${applicationConfig.url}/liek/note/${param.id}", - content = param.reaction - ), - signer - ) - } - - override fun job(): DeliverReactionJob = DeliverReactionJob -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApRemoveReactionJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApRemoveReactionJobProcessor.kt deleted file mode 100644 index eb67b754..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApRemoveReactionJobProcessor.kt +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.activitypub.service.activity.like - -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue -import dev.usbharu.hideout.activitypub.domain.model.Like -import dev.usbharu.hideout.activitypub.domain.model.Undo -import dev.usbharu.hideout.activitypub.service.common.APRequestService -import dev.usbharu.hideout.application.config.ApplicationConfig -import dev.usbharu.hideout.application.external.Transaction -import dev.usbharu.hideout.core.domain.model.actor.ActorRepository -import dev.usbharu.hideout.core.external.job.DeliverRemoveReactionJob -import dev.usbharu.hideout.core.external.job.DeliverRemoveReactionJobParam -import dev.usbharu.hideout.core.service.job.JobProcessor -import org.springframework.stereotype.Service -import java.time.Instant - -@Service -class ApRemoveReactionJobProcessor( - private val transaction: Transaction, - private val objectMapper: ObjectMapper, - private val apRequestService: APRequestService, - private val applicationConfig: ApplicationConfig, - private val actorRepository: ActorRepository -) : JobProcessor { - override suspend fun process(param: DeliverRemoveReactionJobParam): Unit = transaction.transaction { - val like = objectMapper.readValue(param.like) - - val signer = actorRepository.findByUrl(param.actor) - - apRequestService.apPost( - param.inbox, - Undo( - actor = param.actor, - apObject = like, - id = "${applicationConfig.url}/undo/like/${param.id}", - published = Instant.now().toString() - ), - signer - ) - } - - override fun job(): DeliverRemoveReactionJob = DeliverRemoveReactionJob -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectServiceImpl.kt index eef398ed..eef8dc2f 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectServiceImpl.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/ApSendRejectServiceImpl.kt @@ -20,7 +20,7 @@ import dev.usbharu.hideout.activitypub.domain.model.Follow import dev.usbharu.hideout.activitypub.domain.model.Reject import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.core.domain.model.actor.Actor -import dev.usbharu.hideout.core.external.job.DeliverRejectJobParam +import dev.usbharu.hideout.core.external.job.DeliverRejectTask import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service @@ -30,7 +30,7 @@ class ApSendRejectServiceImpl( private val owlProducer: OwlProducer, ) : ApSendRejectService { override suspend fun sendRejectFollow(actor: Actor, target: Actor) { - val deliverRejectJobParam = DeliverRejectJobParam( + val deliverRejectTask = DeliverRejectTask( Reject( actor.url, "${applicationConfig.url}/reject/${actor.id}/${target.id}", @@ -40,6 +40,6 @@ class ApSendRejectServiceImpl( actor.id ) - owlProducer.publishTask(deliverRejectJobParam) + owlProducer.publishTask(deliverRejectTask) } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoServiceImpl.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoServiceImpl.kt index 342951ec..1022ebd0 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoServiceImpl.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APSendUndoServiceImpl.kt @@ -21,7 +21,7 @@ import dev.usbharu.hideout.activitypub.domain.model.Follow import dev.usbharu.hideout.activitypub.domain.model.Undo import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.core.domain.model.actor.Actor -import dev.usbharu.hideout.core.external.job.DeliverUndoJobParam +import dev.usbharu.hideout.core.external.job.DeliverUndoTask import dev.usbharu.owl.producer.api.OwlProducer import org.springframework.stereotype.Service import java.time.Instant @@ -32,7 +32,7 @@ class APSendUndoServiceImpl( private val owlProducer: OwlProducer, ) : APSendUndoService { override suspend fun sendUndoFollow(actor: Actor, target: Actor) { - val deliverUndoJobParam = DeliverUndoJobParam( + val deliverUndoTask = DeliverUndoTask( Undo( actor = actor.url, id = "${applicationConfig.url}/undo/follow/${actor.id}/${target.url}", @@ -46,11 +46,11 @@ class APSendUndoServiceImpl( actor.id ) - owlProducer.publishTask(deliverUndoJobParam) + owlProducer.publishTask(deliverUndoTask) } override suspend fun sendUndoBlock(actor: Actor, target: Actor) { - val deliverUndoJobParam = DeliverUndoJobParam( + val deliverUndoTask = DeliverUndoTask( Undo( actor = actor.url, id = "${applicationConfig.url}/undo/block/${actor.id}/${target.url}", @@ -65,6 +65,6 @@ class APSendUndoServiceImpl( actor.id ) - owlProducer.publishTask(deliverUndoJobParam) + owlProducer.publishTask(deliverUndoTask) } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobProcessor.kt deleted file mode 100644 index 0ad6e898..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/note/ApNoteJobProcessor.kt +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.activitypub.service.objects.note - -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue -import dev.usbharu.hideout.activitypub.domain.model.Create -import dev.usbharu.hideout.activitypub.service.common.APRequestService -import dev.usbharu.hideout.application.external.Transaction -import dev.usbharu.hideout.core.domain.model.actor.ActorRepository -import dev.usbharu.hideout.core.external.job.DeliverPostJob -import dev.usbharu.hideout.core.external.job.DeliverPostJobParam -import dev.usbharu.hideout.core.service.job.JobProcessor -import org.slf4j.LoggerFactory -import org.springframework.stereotype.Service - -@Service -class ApNoteJobProcessor( - private val transaction: Transaction, - private val objectMapper: ObjectMapper, - private val apRequestService: APRequestService, - private val actorRepository: ActorRepository -) : JobProcessor { - override suspend fun process(param: DeliverPostJobParam) { - val create = objectMapper.readValue(param.create) - transaction.transaction { - val signer = actorRepository.findByUrl(param.actor) - - logger.debug("CreateNoteJob: actor: {} create: {} inbox: {}", param.actor, create, param.inbox) - - apRequestService.apPost( - param.inbox, - create, - signer - ) - } - } - - override fun job(): DeliverPostJob = DeliverPostJob - - companion object { - private val logger = LoggerFactory.getLogger(ApNoteJobProcessor::class.java) - } -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt deleted file mode 100644 index 65fc9fcc..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/JobQueueRunner.kt +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.application.config - -import dev.usbharu.hideout.core.external.job.HideoutJob -import dev.usbharu.hideout.core.service.job.JobQueueParentService -import dev.usbharu.hideout.core.service.job.JobQueueWorkerService -import org.slf4j.Logger -import org.slf4j.LoggerFactory -import org.springframework.boot.ApplicationArguments -import org.springframework.boot.ApplicationRunner -import org.springframework.stereotype.Component - -@Component -class JobQueueRunner( - private val jobQueueParentService: JobQueueParentService, - private val jobs: List> -) : - ApplicationRunner { - override fun run(args: ApplicationArguments?) { - LOGGER.info("Init job queue. ${jobs.size}") - jobQueueParentService.init(jobs) - } - - companion object { - val LOGGER: Logger = LoggerFactory.getLogger(JobQueueRunner::class.java) - } -} - -@Component -class JobQueueWorkerRunner( - private val jobQueueWorkerService: JobQueueWorkerService, -) : ApplicationRunner { - override fun run(args: ApplicationArguments?) { - LOGGER.info("Init job queue worker.") - jobQueueWorkerService.init>(emptyList()) - } - - companion object { - val LOGGER: Logger = LoggerFactory.getLogger(JobQueueWorkerRunner::class.java) - } -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt index a58efc94..24acde80 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt @@ -39,19 +39,16 @@ class OwlConfig(private val producerConfig: ProducerConfig) { if (producerConfig.port != null) { this.port = producerConfig.port.toString() } - } } ProducerMode.GRPC -> { OWL(EMBEDDED_GRPC) { - } } ProducerMode.EMBEDDED_GRPC -> { OWL(DEFAULT) { - } } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptJob.kt deleted file mode 100644 index 59e10083..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptJob.kt +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.external.job - -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue -import dev.usbharu.hideout.activitypub.domain.model.Accept -import dev.usbharu.owl.common.task.Task -import kjob.core.dsl.ScheduleContext -import kjob.core.job.JobProps -import org.springframework.stereotype.Component - -data class DeliverAcceptJobParam( - val accept: Accept, - val inbox: String, - val signer: Long, -) : Task() - -@Component -class DeliverAcceptJob(private val objectMapper: ObjectMapper) : - HideoutJob("DeliverAcceptJob") { - - val accept = string("accept") - val inbox = string("inbox") - val signer = long("signer") - - override fun convert(value: DeliverAcceptJobParam): ScheduleContext.(DeliverAcceptJob) -> Unit = { - props[accept] = objectMapper.writeValueAsString(value.accept) - props[inbox] = value.inbox - props[signer] = value.signer - } - - override fun convert(props: JobProps): DeliverAcceptJobParam { - return DeliverAcceptJobParam( - objectMapper.readValue(props[accept]), - props[inbox], - props[signer] - ) - } -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptTask.kt new file mode 100644 index 00000000..a5893c71 --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptTask.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.core.external.job + +import dev.usbharu.hideout.activitypub.domain.model.Accept +import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.task.PropertyDefinition +import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition + +data class DeliverAcceptTask( + val accept: Accept, + val inbox: String, + val signer: Long, +) : Task() + +data object DeliverAcceptTaskDef : TaskDefinition { + override val name: String + get() = TODO("Not yet implemented") + override val priority: Int + get() = TODO("Not yet implemented") + override val maxRetry: Int + get() = TODO("Not yet implemented") + override val retryPolicy: String + get() = TODO("Not yet implemented") + override val timeoutMilli: Long + get() = TODO("Not yet implemented") + override val propertyDefinition: PropertyDefinition + get() = TODO("Not yet implemented") + override val type: Class + get() = TODO("Not yet implemented") + + override fun serialize(task: DeliverAcceptTask): Map> { + TODO("Not yet implemented") + } + + override fun deserialize(value: Map>): DeliverAcceptTask { + TODO("Not yet implemented") + } +} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt deleted file mode 100644 index 4b02ff73..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.external.job - -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue -import dev.usbharu.hideout.activitypub.domain.model.Block -import dev.usbharu.hideout.activitypub.domain.model.Reject -import dev.usbharu.owl.common.task.Task -import kjob.core.dsl.ScheduleContext -import kjob.core.job.JobProps -import org.springframework.beans.factory.annotation.Qualifier -import org.springframework.stereotype.Component - -/** - * ブロックアクティビティ配送のジョブパラメーター - * - * @property signer ブロック操作を行ったユーザーid - * @property block 配送するブロックアクティビティ - * @property reject 配送するフォロー解除アクティビティ - * @property inbox 配送先url - */ -data class DeliverBlockJobParam( - val signer: Long, - val block: Block, - val reject: Reject, - val inbox: String, -) : Task() - -/** - * ブロックアクティビティ配送のジョブ - */ -@Component -class DeliverBlockJob(@Qualifier("activitypub") private val objectMapper: ObjectMapper) : - HideoutJob("DeliverBlockJob") { - - val block = string("block") - val reject = string("reject") - val inbox = string("inbox") - val signer = long("signer") - - override fun convert(value: DeliverBlockJobParam): ScheduleContext.(DeliverBlockJob) -> Unit = { - props[block] = objectMapper.writeValueAsString(value.block) - props[reject] = objectMapper.writeValueAsString(value.reject) - props[inbox] = value.inbox - props[signer] = value.signer - } - - override fun convert(props: JobProps): DeliverBlockJobParam = DeliverBlockJobParam( - signer = props[signer], - block = objectMapper.readValue(props[block]), - reject = objectMapper.readValue(props[reject]), - inbox = props[inbox] - ) -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt new file mode 100644 index 00000000..1aabefc3 --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.core.external.job + +import dev.usbharu.hideout.activitypub.domain.model.Create +import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.task.PropertyDefinition +import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition + +data class DeliverCreateTask( + val create: Create, + val inbox: String, + val actor: String, +) : Task() + +data object DeliverCreateTaskDef : TaskDefinition { + override val name: String + get() = TODO("Not yet implemented") + override val priority: Int + get() = TODO("Not yet implemented") + override val maxRetry: Int + get() = TODO("Not yet implemented") + override val retryPolicy: String + get() = TODO("Not yet implemented") + override val timeoutMilli: Long + get() = TODO("Not yet implemented") + override val propertyDefinition: PropertyDefinition + get() = TODO("Not yet implemented") + override val type: Class + get() = TODO("Not yet implemented") + + override fun serialize(task: DeliverCreateTask): Map> { + TODO("Not yet implemented") + } + + override fun deserialize(value: Map>): DeliverCreateTask { + TODO("Not yet implemented") + } +} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteJob.kt deleted file mode 100644 index 5d3ce8b7..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteJob.kt +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.external.job - -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue -import dev.usbharu.hideout.activitypub.domain.model.Delete -import dev.usbharu.owl.common.task.Task -import kjob.core.dsl.ScheduleContext -import kjob.core.job.JobProps -import org.springframework.beans.factory.annotation.Qualifier -import org.springframework.stereotype.Component - -data class DeliverDeleteJobParam( - val delete: Delete, - val inbox: String, - val signer: Long, -) : Task() - -@Component -class DeliverDeleteJob(@Qualifier("activitypub") private val objectMapper: ObjectMapper) : - HideoutJob("DeliverDeleteJob") { - - val delete = string("delete") - val inbox = string("inbox") - val signer = long("signer") - - override fun convert(value: DeliverDeleteJobParam): ScheduleContext.(DeliverDeleteJob) -> Unit = { - props[delete] = objectMapper.writeValueAsString(value.delete) - props[inbox] = value.inbox - props[signer] = value.signer - } - - override fun convert(props: JobProps): DeliverDeleteJobParam = DeliverDeleteJobParam( - objectMapper.readValue(props[delete]), - props[inbox], - props[signer] - ) -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt new file mode 100644 index 00000000..801a917f --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.core.external.job + +import dev.usbharu.hideout.activitypub.domain.model.Delete +import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.task.PropertyDefinition +import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition + +data class DeliverDeleteTask( + val delete: Delete, + val inbox: String, + val signer: Long, +) : Task() + +data object DeliverDeleteTaskDef : TaskDefinition { + override val name: String + get() = TODO("Not yet implemented") + override val priority: Int + get() = TODO("Not yet implemented") + override val maxRetry: Int + get() = TODO("Not yet implemented") + override val retryPolicy: String + get() = TODO("Not yet implemented") + override val timeoutMilli: Long + get() = TODO("Not yet implemented") + override val propertyDefinition: PropertyDefinition + get() = TODO("Not yet implemented") + override val type: Class + get() = TODO("Not yet implemented") + + override fun serialize(task: DeliverDeleteTask): Map> { + TODO("Not yet implemented") + } + + override fun deserialize(value: Map>): DeliverDeleteTask { + TODO("Not yet implemented") + } +} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt index 3a11d541..e2f8001a 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt @@ -16,12 +16,39 @@ package dev.usbharu.hideout.core.external.job +import dev.usbharu.hideout.activitypub.domain.model.Like +import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition data class DeliverReactionTask( val actor: String, - val reaction: String, + val like: Like, val inbox: String, - val postUrl: String, - val id: Long, ) : Task() + +data object DeliverReactionTaskDef : TaskDefinition { + override val name: String + get() = TODO("Not yet implemented") + override val priority: Int + get() = TODO("Not yet implemented") + override val maxRetry: Int + get() = TODO("Not yet implemented") + override val retryPolicy: String + get() = TODO("Not yet implemented") + override val timeoutMilli: Long + get() = TODO("Not yet implemented") + override val propertyDefinition: PropertyDefinition + get() = TODO("Not yet implemented") + override val type: Class + get() = TODO("Not yet implemented") + + override fun deserialize(value: Map>): DeliverReactionTask { + TODO("Not yet implemented") + } + + override fun serialize(task: DeliverReactionTask): Map> { + TODO("Not yet implemented") + } +} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt index 85baa145..e675409c 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt @@ -16,38 +16,39 @@ package dev.usbharu.hideout.core.external.job -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue import dev.usbharu.hideout.activitypub.domain.model.Reject +import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task -import kjob.core.dsl.ScheduleContext -import kjob.core.job.JobProps -import org.springframework.beans.factory.annotation.Qualifier -import org.springframework.stereotype.Component +import dev.usbharu.owl.common.task.TaskDefinition -data class DeliverRejectJobParam( +data class DeliverRejectTask( val reject: Reject, val inbox: String, val signer: Long, ) : Task() -@Component -class DeliverRejectJob(@Qualifier("activitypub") private val objectMapper: ObjectMapper) : - HideoutJob("DeliverRejectJob") { - val reject = string("reject") - val inbox = string("inbox") - val signer = long("signer") +data object DeliverRejectTaskDef : TaskDefinition { + override val name: String + get() = TODO("Not yet implemented") + override val priority: Int + get() = TODO("Not yet implemented") + override val maxRetry: Int + get() = TODO("Not yet implemented") + override val retryPolicy: String + get() = TODO("Not yet implemented") + override val timeoutMilli: Long + get() = TODO("Not yet implemented") + override val propertyDefinition: PropertyDefinition + get() = TODO("Not yet implemented") + override val type: Class + get() = TODO("Not yet implemented") - override fun convert(value: DeliverRejectJobParam): ScheduleContext.(DeliverRejectJob) -> Unit = - { - props[reject] = objectMapper.writeValueAsString(value.reject) - props[inbox] = value.inbox - props[signer] = value.signer - } + override fun serialize(task: DeliverRejectTask): Map> { + TODO("Not yet implemented") + } - override fun convert(props: JobProps): DeliverRejectJobParam = DeliverRejectJobParam( - objectMapper.readValue(props[reject]), - props[inbox], - props[signer] - ) + override fun deserialize(value: Map>): DeliverRejectTask { + TODO("Not yet implemented") + } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoJob.kt deleted file mode 100644 index f89c6d62..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoJob.kt +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.external.job - -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue -import dev.usbharu.hideout.activitypub.domain.model.Undo -import dev.usbharu.owl.common.task.Task -import kjob.core.dsl.ScheduleContext -import kjob.core.job.JobProps -import org.springframework.beans.factory.annotation.Qualifier -import org.springframework.stereotype.Component - -data class DeliverUndoJobParam( - val undo: Undo, - val inbox: String, - val signer: Long, -) : Task() - -@Component -class DeliverUndoJob(@Qualifier("activitypub") private val objectMapper: ObjectMapper) : - HideoutJob("DeliverUndoJob") { - - val undo = string("undo") - val inbox = string("inbox") - val signer = long("signer") - - override fun convert(value: DeliverUndoJobParam): ScheduleContext.(DeliverUndoJob) -> Unit = { - props[undo] = objectMapper.writeValueAsString(value.undo) - props[inbox] = value.inbox - props[signer] = value.signer - } - - override fun convert(props: JobProps): DeliverUndoJobParam { - return DeliverUndoJobParam( - objectMapper.readValue(props[undo]), - props[inbox], - props[signer] - ) - } -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt new file mode 100644 index 00000000..f0ae462f --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.core.external.job + +import dev.usbharu.hideout.activitypub.domain.model.Undo +import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.task.PropertyDefinition +import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition + +data class DeliverUndoTask( + val undo: Undo, + val inbox: String, + val signer: Long, +) : Task() + +data object DeliverUndoTaskDef : TaskDefinition { + override val name: String + get() = TODO("Not yet implemented") + override val priority: Int + get() = TODO("Not yet implemented") + override val maxRetry: Int + get() = TODO("Not yet implemented") + override val retryPolicy: String + get() = TODO("Not yet implemented") + override val timeoutMilli: Long + get() = TODO("Not yet implemented") + override val propertyDefinition: PropertyDefinition + get() = TODO("Not yet implemented") + override val type: Class + get() = TODO("Not yet implemented") + + override fun deserialize(value: Map>): DeliverUndoTask { + TODO("Not yet implemented") + } + + override fun serialize(task: DeliverUndoTask): Map> { + TODO("Not yet implemented") + } +} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/HideoutJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/HideoutJob.kt deleted file mode 100644 index 26d8a1cf..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/HideoutJob.kt +++ /dev/null @@ -1,178 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.external.job - -import dev.usbharu.hideout.activitypub.service.common.ActivityType -import dev.usbharu.owl.common.task.Task -import kjob.core.Job -import kjob.core.Prop -import kjob.core.dsl.ScheduleContext -import kjob.core.job.JobProps -import org.springframework.stereotype.Component - -abstract class HideoutJob>(name: String) : Job(name) { - abstract fun convert(value: @UnsafeVariance T): ScheduleContext<@UnsafeVariance R>.(@UnsafeVariance R) -> Unit - fun convertUnsafe(props: JobProps<*>): T = convert(props as JobProps) - abstract fun convert(props: JobProps<@UnsafeVariance R>): T -} - -data class ReceiveFollowJobParam( - val actor: String, - val follow: String, - val targetActor: String, -) : Task() - -@Component -object ReceiveFollowJob : HideoutJob("ReceiveFollowJob") { - val actor: Prop = string("actor") - val follow: Prop = string("follow") - val targetActor: Prop = string("targetActor") - - override fun convert(value: ReceiveFollowJobParam): ScheduleContext.(ReceiveFollowJob) -> Unit = { - props[follow] = value.follow - props[actor] = value.actor - props[targetActor] = value.targetActor - } - - override fun convert(props: JobProps): ReceiveFollowJobParam = ReceiveFollowJobParam( - actor = props[actor], - follow = props[follow], - targetActor = props[targetActor] - ) -} - -data class DeliverPostJobParam( - val create: String, - val inbox: String, - val actor: String -) - -@Component -object DeliverPostJob : HideoutJob("DeliverPostJob") { - val create = string("create") - val inbox = string("inbox") - val actor = string("actor") - override fun convert(value: DeliverPostJobParam): ScheduleContext.(DeliverPostJob) -> Unit = { - props[create] = value.create - props[inbox] = value.inbox - props[actor] = value.actor - } - - override fun convert(props: JobProps): DeliverPostJobParam = DeliverPostJobParam( - create = props[create], - inbox = props[inbox], - actor = props[actor] - ) -} - -data class DeliverReactionJobParam( - val reaction: String, - val postUrl: String, - val actor: String, - val inbox: String, - val id: String -) - -@Component -object DeliverReactionJob : HideoutJob("DeliverReactionJob") { - val reaction: Prop = string("reaction") - val postUrl: Prop = string("postUrl") - val actor: Prop = string("actor") - val inbox: Prop = string("inbox") - val id: Prop = string("id") - override fun convert( - value: DeliverReactionJobParam - ): ScheduleContext.(DeliverReactionJob) -> Unit = - { - props[reaction] = value.reaction - props[postUrl] = value.postUrl - props[actor] = value.actor - props[inbox] = value.inbox - props[id] = value.id - } - - override fun convert(props: JobProps): DeliverReactionJobParam = DeliverReactionJobParam( - props[reaction], - props[postUrl], - props[actor], - props[inbox], - props[id] - ) -} - -data class DeliverRemoveReactionJobParam( - val id: String, - val inbox: String, - val actor: String, - val like: String -) - -@Component -object DeliverRemoveReactionJob : - HideoutJob("DeliverRemoveReactionJob") { - val id: Prop = string("id") - val inbox: Prop = string("inbox") - val actor: Prop = string("actor") - val like: Prop = string("like") - - override fun convert( - value: DeliverRemoveReactionJobParam - ): ScheduleContext.(DeliverRemoveReactionJob) -> Unit = - { - props[id] = value.id - props[inbox] = value.inbox - props[actor] = value.actor - props[like] = value.like - } - - override fun convert(props: JobProps): DeliverRemoveReactionJobParam = - DeliverRemoveReactionJobParam( - id = props[id], - inbox = props[inbox], - actor = props[actor], - like = props[like] - ) -} - -data class InboxJobParam( - val json: String, - val type: ActivityType, - val httpRequest: String, - val headers: String -) - -@Component -object InboxJob : HideoutJob("InboxJob") { - val json = string("json") - val type = string("type") - val httpRequest = string("http_request") - val headers = string("headers") - - override fun convert(value: InboxJobParam): ScheduleContext.(InboxJob) -> Unit = { - props[json] = value.json - props[type] = value.type.name - props[httpRequest] = value.httpRequest - props[headers] = value.headers - } - - override fun convert(props: JobProps): InboxJobParam = InboxJobParam( - props[json], - ActivityType.valueOf(props[type]), - props[httpRequest], - props[headers] - ) -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt index fc281e2b..e5f0fc95 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt @@ -18,7 +18,10 @@ package dev.usbharu.hideout.core.external.job import dev.usbharu.hideout.activitypub.service.common.ActivityType import dev.usbharu.httpsignature.common.HttpRequest +import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition data class InboxTask( val json: String, @@ -26,3 +29,28 @@ data class InboxTask( val httpRequest: HttpRequest, val headers: Map>, ) : Task() + +data object InboxTaskDef : TaskDefinition { + override val name: String + get() = TODO("Not yet implemented") + override val priority: Int + get() = TODO("Not yet implemented") + override val maxRetry: Int + get() = TODO("Not yet implemented") + override val retryPolicy: String + get() = TODO("Not yet implemented") + override val timeoutMilli: Long + get() = TODO("Not yet implemented") + override val propertyDefinition: PropertyDefinition + get() = TODO("Not yet implemented") + override val type: Class + get() = TODO("Not yet implemented") + + override fun serialize(task: InboxTask): Map> { + TODO("Not yet implemented") + } + + override fun deserialize(value: Map>): InboxTask { + TODO("Not yet implemented") + } +} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt index f11b2b60..7dc1aac5 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt @@ -17,10 +17,38 @@ package dev.usbharu.hideout.core.external.job import dev.usbharu.hideout.activitypub.domain.model.Follow +import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition data class ReceiveFollowTask( val actor: String, val follow: Follow, val targetActor: String, ) : Task() + +data object ReceiveFollowTaskDef : TaskDefinition { + override val name: String + get() = TODO("Not yet implemented") + override val priority: Int + get() = TODO("Not yet implemented") + override val maxRetry: Int + get() = TODO("Not yet implemented") + override val retryPolicy: String + get() = TODO("Not yet implemented") + override val timeoutMilli: Long + get() = TODO("Not yet implemented") + override val propertyDefinition: PropertyDefinition + get() = TODO("Not yet implemented") + override val type: Class + get() = TODO("Not yet implemented") + + override fun deserialize(value: Map>): ReceiveFollowTask { + TODO("Not yet implemented") + } + + override fun serialize(task: ReceiveFollowTask): Map> { + TODO("Not yet implemented") + } +} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueParentService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueParentService.kt deleted file mode 100644 index 68ace348..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueParentService.kt +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.infrastructure.kjobexposed - -import dev.usbharu.hideout.core.external.job.HideoutJob -import dev.usbharu.hideout.core.service.job.JobQueueParentService -import kjob.core.Job -import kjob.core.KJob -import kjob.core.dsl.ScheduleContext -import kjob.core.kjob -import org.jetbrains.exposed.sql.transactions.TransactionManager -import org.slf4j.LoggerFactory -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty -import org.springframework.stereotype.Service - -@Service -@ConditionalOnProperty(name = ["hideout.use-mongodb"], havingValue = "false", matchIfMissing = true) -class KJobJobQueueParentService : JobQueueParentService { - - private val logger = LoggerFactory.getLogger(this::class.java) - - val kjob: KJob by lazy { - kjob(ExposedKJob) { - connectionDatabase = TransactionManager.defaultDatabase - isWorker = false - }.start() - } - - override fun init(jobDefines: List) = Unit - - @Deprecated("use type safe → scheduleTypeSafe") - override suspend fun schedule(job: J, block: ScheduleContext.(J) -> Unit) { - logger.debug("schedule job={}", job.name) - kjob.schedule(job, block) - } - - override suspend fun > scheduleTypeSafe(job: J, jobProps: T) { - logger.debug("SCHEDULE Job: {}", job.name) - logger.trace("Job props: {}", jobProps) - val convert: ScheduleContext.(J) -> Unit = job.convert(jobProps) - kjob.schedule(job, convert) - logger.debug("SUCCESS Schedule Job: {}", job.name) - } -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueWorkerService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueWorkerService.kt deleted file mode 100644 index d8df6469..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/KJobJobQueueWorkerService.kt +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.infrastructure.kjobexposed - -import dev.usbharu.hideout.core.external.job.HideoutJob -import dev.usbharu.hideout.core.service.job.JobProcessor -import dev.usbharu.hideout.core.service.job.JobQueueWorkerService -import kjob.core.dsl.JobContextWithProps -import kjob.core.dsl.JobRegisterContext -import kjob.core.dsl.KJobFunctions -import kjob.core.kjob -import org.jetbrains.exposed.sql.transactions.TransactionManager -import org.slf4j.MDC -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty -import org.springframework.stereotype.Service - -@Service -@ConditionalOnProperty(name = ["hideout.use-mongodb"], havingValue = "false", matchIfMissing = true) -class KJobJobQueueWorkerService(private val jobQueueProcessorList: List>) : JobQueueWorkerService { - - val kjob by lazy { - kjob(ExposedKJob) { - connectionDatabase = TransactionManager.defaultDatabase - nonBlockingMaxJobs = 10 - blockingMaxJobs = 10 - jobExecutionPeriodInSeconds = 1 - }.start() - } - - override fun > init( - defines: - List>.(R) -> KJobFunctions>>> - ) { - defines.forEach { job -> - kjob.register(job.first, job.second) - } - - for (jobProcessor in jobQueueProcessorList) { - kjob.register(jobProcessor.job()) { - execute { - @Suppress("TooGenericExceptionCaught") - try { - MDC.put("x-job-id", this.jobId) - val param = it.convertUnsafe(props) - jobProcessor.process(param) - } catch (e: Exception) { - logger.warn("FAILED Execute Job. job name: {} job id: {}", it.name, this.jobId, e) - throw e - } finally { - MDC.remove("x-job-id") - } - } - } - } - } -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KJobMongoJobQueueWorkerService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KJobMongoJobQueueWorkerService.kt deleted file mode 100644 index dc5c15e1..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KJobMongoJobQueueWorkerService.kt +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.infrastructure.kjobmongodb - -import com.mongodb.reactivestreams.client.MongoClient -import dev.usbharu.hideout.core.external.job.HideoutJob -import dev.usbharu.hideout.core.service.job.JobProcessor -import dev.usbharu.hideout.core.service.job.JobQueueWorkerService -import kjob.core.dsl.JobContextWithProps -import kjob.core.dsl.JobRegisterContext -import kjob.core.dsl.KJobFunctions -import kjob.core.job.JobExecutionType -import kjob.core.kjob -import kjob.mongo.Mongo -import kotlinx.coroutines.CancellationException -import org.slf4j.MDC -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty -import org.springframework.stereotype.Service - -@Service -@ConditionalOnProperty(name = ["hideout.use-mongodb"], havingValue = "true", matchIfMissing = false) -class KJobMongoJobQueueWorkerService( - private val mongoClient: MongoClient, - private val jobQueueProcessorList: List> -) : JobQueueWorkerService, AutoCloseable { - val kjob by lazy { - kjob(Mongo) { - client = mongoClient - nonBlockingMaxJobs = 10 - blockingMaxJobs = 10 - jobExecutionPeriodInSeconds = 1 - maxRetries = 3 - defaultJobExecutor = JobExecutionType.NON_BLOCKING - }.start() - } - - override fun > init( - defines: - List>.(R) -> KJobFunctions>>> - ) { - defines.forEach { job -> - kjob.register(job.first, job.second) - } - for (jobProcessor in jobQueueProcessorList) { - kjob.register(jobProcessor.job()) { - execute { - @Suppress("TooGenericExceptionCaught") - try { - MDC.put("x-job-id", this.jobId) - val param = it.convertUnsafe(props) - jobProcessor.process(param) - } catch (e: CancellationException) { - throw e - } catch (e: Exception) { - logger.warn("FAILED Excute Job. job name: {} job id: {}", it.name, this.jobId, e) - throw e - } finally { - MDC.remove("x-job-id") - } - }.onError { - logger.warn("FAILED Excute Job. job name: {} job id: {}", this.jobName, this.jobId, error) - } - } - } - } - - override fun close() { - kjob.shutdown() - } -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KjobMongoJobQueueParentService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KjobMongoJobQueueParentService.kt deleted file mode 100644 index b9e49f4c..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobmongodb/KjobMongoJobQueueParentService.kt +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.infrastructure.kjobmongodb - -import com.mongodb.reactivestreams.client.MongoClient -import dev.usbharu.hideout.core.external.job.HideoutJob -import dev.usbharu.hideout.core.service.job.JobQueueParentService -import kjob.core.Job -import kjob.core.dsl.ScheduleContext -import kjob.core.kjob -import kjob.mongo.Mongo -import org.slf4j.LoggerFactory -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty -import org.springframework.stereotype.Service - -@Service -@ConditionalOnProperty(name = ["hideout.use-mongodb"], havingValue = "true", matchIfMissing = false) -class KjobMongoJobQueueParentService(private val mongoClient: MongoClient) : JobQueueParentService, AutoCloseable { - private val kjob = kjob(Mongo) { - client = mongoClient - databaseName = "kjob" - jobCollection = "kjob-jobs" - lockCollection = "kjob-locks" - expireLockInMinutes = 5L - isWorker = false - }.start() - - override fun init(jobDefines: List) = Unit - - @Deprecated("use type safe → scheduleTypeSafe") - override suspend fun schedule(job: J, block: ScheduleContext.(J) -> Unit) { - logger.debug("SCHEDULE Job: {}", job.name) - kjob.schedule(job, block) - } - - override suspend fun > scheduleTypeSafe(job: J, jobProps: T) { - logger.debug("SCHEDULE Job: {}", job.name) - logger.trace("Job props: {}", jobProps) - val convert = job.convert(jobProps) - kjob.schedule(job, convert) - logger.debug("SUCCESS Job: {}", job.name) - } - - override fun close() { - kjob.shutdown() - } - - companion object { - private val logger = LoggerFactory.getLogger(KjobMongoJobQueueParentService::class.java) - } -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobProcessor.kt deleted file mode 100644 index cd33d1c4..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobProcessor.kt +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.service.job - -import dev.usbharu.hideout.core.external.job.HideoutJob - -@Deprecated("use owl") -interface JobProcessor> { - suspend fun process(param: @UnsafeVariance T) - fun job(): R -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueWorkerService.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueWorkerService.kt deleted file mode 100644 index d5577ee5..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueWorkerService.kt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.service.job - -import kjob.core.dsl.KJobFunctions -import org.springframework.stereotype.Service -import dev.usbharu.hideout.core.external.job.HideoutJob as HJ -import kjob.core.dsl.JobContextWithProps as JCWP -import kjob.core.dsl.JobRegisterContext as JRC - -@Deprecated("use owl") -@Service -interface JobQueueWorkerService { - fun > init( - defines: List>.(R) -> KJobFunctions>>> - ) -} diff --git a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessorTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessorTest.kt deleted file mode 100644 index 30f59887..00000000 --- a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessorTest.kt +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.activitypub.service.activity.accept - -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.core.domain.model.actor.ActorRepository -import dev.usbharu.hideout.core.external.job.DeliverAcceptJob -import dev.usbharu.hideout.core.external.job.DeliverAcceptJobParam -import kotlinx.coroutines.test.runTest -import org.assertj.core.api.Assertions.assertThat -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -import org.mockito.InjectMocks -import org.mockito.Mock -import org.mockito.Spy -import org.mockito.junit.jupiter.MockitoExtension -import org.mockito.kotlin.* -import utils.TestTransaction -import utils.UserBuilder - -@ExtendWith(MockitoExtension::class) -class APDeliverAcceptJobProcessorTest { - - @Mock - private lateinit var apRequestService: APRequestService - - @Mock - private lateinit var actorRepository: ActorRepository - - @Mock - private lateinit var deliverAcceptJob: DeliverAcceptJob - - @Spy - private val transaction = TestTransaction - - @InjectMocks - private lateinit var apDeliverAcceptJobProcessor: APDeliverAcceptJobProcessor - - @Test - fun `process apPostが発行される`() = runTest { - val user = UserBuilder.localUserOf() - - whenever(actorRepository.findById(eq(1))).doReturn(user) - - val accept = Accept( - apObject = Follow( - apObject = "https://example.com", - actor = "https://remote.example.com" - ), - actor = "https://example.com" - ) - val param = DeliverAcceptJobParam( - accept = accept, - "https://remote.example.com", - 1 - ) - - apDeliverAcceptJobProcessor.process(param) - - verify(apRequestService, times(1)).apPost(eq("https://remote.example.com"), eq(accept), eq(user)) - } - - @Test - fun `job DeliverAcceptJobが返ってくる`() { - val actual = apDeliverAcceptJobProcessor.job() - - assertThat(actual).isEqualTo(deliverAcceptJob) - - } -} diff --git a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptServiceImplTest.kt deleted file mode 100644 index b3b8e79b..00000000 --- a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApSendAcceptServiceImplTest.kt +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.activitypub.service.activity.accept - -import dev.usbharu.hideout.activitypub.domain.model.Accept -import dev.usbharu.hideout.activitypub.domain.model.Follow -import dev.usbharu.hideout.core.external.job.DeliverAcceptJob -import dev.usbharu.hideout.core.external.job.DeliverAcceptJobParam -import dev.usbharu.hideout.core.service.job.JobQueueParentService -import kotlinx.coroutines.test.runTest -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -import org.mockito.InjectMocks -import org.mockito.Mock -import org.mockito.junit.jupiter.MockitoExtension -import org.mockito.kotlin.eq -import org.mockito.kotlin.times -import org.mockito.kotlin.verify -import utils.UserBuilder - -@ExtendWith(MockitoExtension::class) -class ApSendAcceptServiceImplTest { - - @Mock - private lateinit var jobQueueParentService: JobQueueParentService - - @Mock - private lateinit var deliverAcceptJob: DeliverAcceptJob - - @InjectMocks - private lateinit var apSendAcceptServiceImpl: ApSendAcceptServiceImpl - - @Test - fun `sendAccept DeliverAcceptJobが発行される`() = runTest { - val user = UserBuilder.localUserOf() - val remoteUser = UserBuilder.remoteUserOf() - - apSendAcceptServiceImpl.sendAcceptFollow(user, remoteUser) - - val deliverAcceptJobParam = DeliverAcceptJobParam( - Accept(apObject = Follow(apObject = user.url, actor = remoteUser.url), actor = user.url), - remoteUser.inbox, - user.id - ) - verify(jobQueueParentService, times(1)).scheduleTypeSafe(eq(deliverAcceptJob), eq(deliverAcceptJobParam)) - } -} diff --git a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessorTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessorTest.kt deleted file mode 100644 index 2b7ba4d0..00000000 --- a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/block/APDeliverBlockJobProcessorTest.kt +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.activitypub.service.activity.block - -import dev.usbharu.hideout.activitypub.domain.model.Block -import dev.usbharu.hideout.activitypub.domain.model.Follow -import dev.usbharu.hideout.activitypub.domain.model.Reject -import dev.usbharu.hideout.activitypub.service.common.APRequestService -import dev.usbharu.hideout.core.domain.model.actor.ActorRepository -import dev.usbharu.hideout.core.external.job.DeliverBlockJob -import dev.usbharu.hideout.core.external.job.DeliverBlockJobParam -import kotlinx.coroutines.test.runTest -import org.assertj.core.api.Assertions.assertThat -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -import org.mockito.InjectMocks -import org.mockito.Mock -import org.mockito.Spy -import org.mockito.junit.jupiter.MockitoExtension -import org.mockito.kotlin.* -import utils.TestTransaction -import utils.UserBuilder - -@ExtendWith(MockitoExtension::class) -class APDeliverBlockJobProcessorTest { - - @Mock - private lateinit var apRequestService: APRequestService - - @Mock - private lateinit var actorRepository: ActorRepository - - @Spy - private val transaction = TestTransaction - - @Mock - private lateinit var deliverBlockJob: DeliverBlockJob - - @InjectMocks - private lateinit var apDeliverBlockJobProcessor: APDeliverBlockJobProcessor - - @Test - fun `process rejectとblockがapPostされる`() = runTest { - val user = UserBuilder.localUserOf() - whenever(actorRepository.findById(eq(user.id))).doReturn(user) - - - val block = Block( - actor = user.url, - "https://example.com/block", - apObject = "https://remote.example.com" - ) - val reject = Reject( - actor = user.url, - "https://example.com/reject/follow", - apObject = Follow( - apObject = user.url, - actor = "https://remote.example.com" - ) - ) - val param = DeliverBlockJobParam( - user.id, - block, - reject, - "https://remote.example.com" - ) - - - apDeliverBlockJobProcessor.process(param) - - verify(apRequestService, times(1)).apPost(eq("https://remote.example.com"), eq(block), eq(user)) - verify(apRequestService, times(1)).apPost(eq("https://remote.example.com"), eq(reject), eq(user)) - } - - @Test - fun `job deliverBlockJobが返ってくる`() { - val actual = apDeliverBlockJobProcessor.job() - assertThat(actual).isEqualTo(deliverBlockJob) - } -} diff --git a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImplTest.kt deleted file mode 100644 index 74377eff..00000000 --- a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/ApSendCreateServiceImplTest.kt +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.activitypub.service.activity.create - -import com.fasterxml.jackson.databind.ObjectMapper -import dev.usbharu.hideout.activitypub.domain.model.Note -import dev.usbharu.hideout.activitypub.query.NoteQueryService -import dev.usbharu.hideout.activitypub.service.objects.note.APNoteServiceImpl -import dev.usbharu.hideout.application.config.ActivityPubConfig -import dev.usbharu.hideout.application.config.ApplicationConfig -import dev.usbharu.hideout.core.domain.model.actor.ActorRepository -import dev.usbharu.hideout.core.external.job.DeliverPostJob -import dev.usbharu.hideout.core.query.FollowerQueryService -import dev.usbharu.hideout.core.service.job.JobQueueParentService -import kotlinx.coroutines.test.runTest -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith -import org.mockito.InjectMocks -import org.mockito.Mock -import org.mockito.Spy -import org.mockito.junit.jupiter.MockitoExtension -import org.mockito.kotlin.* -import utils.PostBuilder -import utils.UserBuilder -import java.net.URL -import java.time.Instant - -@ExtendWith(MockitoExtension::class) -class ApSendCreateServiceImplTest { - - @Mock - private lateinit var followerQueryService: FollowerQueryService - - @Spy - private val objectMapper: ObjectMapper = ActivityPubConfig().objectMapper() - - @Mock - private lateinit var jobQueueParentService: JobQueueParentService - - @Mock - private lateinit var actorRepository: ActorRepository - - @Mock - private lateinit var noteQueryService: NoteQueryService - - @Spy - private val applicationConfig: ApplicationConfig = ApplicationConfig(URL("https://example.com")) - - @InjectMocks - private lateinit var apSendCreateServiceImpl: ApSendCreateServiceImpl - - @Test - fun `createNote 正常なPostでCreateのジョブを発行できる`() = runTest { - val post = PostBuilder.of() - val user = UserBuilder.localUserOf(id = post.actorId) - val note = Note( - id = post.apId, - attributedTo = user.url, - content = post.text, - published = Instant.ofEpochMilli(post.createdAt).toString(), - to = listOfNotNull(APNoteServiceImpl.public, user.followers), - sensitive = post.sensitive, - cc = listOfNotNull(APNoteServiceImpl.public, user.followers), - inReplyTo = null - ) - val followers = listOf( - UserBuilder.remoteUserOf(), - UserBuilder.remoteUserOf(), - UserBuilder.remoteUserOf() - ) - - whenever(followerQueryService.findFollowersById(eq(post.actorId))).doReturn(followers) - whenever(actorRepository.findById(eq(post.actorId))).doReturn(user) - whenever(noteQueryService.findById(eq(post.id))).doReturn(note to post) - - apSendCreateServiceImpl.createNote(post) - - verify(jobQueueParentService, times(followers.size)).schedule(eq(DeliverPostJob), any()) - } -} diff --git a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt deleted file mode 100644 index fa1cd43e..00000000 --- a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.activitypub.service.activity.like - - -import dev.usbharu.hideout.application.service.id.TwitterSnowflakeIdGenerateService -import dev.usbharu.hideout.core.domain.model.actor.ActorRepository -import dev.usbharu.hideout.core.domain.model.emoji.UnicodeEmoji -import dev.usbharu.hideout.core.domain.model.post.PostRepository -import dev.usbharu.hideout.core.domain.model.reaction.Reaction -import dev.usbharu.hideout.core.external.job.DeliverReactionJob -import dev.usbharu.hideout.core.external.job.DeliverRemoveReactionJob -import dev.usbharu.hideout.core.query.FollowerQueryService -import dev.usbharu.hideout.core.service.job.JobQueueParentService -import kotlinx.coroutines.test.runTest -import org.junit.jupiter.api.Test -import org.mockito.kotlin.* -import utils.JsonObjectMapper.objectMapper -import utils.PostBuilder -import utils.UserBuilder - -class APReactionServiceImplTest { - @Test - fun `reaction リアクションするとフォロワーの数だけ配送ジョブが作成される`() = runTest { - - val user = UserBuilder.localUserOf() - val post = PostBuilder.of() - - val postQueryService = mock { - onBlocking { findById(eq(post.id)) } doReturn post - } - val followerQueryService = mock { - onBlocking { findFollowersById(eq(user.id)) } doReturn listOf( - UserBuilder.localUserOf(), - UserBuilder.localUserOf(), - UserBuilder.localUserOf() - ) - } - val jobQueueParentService = mock() - val actorRepository = mock { - onBlocking { findById(eq(user.id)) }.doReturn(user) - } - val apReactionServiceImpl = APReactionServiceImpl( - actorRepository = actorRepository, - followerQueryService = followerQueryService, - postRepository = postQueryService, - ) - - apReactionServiceImpl.reaction( - Reaction( - id = TwitterSnowflakeIdGenerateService.generateId(), - emoji = UnicodeEmoji("❤"), - postId = post.id, - actorId = user.id - ) - ) - - verify(jobQueueParentService, times(3)).schedule(eq(DeliverReactionJob), any()) - } - - @Test - fun `removeReaction リアクションを削除するとフォロワーの数だけ配送ジョブが作成される`() = runTest { - - val user = UserBuilder.localUserOf() - val post = PostBuilder.of() - - val postQueryService = mock { - onBlocking { findById(eq(post.id)) } doReturn post - } - val followerQueryService = mock { - onBlocking { findFollowersById(eq(user.id)) } doReturn listOf( - UserBuilder.localUserOf(), - UserBuilder.localUserOf(), - UserBuilder.localUserOf() - ) - } - val jobQueueParentService = mock() - val actorRepository = mock { - onBlocking { findById(eq(user.id)) }.doReturn(user) - } - val apReactionServiceImpl = APReactionServiceImpl( - jobQueueParentService = jobQueueParentService, - actorRepository = actorRepository, - followerQueryService = followerQueryService, - postRepository = postQueryService, - objectMapper = objectMapper - ) - - apReactionServiceImpl.removeReaction( - Reaction( - id = TwitterSnowflakeIdGenerateService.generateId(), - emoji = UnicodeEmoji("❤"), - postId = post.id, - actorId = user.id - ) - ) - - verify(jobQueueParentService, times(3)).schedule(eq(DeliverRemoveReactionJob), any()) - } -} diff --git a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APServiceImplTest.kt index 39c31feb..b924baeb 100644 --- a/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APServiceImplTest.kt +++ b/hideout-core/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APServiceImplTest.kt @@ -27,7 +27,7 @@ class APServiceImplTest { @Test fun `parseActivity 正常なActivityをパースできる`() { val apServiceImpl = APServiceImpl( - objectMapper = objectMapper, jobQueueParentService = mock() + objectMapper = objectMapper, owlProducer = mock() ) //language=JSON @@ -39,7 +39,7 @@ class APServiceImplTest { @Test fun `parseActivity Typeが配列のActivityをパースできる`() { val apServiceImpl = APServiceImpl( - objectMapper = objectMapper, jobQueueParentService = mock() + objectMapper = objectMapper, owlProducer = mock() ) //language=JSON @@ -51,7 +51,7 @@ class APServiceImplTest { @Test fun `parseActivity Typeが配列で関係ない物が入っていてもパースできる`() { val apServiceImpl = APServiceImpl( - objectMapper = objectMapper, jobQueueParentService = mock() + objectMapper = objectMapper, owlProducer = mock() ) //language=JSON @@ -64,7 +64,7 @@ class APServiceImplTest { fun `parseActivity jsonとして解釈できない場合JsonParseExceptionがthrowされる`() { val apServiceImpl = APServiceImpl( - objectMapper = objectMapper, jobQueueParentService = mock() + objectMapper = objectMapper, owlProducer = mock() ) //language=JSON @@ -77,7 +77,7 @@ class APServiceImplTest { fun `parseActivity 空の場合JsonParseExceptionがthrowされる`() { val apServiceImpl = APServiceImpl( - objectMapper = objectMapper, jobQueueParentService = mock() + objectMapper = objectMapper, owlProducer = mock() ) //language=JSON @@ -90,7 +90,7 @@ class APServiceImplTest { fun `parseActivity jsonにtypeプロパティがない場合JsonParseExceptionがthrowされる`() { val apServiceImpl = APServiceImpl( - objectMapper = objectMapper, jobQueueParentService = mock() + objectMapper = objectMapper, owlProducer = mock() ) //language=JSON @@ -103,7 +103,7 @@ class APServiceImplTest { fun `parseActivity typeが配列でないときtypeが未定義の場合IllegalArgumentExceptionがthrowされる`() { val apServiceImpl = APServiceImpl( - objectMapper = objectMapper, jobQueueParentService = mock() + objectMapper = objectMapper, owlProducer = mock() ) //language=JSON @@ -116,7 +116,7 @@ class APServiceImplTest { fun `parseActivity typeが配列のとき定義済みのtypeを見つけられなかった場合IllegalArgumentExceptionがthrowされる`() { val apServiceImpl = APServiceImpl( - objectMapper = objectMapper, jobQueueParentService = mock() + objectMapper = objectMapper, owlProducer = mock() ) //language=JSON @@ -129,7 +129,7 @@ class APServiceImplTest { fun `parseActivity typeが空の場合IllegalArgumentExceptionがthrowされる`() { val apServiceImpl = APServiceImpl( - objectMapper = objectMapper, jobQueueParentService = mock() + objectMapper = objectMapper, owlProducer = mock() ) //language=JSON @@ -142,7 +142,7 @@ class APServiceImplTest { fun `parseActivity typeに指定されている文字の判定がcase-insensitiveで行われる`() { val apServiceImpl = APServiceImpl( - objectMapper = objectMapper, jobQueueParentService = mock() + objectMapper = objectMapper, owlProducer = mock() ) //language=JSON @@ -155,7 +155,7 @@ class APServiceImplTest { fun `parseActivity typeが配列のとき指定されている文字の判定がcase-insensitiveで行われる`() { val apServiceImpl = APServiceImpl( - objectMapper = objectMapper, jobQueueParentService = mock() + objectMapper = objectMapper, owlProducer = mock() ) //language=JSON @@ -168,7 +168,7 @@ class APServiceImplTest { fun `parseActivity activityがarrayのときJsonParseExceptionがthrowされる`() { val apServiceImpl = APServiceImpl( - objectMapper = objectMapper, jobQueueParentService = mock() + objectMapper = objectMapper, owlProducer = mock() ) //language=JSON @@ -181,7 +181,7 @@ class APServiceImplTest { fun `parseActivity activityがvalueのときJsonParseExceptionがthrowされる`() { val apServiceImpl = APServiceImpl( - objectMapper = objectMapper, jobQueueParentService = mock() + objectMapper = objectMapper, owlProducer = mock() ) //language=JSON diff --git a/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiControllerTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiControllerTest.kt index 0e6a8d72..ff2047ea 100644 --- a/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiControllerTest.kt +++ b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/status/MastodonStatusesApiControllerTest.kt @@ -16,7 +16,6 @@ package dev.usbharu.hideout.mastodon.interfaces.api.status -import Status import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import dev.usbharu.hideout.core.infrastructure.springframework.security.OAuth2JwtLoginUserContextHolder import dev.usbharu.hideout.domain.mastodon.model.generated.Account diff --git a/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiControllerTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiControllerTest.kt index 9c411699..8302d0cf 100644 --- a/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiControllerTest.kt +++ b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiControllerTest.kt @@ -16,7 +16,6 @@ package dev.usbharu.hideout.mastodon.interfaces.api.timeline -import Status import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.application.infrastructure.exposed.PaginationList diff --git a/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiServiceImplTest.kt b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiServiceImplTest.kt index 76936027..de1477c6 100644 --- a/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiServiceImplTest.kt +++ b/hideout-core/src/test/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiServiceImplTest.kt @@ -16,7 +16,6 @@ package dev.usbharu.hideout.mastodon.service.account -import Status import dev.usbharu.hideout.application.external.Transaction import dev.usbharu.hideout.application.infrastructure.exposed.Page import dev.usbharu.hideout.application.infrastructure.exposed.PaginationList diff --git a/hideout-worker/build.gradle.kts b/hideout-worker/build.gradle.kts index 8ff28341..5397d66e 100644 --- a/hideout-worker/build.gradle.kts +++ b/hideout-worker/build.gradle.kts @@ -1,5 +1,11 @@ plugins { alias(libs.plugins.kotlin.jvm) + alias(libs.plugins.kotlin.spring) + alias(libs.plugins.spring.boot) +} + +apply { + plugin("io.spring.dependency-management") } group = "dev.usbharu" @@ -7,11 +13,41 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() + maven { + url = uri("https://git.usbharu.dev/api/packages/usbharu/maven") + } + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/usbharu/http-signature") + credentials { + + username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME") + password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN") + } + } + maven { + name = "GitHubPackages2" + url = uri("https://maven.pkg.github.com/multim-dev/emoji-kt") + credentials { + + username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME") + password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN") + } + } } dependencies { testImplementation(kotlin("test")) implementation("dev.usbharu:owl-consumer:0.0.1") + implementation("dev.usbharu:owl-common:0.0.1") + implementation("dev.usbharu:hideout-core:0.0.1") + implementation("dev.usbharu:http-signature:1.0.0") + implementation("org.springframework.boot:spring-boot-starter") + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation(libs.jackson.databind) + implementation(libs.jackson.module.kotlin) + + testImplementation("org.springframework.boot:spring-boot-starter-test") } tasks.test { diff --git a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverAcceptTaskRunner.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverAcceptTaskRunner.kt index d8946021..b557e259 100644 --- a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverAcceptTaskRunner.kt +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverAcceptTaskRunner.kt @@ -16,15 +16,31 @@ package dev.usbharu.hideout.worker +import dev.usbharu.hideout.activitypub.service.common.APRequestService +import dev.usbharu.hideout.application.external.Transaction +import dev.usbharu.hideout.core.domain.model.actor.ActorRepository +import dev.usbharu.hideout.core.external.job.DeliverAcceptTask +import dev.usbharu.hideout.core.external.job.DeliverAcceptTaskDef +import dev.usbharu.owl.consumer.AbstractTaskRunner import dev.usbharu.owl.consumer.TaskRequest import dev.usbharu.owl.consumer.TaskResult -import dev.usbharu.owl.consumer.TaskRunner +import org.springframework.stereotype.Component -class DeliverAcceptTaskRunner : TaskRunner { - override val name: String - get() = "" +@Component +class DeliverAcceptTaskRunner( + private val apRequestService: APRequestService, + private val actorRepository: ActorRepository, + private val transaction: Transaction, +) : AbstractTaskRunner(DeliverAcceptTaskDef) { + override suspend fun typedRun(typedParam: DeliverAcceptTask, taskRequest: TaskRequest): TaskResult { - override suspend fun run(taskRequest: TaskRequest): TaskResult { - TODO("Not yet implemented") + transaction.transaction { + apRequestService.apPost( + typedParam.inbox, + typedParam.accept, + actorRepository.findById(typedParam.signer) + ) + } + return TaskResult.ok() } } \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APDeliverUndoJobProcessor.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverCreateTaskRunner.kt similarity index 51% rename from hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APDeliverUndoJobProcessor.kt rename to hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverCreateTaskRunner.kt index c72ee374..7780d00d 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APDeliverUndoJobProcessor.kt +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverCreateTaskRunner.kt @@ -14,26 +14,31 @@ * limitations under the License. */ -package dev.usbharu.hideout.activitypub.service.activity.undo +package dev.usbharu.hideout.worker import dev.usbharu.hideout.activitypub.service.common.APRequestService import dev.usbharu.hideout.application.external.Transaction import dev.usbharu.hideout.core.domain.model.actor.ActorRepository -import dev.usbharu.hideout.core.external.job.DeliverUndoJob -import dev.usbharu.hideout.core.external.job.DeliverUndoJobParam -import dev.usbharu.hideout.core.service.job.JobProcessor -import org.springframework.stereotype.Service +import dev.usbharu.hideout.core.external.job.DeliverCreateTask +import dev.usbharu.hideout.core.external.job.DeliverCreateTaskDef +import dev.usbharu.owl.consumer.AbstractTaskRunner +import dev.usbharu.owl.consumer.TaskRequest +import dev.usbharu.owl.consumer.TaskResult +import org.springframework.stereotype.Component -@Service -class APDeliverUndoJobProcessor( - private val deliverUndoJob: DeliverUndoJob, - private val apRequestService: APRequestService, +@Component +class DeliverCreateTaskRunner( private val transaction: Transaction, - private val actorRepository: ActorRepository -) : JobProcessor { - override suspend fun process(param: DeliverUndoJobParam): Unit = transaction.transaction { - apRequestService.apPost(param.inbox, param.undo, actorRepository.findById(param.signer)) - } + private val apRequestService: APRequestService, + private val actorRepository: ActorRepository, +) : AbstractTaskRunner(DeliverCreateTaskDef) { + override suspend fun typedRun(typedParam: DeliverCreateTask, taskRequest: TaskRequest): TaskResult { + transaction.transaction { + val signer = actorRepository.findByUrl(typedParam.actor) - override fun job(): DeliverUndoJob = deliverUndoJob -} + apRequestService.apPost(typedParam.inbox, typedParam.create, signer) + } + + return TaskResult.ok() + } +} \ No newline at end of file diff --git a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverDeleteTaskRunner.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverDeleteTaskRunner.kt new file mode 100644 index 00000000..92961616 --- /dev/null +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverDeleteTaskRunner.kt @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.worker + +import dev.usbharu.hideout.activitypub.service.common.APRequestService +import dev.usbharu.hideout.core.domain.model.actor.ActorRepository +import dev.usbharu.hideout.core.external.job.DeliverDeleteTask +import dev.usbharu.hideout.core.external.job.DeliverDeleteTaskDef +import dev.usbharu.owl.consumer.AbstractTaskRunner +import dev.usbharu.owl.consumer.TaskRequest +import dev.usbharu.owl.consumer.TaskResult +import org.springframework.stereotype.Component + +@Component +class DeliverDeleteTaskRunner( + private val apRequestService: APRequestService, + private val actorRepository: ActorRepository, +) : + AbstractTaskRunner(DeliverDeleteTaskDef) { + override suspend fun typedRun(typedParam: DeliverDeleteTask, taskRequest: TaskRequest): TaskResult { + apRequestService.apPost(typedParam.inbox, typedParam.delete, actorRepository.findById(typedParam.signer)) + return TaskResult.ok() + } +} \ No newline at end of file diff --git a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverReactionTaskRunner.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverReactionTaskRunner.kt new file mode 100644 index 00000000..6408a73c --- /dev/null +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverReactionTaskRunner.kt @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.worker + +import dev.usbharu.hideout.activitypub.service.common.APRequestService +import dev.usbharu.hideout.core.domain.model.actor.ActorRepository +import dev.usbharu.hideout.core.external.job.DeliverReactionTask +import dev.usbharu.hideout.core.external.job.DeliverReactionTaskDef +import dev.usbharu.owl.consumer.AbstractTaskRunner +import dev.usbharu.owl.consumer.TaskRequest +import dev.usbharu.owl.consumer.TaskResult +import org.springframework.stereotype.Component + +@Component +class DeliverReactionTaskRunner( + private val apRequestService: APRequestService, + private val actorRepository: ActorRepository, +) : AbstractTaskRunner(DeliverReactionTaskDef) { + override suspend fun typedRun(typedParam: DeliverReactionTask, taskRequest: TaskRequest): TaskResult { + val signer = actorRepository.findByUrl(typedParam.actor) + + apRequestService.apPost( + typedParam.inbox, + typedParam.like, + signer + ) + + return TaskResult.ok() + } +} \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessor.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverRejectTaskRunner.kt similarity index 51% rename from hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessor.kt rename to hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverRejectTaskRunner.kt index 466824b4..7558197b 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APDeliverAcceptJobProcessor.kt +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverRejectTaskRunner.kt @@ -14,27 +14,30 @@ * limitations under the License. */ -package dev.usbharu.hideout.activitypub.service.activity.accept +package dev.usbharu.hideout.worker import dev.usbharu.hideout.activitypub.service.common.APRequestService import dev.usbharu.hideout.application.external.Transaction import dev.usbharu.hideout.core.domain.model.actor.ActorRepository -import dev.usbharu.hideout.core.external.job.DeliverAcceptJob -import dev.usbharu.hideout.core.external.job.DeliverAcceptJobParam -import dev.usbharu.hideout.core.service.job.JobProcessor -import org.springframework.stereotype.Service +import dev.usbharu.hideout.core.external.job.DeliverRejectTask +import dev.usbharu.hideout.core.external.job.DeliverRejectTaskDef +import dev.usbharu.owl.consumer.AbstractTaskRunner +import dev.usbharu.owl.consumer.TaskRequest +import dev.usbharu.owl.consumer.TaskResult +import org.springframework.stereotype.Component -@Service -class APDeliverAcceptJobProcessor( - private val apRequestService: APRequestService, - private val deliverAcceptJob: DeliverAcceptJob, +@Component +class DeliverRejectTaskRunner( private val transaction: Transaction, - private val actorRepository: ActorRepository -) : - JobProcessor { - override suspend fun process(param: DeliverAcceptJobParam): Unit = transaction.transaction { - apRequestService.apPost(param.inbox, param.accept, actorRepository.findById(param.signer)) - } + private val apRequestService: APRequestService, + private val actorRepository: ActorRepository, +) : AbstractTaskRunner(DeliverRejectTaskDef) { + override suspend fun typedRun(typedParam: DeliverRejectTask, taskRequest: TaskRequest): TaskResult { + val signer = transaction.transaction { + actorRepository.findById(typedParam.signer) + } + apRequestService.apPost(typedParam.inbox, typedParam.reject, signer) - override fun job(): DeliverAcceptJob = deliverAcceptJob -} + return TaskResult.ok() + } +} \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/APDeliverRejectJobProcessor.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverUndoTaskRunner.kt similarity index 55% rename from hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/APDeliverRejectJobProcessor.kt rename to hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverUndoTaskRunner.kt index 2e628d37..c811d2a6 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/reject/APDeliverRejectJobProcessor.kt +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/DeliverUndoTaskRunner.kt @@ -14,27 +14,30 @@ * limitations under the License. */ -package dev.usbharu.hideout.activitypub.service.activity.reject +package dev.usbharu.hideout.worker import dev.usbharu.hideout.activitypub.service.common.APRequestService import dev.usbharu.hideout.application.external.Transaction import dev.usbharu.hideout.core.domain.model.actor.ActorRepository -import dev.usbharu.hideout.core.external.job.DeliverRejectJob -import dev.usbharu.hideout.core.external.job.DeliverRejectJobParam -import dev.usbharu.hideout.core.service.job.JobProcessor +import dev.usbharu.hideout.core.external.job.DeliverUndoTask +import dev.usbharu.hideout.core.external.job.DeliverUndoTaskDef +import dev.usbharu.owl.consumer.AbstractTaskRunner +import dev.usbharu.owl.consumer.TaskRequest +import dev.usbharu.owl.consumer.TaskResult import org.springframework.stereotype.Component @Component -class APDeliverRejectJobProcessor( - private val apRequestService: APRequestService, - private val deliverRejectJob: DeliverRejectJob, +class DeliverUndoTaskRunner( private val transaction: Transaction, - private val actorRepository: ActorRepository -) : - JobProcessor { - override suspend fun process(param: DeliverRejectJobParam): Unit = transaction.transaction { - apRequestService.apPost(param.inbox, param.reject, actorRepository.findById(param.signer)) - } + private val apRequestService: APRequestService, + private val actorRepository: ActorRepository, +) : AbstractTaskRunner(DeliverUndoTaskDef) { + override suspend fun typedRun(typedParam: DeliverUndoTask, taskRequest: TaskRequest): TaskResult { + val signer = transaction.transaction { + actorRepository.findById(typedParam.signer) + } + apRequestService.apPost(typedParam.inbox, typedParam.undo, signer) - override fun job(): DeliverRejectJob = deliverRejectJob -} + return TaskResult.ok() + } +} \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/InboxTaskRunner.kt similarity index 79% rename from hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt rename to hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/InboxTaskRunner.kt index 9e5d0786..1a5be9a4 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/inbox/InboxJobProcessor.kt +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/InboxTaskRunner.kt @@ -14,19 +14,17 @@ * limitations under the License. */ -package dev.usbharu.hideout.activitypub.service.inbox +package dev.usbharu.hideout.worker import com.fasterxml.jackson.core.JsonParseException import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.readValue 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.objects.user.APUserService import dev.usbharu.hideout.application.external.Transaction -import dev.usbharu.hideout.core.external.job.InboxJob -import dev.usbharu.hideout.core.external.job.InboxJobParam -import dev.usbharu.hideout.core.service.job.JobProcessor +import dev.usbharu.hideout.core.external.job.InboxTask +import dev.usbharu.hideout.core.external.job.InboxTaskDef import dev.usbharu.hideout.util.RsaUtil import dev.usbharu.httpsignature.common.HttpHeaders import dev.usbharu.httpsignature.common.HttpMethod @@ -35,28 +33,85 @@ import dev.usbharu.httpsignature.common.PublicKey import dev.usbharu.httpsignature.verify.HttpSignatureVerifier import dev.usbharu.httpsignature.verify.Signature import dev.usbharu.httpsignature.verify.SignatureHeaderParser +import dev.usbharu.owl.consumer.AbstractTaskRunner +import dev.usbharu.owl.consumer.TaskRequest +import dev.usbharu.owl.consumer.TaskResult import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Value -import org.springframework.stereotype.Service +import org.springframework.stereotype.Component -@Service -class InboxJobProcessor( +@Component +class InboxTaskRunner( private val activityPubProcessorList: List>, - private val objectMapper: ObjectMapper, private val signatureHeaderParser: SignatureHeaderParser, private val signatureVerifier: HttpSignatureVerifier, private val apUserService: APUserService, - private val transaction: Transaction -) : JobProcessor { + private val objectMapper: ObjectMapper, + private val transaction: Transaction, +) : AbstractTaskRunner(InboxTaskDef) { @Value("\${hideout.debug.trace-inbox:false}") private var traceJson: Boolean = false + override suspend fun typedRun(typedParam: InboxTask, taskRequest: TaskRequest): TaskResult { + val jsonNode = objectMapper.readTree(typedParam.json) + + logger.info("START Process inbox. type: {}", typedParam.type) + if (traceJson) { + logger.trace("type: {}\njson: \n{}", typedParam.type, jsonNode.toPrettyString()) + } + + val map = typedParam.headers + + val httpRequest = typedParam.httpRequest.copy(headers = HttpHeaders(map)) + + logger.trace("Request: {}\nheaders: {}", httpRequest, map) + + val signature = parseSignatureHeader(httpRequest.headers) + + logger.debug("Has signature? {}", signature != null) + + // todo 不正なactorを取得してしまわないようにする + val verify = + signature?.let { + verifyHttpSignature( + httpRequest, + it, + transaction, + jsonNode.get("actor")?.asText() ?: signature.keyId + ) + } + ?: false + + logger.debug("Is verifying success? {}", verify) + + val activityPubProcessor = + activityPubProcessorList.firstOrNull { it.isSupported(typedParam.type) } as? ActivityPubProcessor + + if (activityPubProcessor == null) { + logger.warn("ActivityType {} is not support.", typedParam.type) + throw IllegalStateException("ActivityPubProcessor not found. type: ${typedParam.type}") + } + + val value = try { + objectMapper.treeToValue(jsonNode, activityPubProcessor.type()) + } catch (e: JsonParseException) { + logger.warn("Invalid JSON\n\n{}\n\n", jsonNode.toPrettyString()) + throw e + } + activityPubProcessor.process(ActivityPubProcessContext(value, jsonNode, httpRequest, signature, verify)) + + logger.info("SUCCESS Process inbox. type: {}", typedParam.type) + + + return TaskResult.ok() + } + private suspend fun verifyHttpSignature( httpRequest: HttpRequest, signature: Signature, transaction: Transaction, - actor: String + actor: String, ): Boolean { val requiredHeaders = when (httpRequest.method) { HttpMethod.GET -> getRequiredHeaders @@ -96,62 +151,9 @@ class InboxJobProcessor( } } - override suspend fun process(param: InboxJobParam) { - val jsonNode = objectMapper.readTree(param.json) - - logger.info("START Process inbox. type: {}", param.type) - if (traceJson) { - logger.trace("type: {}\njson: \n{}", param.type, jsonNode.toPrettyString()) - } - - val map = objectMapper.readValue>>(param.headers) - - val httpRequest = objectMapper.readValue(param.httpRequest).copy(headers = HttpHeaders(map)) - - logger.trace("Request: {}\nheaders: {}", httpRequest, map) - - val signature = parseSignatureHeader(httpRequest.headers) - - logger.debug("Has signature? {}", signature != null) - - // todo 不正なactorを取得してしまわないようにする - val verify = - signature?.let { - verifyHttpSignature( - httpRequest, - it, - transaction, - jsonNode.get("actor")?.asText() ?: signature.keyId - ) - } - ?: false - - logger.debug("Is verifying success? {}", verify) - - val activityPubProcessor = - activityPubProcessorList.firstOrNull { it.isSupported(param.type) } as? ActivityPubProcessor - - if (activityPubProcessor == null) { - logger.warn("ActivityType {} is not support.", param.type) - throw IllegalStateException("ActivityPubProcessor not found. type: ${param.type}") - } - - val value = try { - objectMapper.treeToValue(jsonNode, activityPubProcessor.type()) - } catch (e: JsonParseException) { - logger.warn("Invalid JSON\n\n{}\n\n", jsonNode.toPrettyString()) - throw e - } - activityPubProcessor.process(ActivityPubProcessContext(value, jsonNode, httpRequest, signature, verify)) - - logger.info("SUCCESS Process inbox. type: {}", param.type) - } - - override fun job(): InboxJob = InboxJob - companion object { - private val logger = LoggerFactory.getLogger(InboxJobProcessor::class.java) + private val logger = LoggerFactory.getLogger(InboxTaskRunner::class.java) private val postRequiredHeaders = listOf("(request-target)", "date", "host", "digest") private val getRequiredHeaders = listOf("(request-target)", "date", "host") } -} +} \ No newline at end of file diff --git a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/ReceiveFollowTaskRunner.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/ReceiveFollowTaskRunner.kt new file mode 100644 index 00000000..458f4f4c --- /dev/null +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/ReceiveFollowTaskRunner.kt @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.worker + +import dev.usbharu.hideout.activitypub.service.objects.user.APUserService +import dev.usbharu.hideout.application.external.Transaction +import dev.usbharu.hideout.core.domain.exception.resource.UserNotFoundException +import dev.usbharu.hideout.core.domain.model.actor.ActorRepository +import dev.usbharu.hideout.core.external.job.ReceiveFollowTask +import dev.usbharu.hideout.core.external.job.ReceiveFollowTaskDef +import dev.usbharu.hideout.core.service.relationship.RelationshipService +import dev.usbharu.owl.consumer.AbstractTaskRunner +import dev.usbharu.owl.consumer.TaskRequest +import dev.usbharu.owl.consumer.TaskResult +import org.springframework.stereotype.Component + +@Component +class ReceiveFollowTaskRunner( + private val transaction: Transaction, + private val apUserService: APUserService, + private val actorRepository: ActorRepository, + private val relationshipService: RelationshipService, +) : AbstractTaskRunner(ReceiveFollowTaskDef) { + override suspend fun typedRun(typedParam: ReceiveFollowTask, taskRequest: TaskRequest): TaskResult { + + transaction.transaction { + + apUserService.fetchPerson(typedParam.actor, typedParam.targetActor) + val targetEntity = actorRepository.findByUrl(typedParam.targetActor) ?: throw UserNotFoundException.withUrl( + typedParam.targetActor + ) + val followActorEntity = actorRepository.findByUrl(typedParam.follow.actor) + ?: throw UserNotFoundException.withUrl(typedParam.follow.actor) + relationshipService.followRequest(followActorEntity.id, targetEntity.id) + } + + return TaskResult.ok() + } +} \ No newline at end of file diff --git a/libs.versions.toml b/libs.versions.toml index eafb51ec..5af99f9a 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -11,6 +11,7 @@ serialization = "1.6.3" kjob = "0.6.0" tika = "2.9.1" owl = "0.0.1" +jackson = "2.17.1" [libraries] @@ -60,6 +61,9 @@ owl-producer-api = { module = "dev.usbharu:owl-producer-api", version.ref = "owl owl-producer-default = { module = "dev.usbharu:owl-producer-default", version.ref = "owl" } owl-producer-embedded = { module = "dev.usbharu:owl-producer-embedded", version.ref = "owl" } +jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } +jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" } + [bundles] exposed = ["exposed-core", "exposed-java-time", "exposed-jdbc", "exposed-spring"] diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueParentService.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/AbstractTaskRunner.kt similarity index 50% rename from hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueParentService.kt rename to owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/AbstractTaskRunner.kt index a302a44b..e1a5125e 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/service/job/JobQueueParentService.kt +++ b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/AbstractTaskRunner.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package dev.usbharu.hideout.core.service.job +package dev.usbharu.owl.consumer -import dev.usbharu.hideout.core.external.job.HideoutJob -import kjob.core.Job -import kjob.core.dsl.ScheduleContext -import org.springframework.stereotype.Service +import dev.usbharu.owl.common.task.Task +import dev.usbharu.owl.common.task.TaskDefinition -@Service -@Deprecated("use owl producer") -interface JobQueueParentService { +abstract class AbstractTaskRunner>(private val taskDefinition: D) : TaskRunner { + override val name: String + get() = taskDefinition.name - fun init(jobDefines: List) + override suspend fun run(taskRequest: TaskRequest): TaskResult { + val deserialize = taskDefinition.deserialize(taskRequest.properties) + return typedRun(deserialize, taskRequest) + } - @Deprecated("use type safe → scheduleTypeSafe") - suspend fun schedule(job: J, block: ScheduleContext.(J) -> Unit = {}) - suspend fun > scheduleTypeSafe(job: J, jobProps: T) -} + abstract suspend fun typedRun(typedParam: T, taskRequest: TaskRequest): TaskResult + +} \ No newline at end of file diff --git a/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt index 40b44201..777e2d4a 100644 --- a/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt +++ b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt @@ -43,9 +43,9 @@ class Consumer( private val subscribeTaskStub: SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineStub, private val assignmentTaskStub: AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub, private val taskResultStub: TaskResultServiceGrpcKt.TaskResultServiceCoroutineStub, - private val runnerMap: Map, + taskRunnerLoader: TaskRunnerLoader, private val propertySerializerFactory: PropertySerializerFactory, - consumerConfig: ConsumerConfig + consumerConfig: ConsumerConfig, ) { private lateinit var consumerId: UUID @@ -55,6 +55,8 @@ class Consumer( private val concurrent = MutableStateFlow(consumerConfig.concurrent) private val processing = MutableStateFlow(0) + private val runnerMap = taskRunnerLoader.load() + /** * Consumerを初期化します * diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRemoveReactionTask.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/ServiceLoaderTaskRunnerLoader.kt similarity index 65% rename from hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRemoveReactionTask.kt rename to owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/ServiceLoaderTaskRunnerLoader.kt index 1f0a5b15..a34fc37b 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRemoveReactionTask.kt +++ b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/ServiceLoaderTaskRunnerLoader.kt @@ -14,14 +14,16 @@ * limitations under the License. */ -package dev.usbharu.hideout.core.external.job +package dev.usbharu.owl.consumer -import dev.usbharu.hideout.core.domain.model.reaction.Reaction -import dev.usbharu.owl.common.task.Task +import java.util.* -data class DeliverRemoveReactionTask( - val actor: String, - val inbox: String, - val id: Long, - val reaction: Reaction, -) : Task() +class ServiceLoaderTaskRunnerLoader : TaskRunnerLoader { + private val taskRunnerMap = ServiceLoader + .load(TaskRunner::class.java) + .associateBy { it.name } + + override fun load(): Map { + return taskRunnerMap + } +} \ No newline at end of file diff --git a/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt index 7d1cf295..0e54a92a 100644 --- a/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt +++ b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt @@ -23,7 +23,6 @@ import dev.usbharu.owl.common.property.CustomPropertySerializerFactory import dev.usbharu.owl.common.property.PropertySerializerFactory import io.grpc.ManagedChannelBuilder import java.nio.file.Path -import java.util.* /** * 単独で起動できるConsumer @@ -33,18 +32,27 @@ import java.util.* */ class StandaloneConsumer( private val config: StandaloneConsumerConfig, - private val propertySerializerFactory: PropertySerializerFactory + private val propertySerializerFactory: PropertySerializerFactory, + taskRunnerLoader: TaskRunnerLoader, ) { constructor( path: Path, propertySerializerFactory: PropertySerializerFactory = CustomPropertySerializerFactory( emptySet() - ) - ) : this(StandaloneConsumerConfigLoader.load(path), propertySerializerFactory) + ), + taskRunnerLoader: TaskRunnerLoader = ServiceLoaderTaskRunnerLoader(), + ) : this(StandaloneConsumerConfigLoader.load(path), propertySerializerFactory, taskRunnerLoader) - constructor(string: String) : this(Path.of(string)) + constructor( + string: String, + propertySerializerFactory: PropertySerializerFactory = CustomPropertySerializerFactory(emptySet()), + taskRunnerLoader: TaskRunnerLoader = ServiceLoaderTaskRunnerLoader(), + ) : this(Path.of(string), propertySerializerFactory, taskRunnerLoader) - constructor() : this(Path.of("consumer.properties")) + constructor( + propertySerializerFactory: PropertySerializerFactory = CustomPropertySerializerFactory(emptySet()), + taskRunnerLoader: TaskRunnerLoader = ServiceLoaderTaskRunnerLoader(), + ) : this(Path.of("consumer.properties"), propertySerializerFactory, taskRunnerLoader) private val channel = ManagedChannelBuilder.forAddress(config.address, config.port) .usePlaintext() @@ -54,15 +62,11 @@ class StandaloneConsumer( private val assignmentTaskStub = AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineStub(channel) private val taskResultStub = TaskResultServiceGrpcKt.TaskResultServiceCoroutineStub(channel) - private val taskRunnerMap = ServiceLoader - .load(TaskRunner::class.java) - .associateBy { it.name } - private val consumer = Consumer( subscribeTaskStub = subscribeStub, assignmentTaskStub = assignmentTaskStub, taskResultStub = taskResultStub, - runnerMap = taskRunnerMap, + taskRunnerLoader = taskRunnerLoader, propertySerializerFactory = propertySerializerFactory, consumerConfig = ConsumerConfig(config.concurrency) ) diff --git a/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt index 3e21dfb9..07d4bd9f 100644 --- a/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt +++ b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskResult.kt @@ -28,5 +28,11 @@ import dev.usbharu.owl.common.property.PropertyValue data class TaskResult( val success: Boolean, val result: Map>, - val message: String -) + val message: String, +) { + companion object { + fun ok(result: Map> = emptyMap()): TaskResult { + return TaskResult(true, result, "") + } + } +} \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverPostTask.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunnerLoader.kt similarity index 70% rename from hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverPostTask.kt rename to owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunnerLoader.kt index 3b682831..2581e5de 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverPostTask.kt +++ b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/TaskRunnerLoader.kt @@ -14,13 +14,8 @@ * limitations under the License. */ -package dev.usbharu.hideout.core.external.job +package dev.usbharu.owl.consumer -import dev.usbharu.hideout.activitypub.domain.model.Create -import dev.usbharu.owl.common.task.Task - -data class DeliverPostTask( - val create: Create, - val inbox: String, - val actor: String, -) : Task() +interface TaskRunnerLoader { + fun load(): Map +} \ No newline at end of file From 7324e0b0e16e3137d4196172c2592025be7a01cb Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 8 May 2024 19:30:24 +0900 Subject: [PATCH 13/24] =?UTF-8?q?chore:=20KJOB=E4=BE=9D=E5=AD=98=E3=82=92?= =?UTF-8?q?=E5=AE=8C=E5=85=A8=E3=81=AB=E3=81=AA=E3=81=8F=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hideout-core/build.gradle.kts | 2 - .../activity/follow/APFollowProcessor.kt | 2 - .../kjobexposed/ExposedJobRepository.kt | 331 ------------------ .../infrastructure/kjobexposed/ExposedKJob.kt | 65 ---- .../kjobexposed/ExposedLockRepository.kt | 91 ----- 5 files changed, 491 deletions(-) delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedJobRepository.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedKJob.kt delete mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedLockRepository.kt diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index 2537e715..ae7b5128 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -188,10 +188,8 @@ dependencies { implementation(libs.bundles.exposed) implementation(libs.bundles.coroutines) implementation(libs.bundles.ktor.client) - implementation(libs.bundles.serialization) implementation(libs.bundles.apache.tika) implementation(libs.bundles.openapi) - implementation(libs.bundles.kjob) implementation(libs.bundles.owl.producer) implementation(libs.bundles.spring.boot.oauth2) implementation(libs.bundles.spring.boot.data.mongodb) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt index 751c59f3..3cc8cc68 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APFollowProcessor.kt @@ -16,7 +16,6 @@ package dev.usbharu.hideout.activitypub.service.activity.follow -import com.fasterxml.jackson.databind.ObjectMapper import dev.usbharu.hideout.activitypub.domain.model.Follow import dev.usbharu.hideout.activitypub.service.common.AbstractActivityPubProcessor import dev.usbharu.hideout.activitypub.service.common.ActivityPubProcessContext @@ -29,7 +28,6 @@ import org.springframework.stereotype.Service @Service class APFollowProcessor( transaction: Transaction, - private val objectMapper: ObjectMapper, private val owlProducer: OwlProducer, ) : AbstractActivityPubProcessor(transaction) { diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedJobRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedJobRepository.kt deleted file mode 100644 index 50c60379..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedJobRepository.kt +++ /dev/null @@ -1,331 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.infrastructure.kjobexposed - -import kjob.core.job.JobProgress -import kjob.core.job.JobSettings -import kjob.core.job.JobStatus -import kjob.core.job.ScheduledJob -import kjob.core.repository.JobRepository -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.asFlow -import kotlinx.serialization.encodeToString -import kotlinx.serialization.json.* -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.* -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.inList -import org.jetbrains.exposed.sql.SqlExpressionBuilder.plus -import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction -import org.jetbrains.exposed.sql.transactions.transaction -import java.time.Clock -import java.time.Instant -import java.util.* - -class ExposedJobRepository( - private val database: Database, - private val tableName: String, - private val clock: Clock, - private val json: Json -) : - JobRepository { - - class Jobs(tableName: String) : LongIdTable(tableName) { - val status = text("status") - val runAt = long("runAt").nullable() - val statusMessage = text("statusMessage").nullable() - val retries = integer("retries") - val kjobId = char("kjobId", 36).nullable() - val createdAt = long("createdAt") - val updatedAt = long("updatedAt") - val jobId = text("jobId") - val name = text("name") - val properties = text("properties").nullable() - val step = integer("step") - val max = integer("max").nullable() - val startedAt = long("startedAt").nullable() - val completedAt = long("completedAt").nullable() - } - - val jobs: Jobs = Jobs(tableName) - - fun createTable() { - transaction(database) { - SchemaUtils.create(jobs) - } - } - - @Suppress("InjectDispatcher") - suspend fun query(block: suspend () -> T): T = newSuspendedTransaction(Dispatchers.IO) { block() } - - override suspend fun completeProgress(id: String): Boolean { - val now = Instant.now(clock).toEpochMilli() - return query { - jobs.update({ jobs.id eq id.toLong() }) { - it[jobs.completedAt] = now - it[jobs.updatedAt] = now - } == 1 - } - } - - override suspend fun exist(jobId: String): Boolean { - return query { - jobs.selectAll().where(jobs.jobId eq jobId).empty().not() - } - } - - @Suppress("SuspendFunWithFlowReturnType") - override suspend fun findNext(names: Set, status: Set, limit: Int): Flow { - return query { - jobs.selectAll().where( - jobs.status.inList(list = status.map { it.name }) - .and(if (names.isEmpty()) Op.TRUE else jobs.name.inList(names)) - ).limit(limit) - .map { it.toScheduledJob() }.asFlow() - } - } - - override suspend fun get(id: String): ScheduledJob? { - val single = query { jobs.selectAll().where(jobs.id eq id.toLong()).singleOrNull() } ?: return null - return single.toScheduledJob() - } - - override suspend fun reset(id: String, oldKjobId: UUID?): Boolean { - return query { - jobs.update({ - jobs.id eq id.toLong() and if (oldKjobId == null) { - jobs.kjobId.isNull() - } else { - jobs.kjobId eq oldKjobId.toString() - } - }) { - it[jobs.status] = JobStatus.CREATED.name - it[jobs.statusMessage] = null - it[jobs.kjobId] = null - it[jobs.step] = 0 - it[jobs.max] = null - it[jobs.startedAt] = null - it[jobs.completedAt] = null - it[jobs.updatedAt] = Instant.now(clock).toEpochMilli() - } == 1 - } - } - - override suspend fun save(jobSettings: JobSettings, runAt: Instant?): ScheduledJob { - val now = Instant.now(clock) - val scheduledJob = - ScheduledJob( - id = "", - status = JobStatus.CREATED, - runAt = runAt, - statusMessage = null, - retries = 0, - kjobId = null, - createdAt = now, - updatedAt = now, - settings = jobSettings, - progress = JobProgress(0) - ) - val id = query { - jobs.insert { - it[jobs.status] = scheduledJob.status.name - it[jobs.createdAt] = scheduledJob.createdAt.toEpochMilli() - it[jobs.updatedAt] = scheduledJob.updatedAt.toEpochMilli() - it[jobs.jobId] = scheduledJob.settings.id - it[jobs.name] = scheduledJob.settings.name - it[jobs.properties] = scheduledJob.settings.properties.stringify() - it[jobs.runAt] = scheduledJob.runAt?.toEpochMilli() - it[jobs.statusMessage] = null - it[jobs.retries] = 0 - it[jobs.kjobId] = null - it[jobs.step] = 0 - it[jobs.max] = null - it[jobs.startedAt] = null - it[jobs.completedAt] = null - }[jobs.id].value - } - return scheduledJob.copy(id = id.toString()) - } - - override suspend fun setProgressMax(id: String, max: Long): Boolean { - val now = Instant.now(clock).toEpochMilli() - return query { - jobs.update({ jobs.id eq id.toLong() }) { - it[jobs.max] = max.toInt() - it[jobs.updatedAt] = now - } == 1 - } - } - - override suspend fun startProgress(id: String): Boolean { - val now = Instant.now(clock).toEpochMilli() - return query { - jobs.update({ jobs.id eq id.toLong() }) { - it[jobs.startedAt] = now - it[jobs.updatedAt] = now - } == 1 - } - } - - override suspend fun stepProgress(id: String, step: Long): Boolean { - val now = Instant.now(clock).toEpochMilli() - return query { - jobs.update({ jobs.id eq id.toLong() }) { - it[jobs.step] = jobs.step + step.toInt() - it[jobs.updatedAt] = now - } == 1 - } - } - - override suspend fun update( - id: String, - oldKjobId: UUID?, - kjobId: UUID?, - status: JobStatus, - statusMessage: String?, - retries: Int - ): Boolean { - return query { - jobs.update({ - (jobs.id eq id.toLong()) and if (oldKjobId == null) { - jobs.kjobId.isNull() - } else { - jobs.kjobId eq oldKjobId.toString() - } - }) { - it[jobs.status] = status.name - it[jobs.retries] = retries - it[jobs.updatedAt] = Instant.now(clock).toEpochMilli() - it[jobs.id] = id.toLong() - it[jobs.statusMessage] = statusMessage - it[jobs.kjobId] = kjobId.toString() - } == 1 - } - } - - @Suppress("CyclomaticComplexMethod") - private fun String?.parseJsonMap(): Map { - this ?: return emptyMap() - return json.parseToJsonElement(this).jsonObject.mapValues { (_, el) -> - if (el is JsonObject) { - val t = el["t"]?.run { jsonPrimitive.content } ?: error("Cannot get jsonPrimitive") - val value = el["v"]?.jsonArray ?: error("Cannot get jsonArray") - when (t) { - "s" -> value.map { it.jsonPrimitive.content } - "d" -> value.map { it.jsonPrimitive.double } - "l" -> value.map { it.jsonPrimitive.long } - "i" -> value.map { it.jsonPrimitive.int } - "b" -> value.map { it.jsonPrimitive.boolean } - else -> error("Unknown type prefix '$t'") - }.toList() - } else { - val content = el.jsonPrimitive.content - val t = content.substringBefore(':') - val value = content.substringAfter(':') - when (t) { - "s" -> value - "d" -> value.toDouble() - "l" -> value.toLong() - "i" -> value.toInt() - "b" -> value.toBoolean() - else -> error("Unknown type prefix '$t'") - } - } - } - } - - @Suppress("CyclomaticComplexMethod") - private fun Map.stringify(): String? { - if (isEmpty()) { - return null - } - - @Suppress("UNCHECKED_CAST") - fun listSerialize(value: List<*>): JsonElement { - return if (value.isEmpty()) { - buildJsonObject { - put("t", "s") - putJsonArray("v") {} - } - } else { - val (t, values) = when (val item = value.first()) { - is Double -> "d" to (value as List).map(::JsonPrimitive) - is Long -> "l" to (value as List).map(::JsonPrimitive) - is Int -> "i" to (value as List).map(::JsonPrimitive) - is String -> "s" to (value as List).map(::JsonPrimitive) - is Boolean -> "b" to (value as List).map(::JsonPrimitive) - else -> error("Cannot serialize unsupported list property value: $item") - } - buildJsonObject { - put("t", t) - put("v", JsonArray(values)) - } - } - } - - fun createJsonPrimitive(string: String, value: Any) = JsonPrimitive("$string:$value") - - val jsonObject = JsonObject( - mapValues { (_, value) -> - when (value) { - is List<*> -> listSerialize(value) - is Double -> createJsonPrimitive("d", value) - is Long -> createJsonPrimitive("l", value) - is Int -> createJsonPrimitive("i", value) - is String -> createJsonPrimitive("s", value) - is Boolean -> createJsonPrimitive("b", value) - else -> error("Cannot serialize unsupported property value: $value") - } - } - ) - return json.encodeToString(jsonObject) - } - - private fun ResultRow.toScheduledJob(): ScheduledJob { - val single = this - - return ScheduledJob( - id = single[jobs.id].value.toString(), - status = JobStatus.valueOf(single[jobs.status]), - runAt = single[jobs.runAt]?.let { Instant.ofEpochMilli(it) }, - statusMessage = single[jobs.statusMessage], - retries = single[jobs.retries], - kjobId = single[jobs.kjobId]?.let { - try { - @Suppress("SwallowedException") - UUID.fromString(it) - } catch (ignored: IllegalArgumentException) { - null - } - }, - createdAt = Instant.ofEpochMilli(single[jobs.createdAt]), - updatedAt = Instant.ofEpochMilli(single[jobs.updatedAt]), - settings = JobSettings( - id = single[jobs.jobId], - name = single[jobs.name], - properties = single[jobs.properties].parseJsonMap() - ), - progress = JobProgress( - step = single[jobs.step].toLong(), - max = single[jobs.max]?.toLong(), - startedAt = single[jobs.startedAt]?.let { Instant.ofEpochMilli(it) }, - completedAt = single[jobs.completedAt]?.let { Instant.ofEpochMilli(it) } - ) - ) - } -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedKJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedKJob.kt deleted file mode 100644 index b2f5c49d..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedKJob.kt +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.infrastructure.kjobexposed - -import kjob.core.BaseKJob -import kjob.core.KJob -import kjob.core.KJobFactory -import kotlinx.coroutines.runBlocking -import org.jetbrains.exposed.sql.Database -import java.time.Clock - -class ExposedKJob(config: Configuration) : BaseKJob(config) { - - private val database: Database = config.connectionDatabase ?: Database.connect( - requireNotNull(config.connectionString), - requireNotNull(config.driverClassName) - ) - - override val jobRepository: ExposedJobRepository - get() = ExposedJobRepository(database, config.jobTableName, Clock.systemUTC(), config.json) - - override val lockRepository: ExposedLockRepository - get() = ExposedLockRepository(database, config, clock) - - override fun start(): KJob { - jobRepository.createTable() - lockRepository.createTable() - return super.start() - } - - override fun shutdown(): Unit = runBlocking { - super.shutdown() - lockRepository.clearExpired() - } - - companion object : KJobFactory { - override fun create(configure: Configuration.() -> Unit): KJob = ExposedKJob(Configuration().apply(configure)) - } - - class Configuration : BaseKJob.Configuration() { - var connectionString: String? = null - var driverClassName: String? = null - var connectionDatabase: Database? = null - - var jobTableName: String = "kjobJobs" - - var lockTableName: String = "kjobLocks" - - var expireLockInMinutes: Long = 5L - } -} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedLockRepository.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedLockRepository.kt deleted file mode 100644 index f087f224..00000000 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/kjobexposed/ExposedLockRepository.kt +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (C) 2024 usbharu - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev.usbharu.hideout.core.infrastructure.kjobexposed - -import kjob.core.job.Lock -import kjob.core.repository.LockRepository -import kotlinx.coroutines.Dispatchers -import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.* -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.SqlExpressionBuilder.greater -import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction -import org.jetbrains.exposed.sql.transactions.transaction -import java.time.Clock -import java.time.Instant -import java.util.* -import kotlin.time.Duration.Companion.minutes - -class ExposedLockRepository( - private val database: Database, - private val config: ExposedKJob.Configuration, - private val clock: Clock -) : LockRepository { - - class Locks(tableName: String) : UUIDTable(tableName) { - val updatedAt = long("updatedAt") - val expiresAt = long("expiresAt") - } - - val locks: Locks = Locks(config.lockTableName) - - fun createTable() { - transaction(database) { - SchemaUtils.create(locks) - } - } - - @Suppress("InjectDispatcher") - suspend fun query(block: suspend () -> T): T = newSuspendedTransaction(Dispatchers.IO) { block() } - - override suspend fun exists(id: UUID): Boolean { - val now = Instant.now(clock) - return query { - locks.selectAll().where(locks.id eq id and locks.expiresAt.greater(now.toEpochMilli())).empty().not() - } - } - - override suspend fun ping(id: UUID): Lock { - val now = Instant.now(clock) - val expiresAt = now.plusSeconds(config.expireLockInMinutes.minutes.inWholeSeconds) - val lock = Lock(id, now) - query { - if (locks.selectAll().where(locks.id eq id).limit(1) - .map { Lock(it[locks.id].value, Instant.ofEpochMilli(it[locks.expiresAt])) }.isEmpty() - ) { - locks.insert { - it[locks.id] = id - it[locks.updatedAt] = now.toEpochMilli() - it[locks.expiresAt] = expiresAt.toEpochMilli() - } - } else { - locks.update({ locks.id eq id }) { - it[locks.updatedAt] = now.toEpochMilli() - it[locks.expiresAt] = expiresAt.toEpochMilli() - } - } - } - return lock - } - - suspend fun clearExpired() { - val now = Instant.now(clock).toEpochMilli() - query { - locks.deleteWhere { locks.expiresAt greater now } - } - } -} From f1f6166a7860972bfcaf1876a722b763de474709 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 8 May 2024 20:52:39 +0900 Subject: [PATCH 14/24] =?UTF-8?q?feat:=20=E8=B5=B7=E5=8B=95=E6=99=82?= =?UTF-8?q?=E3=81=AB=E3=82=BF=E3=82=B9=E3=82=AF=E5=AE=9A=E7=BE=A9=E3=82=92?= =?UTF-8?q?=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=82=80=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hideout-core/build.gradle.kts | 1 + .../hideout/application/config/OwlConfig.kt | 9 ++++- .../application/external/OwlProducerRunner.kt | 35 +++++++++++++++++++ .../core/external/job/DeliverAcceptTask.kt | 2 ++ .../core/external/job/DeliverCreateTask.kt | 2 ++ .../core/external/job/DeliverDeleteTask.kt | 2 ++ .../core/external/job/DeliverReactionTask.kt | 2 ++ .../core/external/job/DeliverRejectJob.kt | 2 ++ .../core/external/job/DeliverUndoTask.kt | 2 ++ .../hideout/core/external/job/InboxTask.kt | 2 ++ .../core/external/job/ReceiveFollowTask.kt | 2 ++ .../src/main/resources/application.yml | 2 +- libs.versions.toml | 3 ++ 13 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 hideout-core/src/main/kotlin/dev/usbharu/hideout/application/external/OwlProducerRunner.kt diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index ae7b5128..ca8e9cf8 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -191,6 +191,7 @@ dependencies { implementation(libs.bundles.apache.tika) implementation(libs.bundles.openapi) implementation(libs.bundles.owl.producer) + implementation(libs.bundles.owl.broker) implementation(libs.bundles.spring.boot.oauth2) implementation(libs.bundles.spring.boot.data.mongodb) implementation(libs.bundles.spring.boot.data.mongodb) diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt index 24acde80..51d3be21 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt @@ -16,20 +16,23 @@ package dev.usbharu.hideout.application.config +import dev.usbharu.owl.broker.ModuleContext import dev.usbharu.owl.common.retry.RetryPolicyFactory import dev.usbharu.owl.producer.api.OWL import dev.usbharu.owl.producer.api.OwlProducer import dev.usbharu.owl.producer.defaultimpl.DEFAULT import dev.usbharu.owl.producer.embedded.EMBEDDED import dev.usbharu.owl.producer.embedded.EMBEDDED_GRPC +import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration +import java.util.* @Configuration class OwlConfig(private val producerConfig: ProducerConfig) { @Bean - fun producer(retryPolicyFactory: RetryPolicyFactory? = null): OwlProducer { + fun producer(@Autowired(required = false) retryPolicyFactory: RetryPolicyFactory? = null): OwlProducer { return when (producerConfig.mode) { ProducerMode.EMBEDDED -> { OWL(EMBEDDED) { @@ -39,6 +42,10 @@ class OwlConfig(private val producerConfig: ProducerConfig) { if (producerConfig.port != null) { this.port = producerConfig.port.toString() } + val moduleContext = ServiceLoader.load(ModuleContext::class.java).firstOrNull() + if (moduleContext != null) { + this.moduleContext = moduleContext + } } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/external/OwlProducerRunner.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/external/OwlProducerRunner.kt new file mode 100644 index 00000000..06f74c44 --- /dev/null +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/external/OwlProducerRunner.kt @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.application.external + +import dev.usbharu.owl.common.task.TaskDefinition +import dev.usbharu.owl.producer.api.OwlProducer +import kotlinx.coroutines.runBlocking +import org.springframework.boot.ApplicationArguments +import org.springframework.boot.ApplicationRunner +import org.springframework.stereotype.Component + +@Component +class OwlProducerRunner(private val owlProducer: OwlProducer, private val taskDefinitions: List>) : + ApplicationRunner { + override fun run(args: ApplicationArguments?) { + runBlocking { + owlProducer.start() + taskDefinitions.forEach { taskDefinition -> owlProducer.registerTask(taskDefinition) } + } + } +} \ No newline at end of file diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptTask.kt index a5893c71..de3f4332 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptTask.kt @@ -21,6 +21,7 @@ import dev.usbharu.owl.common.property.PropertyValue import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition +import org.springframework.stereotype.Component data class DeliverAcceptTask( val accept: Accept, @@ -28,6 +29,7 @@ data class DeliverAcceptTask( val signer: Long, ) : Task() +@Component data object DeliverAcceptTaskDef : TaskDefinition { override val name: String get() = TODO("Not yet implemented") diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt index 1aabefc3..66a7bce1 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt @@ -21,6 +21,7 @@ import dev.usbharu.owl.common.property.PropertyValue import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition +import org.springframework.stereotype.Component data class DeliverCreateTask( val create: Create, @@ -28,6 +29,7 @@ data class DeliverCreateTask( val actor: String, ) : Task() +@Component data object DeliverCreateTaskDef : TaskDefinition { override val name: String get() = TODO("Not yet implemented") diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt index 801a917f..b4b55f51 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt @@ -21,6 +21,7 @@ import dev.usbharu.owl.common.property.PropertyValue import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition +import org.springframework.stereotype.Component data class DeliverDeleteTask( val delete: Delete, @@ -28,6 +29,7 @@ data class DeliverDeleteTask( val signer: Long, ) : Task() +@Component data object DeliverDeleteTaskDef : TaskDefinition { override val name: String get() = TODO("Not yet implemented") diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt index e2f8001a..cd122db7 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt @@ -21,6 +21,7 @@ import dev.usbharu.owl.common.property.PropertyValue import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition +import org.springframework.stereotype.Component data class DeliverReactionTask( val actor: String, @@ -28,6 +29,7 @@ data class DeliverReactionTask( val inbox: String, ) : Task() +@Component data object DeliverReactionTaskDef : TaskDefinition { override val name: String get() = TODO("Not yet implemented") diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt index e675409c..b76e9f5e 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt @@ -21,6 +21,7 @@ import dev.usbharu.owl.common.property.PropertyValue import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition +import org.springframework.stereotype.Component data class DeliverRejectTask( val reject: Reject, @@ -28,6 +29,7 @@ data class DeliverRejectTask( val signer: Long, ) : Task() +@Component data object DeliverRejectTaskDef : TaskDefinition { override val name: String get() = TODO("Not yet implemented") diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt index f0ae462f..60ca28ba 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt @@ -21,6 +21,7 @@ import dev.usbharu.owl.common.property.PropertyValue import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition +import org.springframework.stereotype.Component data class DeliverUndoTask( val undo: Undo, @@ -28,6 +29,7 @@ data class DeliverUndoTask( val signer: Long, ) : Task() +@Component data object DeliverUndoTaskDef : TaskDefinition { override val name: String get() = TODO("Not yet implemented") diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt index e5f0fc95..9206cc2b 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt @@ -22,6 +22,7 @@ import dev.usbharu.owl.common.property.PropertyValue import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition +import org.springframework.stereotype.Component data class InboxTask( val json: String, @@ -30,6 +31,7 @@ data class InboxTask( val headers: Map>, ) : Task() +@Component data object InboxTaskDef : TaskDefinition { override val name: String get() = TODO("Not yet implemented") diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt index 7dc1aac5..d212896b 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt @@ -21,6 +21,7 @@ import dev.usbharu.owl.common.property.PropertyValue import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition +import org.springframework.stereotype.Component data class ReceiveFollowTask( val actor: String, @@ -28,6 +29,7 @@ data class ReceiveFollowTask( val targetActor: String, ) : Task() +@Component data object ReceiveFollowTaskDef : TaskDefinition { override val name: String get() = TODO("Not yet implemented") diff --git a/hideout-core/src/main/resources/application.yml b/hideout-core/src/main/resources/application.yml index 425c64f9..ae863531 100644 --- a/hideout-core/src/main/resources/application.yml +++ b/hideout-core/src/main/resources/application.yml @@ -1,5 +1,5 @@ hideout: - url: "https://test-hideout.usbharu.dev" + url: "https://test-hideout-dev.usbharu.dev" use-mongodb: true owl: producer: diff --git a/libs.versions.toml b/libs.versions.toml index 5af99f9a..ee3e55dd 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -60,6 +60,8 @@ kjon-mongo = { module = "org.drewcarlson:kjob-mongo", version.ref = "kjob" } owl-producer-api = { module = "dev.usbharu:owl-producer-api", version.ref = "owl" } owl-producer-default = { module = "dev.usbharu:owl-producer-default", version.ref = "owl" } owl-producer-embedded = { module = "dev.usbharu:owl-producer-embedded", version.ref = "owl" } +owl-broker = { module = "dev.usbharu:owl-broker", version.ref = "owl" } +owl-broker-mongodb = { module = "dev.usbharu:owl-broker-mongodb", version.ref = "owl" } jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" } @@ -76,6 +78,7 @@ serialization = ["serialization-core", "serialization-json"] apache-tika = ["apache-tika-core", "apache-tika-parsers"] kjob = ["kjon-core", "kjon-mongo"] owl-producer = ["owl-producer-api", "owl-producer-default", "owl-producer-embedded"] +owl-broker = ["owl-broker", "owl-broker-mongodb"] [plugins] From de4ad8ecfd3eb6939a7c13a4a52616a27f606619 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 8 May 2024 23:12:43 +0900 Subject: [PATCH 15/24] =?UTF-8?q?feat:=20=E8=B5=B7=E5=8B=95=E5=89=8D?= =?UTF-8?q?=E3=81=ABRepository=E3=81=AE=E3=83=81=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=82=92=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/InvalidRepositoryException.kt | 30 +++++++++++++++++++ .../producer/embedded/EmbeddedOwlProducer.kt | 5 ++++ 2 files changed, 35 insertions(+) create mode 100644 owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/InvalidRepositoryException.kt diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/InvalidRepositoryException.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/InvalidRepositoryException.kt new file mode 100644 index 00000000..9019c314 --- /dev/null +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/domain/exception/InvalidRepositoryException.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.owl.broker.domain.exception + +class InvalidRepositoryException : RuntimeException { + constructor() : super() + constructor(message: String?) : super(message) + constructor(message: String?, cause: Throwable?) : super(message, cause) + constructor(cause: Throwable?) : super(cause) + constructor(message: String?, cause: Throwable?, enableSuppression: Boolean, writableStackTrace: Boolean) : super( + message, + cause, + enableSuppression, + writableStackTrace + ) +} \ No newline at end of file diff --git a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt index b31890a3..bdf950bf 100644 --- a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt +++ b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt @@ -17,6 +17,8 @@ package dev.usbharu.owl.producer.embedded import dev.usbharu.owl.broker.OwlBrokerApplication +import dev.usbharu.owl.broker.domain.exception.InvalidRepositoryException +import dev.usbharu.owl.broker.domain.model.producer.ProducerRepository import dev.usbharu.owl.broker.service.* import dev.usbharu.owl.common.retry.RetryPolicyFactory import dev.usbharu.owl.common.task.PublishedTask @@ -53,6 +55,9 @@ class EmbeddedOwlProducer( modules(module, defaultModule, embeddedOwlProducerConfig.moduleContext.module()) }.koin + application.getOrNull() + ?: throw InvalidRepositoryException("Repository not found. Install owl-broker-mongodb, etc. on the classpath") + val producerService = application.get() producerId = producerService.registerProducer( From 918de02c86913b2034f82611927d67ef540b91e5 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 11 May 2024 15:35:42 +0900 Subject: [PATCH 16/24] =?UTF-8?q?feat:=20OWL=E3=82=92=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=82=AD=E3=83=A5=E3=83=BC=E3=81=AB=E3=81=84?= =?UTF-8?q?=E3=82=8C=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=A7=E3=81=8D?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hideout-core/build.gradle.kts | 1 + .../core/external/job/DeliverAcceptTask.kt | 34 ++++++++---- .../core/external/job/DeliverCreateTask.kt | 23 +------- .../core/external/job/DeliverDeleteTask.kt | 23 +------- .../core/external/job/DeliverReactionTask.kt | 24 +-------- ...liverRejectJob.kt => DeliverRejectTask.kt} | 24 +-------- .../core/external/job/DeliverUndoTask.kt | 23 +------- .../hideout/core/external/job/InboxTask.kt | 24 +-------- .../core/external/job/ReceiveFollowTask.kt | 23 +------- hideout-worker/build.gradle.kts | 1 + libs.versions.toml | 1 + .../build.gradle.kts | 23 ++++++++ .../src/main/kotlin/dev/usbharu/Main.kt | 21 ++++++++ .../common/property/ObjectPropertyValue.kt | 51 ++++++++++++++++++ .../owl/common/property/FloatPropertyValue.kt | 44 ++++++++++++++++ .../owl/common/property/LongPropertyValue.kt | 45 ++++++++++++++++ .../owl/common/property/PropertyValue.kt | 2 +- .../usbharu/owl/common/task/TaskDefinition.kt | 52 +++++++++++++++++-- .../embedded/EmbeddedOwlProducerBuilder.kt | 3 +- owl/settings.gradle.kts | 15 +++++- 20 files changed, 284 insertions(+), 173 deletions(-) rename hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/{DeliverRejectJob.kt => DeliverRejectTask.kt} (54%) create mode 100644 owl/owl-common/owl-common-serialize-jackson/build.gradle.kts create mode 100644 owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/Main.kt create mode 100644 owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/owl/common/property/ObjectPropertyValue.kt create mode 100644 owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/FloatPropertyValue.kt create mode 100644 owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/LongPropertyValue.kt diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index ca8e9cf8..e13545a9 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -202,6 +202,7 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-log4j2") implementation("org.springframework.boot:spring-boot-starter-validation") + implementation("dev.usbharu:owl-common-serialize-jackson:0.0.1") implementation("io.trbl:blurhash:1.0.0") implementation("software.amazon.awssdk:s3:2.25.23") implementation("org.jsoup:jsoup:1.17.2") diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptTask.kt index de3f4332..b7b19949 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverAcceptTask.kt @@ -17,7 +17,7 @@ package dev.usbharu.hideout.core.external.job import dev.usbharu.hideout.activitypub.domain.model.Accept -import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.property.* import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition @@ -32,25 +32,39 @@ data class DeliverAcceptTask( @Component data object DeliverAcceptTaskDef : TaskDefinition { override val name: String - get() = TODO("Not yet implemented") + get() = "DeliverAccept" override val priority: Int - get() = TODO("Not yet implemented") + get() = 10 override val maxRetry: Int - get() = TODO("Not yet implemented") + get() = 5 override val retryPolicy: String - get() = TODO("Not yet implemented") + get() = "" override val timeoutMilli: Long - get() = TODO("Not yet implemented") + get() = 1000 override val propertyDefinition: PropertyDefinition - get() = TODO("Not yet implemented") + get() = PropertyDefinition( + mapOf( + "accept" to PropertyType.binary, + "inbox" to PropertyType.string, + "signer" to PropertyType.number, + ) + ) override val type: Class - get() = TODO("Not yet implemented") + get() = DeliverAcceptTask::class.java override fun serialize(task: DeliverAcceptTask): Map> { - TODO("Not yet implemented") + return mapOf( + "accept" to ObjectPropertyValue(task.accept), + "inbox" to StringPropertyValue(task.inbox), + "signer" to LongPropertyValue(task.signer) + ) } override fun deserialize(value: Map>): DeliverAcceptTask { - TODO("Not yet implemented") + return DeliverAcceptTask( + value.getValue("accept").value as Accept, + value.getValue("inbox").value as String, + value.getValue("signer").value as Long, + ) } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt index 66a7bce1..b989b782 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt @@ -17,8 +17,6 @@ package dev.usbharu.hideout.core.external.job import dev.usbharu.hideout.activitypub.domain.model.Create -import dev.usbharu.owl.common.property.PropertyValue -import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition import org.springframework.stereotype.Component @@ -31,26 +29,7 @@ data class DeliverCreateTask( @Component data object DeliverCreateTaskDef : TaskDefinition { - override val name: String - get() = TODO("Not yet implemented") - override val priority: Int - get() = TODO("Not yet implemented") - override val maxRetry: Int - get() = TODO("Not yet implemented") - override val retryPolicy: String - get() = TODO("Not yet implemented") - override val timeoutMilli: Long - get() = TODO("Not yet implemented") - override val propertyDefinition: PropertyDefinition - get() = TODO("Not yet implemented") override val type: Class - get() = TODO("Not yet implemented") + get() = DeliverCreateTask::class.java - override fun serialize(task: DeliverCreateTask): Map> { - TODO("Not yet implemented") - } - - override fun deserialize(value: Map>): DeliverCreateTask { - TODO("Not yet implemented") - } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt index b4b55f51..29fe25d3 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt @@ -17,8 +17,6 @@ package dev.usbharu.hideout.core.external.job import dev.usbharu.hideout.activitypub.domain.model.Delete -import dev.usbharu.owl.common.property.PropertyValue -import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition import org.springframework.stereotype.Component @@ -31,26 +29,7 @@ data class DeliverDeleteTask( @Component data object DeliverDeleteTaskDef : TaskDefinition { - override val name: String - get() = TODO("Not yet implemented") - override val priority: Int - get() = TODO("Not yet implemented") - override val maxRetry: Int - get() = TODO("Not yet implemented") - override val retryPolicy: String - get() = TODO("Not yet implemented") - override val timeoutMilli: Long - get() = TODO("Not yet implemented") - override val propertyDefinition: PropertyDefinition - get() = TODO("Not yet implemented") override val type: Class - get() = TODO("Not yet implemented") + get() = DeliverDeleteTask::class.java - override fun serialize(task: DeliverDeleteTask): Map> { - TODO("Not yet implemented") - } - - override fun deserialize(value: Map>): DeliverDeleteTask { - TODO("Not yet implemented") - } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt index cd122db7..c1c73154 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverReactionTask.kt @@ -17,8 +17,6 @@ package dev.usbharu.hideout.core.external.job import dev.usbharu.hideout.activitypub.domain.model.Like -import dev.usbharu.owl.common.property.PropertyValue -import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition import org.springframework.stereotype.Component @@ -31,26 +29,6 @@ data class DeliverReactionTask( @Component data object DeliverReactionTaskDef : TaskDefinition { - override val name: String - get() = TODO("Not yet implemented") - override val priority: Int - get() = TODO("Not yet implemented") - override val maxRetry: Int - get() = TODO("Not yet implemented") - override val retryPolicy: String - get() = TODO("Not yet implemented") - override val timeoutMilli: Long - get() = TODO("Not yet implemented") - override val propertyDefinition: PropertyDefinition - get() = TODO("Not yet implemented") override val type: Class - get() = TODO("Not yet implemented") - - override fun deserialize(value: Map>): DeliverReactionTask { - TODO("Not yet implemented") - } - - override fun serialize(task: DeliverReactionTask): Map> { - TODO("Not yet implemented") - } + get() = DeliverReactionTask::class.java } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectTask.kt similarity index 54% rename from hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt rename to hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectTask.kt index b76e9f5e..5bb47432 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectJob.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverRejectTask.kt @@ -17,8 +17,6 @@ package dev.usbharu.hideout.core.external.job import dev.usbharu.hideout.activitypub.domain.model.Reject -import dev.usbharu.owl.common.property.PropertyValue -import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition import org.springframework.stereotype.Component @@ -31,26 +29,6 @@ data class DeliverRejectTask( @Component data object DeliverRejectTaskDef : TaskDefinition { - override val name: String - get() = TODO("Not yet implemented") - override val priority: Int - get() = TODO("Not yet implemented") - override val maxRetry: Int - get() = TODO("Not yet implemented") - override val retryPolicy: String - get() = TODO("Not yet implemented") - override val timeoutMilli: Long - get() = TODO("Not yet implemented") - override val propertyDefinition: PropertyDefinition - get() = TODO("Not yet implemented") override val type: Class - get() = TODO("Not yet implemented") - - override fun serialize(task: DeliverRejectTask): Map> { - TODO("Not yet implemented") - } - - override fun deserialize(value: Map>): DeliverRejectTask { - TODO("Not yet implemented") - } + get() = DeliverRejectTask::class.java } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt index 60ca28ba..69d47260 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt @@ -17,8 +17,6 @@ package dev.usbharu.hideout.core.external.job import dev.usbharu.hideout.activitypub.domain.model.Undo -import dev.usbharu.owl.common.property.PropertyValue -import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition import org.springframework.stereotype.Component @@ -31,26 +29,7 @@ data class DeliverUndoTask( @Component data object DeliverUndoTaskDef : TaskDefinition { - override val name: String - get() = TODO("Not yet implemented") - override val priority: Int - get() = TODO("Not yet implemented") - override val maxRetry: Int - get() = TODO("Not yet implemented") - override val retryPolicy: String - get() = TODO("Not yet implemented") - override val timeoutMilli: Long - get() = TODO("Not yet implemented") - override val propertyDefinition: PropertyDefinition - get() = TODO("Not yet implemented") override val type: Class - get() = TODO("Not yet implemented") + get() = DeliverUndoTask::class.java - override fun deserialize(value: Map>): DeliverUndoTask { - TODO("Not yet implemented") - } - - override fun serialize(task: DeliverUndoTask): Map> { - TODO("Not yet implemented") - } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt index 9206cc2b..b3e342b0 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt @@ -18,8 +18,6 @@ package dev.usbharu.hideout.core.external.job import dev.usbharu.hideout.activitypub.service.common.ActivityType import dev.usbharu.httpsignature.common.HttpRequest -import dev.usbharu.owl.common.property.PropertyValue -import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition import org.springframework.stereotype.Component @@ -33,26 +31,6 @@ data class InboxTask( @Component data object InboxTaskDef : TaskDefinition { - override val name: String - get() = TODO("Not yet implemented") - override val priority: Int - get() = TODO("Not yet implemented") - override val maxRetry: Int - get() = TODO("Not yet implemented") - override val retryPolicy: String - get() = TODO("Not yet implemented") - override val timeoutMilli: Long - get() = TODO("Not yet implemented") - override val propertyDefinition: PropertyDefinition - get() = TODO("Not yet implemented") override val type: Class - get() = TODO("Not yet implemented") - - override fun serialize(task: InboxTask): Map> { - TODO("Not yet implemented") - } - - override fun deserialize(value: Map>): InboxTask { - TODO("Not yet implemented") - } + get() = InboxTask::class.java } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt index d212896b..2792b13e 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt @@ -17,8 +17,6 @@ package dev.usbharu.hideout.core.external.job import dev.usbharu.hideout.activitypub.domain.model.Follow -import dev.usbharu.owl.common.property.PropertyValue -import dev.usbharu.owl.common.task.PropertyDefinition import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition import org.springframework.stereotype.Component @@ -31,26 +29,7 @@ data class ReceiveFollowTask( @Component data object ReceiveFollowTaskDef : TaskDefinition { - override val name: String - get() = TODO("Not yet implemented") - override val priority: Int - get() = TODO("Not yet implemented") - override val maxRetry: Int - get() = TODO("Not yet implemented") - override val retryPolicy: String - get() = TODO("Not yet implemented") - override val timeoutMilli: Long - get() = TODO("Not yet implemented") - override val propertyDefinition: PropertyDefinition - get() = TODO("Not yet implemented") override val type: Class - get() = TODO("Not yet implemented") + get() = ReceiveFollowTask::class.java - override fun deserialize(value: Map>): ReceiveFollowTask { - TODO("Not yet implemented") - } - - override fun serialize(task: ReceiveFollowTask): Map> { - TODO("Not yet implemented") - } } diff --git a/hideout-worker/build.gradle.kts b/hideout-worker/build.gradle.kts index 5397d66e..5ae0e94c 100644 --- a/hideout-worker/build.gradle.kts +++ b/hideout-worker/build.gradle.kts @@ -40,6 +40,7 @@ dependencies { testImplementation(kotlin("test")) implementation("dev.usbharu:owl-consumer:0.0.1") implementation("dev.usbharu:owl-common:0.0.1") + implementation("dev.usbharu:owl-common-serialize-jackson:0.0.1") implementation("dev.usbharu:hideout-core:0.0.1") implementation("dev.usbharu:http-signature:1.0.0") implementation("org.springframework.boot:spring-boot-starter") diff --git a/libs.versions.toml b/libs.versions.toml index ee3e55dd..2d43afd5 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -79,6 +79,7 @@ apache-tika = ["apache-tika-core", "apache-tika-parsers"] kjob = ["kjon-core", "kjon-mongo"] owl-producer = ["owl-producer-api", "owl-producer-default", "owl-producer-embedded"] owl-broker = ["owl-broker", "owl-broker-mongodb"] +jackson = ["jackson-databind", "jackson-module-kotlin"] [plugins] diff --git a/owl/owl-common/owl-common-serialize-jackson/build.gradle.kts b/owl/owl-common/owl-common-serialize-jackson/build.gradle.kts new file mode 100644 index 00000000..5eed5b43 --- /dev/null +++ b/owl/owl-common/owl-common-serialize-jackson/build.gradle.kts @@ -0,0 +1,23 @@ +plugins { + kotlin("jvm") +} + +group = "dev.usbharu" +version = "0.0.1" + +repositories { + mavenCentral() +} + +dependencies { + implementation(project(":owl-common")) + testImplementation(kotlin("test")) + implementation(libs.bundles.jackson) +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(21) +} \ No newline at end of file diff --git a/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/Main.kt b/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/Main.kt new file mode 100644 index 00000000..64eb428e --- /dev/null +++ b/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/Main.kt @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu + +fun main() { + println("Hello World!") +} \ No newline at end of file diff --git a/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/owl/common/property/ObjectPropertyValue.kt b/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/owl/common/property/ObjectPropertyValue.kt new file mode 100644 index 00000000..10682e1d --- /dev/null +++ b/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/owl/common/property/ObjectPropertyValue.kt @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.owl.common.property + +import com.fasterxml.jackson.databind.ObjectMapper + +class ObjectPropertyValue(override val value: Any) : PropertyValue() { + override val type: PropertyType + get() = PropertyType.string +} + +class ObjectPropertySerializer(private val objectMapper: ObjectMapper) : PropertySerializer { + override fun isSupported(propertyValue: PropertyValue<*>): Boolean { + return propertyValue is ObjectPropertyValue + } + + override fun isSupported(string: String): Boolean { + return string.startsWith("jackson:") + } + + override fun serialize(propertyValue: PropertyValue<*>): String { + return "jackson:" + propertyValue.value!!::class.qualifiedName + ":" + objectMapper.writeValueAsString( + propertyValue.value + ) + } + + override fun deserialize(string: String): PropertyValue { + + return ObjectPropertyValue( + objectMapper.readValue( + string, + Class.forName(string.substringAfter("jackson:").substringBeforeLast(":")) + ) + ) + + } +} \ No newline at end of file diff --git a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/FloatPropertyValue.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/FloatPropertyValue.kt new file mode 100644 index 00000000..0f18c832 --- /dev/null +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/FloatPropertyValue.kt @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.owl.common.property + +class FloatPropertyValue(override val value: Float) : PropertyValue() { + override val type: PropertyType + get() = PropertyType.number +} + +/** + * [FloatPropertyValue]のシリアライザー + * + */ +class FloatPropertySerializer : PropertySerializer { + override fun isSupported(propertyValue: PropertyValue<*>): Boolean { + return propertyValue.value is Float + } + + override fun isSupported(string: String): Boolean { + return string.startsWith("float:") + } + + override fun serialize(propertyValue: PropertyValue<*>): String { + return "float:" + propertyValue.value.toString() + } + + override fun deserialize(string: String): PropertyValue { + return FloatPropertyValue(string.replace("float:", "").toFloat()) + } +} \ No newline at end of file diff --git a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/LongPropertyValue.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/LongPropertyValue.kt new file mode 100644 index 00000000..660b0b69 --- /dev/null +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/LongPropertyValue.kt @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.owl.common.property + +class LongPropertyValue(override val value: Long) : PropertyValue() { + + override val type: PropertyType + get() = PropertyType.number +} + +/** + * [LongPropertyValue]のシリアライザー + * + */ +class LongPropertySerializer : PropertySerializer { + override fun isSupported(propertyValue: PropertyValue<*>): Boolean { + return propertyValue.value is Long + } + + override fun isSupported(string: String): Boolean { + return string.startsWith("int64:") + } + + override fun serialize(propertyValue: PropertyValue<*>): String { + return "int64:" + propertyValue.value.toString() + } + + override fun deserialize(string: String): PropertyValue { + return LongPropertyValue(string.replace("int64:", "").toLong()) + } +} \ No newline at end of file diff --git a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt index c251c54f..90910a8c 100644 --- a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt @@ -21,7 +21,7 @@ package dev.usbharu.owl.common.property * * @param T プロパティの型 */ -sealed class PropertyValue { +abstract class PropertyValue { /** * プロパティ */ diff --git a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt index b96c12de..0b7ec1dd 100644 --- a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt @@ -16,7 +16,7 @@ package dev.usbharu.owl.common.task -import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.property.* /** * タスク定義 @@ -28,16 +28,19 @@ interface TaskDefinition { * タスク名 */ val name: String + get() = type.simpleName /** * 優先度 */ val priority: Int + get() = 0 /** * 最大リトライ数 */ val maxRetry: Int + get() = 5 /** * リトライポリシー名 @@ -45,16 +48,31 @@ interface TaskDefinition { * ポリシーの解決は各Brokerに依存しています */ val retryPolicy: String + get() = "" /** * タスク実行時のタイムアウト(ミリ秒) */ val timeoutMilli: Long + get() = 1000 /** * プロパティ定義 */ val propertyDefinition: PropertyDefinition + get() { + val mapValues = type.fields.associate { it.name to it.type }.mapValues { + when { + it.value === Int::class.java -> PropertyType.number + it.value === String::class.java -> PropertyType.string + it.value === Long::class.java -> PropertyType.number + it.value === Double::class.java -> PropertyType.number + it.value === Float::class.java -> PropertyType.number + else -> PropertyType.binary + } + } + return PropertyDefinition(mapValues) + } /** * [Task]の[Class] @@ -67,7 +85,19 @@ interface TaskDefinition { * @param task シリアライズするタスク * @return シリアライズされたタスク */ - fun serialize(task: T): Map> + fun serialize(task: T): Map> { + return type.fields.associateBy { it.name }.mapValues { + when { + it.value.type === Int::class.java -> IntegerPropertyValue(it.value.getInt(task)) + it.value.type === String::class.java -> StringPropertyValue(it.value.get(task) as String) + it.value.type === Long::class.java -> LongPropertyValue(it.value.getLong(task)) + it.value.type === Double::class.java -> DoublePropertyValue(it.value.getDouble(task)) + it.value.type === Float::class.java -> FloatPropertyValue(it.value.getFloat(task)) + it.value.type === Boolean::class.java -> BooleanPropertyValue(it.value.getBoolean(task)) + else -> throw IllegalArgumentException("Unsupported type ${it.value} in ${task.javaClass.name}") + } + } + } /** * タスクをデシリアライズします。 @@ -75,5 +105,21 @@ interface TaskDefinition { * @param value デシリアライズするタスク * @return デシリアライズされたタスク */ - fun deserialize(value: Map>): T + fun deserialize(value: Map>): T { + + val task = type.getDeclaredConstructor().newInstance() + + type.fields.associateBy { it.name }.mapValues { + when { + it.value.type === Int::class.java -> it.value.setInt(task, value.getValue(it.key).value as Int) + it.value.type === Double::class.java -> it.value.setDouble(task, value.getValue(it.key).value as Double) + it.value.type === Float::class.java -> it.value.setFloat(task, value.getValue(it.key).value as Float) + it.value.type === String::class.java -> it.value.set(task, value.getValue(it.key).value as String) + it.value.type === Long::class.java -> it.value.setLong(task, value.getValue(it.key).value as Long) + else -> throw IllegalArgumentException("Unsupported type ${it.value} in ${task.javaClass.name}") + } + } + + return task + } } \ No newline at end of file diff --git a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerBuilder.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerBuilder.kt index 3a73cb08..e92b6fc9 100644 --- a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerBuilder.kt +++ b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerBuilder.kt @@ -18,6 +18,7 @@ package dev.usbharu.owl.producer.embedded import dev.usbharu.owl.broker.EmptyModuleContext import dev.usbharu.owl.common.retry.DefaultRetryPolicyFactory +import dev.usbharu.owl.common.retry.ExponentialRetryPolicy import dev.usbharu.owl.producer.api.OwlProducerBuilder class EmbeddedOwlProducerBuilder : OwlProducerBuilder { @@ -28,7 +29,7 @@ class EmbeddedOwlProducerBuilder : OwlProducerBuilder Date: Sat, 11 May 2024 19:04:57 +0900 Subject: [PATCH 17/24] =?UTF-8?q?feat:=20Consumer=E3=82=92=E8=AA=AD?= =?UTF-8?q?=E3=81=BF=E8=BE=BC=E3=82=93=E3=81=A7=E8=B5=B7=E5=8B=95=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hideout/application/config/OwlConfig.kt | 19 +- .../hideout/core/external/job/InboxTask.kt | 21 ++ hideout-core/src/main/resources/log4j2.xml | 16 ++ hideout-worker/build.gradle.kts | 9 + .../usbharu/hideout/SpringTaskRunnerLoader.kt | 26 +++ .../dev/usbharu/hideout/WorkerRunner.kt | 36 ++++ libs.versions.toml | 2 +- .../mongodb/MongodbQueuedTaskRepository.kt | 2 +- .../kotlin/dev/usbharu/owl/broker/Main.kt | 2 +- .../owl/broker/OwlBrokerApplication.kt | 4 +- .../interfaces/grpc/AssignmentTaskService.kt | 46 +++-- .../interfaces/grpc/TaskResultService.kt | 39 ++-- .../DefaultPropertySerializerFactory.kt | 4 +- .../owl/broker/service/QueuedTaskAssigner.kt | 7 +- .../common/property/ObjectPropertyValue.kt | 5 +- .../CustomPropertySerializerFactory.kt | 3 +- .../property/PropertySerializeException.kt | 30 +++ .../common/property/PropertySerializeUtils.kt | 13 +- .../owl/common/property/PropertyValue.kt | 5 + .../usbharu/owl/common/task/TaskDefinition.kt | 6 +- .../dev/usbharu/owl/consumer/Consumer.kt | 182 ++++++++++-------- .../owl/consumer/StandaloneConsumer.kt | 8 +- .../src/main/resources/consumer.properties | 20 ++ .../producer/embedded/EmbeddedOwlProducer.kt | 6 +- .../embedded/EmbeddedOwlProducerConfig.kt | 2 + 25 files changed, 392 insertions(+), 121 deletions(-) create mode 100644 hideout-core/src/main/resources/log4j2.xml create mode 100644 hideout-worker/src/main/kotlin/dev/usbharu/hideout/SpringTaskRunnerLoader.kt create mode 100644 hideout-worker/src/main/kotlin/dev/usbharu/hideout/WorkerRunner.kt create mode 100644 owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeException.kt create mode 100644 owl/owl-consumer/src/main/resources/consumer.properties diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt index 51d3be21..e5454e23 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/config/OwlConfig.kt @@ -16,7 +16,9 @@ package dev.usbharu.hideout.application.config +import com.fasterxml.jackson.databind.ObjectMapper import dev.usbharu.owl.broker.ModuleContext +import dev.usbharu.owl.common.property.* import dev.usbharu.owl.common.retry.RetryPolicyFactory import dev.usbharu.owl.producer.api.OWL import dev.usbharu.owl.producer.api.OwlProducer @@ -24,6 +26,7 @@ import dev.usbharu.owl.producer.defaultimpl.DEFAULT import dev.usbharu.owl.producer.embedded.EMBEDDED import dev.usbharu.owl.producer.embedded.EMBEDDED_GRPC import org.springframework.beans.factory.annotation.Autowired +import org.springframework.beans.factory.annotation.Qualifier import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration @@ -32,7 +35,10 @@ import java.util.* @Configuration class OwlConfig(private val producerConfig: ProducerConfig) { @Bean - fun producer(@Autowired(required = false) retryPolicyFactory: RetryPolicyFactory? = null): OwlProducer { + fun producer( + @Autowired(required = false) retryPolicyFactory: RetryPolicyFactory? = null, + @Qualifier("activitypub") objectMapper: ObjectMapper, + ): OwlProducer { return when (producerConfig.mode) { ProducerMode.EMBEDDED -> { OWL(EMBEDDED) { @@ -46,6 +52,17 @@ class OwlConfig(private val producerConfig: ProducerConfig) { if (moduleContext != null) { this.moduleContext = moduleContext } + this.propertySerializerFactory = CustomPropertySerializerFactory( + setOf( + IntegerPropertySerializer(), + StringPropertyValueSerializer(), + DoublePropertySerializer(), + BooleanPropertySerializer(), + LongPropertySerializer(), + FloatPropertySerializer(), + ObjectPropertySerializer(objectMapper), + ) + ) } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt index b3e342b0..de6b926f 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/InboxTask.kt @@ -18,6 +18,9 @@ package dev.usbharu.hideout.core.external.job import dev.usbharu.hideout.activitypub.service.common.ActivityType import dev.usbharu.httpsignature.common.HttpRequest +import dev.usbharu.owl.common.property.ObjectPropertyValue +import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.property.StringPropertyValue import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition import org.springframework.stereotype.Component @@ -33,4 +36,22 @@ data class InboxTask( data object InboxTaskDef : TaskDefinition { override val type: Class get() = InboxTask::class.java + + override fun serialize(task: InboxTask): Map> { + return mapOf( + "json" to StringPropertyValue(task.json), + "type" to ObjectPropertyValue(task.type), + "httpRequest" to ObjectPropertyValue(task.httpRequest), + "headers" to ObjectPropertyValue(task.headers), + ) + } + + override fun deserialize(value: Map>): InboxTask { + return InboxTask( + value.getValue("json").value as String, + value.getValue("type").value as ActivityType, + value.getValue("httpRequest").value as HttpRequest, + value.getValue("headers").value as Map>, + ) + } } diff --git a/hideout-core/src/main/resources/log4j2.xml b/hideout-core/src/main/resources/log4j2.xml new file mode 100644 index 00000000..e1d64a3b --- /dev/null +++ b/hideout-core/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/hideout-worker/build.gradle.kts b/hideout-worker/build.gradle.kts index 5ae0e94c..db74eb66 100644 --- a/hideout-worker/build.gradle.kts +++ b/hideout-worker/build.gradle.kts @@ -45,12 +45,21 @@ dependencies { implementation("dev.usbharu:http-signature:1.0.0") implementation("org.springframework.boot:spring-boot-starter") implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.springframework.boot:spring-boot-starter-log4j2") implementation(libs.jackson.databind) implementation(libs.jackson.module.kotlin) + implementation(libs.bundles.coroutines) testImplementation("org.springframework.boot:spring-boot-starter-test") } +configurations { + all { + exclude("org.springframework.boot", "spring-boot-starter-logging") + exclude("ch.qos.logback", "logback-classic") + } +} + tasks.test { useJUnitPlatform() } diff --git a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/SpringTaskRunnerLoader.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/SpringTaskRunnerLoader.kt new file mode 100644 index 00000000..6ff0b4a3 --- /dev/null +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/SpringTaskRunnerLoader.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout + +import dev.usbharu.owl.consumer.TaskRunner +import dev.usbharu.owl.consumer.TaskRunnerLoader +import org.springframework.stereotype.Component + +@Component +class SpringTaskRunnerLoader(private val taskRunners: List) : TaskRunnerLoader { + override fun load(): Map = taskRunners.associateBy { it.name } +} \ No newline at end of file diff --git a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/WorkerRunner.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/WorkerRunner.kt new file mode 100644 index 00000000..012e5ee5 --- /dev/null +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/WorkerRunner.kt @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout + +import dev.usbharu.owl.consumer.StandaloneConsumer +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch +import org.springframework.boot.ApplicationArguments +import org.springframework.boot.ApplicationRunner +import org.springframework.stereotype.Component + +@Component +class WorkerRunner(private val springTaskRunnerLoader: SpringTaskRunnerLoader) : ApplicationRunner { + override fun run(args: ApplicationArguments?) { + GlobalScope.launch(Dispatchers.Default) { + val consumer = StandaloneConsumer(taskRunnerLoader = springTaskRunnerLoader) + consumer.init() + consumer.start() + } + } +} \ No newline at end of file diff --git a/libs.versions.toml b/libs.versions.toml index 2d43afd5..85f71822 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -11,7 +11,7 @@ serialization = "1.6.3" kjob = "0.6.0" tika = "2.9.1" owl = "0.0.1" -jackson = "2.17.1" +jackson = "2.15.4" [libraries] diff --git a/owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt b/owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt index 343b5c21..a20f1d02 100644 --- a/owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt +++ b/owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt @@ -66,7 +66,7 @@ class MongodbQueuedTaskRepository( eq(QueuedTaskMongodb::isActive.name, true) ), listOf( - set(QueuedTaskMongodb::assignedConsumer.name, update.assignedConsumer), + set(QueuedTaskMongodb::assignedConsumer.name, update.assignedConsumer?.toString()), set(QueuedTaskMongodb::assignedAt.name, update.assignedAt), set(QueuedTaskMongodb::queuedAt.name, update.queuedAt), set(QueuedTaskMongodb::isActive.name, update.isActive) diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt index 7f3d71b4..265a9487 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt @@ -44,7 +44,7 @@ fun main() { DefaultRetryPolicyFactory(mapOf("" to ExponentialRetryPolicy())) } } - modules(module, defaultModule, moduleContext.module()) + modules(defaultModule, module, moduleContext.module()) } val application = koin.koin.get() diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt index 66696f23..6ed8527e 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt @@ -34,7 +34,8 @@ class OwlBrokerApplication( private val subscribeTaskService: SubscribeTaskService, private val taskPublishService: TaskPublishService, private val taskManagementService: TaskManagementService, - private val taskResultSubscribeService: TaskResultSubscribeService + private val taskResultSubscribeService: TaskResultSubscribeService, + private val taskResultService: TaskResultService, ) { private lateinit var server: Server @@ -47,6 +48,7 @@ class OwlBrokerApplication( .addService(subscribeTaskService) .addService(taskPublishService) .addService(taskResultSubscribeService) + .addService(taskResultService) .build() server.start() diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt index 4004de82..9c71b8e0 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt @@ -24,10 +24,13 @@ import dev.usbharu.owl.broker.external.toUUID import dev.usbharu.owl.broker.service.QueuedTaskAssigner import dev.usbharu.owl.common.property.PropertySerializeUtils import dev.usbharu.owl.common.property.PropertySerializerFactory +import io.grpc.Status +import io.grpc.StatusException import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flatMapMerge import kotlinx.coroutines.flow.map import org.koin.core.annotation.Singleton +import org.slf4j.LoggerFactory import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext @@ -40,19 +43,34 @@ class AssignmentTaskService( AssignmentTaskServiceGrpcKt.AssignmentTaskServiceCoroutineImplBase(coroutineContext) { override fun ready(requests: Flow): Flow { - return requests - .flatMapMerge { - queuedTaskAssigner.ready(it.consumerId.toUUID(), it.numberOfConcurrent) - } - .map { - Task.TaskRequest - .newBuilder() - .setName(it.task.name) - .setId(it.task.id.toUUID()) - .setAttempt(it.attempt) - .setQueuedAt(it.queuedAt.toTimestamp()) - .putAllProperties(PropertySerializeUtils.serialize(propertySerializerFactory, it.task.properties)) - .build() - } + + return try { + requests + .flatMapMerge { + queuedTaskAssigner.ready(it.consumerId.toUUID(), it.numberOfConcurrent) + } + .map { + Task.TaskRequest + .newBuilder() + .setName(it.task.name) + .setId(it.task.id.toUUID()) + .setAttempt(it.attempt) + .setQueuedAt(it.queuedAt.toTimestamp()) + .putAllProperties( + PropertySerializeUtils.serialize( + propertySerializerFactory, + it.task.properties + ) + ) + .build() + } + } catch (e: Exception) { + logger.warn("Error while reading requests", e) + throw StatusException(Status.INTERNAL.withDescription("Error while reading requests").withCause(e)) + } + } + + companion object { + private val logger = LoggerFactory.getLogger(AssignmentTaskService::class.java) } } \ No newline at end of file diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt index 613480b9..1a82a7ef 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt @@ -24,13 +24,19 @@ import dev.usbharu.owl.broker.external.toUUID import dev.usbharu.owl.broker.service.TaskManagementService import dev.usbharu.owl.common.property.PropertySerializeUtils import dev.usbharu.owl.common.property.PropertySerializerFactory +import io.grpc.Status +import io.grpc.StatusException +import kotlinx.coroutines.CancellationException import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.onEach +import org.koin.core.annotation.Singleton +import org.slf4j.LoggerFactory import java.util.* import kotlin.coroutines.CoroutineContext import kotlin.coroutines.EmptyCoroutineContext +@Singleton class TaskResultService( coroutineContext: CoroutineContext = EmptyCoroutineContext, private val taskManagementService: TaskManagementService, @@ -38,18 +44,29 @@ class TaskResultService( ) : TaskResultServiceGrpcKt.TaskResultServiceCoroutineImplBase(coroutineContext) { override suspend fun tasKResult(requests: Flow): Empty { - requests.onEach { - taskManagementService.queueProcessed( - TaskResult( - id = UUID.randomUUID(), - taskId = it.id.toUUID(), - success = it.success, - attempt = it.attempt, - result = PropertySerializeUtils.deserialize(propertySerializerFactory, it.resultMap), - message = it.message + try { + requests.onEach { + taskManagementService.queueProcessed( + TaskResult( + id = UUID.randomUUID(), + taskId = it.id.toUUID(), + success = it.success, + attempt = it.attempt, + result = PropertySerializeUtils.deserialize(propertySerializerFactory, it.resultMap), + message = it.message + ) ) - ) - }.collect() + }.collect() + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + logger.warn("Error while executing task results", e) + throw StatusException(Status.INTERNAL.withDescription("Error while executing task results").withCause(e)) + } return Empty.getDefaultInstance() } + + companion object { + private val logger = LoggerFactory.getLogger(TaskResultService::class.java) + } } \ No newline at end of file diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt index d35c6e06..b1caaf51 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt @@ -26,6 +26,8 @@ class DefaultPropertySerializerFactory : IntegerPropertySerializer(), StringPropertyValueSerializer(), DoublePropertySerializer(), - BooleanPropertySerializer() + BooleanPropertySerializer(), + LongPropertySerializer(), + FloatPropertySerializer(), ) ) \ No newline at end of file diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt index da6c1390..a529bbe4 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt @@ -18,10 +18,7 @@ package dev.usbharu.owl.broker.service import dev.usbharu.owl.broker.domain.exception.service.QueueCannotDequeueException import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.collect -import kotlinx.coroutines.flow.flow -import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.* import org.koin.core.annotation.Singleton import org.slf4j.LoggerFactory import java.time.Instant @@ -37,6 +34,7 @@ class QueuedTaskAssignerImpl( private val queueStore: QueueStore ) : QueuedTaskAssigner { override fun ready(consumerId: UUID, numberOfConcurrent: Int): Flow { + logger.trace("Ready {}/{}", numberOfConcurrent, consumerId) return flow { taskManagementService.findAssignableTask(consumerId, numberOfConcurrent) .onEach { @@ -46,6 +44,7 @@ class QueuedTaskAssignerImpl( emit(assignTask) } } + .catch { logger.warn("Failed to assign task {}", consumerId, it) } .collect() } } diff --git a/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/owl/common/property/ObjectPropertyValue.kt b/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/owl/common/property/ObjectPropertyValue.kt index 10682e1d..7d92a350 100644 --- a/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/owl/common/property/ObjectPropertyValue.kt +++ b/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/owl/common/property/ObjectPropertyValue.kt @@ -25,6 +25,7 @@ class ObjectPropertyValue(override val value: Any) : PropertyValue() { class ObjectPropertySerializer(private val objectMapper: ObjectMapper) : PropertySerializer { override fun isSupported(propertyValue: PropertyValue<*>): Boolean { + println(propertyValue::class.java) return propertyValue is ObjectPropertyValue } @@ -39,11 +40,11 @@ class ObjectPropertySerializer(private val objectMapper: ObjectMapper) : Propert } override fun deserialize(string: String): PropertyValue { - +//todo jacksonに読み込ませるStringがjackson:classname:jsonになっているのでjsonだけを読み込ませる return ObjectPropertyValue( objectMapper.readValue( string, - Class.forName(string.substringAfter("jackson:").substringBeforeLast(":")) + Class.forName(string.substringAfter("jackson:").substringBefore(":")) ) ) diff --git a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt index c1d0537b..00d7a3f3 100644 --- a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/CustomPropertySerializerFactory.kt @@ -24,7 +24,8 @@ package dev.usbharu.owl.common.property open class CustomPropertySerializerFactory(private val propertySerializers: Set>) : PropertySerializerFactory { override fun factory(propertyValue: PropertyValue): PropertySerializer { - return propertySerializers.first { it.isSupported(propertyValue) } as PropertySerializer + return propertySerializers.firstOrNull { it.isSupported(propertyValue) } as PropertySerializer? + ?: throw IllegalArgumentException("PropertySerializer not found: $propertyValue") } override fun factory(string: String): PropertySerializer<*> { diff --git a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeException.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeException.kt new file mode 100644 index 00000000..4acc597d --- /dev/null +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeException.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.owl.common.property + +class PropertySerializeException : RuntimeException { + constructor() : super() + constructor(message: String?) : super(message) + constructor(message: String?, cause: Throwable?) : super(message, cause) + constructor(cause: Throwable?) : super(cause) + constructor(message: String?, cause: Throwable?, enableSuppression: Boolean, writableStackTrace: Boolean) : super( + message, + cause, + enableSuppression, + writableStackTrace + ) +} \ No newline at end of file diff --git a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt index 248e63f2..94c411c4 100644 --- a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt @@ -29,9 +29,16 @@ object PropertySerializeUtils { */ fun serialize( serializerFactory: PropertySerializerFactory, - properties: Map> - ): Map = - properties.map { it.key to serializerFactory.factory(it.value).serialize(it.value) }.toMap() + properties: Map>, + ): Map { + return properties.map { + try { + it.key to serializerFactory.factory(it.value).serialize(it.value) + } catch (e: Exception) { + throw PropertySerializeException("Failed to serialize property in ${serializerFactory.javaClass}", e) + } + }.toMap() + } /** * Stringとシリアライズ済みの[PropertyValue]の[Map]からシリアライズ済みの[PropertyValue]をデシリアライズし、Stringと[PropertyValue]の[Map]として返します diff --git a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt index 90910a8c..d04ca229 100644 --- a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertyValue.kt @@ -31,4 +31,9 @@ abstract class PropertyValue { * プロパティの型 */ abstract val type: PropertyType + override fun toString(): String { + return "PropertyValue(value=$value, type=$type)" + } + + } \ No newline at end of file diff --git a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt index 0b7ec1dd..a4ef6a5b 100644 --- a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt @@ -107,7 +107,11 @@ interface TaskDefinition { */ fun deserialize(value: Map>): T { - val task = type.getDeclaredConstructor().newInstance() + val task = try { + type.getDeclaredConstructor().newInstance() + } catch (e: Exception) { + throw IllegalArgumentException("Unable to deserialize value $value for type ${type.name}", e) + } type.fields.associateBy { it.name }.mapValues { when { diff --git a/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt index 777e2d4a..886bacc4 100644 --- a/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt +++ b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt @@ -81,86 +81,116 @@ class Consumer( suspend fun start() { coroutineScope = CoroutineScope(Dispatchers.Default) coroutineScope { - taskResultStub - .tasKResult(flow { - assignmentTaskStub - .ready(flow { - while (coroutineScope.isActive) { - val andSet = concurrent.getAndUpdate { 0 } + while (isActive) { + try { + taskResultStub + .tasKResult(flow { + assignmentTaskStub + .ready(flow { + requestTask() + }).onEach { + logger.info("Start Task name: {}", it.name) + processing.update { it + 1 } + try { - if (andSet != 0) { - logger.debug("Request {} tasks.", andSet) - emit(readyRequest { - this.consumerId = consumerId - this.numberOfConcurrent = andSet - }) - continue - } - delay(100) - - concurrent.update { - ((64 - it) - processing.value).coerceIn(0, 64 - max(0, processing.value)) - } - } - }).onEach { - logger.info("Start Task name: {}", it.name) - processing.update { it + 1 } - - try { - - val taskResult = runnerMap.getValue(it.name).run( - TaskRequest( - it.name, - java.util.UUID(it.id.mostSignificantUuidBits, it.id.leastSignificantUuidBits), - it.attempt, - Instant.ofEpochSecond(it.queuedAt.seconds, it.queuedAt.nanos.toLong()), - PropertySerializeUtils.deserialize(propertySerializerFactory, it.propertiesMap) - ) - ) - - emit(taskResult { - this.success = taskResult.success - this.attempt = it.attempt - this.id = it.id - this.result.putAll( - PropertySerializeUtils.serialize( - propertySerializerFactory, taskResult.result + val taskResult = runnerMap.getValue(it.name).run( + TaskRequest( + it.name, + java.util.UUID( + it.id.mostSignificantUuidBits, + it.id.leastSignificantUuidBits + ), + it.attempt, + Instant.ofEpochSecond(it.queuedAt.seconds, it.queuedAt.nanos.toLong()), + PropertySerializeUtils.deserialize( + propertySerializerFactory, + it.propertiesMap + ) + ) ) - ) - this.message = taskResult.message - }) - logger.info("Success execute task. name: {} success: {}", it.name, taskResult.success) - logger.debug("TRACE RESULT {}", taskResult) - } catch (e: CancellationException) { - logger.warn("Cancelled execute task.", e) - emit(taskResult { - this.success = false - this.attempt = it.attempt - this.id = it.id - this.message = e.localizedMessage - }) - throw e - } catch (e: Exception) { - logger.warn("Failed execute task.", e) - emit(taskResult { - this.success = false - this.attempt = it.attempt - this.id = it.id - this.message = e.localizedMessage - }) - } finally { - processing.update { it - 1 } - concurrent.update { - if (it < 64) { - it + 1 - } else { - 64 + + emit(taskResult { + this.success = taskResult.success + this.attempt = it.attempt + this.id = it.id + this.result.putAll( + PropertySerializeUtils.serialize( + propertySerializerFactory, taskResult.result + ) + ) + this.message = taskResult.message + }) + logger.info( + "Success execute task. name: {} success: {}", + it.name, + taskResult.success + ) + logger.debug("TRACE RESULT {}", taskResult) + } catch (e: CancellationException) { + logger.warn("Cancelled execute task.", e) + emit(taskResult { + this.success = false + this.attempt = it.attempt + this.id = it.id + this.message = e.localizedMessage + }) + throw e + } catch (e: Exception) { + logger.warn("Failed execute task.", e) + emit(taskResult { + this.success = false + this.attempt = it.attempt + this.id = it.id + this.message = e.localizedMessage + }) + } finally { + processing.update { it - 1 } + concurrent.update { + if (it < 64) { + it + 1 + } else { + 64 + } + } } - } - } - }.flowOn(Dispatchers.Default).collect() - }) + }.flowOn(Dispatchers.Default).collect() + }) + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + logger.warn("Consumer error", e) + } + + delay(1000) + } + } + } + + private suspend fun FlowCollector.requestTask() { + while (coroutineScope.isActive) { + val andSet = concurrent.getAndUpdate { 0 } + + + if (andSet != 0) { + logger.debug("Request {} tasks.", andSet) + try { + emit(readyRequest { + this.consumerId = this@Consumer.consumerId + this.numberOfConcurrent = andSet + }) + } catch (e: CancellationException) { + throw e + } catch (e: Exception) { + logger.warn("Failed request task.", e) + } + continue + } + delay(100) + + concurrent.update { + ((64 - it) - processing.value).coerceIn(0, 64 - max(0, processing.value)) + } } } diff --git a/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt index 0e54a92a..34f75a05 100644 --- a/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt +++ b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/StandaloneConsumer.kt @@ -52,7 +52,11 @@ class StandaloneConsumer( constructor( propertySerializerFactory: PropertySerializerFactory = CustomPropertySerializerFactory(emptySet()), taskRunnerLoader: TaskRunnerLoader = ServiceLoaderTaskRunnerLoader(), - ) : this(Path.of("consumer.properties"), propertySerializerFactory, taskRunnerLoader) + ) : this( + Path.of(StandaloneConsumer::class.java.getClassLoader().getResource("consumer.properties").toURI()), + propertySerializerFactory, + taskRunnerLoader + ) private val channel = ManagedChannelBuilder.forAddress(config.address, config.port) .usePlaintext() @@ -68,7 +72,7 @@ class StandaloneConsumer( taskResultStub = taskResultStub, taskRunnerLoader = taskRunnerLoader, propertySerializerFactory = propertySerializerFactory, - consumerConfig = ConsumerConfig(config.concurrency) + consumerConfig = ConsumerConfig(config.concurrency), ) /** diff --git a/owl/owl-consumer/src/main/resources/consumer.properties b/owl/owl-consumer/src/main/resources/consumer.properties new file mode 100644 index 00000000..05da7435 --- /dev/null +++ b/owl/owl-consumer/src/main/resources/consumer.properties @@ -0,0 +1,20 @@ +# +# Copyright (C) 2024 usbharu +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +address=localhost +port=50051 +name=owl +hostname=localhost +concurrency=10 \ No newline at end of file diff --git a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt index bdf950bf..0f9c5647 100644 --- a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt +++ b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt @@ -20,6 +20,7 @@ import dev.usbharu.owl.broker.OwlBrokerApplication import dev.usbharu.owl.broker.domain.exception.InvalidRepositoryException import dev.usbharu.owl.broker.domain.model.producer.ProducerRepository import dev.usbharu.owl.broker.service.* +import dev.usbharu.owl.common.property.PropertySerializerFactory import dev.usbharu.owl.common.retry.RetryPolicyFactory import dev.usbharu.owl.common.task.PublishedTask import dev.usbharu.owl.common.task.Task @@ -51,8 +52,11 @@ class EmbeddedOwlProducer( single { embeddedOwlProducerConfig.retryPolicyFactory } + single { + embeddedOwlProducerConfig.propertySerializerFactory + } } - modules(module, defaultModule, embeddedOwlProducerConfig.moduleContext.module()) + modules(defaultModule, module, embeddedOwlProducerConfig.moduleContext.module()) }.koin application.getOrNull() diff --git a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerConfig.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerConfig.kt index 086ad5bc..61e60220 100644 --- a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerConfig.kt +++ b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducerConfig.kt @@ -17,12 +17,14 @@ package dev.usbharu.owl.producer.embedded import dev.usbharu.owl.broker.ModuleContext +import dev.usbharu.owl.common.property.CustomPropertySerializerFactory import dev.usbharu.owl.common.retry.RetryPolicyFactory import dev.usbharu.owl.producer.api.OwlProducerConfig class EmbeddedOwlProducerConfig : OwlProducerConfig { lateinit var moduleContext: ModuleContext lateinit var retryPolicyFactory: RetryPolicyFactory + lateinit var propertySerializerFactory: CustomPropertySerializerFactory lateinit var name: String lateinit var port: String } From 9c7fda27eafb20309a506555aa214e42ec456484 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 11 May 2024 22:50:03 +0900 Subject: [PATCH 18/24] =?UTF-8?q?feat:=20OWL=E3=81=A7=E3=82=BF=E3=82=B9?= =?UTF-8?q?=E3=82=AF=E3=82=92=E5=AE=9F=E8=A1=8C=E3=81=A7=E3=81=8D=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/external/job/ReceiveFollowTask.kt | 18 +++++++++++++ hideout-core/src/main/resources/log4j2.xml | 4 +-- .../dev/usbharu/hideout/WorkerRunner.kt | 22 ++++++++++++++-- .../owl/broker/service/QueuedTaskAssigner.kt | 9 +++---- .../broker/service/TaskManagementService.kt | 6 ++--- .../common/property/ObjectPropertyValue.kt | 4 +-- .../dev/usbharu/owl/common/ReflectionUtils.kt | 26 +++++++++++++++++++ .../common/property/PropertySerializeUtils.kt | 13 +++++++--- .../usbharu/owl/common/task/TaskDefinition.kt | 7 ++--- .../dev/usbharu/owl/consumer/Consumer.kt | 6 ++--- 10 files changed, 90 insertions(+), 25 deletions(-) create mode 100644 owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/ReflectionUtils.kt diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt index 2792b13e..a72b0d5a 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/ReceiveFollowTask.kt @@ -17,6 +17,9 @@ package dev.usbharu.hideout.core.external.job import dev.usbharu.hideout.activitypub.domain.model.Follow +import dev.usbharu.owl.common.property.ObjectPropertyValue +import dev.usbharu.owl.common.property.PropertyValue +import dev.usbharu.owl.common.property.StringPropertyValue import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition import org.springframework.stereotype.Component @@ -32,4 +35,19 @@ data object ReceiveFollowTaskDef : TaskDefinition { override val type: Class get() = ReceiveFollowTask::class.java + override fun serialize(task: ReceiveFollowTask): Map> { + return mapOf( + "actor" to StringPropertyValue(task.actor), + "follow" to ObjectPropertyValue(task.follow), + "targetActor" to StringPropertyValue(task.targetActor) + ) + } + + override fun deserialize(value: Map>): ReceiveFollowTask { + return ReceiveFollowTask( + value.getValue("actor").value as String, + value.getValue("follow").value as Follow, + value.getValue("targetActor").value as String, + ) + } } diff --git a/hideout-core/src/main/resources/log4j2.xml b/hideout-core/src/main/resources/log4j2.xml index e1d64a3b..7c9b917d 100644 --- a/hideout-core/src/main/resources/log4j2.xml +++ b/hideout-core/src/main/resources/log4j2.xml @@ -9,8 +9,6 @@ - - - + \ No newline at end of file diff --git a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/WorkerRunner.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/WorkerRunner.kt index 012e5ee5..b19836b0 100644 --- a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/WorkerRunner.kt +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/WorkerRunner.kt @@ -16,19 +16,37 @@ package dev.usbharu.hideout +import com.fasterxml.jackson.databind.ObjectMapper +import dev.usbharu.owl.common.property.* import dev.usbharu.owl.consumer.StandaloneConsumer import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch +import org.springframework.beans.factory.annotation.Qualifier import org.springframework.boot.ApplicationArguments import org.springframework.boot.ApplicationRunner import org.springframework.stereotype.Component @Component -class WorkerRunner(private val springTaskRunnerLoader: SpringTaskRunnerLoader) : ApplicationRunner { +class WorkerRunner( + private val springTaskRunnerLoader: SpringTaskRunnerLoader, + @Qualifier("activitypub") private val objectMapper: ObjectMapper, +) : ApplicationRunner { override fun run(args: ApplicationArguments?) { GlobalScope.launch(Dispatchers.Default) { - val consumer = StandaloneConsumer(taskRunnerLoader = springTaskRunnerLoader) + val consumer = StandaloneConsumer( + taskRunnerLoader = springTaskRunnerLoader, propertySerializerFactory = CustomPropertySerializerFactory( + setOf( + IntegerPropertySerializer(), + StringPropertyValueSerializer(), + DoublePropertySerializer(), + BooleanPropertySerializer(), + LongPropertySerializer(), + FloatPropertySerializer(), + ObjectPropertySerializer(objectMapper), + ) + ) + ) consumer.init() consumer.start() } diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt index a529bbe4..4f0678fe 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt @@ -34,7 +34,6 @@ class QueuedTaskAssignerImpl( private val queueStore: QueueStore ) : QueuedTaskAssigner { override fun ready(consumerId: UUID, numberOfConcurrent: Int): Flow { - logger.trace("Ready {}/{}", numberOfConcurrent, consumerId) return flow { taskManagementService.findAssignableTask(consumerId, numberOfConcurrent) .onEach { @@ -65,10 +64,10 @@ class QueuedTaskAssignerImpl( logger.debug( "Assign Task. name: {} id: {} attempt: {} consumer: {}", - queuedTask.task.name, - queuedTask.task.id, - queuedTask.attempt, - queuedTask.assignedConsumer + assignedTaskQueue.task.name, + assignedTaskQueue.task.id, + assignedTaskQueue.attempt, + assignedTaskQueue.assignedConsumer ) assignedTaskQueue } catch (e: QueueCannotDequeueException) { diff --git a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt index 360fae1a..3d801972 100644 --- a/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt +++ b/owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt @@ -130,8 +130,8 @@ class TaskManagementServiceImpl( } override suspend fun queueProcessed(taskResult: TaskResult) { - val task = taskRepository.findById(taskResult.id) - ?: throw RecordNotFoundException("Task not found. id: ${taskResult.id}") + val task = taskRepository.findById(taskResult.taskId) + ?: throw RecordNotFoundException("Task not found. id: ${taskResult.taskId}") val taskDefinition = taskDefinitionRepository.findByName(task.name) ?: throw TaskNotRegisterException("Task ${task.name} not definition.") @@ -147,7 +147,7 @@ class TaskManagementServiceImpl( taskResultRepository.save(taskResult) taskRepository.findByIdAndUpdate( - taskResult.id, + taskResult.taskId, task.copy(completedAt = completedAt, attempt = taskResult.attempt) ) diff --git a/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/owl/common/property/ObjectPropertyValue.kt b/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/owl/common/property/ObjectPropertyValue.kt index 7d92a350..6583d4f1 100644 --- a/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/owl/common/property/ObjectPropertyValue.kt +++ b/owl/owl-common/owl-common-serialize-jackson/src/main/kotlin/dev/usbharu/owl/common/property/ObjectPropertyValue.kt @@ -25,7 +25,6 @@ class ObjectPropertyValue(override val value: Any) : PropertyValue() { class ObjectPropertySerializer(private val objectMapper: ObjectMapper) : PropertySerializer { override fun isSupported(propertyValue: PropertyValue<*>): Boolean { - println(propertyValue::class.java) return propertyValue is ObjectPropertyValue } @@ -40,10 +39,9 @@ class ObjectPropertySerializer(private val objectMapper: ObjectMapper) : Propert } override fun deserialize(string: String): PropertyValue { -//todo jacksonに読み込ませるStringがjackson:classname:jsonになっているのでjsonだけを読み込ませる return ObjectPropertyValue( objectMapper.readValue( - string, + string.substringAfter("jackson:").substringAfter(":"), Class.forName(string.substringAfter("jackson:").substringBefore(":")) ) ) diff --git a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/ReflectionUtils.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/ReflectionUtils.kt new file mode 100644 index 00000000..f0a6ff90 --- /dev/null +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/ReflectionUtils.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.owl.common + +import java.lang.reflect.Field + +val Class<*>.allFields: List + get() = if (superclass != null) { + superclass.allFields + declaredFields + } else { + declaredFields.toList() + }.map { it.trySetAccessible();it } \ No newline at end of file diff --git a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt index 94c411c4..817f3d24 100644 --- a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/property/PropertySerializeUtils.kt @@ -49,7 +49,14 @@ object PropertySerializeUtils { */ fun deserialize( serializerFactory: PropertySerializerFactory, - properties: Map - ): Map> = - properties.map { it.key to serializerFactory.factory(it.value).deserialize(it.value) }.toMap() + properties: Map, + ): Map> { + return properties.map { + try { + it.key to serializerFactory.factory(it.value).deserialize(it.value) + } catch (e: Exception) { + throw PropertySerializeException("Failed to deserialize property in ${serializerFactory.javaClass}", e) + } + }.toMap() + } } \ No newline at end of file diff --git a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt index a4ef6a5b..5cced498 100644 --- a/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt +++ b/owl/owl-common/src/main/kotlin/dev/usbharu/owl/common/task/TaskDefinition.kt @@ -16,6 +16,7 @@ package dev.usbharu.owl.common.task +import dev.usbharu.owl.common.allFields import dev.usbharu.owl.common.property.* /** @@ -61,7 +62,7 @@ interface TaskDefinition { */ val propertyDefinition: PropertyDefinition get() { - val mapValues = type.fields.associate { it.name to it.type }.mapValues { + val mapValues = type.allFields.associate { it.name to it.type }.mapValues { when { it.value === Int::class.java -> PropertyType.number it.value === String::class.java -> PropertyType.string @@ -86,7 +87,7 @@ interface TaskDefinition { * @return シリアライズされたタスク */ fun serialize(task: T): Map> { - return type.fields.associateBy { it.name }.mapValues { + return type.allFields.associateBy { it.name }.mapValues { when { it.value.type === Int::class.java -> IntegerPropertyValue(it.value.getInt(task)) it.value.type === String::class.java -> StringPropertyValue(it.value.get(task) as String) @@ -113,7 +114,7 @@ interface TaskDefinition { throw IllegalArgumentException("Unable to deserialize value $value for type ${type.name}", e) } - type.fields.associateBy { it.name }.mapValues { + type.allFields.associateBy { it.name }.mapValues { when { it.value.type === Int::class.java -> it.value.setInt(task, value.getValue(it.key).value as Int) it.value.type === Double::class.java -> it.value.setDouble(task, value.getValue(it.key).value as Double) diff --git a/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt index 886bacc4..56ac00c7 100644 --- a/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt +++ b/owl/owl-consumer/src/main/kotlin/dev/usbharu/owl/consumer/Consumer.kt @@ -89,11 +89,10 @@ class Consumer( .ready(flow { requestTask() }).onEach { - logger.info("Start Task name: {}", it.name) + logger.info("Start Task name: {} id: {}", it.name, it.id) processing.update { it + 1 } try { - val taskResult = runnerMap.getValue(it.name).run( TaskRequest( it.name, @@ -137,7 +136,7 @@ class Consumer( }) throw e } catch (e: Exception) { - logger.warn("Failed execute task.", e) + logger.warn("Failed execute task. name: {} id: {}", it.name, it.id, e) emit(taskResult { this.success = false this.attempt = it.attempt @@ -145,6 +144,7 @@ class Consumer( this.message = e.localizedMessage }) } finally { + logger.debug(" Task name: {} id: {}", it.name, it.id) processing.update { it - 1 } concurrent.update { if (it < 64) { From 585907a4c450314823acadc53d8bdb75e1fa4e77 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 11 May 2024 23:14:23 +0900 Subject: [PATCH 19/24] =?UTF-8?q?chore:=20=E4=BE=9D=E5=AD=98=E9=96=A2?= =?UTF-8?q?=E4=BF=82=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- owl/build.gradle.kts | 2 +- owl/owl-broker/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/owl/build.gradle.kts b/owl/build.gradle.kts index 36e9a22a..0e74414e 100644 --- a/owl/build.gradle.kts +++ b/owl/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.9.24" + alias(libs.plugins.kotlin.jvm) } diff --git a/owl/owl-broker/build.gradle.kts b/owl/owl-broker/build.gradle.kts index df56c538..c5e4117b 100644 --- a/owl/owl-broker/build.gradle.kts +++ b/owl/owl-broker/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") + alias(libs.plugins.kotlin.jvm) id("com.google.protobuf") version "0.9.4" id("com.google.devtools.ksp") version "1.9.23-1.0.20" } From 78e70c70c983c87d1f0d3e0e73d32f62d77e49d3 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 11 May 2024 23:26:25 +0900 Subject: [PATCH 20/24] =?UTF-8?q?chore:=20=E3=83=97=E3=83=AD=E3=82=B8?= =?UTF-8?q?=E3=82=A7=E3=82=AF=E3=83=88=E6=A7=8B=E9=80=A0=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 0 gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 +++++++++++++++++++++++ gradlew.bat | 92 +++++++++ hideout.iml | 8 - settings.gradle.kts | 34 ++++ 7 files changed, 382 insertions(+), 8 deletions(-) create mode 100644 build.gradle.kts create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat delete mode 100644 hideout.iml create mode 100644 settings.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..e69de29b diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..1af9e093 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..1aa94a42 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..93e3f59f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/hideout.iml b/hideout.iml deleted file mode 100644 index 9a5cfcef..00000000 --- a/hideout.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..d68d7e07 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" +} +rootProject.name = "hideout" + +includeBuild("owl") + +dependencyResolutionManagement { + repositories { + mavenCentral() + } + + versionCatalogs { + create("libs") { + from(files("libs.versions.toml")) + } + } +} \ No newline at end of file From 683bbc5eecb7ae7b38719347728aa43d59d6b590 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 11 May 2024 23:27:17 +0900 Subject: [PATCH 21/24] =?UTF-8?q?chore:=20=E3=83=97=E3=83=AD=E3=82=B8?= =?UTF-8?q?=E3=82=A7=E3=82=AF=E3=83=88=E6=A7=8B=E9=80=A0=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From abf3b329e23c7ee67c3cf96bf4ff993f5337198d Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sun, 12 May 2024 00:19:09 +0900 Subject: [PATCH 22/24] =?UTF-8?q?chore:=20=E3=83=97=E3=83=AD=E3=82=B8?= =?UTF-8?q?=E3=82=A7=E3=82=AF=E3=83=88=E6=A7=8B=E9=80=A0=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflows/pull-request-merge-check.yml | 12 ++++---- build.gradle.kts | 28 ++++++++++++++++++ .../dev/usbharu/hideout/HideoutWorker.kt | 29 +++++++++++++++++++ .../dev/usbharu/hideout/WorkerRunner.kt | 13 ++++++++- .../hideout/worker/SpringConsumerConfig.kt | 28 ++++++++++++++++++ settings.gradle.kts | 3 +- 6 files changed, 105 insertions(+), 8 deletions(-) create mode 100644 hideout-worker/src/main/kotlin/dev/usbharu/hideout/HideoutWorker.kt create mode 100644 hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/SpringConsumerConfig.kt diff --git a/.github/workflows/pull-request-merge-check.yml b/.github/workflows/pull-request-merge-check.yml index d2082154..0eff5c92 100644 --- a/.github/workflows/pull-request-merge-check.yml +++ b/.github/workflows/pull-request-merge-check.yml @@ -61,7 +61,7 @@ jobs: - name: Build uses: gradle/gradle-build-action@v3.3.2 with: - arguments: testClasses + arguments: :hideout-core:testClasses unit-test: name: Unit Test @@ -113,7 +113,7 @@ jobs: - name: Unit Test uses: gradle/gradle-build-action@v3.3.2 with: - arguments: test + arguments: :hideout-core:test - name: Save Test Report if: always() @@ -177,7 +177,7 @@ jobs: - name: Unit Test uses: gradle/gradle-build-action@v3.3.2 with: - arguments: integrationTest + arguments: :hideout-core:integrationTest - name: Save Test Report if: always() @@ -236,7 +236,7 @@ jobs: - name: Run Kover uses: gradle/gradle-build-action@v3.3.2 with: - arguments: koverXmlReport -x integrationTest -x e2eTest --rerun-tasks + arguments: :hideout-core:koverXmlReport -x :hideout-core:integrationTest -x :hideout-core:e2eTest --rerun-tasks - name: Add coverage report to PR if: always() @@ -331,7 +331,7 @@ jobs: - name: Build with Gradle uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff with: - arguments: detektMain + arguments: :hideout-core:detektMain - name: "reviewdog-suggester: Suggest any code changes based on diff with reviewdog" if: ${{ always() }} @@ -401,7 +401,7 @@ jobs: - name: E2E Test uses: gradle/gradle-build-action@v3.3.2 with: - arguments: e2eTest + arguments: :hideout-core:e2eTest - name: Save Test Report diff --git a/build.gradle.kts b/build.gradle.kts index e69de29b..c0e7f565 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +plugins { + alias(libs.plugins.kotlin.jvm) +} + +dependencies { + implementation("dev.usbharu:hideout-core:0.0.1") + implementation("dev.usbharu:hideout-worker:0.0.1") +} + +tasks.register("run") { + dependsOn(gradle.includedBuild("hideout-core").task(":run")) +} \ No newline at end of file diff --git a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/HideoutWorker.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/HideoutWorker.kt new file mode 100644 index 00000000..3ef74a43 --- /dev/null +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/HideoutWorker.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.context.properties.ConfigurationPropertiesScan +import org.springframework.boot.runApplication + +@SpringBootApplication +@ConfigurationPropertiesScan +class HideoutWorker + +fun main(args: Array) { + runApplication(*args) +} \ No newline at end of file diff --git a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/WorkerRunner.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/WorkerRunner.kt index b19836b0..47f0b98e 100644 --- a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/WorkerRunner.kt +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/WorkerRunner.kt @@ -17,8 +17,10 @@ package dev.usbharu.hideout import com.fasterxml.jackson.databind.ObjectMapper +import dev.usbharu.hideout.worker.SpringConsumerConfig import dev.usbharu.owl.common.property.* import dev.usbharu.owl.consumer.StandaloneConsumer +import dev.usbharu.owl.consumer.StandaloneConsumerConfig import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch @@ -31,11 +33,13 @@ import org.springframework.stereotype.Component class WorkerRunner( private val springTaskRunnerLoader: SpringTaskRunnerLoader, @Qualifier("activitypub") private val objectMapper: ObjectMapper, + private val springCConsumerConfig: SpringConsumerConfig, ) : ApplicationRunner { override fun run(args: ApplicationArguments?) { GlobalScope.launch(Dispatchers.Default) { val consumer = StandaloneConsumer( - taskRunnerLoader = springTaskRunnerLoader, propertySerializerFactory = CustomPropertySerializerFactory( + taskRunnerLoader = springTaskRunnerLoader, + propertySerializerFactory = CustomPropertySerializerFactory( setOf( IntegerPropertySerializer(), StringPropertyValueSerializer(), @@ -45,6 +49,13 @@ class WorkerRunner( FloatPropertySerializer(), ObjectPropertySerializer(objectMapper), ) + ), + config = StandaloneConsumerConfig( + springCConsumerConfig.address, + springCConsumerConfig.port, + springCConsumerConfig.name, + springCConsumerConfig.hostname, + springCConsumerConfig.concurrency ) ) consumer.init() diff --git a/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/SpringConsumerConfig.kt b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/SpringConsumerConfig.kt new file mode 100644 index 00000000..2fa99d6b --- /dev/null +++ b/hideout-worker/src/main/kotlin/dev/usbharu/hideout/worker/SpringConsumerConfig.kt @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2024 usbharu + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dev.usbharu.hideout.worker + +import org.springframework.boot.context.properties.ConfigurationProperties + +@ConfigurationProperties("hideout.worker") +data class SpringConsumerConfig( + val address: String = "localhost", + val port: Int = 50051, + val name: String = "hideout-worker", + val hostname: String = "localhost", + val concurrency: Int = 10, +) diff --git a/settings.gradle.kts b/settings.gradle.kts index d68d7e07..2a3ed72d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,7 +19,8 @@ plugins { } rootProject.name = "hideout" -includeBuild("owl") +includeBuild("hideout-core") +includeBuild("hideout-worker") dependencyResolutionManagement { repositories { From 6a4921cfac9f2b171d5c24e2171488e8532c5f1d Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sun, 12 May 2024 00:26:56 +0900 Subject: [PATCH 23/24] =?UTF-8?q?chore:=20=E3=83=97=E3=83=AD=E3=82=B8?= =?UTF-8?q?=E3=82=A7=E3=82=AF=E3=83=88=E6=A7=8B=E9=80=A0=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hideout-core/build.gradle.kts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index f371f43b..baac473f 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -31,22 +31,12 @@ version = "0.0.1" sourceSets { create("intTest") { -// test { compileClasspath += sourceSets.main.get().output runtimeClasspath += sourceSets.main.get().output - kotlin.srcDirs("src/intTest/kotlin") - java.srcDirs("src/intTest/java") - resources.srcDirs("src/intTest/resources") -// } } create("e2eTest") { -// test { compileClasspath += sourceSets.main.get().output runtimeClasspath += sourceSets.main.get().output - kotlin.srcDirs("src/e2eTest/kotlin") - java.srcDirs("src/e2eTest/java") - resources.srcDirs("src/e2eTest/resources") -// } } } From 5f534d83e967d96cc1c791d5589fc087b75f03ee Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sun, 12 May 2024 01:46:32 +0900 Subject: [PATCH 24/24] =?UTF-8?q?test:=20=E7=B5=90=E5=90=88=E3=83=86?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=81=8C=E5=A3=8A=E3=82=8C=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intTest/kotlin/activitypub/inbox/InboxTest.kt | 7 ++++++- .../src/intTest/kotlin/activitypub/note/NoteTest.kt | 7 ++++++- .../kotlin/activitypub/webfinger/WebFingerTest.kt | 7 ++++++- .../mastodon/account/AccountApiPaginationTest.kt | 8 +++++++- .../kotlin/mastodon/account/AccountApiTest.kt | 7 ++++++- .../src/intTest/kotlin/mastodon/apps/AppTest.kt | 7 ++++++- .../src/intTest/kotlin/mastodon/filter/FilterTest.kt | 7 ++++++- .../src/intTest/kotlin/mastodon/media/MediaTest.kt | 7 ++++++- .../ExposedNotificationsApiPaginationTest.kt | 7 ++++++- .../MongodbNotificationsApiPaginationTest.kt | 11 ++++++++--- .../src/intTest/kotlin/mastodon/status/StatusTest.kt | 7 ++++++- .../kotlin/mastodon/timelines/TimelineApiTest.kt | 7 ++++++- .../application/external/OwlProducerRunner.kt | 12 ++++++++++-- .../hideout/core/external/job/DeliverCreateTask.kt | 1 - .../hideout/core/external/job/DeliverDeleteTask.kt | 1 - .../hideout/core/external/job/DeliverUndoTask.kt | 1 - libs.versions.toml | 2 +- .../dev/usbharu/owl/producer/api/OwlProducer.kt | 2 ++ .../owl/producer/defaultimpl/DefaultOwlProducer.kt | 4 ++++ .../producer/defaultimpl/DefaultOwlProducerConfig.kt | 3 ++- .../owl/producer/embedded/EmbeddedGrpcOwlProducer.kt | 4 ++++ .../owl/producer/embedded/EmbeddedOwlProducer.kt | 11 ++++++++++- 22 files changed, 108 insertions(+), 22 deletions(-) diff --git a/hideout-core/src/intTest/kotlin/activitypub/inbox/InboxTest.kt b/hideout-core/src/intTest/kotlin/activitypub/inbox/InboxTest.kt index aab8b225..40f9ffdf 100644 --- a/hideout-core/src/intTest/kotlin/activitypub/inbox/InboxTest.kt +++ b/hideout-core/src/intTest/kotlin/activitypub/inbox/InboxTest.kt @@ -18,6 +18,8 @@ package activitypub.inbox import dev.usbharu.hideout.SpringApplication import dev.usbharu.hideout.util.Base64Util +import dev.usbharu.owl.producer.api.OwlProducer +import kotlinx.coroutines.runBlocking import org.flywaydb.core.Flyway import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeEach @@ -150,9 +152,12 @@ class InboxTest { companion object { @JvmStatic @AfterAll - fun dropDatabase(@Autowired flyway: Flyway) { + fun dropDatabase(@Autowired flyway: Flyway, @Autowired owlProducer: OwlProducer) { flyway.clean() flyway.migrate() + runBlocking { + owlProducer.stop() + } } } } diff --git a/hideout-core/src/intTest/kotlin/activitypub/note/NoteTest.kt b/hideout-core/src/intTest/kotlin/activitypub/note/NoteTest.kt index 604d4ee3..62d7d3ce 100644 --- a/hideout-core/src/intTest/kotlin/activitypub/note/NoteTest.kt +++ b/hideout-core/src/intTest/kotlin/activitypub/note/NoteTest.kt @@ -17,6 +17,8 @@ package activitypub.note import dev.usbharu.hideout.SpringApplication +import dev.usbharu.owl.producer.api.OwlProducer +import kotlinx.coroutines.runBlocking import org.flywaydb.core.Flyway import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeEach @@ -230,9 +232,12 @@ class NoteTest { companion object { @JvmStatic @AfterAll - fun dropDatabase(@Autowired flyway: Flyway) { + fun dropDatabase(@Autowired flyway: Flyway, @Autowired owlProducer: OwlProducer) { flyway.clean() flyway.migrate() + runBlocking { + owlProducer.stop() + } } } } diff --git a/hideout-core/src/intTest/kotlin/activitypub/webfinger/WebFingerTest.kt b/hideout-core/src/intTest/kotlin/activitypub/webfinger/WebFingerTest.kt index 171ceb98..a12bbfd4 100644 --- a/hideout-core/src/intTest/kotlin/activitypub/webfinger/WebFingerTest.kt +++ b/hideout-core/src/intTest/kotlin/activitypub/webfinger/WebFingerTest.kt @@ -18,6 +18,8 @@ package activitypub.webfinger import dev.usbharu.hideout.SpringApplication import dev.usbharu.hideout.application.external.Transaction +import dev.usbharu.owl.producer.api.OwlProducer +import kotlinx.coroutines.runBlocking import org.flywaydb.core.Flyway import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.Test @@ -103,9 +105,12 @@ class WebFingerTest { companion object { @JvmStatic @AfterAll - fun dropDatabase(@Autowired flyway: Flyway) { + fun dropDatabase(@Autowired flyway: Flyway, @Autowired owlProducer: OwlProducer) { flyway.clean() flyway.migrate() + runBlocking { + owlProducer.stop() + } } } } diff --git a/hideout-core/src/intTest/kotlin/mastodon/account/AccountApiPaginationTest.kt b/hideout-core/src/intTest/kotlin/mastodon/account/AccountApiPaginationTest.kt index 861c5c23..81971e7a 100644 --- a/hideout-core/src/intTest/kotlin/mastodon/account/AccountApiPaginationTest.kt +++ b/hideout-core/src/intTest/kotlin/mastodon/account/AccountApiPaginationTest.kt @@ -20,6 +20,8 @@ import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import dev.usbharu.hideout.SpringApplication import dev.usbharu.hideout.domain.mastodon.model.generated.Status +import dev.usbharu.owl.producer.api.OwlProducer +import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat import org.flywaydb.core.Flyway import org.junit.jupiter.api.AfterAll @@ -152,9 +154,13 @@ class AccountApiPaginationTest { companion object { @JvmStatic @AfterAll - fun dropDatabase(@Autowired flyway: Flyway) { + fun dropDatabase(@Autowired flyway: Flyway, @Autowired owlProducer: OwlProducer) { flyway.clean() flyway.migrate() + runBlocking { + owlProducer.stop() + } } + } } \ No newline at end of file diff --git a/hideout-core/src/intTest/kotlin/mastodon/account/AccountApiTest.kt b/hideout-core/src/intTest/kotlin/mastodon/account/AccountApiTest.kt index 77f785c9..c936764d 100644 --- a/hideout-core/src/intTest/kotlin/mastodon/account/AccountApiTest.kt +++ b/hideout-core/src/intTest/kotlin/mastodon/account/AccountApiTest.kt @@ -19,6 +19,8 @@ package mastodon.account import dev.usbharu.hideout.SpringApplication import dev.usbharu.hideout.core.domain.model.actor.ActorRepository import dev.usbharu.hideout.core.infrastructure.exposedquery.FollowerQueryServiceImpl +import dev.usbharu.owl.producer.api.OwlProducer +import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.runTest import org.assertj.core.api.Assertions.assertThat import org.flywaydb.core.Flyway @@ -462,9 +464,12 @@ class AccountApiTest { companion object { @JvmStatic @AfterAll - fun dropDatabase(@Autowired flyway: Flyway) { + fun dropDatabase(@Autowired flyway: Flyway, @Autowired owlProducer: OwlProducer) { flyway.clean() flyway.migrate() + runBlocking { + owlProducer.stop() + } } } } diff --git a/hideout-core/src/intTest/kotlin/mastodon/apps/AppTest.kt b/hideout-core/src/intTest/kotlin/mastodon/apps/AppTest.kt index 65e42b4a..8ce170eb 100644 --- a/hideout-core/src/intTest/kotlin/mastodon/apps/AppTest.kt +++ b/hideout-core/src/intTest/kotlin/mastodon/apps/AppTest.kt @@ -18,6 +18,8 @@ package mastodon.apps import dev.usbharu.hideout.SpringApplication import dev.usbharu.hideout.core.infrastructure.springframework.oauth2.RegisteredClient +import dev.usbharu.owl.producer.api.OwlProducer +import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat import org.flywaydb.core.Flyway import org.jetbrains.exposed.sql.selectAll @@ -107,9 +109,12 @@ class AppTest { companion object { @JvmStatic @AfterAll - fun dropDatabase(@Autowired flyway: Flyway) { + fun dropDatabase(@Autowired flyway: Flyway, @Autowired owlProducer: OwlProducer) { flyway.clean() flyway.migrate() + runBlocking { + owlProducer.stop() + } } } } diff --git a/hideout-core/src/intTest/kotlin/mastodon/filter/FilterTest.kt b/hideout-core/src/intTest/kotlin/mastodon/filter/FilterTest.kt index 89fe1f5c..bb3dccae 100644 --- a/hideout-core/src/intTest/kotlin/mastodon/filter/FilterTest.kt +++ b/hideout-core/src/intTest/kotlin/mastodon/filter/FilterTest.kt @@ -22,6 +22,8 @@ import dev.usbharu.hideout.domain.mastodon.model.generated.FilterKeywordsPostReq import dev.usbharu.hideout.domain.mastodon.model.generated.FilterPostRequest import dev.usbharu.hideout.domain.mastodon.model.generated.FilterPostRequestKeyword import dev.usbharu.hideout.domain.mastodon.model.generated.V1FilterPostRequest +import dev.usbharu.owl.producer.api.OwlProducer +import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.runTest import org.flywaydb.core.Flyway import org.junit.jupiter.api.AfterAll @@ -702,9 +704,12 @@ class FilterTest { companion object { @JvmStatic @AfterAll - fun dropDatabase(@Autowired flyway: Flyway) { + fun dropDatabase(@Autowired flyway: Flyway, @Autowired owlProducer: OwlProducer) { flyway.clean() flyway.migrate() + runBlocking { + owlProducer.stop() + } } } } \ No newline at end of file diff --git a/hideout-core/src/intTest/kotlin/mastodon/media/MediaTest.kt b/hideout-core/src/intTest/kotlin/mastodon/media/MediaTest.kt index b745cf0c..77f23281 100644 --- a/hideout-core/src/intTest/kotlin/mastodon/media/MediaTest.kt +++ b/hideout-core/src/intTest/kotlin/mastodon/media/MediaTest.kt @@ -20,6 +20,8 @@ import dev.usbharu.hideout.SpringApplication import dev.usbharu.hideout.core.service.media.MediaDataStore import dev.usbharu.hideout.core.service.media.MediaSaveRequest import dev.usbharu.hideout.core.service.media.SuccessSavedMedia +import dev.usbharu.owl.producer.api.OwlProducer +import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.runTest import org.flywaydb.core.Flyway import org.junit.jupiter.api.AfterAll @@ -131,9 +133,12 @@ class MediaTest { companion object { @JvmStatic @AfterAll - fun dropDatabase(@Autowired flyway: Flyway) { + fun dropDatabase(@Autowired flyway: Flyway, @Autowired owlProducer: OwlProducer) { flyway.clean() flyway.migrate() + runBlocking { + owlProducer.stop() + } } } diff --git a/hideout-core/src/intTest/kotlin/mastodon/notifications/ExposedNotificationsApiPaginationTest.kt b/hideout-core/src/intTest/kotlin/mastodon/notifications/ExposedNotificationsApiPaginationTest.kt index ba30f9a7..7405caf6 100644 --- a/hideout-core/src/intTest/kotlin/mastodon/notifications/ExposedNotificationsApiPaginationTest.kt +++ b/hideout-core/src/intTest/kotlin/mastodon/notifications/ExposedNotificationsApiPaginationTest.kt @@ -20,6 +20,8 @@ import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import dev.usbharu.hideout.SpringApplication import dev.usbharu.hideout.domain.mastodon.model.generated.Notification +import dev.usbharu.owl.producer.api.OwlProducer +import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.runTest import org.assertj.core.api.Assertions.assertThat import org.flywaydb.core.Flyway @@ -172,9 +174,12 @@ class ExposedNotificationsApiPaginationTest { companion object { @JvmStatic @AfterAll - fun dropDatabase(@Autowired flyway: Flyway) { + fun dropDatabase(@Autowired flyway: Flyway, @Autowired owlProducer: OwlProducer) { flyway.clean() flyway.migrate() + runBlocking { + owlProducer.stop() + } } } } \ No newline at end of file diff --git a/hideout-core/src/intTest/kotlin/mastodon/notifications/MongodbNotificationsApiPaginationTest.kt b/hideout-core/src/intTest/kotlin/mastodon/notifications/MongodbNotificationsApiPaginationTest.kt index 58c67aaa..0de15332 100644 --- a/hideout-core/src/intTest/kotlin/mastodon/notifications/MongodbNotificationsApiPaginationTest.kt +++ b/hideout-core/src/intTest/kotlin/mastodon/notifications/MongodbNotificationsApiPaginationTest.kt @@ -23,6 +23,8 @@ import dev.usbharu.hideout.domain.mastodon.model.generated.Notification import dev.usbharu.hideout.mastodon.domain.model.MastodonNotification import dev.usbharu.hideout.mastodon.domain.model.NotificationType import dev.usbharu.hideout.mastodon.infrastructure.mongorepository.MongoMastodonNotificationRepository +import dev.usbharu.owl.producer.api.OwlProducer +import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.runTest import org.assertj.core.api.Assertions import org.flywaydb.core.Flyway @@ -178,7 +180,7 @@ class MongodbNotificationsApiPaginationTest { @JvmStatic @BeforeAll fun setupMongodb( - @Autowired mongoMastodonNotificationRepository: MongoMastodonNotificationRepository + @Autowired mongoMastodonNotificationRepository: MongoMastodonNotificationRepository, ) { mongoMastodonNotificationRepository.deleteAll() @@ -203,11 +205,14 @@ class MongodbNotificationsApiPaginationTest { @AfterAll fun dropDatabase( @Autowired flyway: Flyway, - @Autowired mongodbMastodonNotificationRepository: MongoMastodonNotificationRepository + @Autowired mongodbMastodonNotificationRepository: MongoMastodonNotificationRepository, + @Autowired owlProducer: OwlProducer, ) { flyway.clean() flyway.migrate() - + runBlocking { + owlProducer.stop() + } mongodbMastodonNotificationRepository.deleteAll() } } diff --git a/hideout-core/src/intTest/kotlin/mastodon/status/StatusTest.kt b/hideout-core/src/intTest/kotlin/mastodon/status/StatusTest.kt index 4c805205..817d5dfc 100644 --- a/hideout-core/src/intTest/kotlin/mastodon/status/StatusTest.kt +++ b/hideout-core/src/intTest/kotlin/mastodon/status/StatusTest.kt @@ -22,6 +22,8 @@ import dev.usbharu.hideout.core.domain.model.emoji.UnicodeEmoji import dev.usbharu.hideout.core.infrastructure.exposedrepository.CustomEmojis import dev.usbharu.hideout.core.infrastructure.exposedrepository.Reactions import dev.usbharu.hideout.core.infrastructure.exposedrepository.toReaction +import dev.usbharu.owl.producer.api.OwlProducer +import kotlinx.coroutines.runBlocking import org.assertj.core.api.Assertions.assertThat import org.flywaydb.core.Flyway import org.jetbrains.exposed.sql.and @@ -236,9 +238,12 @@ class StatusTest { companion object { @JvmStatic @AfterAll - fun dropDatabase(@Autowired flyway: Flyway) { + fun dropDatabase(@Autowired flyway: Flyway, @Autowired owlProducer: OwlProducer) { flyway.clean() flyway.migrate() + runBlocking { + owlProducer.stop() + } } } } diff --git a/hideout-core/src/intTest/kotlin/mastodon/timelines/TimelineApiTest.kt b/hideout-core/src/intTest/kotlin/mastodon/timelines/TimelineApiTest.kt index 5ebcb3a9..21719e85 100644 --- a/hideout-core/src/intTest/kotlin/mastodon/timelines/TimelineApiTest.kt +++ b/hideout-core/src/intTest/kotlin/mastodon/timelines/TimelineApiTest.kt @@ -17,6 +17,8 @@ package mastodon.timelines import dev.usbharu.hideout.SpringApplication +import dev.usbharu.owl.producer.api.OwlProducer +import kotlinx.coroutines.runBlocking import org.flywaydb.core.Flyway import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeEach @@ -123,9 +125,12 @@ class TimelineApiTest { companion object { @JvmStatic @AfterAll - fun dropDatabase(@Autowired flyway: Flyway) { + fun dropDatabase(@Autowired flyway: Flyway, @Autowired owlProducer: OwlProducer) { flyway.clean() flyway.migrate() + runBlocking { + owlProducer.stop() + } } } } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/external/OwlProducerRunner.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/external/OwlProducerRunner.kt index 06f74c44..ca86bce1 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/external/OwlProducerRunner.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/application/external/OwlProducerRunner.kt @@ -19,17 +19,25 @@ package dev.usbharu.hideout.application.external import dev.usbharu.owl.common.task.TaskDefinition import dev.usbharu.owl.producer.api.OwlProducer import kotlinx.coroutines.runBlocking +import org.springframework.beans.factory.DisposableBean import org.springframework.boot.ApplicationArguments import org.springframework.boot.ApplicationRunner import org.springframework.stereotype.Component @Component class OwlProducerRunner(private val owlProducer: OwlProducer, private val taskDefinitions: List>) : - ApplicationRunner { + ApplicationRunner, DisposableBean { override fun run(args: ApplicationArguments?) { runBlocking { owlProducer.start() taskDefinitions.forEach { taskDefinition -> owlProducer.registerTask(taskDefinition) } } } -} \ No newline at end of file + + override fun destroy() { + System.err.println("destroy aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") + runBlocking { + owlProducer.stop() + } + } +} diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt index b989b782..2c645290 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverCreateTask.kt @@ -31,5 +31,4 @@ data class DeliverCreateTask( data object DeliverCreateTaskDef : TaskDefinition { override val type: Class get() = DeliverCreateTask::class.java - } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt index 29fe25d3..6ce63ad2 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverDeleteTask.kt @@ -31,5 +31,4 @@ data class DeliverDeleteTask( data object DeliverDeleteTaskDef : TaskDefinition { override val type: Class get() = DeliverDeleteTask::class.java - } diff --git a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt index 69d47260..3ae7f129 100644 --- a/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt +++ b/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverUndoTask.kt @@ -31,5 +31,4 @@ data class DeliverUndoTask( data object DeliverUndoTaskDef : TaskDefinition { override val type: Class get() = DeliverUndoTask::class.java - } diff --git a/libs.versions.toml b/libs.versions.toml index 85f71822..ee6f9c7c 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -84,7 +84,7 @@ jackson = ["jackson-databind", "jackson-module-kotlin"] [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -spring-boot = { id = "org.springframework.boot", version = "3.2.3" } +spring-boot = { id = "org.springframework.boot", version = "3.2.5" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" } kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.6" } diff --git a/owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt b/owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt index 21495894..7ece4505 100644 --- a/owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt +++ b/owl/owl-producer/owl-producer-api/src/main/kotlin/dev/usbharu/owl/producer/api/OwlProducer.kt @@ -48,4 +48,6 @@ interface OwlProducer { * @return 公開されたタスク */ suspend fun publishTask(task: T): PublishedTask + + suspend fun stop() } diff --git a/owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt b/owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt index 33a14e34..e4a1dfd4 100644 --- a/owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt +++ b/owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducer.kt @@ -87,4 +87,8 @@ class DefaultOwlProducer(private val defaultOwlProducerConfig: DefaultOwlProduce now ) } + + override suspend fun stop() { + defaultOwlProducerConfig.channel.shutdownNow() + } } \ No newline at end of file diff --git a/owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt b/owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt index ced2695f..1f955677 100644 --- a/owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt +++ b/owl/owl-producer/owl-producer-default/src/main/kotlin/dev/usbharu/owl/producer/defaultimpl/DefaultOwlProducerConfig.kt @@ -19,6 +19,7 @@ package dev.usbharu.owl.producer.defaultimpl import dev.usbharu.owl.common.property.PropertySerializerFactory import dev.usbharu.owl.producer.api.OwlProducerConfig import io.grpc.Channel +import io.grpc.ManagedChannel /** * デフォルトの[dev.usbharu.owl.producer.api.OwlProducer]の構成 @@ -28,7 +29,7 @@ class DefaultOwlProducerConfig : OwlProducerConfig { /** * gRPCで使用する[Channel] */ - lateinit var channel: Channel + lateinit var channel: ManagedChannel /** * プロデューサー名 diff --git a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt index 2a4e1791..477363a3 100644 --- a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt +++ b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt @@ -55,4 +55,8 @@ class EmbeddedGrpcOwlProducer( override suspend fun publishTask(task: T): PublishedTask { return config.owlProducer.publishTask(task) } + + override suspend fun stop() { + config.owlProducer.stop() + } } \ No newline at end of file diff --git a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt index 0f9c5647..032f3255 100644 --- a/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt +++ b/owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt @@ -27,6 +27,7 @@ import dev.usbharu.owl.common.task.Task import dev.usbharu.owl.common.task.TaskDefinition import dev.usbharu.owl.producer.api.OwlProducer import org.koin.core.Koin +import org.koin.core.context.GlobalContext import org.koin.core.context.GlobalContext.startKoin import org.koin.dsl.module import org.koin.ksp.generated.defaultModule @@ -42,9 +43,12 @@ class EmbeddedOwlProducer( private lateinit var application: Koin + private lateinit var brokerApplication: OwlBrokerApplication + private val taskMap: MutableMap, TaskDefinition<*>> = mutableMapOf() override suspend fun start() { + GlobalContext.stopKoin() application = startKoin { printLogger() @@ -71,7 +75,8 @@ class EmbeddedOwlProducer( ) ) - application.get().start(embeddedOwlProducerConfig.port.toInt()) + brokerApplication = application.get() + brokerApplication.start(embeddedOwlProducerConfig.port.toInt()) } override suspend fun registerTask(taskDefinition: TaskDefinition) { @@ -108,4 +113,8 @@ class EmbeddedOwlProducer( Instant.now() ) } + + override suspend fun stop() { + brokerApplication.stop() + } } \ No newline at end of file