Implementing codacy suggestions

Author: Hariharan Ramanathan

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

@@ -16,6 +16,7 @@
 
 package de.upb.cs.swt.delphi.cli
 
+import com.softwaremill.sttp._
 import de.upb.cs.swt.delphi.cli.commands._
 
 /**
@@ -38,8 +39,6 @@ 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/RetrieveCommand.scala

@@ -19,6 +19,7 @@ package de.upb.cs.swt.delphi.cli.commands
 import com.softwaremill.sttp.{Id, SttpBackend}
 import de.upb.cs.swt.delphi.cli._
 import de.upb.cs.swt.delphi.cli.artifacts.RetrieveResult
+import de.upb.cs.swt.delphi.cli.artifacts.SearchResultJson._
 import spray.json._
 
 import scala.io.Source
@@ -55,7 +56,6 @@ object RetrieveCommand extends Command {
         reportResult.apply(s)
       }
       if (!config.raw || !config.csv.equals("")) {
-        import artifacts.SearchResultJson._
 
         //TODO: Direct convertTo[List[RetrieveResult]] not working ???
 

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

@@ -1,4 +1,4 @@
-// Copyright (C) 2018 The Delphi Team.
+  // Copyright (C) 2018 The Delphi Team.
 // See the LICENCE file distributed with this work for additional
 // information regarding copyright ownership.
 //
@@ -20,16 +20,17 @@ import java.util.concurrent.TimeUnit
 
 import com.softwaremill.sttp._
 import com.softwaremill.sttp.sprayJson._
+import de.upb.cs.swt.delphi.cli.Config
 import de.upb.cs.swt.delphi.cli.artifacts.SearchResult
-import de.upb.cs.swt.delphi.cli.{Config, artifacts}
+import de.upb.cs.swt.delphi.cli.artifacts.SearchResultJson._
 import spray.json._
 
 import scala.concurrent.duration._
 
 object SearchCommand extends Command with DefaultJsonProtocol{
 
   val searchTimeout = 10.seconds
-  val TIMEOUT_CODE = 408
+  val timeoutCode = 408
 
   /**
     * Executes the command implementation
@@ -61,15 +62,14 @@ object SearchCommand extends Command with DefaultJsonProtocol{
     val end = System.nanoTime()
     val took = (end - start).nanos
 
-    if (res.code == TIMEOUT_CODE) {
+    if (res.code == timeoutCode) {
 
       error.apply(s"The query timed out after   ${took.toSeconds} seconds. " +
         "To set a longer timeout, use the --timeout option.")
     }
     val resStr = res.body match {
       case Left(v) =>
         error.apply(s"Search request failed \n $v")
-        println(v)
         None
       case Right(v) =>
         Some(v)
@@ -83,7 +83,6 @@ object SearchCommand extends Command with DefaultJsonProtocol{
       reportResult.apply(res)
     }
     if (!(config.raw || res.equals("")) || !config.csv.equals("")) {
-      import artifacts.SearchResultJson._
       val jsonArr = res.parseJson.asInstanceOf[JsArray].elements
       val retrieveResults = jsonArr.map(r => r.convertTo[SearchResult]).toList
       onProperSearchResults(retrieveResults)