Merge pull request #126 from yarosman/master

Correct json for nested objects
sbt · Jul 26, 2018 · c686647 · c686647
2 parents f9fb5de + a830a07
commit c686647
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 19 deletions.
diff --git a/src/main/scala/sbtbuildinfo/ScalaCaseObjectRenderer.scala b/src/main/scala/sbtbuildinfo/ScalaCaseObjectRenderer.scala
@@ -63,16 +63,26 @@ private[sbtbuildinfo] case class ScalaCaseObjectRenderer(options: Seq[BuildInfoO
   def toJsonLine: Seq[String] =
     if (options contains BuildInfoOption.ToJson)
       List(
-         """  val toJson: String = toMap.map{ i =>
-           |    def quote(x:Any) : String = "\"" + x + "\""
-           |    val key : String = quote(i._1)
-           |    val value : String = i._2 match {
-           |       case elem : Seq[_] => elem.map(quote).mkString("[", ",", "]")
-           |       case elem : Option[_] => elem.map(quote).getOrElse("null")
-           |       case elem => quote(elem)
-           |    }
-           |    s"$key : $value"
-           |    }.mkString("{", ", ", "}")""".stripMargin)
+         """|  private def quote(x: Any): String = "\"" + x + "\""
+            |  private def toJsonValue(value: Any): String = {
+            |    value match {
+            |      case elem: Seq[_] => elem.map(toJsonValue).mkString("[", ",", "]")
+            |      case elem: Option[_] => elem.map(toJsonValue).getOrElse("null")
+            |      case elem: Map[String, Any] => elem.map {
+            |        case (k, v) => toJsonValue(k) + ":" + toJsonValue(v)
+            |      }.mkString("{", ", ", "}")
+            |      case d: Double => d.toString
+            |      case f: Float => f.toString
+            |      case l: Long => l.toString
+            |      case i: Int => i.toString
+            |      case s: Short => s.toString
+            |      case bool: Boolean => bool.toString
+            |      case str: String => quote(str)
+            |      case other => quote(other.toString)
+            |    }
+            |  }
+            |
+            |  val toJson: String = toJsonValue(toMap)""".stripMargin)
     else Nil
 
 }
diff --git a/src/sbt-test/sbt-buildinfo/options/build.sbt b/src/sbt-test/sbt-buildinfo/options/build.sbt
@@ -41,16 +41,26 @@ lazy val root = (project in file(".")).
              """    "name" -> name,""" ::
              """    "scalaVersion" -> scalaVersion)""" ::
              """""" ::
-             """  val toJson: String = toMap.map{ i =>""" ::
-             """    def quote(x:Any) : String = "\"" + x + "\""""" ::
-             """    val key : String = quote(i._1)""" ::
-             """    val value : String = i._2 match {""" ::
-             """       case elem : Seq[_] => elem.map(quote).mkString("[", ",", "]")""" ::
-             """       case elem : Option[_] => elem.map(quote).getOrElse("null")""" ::
-             """       case elem => quote(elem)""" ::
+             """  private def quote(x: Any): String = "\"" + x + "\""""" ::
+             """  private def toJsonValue(value: Any): String = {""" ::
+             """    value match {""" ::
+             """      case elem: Seq[_] => elem.map(toJsonValue).mkString("[", ",", "]")""" ::
+             """      case elem: Option[_] => elem.map(toJsonValue).getOrElse("null")""" ::
+             """      case elem: Map[String, Any] => elem.map {""" ::
+             """        case (k, v) => toJsonValue(k) + ":" + toJsonValue(v)""" ::
+             """      }.mkString("{", ", ", "}")""" ::
+             """      case d: Double => d.toString""" ::
+             """      case f: Float => f.toString""" ::
+             """      case l: Long => l.toString""" ::
+             """      case i: Int => i.toString""" ::
+             """      case s: Short => s.toString""" ::
+             """      case bool: Boolean => bool.toString""" ::
+             """      case str: String => quote(str)""" ::
+             """      case other => quote(other.toString)""" ::
              """    }""" ::
-             """    s"$key : $value"""" ::
-             """    }.mkString("{", ", ", "}")""" ::
+             """  }""" ::
+             """""" ::
+             """  val toJson: String = toJsonValue(toMap)""" ::
              """}""" :: Nil =>
         case _ => sys.error("unexpected output: \n" + lines.mkString("\n"))
       }