From 8fb5fa416dc8dfea15eb87f5b8a4be402a5b9a4e Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Tue, 5 Mar 2024 14:47:01 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0?= =?UTF-8?q?=E3=83=97=E3=83=AD=E3=83=91=E3=83=86=E3=82=A3=E3=81=8B=E3=82=89?= =?UTF-8?q?MongoDB=E3=81=B8=E3=81=AE=E6=8E=A5=E7=B6=9A=E6=83=85=E5=A0=B1?= =?UTF-8?q?=E3=82=92=E5=8F=96=E5=BE=97=E3=81=99=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 --- .../owl/broker/mongodb/MongoModuleContext.kt | 18 ++++++++++++++---- broker/build.gradle.kts | 2 -- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt index 6a37436..eece963 100644 --- a/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt +++ b/broker/broker-mongodb/src/main/kotlin/dev/usbharu/owl/broker/mongodb/MongoModuleContext.kt @@ -21,20 +21,30 @@ import com.mongodb.MongoClientSettings import com.mongodb.kotlin.client.coroutine.MongoClient import dev.usbharu.owl.broker.ModuleContext 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(): org.koin.core.module.Module { + override fun module(): Module { val module = MongoModule().module - module.includes(org.koin.dsl.module { + module.includes(module { single { val clientSettings = MongoClientSettings.builder() - .applyConnectionString(ConnectionString("mongodb://agent1.build:27017")) + .applyConnectionString( + ConnectionString( + System.getProperty( + "owl.broker.mongo.url", + "mongodb://agent1.build:27017" + ) + ) + ) .uuidRepresentation(UuidRepresentation.STANDARD).build() - MongoClient.create(clientSettings).getDatabase("mongo-test") + MongoClient.create(clientSettings) + .getDatabase(System.getProperty("owl.broker.mongo.database", "mongo-test")) } }) return module diff --git a/broker/build.gradle.kts b/broker/build.gradle.kts index 393de63..1d3d402 100644 --- a/broker/build.gradle.kts +++ b/broker/build.gradle.kts @@ -22,8 +22,6 @@ 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("org.mongodb:mongodb-driver-kotlin-coroutine:4.11.0") - implementation("org.mongodb:bson-kotlinx:4.11.0") implementation(project(":common")) implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0") implementation(platform("io.insert-koin:koin-bom:3.5.3"))