. r Moving internal .logging

Author: ScottBob

approvaltests-tests/src/test/java/org/approvaltests/ApprovedFileLogTest.java

@@ -1,6 +1,7 @@
 package org.approvaltests;
 
 import com.spun.util.io.FileUtils;
+import org.approvaltests.internal.logs.ApprovedFileLog;
 import org.approvaltests.namer.ApprovalNamer;
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;

approvaltests/src/main/java/org/approvaltests/approvers/FileApprover.java

@@ -2,8 +2,8 @@
 
 import com.spun.util.ObjectUtils;
 import com.spun.util.io.FileUtils;
-import org.approvaltests.ApprovedFileLog;
-import org.approvaltests.FailedFileLog;
+import org.approvaltests.internal.logs.ApprovedFileLog;
+import org.approvaltests.internal.logs.FailedFileLog;
 import org.approvaltests.core.ApprovalFailureReporter;
 import org.approvaltests.core.ApprovalReporterWithCleanUp;
 import org.approvaltests.core.ApprovalWriter;

approvaltests/src/main/java/org/approvaltests/ApprovedFileLog.java renamed to approvaltests/src/main/java/org/approvaltests/internal/logs/ApprovedFileLog.java

@@ -1,19 +1,18 @@
-package org.approvaltests;
+package org.approvaltests.internal.logs;
 
 import com.spun.util.io.FileUtils;
 
 import java.io.File;
 
 public class ApprovedFileLog
 {
-  public static final String APPROVAL_TEMP_DIRECTORY = ".approval_tests_temp";
   static
   {
     FileUtils.writeFile(get(), "");
   }
   public static File get()
   {
-    File file = new File(APPROVAL_TEMP_DIRECTORY + "/.approved_files.log");
+    File file = new File(LoggingUtils.APPROVAL_TEMP_DIRECTORY + "/.approved_files.log");
     FileUtils.createIfNeeded(file.getAbsolutePath());
     return file;
   }

approvaltests/src/main/java/org/approvaltests/FailedFileLog.java renamed to approvaltests/src/main/java/org/approvaltests/internal/logs/FailedFileLog.java

@@ -1,12 +1,10 @@
-package org.approvaltests;
+package org.approvaltests.internal.logs;
 
-import com.spun.util.SystemUtils;
 import com.spun.util.io.FileUtils;
-import com.spun.util.io.NetUtils;
 
 import java.io.File;
 
-import static org.approvaltests.ApprovedFileLog.APPROVAL_TEMP_DIRECTORY;
+import static org.approvaltests.internal.logs.LoggingUtils.APPROVAL_TEMP_DIRECTORY;
 
 public class FailedFileLog
 {
@@ -20,22 +18,8 @@ private static void downloadApproveAllScriptIfMissing()
     if (downloadedScriptCheck)
     { return; }
     downloadedScriptCheck = true;
-    try
-    {
-      String extension = SystemUtils.isWindowsEnvironment() ? ".bat" : ".sh";
-      File script = new File(APPROVAL_TEMP_DIRECTORY + "/approve_all" + extension);
-      if (!script.exists())
-      {
-        String github = "https://raw.githubusercontent.com/approvals/ApprovalTests.Java/refs/heads/master/";
-        String file = "resources/approve_all" + extension;
-        FileUtils.writeFile(script, NetUtils.loadWebPage(github + file, null));
-        script.setExecutable(true);
-      }
-    }
-    catch (Exception e)
-    {
-      // do nothing
-    }
+    String scriptName = "approve_all";
+    LoggingUtils.downloadScriptIfMissing(scriptName);
   }
   public static File get()
   {

approvaltests/src/main/java/org/approvaltests/internal/logs/LoggingUtils.java

@@ -0,0 +1,31 @@
+package org.approvaltests.internal.logs;
+
+import com.spun.util.SystemUtils;
+import com.spun.util.io.FileUtils;
+import com.spun.util.io.NetUtils;
+
+import java.io.File;
+
+public class LoggingUtils
+{
+  public static final String APPROVAL_TEMP_DIRECTORY = ".approval_tests_temp";
+  public static void downloadScriptIfMissing(String scriptName)
+  {
+    try
+    {
+      String extension = SystemUtils.isWindowsEnvironment() ? ".bat" : ".sh";
+      File script = new File(APPROVAL_TEMP_DIRECTORY + "/" + scriptName + extension);
+      if (!script.exists())
+      {
+        String github = "https://raw.githubusercontent.com/approvals/ApprovalTests.Java/refs/heads/master/";
+        String file = "resources/" + scriptName + extension;
+        FileUtils.writeFile(script, NetUtils.loadWebPage(github + file, null));
+        script.setExecutable(true);
+      }
+    }
+    catch (Exception e)
+    {
+      // do nothing
+    }
+  }
+}

approvaltests/src/main/java/org/approvaltests/reporters/ReporterThatCreatesAnApprovalScript.java

@@ -3,8 +3,8 @@
 import com.spun.util.SystemUtils;
 import com.spun.util.io.FileUtils;
 import com.spun.util.logger.SimpleLogger;
-import org.approvaltests.ApprovedFileLog;
 import org.approvaltests.core.ApprovalFailureReporter;
+import org.approvaltests.internal.logs.LoggingUtils;
 
 import java.io.File;
 
@@ -32,14 +32,14 @@ private static void initializeFile()
   }
   private static void initializeLinux()
   {
-    scriptFile = new File(ApprovedFileLog.APPROVAL_TEMP_DIRECTORY + "/" + fileName + ".sh");
+    scriptFile = new File(LoggingUtils.APPROVAL_TEMP_DIRECTORY + "/" + fileName + ".sh");
     FileUtils.createIfNeeded(scriptFile.getAbsolutePath());
     FileUtils.writeFile(scriptFile, "#!/bin/bash\n");
     scriptFile.setExecutable(true);
   }
   private static void initializeWindows()
   {
-    scriptFile = new File(ApprovedFileLog.APPROVAL_TEMP_DIRECTORY + "\\" + fileName + ".bat");
+    scriptFile = new File(LoggingUtils.APPROVAL_TEMP_DIRECTORY + "\\" + fileName + ".bat");
     FileUtils.createIfNeeded(scriptFile.getAbsolutePath());
     FileUtils.writeFile(scriptFile, "");
   }