From 75fa83c8d4b2161c6e72328db0eb1d953adf87db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Wed, 13 Aug 2025 20:44:01 +0200 Subject: [PATCH] refactor(bson-multiplatform): Shorten names of internal implementation classes --- bson-multiplatform/src/commonMain/kotlin/Bson.kt | 8 ++++---- .../src/commonMain/kotlin/BsonContext.kt | 10 +++++----- ...mBsonArrayReader.kt => MultiplatformArrayReader.kt} | 2 +- .../kotlin/impl/read/MultiplatformBsonValueReader.kt | 4 ++-- ...ocumentReader.kt => MultiplatformDocumentReader.kt} | 2 +- ...FieldWriter.kt => MultiplatformArrayFieldWriter.kt} | 2 +- ...ldWriter.kt => MultiplatformDocumentFieldWriter.kt} | 8 ++++---- ...ieldWriter.kt => MultiplatformSingleFieldWriter.kt} | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) rename bson-multiplatform/src/commonMain/kotlin/impl/read/{MultiplatformBsonArrayReader.kt => MultiplatformArrayReader.kt} (98%) rename bson-multiplatform/src/commonMain/kotlin/impl/read/{MultiplatformBsonDocumentReader.kt => MultiplatformDocumentReader.kt} (98%) rename bson-multiplatform/src/commonMain/kotlin/impl/write/{MultiplatformBsonArrayFieldWriter.kt => MultiplatformArrayFieldWriter.kt} (98%) rename bson-multiplatform/src/commonMain/kotlin/impl/write/{MultiplatformBsonFieldWriter.kt => MultiplatformDocumentFieldWriter.kt} (96%) rename bson-multiplatform/src/commonMain/kotlin/impl/write/{MultiplatformBsonSingleFieldWriter.kt => MultiplatformSingleFieldWriter.kt} (97%) diff --git a/bson-multiplatform/src/commonMain/kotlin/Bson.kt b/bson-multiplatform/src/commonMain/kotlin/Bson.kt index 3aee6a50..798bc55a 100644 --- a/bson-multiplatform/src/commonMain/kotlin/Bson.kt +++ b/bson-multiplatform/src/commonMain/kotlin/Bson.kt @@ -20,8 +20,8 @@ import opensavvy.ktmongo.bson.Bson import opensavvy.ktmongo.bson.BsonArray import opensavvy.ktmongo.bson.BsonArrayReader import opensavvy.ktmongo.bson.BsonDocumentReader -import opensavvy.ktmongo.bson.multiplatform.impl.read.MultiplatformBsonArrayReader -import opensavvy.ktmongo.bson.multiplatform.impl.read.MultiplatformBsonDocumentReader +import opensavvy.ktmongo.bson.multiplatform.impl.read.MultiplatformArrayReader +import opensavvy.ktmongo.bson.multiplatform.impl.read.MultiplatformDocumentReader import opensavvy.ktmongo.dsl.LowLevelApi class Bson internal constructor( @@ -33,7 +33,7 @@ class Bson internal constructor( @LowLevelApi override fun reader(): BsonDocumentReader = - MultiplatformBsonDocumentReader(data) + MultiplatformDocumentReader(data) @OptIn(LowLevelApi::class) override fun toString(): String = @@ -49,7 +49,7 @@ class BsonArray internal constructor( @LowLevelApi override fun reader(): BsonArrayReader = - MultiplatformBsonArrayReader(data) + MultiplatformArrayReader(data) @OptIn(LowLevelApi::class) override fun toString(): String = diff --git a/bson-multiplatform/src/commonMain/kotlin/BsonContext.kt b/bson-multiplatform/src/commonMain/kotlin/BsonContext.kt index d9f30499..4b1e1f24 100644 --- a/bson-multiplatform/src/commonMain/kotlin/BsonContext.kt +++ b/bson-multiplatform/src/commonMain/kotlin/BsonContext.kt @@ -21,8 +21,8 @@ import kotlinx.io.readTo import opensavvy.ktmongo.bson.BsonContext import opensavvy.ktmongo.bson.BsonFieldWriter import opensavvy.ktmongo.bson.BsonValueWriter -import opensavvy.ktmongo.bson.multiplatform.impl.write.MultiplatformBsonArrayFieldWriter -import opensavvy.ktmongo.bson.multiplatform.impl.write.MultiplatformBsonFieldWriter +import opensavvy.ktmongo.bson.multiplatform.impl.write.MultiplatformArrayFieldWriter +import opensavvy.ktmongo.bson.multiplatform.impl.write.MultiplatformDocumentFieldWriter import opensavvy.ktmongo.bson.types.ObjectIdGenerator import opensavvy.ktmongo.dsl.LowLevelApi import kotlin.concurrent.atomics.ExperimentalAtomicApi @@ -35,11 +35,11 @@ class BsonContext @OptIn(ExperimentalAtomicApi::class) constructor( @LowLevelApi private inline fun buildArbitraryTopLevel( - block: MultiplatformBsonFieldWriter.() -> Unit, + block: MultiplatformDocumentFieldWriter.() -> Unit, ): Bytes { val buffer = Buffer() val bsonWriter = RawBsonWriter(buffer) - val fieldWriter = MultiplatformBsonFieldWriter(bsonWriter) + val fieldWriter = MultiplatformDocumentFieldWriter(bsonWriter) bsonWriter.writeInt32(0) // Document size. 0 for now, will be overwritten later. fieldWriter.block() @@ -71,7 +71,7 @@ class BsonContext @OptIn(ExperimentalAtomicApi::class) constructor( @LowLevelApi override fun buildArray(block: BsonValueWriter.() -> Unit): BsonArray = buildArbitraryTopLevel { - block(MultiplatformBsonArrayFieldWriter(this)) + block(MultiplatformArrayFieldWriter(this)) }.let(::BsonArray) @LowLevelApi diff --git a/bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformBsonArrayReader.kt b/bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformArrayReader.kt similarity index 98% rename from bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformBsonArrayReader.kt rename to bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformArrayReader.kt index 4a656d9f..59fe815c 100644 --- a/bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformBsonArrayReader.kt +++ b/bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformArrayReader.kt @@ -24,7 +24,7 @@ import opensavvy.ktmongo.bson.multiplatform.Bytes import opensavvy.ktmongo.dsl.LowLevelApi @LowLevelApi -internal class MultiplatformBsonArrayReader( +internal class MultiplatformArrayReader( private val bytesWithHeader: Bytes, ) : BsonArrayReader { diff --git a/bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformBsonValueReader.kt b/bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformBsonValueReader.kt index 55daf8e1..51669e80 100644 --- a/bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformBsonValueReader.kt +++ b/bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformBsonValueReader.kt @@ -193,13 +193,13 @@ internal class MultiplatformBsonValueReader( @LowLevelApi override fun readDocument(): BsonDocumentReader { checkType(BsonType.Document) - return MultiplatformBsonDocumentReader(bytes) + return MultiplatformDocumentReader(bytes) } @LowLevelApi override fun readArray(): BsonArrayReader { checkType(BsonType.Array) - return MultiplatformBsonArrayReader(bytes) + return MultiplatformArrayReader(bytes) } @OptIn(DangerousMongoApi::class) diff --git a/bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformBsonDocumentReader.kt b/bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformDocumentReader.kt similarity index 98% rename from bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformBsonDocumentReader.kt rename to bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformDocumentReader.kt index 32e1fa16..76130fcb 100644 --- a/bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformBsonDocumentReader.kt +++ b/bson-multiplatform/src/commonMain/kotlin/impl/read/MultiplatformDocumentReader.kt @@ -91,7 +91,7 @@ internal fun readField( } @LowLevelApi -internal class MultiplatformBsonDocumentReader( +internal class MultiplatformDocumentReader( private val bytesWithHeader: Bytes, ) : BsonDocumentReader { diff --git a/bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformBsonArrayFieldWriter.kt b/bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformArrayFieldWriter.kt similarity index 98% rename from bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformBsonArrayFieldWriter.kt rename to bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformArrayFieldWriter.kt index 767511a7..6280d858 100644 --- a/bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformBsonArrayFieldWriter.kt +++ b/bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformArrayFieldWriter.kt @@ -23,7 +23,7 @@ import opensavvy.ktmongo.bson.types.Timestamp import opensavvy.ktmongo.dsl.LowLevelApi @LowLevelApi -internal class MultiplatformBsonArrayFieldWriter( +internal class MultiplatformArrayFieldWriter( private val writer: BsonFieldWriter, ) : BsonValueWriter { private var size = 0 diff --git a/bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformBsonFieldWriter.kt b/bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformDocumentFieldWriter.kt similarity index 96% rename from bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformBsonFieldWriter.kt rename to bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformDocumentFieldWriter.kt index 7ce92443..51d493ac 100644 --- a/bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformBsonFieldWriter.kt +++ b/bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformDocumentFieldWriter.kt @@ -31,7 +31,7 @@ import opensavvy.ktmongo.dsl.LowLevelApi import kotlin.time.ExperimentalTime @LowLevelApi -internal class MultiplatformBsonFieldWriter( +internal class MultiplatformDocumentFieldWriter( private val writer: RawBsonWriter, ) : BsonFieldWriter { @@ -47,7 +47,7 @@ internal class MultiplatformBsonFieldWriter( @LowLevelApi override fun write(name: String, block: BsonValueWriter.() -> Unit) { - MultiplatformBsonSingleFieldWriter(this, name).block() + MultiplatformSingleFieldWriter(this, name).block() } @LowLevelApi @@ -203,7 +203,7 @@ internal class MultiplatformBsonFieldWriter( // Once we know the size, we can write it entirely to the real buffer. val childBuffer = Buffer() val childWriter = RawBsonWriter(childBuffer) - val childFieldWriter = MultiplatformBsonFieldWriter(childWriter) + val childFieldWriter = MultiplatformDocumentFieldWriter(childWriter) writeTo(childFieldWriter) childWriter.writeUnsignedByte(0u) @@ -226,7 +226,7 @@ internal class MultiplatformBsonFieldWriter( writeType(BsonType.Array) writeName(name) writeArbitraryDocument { - val writer = MultiplatformBsonArrayFieldWriter(it) + val writer = MultiplatformArrayFieldWriter(it) writer.block() } } diff --git a/bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformBsonSingleFieldWriter.kt b/bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformSingleFieldWriter.kt similarity index 97% rename from bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformBsonSingleFieldWriter.kt rename to bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformSingleFieldWriter.kt index dbd2f8b9..a093d812 100644 --- a/bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformBsonSingleFieldWriter.kt +++ b/bson-multiplatform/src/commonMain/kotlin/impl/write/MultiplatformSingleFieldWriter.kt @@ -25,8 +25,8 @@ import opensavvy.ktmongo.dsl.DangerousMongoApi import opensavvy.ktmongo.dsl.LowLevelApi @LowLevelApi -internal class MultiplatformBsonSingleFieldWriter( - private val writer: MultiplatformBsonFieldWriter, +internal class MultiplatformSingleFieldWriter( + private val writer: MultiplatformDocumentFieldWriter, private val name: String, ) : BsonValueWriter { -- 2.51.2