From 91fc1bc5b10d8d1b869e7a0de27693e978c709f9 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Thu, 16 Apr 2020 18:32:47 +0300 Subject: [PATCH] Made elastic dmp mapping more safe --- .../elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java index 7f4933cc2..b10147413 100644 --- a/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java +++ b/dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java @@ -242,7 +242,9 @@ public class Dmp implements ElasticEntity { this.id = UUID.fromString((String) fields.get(MapKey.ID.getName())); this.label = (String) fields.get(MapKey.LABEL.getName()); this.description = (String) fields.get(MapKey.DESCRIPTION.getName()); - this.groupId = UUID.fromString((String) fields.get(MapKey.GROUPID.getName())); + if (fields.get(MapKey.GROUPID.getName()) != null) { + this.groupId = UUID.fromString((String) fields.get(MapKey.GROUPID.getName())); + } this.status = Short.valueOf(fields.get(MapKey.STATUS.getName()).toString()); if (fields.get(MapKey.TEMPLATES.getName()) != null) { this.templates = ((List>) fields.get(MapKey.TEMPLATES.getName())).stream().map(hashMap -> new DatasetTempalate().fromElasticEntity(hashMap)).collect(Collectors.toList());