Changed Iterable to List

Author: caxaria

src/main/scala/codacy/dockerApi/DockerEngine.scala

@@ -14,21 +14,21 @@ abstract class DockerEngine(Tool: Tool) {
 
   def initTimeout(duration: FiniteDuration) = {
     implicit val ct: ExecutionContext = sys.dispatcher
-    sys.scheduler.scheduleOnce(duration){
-      Runtime.getRuntime().halt(2)
+    sys.scheduler.scheduleOnce(duration) {
+      Runtime.getRuntime.halt(2)
     }
   }
 
-  lazy val timeout = Option(System.getProperty("timeout")).flatMap{ case rawDuration =>
-    Try(Duration(rawDuration)).toOption.collect{ case d:FiniteDuration => d }
+  lazy val timeout = Option(System.getProperty("timeout")).flatMap { case rawDuration =>
+    Try(Duration(rawDuration)).toOption.collect { case d: FiniteDuration => d }
   }.getOrElse(30.minutes)
 
-  lazy val isDebug = Option(System.getProperty("debug")).flatMap{ case rawDebug =>
+  lazy val isDebug = Option(System.getProperty("debug")).flatMap { case rawDebug =>
     Try(rawDebug.toBoolean).toOption
   }.getOrElse(false)
 
-  def log(message:String):Unit = if(isDebug){
-    Console.err.print(s"[DockerEngine] $message")
+  def log(message: String): Unit = if (isDebug) {
+    Console.err.println(s"[DockerEngine] $message")
   }
 
   def main(args: Array[String]): Unit = {
@@ -64,6 +64,7 @@ abstract class DockerEngine(Tool: Tool) {
             logResult(relativeIssue)
         }
         log("tool finished")
+        System.exit(0)
       case Failure(error) =>
         error.printStackTrace(Console.err)
         System.exit(1)

src/main/scala/codacy/dockerApi/DockerEnvironment.scala

@@ -30,7 +30,7 @@ object DockerEnvironment {
   }
 
   private[this] def asFailure(error: Seq[(JsPath, Seq[ValidationError])]) =
-    Failure(new Throwable(Json.stringify(JsError.toFlatJson(error))))
+    Failure(new Throwable(Json.stringify(JsError.toFlatJson(error.toList))))
 
   private[this] lazy val configFilePath = sourcePath.resolve(".codacy.json")
 

src/main/scala/codacy/dockerApi/package.scala

@@ -22,7 +22,7 @@ abstract class Formats[W <: AnyVal {val value : B}, B](apply_ : (B => W)) extend
 }
 
 trait Tool {
-  def apply(path: Path, conf: Option[Seq[PatternDef]], files: Option[Set[Path]])(implicit spec: Spec): Try[Iterable[Result]]
+  def apply(path: Path, conf: Option[List[PatternDef]], files: Option[Set[Path]])(implicit spec: Spec): Try[List[Result]]
 }
 
 final class PatternId(val value: String) extends AnyVal {
@@ -71,7 +71,7 @@ case class ParameterDef(name: ParameterName, value: JsValue)
 
 case class PatternDef(patternId: PatternId, parameters: Option[Set[ParameterDef]])
 
-case class ToolConfig(name: ToolName, patterns: Seq[PatternDef])
+case class ToolConfig(name: ToolName, patterns: List[PatternDef])
 
 case class FullConfig(tools: Set[ToolConfig], files: Option[Set[SourcePath]])
 

src/main/scala/codacy/dockerApi/utils/CommandRunner.scala

@@ -9,11 +9,11 @@ import scala.language.postfixOps
 import scala.sys.process._
 import scala.util.{Failure, Success, Try}
 
-case class CommandResult(exitCode: Int, stdout: Seq[String], stderr: Seq[String])
+case class CommandResult(exitCode: Int, stdout: List[String], stderr: List[String])
 
 object CommandRunner {
 
-  def exec(cmd: Seq[String], dir: Option[File] = None): Either[Throwable, CommandResult] = {
+  def exec(cmd: List[String], dir: Option[File] = None): Either[Throwable, CommandResult] = {
     val stdout = mutable.Buffer[String]()
     val stderr = mutable.Buffer[String]()
 
@@ -23,7 +23,7 @@ object CommandRunner {
       case Success(process) =>
         Try(process.exitValue()) match {
           case Success(exitValue) =>
-            Right(CommandResult(exitValue, stdout, stderr))
+            Right(CommandResult(exitValue, stdout.toList, stderr.toList))
 
           case Failure(e) =>
             process.destroy()

src/main/scala/codacy/dockerApi/utils/FileHelper.scala

@@ -23,17 +23,17 @@ object FileHelper {
       .stripPrefix("/")
   }
 
-  def listAllFiles(path: String): Seq[File] = {
+  def listAllFiles(path: String): List[File] = {
     listAllFiles(Paths.get(path))
   }
 
-  def listAllFiles(path: Path): Seq[File] = {
+  def listAllFiles(path: Path): List[File] = {
     recursiveListFiles(path.toFile)
   }
 
-  private def recursiveListFiles(file: File): Seq[File] = {
+  private def recursiveListFiles(file: File): List[File] = {
     val these = file.listFiles
-    these ++ these.filter(_.isDirectory).flatMap(recursiveListFiles)
+    (these ++ these.filter(_.isDirectory).flatMap(recursiveListFiles)).toList
   }
 
 }

src/main/scala/codacy/dockerApi/utils/ToolHelper.scala

@@ -4,7 +4,7 @@ import codacy.dockerApi._
 
 object ToolHelper {
 
-  def getPatternsToLint(conf: Option[Seq[PatternDef]])(implicit spec: Spec): Option[Seq[PatternDef]] = {
+  def getPatternsToLint(conf: Option[List[PatternDef]])(implicit spec: Spec): Option[List[PatternDef]] = {
     conf.map {
       configuration =>
         configuration.map(pattern => getMissingParametersFromSpec(pattern))

src/test/scala/codacy/dockerApi/utils/CommandRunnerTest.scala

@@ -7,9 +7,9 @@ import scala.collection.mutable.ArrayBuffer
 
 class CommandRunnerTest extends FlatSpec with Matchers {
 
-  val genericCMD = Seq("echo", "foo")
-  val invalidCMD = Seq("rm", "nofile.ext")
-  val errorCMD = Seq("rmzzz", "nofile.ext")
+  val genericCMD = List("echo", "foo")
+  val invalidCMD = List("rm", "nofile.ext")
+  val errorCMD = List("rmzzz", "nofile.ext")
 
   "CommandRunner" should "simpleEchoExec" in {
     val result: Either[Throwable, CommandResult] = CommandRunner.exec(genericCMD)

src/test/scala/codacy/dockerApi/utils/ToolHelperTest.scala

@@ -21,8 +21,8 @@ class ToolHelperTest extends FlatSpec with Matchers {
   val patternDef2NoParam = PatternDef(PatternId("id2"), None)
 
   val genericSpec = codacy.dockerApi.Spec(ToolName("tool1"), patternsSpec)
-  val genericConf: Option[Seq[PatternDef]] = Some(Seq(patternDef1, patternDef2))
-  val genericConfNoParam: Option[Seq[PatternDef]] = Some(Seq(patternDef1NoParam, patternDef2NoParam))
+  val genericConf: Option[List[PatternDef]] = Some(List(patternDef1, patternDef2))
+  val genericConfNoParam: Option[List[PatternDef]] = Some(List(patternDef1NoParam, patternDef2NoParam))
 
   "ToolHelper" should "getPatternsFromConf" in {
     val spec = genericSpec
@@ -44,11 +44,11 @@ class ToolHelperTest extends FlatSpec with Matchers {
 
   "ToolHelper" should "getPatternsEmptyIfEmptyConf" in {
     val spec = genericSpec
-    val conf: Option[Seq[PatternDef]] = Some(Seq())
+    val conf: Option[List[PatternDef]] = Some(List())
 
     val result = ToolHelper.getPatternsToLint(conf)(spec)
 
-    result should equal(Some(Seq()))
+    result should equal(Some(List()))
   }
 
   "ToolHelper" should "getParametersFromSpec" in {
@@ -59,7 +59,7 @@ class ToolHelperTest extends FlatSpec with Matchers {
     val expectedParamDef2 = ParameterDef(ParameterName("param2"), JsString("value2"))
     val expectedPatternDef1 = PatternDef(PatternId("id1"), Some(Set(expectedParamDef1, expectedParamDef2)))
     val expectedPatternDef2 = PatternDef(PatternId("id2"), None)
-    val expectedResult = Some(Seq(expectedPatternDef1, expectedPatternDef2))
+    val expectedResult = Some(List(expectedPatternDef1, expectedPatternDef2))
 
     val result = ToolHelper.getPatternsToLint(conf)(spec)