Updated bson-kotlin in prep for bson-kotlinx

Expanded the test cases
Simplified the DataClassCodecProvider

JAVA-4872 JAVA-4873

Author: rozza

bson-kotlin/src/main/kotlin/org/bson/codecs/kotlin/DataClassCodec.kt

@@ -129,17 +129,25 @@ internal data class DataClassCodec<T : Any>(
         internal val logger = Loggers.getLogger("DataClassCodec")
         private const val idFieldName = "_id"
 
-        fun <R : Any> create(kClass: KClass<R>, codecRegistry: CodecRegistry): Codec<R>? {
-            return if (!kClass.isData) null
-            else if (kClass.typeParameters.isEmpty()) createDataClassCodec(kClass, codecRegistry)
-            else RawDataClassCodec(kClass)
+        internal fun <R : Any> create(
+            kClass: KClass<R>,
+            codecRegistry: CodecRegistry,
+            types: List<Type> = emptyList()
+        ): Codec<R>? {
+            return if (!kClass.isData) {
+                null
+            } else if (kClass.typeParameters.isNotEmpty()) {
+                RawDataClassCodec(kClass)
+            } else {
+                createDataClassCodec(kClass, codecRegistry, types)
+            }
         }
 
-        internal fun <R : Any> createDataClassCodec(
+        private fun <R : Any> createDataClassCodec(
             kClass: KClass<R>,
             codecRegistry: CodecRegistry,
             types: List<Type> = emptyList()
-        ): DataClassCodec<R> {
+        ): Codec<R> {
             validateAnnotations(kClass)
             val primaryConstructor =
                 kClass.primaryConstructor ?: throw CodecConfigurationException("No primary constructor for $kClass")

bson-kotlin/src/main/kotlin/org/bson/codecs/kotlin/DataClassCodecProvider.kt

@@ -19,6 +19,7 @@ import org.bson.codecs.Codec
 import org.bson.codecs.configuration.CodecProvider
 import org.bson.codecs.configuration.CodecRegistry
 
+/** A Kotlin reflection based Codec Provider for data classes */
 public class DataClassCodecProvider : CodecProvider {
     override fun <T : Any> get(clazz: Class<T>, registry: CodecRegistry): Codec<T>? =
         DataClassCodec.create(clazz.kotlin, registry)

bson-kotlin/src/test/kotlin/org/bson/codecs/kotlin/DataClassCodecProviderTest.kt

@@ -26,10 +26,10 @@ import org.bson.BsonDocumentWriter
 import org.bson.codecs.DecoderContext
 import org.bson.codecs.EncoderContext
 import org.bson.codecs.configuration.CodecConfigurationException
-import org.bson.codecs.kotlin.samples.DataClass
 import org.bson.codecs.kotlin.samples.DataClassEmbedded
 import org.bson.codecs.kotlin.samples.DataClassParameterized
 import org.bson.codecs.kotlin.samples.DataClassWithParameterizedDataClass
+import org.bson.codecs.kotlin.samples.DataClassWithSimpleValues
 import org.bson.conversions.Bson
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
@@ -44,11 +44,11 @@ class DataClassCodecProviderTest {
     @Test
     fun shouldReturnDataClassCodecForDataClass() {
         val provider = DataClassCodecProvider()
-        val codec = provider.get(DataClass::class.java, Bson.DEFAULT_CODEC_REGISTRY)
+        val codec = provider.get(DataClassWithSimpleValues::class.java, Bson.DEFAULT_CODEC_REGISTRY)
 
         assertNotNull(codec)
         assertTrue { codec is DataClassCodec }
-        assertEquals(DataClass::class.java, codec.encoderClass)
+        assertEquals(DataClassWithSimpleValues::class.java, codec.encoderClass)
     }
 
     @Test
@@ -78,10 +78,10 @@ class DataClassCodecProviderTest {
 
     @Test
     fun shouldReturnDataClassCodecUsingDefaultRegistry() {
-        val codec = MongoClientSettings.getDefaultCodecRegistry().get(DataClass::class.java)
+        val codec = MongoClientSettings.getDefaultCodecRegistry().get(DataClassWithSimpleValues::class.java)
 
         assertNotNull(codec)
         assertTrue { codec is DataClassCodec }
-        assertEquals(DataClass::class.java, codec.encoderClass)
+        assertEquals(DataClassWithSimpleValues::class.java, codec.encoderClass)
     }
 }