|
|
|
@ -195,10 +195,10 @@ public class JsonUtils {
|
|
|
|
|
for (Object key : json.keySet()) {
|
|
|
|
|
Object value = json.get(key);
|
|
|
|
|
|
|
|
|
|
if (value instanceof JSONObject)
|
|
|
|
|
extractJsonKeyValue((JSONObject)value, keyName, valueName);
|
|
|
|
|
else if (value instanceof JSONArray)
|
|
|
|
|
((JSONArray)value).forEach(obj -> extractJsonKeyValue((JSONObject)obj, keyName, valueName));
|
|
|
|
|
if (value instanceof JSONObject jo)
|
|
|
|
|
extractJsonKeyValue(jo, keyName, valueName);
|
|
|
|
|
else if (value instanceof JSONArray ja)
|
|
|
|
|
ja.forEach(obj -> extractJsonKeyValue((JSONObject)obj, keyName, valueName));
|
|
|
|
|
else{
|
|
|
|
|
//System.out.println(key + ", " + value);
|
|
|
|
|
keys.add(String.valueOf(key));
|
|
|
|
@ -238,10 +238,10 @@ public class JsonUtils {
|
|
|
|
|
for (Object key : json.keySet()) {
|
|
|
|
|
Object value = json.get(key);
|
|
|
|
|
|
|
|
|
|
if (value instanceof JSONObject)
|
|
|
|
|
extractJsonKeyValue((JSONObject)value, keyName, valueName);
|
|
|
|
|
else if (value instanceof JSONArray)
|
|
|
|
|
((JSONArray)value).forEach(obj -> extractJsonKeyValue((JSONObject)obj, keyName, valueName));
|
|
|
|
|
if (value instanceof JSONObject jo)
|
|
|
|
|
extractJsonKeyValue(jo, keyName, valueName);
|
|
|
|
|
else if (value instanceof JSONArray ja)
|
|
|
|
|
ja.forEach(obj -> extractJsonKeyValue((JSONObject)obj, keyName, valueName));
|
|
|
|
|
else{
|
|
|
|
|
//System.out.println(key + ", " + value);
|
|
|
|
|
keys.add(String.valueOf(key));
|
|
|
|
|