From 8a763edc2bc53d2e61efd7155b7af53272e114ef Mon Sep 17 00:00:00 2001 From: Philipp Schramm Date: Tue, 30 Nov 2021 12:03:46 +0100 Subject: [PATCH] RED-2756 Bugfix for temporary files for Windows systems --- .../v1/server/RedactionIntegrationTest.java | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java index b88f67f1..deb6c1e6 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java @@ -22,6 +22,7 @@ import com.iqser.red.storage.commons.service.StorageService; import lombok.SneakyThrows; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -569,7 +570,7 @@ public class RedactionIntegrationTest { .fileId(TEST_FILE_ID) .build()); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated3.pdf")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated3.pdf")) { fileOutputStream.write(annotateResponse.getDocument()); } long rstart = System.currentTimeMillis(); @@ -682,7 +683,7 @@ public class RedactionIntegrationTest { System.out.println("first analysis duration: " + (end - start)); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Test.json")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Test.json")) { fileOutputStream.write(objectMapper.writeValueAsBytes(redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID))); } @@ -750,7 +751,7 @@ public class RedactionIntegrationTest { .fileId(TEST_FILE_ID) .build()); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) { fileOutputStream.write(annotateResponse.getDocument()); } @@ -771,7 +772,7 @@ public class RedactionIntegrationTest { .fileId(TEST_FILE_ID) .build()); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) { fileOutputStream.write(annotateResponse.getDocument()); } long end = System.currentTimeMillis(); @@ -847,7 +848,7 @@ public class RedactionIntegrationTest { .fileId(TEST_FILE_ID) .build()); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) { fileOutputStream.write(annotateResponse.getDocument()); } long end = System.currentTimeMillis(); @@ -873,7 +874,7 @@ public class RedactionIntegrationTest { RedactionResult result = redactionController.classify(redactionRequest); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Classified.pdf")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Classified.pdf")) { fileOutputStream.write(result.getDocument()); } } @@ -895,7 +896,7 @@ public class RedactionIntegrationTest { RedactionResult result = redactionController.sections(redactionRequest); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Sections.pdf")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Sections.pdf")) { fileOutputStream.write(result.getDocument()); } } @@ -917,7 +918,7 @@ public class RedactionIntegrationTest { RedactionResult result = redactionController.htmlTables(redactionRequest); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Tables.html")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Tables.html")) { fileOutputStream.write(result.getDocument()); } } @@ -939,7 +940,7 @@ public class RedactionIntegrationTest { RedactionResult result = redactionController.htmlTables(redactionRequest); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Tables.html")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Tables.html")) { fileOutputStream.write(result.getDocument()); } } @@ -1007,7 +1008,7 @@ public class RedactionIntegrationTest { .fileId(TEST_FILE_ID) .build()); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) { fileOutputStream.write(annotateResponse.getDocument()); } long end = System.currentTimeMillis(); @@ -1031,7 +1032,7 @@ public class RedactionIntegrationTest { .fileId(TEST_FILE_ID) .build()); - try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) { + try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Annotated.pdf")) { fileOutputStream.write(annotateResponse.getDocument()); } long end = System.currentTimeMillis(); @@ -1059,4 +1060,13 @@ public class RedactionIntegrationTest { } } + private static String getTemporaryDirectory() { + + String tmpdir = System.getProperty("java.io.tmpdir"); + if (StringUtils.isNotBlank(tmpdir)) { + return tmpdir; + } + return "/tmp"; + } + }