From bc8ca768589a766dccfada01a866191ee3917ce6 Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 10 Oct 2023 09:51:48 +0200 Subject: [PATCH 1/2] RED-5945: 500 when importing faulty archive * now throwing a BadRequestException when archive is faulty --- .../v1/processor/service/DossierTemplateImportService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java index 65513a13d..f327c2242 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java @@ -113,6 +113,9 @@ public class DossierTemplateImportService { public String importDossierTemplate(ImportDossierTemplateRequest request) { ImportTemplateResult archiveResult = this.handleArchive(request); + if(archiveResult == null) { + throw new BadRequestException("The provided archive is faulty"); + } return this.importDossierTemplate(archiveResult); } @@ -280,6 +283,9 @@ public class DossierTemplateImportService { } } + if(importTemplateResult.getDossierTemplate() == null) { + throw new BadRequestException("Provided archive is faulty"); + } return importTemplateResult; } finally { if (tempFile != null) { -- 2.47.2 From 209373d3fa330fd7f5c751e3478ea1b04c47b2ca Mon Sep 17 00:00:00 2001 From: yhampe Date: Tue, 10 Oct 2023 14:07:22 +0200 Subject: [PATCH 2/2] RED-5945: 500 when importing faulty archive * now throwing a BadRequestException when archive is faulty --- .../v1/processor/service/DossierTemplateImportService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java index f327c2242..4cfb620f9 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DossierTemplateImportService.java @@ -113,9 +113,6 @@ public class DossierTemplateImportService { public String importDossierTemplate(ImportDossierTemplateRequest request) { ImportTemplateResult archiveResult = this.handleArchive(request); - if(archiveResult == null) { - throw new BadRequestException("The provided archive is faulty"); - } return this.importDossierTemplate(archiveResult); } @@ -295,7 +292,7 @@ public class DossierTemplateImportService { } } } - } catch (IOException | BadRequestException e) { + } catch (IOException e) { throw new BadRequestException(e.getMessage(), e); } } -- 2.47.2