@@ -3,6 +3,7 @@ package codacy.plugins.test
3
3
import better .files ._
4
4
import com .codacy .analysis .core .model .{FileError , Issue , ParameterSpec , Pattern , PatternSpec , ToolResult , ToolSpec }
5
5
import com .codacy .analysis .core .tools .FullToolSpec
6
+ import com .codacy .plugins .api
6
7
import com .codacy .plugins .api ._
7
8
import com .codacy .plugins .api .languages .{Language , Languages }
8
9
import com .codacy .plugins .results .traits .DockerToolDocumentation
@@ -34,33 +35,12 @@ trait ITest extends LogSupport {
34
35
languagesFromProperties.getOrElse(languagesFromFiles)
35
36
}
36
37
37
- protected def createToolSpec (languages : Set [Language ], dockerImage : DockerImage ): ToolSpec = {
38
- val dockerImageName = dockerImage.name
39
- val dockerImageVersion = dockerImage.version
40
-
41
- new ToolSpec (uuid = dockerImageName,
42
- dockerImage = s " ${dockerImage.name}: ${dockerImageVersion}" ,
43
- version = dockerImageVersion,
44
- languages = languages,
45
- name = dockerImageName,
46
- shortName = dockerImageName,
47
- documentationUrl = Some (" " ),
48
- sourceCodeUrl = Some (" " ),
49
- prefix = " " ,
50
- needsCompilation = false ,
51
- hasConfigFile = true ,
52
- standalone = false ,
53
- hasUIConfiguration = true ,
54
- isDefault = true ,
55
- configFilenames = Set .empty)
56
- }
57
-
58
- protected def createFullToolSpec (toolSpec : ToolSpec ,
59
- dockerToolDocumentation : DockerToolDocumentation ): FullToolSpec = {
38
+ protected def createFullToolSpec (toolSpec : api.results.Tool .Specification ,
39
+ dockerToolDocumentation : DockerToolDocumentation ,
40
+ languages : Set [Language ],
41
+ dockerImage : DockerImage ): FullToolSpec = {
60
42
val patternDescriptions = dockerToolDocumentation.patternDescriptions.getOrElse(Set .empty)
61
- val patterns = dockerToolDocumentation.toolSpecification
62
- .map(_.patterns)
63
- .getOrElse(Seq .empty)
43
+ val patterns = toolSpec.patterns
64
44
.flatMap { pattern =>
65
45
patternDescriptions
66
46
.find(_.patternId == pattern.patternId)
@@ -69,7 +49,27 @@ trait ITest extends LogSupport {
69
49
}
70
50
}(collection.breakOut)
71
51
72
- FullToolSpec (toolSpec, patterns)
52
+ FullToolSpec (toToolSpec(toolSpec, languages, dockerImage), patterns)
53
+ }
54
+
55
+ private def toToolSpec (toolSpec : api.results.Tool .Specification ,
56
+ languages : Set [Language ],
57
+ dockerImage : DockerImage ): ToolSpec = {
58
+ ToolSpec (toolSpec.name.value,
59
+ dockerImage.toString,
60
+ isDefault = true ,
61
+ dockerImage.version,
62
+ languages,
63
+ toolSpec.name.value,
64
+ toolSpec.name.value,
65
+ Option .empty,
66
+ Option .empty,
67
+ prefix = " " ,
68
+ needsCompilation = false ,
69
+ hasConfigFile = true ,
70
+ Set .empty,
71
+ standalone = false ,
72
+ hasUIConfiguration = true )
73
73
}
74
74
75
75
private def merge (p : results.Pattern .Specification , pd : PatternDescription ): PatternSpec = {
0 commit comments