away with CopyVisitor, back to lambda

Author: Strum355

lsif-java/src/main/scala/com/sourcegraph/io/CopyVisitor.scala

@@ -2,13 +2,13 @@ package com.sourcegraph.lsif_java.buildtools
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
+import java.nio.file.NoSuchFileException
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.StandardCopyOption
 
 import scala.collection.mutable.ListBuffer
 
-import com.sourcegraph.io.CopyVisitor
 import com.sourcegraph.lsif_java.Embedded
 import com.sourcegraph.lsif_java.commands.IndexCommand
 
@@ -105,10 +105,25 @@ case class GradleJavaCompiler(languageVersion: String, javacPath: Path) {
     // as well as <java-installation-path>/jre/lib in JDK <=8, else we get
     // "no class roots are found in the JDK path" from the compile{Test}Kotlin tasks.
     // https://docs.oracle.com/en/java/javase/12/migrate/index.html#JSMIG-GUID-A78CC891-701D-4549-AA4E-B8DD90228B4B
+
+    val copyFiles =
+      (source: Path, destination: Path) => {
+        Files
+          .walk(source)
+          .forEach(t => {
+            val destPath = destination.resolve(source.relativize(t))
+            try {
+              Files.copy(t, destPath)
+            } catch {
+              case _: NoSuchFileException =>
+                return
+            }
+          })
+      }
+
     val libPath = dir.resolve("lib")
-    Files.createDirectory(libPath)
     val javacLibPath = javacPath.getParent.getParent.resolve("lib")
-    Files.walkFileTree(javacLibPath, new CopyVisitor(javacLibPath, libPath))
+    copyFiles(javacLibPath, libPath)
 
     if (languageVersion == "8") {
       val jreLibPath = dir.resolve("jre").resolve("lib")
@@ -119,10 +134,7 @@ case class GradleJavaCompiler(languageVersion: String, javacPath: Path) {
         .resolve("jre")
         .resolve("lib")
 
-      Files.walkFileTree(
-        javacJreLibPath,
-        new CopyVisitor(javacJreLibPath, jreLibPath)
-      )
+      copyFiles(javacJreLibPath, jreLibPath)
     }
   }
 }

lsif-java/src/main/scala/com/sourcegraph/lsif_java/buildtools/GradleJavaCompiler.scala

@@ -289,7 +289,7 @@ class GradleBuildToolSuite extends BaseBuildToolSuite {
 
   List("8", "11").foreach { version =>
     checkBuild(
-      "kotlin-jvm-toolchains",
+      s"kotlin-jvm-toolchains-jdk-$version",
       s"""|/build.gradle
           |plugins {
           |    id 'java'