From 8dc97e5d013d4cd329382efddc8649b60cc9bae2 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 11 Mar 2020 14:31:24 +0100 Subject: [PATCH] DATAMONGO-2488 - Polishing. Simplify conditional entity check. Original pull request: #841. --- .../data/mongodb/core/convert/QueryMapper.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java index f7ec113cf..715ba82d5 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java @@ -1252,14 +1252,13 @@ public class QueryMapper { String partial = iterator.next(); - if (depth > 0 && property.isCollectionLike()) { + if (depth > 0 && property.isCollectionLike() && property.isEntity() && property.getComponentType() != null) { - MongoPersistentEntity persistentEntity = mappingContext.getPersistentEntity(property.getComponentType()); - if (persistentEntity != null) { - MongoPersistentProperty persistentProperty = persistentEntity.getPersistentProperty(partial); - if(persistentProperty != null) { - partial = mapPropertyName(persistentProperty); - } + MongoPersistentEntity persistentEntity = mappingContext + .getRequiredPersistentEntity(property.getComponentType()); + MongoPersistentProperty persistentProperty = persistentEntity.getPersistentProperty(partial); + if (persistentProperty != null) { + partial = mapPropertyName(persistentProperty); } }