From e26db8e4c4ea18b7d0c0af1322254c1fc7640f68 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Wed, 26 Feb 2020 13:37:54 +0200 Subject: [PATCH] Improved null value Handling on WordBuilder --- .../utilities/documents/word/WordBuilder.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java index 39a217ec2..9c58e4742 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java @@ -136,7 +136,11 @@ public class WordBuilder { private void createPages(List datasetProfilePages, XWPFDocument mainDocumentPart, Boolean createListing, VisibilityRuleService visibilityRuleService) { datasetProfilePages.forEach(item -> { - createSections(item.getSections(), mainDocumentPart, ParagraphStyle.HEADER4, 0, createListing, visibilityRuleService); + try { + createSections(item.getSections(), mainDocumentPart, ParagraphStyle.HEADER4, 0, createListing, visibilityRuleService); + } catch (Exception e) { + logger.error(e.getMessage(), e); + } }); } @@ -258,7 +262,7 @@ public class WordBuilder { } return sb.toString(); } else if (comboboxType.equals("wordlist")) { - return field.getValue().toString(); + return field.getValue() != null ? field.getValue().toString() : ""; } } case "booleanDecision": @@ -271,11 +275,9 @@ public class WordBuilder { if (field.getValue() == null || field.getValue().equals("false")) return null; return data.getLabel(); case "freetext": - return field.getValue().toString(); - case "textarea": - return field.getValue().toString(); case "datepicker": - return field.getValue().toString(); + case "textarea": + return field.getValue() != null ? field.getValue().toString(): ""; } return null; }