From 1d48ee81b95532be40afa450f11f1b0332e6e8e2 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Fri, 8 Oct 2021 11:18:22 +0300 Subject: [PATCH] Add additional null check for Elastic's Dmp Repository --- .../main/java/eu/eudat/elastic/repository/DmpRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java index 4acfea5f6..4d2a9cc90 100644 --- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java +++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java @@ -174,7 +174,7 @@ public class DmpRepository extends ElasticRepository { } if (criteria.getCollaborators() != null && criteria.getCollaborators().size() > 0) { - boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.COLLABORATORS.getName() + ".id.keyword", criteria.getCollaborators().stream().map(UUID::toString).collect(Collectors.toList()))); + boolQuery = boolQuery.should(QueryBuilders.termsQuery(Dmp.MapKey.COLLABORATORS.getName() + ".id.keyword", criteria.getCollaborators().stream().filter(Objects::nonNull).map(UUID::toString).collect(Collectors.toList()))); } if (!criteria.isAllowAllVersions()) {