diff --git a/redaction-report-service-image-v1/pom.xml b/redaction-report-service-image-v1/pom.xml index f495872..39924dc 100644 --- a/redaction-report-service-image-v1/pom.xml +++ b/redaction-report-service-image-v1/pom.xml @@ -5,7 +5,7 @@ com.iqser.red platform-docker-dependency - 1.0.1 + 1.1.0 4.0.0 diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java index 9dad62d..60d6ec8 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java @@ -18,6 +18,7 @@ import java.util.Map; import org.apache.commons.io.IOUtils; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.junit.Test; +import org.junit.platform.commons.util.StringUtils; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -186,7 +187,7 @@ public class RedactionReportIntegrationTest { .build(); byte[] report = wordReportGenerationService.generateReport(ReportType.WORD_SINGLE_FILE, reportEntries, dossierTemplateId, reportTemplate, fileStatus, project); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/efsa_template.docx")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/efsa_template.docx")) { fileOutputStream.write(report); } } @@ -242,7 +243,7 @@ public class RedactionReportIntegrationTest { excelTemplateReportGenerationService.generateReport(reportEntries2, "dossierTemplateId", workbook, fileModel2, dossier, true); byte[] excelTemplateReport = excelTemplateReportGenerationService.toByteArray(workbook); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/report_excel_template.xlsx")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/report_excel_template.xlsx")) { fileOutputStream.write(excelTemplateReport); } } @@ -300,7 +301,7 @@ public class RedactionReportIntegrationTest { .uploadDate(OffsetDateTime.now()) .build(); byte[] wordReport = wordReportGenerationService.generateReport(ReportType.WORD_SINGLE_FILE, reportEntries, dossierTemplateId, reportTemplate, fileModel, dossier); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/efsa_template.docx")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/efsa_template.docx")) { fileOutputStream.write(wordReport); } ReportTemplate reportTemplate2 = ReportTemplate.builder() @@ -311,7 +312,7 @@ public class RedactionReportIntegrationTest { .uploadDate(OffsetDateTime.now()) .build(); byte[] wordReport2 = wordReportGenerationService.generateReport(ReportType.WORD_SINGLE_FILE, reportEntries2, dossierTemplateId, reportTemplate2, fileModel2, dossier); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/efsa_template2.docx")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/efsa_template2.docx")) { fileOutputStream.write(wordReport2); } @@ -320,19 +321,19 @@ public class RedactionReportIntegrationTest { excelTemplateReportGenerationService.generateReport(reportEntries, "dossierTemplateId", workbook, fileModel, dossier, false); excelTemplateReportGenerationService.generateReport(reportEntries2, "dossierTemplateId", workbook, fileModel2, dossier, true); byte[] excelTemplateReport = excelTemplateReportGenerationService.toByteArray(workbook); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/report_excel_template.xlsx")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/report_excel_template.xlsx")) { fileOutputStream.write(excelTemplateReport); } XSSFWorkbook workbook2 = new XSSFWorkbook(excelTemplateResource.getInputStream()); excelTemplateReportGenerationService.generateReport(reportEntries, "dossierTemplateId", workbook2, fileModel, dossier, true); byte[] excelTemplateReport2 = excelTemplateReportGenerationService.toByteArray(workbook2); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/report_excel_template2.xlsx")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/report_excel_template2.xlsx")) { fileOutputStream.write(excelTemplateReport2); } XSSFWorkbook workbook3 = new XSSFWorkbook(excelTemplateResource.getInputStream()); excelTemplateReportGenerationService.generateReport(reportEntries2, "dossierTemplateId", workbook3, fileModel2, dossier, true); byte[] excelTemplateReport3 = excelTemplateReportGenerationService.toByteArray(workbook3); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/report_excel_template3.xlsx")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/report_excel_template3.xlsx")) { fileOutputStream.write(excelTemplateReport3); } } @@ -399,9 +400,17 @@ public class RedactionReportIntegrationTest { .build(); byte[] report = wordReportGenerationService.generateReport(ReportType.WORD_SINGLE_FILE, reportEntries, dossierTemplateId, reportTemplate, fileModel, project); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/efsa_template13.docx")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/efsa_template13.docx")) { fileOutputStream.write(report); } } + private static String getTemporaryDirectory() { + String tmpdir = System.getProperty("java.io.tmpdir"); + if (StringUtils.isNotBlank(tmpdir)) { + return tmpdir; + } + return "/tmp"; + } + } diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java index 0eaf90e..f46094d 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import org.junit.Test; +import org.junit.platform.commons.util.StringUtils; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; @@ -78,10 +79,18 @@ public class StatusReportGenerationServiceTest { byte[] report = statusReportGenerationService.generateReport(dossier); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/status_report.xlsx")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/status_report.xlsx")) { fileOutputStream.write(report); } } + private static String getTemporaryDirectory() { + String tmpdir = System.getProperty("java.io.tmpdir"); + if (StringUtils.isNotBlank(tmpdir)) { + return tmpdir; + } + return "/tmp"; + } + } \ No newline at end of file