bump engine.io-client

This commit is contained in:
nkzawa
2015-08-31 11:25:07 +09:00
parent d0039f7910
commit 33a47da3f6
14 changed files with 26 additions and 27 deletions

View File

@@ -56,9 +56,9 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.github.nkzawa</groupId> <groupId>io.socket</groupId>
<artifactId>engine.io-client</artifactId> <artifactId>engine.io-client</artifactId>
<version>0.6.0</version> <version>0.6.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>

View File

@@ -1,10 +1,10 @@
package io.socket.client; package io.socket.client;
import io.socket.backo.Backoff; import io.socket.backo.Backoff;
import com.github.nkzawa.emitter.Emitter; import io.socket.emitter.Emitter;
import io.socket.parser.Packet; import io.socket.parser.Packet;
import io.socket.parser.Parser; import io.socket.parser.Parser;
import com.github.nkzawa.thread.EventThread; import io.socket.thread.EventThread;
import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
@@ -14,7 +14,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
/** /**
* Manager class represents a connection to a given Socket.IO server. * Manager class represents a connection to a given Socket.IO server.
*/ */
@@ -90,7 +89,7 @@ public class Manager extends Emitter {
private List<Packet> packetBuffer; private List<Packet> packetBuffer;
private Queue<On.Handle> subs; private Queue<On.Handle> subs;
private Options opts; private Options opts;
/*package*/ com.github.nkzawa.engineio.client.Socket engine; /*package*/ io.socket.engineio.client.Socket engine;
private Parser.Encoder encoder; private Parser.Encoder encoder;
private Parser.Decoder decoder; private Parser.Decoder decoder;
@@ -252,7 +251,7 @@ public class Manager extends Emitter {
logger.fine(String.format("opening %s", Manager.this.uri)); logger.fine(String.format("opening %s", Manager.this.uri));
Manager.this.engine = new Engine(Manager.this.uri, Manager.this.opts); Manager.this.engine = new Engine(Manager.this.uri, Manager.this.opts);
final com.github.nkzawa.engineio.client.Socket socket = Manager.this.engine; final io.socket.engineio.client.Socket socket = Manager.this.engine;
final Manager self = Manager.this; final Manager self = Manager.this;
Manager.this.readyState = ReadyState.OPENING; Manager.this.readyState = ReadyState.OPENING;
Manager.this.skipReconnect = false; Manager.this.skipReconnect = false;
@@ -338,7 +337,7 @@ public class Manager extends Emitter {
this.readyState = ReadyState.OPEN; this.readyState = ReadyState.OPEN;
this.emit(EVENT_OPEN); this.emit(EVENT_OPEN);
final com.github.nkzawa.engineio.client.Socket socket = this.engine; final io.socket.engineio.client.Socket socket = this.engine;
this.subs.add(On.on(socket, Engine.EVENT_DATA, new Listener() { this.subs.add(On.on(socket, Engine.EVENT_DATA, new Listener() {
@Override @Override
public void call(Object... objects) { public void call(Object... objects) {
@@ -558,14 +557,14 @@ public class Manager extends Emitter {
} }
private static class Engine extends com.github.nkzawa.engineio.client.Socket { private static class Engine extends io.socket.engineio.client.Socket {
Engine(URI uri, Options opts) { Engine(URI uri, Options opts) {
super(uri, opts); super(uri, opts);
} }
} }
public static class Options extends com.github.nkzawa.engineio.client.Socket.Options { public static class Options extends io.socket.engineio.client.Socket.Options {
public boolean reconnection = true; public boolean reconnection = true;
public int reconnectionAttempts; public int reconnectionAttempts;

View File

@@ -1,6 +1,6 @@
package io.socket.client; package io.socket.client;
import com.github.nkzawa.emitter.Emitter; import io.socket.emitter.Emitter;
public class On { public class On {

View File

@@ -1,10 +1,10 @@
package io.socket.client; package io.socket.client;
import com.github.nkzawa.emitter.Emitter; import io.socket.emitter.Emitter;
import io.socket.hasbinary.HasBinary; import io.socket.hasbinary.HasBinary;
import io.socket.parser.Packet; import io.socket.parser.Packet;
import io.socket.parser.Parser; import io.socket.parser.Parser;
import com.github.nkzawa.thread.EventThread; import io.socket.thread.EventThread;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;

View File

@@ -1,6 +1,6 @@
package io.socket.parser; package io.socket.parser;
import com.github.nkzawa.emitter.Emitter; import io.socket.emitter.Emitter;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONTokener; import org.json.JSONTokener;

View File

@@ -1,6 +1,6 @@
package io.socket.client; package io.socket.client;
import com.github.nkzawa.emitter.Emitter; import io.socket.emitter.Emitter;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.junit.Test; import org.junit.Test;

View File

@@ -1,6 +1,6 @@
package io.socket.client; package io.socket.client;
import com.github.nkzawa.emitter.Emitter; import io.socket.emitter.Emitter;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

View File

@@ -1,9 +1,9 @@
package io.socket.client; package io.socket.client;
import com.github.nkzawa.emitter.Emitter; import io.socket.emitter.Emitter;
import com.github.nkzawa.engineio.client.Transport; import io.socket.engineio.client.Transport;
import com.github.nkzawa.engineio.client.transports.Polling; import io.socket.engineio.client.transports.Polling;
import com.github.nkzawa.engineio.client.transports.WebSocket; import io.socket.engineio.client.transports.WebSocket;
import org.json.JSONObject; import org.json.JSONObject;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -195,7 +195,7 @@ public class ServerConnectionTest extends Connection {
socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() { socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() {
@Override @Override
public void call(Object... args) { public void call(Object... args) {
socket.io().engine.on(com.github.nkzawa.engineio.client.Socket.EVENT_CLOSE, new Emitter.Listener() { socket.io().engine.on(io.socket.engineio.client.Socket.EVENT_CLOSE, new Emitter.Listener() {
@Override @Override
public void call(Object... objects) { public void call(Object... objects) {
values.offer("done"); values.offer("done");

View File

@@ -1,6 +1,6 @@
package io.socket.client; package io.socket.client;
import com.github.nkzawa.emitter.Emitter; import io.socket.emitter.Emitter;
import io.socket.util.Optional; import io.socket.util.Optional;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

View File

@@ -1,6 +1,6 @@
package io.socket.client.executions; package io.socket.client.executions;
import com.github.nkzawa.emitter.Emitter; import io.socket.emitter.Emitter;
import io.socket.client.IO; import io.socket.client.IO;
import io.socket.client.Socket; import io.socket.client.Socket;

View File

@@ -1,6 +1,6 @@
package io.socket.client.executions; package io.socket.client.executions;
import com.github.nkzawa.emitter.Emitter; import io.socket.emitter.Emitter;
import io.socket.client.IO; import io.socket.client.IO;
import io.socket.client.Socket; import io.socket.client.Socket;

View File

@@ -1,6 +1,6 @@
package io.socket.client.executions; package io.socket.client.executions;
import com.github.nkzawa.emitter.Emitter; import io.socket.emitter.Emitter;
import io.socket.client.IO; import io.socket.client.IO;
import io.socket.client.Socket; import io.socket.client.Socket;

View File

@@ -1,6 +1,6 @@
package io.socket.parser; package io.socket.parser;
import com.github.nkzawa.emitter.Emitter; import io.socket.emitter.Emitter;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;

View File

@@ -1,6 +1,6 @@
package io.socket.parser; package io.socket.parser;
import com.github.nkzawa.emitter.Emitter; import io.socket.emitter.Emitter;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;