From 4b30d56d91303564d87559de775e7fb91bb9886a Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Wed, 29 Jul 2020 17:52:51 +0300 Subject: [PATCH] Fixed issue if dataset has no profile --- .../main/java/eu/eudat/logic/managers/DatasetManager.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java index f9c404291..b97962f3b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java @@ -188,7 +188,7 @@ public class DatasetManager { DataTableData dataTable = new DataTableData<>(); - dataTable.setData(pagedItems.select(this::mapModel)); + dataTable.setData(pagedItems.select(this::mapModel).stream().filter(Objects::nonNull).collect(Collectors.toList())); dataTable.setTotalCount(authItems.count()); @@ -239,7 +239,7 @@ public class DatasetManager { CompletableFuture> itemsFuture = pagedItems. selectAsync(this::mapModel).whenComplete((resultList, throwable) -> { - dataTable.setData(resultList); + dataTable.setData(resultList.stream().filter(Objects::nonNull).collect(Collectors.toList())); }); CompletableFuture countFuture = pagedItems.countAsync().whenComplete((count, throwable) -> { @@ -1049,6 +1049,8 @@ public class DatasetManager { @Transactional private DatasetListingModel mapModel(Dataset item) { + if (item.getProfile() == null) + return null; DatasetListingModel listingModel = new DatasetListingModel().fromDataModel(item); DatasetProfileCriteria criteria = new DatasetProfileCriteria(); criteria.setGroupIds(Collections.singletonList(item.getProfile().getGroupId()));