Merge branch 'refs/heads/develop' into timeline

.github/workflows/pull-request-merge-check.yml

@@ -65,7 +65,7 @@ jobs:
           java-version: '21'
           distribution: 'temurin'
       - name: Build
-        uses: gradle/gradle-build-action@v3.4.2
+        uses: gradle/gradle-build-action@v3.5.0
         with:
           arguments: :hideout-core:testClasses
 
@@ -117,7 +117,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Unit Test
-        uses: gradle/gradle-build-action@v3.4.2
+        uses: gradle/gradle-build-action@v3.5.0
         with:
           arguments: :hideout-core:test
 
@@ -177,7 +177,7 @@ jobs:
 
       - name: Run Kover
 
-        uses: gradle/gradle-build-action@v3.4.2
+        uses: gradle/gradle-build-action@v3.5.0
         with:
           arguments: :hideout-core:koverXmlReport --rerun-tasks
 
@@ -260,7 +260,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@66535aaf56f831b35e3a8481c9c99b665b84dd45
+        uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1
         with:
           arguments: :hideout-core:detektMain
 

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.caching=true
-org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED
+org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED -XX:TieredStopAtLevel=1 -noverify
 org.gradle.configuration-cache=true
 org.gradle.configuration-cache.problems=warn

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

hideout-activitypub/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.9.24"
+    kotlin("jvm") version "1.9.25"
 }
 
 group = "dev.usbharu"

hideout-activitypub/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

hideout-activitypub/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

hideout-activitypub/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

hideout-core/build.gradle.kts

@@ -92,7 +92,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
     implementation("org.springframework.boot:spring-boot-starter-log4j2")
     implementation("org.springframework.boot:spring-boot-starter-validation")
-
+    annotationProcessor("org.springframework:spring-context-indexer")
 
     implementation(libs.blurhash)
     implementation(libs.aws.s3)
@@ -133,7 +133,7 @@ dependencies {
     testImplementation(libs.coroutines.test)
     testImplementation(libs.ktor.client.mock)
     testImplementation(libs.h2db)
-    testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
     testImplementation("org.mockito:mockito-inline:5.2.0")
     testImplementation("nl.jqno.equalsverifier:equalsverifier:3.16.1")
     testImplementation("com.jparams:to-string-verifier:1.4.8")

hideout-core/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

hideout-core/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

hideout-core/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

hideout-core/src/main/resources/application.yml

@@ -18,6 +18,8 @@ hideout:
 
 
 spring:
+  jmx:
+    enabled: false
   jackson:
     serialization:
       WRITE_DATES_AS_TIMESTAMPS: false

hideout-mastodon/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

hideout-mastodon/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

hideout-mastodon/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

libs.versions.toml

@@ -11,7 +11,7 @@ serialization = "1.7.1"
 kjob = "0.6.0"
 tika = "2.9.2"
 owl = "0.0.1"
-jackson = "2.15.4"
+jackson = "2.17.2"
 
 [libraries]
 
@@ -69,9 +69,9 @@ jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-
 
 blurhash = { module = "io.trbl:blurhash", version = "1.0.0" }
 
-aws-s3 = { module = "software.amazon.awssdk:s3", version = "2.26.12" }
+aws-s3 = { module = "software.amazon.awssdk:s3", version = "2.26.25" }
 
-jsoup = { module = "org.jsoup:jsoup", version = "1.17.2" }
+jsoup = { module = "org.jsoup:jsoup", version = "1.18.1" }
 
 owasp-java-html-sanitizer = { module = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer", version = "20240325.1" }
 
@@ -82,9 +82,9 @@ imageio-webp = { module = "com.twelvemonkeys.imageio:imageio-webp", version = "3
 thumbnailator = { module = "net.coobird:thumbnailator", version = "0.4.20" }
 
 flyway-core = { module = "org.flywaydb:flyway-core" }
-flyway-postgresql = { module = "org.flywaydb:flyway-database-postgresql", version = "10.15.0" }
+flyway-postgresql = { module = "org.flywaydb:flyway-database-postgresql", version = "10.17.0" }
 
-h2db = { module = "com.h2database:h2", version = "2.2.224" }
+h2db = { module = "com.h2database:h2", version = "2.3.230" }
 
 kotlin-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 
@@ -106,9 +106,9 @@ 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.3.1" }
+spring-boot = { id = "org.springframework.boot", version = "3.3.2" }
 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.8.2" }
-openapi-generator = { id = "org.openapi.generator", version = "7.6.0" }
+kover = { id = "org.jetbrains.kotlinx.kover", version = "0.8.3" }
+openapi-generator = { id = "org.openapi.generator", version = "7.7.0" }
 license-report = { id = "com.github.jk1.dependency-license-report", version = "2.8" }

owl/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
-//    alias(libs.plugins.kotlin.jvm)
-    id("org.jetbrains.kotlin.jvm") version "1.9.24"
+    alias(libs.plugins.kotlin.jvm)
 }
 
 
@@ -19,7 +18,7 @@ subprojects {
         plugin("org.jetbrains.kotlin.jvm")
     }
     kotlin {
-        jvmToolchain(17)
+        jvmToolchain(21)
     }
 
     dependencies {

owl/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

owl/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

owl/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

owl/owl-broker/build.gradle.kts

@@ -1,12 +1,6 @@
 plugins {
-//    alias(libs.plugins.kotlin.jvm)
-    kotlin("jvm")
+    alias(libs.plugins.kotlin.jvm)
     id("com.google.protobuf") version "0.9.4"
-    id("com.google.devtools.ksp") version "1.9.24-1.0.20"
-}
-
-apply {
-    plugin("com.google.devtools.ksp")
 }
 
 
@@ -19,24 +13,21 @@ repositories {
 
 dependencies {
     implementation("io.grpc:grpc-kotlin-stub:1.4.1")
-    implementation("io.grpc:grpc-protobuf:1.65.0")
+    implementation("io.grpc:grpc-protobuf:1.65.1")
     implementation("com.google.protobuf:protobuf-kotlin:4.27.2")
-    implementation("io.grpc:grpc-netty:1.65.0")
+    implementation("io.grpc:grpc-netty:1.65.1")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
     implementation(project(":owl-common"))
     implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1")
     implementation(platform("io.insert-koin:koin-bom:3.5.6"))
-    implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1"))
     implementation("io.insert-koin:koin-core")
-    compileOnly("io.insert-koin:koin-annotations")
-    ksp("io.insert-koin:koin-ksp-compiler:1.3.1")
 }
 
 tasks.test {
     useJUnitPlatform()
 }
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 protobuf {
@@ -45,7 +36,7 @@ protobuf {
     }
     plugins {
         create("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:1.65.0"
+            artifact = "io.grpc:protoc-gen-grpc-java:1.65.1"
         }
         create("grpckt") {
             artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"

owl/owl-broker/owl-broker-mongodb/build.gradle.kts

@@ -1,11 +1,6 @@
 plugins {
     application
-    kotlin("jvm")
-    id("com.google.devtools.ksp") version "1.9.24-1.0.20"
-}
-
-apply {
-    plugin("com.google.devtools.ksp")
+    alias(libs.plugins.kotlin.jvm)
 }
 
 group = "dev.usbharu"
@@ -16,21 +11,19 @@ repositories {
 }
 
 dependencies {
-    implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.1.1")
+    implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.1.2")
     implementation(project(":owl-broker"))
     implementation(project(":owl-common"))
     implementation(platform("io.insert-koin:koin-bom:3.5.6"))
     implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1"))
     implementation("io.insert-koin:koin-core")
-    compileOnly("io.insert-koin:koin-annotations")
-    ksp("io.insert-koin:koin-ksp-compiler:1.3.1")
 }
 
 tasks.test {
     useJUnitPlatform()
 }
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 application {

owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModule.kt

@@ -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.owl.broker.mongodb
-
-import org.koin.core.annotation.ComponentScan
-import org.koin.core.annotation.Module
-
-@Module
-@ComponentScan("dev.usbharu.owl.broker.mongodb")
-class MongoModule
-

owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt

@@ -20,15 +20,20 @@ import com.mongodb.ConnectionString
 import com.mongodb.MongoClientSettings
 import com.mongodb.kotlin.client.coroutine.MongoClient
 import dev.usbharu.owl.broker.ModuleContext
+import dev.usbharu.owl.broker.domain.model.consumer.ConsumerRepository
+import dev.usbharu.owl.broker.domain.model.producer.ProducerRepository
+import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTaskRepository
+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.TaskResultRepository
 import org.bson.UuidRepresentation
 import org.koin.core.module.Module
 import org.koin.dsl.module
-import org.koin.ksp.generated.module
 
 class MongoModuleContext : ModuleContext {
     override fun module(): Module {
-        val module = MongoModule().module
-        module.includes(module {
+
+        return module {
             single {
                 val clientSettings =
                     MongoClientSettings.builder()
@@ -46,7 +51,12 @@ class MongoModuleContext : ModuleContext {
                 MongoClient.create(clientSettings)
                     .getDatabase(System.getProperty("owl.broker.mongo.database", "mongo-test"))
             }
-        })
-        return module
+            single<ConsumerRepository> { MongodbConsumerRepository(get()) }
+            single<ProducerRepository> { MongodbProducerRepository(get()) }
+            single<QueuedTaskRepository> { MongodbQueuedTaskRepository(get(), get()) }
+            single<TaskDefinitionRepository> { MongodbTaskDefinitionRepository(get()) }
+            single<TaskRepository> { MongodbTaskRepository(get(), get()) }
+            single<TaskResultRepository> { MongodbTaskResultRepository(get(), get()) }
+        }
     }
 }

owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbConsumerRepository.kt

@@ -27,10 +27,8 @@ import kotlinx.coroutines.withContext
 import org.bson.BsonType
 import org.bson.codecs.pojo.annotations.BsonId
 import org.bson.codecs.pojo.annotations.BsonRepresentation
-import org.koin.core.annotation.Singleton
 import java.util.*
 
-@Singleton
 class MongodbConsumerRepository(database: MongoDatabase) : ConsumerRepository {
 
     private val collection = database.getCollection<ConsumerMongodb>("consumers")

owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbProducerRepository.kt

@@ -23,11 +23,9 @@ import dev.usbharu.owl.broker.domain.model.producer.Producer
 import dev.usbharu.owl.broker.domain.model.producer.ProducerRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.koin.core.annotation.Singleton
 import java.time.Instant
 import java.util.*
 
-@Singleton
 class MongodbProducerRepository(database: MongoDatabase) : ProducerRepository {
 
     private val collection = database.getCollection<ProducerMongodb>("producers")

owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbQueuedTaskRepository.kt

@@ -36,11 +36,9 @@ import kotlinx.coroutines.withContext
 import org.bson.BsonType
 import org.bson.codecs.pojo.annotations.BsonId
 import org.bson.codecs.pojo.annotations.BsonRepresentation
-import org.koin.core.annotation.Singleton
 import java.time.Instant
 import java.util.*
 
-@Singleton
 class MongodbQueuedTaskRepository(
     private val propertySerializerFactory: PropertySerializerFactory,
     database: MongoDatabase

owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskDefinitionRepository.kt

@@ -27,9 +27,7 @@ import kotlinx.coroutines.withContext
 import org.bson.BsonType
 import org.bson.codecs.pojo.annotations.BsonId
 import org.bson.codecs.pojo.annotations.BsonRepresentation
-import org.koin.core.annotation.Singleton
 
-@Singleton
 class MongodbTaskDefinitionRepository(database: MongoDatabase) : TaskDefinitionRepository {
 
     private val collection = database.getCollection<TaskDefinitionMongodb>("task_definition")

owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskRepository.kt

@@ -33,11 +33,10 @@ import kotlinx.coroutines.withContext
 import org.bson.BsonType
 import org.bson.codecs.pojo.annotations.BsonId
 import org.bson.codecs.pojo.annotations.BsonRepresentation
-import org.koin.core.annotation.Singleton
 import java.time.Instant
 import java.util.*
 
-@Singleton
+
 class MongodbTaskRepository(database: MongoDatabase, private val propertySerializerFactory: PropertySerializerFactory) :
     TaskRepository {
 

owl/owl-broker/owl-broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongodbTaskResultRepository.kt

@@ -31,10 +31,8 @@ import kotlinx.coroutines.withContext
 import org.bson.BsonType
 import org.bson.codecs.pojo.annotations.BsonId
 import org.bson.codecs.pojo.annotations.BsonRepresentation
-import org.koin.core.annotation.Singleton
 import java.util.*
 
-@Singleton
 class MongodbTaskResultRepository(
     database: MongoDatabase,
     private val propertySerializerFactory: PropertySerializerFactory

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/Main.kt

@@ -16,18 +16,73 @@
 
 package dev.usbharu.owl.broker
 
+import dev.usbharu.owl.broker.interfaces.grpc.*
+import dev.usbharu.owl.broker.service.*
+import dev.usbharu.owl.broker.service.ProducerService
+import dev.usbharu.owl.broker.service.TaskPublishService
+import dev.usbharu.owl.common.property.PropertySerializerFactory
 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
-import org.koin.ksp.generated.defaultModule
 import org.slf4j.LoggerFactory
 import java.util.*
 
 val logger = LoggerFactory.getLogger("MAIN")
 
+val mainModule = module {
+    single<AssignQueuedTaskDecider> {
+        AssignQueuedTaskDeciderImpl(get(), get())
+    }
+    single<TaskScanner> { TaskScannerImpl(get()) }
+    single<TaskPublishService> { TaskPublishServiceImpl(get(), get(), get()) }
+    single<TaskManagementService> {
+        TaskManagementServiceImpl(
+            taskScanner = get(),
+            queueStore = get(),
+            taskDefinitionRepository = get(),
+            assignQueuedTaskDecider = get(),
+            retryPolicyFactory = get(),
+            taskRepository = get(),
+            queueScanner = get(),
+            taskResultRepository = get()
+        )
+    }
+    single<RegisterTaskService> { RegisterTaskServiceImpl(get()) }
+    single<QueueStore> { QueueStoreImpl(get()) }
+    single<QueueScanner> { QueueScannerImpl(get()) }
+    single<QueuedTaskAssigner> { QueuedTaskAssignerImpl(get(), get()) }
+    single<ProducerService> { ProducerServiceImpl(get()) }
+    single<PropertySerializerFactory> { DefaultPropertySerializerFactory() }
+    single<ConsumerService> { ConsumerServiceImpl(get()) }
+    single {
+        OwlBrokerApplication(
+            assignmentTaskService = get(),
+            definitionTaskService = get(),
+            producerService = get(),
+            subscribeTaskService = get(),
+            taskPublishService = get(),
+            taskManagementService = get(),
+            taskResultSubscribeService = get(),
+            taskResultService = get()
+        )
+    }
+    single { AssignmentTaskService(queuedTaskAssigner = get(), propertySerializerFactory = get()) }
+    single { DefinitionTaskService(registerTaskService = get()) }
+    single { dev.usbharu.owl.broker.interfaces.grpc.ProducerService(producerService = get()) }
+    single { SubscribeTaskService(consumerService = get()) }
+    single {
+        dev.usbharu.owl.broker.interfaces.grpc.TaskPublishService(
+            taskPublishService = get(),
+            propertySerializerFactory = get()
+        )
+    }
+    single { TaskResultService(taskManagementService = get(), propertySerializerFactory = get()) }
+    single { TaskResultSubscribeService(taskManagementService = get(), propertySerializerFactory = get()) }
+}
+
 fun main() {
     val moduleContexts = ServiceLoader.load(ModuleContext::class.java)
 
@@ -43,8 +98,9 @@ fun main() {
             single<RetryPolicyFactory> {
                 DefaultRetryPolicyFactory(mapOf("" to ExponentialRetryPolicy()))
             }
+
         }
-        modules(defaultModule, module, moduleContext.module())
+        modules(mainModule, module, moduleContext.module())
     }
 
     val application = koin.koin.get<OwlBrokerApplication>()

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/OwlBrokerApplication.kt

@@ -24,9 +24,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import org.koin.core.annotation.Singleton
 
-@Singleton
 class OwlBrokerApplication(
     private val assignmentTaskService: AssignmentTaskService,
     private val definitionTaskService: DefinitionTaskService,

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/AssignmentTaskService.kt

@@ -29,12 +29,11 @@ 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
 
-@Singleton
+
 class AssignmentTaskService(
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
     private val queuedTaskAssigner: QueuedTaskAssigner,

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/DefinitionTaskService.kt

@@ -22,11 +22,9 @@ import dev.usbharu.owl.DefinitionTask.TaskDefined
 import dev.usbharu.owl.DefinitionTaskServiceGrpcKt.DefinitionTaskServiceCoroutineImplBase
 import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinition
 import dev.usbharu.owl.broker.service.RegisterTaskService
-import org.koin.core.annotation.Singleton
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
-@Singleton
 class DefinitionTaskService(coroutineContext: CoroutineContext = EmptyCoroutineContext,private val registerTaskService: RegisterTaskService) :
     DefinitionTaskServiceCoroutineImplBase(coroutineContext) {
     override suspend fun register(request: DefinitionTask.TaskDefinition): TaskDefined {

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/ProducerService.kt

@@ -21,11 +21,10 @@ import dev.usbharu.owl.ProducerServiceGrpcKt.ProducerServiceCoroutineImplBase
 import dev.usbharu.owl.broker.external.toUUID
 import dev.usbharu.owl.broker.service.ProducerService
 import dev.usbharu.owl.broker.service.RegisterProducerRequest
-import org.koin.core.annotation.Singleton
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
-@Singleton
+
 class ProducerService(
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
     private val producerService: ProducerService

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/SubscribeTaskService.kt

@@ -21,11 +21,9 @@ import dev.usbharu.owl.SubscribeTaskServiceGrpcKt.SubscribeTaskServiceCoroutineI
 import dev.usbharu.owl.broker.external.toUUID
 import dev.usbharu.owl.broker.service.ConsumerService
 import dev.usbharu.owl.broker.service.RegisterConsumerRequest
-import org.koin.core.annotation.Singleton
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
-@Singleton
 class SubscribeTaskService(
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
     private val consumerService: ConsumerService

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskPublishService.kt

@@ -27,12 +27,10 @@ import dev.usbharu.owl.common.property.PropertySerializeUtils
 import dev.usbharu.owl.common.property.PropertySerializerFactory
 import io.grpc.Status
 import io.grpc.StatusException
-import org.koin.core.annotation.Singleton
 import org.slf4j.LoggerFactory
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
-@Singleton
 class TaskPublishService(
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
     private val taskPublishService: TaskPublishService,

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultService.kt

@@ -30,13 +30,11 @@ 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,

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/interfaces/grpc/TaskResultSubscribeService.kt

@@ -23,11 +23,9 @@ import dev.usbharu.owl.common.property.PropertySerializeUtils
 import dev.usbharu.owl.common.property.PropertySerializerFactory
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import org.koin.core.annotation.Singleton
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
-@Singleton
 class TaskResultSubscribeService(
     private val taskManagementService: TaskManagementService,
     private val propertySerializerFactory: PropertySerializerFactory,

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/AssignQueuedTaskDecider.kt

@@ -23,12 +23,10 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.take
-import org.koin.core.annotation.Singleton
 import java.util.*
 interface AssignQueuedTaskDecider {
     fun findAssignableQueue(consumerId: UUID, numberOfConcurrent: Int): Flow<QueuedTask>
 }
-@Singleton
 class AssignQueuedTaskDeciderImpl(
     private val consumerRepository: ConsumerRepository,
     private val queueStore: QueueStore

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.Singleton
 import org.slf4j.LoggerFactory
 import java.util.*
 
@@ -26,7 +25,6 @@ interface ConsumerService {
     suspend fun registerConsumer(registerConsumerRequest: RegisterConsumerRequest): UUID
 }
 
-@Singleton
 class ConsumerServiceImpl(private val consumerRepository: ConsumerRepository) : ConsumerService {
     override suspend fun registerConsumer(registerConsumerRequest: RegisterConsumerRequest): UUID {
         val id = UUID.randomUUID()

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/DefaultPropertySerializerFactory.kt

@@ -17,9 +17,7 @@
 package dev.usbharu.owl.broker.service
 
 import dev.usbharu.owl.common.property.*
-import org.koin.core.annotation.Singleton
 
-@Singleton(binds = [PropertySerializerFactory::class])
 class DefaultPropertySerializerFactory :
     CustomPropertySerializerFactory(
         setOf(

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/ProducerService.kt

@@ -18,16 +18,15 @@ package dev.usbharu.owl.broker.service
 
 import dev.usbharu.owl.broker.domain.model.producer.Producer
 import dev.usbharu.owl.broker.domain.model.producer.ProducerRepository
-import org.koin.core.annotation.Singleton
 import org.slf4j.LoggerFactory
 import java.time.Instant
 import java.util.*
 
 interface ProducerService {
-    suspend fun registerProducer(producer: RegisterProducerRequest):UUID
+    suspend fun registerProducer(producer: RegisterProducerRequest): UUID
 }
 
-@Singleton
+
 class ProducerServiceImpl(private val producerRepository: ProducerRepository) : ProducerService {
     override suspend fun registerProducer(producer: RegisterProducerRequest): UUID {
 
@@ -43,11 +42,11 @@ class ProducerServiceImpl(private val producerRepository: ProducerRepository) :
 
         producerRepository.save(saveProducer)
 
-        logger.info("Register a new Producer. name: {} hostname: {}",saveProducer.name,saveProducer.hostname)
+        logger.info("Register a new Producer. name: {} hostname: {}", saveProducer.name, saveProducer.hostname)
         return id
     }
 
-    companion object{
+    companion object {
         private val logger = LoggerFactory.getLogger(ProducerServiceImpl::class.java)
     }
 }

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueScanner.kt

@@ -23,14 +23,13 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.isActive
-import org.koin.core.annotation.Singleton
 import java.time.Instant
 
 interface QueueScanner {
     fun startScan(): Flow<QueuedTask>
 }
 
-@Singleton
+
 class QueueScannerImpl(private val queueStore: QueueStore) : QueueScanner {
     override fun startScan(): Flow<QueuedTask> {
         return flow {

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueueStore.kt

@@ -19,7 +19,6 @@ package dev.usbharu.owl.broker.service
 import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTask
 import dev.usbharu.owl.broker.domain.model.queuedtask.QueuedTaskRepository
 import kotlinx.coroutines.flow.Flow
-import org.koin.core.annotation.Singleton
 import java.time.Instant
 
 interface QueueStore {
@@ -33,7 +32,7 @@ interface QueueStore {
     fun findByQueuedAtBeforeAndIsActiveIsTrue(instant: Instant): Flow<QueuedTask>
 }
 
-@Singleton
+
 class QueueStoreImpl(private val queuedTaskRepository: QueuedTaskRepository) : QueueStore {
     override suspend fun enqueue(queuedTask: QueuedTask) {
         queuedTaskRepository.save(queuedTask)

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/QueuedTaskAssigner.kt

@@ -19,7 +19,6 @@ 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.*
-import org.koin.core.annotation.Singleton
 import org.slf4j.LoggerFactory
 import java.time.Instant
 import java.util.*
@@ -28,7 +27,7 @@ interface QueuedTaskAssigner {
     fun ready(consumerId: UUID, numberOfConcurrent: Int): Flow<QueuedTask>
 }
 
-@Singleton
+
 class QueuedTaskAssignerImpl(
     private val taskManagementService: TaskManagementService,
     private val queueStore: QueueStore

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/RegisterTaskService.kt

@@ -19,7 +19,6 @@ package dev.usbharu.owl.broker.service
 import dev.usbharu.owl.broker.domain.exception.service.IncompatibleTaskException
 import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinition
 import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinitionRepository
-import org.koin.core.annotation.Singleton
 import org.slf4j.LoggerFactory
 
 interface RegisterTaskService {
@@ -28,7 +27,7 @@ interface RegisterTaskService {
     suspend fun unregisterTask(name:String)
 }
 
-@Singleton
+
 class RegisterTaskServiceImpl(private val taskDefinitionRepository: TaskDefinitionRepository) : RegisterTaskService {
     override suspend fun registerTask(taskDefinition: TaskDefinition) {
         val definedTask = taskDefinitionRepository.findByName(taskDefinition.name)

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskManagementService.kt

@@ -27,7 +27,6 @@ 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
 import org.slf4j.LoggerFactory
 import java.time.Instant
 import java.util.*
@@ -43,7 +42,6 @@ interface TaskManagementService {
     fun subscribeResult(producerId: UUID): Flow<TaskResults>
 }
 
-@Singleton
 class TaskManagementServiceImpl(
     private val taskScanner: TaskScanner,
     private val queueStore: QueueStore,

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskPublishService.kt

@@ -22,7 +22,6 @@ 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
 import java.util.*
@@ -43,7 +42,6 @@ data class PublishedTask(
     val id: UUID
 )
 
-@Singleton
 class TaskPublishServiceImpl(
     private val taskRepository: TaskRepository,
     private val taskDefinitionRepository: TaskDefinitionRepository,

owl/owl-broker/src/main/kotlin/dev/usbharu/owl/broker/service/TaskScanner.kt

@@ -24,7 +24,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.isActive
-import org.koin.core.annotation.Singleton
 import org.slf4j.LoggerFactory
 import java.time.Instant
 
@@ -33,7 +32,6 @@ interface TaskScanner {
     fun startScan(): Flow<Task>
 }
 
-@Singleton
 class TaskScannerImpl(private val taskRepository: TaskRepository) :
     TaskScanner {
 

owl/owl-common/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm")
+    alias(libs.plugins.kotlin.jvm)
 }
 
 group = "dev.usbharu"
@@ -17,5 +17,5 @@ tasks.test {
     useJUnitPlatform()
 }
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }

owl/owl-common/owl-common-serialize-jackson/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm")
+    alias(libs.plugins.kotlin.jvm)
 }
 
 group = "dev.usbharu"
@@ -19,5 +19,5 @@ tasks.test {
     useJUnitPlatform()
 }
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }

owl/owl-consumer/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm")
+    alias(libs.plugins.kotlin.jvm)
     id("com.google.protobuf") version "0.9.4"
 }
 
@@ -13,9 +13,9 @@ repositories {
 dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     implementation("io.grpc:grpc-kotlin-stub:1.4.1")
-    implementation("io.grpc:grpc-protobuf:1.65.0")
+    implementation("io.grpc:grpc-protobuf:1.65.1")
     implementation("com.google.protobuf:protobuf-kotlin:4.27.2")
-    implementation("io.grpc:grpc-netty:1.65.0")
+    implementation("io.grpc:grpc-netty:1.65.1")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
     implementation(project(":owl-common"))
     protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto"))
@@ -25,7 +25,7 @@ tasks.test {
     useJUnitPlatform()
 }
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 protobuf {
@@ -34,7 +34,7 @@ protobuf {
     }
     plugins {
         create("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:1.65.0"
+            artifact = "io.grpc:protoc-gen-grpc-java:1.65.1"
         }
         create("grpckt") {
             artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"

owl/owl-producer/owl-producer-api/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm")
+    alias(libs.plugins.kotlin.jvm)
 }
 
 group = "dev.usbharu"
@@ -17,5 +17,5 @@ tasks.test {
     useJUnitPlatform()
 }
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }

owl/owl-producer/owl-producer-default/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm")
+    alias(libs.plugins.kotlin.jvm)
     id("com.google.protobuf") version "0.9.4"
 }
 
@@ -14,9 +14,9 @@ dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     api(project(":owl-producer:owl-producer-api"))
     implementation("io.grpc:grpc-kotlin-stub:1.4.1")
-    implementation("io.grpc:grpc-protobuf:1.65.0")
+    implementation("io.grpc:grpc-protobuf:1.65.1")
     implementation("com.google.protobuf:protobuf-kotlin:4.27.2")
-    implementation("io.grpc:grpc-netty:1.65.0")
+    implementation("io.grpc:grpc-netty:1.65.1")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
     implementation(project(":owl-common"))
     protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto"))
@@ -26,7 +26,7 @@ tasks.test {
     useJUnitPlatform()
 }
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 protobuf {
@@ -35,7 +35,7 @@ protobuf {
     }
     plugins {
         create("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:1.65.0"
+            artifact = "io.grpc:protoc-gen-grpc-java:1.65.1"
         }
         create("grpckt") {
             artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"

owl/owl-producer/owl-producer-embedded/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm")
+    alias(libs.plugins.kotlin.jvm)
 }
 
 group = "dev.usbharu"
@@ -22,5 +22,5 @@ tasks.test {
     useJUnitPlatform()
 }
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }

owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedGrpcOwlProducer.kt

@@ -17,6 +17,7 @@
 package dev.usbharu.owl.producer.embedded
 
 import dev.usbharu.owl.broker.OwlBrokerApplication
+import dev.usbharu.owl.broker.mainModule
 import dev.usbharu.owl.common.retry.RetryPolicyFactory
 import dev.usbharu.owl.common.task.PublishedTask
 import dev.usbharu.owl.common.task.Task
@@ -25,7 +26,6 @@ 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
 
 class EmbeddedGrpcOwlProducer(
     private val config: EmbeddedGrpcOwlProducerConfig,
@@ -42,7 +42,7 @@ class EmbeddedGrpcOwlProducer(
                     config.retryPolicyFactory
                 }
             }
-            modules(module, defaultModule, config.moduleContext.module())
+            modules(mainModule, module, config.moduleContext.module())
         }.koin
 
         application.get<OwlBrokerApplication>().start(config.port.toInt())

owl/owl-producer/owl-producer-embedded/src/main/kotlin/dev/usbharu/owl/producer/embedded/EmbeddedOwlProducer.kt

@@ -19,6 +19,7 @@ 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.mainModule
 import dev.usbharu.owl.broker.service.*
 import dev.usbharu.owl.common.property.PropertySerializerFactory
 import dev.usbharu.owl.common.retry.RetryPolicyFactory
@@ -30,7 +31,6 @@ 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
 import java.time.Instant
 import java.util.*
 import dev.usbharu.owl.broker.domain.model.taskdefinition.TaskDefinition as BrokerTaskDefinition
@@ -60,7 +60,7 @@ class EmbeddedOwlProducer(
                     embeddedOwlProducerConfig.propertySerializerFactory
                 }
             }
-            modules(defaultModule, module, embeddedOwlProducerConfig.moduleContext.module())
+            modules(mainModule, module, embeddedOwlProducerConfig.moduleContext.module())
         }.koin
 
         application.getOrNull<ProducerRepository>()