Marmelator/redaction-report-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity

Pull request #53: Fixed NPE if image placeholder image value is null

Browse Source 
Merge in RED/redaction-report-service from FixNPEImageMaster to master

* commit '81af48e7449aa34c29b53b05d62ed1d7823381ae':
  Fixed NPE if image placeholder image value is null
This commit is contained in:
Dominique Eiflaender 2021-08-16 10:08:22 +02:00
commit 85749f328a
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelTemplateReportGenerationService.java
View File

@ -78,12 +78,15 @@ public class ExcelTemplateReportGenerationService {
for (DossierAttributeConfig attribute : dossierAttributesConfig.getDossierAttributeConfigs()) {
if (dossierAttribute.getDossierAttributeId().equals(attribute.getId())) {
if (attribute.getType().equals(DossierAttributeConfig.DossierAttributeType.IMAGE)) {
if (dossierAttribute.getValue().startsWith("data:")) {
imagePlaceholders.add(new ImagePlaceholder(attribute.getPlaceholder(), Base64.getDecoder()
.decode(dossierAttribute.getValue().split(",")[1])));
} else {
imagePlaceholders.add(new ImagePlaceholder(attribute.getPlaceholder(), Base64.getDecoder()
.decode(dossierAttribute.getValue())));
if(dossierAttribute.getValue() != null) {
if (dossierAttribute.getValue().startsWith("data:")) {
imagePlaceholders.add(new ImagePlaceholder(attribute.getPlaceholder(), Base64.getDecoder()
.decode(dossierAttribute.getValue().split(",")[1])));
} else {
imagePlaceholders.add(new ImagePlaceholder(attribute.getPlaceholder(), Base64.getDecoder()
.decode(dossierAttribute.getValue())));
}
}
} else {
dossierAttributesPlaceholder.put(attribute.getPlaceholder(), dossierAttribute.getValue());

14
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/WordReportGenerationService.java
View File

@ -98,12 +98,14 @@ public class WordReportGenerationService {
if (dossierAttribute.getDossierAttributeId().equals(attributeConfig.getId())) {
if (attributeConfig.getType().equals(DossierAttributeConfig.DossierAttributeType.IMAGE)) {
if (dossierAttribute.getValue().startsWith("data:")) {
imagePlaceholders.add(new ImagePlaceholder(attributeConfig.getPlaceholder(), Base64.getDecoder()
.decode(dossierAttribute.getValue().split(",")[1])));
} else {
imagePlaceholders.add(new ImagePlaceholder(attributeConfig.getPlaceholder(), Base64.getDecoder()
.decode(dossierAttribute.getValue())));
if(dossierAttribute.getValue() != null) {
if (dossierAttribute.getValue().startsWith("data:")) {
imagePlaceholders.add(new ImagePlaceholder(attributeConfig.getPlaceholder(), Base64.getDecoder()
.decode(dossierAttribute.getValue().split(",")[1])));
} else {
imagePlaceholders.add(new ImagePlaceholder(attributeConfig.getPlaceholder(), Base64.getDecoder()
.decode(dossierAttribute.getValue())));
}
}
} else {
dossierAttributesPlaceholder.put(attributeConfig.getPlaceholder(), dossierAttribute.getValue());