[daffodil-vscode] branch main updated: Support Java 8

[sl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-vscode.git


The following commit(s) were added to refs/heads/main by this push:
     new 96a30df  Support Java 8
96a30df is described below

commit 96a30df51cc51a01b5b766a25112d9e23b2abbed
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Thu Jan 20 10:58:35 2022 -0500

    Support Java 8
    
    Closes #16
---
 .../src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala  | 3 ++-
 .../src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala    | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/core/src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala b/server/core/src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala
index 2726f24..d661ae2 100644
--- a/server/core/src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala
+++ b/server/core/src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala
@@ -34,6 +34,7 @@ import fs2.concurrent.Signal
 import java.io._
 import java.net._
 import java.nio.file.Path
+import java.nio.file.Paths
 import org.typelevel.log4cats.Logger
 import org.typelevel.log4cats.slf4j.Slf4jLogger
 
@@ -249,7 +250,7 @@ class DAPodil(
       case DAPodil.State.Launched(debugee) =>
         for {
           _ <- debugee.setBreakpoints(
-            Path.of(args.source.path).toUri(),
+            Paths.get(args.source.path).toUri(),
             args.breakpoints.toList.map(bp => DAPodil.Line(bp.line))
           )
           breakpoints = args.breakpoints.toList.zipWithIndex.map {
diff --git a/server/core/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala b/server/core/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
index caf0ffc..3b18b76 100644
--- a/server/core/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
+++ b/server/core/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
@@ -32,6 +32,7 @@ import fs2.io.file.Files
 import java.io._
 import java.net.URI
 import java.nio.file._
+import org.apache.commons.io.FileUtils
 import org.apache.daffodil.debugger.dap.{BuildInfo => DAPBuildInfo}
 import org.apache.daffodil.debugger.Debugger
 import org.apache.daffodil.exceptions.SchemaFileLocation
@@ -159,7 +160,7 @@ object Parse {
         infosetOutput: LaunchArgs.InfosetOutput
     ) extends Arguments {
       def data: IO[InputStream] =
-        IO.blocking(new FileInputStream(dataPath.toFile).readAllBytes())
+        IO.blocking(FileUtils.readFileToByteArray(dataPath.toFile))
           .map(new ByteArrayInputStream(_))
     }
 
@@ -228,8 +229,8 @@ object Parse {
     }
   }
 
-  val infosetSource = DAPodil.Source(Path.of("infoset"), Some(DAPodil.Source.Ref(1)))
-  val dataDumpSource = DAPodil.Source(Path.of("data"), Some(DAPodil.Source.Ref(2)))
+  val infosetSource = DAPodil.Source(Paths.get("infoset"), Some(DAPodil.Source.Ref(1)))
+  val dataDumpSource = DAPodil.Source(Paths.get("data"), Some(DAPodil.Source.Ref(2)))
 
   def debugee(request: Request): EitherNel[String, Resource[IO, DAPodil.Debugee]] =
     Debugee.LaunchArgs.parse(request.arguments).map(debugee)