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

use org.json instead of Gson

Browse Source
This commit is contained in:
Naoyuki Kanezawa
2014-04-06 17:48:32 +09:00
parent f44cb0a956
commit 75b57a175f
7 changed files with 64 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -454,7 +454,7 @@ public class Manager extends Emitter {
}
private class Engine extends com.github.nkzawa.engineio.client.Socket {
private static class Engine extends com.github.nkzawa.engineio.client.Socket {
Engine(URI uri, Options opts) {
super(uri, opts);

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

@@ -4,9 +4,8 @@ import com.github.nkzawa.emitter.Emitter;
import com.github.nkzawa.socketio.parser.Packet;
import com.github.nkzawa.socketio.parser.Parser;
import com.github.nkzawa.thread.EventThread;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import org.json.JSONArray;
import org.json.JSONObject;
import java.util.*;
import java.util.logging.Logger;
@@ -18,8 +17,6 @@ public class Socket extends Emitter {
private static final Logger logger = Logger.getLogger(Socket.class.getName());
private static final Gson gson = new Gson();
/**
* Called on a connection.
*/
@@ -55,7 +52,7 @@ public class Socket extends Emitter {
private Manager io;
private Map<Integer, Ack> acks = new HashMap<Integer, Ack>();
private Queue<On.Handle> subs;
private final Queue<LinkedList<Object>> buffer = new LinkedList<LinkedList<Object>>();
private final Queue<List<Object>> buffer = new LinkedList<List<Object>>();
public Socket(Manager io, String nsp) {
@@ -150,7 +147,7 @@ public class Socket extends Emitter {
_args.addAll(Arrays.asList(args));
int parserType = Parser.EVENT;
// TODO: hasBin(_args)
Packet packet = new Packet(parserType, toJsonArray(_args));
Packet packet = new Packet(parserType, new JSONArray(_args));
if (_args.get(_args.size() - 1) instanceof Ack) {
logger.fine(String.format("emitting packet with ack id %d", Socket.this.ids));
@@ -182,7 +179,7 @@ public class Socket extends Emitter {
addAll(Arrays.asList(args));
}
}};
Packet packet = new Packet(Parser.EVENT, toJsonArray(_args));
Packet packet = new Packet(Parser.EVENT, new JSONArray(_args));
logger.fine(String.format("emitting packet with ack id %d", ids));
Socket.this.acks.put(ids, ack);
@@ -249,16 +246,16 @@ public class Socket extends Emitter {
}
private void onevent(Packet packet) {
LinkedList<Object> args = new LinkedList<Object>(fromJsonArray(packet.data.getAsJsonArray()));
List<Object> args = new ArrayList<Object>(Arrays.asList(toArray((JSONArray) packet.data)));
logger.fine(String.format("emitting event %s", args));
if (packet.id >= 0) {
logger.fine("attaching ack callback to event");
args.offerLast(this.ack(packet.id));
args.add(this.ack(packet.id));
}
if (this.connected) {
String event = (String)args.pollFirst();
String event = (String)args.remove(0);
super.emit(event, args.toArray());
} else {
this.buffer.add(args);
@@ -274,7 +271,7 @@ public class Socket extends Emitter {
if (sent[0]) return;
sent[0] = true;
logger.fine(String.format("sending ack %s", args));
Packet packet = new Packet(Parser.ACK, gson.toJsonTree(args));
Packet packet = new Packet(Parser.ACK, new JSONArray(args));
packet.id = id;
self.packet(packet);
}
@@ -284,7 +281,7 @@ public class Socket extends Emitter {
private void onack(Packet packet) {
logger.fine(String.format("calling ack %s with %s", packet.id, packet.data));
Ack fn = this.acks.remove(packet.id);
fn.call(fromJsonArray(packet.data.getAsJsonArray()).toArray());
fn.call(toArray((JSONArray) packet.data));
}
private void onconnect() {
@@ -295,12 +292,10 @@ public class Socket extends Emitter {
}
private void emitBuffered() {
synchronized (this.buffer) {
LinkedList<Object> data;
while ((data = this.buffer.poll()) != null) {
String event = (String)data.pollFirst();
super.emit(event, data.toArray());
}
List<Object> data;
while ((data = this.buffer.poll()) != null) {
String event = (String)data.get(0);
super.emit(event, data.toArray());
}
}
@@ -349,18 +344,12 @@ public class Socket extends Emitter {
return this.close();
}
private static JsonArray toJsonArray(List<Object> list) {
JsonArray data = new JsonArray();
for (Object v : list) {
data.add(v instanceof JsonElement ? (JsonElement)v : gson.toJsonTree(v));
}
return data;
}
private static List<Object> fromJsonArray(JsonArray array) {
List<Object> data = new ArrayList<Object>();
for (JsonElement v : array) {
data.add(v.isJsonPrimitive() || v.isJsonNull() ? gson.fromJson(v, Object.class) : v);
private static Object[] toArray(JSONArray array) {
int length = array.length();
Object[] data = new Object[length];
for (int i = 0; i < length; i++) {
Object v = array.get(i);
data[i] = v == JSONObject.NULL ? null : v;
}
return data;
}

5
src/main/java/com/github/nkzawa/socketio/parser/Packet.java
View File

@@ -1,13 +1,12 @@
package com.github.nkzawa.socketio.parser;
import com.google.gson.JsonElement;
public class Packet {
public int type = -1;
public int id = -1;
public String nsp;
public JsonElement data;
public Object data;
public int attachments;
public Packet() {}
@@ -16,7 +15,7 @@ public class Packet {
this.type = type;
}
public Packet(int type, JsonElement data) {
public Packet(int type, Object data) {
this.type = type;
this.data = data;
}

14
src/main/java/com/github/nkzawa/socketio/parser/Parser.java
View File

@@ -1,7 +1,8 @@
package com.github.nkzawa.socketio.parser;
import com.github.nkzawa.emitter.Emitter;
import com.google.gson.*;
import org.json.JSONException;
import org.json.JSONTokener;
import java.util.ArrayList;
import java.util.List;
@@ -11,9 +12,6 @@ public class Parser {
private static final Logger logger = Logger.getLogger(Parser.class.getName());
private static final Gson gson = new Gson();
private static final JsonParser json = new JsonParser();
/**
* Packet type `connect`.
*/
@@ -62,7 +60,7 @@ public class Parser {
private Parser() {}
private static Packet error() {
return new Packet(ERROR, new JsonPrimitive("parser error"));
return new Packet(ERROR, "parser error");
}
@@ -107,7 +105,7 @@ public class Parser {
if (obj.data != null) {
if (nsp) str.append(",");
str.append(gson.toJson(obj.data));
str.append(obj.data);
}
logger.fine(String.format("encoded %s as %s", obj, str));
@@ -211,10 +209,10 @@ public class Parser {
try {
str.charAt(++i);
p.data = json.parse(str.substring(i));
p.data = new JSONTokener(str.substring(i)).nextValue();
} catch (IndexOutOfBoundsException e) {
// do nothing
} catch (JsonParseException e) {
} catch (JSONException e) {
return error();
}