handle 'id' property as well in model objects

Litote · Jul 13, 2021 · 0cebbb5 · 0cebbb5
1 parent 9c2413a
commit 0cebbb5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/kmongo-jackson-mapping/src/main/kotlin/org/litote/kmongo/util/MongoIdUtil.kt b/kmongo-jackson-mapping/src/main/kotlin/org/litote/kmongo/util/MongoIdUtil.kt
@@ -79,7 +79,7 @@ internal object MongoIdUtil {
 
     private fun getIdProperty(type: KClass<*>): KProperty1<*, *>? =
         try {
-            type.memberProperties.find { "_id" == it.name }
+            type.memberProperties.find { "_id" == it.name || "id" == it.name}
         } catch (error: KotlinReflectionInternalError) {
             //ignore
             null

diff --git a/kmongo-jackson-mapping/src/test/kotlin/org/litote/kmongo/jackson/UUIDTest.kt b/kmongo-jackson-mapping/src/test/kotlin/org/litote/kmongo/jackson/UUIDTest.kt
@@ -63,7 +63,7 @@ class UUIDTest
         val bytes = mapper.writeValueAsBytes(testObject)
 
         // Check the type of the binary representation of the UUID
-        assertEquals(if(uuidRepresentation == UuidRepresentation.STANDARD) 4 else 3, bytes[12].toInt())
+        assertEquals(if(uuidRepresentation == UuidRepresentation.STANDARD) 4 else 3, bytes[13].toInt())
 
         val decodedObject: TestingObject = mapper.readValue(bytes)