From 51e9098be1b4bd277a27d26b2121482c267dbf22 Mon Sep 17 00:00:00 2001 From: Chris Llanwarne Date: Mon, 13 Feb 2017 15:05:07 -0500 Subject: [PATCH] new wdl4s dependency --- build.sbt | 2 +- src/main/scala/wdltool/GraphPrint.scala | 3 ++- src/main/scala/wdltool/Main.scala | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 7c2483c..76d358a 100644 --- a/build.sbt +++ b/build.sbt @@ -34,7 +34,7 @@ resolvers ++= Seq( ) libraryDependencies ++= Seq( - "org.broadinstitute" %% "wdl4s" % "0.8", + "org.broadinstitute" %% "wdl4s" % "0.10-ae6c153-SNAP", //---------- Test libraries -------------------// "org.scalatest" %% "scalatest" % "2.2.5" % Test ) diff --git a/src/main/scala/wdltool/GraphPrint.scala b/src/main/scala/wdltool/GraphPrint.scala index 9587468..6bb12ff 100644 --- a/src/main/scala/wdltool/GraphPrint.scala +++ b/src/main/scala/wdltool/GraphPrint.scala @@ -10,7 +10,8 @@ object GraphPrint { case class WorkflowDigraph(workflowName: String, digraph: Set[String]) def generateWorkflowDigraph(file: String, allNodesMode: Boolean): WorkflowDigraph = { - val namespace = WdlNamespaceWithWorkflow.load(Files.readAllLines(Paths.get(file)).asScala.mkString(System.lineSeparator()), Seq(WdlNamespace.fileResolver _)) + // It's ok to use .get here, we're happy to throw an exception and crash the program! + val namespace = WdlNamespaceWithWorkflow.load(Files.readAllLines(Paths.get(file)).asScala.mkString(System.lineSeparator()), Seq(WdlNamespace.fileResolver _)).get val digraph = if (allNodesMode) { listAllGraphNodes(namespace) diff --git a/src/main/scala/wdltool/Main.scala b/src/main/scala/wdltool/Main.scala index 04b9854..28bdaef 100644 --- a/src/main/scala/wdltool/Main.scala +++ b/src/main/scala/wdltool/Main.scala @@ -94,7 +94,7 @@ object Main extends App { private[this] def continueIf(valid: => Boolean)(block: => Termination): Termination = if (valid) block else BadUsageTermination private[this] def loadWdl(path: String)(f: WdlNamespace => Termination): Termination = { - Try(WdlNamespace.loadUsingPath(Paths.get(path), None, None)) match { + WdlNamespace.loadUsingPath(Paths.get(path), None, None) match { case Success(namespace) => f(namespace) case Failure(t) => UnsuccessfulTermination(t.getMessage) }