Reduce duplication in directory delete utils

src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD

@@ -12,38 +12,18 @@ java_binary(
     main_class = "io.bazel.rulesscala.coverage.instrumenter.JacocoInstrumenter",
     visibility = ["//visibility:public"],
     deps = [
-        ":directory_utils",
+        "//src/java/io/bazel/rulesscala/io_utils",
+        "//src/java/io/bazel/rulesscala/jar",
+        "//src/java/io/bazel/rulesscala/worker",
         "//third_party/bazel/src/main/protobuf:worker_protocol_java_proto",
         "@bazel_tools//tools/jdk:JacocoCoverage",
-        "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/jar",
-        "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/worker",
     ],
 )
 
-java_library(
-    name = "directory_utils",
-    srcs = [
-        "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/coverage/instrumenter:directory_utils_files",
-    ],
-    javacopts = [
-        "-source 1.8",
-        "-target 1.8",
-    ],
-    visibility = ["//visibility:public"],
-)
-
 filegroup(
     name = "instrumenter_files",
     srcs = [
         "JacocoInstrumenter.java",
     ],
     visibility = ["//visibility:public"],
 )
-
-filegroup(
-    name = "directory_utils_files",
-    srcs = [
-        "DirectoryUtils.java",
-    ],
-    visibility = ["//visibility:public"],
-)

src/java/io/bazel/rulesscala/coverage/instrumenter/JacocoInstrumenter.java

@@ -1,26 +1,23 @@
 package io.bazel.rulesscala.coverage.instrumenter;
 
+import io.bazel.rulesscala.io_utils.DeleteRecursively;
 import io.bazel.rulesscala.jar.JarCreator;
 import io.bazel.rulesscala.worker.Worker;
-
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
-import java.nio.file.Files;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
-import java.nio.file.FileVisitor;
 import java.nio.file.FileVisitResult;
+import java.nio.file.FileVisitor;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.StandardOpenOption;
 import java.nio.file.attribute.BasicFileAttributes;
-
 import org.jacoco.core.instr.Instrumenter;
 import org.jacoco.core.runtime.OfflineInstrumentationAccessGenerator;
 
-import static io.bazel.rulesscala.coverage.instrumenter.DirectoryUtils.deleteTempDir;
-
 public final class JacocoInstrumenter implements Worker.Interface {
 
     public static void main(String[] args) throws Exception {
@@ -83,7 +80,7 @@ private void processArg(Instrumenter jacoco, String arg) throws Exception {
             jarCreator.setCompression(true);
             jarCreator.execute();
         } finally {
-            deleteTempDir(instrumentedClassesDirectory);
+            DeleteRecursively.run(instrumentedClassesDirectory);
         }
     }
 

src/scala/io/bazel/rules_scala/tut_support/TutCompiler.scala

@@ -1,8 +1,8 @@
 package io.bazel.rules_scala.tut_support
 
+import java.nio.file.{Files, Paths}
+
 import io.bazel.rulesscala.io_utils.DeleteRecursively
-import java.io.File
-import java.nio.file.{ Files, Paths }
 import tut.TutMain
 
 object TutCompiler {
@@ -25,8 +25,8 @@ object TutCompiler {
             System.exit(1)
         }
       case many =>
-          System.err.println(s"expected one file in $mdOutput, found: $many")
-          System.exit(1)
+        System.err.println(s"expected one file in $mdOutput, found: $many")
+        System.exit(1)
     }
   }
 }

src/scala/scripts/ScroogeWorker.scala

@@ -1,14 +1,13 @@
 package scripts
 
-import io.bazel.rules_scala.scrooge_support.{ Compiler, CompilerDefaults }
+import java.io.File
+import java.nio.file.{Files, Path, Paths}
+
 import com.twitter.scrooge.backend.WithFinagle
-import io.bazel.rulesscala.jar.JarCreator
+import io.bazel.rules_scala.scrooge_support.{Compiler, CompilerDefaults}
 import io.bazel.rulesscala.io_utils.DeleteRecursively
-import java.io.{ File, PrintStream }
-import java.nio.file.{ Files, Path, Paths }
-import scala.collection.mutable.Buffer
+import io.bazel.rulesscala.jar.JarCreator
 import io.bazel.rulesscala.worker.Worker
-import scala.io.Source
 
 object ScroogeWorker extends Worker.Interface {
 
@@ -96,6 +95,6 @@ object ScroogeWorker extends Worker.Interface {
     JarCreator.buildJar(Array(jarOutput, scroogeOutput.toString))
 
     // Clean it out to be idempotent
-    dirsToDelete.foreach { deleteDir(_) }
+    dirsToDelete.foreach(deleteDir)
   }
 }

test/coverage/BUILD

@@ -77,13 +77,3 @@ scala_library(
         "D1.scala",
     ],
 )
-
-scala_test(
-    name = "directory_utils",
-    srcs = [
-        "DirectoryUtilsTest.scala",
-    ],
-    deps = [
-        "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/coverage/instrumenter:directory_utils",
-    ],
-)

test/src/main/scala/scalarules/test/io_utils/BUILD

@@ -0,0 +1,11 @@
+load("//scala:scala.bzl", "scala_library", "scala_test")
+
+scala_test(
+    name = "directory_utils",
+    srcs = [
+        "DeleteDirectoryTest.scala",
+    ],
+    deps = [
+        "@io_bazel_rules_scala//src/java/io/bazel/rulesscala/io_utils",
+    ],
+)

test/coverage/DirectoryUtilsTest.scala → test/src/main/scala/scalarules/test/io_utils/DeleteDirectoryTest.scala

@@ -1,12 +1,14 @@
-package coverage;
-import org.scalatest._
-import java.nio.file.Files
+package scalarules.test.io_utils
+
 import java.io.File
-import io.bazel.rulesscala.coverage.instrumenter.DirectoryUtils
+import java.nio.file.Files
+
+import io.bazel.rulesscala.io_utils.DeleteRecursively
+import org.scalatest._
 
-class TestAll extends FlatSpec with Matchers {
+class DeleteDirectoryTest extends FlatSpec with Matchers {
 
-  "DirectoryUtils.deleteTempDir" should "remove nested folders" in {
+  "DeleteDirectory.run" should "remove nested folders" in {
     // Arrange.
     val tempDir = Files.createTempDirectory("test-tempdir-")
 
@@ -17,7 +19,7 @@ class TestAll extends FlatSpec with Matchers {
     Files.createTempDirectory(tempDir, "ghi")
 
     // Act.
-    DirectoryUtils.deleteTempDir(tempDir)
+    DeleteRecursively.run(tempDir)
 
     // Assert.
     new File(tempDir.toUri) should not (exist)

third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/AstUsedJarFinderTest.scala

@@ -2,7 +2,7 @@ package third_party.dependency_analyzer.src.test.io.bazel.rulesscala.dependencya
 
 import java.nio.file.Files
 import java.nio.file.Path
-import io.bazel.rulesscala.io_utils.DeleteDirectory
+import io.bazel.rulesscala.io_utils.DeleteRecursively
 import org.scalatest._
 import scala.tools.nsc.reporters.StoreReporter
 import third_party.dependency_analyzer.src.main.io.bazel.rulesscala.dependencyanalyzer.DependencyTrackingMethod
@@ -21,7 +21,7 @@ class AstUsedJarFinderTest extends FunSuite {
     try {
       action(new Sandbox(tmpDir))
     } finally {
-      DeleteDirectory.delete(tmpDir)
+      DeleteRecursively.run(tmpDir)
     }
   }
 

third_party/dependency_analyzer/src/test/io/bazel/rulesscala/dependencyanalyzer/ScalacDependencyTest.scala

@@ -3,7 +3,7 @@ package third_party.dependency_analyzer.src.test.io.bazel.rulesscala.dependencya
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.UUID
-import io.bazel.rulesscala.io_utils.DeleteDirectory
+import io.bazel.rulesscala.io_utils.DeleteRecursively
 import org.scalatest._
 import third_party.utils.src.test.io.bazel.rulesscala.utils.JavaCompileUtil
 import third_party.utils.src.test.io.bazel.rulesscala.utils.TestUtil
@@ -24,7 +24,7 @@ class ScalacDependencyTest extends FunSuite {
     try {
       action(new Sandbox(tmpDir))
     } finally {
-      DeleteDirectory.delete(tmpDir)
+      DeleteRecursively.run(tmpDir)
     }
   }