diff --git a/admin4j-json-fastjson/src/main/java/com/admin4j/json/FastjsonJSONMapper.java b/admin4j-json-fastjson/src/main/java/com/admin4j/json/FastjsonJSONMapper.java index fc21f3d..90ac551 100644 --- a/admin4j-json-fastjson/src/main/java/com/admin4j/json/FastjsonJSONMapper.java +++ b/admin4j-json-fastjson/src/main/java/com/admin4j/json/FastjsonJSONMapper.java @@ -61,7 +61,11 @@ public List getArray(String key, Class tClass) { JSONArray jsonArray = jsonObject.getJSONArray(key); List jsonMappers = new ArrayList<>(jsonArray.size()); for (Object jsonObject : jsonArray) { - jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass)); + if (jsonObject instanceof JSONObject) { + jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass)); + } else { + jsonMappers.add((T) jsonObject); + } } return jsonMappers; } diff --git a/admin4j-json-fastjson2/src/main/java/com/admin4j/json/Fastjson2JSONMapper.java b/admin4j-json-fastjson2/src/main/java/com/admin4j/json/Fastjson2JSONMapper.java index 0a7bad9..3ec3007 100644 --- a/admin4j-json-fastjson2/src/main/java/com/admin4j/json/Fastjson2JSONMapper.java +++ b/admin4j-json-fastjson2/src/main/java/com/admin4j/json/Fastjson2JSONMapper.java @@ -58,7 +58,11 @@ public List getArray(String key, Class tClass) { JSONArray jsonArray = jsonObject.getJSONArray(key); List jsonMappers = new ArrayList<>(jsonArray.size()); for (Object jsonObject : jsonArray) { - jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass)); + if (jsonObject instanceof JSONObject) { + jsonMappers.add(((JSONObject) jsonObject).toJavaObject(tClass)); + } else { + jsonMappers.add((T) jsonObject); + } } return jsonMappers; } diff --git a/pom.xml b/pom.xml index 8770ef9..82b3557 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ - 0.7.0 + 0.7.1 UTF-8