h4ckx0r/socket.io-client-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert JsonNull to null

Browse Source
This commit is contained in:
Naoyuki Kanezawa
2013-05-10 02:08:07 +09:00
parent 9833145266
commit 2e2da92245
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/github/nkzawa/socketio/client/Socket.java
View File

@@ -352,7 +352,7 @@ public class Socket extends Emitter {
private static List<Object> fromJsonArray(JsonArray array) { private static List<Object> fromJsonArray(JsonArray array) {
List<Object> data = new ArrayList<Object>(); List<Object> data = new ArrayList<Object>();
for (JsonElement v : array) { for (JsonElement v : array) {
data.add(v.isJsonPrimitive() ? gson.fromJson(v, Object.class) : v); data.add(v.isJsonPrimitive() || v.isJsonNull() ? gson.fromJson(v, Object.class) : v);
} }
return data; return data;
} }

6
src/test/java/com/github/nkzawa/socketio/client/ServerConnectionTest.java
View File

@@ -157,18 +157,18 @@ public class ServerConnectionTest {
@Override @Override
public void call(Object... objects) { public void call(Object... objects) {
System.out.println("connect:"); System.out.println("connect:");
socket.emit("echo", jsonData, "bar"); socket.emit("echo", jsonData, null, "bar");
} }
}).on("echoBack", new Emitter.Listener() { }).on("echoBack", new Emitter.Listener() {
@Override @Override
public void call(Object... objects) { public void call(Object... objects) {
System.out.println(String.format("echoBack: %s, %s", objects)); System.out.println(String.format("echoBack: %s, %s, %s", objects));
events.offer(objects); events.offer(objects);
} }
}); });
socket.connect(); socket.connect();
assertThat(events.take(), is(new Object[] {jsonData, "bar"})); assertThat(events.take(), is(new Object[] {jsonData, null, "bar"}));
socket.disconnect(); socket.disconnect();
} }