From 57bfec9ab0084ec029a1be9f6d94e4d6fa78e008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sun, 23 Nov 2025 16:03:26 +0100 Subject: [PATCH] refactor(bson): Move PropertyNameStrategy to :dsl --- driver-coroutines/src/jvmMain/kotlin/JvmMongoCollection.kt | 2 +- driver-shared-kmongo/src/jvmMain/kotlin/KMongoNameStrategy.kt | 2 +- .../src/jvmTest/kotlin/KMongoNameStrategyTest.kt | 2 +- driver-shared-official/src/jvmMain/kotlin/JvmBsonContext.kt | 2 +- driver-sync/src/jvmMain/kotlin/JvmMongoCollection.kt | 2 +- dsl/src/commonMain/kotlin/BsonContext.kt | 2 +- dsl/src/commonMain/kotlin/path/Field.kt | 1 - .../src/commonMain/kotlin/path}/PropertyNameStrategy.kt | 2 +- dsl/src/commonTest/kotlin/path/FieldTest.kt | 1 - 9 files changed, 7 insertions(+), 9 deletions(-) rename {bson/src/commonMain/kotlin => dsl/src/commonMain/kotlin/path}/PropertyNameStrategy.kt (97%) diff --git a/driver-coroutines/src/jvmMain/kotlin/JvmMongoCollection.kt b/driver-coroutines/src/jvmMain/kotlin/JvmMongoCollection.kt index 96ed2621..db462925 100644 --- a/driver-coroutines/src/jvmMain/kotlin/JvmMongoCollection.kt +++ b/driver-coroutines/src/jvmMain/kotlin/JvmMongoCollection.kt @@ -21,7 +21,6 @@ import com.mongodb.client.model.ReplaceOptions import com.mongodb.client.model.UpdateOptions import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.firstOrNull -import opensavvy.ktmongo.bson.PropertyNameStrategy import opensavvy.ktmongo.bson.official.JvmBsonFactory import opensavvy.ktmongo.bson.official.types.Jvm import opensavvy.ktmongo.bson.types.ObjectIdGenerator @@ -35,6 +34,7 @@ import opensavvy.ktmongo.dsl.command.InsertOneOptions import opensavvy.ktmongo.dsl.options.WithWriteConcern import opensavvy.ktmongo.dsl.options.WriteConcernOption import opensavvy.ktmongo.dsl.options.option +import opensavvy.ktmongo.dsl.path.PropertyNameStrategy import opensavvy.ktmongo.dsl.query.FilterQuery import opensavvy.ktmongo.dsl.query.UpdateQuery import opensavvy.ktmongo.dsl.query.UpdateWithPipelineQuery diff --git a/driver-shared-kmongo/src/jvmMain/kotlin/KMongoNameStrategy.kt b/driver-shared-kmongo/src/jvmMain/kotlin/KMongoNameStrategy.kt index 09bf72f2..edbbdd9e 100644 --- a/driver-shared-kmongo/src/jvmMain/kotlin/KMongoNameStrategy.kt +++ b/driver-shared-kmongo/src/jvmMain/kotlin/KMongoNameStrategy.kt @@ -17,8 +17,8 @@ package opensavvy.ktmongo.utils.kmongo import kotlinx.serialization.SerialName -import opensavvy.ktmongo.bson.PropertyNameStrategy import opensavvy.ktmongo.dsl.LowLevelApi +import opensavvy.ktmongo.dsl.path.PropertyNameStrategy import org.bson.codecs.pojo.annotations.BsonId import org.litote.kmongo.property.KPropertyPath import kotlin.reflect.KProperty1 diff --git a/driver-shared-kmongo/src/jvmTest/kotlin/KMongoNameStrategyTest.kt b/driver-shared-kmongo/src/jvmTest/kotlin/KMongoNameStrategyTest.kt index def89d6a..686a872c 100644 --- a/driver-shared-kmongo/src/jvmTest/kotlin/KMongoNameStrategyTest.kt +++ b/driver-shared-kmongo/src/jvmTest/kotlin/KMongoNameStrategyTest.kt @@ -18,9 +18,9 @@ package opensavvy.ktmongo.utils.kmongo import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import opensavvy.ktmongo.bson.PropertyNameStrategy import opensavvy.ktmongo.dsl.LowLevelApi import opensavvy.ktmongo.dsl.path.FieldDsl +import opensavvy.ktmongo.dsl.path.PropertyNameStrategy import opensavvy.prepared.runner.testballoon.preparedSuite import opensavvy.prepared.suite.prepared import org.bson.codecs.pojo.annotations.BsonId diff --git a/driver-shared-official/src/jvmMain/kotlin/JvmBsonContext.kt b/driver-shared-official/src/jvmMain/kotlin/JvmBsonContext.kt index c8aae5a8..7563edaa 100644 --- a/driver-shared-official/src/jvmMain/kotlin/JvmBsonContext.kt +++ b/driver-shared-official/src/jvmMain/kotlin/JvmBsonContext.kt @@ -16,10 +16,10 @@ package opensavvy.ktmongo.official -import opensavvy.ktmongo.bson.PropertyNameStrategy import opensavvy.ktmongo.bson.official.JvmBsonFactory import opensavvy.ktmongo.bson.types.ObjectIdGenerator import opensavvy.ktmongo.dsl.BsonContext +import opensavvy.ktmongo.dsl.path.PropertyNameStrategy class JvmBsonContext( bsonFactory: JvmBsonFactory, diff --git a/driver-sync/src/jvmMain/kotlin/JvmMongoCollection.kt b/driver-sync/src/jvmMain/kotlin/JvmMongoCollection.kt index 6112f112..78563e8d 100644 --- a/driver-sync/src/jvmMain/kotlin/JvmMongoCollection.kt +++ b/driver-sync/src/jvmMain/kotlin/JvmMongoCollection.kt @@ -19,7 +19,6 @@ package opensavvy.ktmongo.sync import com.mongodb.client.model.* import com.mongodb.client.model.ReplaceOptions import com.mongodb.client.model.UpdateOptions -import opensavvy.ktmongo.bson.PropertyNameStrategy import opensavvy.ktmongo.bson.official.JvmBsonFactory import opensavvy.ktmongo.bson.official.types.Jvm import opensavvy.ktmongo.bson.types.ObjectIdGenerator @@ -33,6 +32,7 @@ import opensavvy.ktmongo.dsl.command.InsertOneOptions import opensavvy.ktmongo.dsl.options.WithWriteConcern import opensavvy.ktmongo.dsl.options.WriteConcernOption import opensavvy.ktmongo.dsl.options.option +import opensavvy.ktmongo.dsl.path.PropertyNameStrategy import opensavvy.ktmongo.dsl.query.FilterQuery import opensavvy.ktmongo.dsl.query.UpdateQuery import opensavvy.ktmongo.dsl.query.UpdateWithPipelineQuery diff --git a/dsl/src/commonMain/kotlin/BsonContext.kt b/dsl/src/commonMain/kotlin/BsonContext.kt index 90ea7a34..bd6629d7 100644 --- a/dsl/src/commonMain/kotlin/BsonContext.kt +++ b/dsl/src/commonMain/kotlin/BsonContext.kt @@ -17,8 +17,8 @@ package opensavvy.ktmongo.dsl import opensavvy.ktmongo.bson.BsonFactory -import opensavvy.ktmongo.bson.PropertyNameStrategy import opensavvy.ktmongo.bson.types.ObjectIdGenerator +import opensavvy.ktmongo.dsl.path.PropertyNameStrategy import kotlin.concurrent.atomics.ExperimentalAtomicApi import kotlin.time.ExperimentalTime diff --git a/dsl/src/commonMain/kotlin/path/Field.kt b/dsl/src/commonMain/kotlin/path/Field.kt index 1f61c2d6..85906fc9 100644 --- a/dsl/src/commonMain/kotlin/path/Field.kt +++ b/dsl/src/commonMain/kotlin/path/Field.kt @@ -16,7 +16,6 @@ package opensavvy.ktmongo.dsl.path -import opensavvy.ktmongo.bson.PropertyNameStrategy import opensavvy.ktmongo.dsl.BsonContext import opensavvy.ktmongo.dsl.DangerousMongoApi import opensavvy.ktmongo.dsl.KtMongoDsl diff --git a/bson/src/commonMain/kotlin/PropertyNameStrategy.kt b/dsl/src/commonMain/kotlin/path/PropertyNameStrategy.kt similarity index 97% rename from bson/src/commonMain/kotlin/PropertyNameStrategy.kt rename to dsl/src/commonMain/kotlin/path/PropertyNameStrategy.kt index dcb8b9a7..cd07c40b 100644 --- a/bson/src/commonMain/kotlin/PropertyNameStrategy.kt +++ b/dsl/src/commonMain/kotlin/path/PropertyNameStrategy.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package opensavvy.ktmongo.bson +package opensavvy.ktmongo.dsl.path import opensavvy.ktmongo.dsl.LowLevelApi import kotlin.reflect.KProperty1 diff --git a/dsl/src/commonTest/kotlin/path/FieldTest.kt b/dsl/src/commonTest/kotlin/path/FieldTest.kt index 1a4f6634..c8564f4a 100644 --- a/dsl/src/commonTest/kotlin/path/FieldTest.kt +++ b/dsl/src/commonTest/kotlin/path/FieldTest.kt @@ -16,7 +16,6 @@ package opensavvy.ktmongo.dsl.path -import opensavvy.ktmongo.bson.PropertyNameStrategy import opensavvy.ktmongo.dsl.LowLevelApi import opensavvy.prepared.runner.testballoon.preparedSuite import kotlin.reflect.KProperty1 -- 2.51.2