Skip to content

Commit e39c850

Browse files
authored
Merge pull request #13 from codacy/do-not-filter-spec-patterns
Do not filter spec patterns
2 parents 9edf091 + a139626 commit e39c850

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,23 @@ import codacy.dockerApi.DockerEnvironment._
77
import codacy.dockerApi.utils.Delayed
88
import play.api.libs.json.{Json, Writes}
99

10+
import scala.concurrent.Future
1011
import scala.concurrent.duration._
1112
import scala.util.{Failure, Success, Try}
1213

1314
abstract class DockerEngine(Tool: codacy.docker.api.Tool) extends Delayed {
1415

15-
def initTimeout(duration: FiniteDuration) = {
16+
def initTimeout(duration: FiniteDuration): Future[Unit] = {
1617
delay(duration) {
1718
Runtime.getRuntime.halt(2)
1819
}
1920
}
2021

21-
lazy val timeout = Option(System.getProperty("timeout")).flatMap { rawDuration =>
22+
lazy val timeout: FiniteDuration = Option(System.getProperty("timeout")).flatMap { rawDuration =>
2223
Try(Duration(rawDuration)).toOption.collect { case d: FiniteDuration => d }
2324
}.getOrElse(10.minutes)
2425

25-
lazy val isDebug = Option(System.getProperty("debug")).flatMap { rawDebug =>
26+
lazy val isDebug: Boolean = Option(System.getProperty("debug")).flatMap { rawDebug =>
2627
Try(rawDebug.toBoolean).toOption
2728
}.getOrElse(false)
2829

@@ -43,10 +44,7 @@ abstract class DockerEngine(Tool: codacy.docker.api.Tool) extends Delayed {
4344
config <- configOpt
4445
toolCfg <- config.tools.find(_.name == spec.name)
4546
patterns <- toolCfg.patterns
46-
} yield {
47-
lazy val existingPatternIds = spec.patterns.map(_.patternId)
48-
patterns.filter(pattern => existingPatternIds contains pattern.patternId)
49-
}
47+
} yield patterns
5048

5149
val filesOpt = for {
5250
config <- configOpt
@@ -74,10 +72,10 @@ abstract class DockerEngine(Tool: codacy.docker.api.Tool) extends Delayed {
7472
case Success(results) =>
7573
log("receiving results")
7674
results.foreach {
77-
case issue@NewResult.Issue(file, _, _, _) =>
75+
case issue@NewResult.Issue(_, _, _, _) =>
7876
val relativeIssue = issue.copy(file = Source.File(relativize(issue.file.path)))
7977
logResult(relativeIssue)
80-
case error@NewResult.FileError(filename, _) =>
78+
case error@NewResult.FileError(_, _) =>
8179
val relativeIssue = error.copy(file = Source.File(relativize(error.file.path)))
8280
logResult(relativeIssue)
8381
}

0 commit comments

Comments
 (0)