DATAMONGO-2488 - Polishing.

Simplify conditional entity check.

Original pull request: #841.
This commit is contained in:
Mark Paluch
2020-03-11 14:31:24 +01:00
parent a037c50961
commit 8dc97e5d01

View File

@@ -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);
}
}