Fix Value mess
This commit is contained in:
5 files changed
+69
-63
No files matched your search
@@ -22,57 +22,57 @@ import carpet.script.value.Value;
|
||||
|
||||
public class ScarpetJsonDeserializer implements JsonDeserializer<Value>{
|
||||
|
||||
@Override
|
||||
public Value deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
|
||||
throws JsonParseException {
|
||||
return parseElement(json);
|
||||
}
|
||||
|
||||
private Value parseElement(JsonElement element) throws JsonParseException {
|
||||
if (element.isJsonObject())
|
||||
{
|
||||
return parseMap(element.getAsJsonObject());
|
||||
}
|
||||
else if (element.isJsonArray())
|
||||
{
|
||||
return parseList(element.getAsJsonArray());
|
||||
}
|
||||
else if (element.isJsonPrimitive())
|
||||
{
|
||||
return parsePrimitive(element.getAsJsonPrimitive());
|
||||
}
|
||||
return Value.NULL;
|
||||
}
|
||||
@Override
|
||||
public Value deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
|
||||
throws JsonParseException {
|
||||
return parseElement(json);
|
||||
}
|
||||
|
||||
private Value parseElement(JsonElement element) throws JsonParseException {
|
||||
if (element.isJsonObject())
|
||||
{
|
||||
return parseMap(element.getAsJsonObject());
|
||||
}
|
||||
else if (element.isJsonArray())
|
||||
{
|
||||
return parseList(element.getAsJsonArray());
|
||||
}
|
||||
else if (element.isJsonPrimitive())
|
||||
{
|
||||
return parsePrimitive(element.getAsJsonPrimitive());
|
||||
}
|
||||
return Value.NULL;
|
||||
}
|
||||
|
||||
private Value parseMap(JsonObject jsonMap) throws JsonParseException {
|
||||
Map<Value, Value> map = new HashMap<Value, Value>();
|
||||
jsonMap.entrySet().forEach(entry -> {
|
||||
map.put(new StringValue(entry.getKey()), parseElement(entry.getValue()));
|
||||
});
|
||||
return MapValue.wrap(map);
|
||||
}
|
||||
private Value parseMap(JsonObject jsonMap) throws JsonParseException {
|
||||
Map<Value, Value> map = new HashMap<Value, Value>();
|
||||
jsonMap.entrySet().forEach(entry -> {
|
||||
map.put(new StringValue(entry.getKey()), parseElement(entry.getValue()));
|
||||
});
|
||||
return MapValue.wrap(map);
|
||||
}
|
||||
|
||||
private Value parseList(JsonArray jsonList) throws JsonParseException {
|
||||
List<Value> list = new ArrayList<Value>();
|
||||
jsonList.forEach(elem -> {
|
||||
list.add(parseElement(elem));
|
||||
});
|
||||
return new ListValue(list);
|
||||
}
|
||||
|
||||
private Value parsePrimitive(JsonPrimitive primitive) throws JsonParseException {
|
||||
if (primitive.isString())
|
||||
{
|
||||
return new StringValue(primitive.getAsString());
|
||||
}
|
||||
else if (primitive.isBoolean())
|
||||
{
|
||||
return primitive.getAsBoolean() ? Value.TRUE : Value.FALSE;
|
||||
}
|
||||
else if (primitive.isNumber())
|
||||
{
|
||||
return NumericValue.of(primitive.getAsNumber());
|
||||
}
|
||||
return Value.NULL;
|
||||
}
|
||||
private Value parseList(JsonArray jsonList) throws JsonParseException {
|
||||
List<Value> list = new ArrayList<Value>();
|
||||
jsonList.forEach(elem -> {
|
||||
list.add(parseElement(elem));
|
||||
});
|
||||
return new ListValue(list);
|
||||
}
|
||||
|
||||
private Value parsePrimitive(JsonPrimitive primitive) throws JsonParseException {
|
||||
if (primitive.isString())
|
||||
{
|
||||
return new StringValue(primitive.getAsString());
|
||||
}
|
||||
else if (primitive.isBoolean())
|
||||
{
|
||||
return primitive.getAsBoolean() ? Value.TRUE : Value.FALSE;
|
||||
}
|
||||
else if (primitive.isNumber())
|
||||
{
|
||||
return NumericValue.of(primitive.getAsNumber());
|
||||
}
|
||||
return Value.NULL;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user