diff --git a/build.gradle b/build.gradle index 99a2cbb..760ebc8 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ uploadArchives { authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD) } pom.project { - version '1.1.41' + version '1.1.43' artifactId ARTIFACT_Id groupId GROUP_ID packaging TYPE diff --git a/src/main/java/com/taover/util/UtilJSON.java b/src/main/java/com/taover/util/UtilJSON.java index c7504e5..e547ccc 100644 --- a/src/main/java/com/taover/util/UtilJSON.java +++ b/src/main/java/com/taover/util/UtilJSON.java @@ -6,6 +6,19 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; public class UtilJSON { + public static boolean isJsonNull(Object data){ + if(data == null){ + return true; + } + if(!(data instanceof String) && data.toString().equals("null")){ + return true; + } + if(data instanceof JSONObject && ((JSONObject) data).isNullObject()){ + return true; + } + return false; + } + public static void removeJsonNull(JSONObject data){ if(data == null || data.isNullObject()){ return; @@ -16,44 +29,35 @@ public class UtilJSON { Object value = data.get(keyItem); if(isJsonNull(value)) { - data.put(keyItem, ""); + data.remove(keyItem); + continue; } if(value instanceof JSONObject){ removeJsonNull((JSONObject)value); - continue; - } - - if(value instanceof JSONArray){ + }else if(value instanceof JSONArray){ removeJsonNull((JSONArray)value); } } } - - public static boolean isJsonNull(Object data){ - if(data == null){ - return true; - } - if(!(data instanceof String) && data.toString().equals("null")){ - return true; - } - if(data instanceof JSONObject && ((JSONObject) data).isNullObject()){ - return true; - } - return false; - } - + public static void removeJsonNull(JSONArray dataArr){ if(dataArr == null){ return; } for(int i=0; i