diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AggregationUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AggregationUtils.java index c06a7a691..1ca713a6d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AggregationUtils.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AggregationUtils.java @@ -39,6 +39,7 @@ import org.springframework.data.repository.query.QueryMethodEvaluationContextPro import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.lang.Nullable; import org.springframework.util.ClassUtils; +import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; /** @@ -198,7 +199,7 @@ class AggregationUtils { @Nullable static T extractSimpleTypeResult(@Nullable Document source, Class targetType, MongoConverter converter) { - if (source == null || source.isEmpty()) { + if (ObjectUtils.isEmpty(source)) { return null; }