add basic support for non-primitive elements inside json arrays

Resolves #81
This commit is contained in:
marhali 2022-02-03 20:30:50 +01:00
parent f749715f14
commit 778490b8d8
2 changed files with 20 additions and 4 deletions

View File

@ -9,6 +9,7 @@
### Added ### Added
- Modularization supports namespace or locale module - Modularization supports namespace or locale module
- Full namespace / locale module support for all file types - Full namespace / locale module support for all file types
- Support for object and array elements inside json arrays
### Changed ### Changed
- Improve exception handling on IO operations - Improve exception handling on IO operations

View File

@ -1,7 +1,7 @@
package de.marhali.easyi18n.io.parser.json; package de.marhali.easyi18n.io.parser.json;
import com.google.gson.JsonArray; import com.google.gson.*;
import com.google.gson.JsonElement;
import de.marhali.easyi18n.io.parser.ArrayMapper; import de.marhali.easyi18n.io.parser.ArrayMapper;
/** /**
@ -9,13 +9,28 @@ import de.marhali.easyi18n.io.parser.ArrayMapper;
* @author marhali * @author marhali
*/ */
public class JsonArrayMapper extends ArrayMapper { public class JsonArrayMapper extends ArrayMapper {
private static final Gson GSON = new GsonBuilder().create();
public static String read(JsonArray array) { public static String read(JsonArray array) {
return read(array.iterator(), JsonElement::getAsString); return read(array.iterator(), (jsonElement -> jsonElement.isJsonArray() || jsonElement.isJsonObject()
? jsonElement.toString()
: jsonElement.getAsString()));
} }
public static JsonArray write(String concat) { public static JsonArray write(String concat) {
JsonArray array = new JsonArray(); JsonArray array = new JsonArray();
write(concat, array::add);
write(concat, (element) -> {
if(element.startsWith("{") && element.endsWith("}")) {
array.add(GSON.fromJson(element, JsonObject.class));
} else if (element.startsWith("[") && element.endsWith("]")) {
array.add(GSON.fromJson(element, JsonArray.class));
} else {
array.add(element);
}
});
return array; return array;
} }
} }