Remodeled towards a blocking HTTP call. Makes sense for the CLI actually.

Author: bhermann

src/main/scala/de/upb/cs/swt/delphi/cli/BlockingHttpClient.scala

@@ -0,0 +1,40 @@
+package de.upb.cs.swt.delphi.cli
+
+import akka.actor.ActorSystem
+import akka.http.scaladsl.Http
+import akka.http.scaladsl.model.{HttpMethods, HttpRequest, HttpResponse, Uri}
+import akka.stream.{ActorMaterializer, ActorMaterializerSettings}
+import akka.util.ByteString
+
+import scala.concurrent.{Await, Future}
+import scala.concurrent.duration.Duration
+import scala.util.{Failure, Success, Try}
+
+/**
+  * Created by benhermann on 12.02.18.
+  */
+object BlockingHttpClient {
+
+  def doGet(uri : Uri) : Try[String] = {
+    implicit val system = ActorSystem()
+    implicit val executionContext = system.dispatcher
+    implicit val materializer: ActorMaterializer = ActorMaterializer(ActorMaterializerSettings(system))
+
+    try {
+      val req: Future[HttpResponse] = Http(system).singleRequest(HttpRequest(method = HttpMethods.GET, uri = uri))
+      Await.result(req, Duration.Inf)
+
+      val f = req.value.get.get.entity.dataBytes.runFold(ByteString(""))(_ ++ _)
+      Await.result(f, Duration.Inf)
+
+      Success(f.value.get.get.utf8String)
+    } catch  {
+      case e : Exception => Failure(e)
+    } finally {
+      system.terminate()
+    }
+
+  }
+
+}
+

src/main/scala/de/upb/cs/swt/delphi/cli/TestCommand.scala

@@ -15,31 +15,17 @@ import scala.util.{Failure, Success}
 object TestCommand extends Command {
   override def execute(config: Config): Unit = {
 
-    implicit val system = ActorSystem()
-    implicit val executionContext = system.dispatcher
-    implicit val materializer: ActorMaterializer = ActorMaterializer(ActorMaterializerSettings(system))
-
     val uri = Uri(config.server)
     println(s"Contacting server ${uri}...")
-    val resp = Http().singleRequest(HttpRequest(uri = uri.withPath(uri.path + "/version")))
+    val resp = BlockingHttpClient.doGet(uri.withPath(uri.path + "/version"))
 
-    resp.onComplete {
-      case Success(res) =>
-        res.status match {
-           case x if x.isSuccess() => {
-             res.entity.dataBytes.runFold(ByteString(""))(_ ++ _).foreach { body =>
-               println("Successfully contacted Delphi server. ")
-               println("Server version: " + body.utf8String)
-             } }
-             case _ => {
-               println(s"Could not validate server ${config.server}. Error: ${res.status}.")
-             }
-           }
-        system.terminate()
+    resp match {
+      case Success(res) => {
+        println("Successfully contacted Delphi server. ")
+        println("Server version: " + res)
+      }
       case Failure(_) => {
         println(s"Could not reach server ${config.server}.")
-
-        system.terminate()
       }
     }