From 9af8a732900502555bb5a5a6eceef4de601d62c5 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 7 Oct 2020 11:35:31 +0200 Subject: [PATCH] DATAMONGO-2616 - Polishing. Reformat code. Merge if-statements. Original pull request: #889. --- .../data/mongodb/core/convert/MongoConverter.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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; }