octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-16 02:07:08 +00:00
Code Issues Releases Wiki Activity

fix: allow different type inside array for GetJsonKey builtin fct

Browse Source
This commit is contained in:
The-Lum 2023-12-08 21:08:36 +00:00
parent 3a4c614fc1
commit 1cb61d5609
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java
View File

@ -76,9 +76,11 @@ public class GetJsonKey extends SimpleReturnFunction {
final JsonArray array = (JsonArray) json; final JsonArray array = (JsonArray) json;
final JsonArray result = new JsonArray(); final JsonArray result = new JsonArray();
for (JsonValue tmp : array) { for (JsonValue tmp : array) {
final JsonObject object = (JsonObject) tmp; if (tmp.isObject()) {
for (String key : object.names()) final JsonObject object = (JsonObject) tmp;
result.add(key); for (String key : object.names())
result.add(key);
}
} }
return TValue.fromJson(result); return TValue.fromJson(result);
} }

4
test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java
View File

@ -61,11 +61,11 @@ class GetJsonKeyTest {
" '{\"a\":\"abc\"}' , [\"a\"]", " '{\"a\":\"abc\"}' , [\"a\"]",
" '[{\"a\":[1, 2]}, {\"b\":[3, 4]}]' , '[\"a\",\"b\"]'", " '[{\"a\":[1, 2]}, {\"b\":[3, 4]}]' , '[\"a\",\"b\"]'",
" '{\"a\":[1, 2], \"b\":\"abc\", \"b\":true}' , '[\"a\",\"b\",\"b\"]'", " '{\"a\":[1, 2], \"b\":\"abc\", \"b\":true}' , '[\"a\",\"b\",\"b\"]'",
// TODO: Manage Array with different type inside // DONE: Manage Array with different type inside
// Ref.: // Ref.:
// - https://datatracker.ietf.org/doc/html/rfc8259#section-5 // - https://datatracker.ietf.org/doc/html/rfc8259#section-5
// - https://json-schema.org/understanding-json-schema/reference/array.html // - https://json-schema.org/understanding-json-schema/reference/array.html
//" '[3, \"different\", { \"types\" : \"of values\" }]', [\"types\"]", " '[3, \"different\", { \"types\" : \"of values\" }]', [\"types\"]",
}) })
void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException, EaterExceptionLocated { void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException, EaterExceptionLocated {
assertTimExpectedOutputFromInput(cut, input, expected); assertTimExpectedOutputFromInput(cut, input, expected);