From 74a1715e9c1321fff7d0169f119a055968c951a5 Mon Sep 17 00:00:00 2001
From: Philipp Schramm <Philipp.Schramm@iqser.com>
Date: Thu, 16 Dec 2021 15:10:13 +0100
Subject: [PATCH] Refactored and fixed getting temporary directory for
 different OS

---
 .../RedactionReportIntegrationTest.java       | 11 +---------
 .../StatusReportGenerationServiceTest.java    | 10 +--------
 .../report/v1/server/utils/OsUtils.java       | 22 +++++++++++++++++++
 3 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/utils/OsUtils.java

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 20c4e01..d702dab 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
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.report.v1.server;
 
 import static com.iqser.red.service.redaction.report.v1.server.service.PlaceholderService.FORMAT_DATE_ENG;
+import static com.iqser.red.service.redaction.report.v1.server.utils.OsUtils.getTemporaryDirectory;
 import static org.mockito.Mockito.when;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
@@ -12,13 +13,11 @@ import java.util.Arrays;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ListIterator;
 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;
@@ -472,12 +471,4 @@ public class RedactionReportIntegrationTest {
     }
 
 
-    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 83cb19c..c9458d7 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
@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.report.v1.server.service;
 
+import static com.iqser.red.service.redaction.report.v1.server.utils.OsUtils.getTemporaryDirectory;
 import static org.mockito.Mockito.when;
 
 import java.io.FileOutputStream;
@@ -9,7 +10,6 @@ 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;
@@ -85,12 +85,4 @@ public class StatusReportGenerationServiceTest {
 
     }
 
-    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
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/utils/OsUtils.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/utils/OsUtils.java
new file mode 100644
index 0000000..2b3848b
--- /dev/null
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/utils/OsUtils.java
@@ -0,0 +1,22 @@
+package com.iqser.red.service.redaction.report.v1.server.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class OsUtils {
+
+    public static boolean isWindows() {
+
+        return StringUtils.containsIgnoreCase(System.getProperty("os.name"), "Windows");
+    }
+
+
+    public static String getTemporaryDirectory() {
+
+        String tmpdir = System.getProperty("java.io.tmpdir");
+        if (isWindows() && StringUtils.isNotBlank(tmpdir)) {
+            return tmpdir;
+        }
+        return "/tmp";
+    }
+
+}