From dfede781fbb50d94792e0aadfd34bf2eead3c1b0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 6 Jun 2018 11:34:20 +0200 Subject: [PATCH] DATAMONGO-1998 - Polishing. Switch id field name check to equals or to match the last property path segment. Original pull request: #567. --- .../repository/support/SpringDataMongodbSerializer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java index d6881341b..7add845d4 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java @@ -119,14 +119,14 @@ class SpringDataMongodbSerializer extends MongodbSerializer { /* * (non-Javadoc) - * @see com.querydsl.mongodb.MongodbSerializer#asDocument(java.lang.String, java.lang.Object) + * @see com.querydsl.mongodb.MongodbSerializer#asDBObject(java.lang.String, java.lang.Object) */ @Override protected DBObject asDBObject(@Nullable String key, @Nullable Object value) { value = value instanceof Optional ? ((Optional) value).orElse(null) : value; - if (key.endsWith(ID_KEY)) { + if (ID_KEY.equals(key) || (key != null && key.endsWith("." + ID_KEY))) { return convertId(key, value); }