Skip to content

Fix corner case for YAML parsing with primitive types #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephenamar-db merged 2 commits into from
Dec 31, 2024
Merged

Fix corner case for YAML parsing with primitive types #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2df1a92
Fix return value of std.parseYaml for primitive yaml types
stephenamar-db Dec 29, 2024
ca5ab6c
add tests
stephenamar-db Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions sjsonnet/src-jvm/sjsonnet/Platform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ object Platform {
}

/**
* Valid compression levels are 0 (no compression) to 9 (maximum compression).
* Valid compression levels are 0 (no compression) to 9 (maximum compression).
*/
def xzBytes(b: Array[Byte], compressionLevel: Option[Int]): String = {
val outputStream: ByteArrayOutputStream = new ByteArrayOutputStream(b.length)
Expand All @@ -51,14 +51,14 @@ object Platform {

def yamlToJson(yamlString: String): String = {
try {
val yaml = new Yaml(new SafeConstructor(new LoaderOptions())).loadAll(yamlString)
.asInstanceOf[java.lang.Iterable[java.util.Collection[Object]]].asScala.toSeq
val yaml = new Yaml(new SafeConstructor(new LoaderOptions())).loadAll(yamlString).asScala.toSeq
yaml.size match {
case 0 => "{}"
case 1 if yaml.head.isInstanceOf[java.util.Map[String, Object]] =>
new JSONObject(yaml.head.asInstanceOf[java.util.Map[String, Object]]).toString()
case 1 if yaml.head.isInstanceOf[java.util.List[Object]] =>
new JSONArray(yaml.head.asInstanceOf[java.util.List[Object]]).toString()
case 1 => yaml.head match {
case m: java.util.Map[_, _] => new JSONObject(m).toString()
case l: java.util.List[_] => new JSONArray(l).toString()
case _ => new JSONArray(yaml.asJava).get(0).toString
}
case _ => new JSONArray(yaml.asJava).toString()
}
} catch {
Expand All @@ -70,7 +70,7 @@ object Platform {
private def computeHash(algorithm: String, s: String) = {
java.security.MessageDigest.getInstance(algorithm)
.digest(s.getBytes("UTF-8"))
.map{ b => String.format("%02x", (b & 0xff).asInstanceOf[Integer])}
.map { b => String.format("%02x", (b & 0xff).asInstanceOf[Integer]) }
.mkString
}

Expand Down
4 changes: 3 additions & 1 deletion sjsonnet/src/sjsonnet/Materializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@ abstract class Materializer {
case Val.Null(pos) => storePos(pos); visitor.visitNull(-1)
case s: Val.Func =>
Error.fail("Couldn't manifest function with params [" + s.params.names.mkString(",") + "]", v.pos)
case vv: Val =>
Error.fail("Unknown value type " + vv.prettyName, vv.pos)
case _ =>
Error.fail("Unknown value type", v.pos)
Error.fail("Unknown value type " + v)
}
} catch {
case _: StackOverflowError =>
Expand Down
4 changes: 3 additions & 1 deletion sjsonnet/test/src-jvm/sjsonnet/ParseYamlTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ object ParseYamlTests extends TestSuite {
def tests: Tests = Tests {
test {
eval("std.parseYaml('foo: bar')") ==> ujson.Value("""{"foo":"bar"}""")
eval("std.parseYaml('- foo: bar')") ==> ujson.Value("""[{"foo":"bar"}]""")
}
test {
eval("std.parseYaml('')") ==> ujson.Value("""{}""")
}
eval("std.parseYaml(\"0777\")") ==> ujson.Value("""511""")
}
test {
eval("std.parseYaml('foo: bar\n---\nbar: baz\n')") ==> ujson.Value("""[{"foo": "bar"}, {"bar": "baz"}]""")
}
Expand Down
Loading