github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

encode empty arrays as nulls by default, leave old function as a backup 

closes #1011
pull/1016/head
Justin Richer 2016-01-29 16:42:40 -05:00
parent 61433cc23a
commit f27df01ccc
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openid-connect-common/src/main/java/org/mitre/util/JsonUtils.java
View File

@ -35,6 +35,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonNull;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonSyntaxException; import com.google.gson.JsonSyntaxException;
import com.google.gson.reflect.TypeToken; import com.google.gson.reflect.TypeToken;
@ -61,13 +62,29 @@ public class JsonUtils {
private static Gson gson = new Gson(); private static Gson gson = new Gson();
/** /**
* Translate a set of strings to a JSON array * Translate a set of strings to a JSON array, empty array returned as null
* @param value * @param value
* @return * @return
*/ */
public static JsonElement getAsArray(Set<String> value) { public static JsonElement getAsArray(Set<String> value) {
return getAsArray(value, false);
}
/**
* Translate a set of strings to a JSON array, optionally preserving the empty array. Otherwise (default) empty array is returned as null.
* @param value
* @param preserveEmpty
* @return
*/
public static JsonElement getAsArray(Set<String> value, boolean preserveEmpty) {
if (!preserveEmpty && value != null && value.isEmpty()) {
// if we're not preserving empty arrays and the value is empty, return null
return JsonNull.INSTANCE;
} else {
return gson.toJsonTree(value, new TypeToken<Set<String>>(){}.getType()); return gson.toJsonTree(value, new TypeToken<Set<String>>(){}.getType());
} }
}
/** /**
* Gets the value of the given member (expressed as integer seconds since epoch) as a Date * Gets the value of the given member (expressed as integer seconds since epoch) as a Date