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 6078f23a1..b3cef1f6d 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 @@ -33,6 +33,7 @@ import org.springframework.data.repository.query.QueryMethodEvaluationContextPro import org.springframework.expression.ExpressionParser; import org.springframework.lang.Nullable; import org.springframework.util.ClassUtils; +import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; /** @@ -165,7 +166,7 @@ abstract class AggregationUtils { @Nullable static T extractSimpleTypeResult(@Nullable Document source, Class targetType, MongoConverter converter) { - if (source == null || source.isEmpty()) { + if (ObjectUtils.isEmpty(source)) { return null; }