Fixed error handling

Author: bhermann

src/main/scala/de/upb/cs/swt/delphi/cli/commands/RetrieveCommand.scala

@@ -21,9 +21,8 @@ import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
 import akka.http.scaladsl.unmarshalling.Unmarshal
 import akka.stream.ActorMaterializer
 import de.upb.cs.swt.delphi.cli.Config
-import de.upb.cs.swt.delphi.cli.artifacts.{RetrieveResult, SearchResult}
+import de.upb.cs.swt.delphi.cli.artifacts.RetrieveResult
 import de.upb.cs.swt.delphi.cli.artifacts.SearchResultJson._
-import de.upb.cs.swt.delphi.cli.commands.SearchCommand.{error, information, reportResult}
 import spray.json.DefaultJsonProtocol
 
 import scala.concurrent.Await
@@ -38,7 +37,7 @@ import scala.util.{Failure, Success}
 object RetrieveCommand extends Command with SprayJsonSupport with DefaultJsonProtocol {
 
 
-  override def execute(config: Config)(implicit system : ActorSystem): Unit = {
+  override def execute(config: Config)(implicit system: ActorSystem): Unit = {
     implicit val ec = system.dispatcher
     implicit val materializer = ActorMaterializer()
 
@@ -54,6 +53,7 @@ object RetrieveCommand extends Command with SprayJsonSupport with DefaultJsonPro
         config.id
       }
     }
+
     val result = executeGet(
       s"/retrieve/$checkTarget",
       Map("pretty" -> "")
@@ -65,18 +65,19 @@ object RetrieveCommand extends Command with SprayJsonSupport with DefaultJsonPro
       } else {
         val unmarshalledFuture = Unmarshal(s).to[List[RetrieveResult]]
 
-        unmarshalledFuture.onComplete {
+        unmarshalledFuture.transform {
+          case Success(unmarshalled) => {
+            val unmarshalled = Await.result(unmarshalledFuture, Duration.Inf)
+            success(config)(s"Found ${unmarshalled.size} item(s).")
+            reportResult(config)(unmarshalled)
+
+            Success(unmarshalled)
+          }
           case Failure(e) => {
             error(config)(s)
+            Failure(e)
           }
-          case _ =>
         }
-
-        val unmarshalled = Await.result(unmarshalledFuture, Duration.Inf)
-        success(config)(s"Found ${unmarshalled.size} item(s).")
-        reportResult(config)(unmarshalled)
-
-        Await.ready(unmarshalledFuture, Duration.Inf)
       }
     })
   }

src/main/scala/de/upb/cs/swt/delphi/cli/commands/SearchCommand.scala

@@ -16,7 +16,6 @@
 
 package de.upb.cs.swt.delphi.cli.commands
 
-
 import java.util.concurrent.TimeUnit
 
 import akka.actor.ActorSystem
@@ -34,7 +33,7 @@ import spray.json.DefaultJsonProtocol
 
 import scala.concurrent.duration._
 import scala.concurrent.{Await, Future}
-import scala.util.Failure
+import scala.util.{Failure, Success}
 
 object SearchCommand extends Command with SprayJsonSupport with DefaultJsonProtocol {
   /**
@@ -50,8 +49,8 @@ object SearchCommand extends Command with SprayJsonSupport with DefaultJsonProto
 
     information(config)(s"Searching for artifacts matching ${'"'}$query${'"'}.")
     val start = System.nanoTime()
-    implicit val queryFormat = jsonFormat2(Query)
 
+    implicit val queryFormat = jsonFormat2(Query)
     val baseUri = Uri(config.server)
     val prettyParam = Map("pretty" -> "")
     val searchUri = baseUri.withPath(baseUri.path + "/search").withQuery(akka.http.scaladsl.model.Uri.Query(prettyParam))
@@ -79,33 +78,36 @@ object SearchCommand extends Command with SprayJsonSupport with DefaultJsonProto
     if (config.raw || result.equals("")) {
       reportResult(config)(result)
     } else {
-
       val unmarshalledFuture = Unmarshal(result).to[List[SearchResult]]
 
-      unmarshalledFuture.onComplete {
+      val processFuture = unmarshalledFuture.transform {
+        case Success(unmarshalled) => {
+          processResults(config, unmarshalled, took)
+          Success(unmarshalled)
+        }
         case Failure(e) => {
           error(config)(result)
+          Failure(e)
         }
-        case _ =>
       }
+    }
+  }
 
-      val unmarshalled = Await.result(unmarshalledFuture, Duration.Inf)
-      val capMessage = {
-        config.limit match {
-          case Some(limit) if (limit <= unmarshalled.size)
-          => s"Results may be capped by result limit set to $limit."
-          case None if (unmarshalled.size >= 50)
-          => "Results may be capped by default limit of 50 returned results. Use --limit to extend the result set."
-          case _
-          => ""
-        }
+  private def processResults(config: Config, results: List[SearchResult], queryRuntime: Double) = {
+    val capMessage = {
+      config.limit match {
+        case Some(limit) if (limit <= results.size)
+        => s"Results may be capped by result limit set to $limit."
+        case None if (results.size >= 50)
+        => "Results may be capped by default limit of 50 returned results. Use --limit to extend the result set."
+        case _
+        => ""
       }
-      success(config)(s"Found ${unmarshalled.size} item(s). $capMessage")
-      reportResult(config)(unmarshalled)
-
-
-      information(config)(f"Query took $took%.2fs.")
     }
+    success(config)(s"Found ${results.size} item(s). $capMessage")
+    reportResult(config)(results)
+
+    information(config)(f"Query took $queryRuntime%.2fs.")
   }
 
   case class Query(query: String,