Fixing encoded url issue for retrieve command

Author: Hariharan Ramanathan

build.sbt

@@ -1,6 +1,6 @@
 scalaVersion := "2.12.4"
 
-name := "delphi"
+name := "delphi-cli"
 version := "1.0.0-SNAPSHOT"
 maintainer := "Ben Hermann <[email protected]>"
 
@@ -28,10 +28,12 @@ libraryDependencies += "de.vandermeer" % "asciitable" % "0.3.2"
 libraryDependencies += "com.lihaoyi" %% "fansi" % "0.2.5"
 libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
 libraryDependencies += "au.com.bytecode" % "opencsv" % "2.4"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.4" % "test"
 
-
-libraryDependencies += "com.softwaremill.sttp" %% "core" % "1.5.4"
-
+libraryDependencies ++= Seq(
+  "com.softwaremill.sttp" %% "core" % "1.5.4",
+  "com.softwaremill.sttp" %% "spray-json" % "1.5.4"
+)
 
 
 debianPackageDependencies := Seq("java8-runtime-headless")
@@ -45,7 +47,7 @@ lazy val cli = (project in file(".")).
   enablePlugins(WindowsPlugin).
   enablePlugins(GraalVMNativeImagePlugin).
   settings(
-    graalVMNativeImageOptions++=Seq(
+    graalVMNativeImageOptions ++= Seq(
       "--enable-https",
       "--enable-http",
       "--enable-all-security-services",

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

@@ -16,7 +16,6 @@
 
 package de.upb.cs.swt.delphi.cli
 
-import com.softwaremill.sttp.{HttpURLConnectionBackend, Id, SttpBackend}
 import de.upb.cs.swt.delphi.cli.commands._
 
 /**
@@ -39,6 +38,9 @@ object DelphiCLI {
     cliParser.parse(args, Config()) match {
       case Some(c) =>
 
+        import com.softwaremill.sttp._
+        import scala.concurrent.duration._
+
         implicit val config: Config = c
         implicit val backend: SttpBackend[Id, Nothing] = HttpURLConnectionBackend()
 

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

@@ -33,16 +33,18 @@ trait Command {
 
 
   /**
-    * Generic http GET request
+    * Http GET request template
     *
     * @param target     Sub url in delphi server
     * @param parameters Query params
     * @return GET response
     */
-  protected def executeGet(target: String, parameters: Map[String, String] = Map())
+  protected def executeGet(paths: Seq[String], parameters: Map[String, String] = Map())
                           (implicit config: Config, backend: SttpBackend[Id, Nothing]): Option[String] = {
-
-    val request = sttp.get(uri"${config.server}/$target?$parameters")
+    val serverUrl = uri"${config.server}"
+    val oldPath = serverUrl.path
+    val reqUrl = serverUrl.path(oldPath ++ paths).params(parameters)
+    val request = sttp.get(reqUrl)
     config.consoleOutput.outputInformation(s"Sending request ${request.uri}")
     val response = request.send()
     response.body match {

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

@@ -45,8 +45,9 @@ object RetrieveCommand extends Command with DefaultJsonProtocol {
       }
     }
 
+    println(config.id)
     val result = executeGet(
-      s"retrieve/$checkTarget",
+      Seq("retrieve", checkTarget),
       Map("pretty" -> "")
     )
 
@@ -57,7 +58,8 @@ object RetrieveCommand extends Command with DefaultJsonProtocol {
       if (!config.raw || !config.csv.equals("")) {
         import artifacts.SearchResultJson._
 
-        //TODO:  convertTo[List[RetrieveResult]] not working ???
+        //TODO: Direct convertTo[List[RetrieveResult]] not working ???
+
 
         val jsonArr = s.parseJson.asInstanceOf[JsArray].elements
         val retrieveResults = jsonArr.map(r => r.convertTo[RetrieveResult])
@@ -69,31 +71,6 @@ object RetrieveCommand extends Command with DefaultJsonProtocol {
           information.apply("Results written to file '" + config.csv + "'")
         }
       }
-
-
     })
   }
 }
-
-/* if (!config.raw || !config.csv.equals("")) {
-      val unmarshalledFuture = Unmarshal(s).to[List[RetrieveResult]]
-
-      unmarshalledFuture.transform {
-        case Success(unmarshalled) => {
-          val unmarshalled = Await.result(unmarshalledFuture, Duration.Inf)
-          success.apply(s"Found ${unmarshalled.size} item(s).")
-          reportResult.apply(unmarshalled)
-
-          if (!config.csv.equals("")) {
-            exportResult.apply(unmarshalled)
-            information.apply("Results written to file '" + config.csv + "'")
-          }
-
-          Success(unmarshalled)
-        }
-        case Failure(e) => {
-          error.apply(s)
-          Failure(e)
-        }
-      }
-    }*/

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

@@ -24,8 +24,8 @@ import de.upb.cs.swt.delphi.cli.Config
   * Tries to connect to the Delphi server and reports on the results of the version call.
   */
 object TestCommand extends Command {
-  override def execute(implicit config: Config,backend: SttpBackend[Id, Nothing]): Unit = {
-    executeGet("version")
+  override def execute(implicit config: Config, backend: SttpBackend[Id, Nothing]): Unit = {
+    executeGet(Seq("version"))
       .foreach(s => {
         success.apply("Successfully contacted Delphi server. ")
         information.apply("Server version: " + s)