Skip to content

Commit 9edf091

Browse files
authored
Merge pull request #12 from codacy/add-descriptions
Add description DTOs
2 parents 961b41f + 47c9dc1 commit 9edf091

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ resolvers += "Bintray Typesafe Repo" at "http://dl.bintray.com/typesafe/maven-re
1919
libraryDependencies ++= Seq(
2020
"com.typesafe.play" %% "play-json" % "2.4.8",
2121
"org.scalatest" %% "scalatest" % "2.2.4" % "test",
22-
"com.codacy" %% "codacy-plugins-api" % "0.1.2" withSources(),
22+
"com.codacy" %% "codacy-plugins-api" % "1.0.8" withSources(),
2323
"com.github.pathikrit" %% "better-files" % "2.14.0" withSources()
2424
)
2525

src/main/scala/codacy/docker/api/JsonApi.scala

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package codacy.docker.api
33
import play.api.libs.json._
44
import scala.language.implicitConversions
55

6-
private[api] case class ParamValue(value:JsValue) extends AnyVal with Parameter.Value
6+
private[api] case class ParamValue(value: JsValue) extends AnyVal with Parameter.Value
77

88
trait JsonApi {
99

@@ -18,16 +18,16 @@ trait JsonApi {
1818
}
1919
}
2020

21-
implicit def paramValueToJsValue(paramValue:Parameter.Value): JsValue = {
21+
implicit def paramValueToJsValue(paramValue: Parameter.Value): JsValue = {
2222
paramValue match {
2323
case ParamValue(v) => v
2424
case _ => JsNull
2525
}
2626
}
2727

2828
implicit lazy val parameterValueFormat: Format[Parameter.Value] = Format(
29-
implicitly[Reads[JsValue]].map( Parameter.Value ),
30-
Writes( paramValueToJsValue )
29+
implicitly[Reads[JsValue]].map(Parameter.Value),
30+
Writes(paramValueToJsValue)
3131
)
3232

3333
implicit lazy val resultLevelFormat = Format(
@@ -39,6 +39,9 @@ trait JsonApi {
3939
enumWrites[Pattern.Category]
4040
)
4141

42+
implicit lazy val patternLanguageFormat = Format(Reads.StringReads.map(Pattern.Language),
43+
Writes((v: Pattern.Language) => Json.toJson(v.name))) //Json.format[Pattern.Language]
44+
4245
implicit lazy val patternIdFormat = Format(Reads.StringReads.map(Pattern.Id),
4346
Writes((v: Pattern.Id) => Json.toJson(v.value))) //Json.format[Pattern.Id]
4447

@@ -60,13 +63,27 @@ trait JsonApi {
6063
implicit lazy val sourceFileFormat = Format(Reads.StringReads.map(Source.File),
6164
Writes((v: Source.File) => Json.toJson(v.path))) //Json.format[Source.File]
6265

66+
implicit lazy val parameterDescriptionTextFormat = Format(Reads.StringReads.map(Parameter.DescriptionText),
67+
Writes((v: Parameter.DescriptionText) => Json.toJson(v.value))) //Json.format[Parameter.DescriptionText]
68+
69+
implicit lazy val patternDescriptionTextFormat = Format(Reads.StringReads.map(Pattern.DescriptionText),
70+
Writes((v: Pattern.DescriptionText) => Json.toJson(v.value))) //Json.format[Pattern.DescriptionText]
71+
72+
implicit lazy val patternTitleFormat = Format(Reads.StringReads.map(Pattern.Title),
73+
Writes((v: Pattern.Title) => Json.toJson(v.value))) //Json.format[Pattern.Title]
74+
75+
implicit lazy val patternTimeToFixFormat = Format(Reads.IntReads.map(Pattern.TimeToFix),
76+
Writes((v: Pattern.TimeToFix) => Json.toJson(v.value))) //Json.format[Pattern.TimeToFix]
77+
6378
implicit lazy val parameterSpecificationFormat = Json.format[Parameter.Specification]
6479
implicit lazy val parameterDefinitionFormat = Json.format[Parameter.Definition]
6580
implicit lazy val patternDefinitionFormat = Json.format[Pattern.Definition]
6681
implicit lazy val patternSpecificationFormat = Json.format[Pattern.Specification]
6782
implicit lazy val toolConfigurationFormat = Json.format[Tool.Configuration]
6883
implicit lazy val specificationFormat = Json.format[Tool.Specification]
6984
implicit lazy val configurationFormat = Json.format[Configuration]
85+
implicit lazy val parameterDescriptionFormat = Json.format[Parameter.Description]
86+
implicit lazy val patternDescriptionFormat = Json.format[Pattern.Description]
7087

7188
implicit lazy val resultWrites: Writes[Result] = Writes[Result]((_: Result) match {
7289
case r: Result.Issue => Json.writes[Result.Issue].writes(r)

0 commit comments

Comments
 (0)