Reduce duplication in directory delete utils

liucijus · liucijus · commit 5fab80bd7064 · 2020-09-21T09:54:29.000+03:00
diff --git a/src/java/io/bazel/rulesscala/coverage/instrumenter/BUILD b/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"],
-)
diff --git a/src/java/io/bazel/rulesscala/coverage/instrumenter/DirectoryUtils.java b/src/java/io/bazel/rulesscala/coverage/instrumenter/DirectoryUtils.java
diff --git a/src/java/io/bazel/rulesscala/coverage/instrumenter/JacocoInstrumenter.java b/src/java/io/bazel/rulesscala/coverage/instrumenter/JacocoInstrumenter.java
@@ -1,5 +1,7 @@
 package io.bazel.rulesscala.coverage.instrumenter;
 
+import static io.bazel.rulesscala.io_utils.DeleteDirectory.delete;
+
 import io.bazel.rulesscala.jar.JarCreator;
 import io.bazel.rulesscala.worker.Worker;
 
@@ -19,8 +21,6 @@
 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 +83,7 @@ private void processArg(Instrumenter jacoco, String arg) throws Exception {
             jarCreator.setCompression(true);
             jarCreator.execute();
         } finally {
-            deleteTempDir(instrumentedClassesDirectory);
+            delete(instrumentedClassesDirectory);
         }
     }
 
diff --git a/src/java/io/bazel/rulesscala/io_utils/DeleteRecursively.java b/src/java/io/bazel/rulesscala/io_utils/DeleteRecursively.java
diff --git a/src/scala/io/bazel/rules_scala/tut_support/TutCompiler.scala b/src/scala/io/bazel/rules_scala/tut_support/TutCompiler.scala
@@ -1,8 +1,8 @@
 package io.bazel.rules_scala.tut_support
 
-import io.bazel.rulesscala.io_utils.DeleteRecursively
-import java.io.File
-import java.nio.file.{ Files, Paths }
+import java.nio.file.{Files, Paths}
+
+import io.bazel.rulesscala.io_utils.DeleteDirectory
 import tut.TutMain
 
 object TutCompiler {
@@ -16,7 +16,7 @@ object TutCompiler {
       case List(path) =>
         try {
           Files.copy(path.toPath, Paths.get(outfile))
-          DeleteRecursively.run(mdOutput)
+          DeleteDirectory.delete(mdOutput)
           println(s"wrote: $outfile")
         }
         catch {
@@ -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)
     }
   }
 }
diff --git a/src/scala/scripts/ScalaPBWorker.scala b/src/scala/scripts/ScalaPBWorker.scala
@@ -3,7 +3,7 @@ package scripts
 import java.net.URLClassLoader
 import java.nio.file.Path
 
-import io.bazel.rulesscala.io_utils.DeleteRecursively
+import io.bazel.rulesscala.io_utils.DeleteDirectory
 import io.bazel.rulesscala.jar.JarCreator
 import io.bazel.rulesscala.worker.Worker
 import protocbridge.{ProtocBridge, ProtocCodeGenerator}
@@ -14,7 +14,7 @@ object ScalaPBWorker extends Worker.Interface {
   def main(args: Array[String]): Unit = Worker.workerMain(args, ScalaPBWorker)
 
   def deleteDir(path: Path): Unit =
-    try DeleteRecursively.run(path)
+    try DeleteDirectory.delete(path)
     catch {
       case e: Exception => sys.error(s"Problem while deleting path [$path], e.getMessage= ${e.getMessage}")
     }
diff --git a/src/scala/scripts/ScroogeWorker.scala b/src/scala/scripts/ScroogeWorker.scala
@@ -1,21 +1,20 @@
 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.rules_scala.scrooge_support.{Compiler, CompilerDefaults}
+import io.bazel.rulesscala.io_utils.DeleteDirectory
 import io.bazel.rulesscala.jar.JarCreator
-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.worker.Worker
-import scala.io.Source
 
 object ScroogeWorker extends Worker.Interface {
 
   def main(args: Array[String]): Unit = Worker.workerMain(args, ScroogeWorker)
 
   def deleteDir(path: Path): Unit =
-    try DeleteRecursively.run(path)
+    try DeleteDirectory.delete(path)
     catch {
       case e: Exception => ()
     }
@@ -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)
   }
 }
diff --git a/test/coverage/BUILD b/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",
-    ],
-)
diff --git a/test/src/main/scala/scalarules/test/io_utils/BUILD b/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",
+    ],
+)
diff --git a/test/src/main/scala/scalarules/test/io_utils/DeleteDirectoryTest.scala b/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.DeleteDirectory
+import org.scalatest._
 
-class TestAll extends FlatSpec with Matchers {
+class DeleteDirectoryTest extends FlatSpec with Matchers {
 
-  "DirectoryUtils.deleteTempDir" should "remove nested folders" in {
+  "DeleteDirectory.delete" 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)
+    DeleteDirectory.delete(tempDir)
 
     // Assert.
     new File(tempDir.toUri) should not (exist)

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package io.bazel.rules_scala.tut_support`
`2`	`2`
`3`		`-import io.bazel.rulesscala.io_utils.DeleteRecursively`
`4`		`-import java.io.File`
`5`		`-import java.nio.file.{ Files, Paths }`
	`3`	`+import java.nio.file.{Files, Paths}`
	`4`	`+`
	`5`	`+import io.bazel.rulesscala.io_utils.DeleteDirectory`
`6`	`6`	`import tut.TutMain`
`7`	`7`
`8`	`8`	`object TutCompiler {`
`@@ -16,7 +16,7 @@ object TutCompiler {`
`16`	`16`	`case List(path) =>`
`17`	`17`	`try {`
`18`	`18`	`Files.copy(path.toPath, Paths.get(outfile))`
`19`		`- DeleteRecursively.run(mdOutput)`
	`19`	`+ DeleteDirectory.delete(mdOutput)`
`20`	`20`	`println(s"wrote: $outfile")`
`21`	`21`	`}`
`22`	`22`	`catch {`
`@@ -25,8 +25,8 @@ object TutCompiler {`
`25`	`25`	`System.exit(1)`
`26`	`26`	`}`
`27`	`27`	`case many =>`
`28`		`- System.err.println(s"expected one file in $mdOutput, found: $many")`
`29`		`- System.exit(1)`
	`28`	`+ System.err.println(s"expected one file in $mdOutput, found: $many")`
	`29`	`+ System.exit(1)`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`