diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverter.java index 8358e84e6..5086f3040 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverter.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverter.java @@ -127,11 +127,7 @@ public interface MongoConverter @Nullable default Object convertId(@Nullable Object id, Class targetType) { - if (id == null) { - return null; - } - - if(ClassUtils.isAssignableValue(targetType, id)) { + if (id == null || ClassUtils.isAssignableValue(targetType, id)) { return id; }