@@ -7,22 +7,23 @@ import codacy.dockerApi.DockerEnvironment._
7
7
import codacy .dockerApi .utils .Delayed
8
8
import play .api .libs .json .{Json , Writes }
9
9
10
+ import scala .concurrent .Future
10
11
import scala .concurrent .duration ._
11
12
import scala .util .{Failure , Success , Try }
12
13
13
14
abstract class DockerEngine (Tool : codacy.docker.api.Tool ) extends Delayed {
14
15
15
- def initTimeout (duration : FiniteDuration ) = {
16
+ def initTimeout (duration : FiniteDuration ): Future [ Unit ] = {
16
17
delay(duration) {
17
18
Runtime .getRuntime.halt(2 )
18
19
}
19
20
}
20
21
21
- lazy val timeout = Option (System .getProperty(" timeout" )).flatMap { rawDuration =>
22
+ lazy val timeout : FiniteDuration = Option (System .getProperty(" timeout" )).flatMap { rawDuration =>
22
23
Try (Duration (rawDuration)).toOption.collect { case d : FiniteDuration => d }
23
24
}.getOrElse(10 .minutes)
24
25
25
- lazy val isDebug = Option (System .getProperty(" debug" )).flatMap { rawDebug =>
26
+ lazy val isDebug : Boolean = Option (System .getProperty(" debug" )).flatMap { rawDebug =>
26
27
Try (rawDebug.toBoolean).toOption
27
28
}.getOrElse(false )
28
29
@@ -43,10 +44,7 @@ abstract class DockerEngine(Tool: codacy.docker.api.Tool) extends Delayed {
43
44
config <- configOpt
44
45
toolCfg <- config.tools.find(_.name == spec.name)
45
46
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
50
48
51
49
val filesOpt = for {
52
50
config <- configOpt
@@ -74,10 +72,10 @@ abstract class DockerEngine(Tool: codacy.docker.api.Tool) extends Delayed {
74
72
case Success (results) =>
75
73
log(" receiving results" )
76
74
results.foreach {
77
- case issue@ NewResult .Issue (file , _, _, _) =>
75
+ case issue@ NewResult .Issue (_ , _, _, _) =>
78
76
val relativeIssue = issue.copy(file = Source .File (relativize(issue.file.path)))
79
77
logResult(relativeIssue)
80
- case error@ NewResult .FileError (filename , _) =>
78
+ case error@ NewResult .FileError (_ , _) =>
81
79
val relativeIssue = error.copy(file = Source .File (relativize(error.file.path)))
82
80
logResult(relativeIssue)
83
81
}
0 commit comments