BDOG-302 revised java version model for ServiceDependency

Author: christopherjturner

app/uk/gov/hmrc/cataloguefrontend/service/DependenciesService.scala

@@ -90,6 +90,9 @@ object DependenciesService {
     dependencies.sortBy(serviceDependency => (serviceDependency.group, serviceDependency.artifact))
 }
 
+
+case class ServiceJDKVersion(version: String, vendor: String, kind:String)
+
 case class ServiceDependency(
     path    : String
   , group   : String
@@ -103,7 +106,7 @@ case class ServiceDependencies(
     , name         : String
     , version      : Option[String]
     , runnerVersion: String
-    , java         : JDKVersion
+    , java         : ServiceJDKVersion
     , classpath    : String
     , dependencies : Seq[ServiceDependency]
     , environment  : Option[String] = None
@@ -117,23 +120,22 @@ case class ServiceDependencies(
 }
 
 object ServiceDependencies {
-  import play.api.libs.json.{__}
+  import play.api.libs.json.__
   import play.api.libs.functional.syntax._
 
   implicit val jdkr = (
-        Reads.pure("") // skip name field
-      ~ (__ \ "version").read[String]
+        (__ \ "version").read[String]
       ~ (__ \ "vendor" ).read[String]
       ~ (__ \ "kind"   ).read[String]
-    )(JDKVersion)
+    )(ServiceJDKVersion)
 
   implicit val dependencyReads: Reads[ServiceDependency] = Json.using[Json.WithDefaultValues].reads[ServiceDependency]
   implicit val serviceDependenciesReads: Reads[ServiceDependencies] = (
     (__ \ "uri"          ).read[String]
   ~ (__ \ "name"         ).read[String]
   ~ (__ \ "version"      ).readNullable[String]
   ~ (__ \ "runnerVersion").read[String]
-  ~ (__ \ "java"         ).read[JDKVersion]
+  ~ (__ \ "java"         ).read[ServiceJDKVersion]
   ~ (__ \ "classpath"    ).read[String]
   ~ (__ \ "dependencies" ).read[Seq[ServiceDependency]]
   ~ (__ \ "environment"  ).readNullable[String]