Fixing code style issues.

Author: sideresearch

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

@@ -20,11 +20,7 @@ import java.io.{BufferedWriter, FileWriter}
 
 import de.upb.cs.swt.delphi.cli.artifacts.Result
 import au.com.bytecode.opencsv.CSVWriter
-import de.upb.cs.swt.delphi.cli.commands.SearchCommand.information
-import de.vandermeer.asciitable.{AsciiTable, CWC_LongestLine}
-import de.vandermeer.skb.interfaces.transformers.textformat.TextAlignment
 
-import scala.collection.mutable.ListBuffer
 import scala.collection.JavaConverters._
 
 /**
@@ -38,32 +34,35 @@ import scala.collection.JavaConverters._
 class CsvOutput(config: Config) {
 
   def exportResult(value: Any): Unit = {
-    var table = value match {
-      case results : Seq[Result] if results.head.isInstanceOf[Result] => resultsToCsv(results)
-      case _ => {
-        println("Error: results are in unknown format.")
-        return
+    printToCsv(
+      value match {
+        case results :
+          Seq[Result] if results.headOption.getOrElse(Seq.empty[Array[String]]).isInstanceOf[Result] => resultsToCsv(results)
+        case _ => Seq.empty[Array[String]]
       }
-    }
+    )
+  }
 
+  def printToCsv(table : Seq[Array[String]]): Unit = {
     val outputFile = new BufferedWriter(new FileWriter(config.csv, /* append = */false))
     val csvWriter = new CSVWriter(outputFile)
     csvWriter.writeAll(seqAsJavaList(table))
     outputFile.close()
-    println("Results written to file '" + config.csv + "'")
   }
 
   def resultsToCsv(results : Seq[Result]) : Seq[Array[String]] = {
-    if (results.size != 0) {
-      val fieldNames = results.head.fieldNames()
-      val tableHeader : Array[String] = (fieldNames.+:("discovered at").+:("version").+:("groupId").+:("artifactId").+:("source").+:("Id")).toArray
-      val tableBody: Seq[Array[String]] = results.map {
+    if (results.isEmpty) {
+      Seq.empty[Array[String]]
+    } else {
+      val fieldNames = results.headOption.get.fieldNames()
+      val tableHeader : Array[String] =
+        fieldNames.+:("discovered at").+:("version").+:("groupId").+:("artifactId").+:("source").+:("Id").toArray
+      results.map {
         e => {
-          Array(e.id, e.metadata.source, e.metadata.artifactId, e.metadata.groupId, e.metadata.version, e.metadata.discovered).++(fieldNames.map(f => e.metricResults(f).toString))
+          Array(e.id, e.metadata.source, e.metadata.artifactId, e.metadata.groupId, e.metadata.version,
+            e.metadata.discovered).++(fieldNames.map(f => e.metricResults(f).toString))
         }
-      }
-      return tableBody.+:(tableHeader)
+      }.+:(tableHeader)
     }
-    return Seq.empty[Array[String]]
   }
 }

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

@@ -32,7 +32,6 @@ object DelphiCLI extends App {
 
   implicit val system = ActorSystem()
 
-
   val cliParser = {
     new scopt.OptionParser[Config]("delphi-cli") {
       head("Delphi Command Line Tool", s"(${BuildInfo.version})")
@@ -55,7 +54,8 @@ object DelphiCLI extends App {
         .children(
           arg[String]("id").action((x, c) => c.copy(id = x)).text("The ID of the project to retrieve"),
           opt[Unit]('f', "file").action((_, c) => c.copy(opts = List("file"))).text("Use to load the ID from file, " +
-            "with the filepath given in place of the ID"), opt[String]("csv").action((x, c) => c.copy(csv = x)).text("Path to the output .csv file (overwrites existing file)")
+            "with the filepath given in place of the ID"),
+          opt[String]("csv").action((x, c) => c.copy(csv = x)).text("Path to the output .csv file (overwrites existing file)")
         )
 
       cmd("search").action((s, c) => c.copy(mode = "search"))

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

@@ -74,8 +74,10 @@ object RetrieveCommand extends Command with SprayJsonSupport with DefaultJsonPro
             success(config)(s"Found ${unmarshalled.size} item(s).")
             reportResult(config)(unmarshalled)
 
-            if(!config.csv.equals(""))
+            if(!config.csv.equals("")) {
               exportResult(config)(unmarshalled)
+              information(config)("Results written to file '" + config.csv + "'")
+            }
 
             Success(unmarshalled)
           }

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

@@ -29,6 +29,7 @@ import akka.util.ByteString
 import de.upb.cs.swt.delphi.cli.Config
 import de.upb.cs.swt.delphi.cli.artifacts.SearchResult
 import de.upb.cs.swt.delphi.cli.artifacts.SearchResultJson._
+import de.upb.cs.swt.delphi.cli.commands.RetrieveCommand.information
 import spray.json.DefaultJsonProtocol
 
 import scala.concurrent.duration._
@@ -111,8 +112,10 @@ object SearchCommand extends Command with SprayJsonSupport with DefaultJsonProto
 
     information(config)(f"Query took $queryRuntime%.2fs.")
 
-    if(!config.csv.equals(""))
+    if(!config.csv.equals("")) {
       exportResult(config)(results)
+      information(config)("Results written to file '" + config.csv + "'")
+    }
   }
 
   case class Query(query: String,