diff --git a/History.md b/History.md
index 6b02e66..53af5a8 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,8 @@
+0.6.1 / 2015-08-31
+==================
+
+* change package name to "io.socket"
+
0.6.0 / 2015-08-09
==================
diff --git a/README.md b/README.md
index 4b907c1..3bd3832 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
-# Socket.IO-client.java
-[](https://travis-ci.org/nkzawa/socket.io-client.java)
+# Socket.IO-client Java
+[](https://travis-ci.org/socketio/socket.io-client-java)
-This is the Socket.IO v1.x Client Library for Java, which is simply ported from the [JavaScript client](https://github.com/Automattic/socket.io-client).
+This is the Socket.IO v1.x Client Library for Java, which is simply ported from the [JavaScript client](https://github.com/socketio/socket.io-client).
See also:
- [Android chat demo](https://github.com/nkzawa/socket.io-android-chat)
-- [engine.io-client.java](https://github.com/nkzawa/engine.io-client.java)
+- [engine.io-client-java](https://github.com/socketio/engine.io-client-java)
## Installation
-The latest artifact is available on Maven Central. You'll also need [dependencies](http://nkzawa.github.io/socket.io-client.java/dependencies.html) to install.
+The latest artifact is available on Maven Central. You'll also need [dependencies](http://socketio.github.io/socket.io-client-java/dependencies.html) to install.
### Maven
Add the following dependency to your `pom.xml`.
@@ -17,9 +17,9 @@ Add the following dependency to your `pom.xml`.
```xml
- com.github.nkzawa
+ io.socket
socket.io-client
- 0.6.0
+ 0.6.1
```
@@ -28,11 +28,11 @@ Add the following dependency to your `pom.xml`.
Add it as a gradle dependency for Android Studio, in `build.gradle`:
```groovy
-compile 'com.github.nkzawa:socket.io-client:0.6.0'
+compile 'io.socket:socket.io-client:0.6.1'
```
## Usage
-Socket.IO-client.java has almost the same api and features with the original JS client. You use `IO#socket` to initialize `Socket`:
+Socket.IO-client Java has almost the same api and features with the original JS client. You use `IO#socket` to initialize `Socket`:
```java
socket = IO.socket("http://localhost");
@@ -131,7 +131,7 @@ socket = IO.socket("https://localhost", opts);
See the Javadoc for more details.
-http://nkzawa.github.io/socket.io-client.java/apidocs/
+http://socketio.github.io/socket.io-client-java/apidocs/
## Features
This library supports all of the features the JS client does, including events, options and upgrading transport. Android is fully supported.
diff --git a/pom.xml b/pom.xml
index 0a21df2..7a9f609 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
4.0.0
- com.github.nkzawa
+ io.socket
socket.io-client
- 0.6.1-SNAPSHOT
+ 0.6.2-SNAPSHOT
jar
socket.io-client
Socket.IO Client Library for Java
- https://github.com/nkzawa/socket.io-client.java
+ https://github.com/socketio/socket.io-client-java
org.sonatype.oss
@@ -27,9 +27,9 @@
- https://github.com/nkzawa/socket.io-client.java
- scm:git:git://github.com/nkzawa/socket.io-client.java.git
- scm:git:git@github.com:nkzawa/socket.io-client.java.git
+ https://github.com/socketio/socket.io-client-java
+ scm:git:git://github.com/socketio/socket.io-client-java.git
+ scm:git:git@github.com:socketio/socket.io-client-java.git
HEAD
@@ -56,9 +56,9 @@
- com.github.nkzawa
+ io.socket
engine.io-client
- 0.6.0
+ 0.6.1
org.json
diff --git a/src/main/java/com/github/nkzawa/backo/Backoff.java b/src/main/java/io/socket/backo/Backoff.java
similarity index 97%
rename from src/main/java/com/github/nkzawa/backo/Backoff.java
rename to src/main/java/io/socket/backo/Backoff.java
index 65f4260..4252266 100644
--- a/src/main/java/com/github/nkzawa/backo/Backoff.java
+++ b/src/main/java/io/socket/backo/Backoff.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.backo;
+package io.socket.backo;
public class Backoff {
diff --git a/src/main/java/com/github/nkzawa/socketio/client/Ack.java b/src/main/java/io/socket/client/Ack.java
similarity index 68%
rename from src/main/java/com/github/nkzawa/socketio/client/Ack.java
rename to src/main/java/io/socket/client/Ack.java
index eaf3f5c..8bd6a1e 100644
--- a/src/main/java/com/github/nkzawa/socketio/client/Ack.java
+++ b/src/main/java/io/socket/client/Ack.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
/**
* Acknowledgement.
diff --git a/src/main/java/com/github/nkzawa/socketio/client/IO.java b/src/main/java/io/socket/client/IO.java
similarity index 96%
rename from src/main/java/com/github/nkzawa/socketio/client/IO.java
rename to src/main/java/io/socket/client/IO.java
index 5385917..58b2941 100644
--- a/src/main/java/com/github/nkzawa/socketio/client/IO.java
+++ b/src/main/java/io/socket/client/IO.java
@@ -1,7 +1,7 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
-import com.github.nkzawa.socketio.parser.Parser;
+import io.socket.parser.Parser;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
diff --git a/src/main/java/com/github/nkzawa/socketio/client/Manager.java b/src/main/java/io/socket/client/Manager.java
similarity index 96%
rename from src/main/java/com/github/nkzawa/socketio/client/Manager.java
rename to src/main/java/io/socket/client/Manager.java
index 63f2c1d..c4169d7 100644
--- a/src/main/java/com/github/nkzawa/socketio/client/Manager.java
+++ b/src/main/java/io/socket/client/Manager.java
@@ -1,10 +1,10 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
-import com.github.nkzawa.backo.Backoff;
-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 io.socket.backo.Backoff;
+import io.socket.emitter.Emitter;
+import io.socket.parser.Packet;
+import io.socket.parser.Parser;
+import io.socket.thread.EventThread;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
@@ -14,7 +14,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-
/**
* Manager class represents a connection to a given Socket.IO server.
*/
@@ -90,7 +89,7 @@ public class Manager extends Emitter {
private List packetBuffer;
private Queue subs;
private Options opts;
- /*package*/ com.github.nkzawa.engineio.client.Socket engine;
+ /*package*/ io.socket.engineio.client.Socket engine;
private Parser.Encoder encoder;
private Parser.Decoder decoder;
@@ -252,7 +251,7 @@ public class Manager extends Emitter {
logger.fine(String.format("opening %s", Manager.this.uri));
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;
Manager.this.readyState = ReadyState.OPENING;
Manager.this.skipReconnect = false;
@@ -338,7 +337,7 @@ public class Manager extends Emitter {
this.readyState = ReadyState.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() {
@Override
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) {
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 int reconnectionAttempts;
diff --git a/src/main/java/com/github/nkzawa/socketio/client/On.java b/src/main/java/io/socket/client/On.java
similarity index 82%
rename from src/main/java/com/github/nkzawa/socketio/client/On.java
rename to src/main/java/io/socket/client/On.java
index c06acf9..b962f13 100644
--- a/src/main/java/com/github/nkzawa/socketio/client/On.java
+++ b/src/main/java/io/socket/client/On.java
@@ -1,6 +1,6 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
public class On {
diff --git a/src/main/java/com/github/nkzawa/socketio/client/Socket.java b/src/main/java/io/socket/client/Socket.java
similarity index 98%
rename from src/main/java/com/github/nkzawa/socketio/client/Socket.java
rename to src/main/java/io/socket/client/Socket.java
index 2b9ca1c..88f897e 100644
--- a/src/main/java/com/github/nkzawa/socketio/client/Socket.java
+++ b/src/main/java/io/socket/client/Socket.java
@@ -1,10 +1,10 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.hasbinary.HasBinary;
-import com.github.nkzawa.socketio.parser.Packet;
-import com.github.nkzawa.socketio.parser.Parser;
-import com.github.nkzawa.thread.EventThread;
+import io.socket.emitter.Emitter;
+import io.socket.hasbinary.HasBinary;
+import io.socket.parser.Packet;
+import io.socket.parser.Parser;
+import io.socket.thread.EventThread;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
diff --git a/src/main/java/com/github/nkzawa/socketio/client/SocketIOException.java b/src/main/java/io/socket/client/SocketIOException.java
similarity index 89%
rename from src/main/java/com/github/nkzawa/socketio/client/SocketIOException.java
rename to src/main/java/io/socket/client/SocketIOException.java
index 059976e..5ad67dc 100644
--- a/src/main/java/com/github/nkzawa/socketio/client/SocketIOException.java
+++ b/src/main/java/io/socket/client/SocketIOException.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
public class SocketIOException extends Exception {
diff --git a/src/main/java/com/github/nkzawa/socketio/client/Url.java b/src/main/java/io/socket/client/Url.java
similarity index 98%
rename from src/main/java/com/github/nkzawa/socketio/client/Url.java
rename to src/main/java/io/socket/client/Url.java
index 0096140..b983018 100644
--- a/src/main/java/com/github/nkzawa/socketio/client/Url.java
+++ b/src/main/java/io/socket/client/Url.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
import java.net.MalformedURLException;
import java.net.URI;
diff --git a/src/main/java/com/github/nkzawa/hasbinary/HasBinary.java b/src/main/java/io/socket/hasbinary/HasBinary.java
similarity index 97%
rename from src/main/java/com/github/nkzawa/hasbinary/HasBinary.java
rename to src/main/java/io/socket/hasbinary/HasBinary.java
index bcd8b93..368c061 100644
--- a/src/main/java/com/github/nkzawa/hasbinary/HasBinary.java
+++ b/src/main/java/io/socket/hasbinary/HasBinary.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.hasbinary;
+package io.socket.hasbinary;
import org.json.JSONArray;
import org.json.JSONException;
diff --git a/src/main/java/com/github/nkzawa/socketio/parser/Binary.java b/src/main/java/io/socket/parser/Binary.java
similarity index 98%
rename from src/main/java/com/github/nkzawa/socketio/parser/Binary.java
rename to src/main/java/io/socket/parser/Binary.java
index 44d47da..7cb158d 100644
--- a/src/main/java/com/github/nkzawa/socketio/parser/Binary.java
+++ b/src/main/java/io/socket/parser/Binary.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.parser;
+package io.socket.parser;
import org.json.JSONArray;
import org.json.JSONException;
diff --git a/src/main/java/com/github/nkzawa/socketio/parser/Packet.java b/src/main/java/io/socket/parser/Packet.java
similarity index 88%
rename from src/main/java/com/github/nkzawa/socketio/parser/Packet.java
rename to src/main/java/io/socket/parser/Packet.java
index 8bfe9ee..ae5e35b 100644
--- a/src/main/java/com/github/nkzawa/socketio/parser/Packet.java
+++ b/src/main/java/io/socket/parser/Packet.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.parser;
+package io.socket.parser;
public class Packet {
diff --git a/src/main/java/com/github/nkzawa/socketio/parser/Parser.java b/src/main/java/io/socket/parser/Parser.java
similarity index 98%
rename from src/main/java/com/github/nkzawa/socketio/parser/Parser.java
rename to src/main/java/io/socket/parser/Parser.java
index 95c69f4..806c00c 100644
--- a/src/main/java/com/github/nkzawa/socketio/parser/Parser.java
+++ b/src/main/java/io/socket/parser/Parser.java
@@ -1,6 +1,6 @@
-package com.github.nkzawa.socketio.parser;
+package io.socket.parser;
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
import org.json.JSONException;
import org.json.JSONTokener;
diff --git a/src/test/java/com/github/nkzawa/backo/BackoffTest.java b/src/test/java/io/socket/backo/BackoffTest.java
similarity index 95%
rename from src/test/java/com/github/nkzawa/backo/BackoffTest.java
rename to src/test/java/io/socket/backo/BackoffTest.java
index 443a913..5da719b 100644
--- a/src/test/java/com/github/nkzawa/backo/BackoffTest.java
+++ b/src/test/java/io/socket/backo/BackoffTest.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.backo;
+package io.socket.backo;
import org.junit.Test;
diff --git a/src/test/java/com/github/nkzawa/socketio/client/Connection.java b/src/test/java/io/socket/client/Connection.java
similarity index 98%
rename from src/test/java/com/github/nkzawa/socketio/client/Connection.java
rename to src/test/java/io/socket/client/Connection.java
index 08cc4c7..efb0133 100644
--- a/src/test/java/com/github/nkzawa/socketio/client/Connection.java
+++ b/src/test/java/io/socket/client/Connection.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
import org.junit.After;
import org.junit.Before;
diff --git a/src/test/java/com/github/nkzawa/socketio/client/ConnectionTest.java b/src/test/java/io/socket/client/ConnectionTest.java
similarity index 99%
rename from src/test/java/com/github/nkzawa/socketio/client/ConnectionTest.java
rename to src/test/java/io/socket/client/ConnectionTest.java
index 5ff2145..034733a 100644
--- a/src/test/java/com/github/nkzawa/socketio/client/ConnectionTest.java
+++ b/src/test/java/io/socket/client/ConnectionTest.java
@@ -1,6 +1,6 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
import org.json.JSONException;
import org.json.JSONObject;
import org.junit.Test;
diff --git a/src/test/java/com/github/nkzawa/socketio/client/ExecutionTest.java b/src/test/java/io/socket/client/ExecutionTest.java
similarity index 84%
rename from src/test/java/com/github/nkzawa/socketio/client/ExecutionTest.java
rename to src/test/java/io/socket/client/ExecutionTest.java
index ea0d804..1c6bb26 100644
--- a/src/test/java/com/github/nkzawa/socketio/client/ExecutionTest.java
+++ b/src/test/java/io/socket/client/ExecutionTest.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -21,17 +21,17 @@ public class ExecutionTest extends Connection {
@Test(timeout = TIMEOUT)
public void execConnection() throws InterruptedException, IOException {
- exec("com.github.nkzawa.socketio.client.executions.Connection");
+ exec("io.socket.client.executions.Connection");
}
@Test(timeout = TIMEOUT)
public void execConnectionFailure() throws InterruptedException, IOException {
- exec("com.github.nkzawa.socketio.client.executions.ConnectionFailure");
+ exec("io.socket.client.executions.ConnectionFailure");
}
@Test(timeout = TIMEOUT)
public void execImmediateClose() throws InterruptedException, IOException {
- exec("com.github.nkzawa.socketio.client.executions.ImmediateClose");
+ exec("io.socket.client.executions.ImmediateClose");
}
private void exec(String mainClass) throws InterruptedException, IOException {
diff --git a/src/test/java/com/github/nkzawa/socketio/client/SSLConnectionTest.java b/src/test/java/io/socket/client/SSLConnectionTest.java
similarity index 97%
rename from src/test/java/com/github/nkzawa/socketio/client/SSLConnectionTest.java
rename to src/test/java/io/socket/client/SSLConnectionTest.java
index 7877115..e4585c5 100644
--- a/src/test/java/com/github/nkzawa/socketio/client/SSLConnectionTest.java
+++ b/src/test/java/io/socket/client/SSLConnectionTest.java
@@ -1,6 +1,6 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/src/test/java/com/github/nkzawa/socketio/client/ServerConnectionNamespaceTest.java b/src/test/java/io/socket/client/ServerConnectionNamespaceTest.java
similarity index 84%
rename from src/test/java/com/github/nkzawa/socketio/client/ServerConnectionNamespaceTest.java
rename to src/test/java/io/socket/client/ServerConnectionNamespaceTest.java
index 53245ef..46974b0 100644
--- a/src/test/java/com/github/nkzawa/socketio/client/ServerConnectionNamespaceTest.java
+++ b/src/test/java/io/socket/client/ServerConnectionNamespaceTest.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
diff --git a/src/test/java/com/github/nkzawa/socketio/client/ServerConnectionTest.java b/src/test/java/io/socket/client/ServerConnectionTest.java
similarity index 97%
rename from src/test/java/com/github/nkzawa/socketio/client/ServerConnectionTest.java
rename to src/test/java/io/socket/client/ServerConnectionTest.java
index b0fe60d..6c421a1 100644
--- a/src/test/java/com/github/nkzawa/socketio/client/ServerConnectionTest.java
+++ b/src/test/java/io/socket/client/ServerConnectionTest.java
@@ -1,9 +1,9 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.engineio.client.Transport;
-import com.github.nkzawa.engineio.client.transports.Polling;
-import com.github.nkzawa.engineio.client.transports.WebSocket;
+import io.socket.emitter.Emitter;
+import io.socket.engineio.client.Transport;
+import io.socket.engineio.client.transports.Polling;
+import io.socket.engineio.client.transports.WebSocket;
import org.json.JSONObject;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -195,7 +195,7 @@ public class ServerConnectionTest extends Connection {
socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() {
@Override
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
public void call(Object... objects) {
values.offer("done");
diff --git a/src/test/java/com/github/nkzawa/socketio/client/SocketTest.java b/src/test/java/io/socket/client/SocketTest.java
similarity index 96%
rename from src/test/java/com/github/nkzawa/socketio/client/SocketTest.java
rename to src/test/java/io/socket/client/SocketTest.java
index a8f1ab7..800ae1f 100644
--- a/src/test/java/com/github/nkzawa/socketio/client/SocketTest.java
+++ b/src/test/java/io/socket/client/SocketTest.java
@@ -1,7 +1,7 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.util.Optional;
+import io.socket.emitter.Emitter;
+import io.socket.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
diff --git a/src/test/java/com/github/nkzawa/socketio/client/UrlTest.java b/src/test/java/io/socket/client/UrlTest.java
similarity index 98%
rename from src/test/java/com/github/nkzawa/socketio/client/UrlTest.java
rename to src/test/java/io/socket/client/UrlTest.java
index aebad39..895af4d 100644
--- a/src/test/java/com/github/nkzawa/socketio/client/UrlTest.java
+++ b/src/test/java/io/socket/client/UrlTest.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.client;
+package io.socket.client;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/src/test/java/com/github/nkzawa/socketio/client/executions/Connection.java b/src/test/java/io/socket/client/executions/Connection.java
similarity index 75%
rename from src/test/java/com/github/nkzawa/socketio/client/executions/Connection.java
rename to src/test/java/io/socket/client/executions/Connection.java
index 4e4a845..1d1a8c8 100644
--- a/src/test/java/com/github/nkzawa/socketio/client/executions/Connection.java
+++ b/src/test/java/io/socket/client/executions/Connection.java
@@ -1,8 +1,8 @@
-package com.github.nkzawa.socketio.client.executions;
+package io.socket.client.executions;
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.socketio.client.IO;
-import com.github.nkzawa.socketio.client.Socket;
+import io.socket.emitter.Emitter;
+import io.socket.client.IO;
+import io.socket.client.Socket;
import java.net.URISyntaxException;
diff --git a/src/test/java/com/github/nkzawa/socketio/client/executions/ConnectionFailure.java b/src/test/java/io/socket/client/executions/ConnectionFailure.java
similarity index 84%
rename from src/test/java/com/github/nkzawa/socketio/client/executions/ConnectionFailure.java
rename to src/test/java/io/socket/client/executions/ConnectionFailure.java
index 78fc9f9..92c9b3b 100644
--- a/src/test/java/com/github/nkzawa/socketio/client/executions/ConnectionFailure.java
+++ b/src/test/java/io/socket/client/executions/ConnectionFailure.java
@@ -1,8 +1,8 @@
-package com.github.nkzawa.socketio.client.executions;
+package io.socket.client.executions;
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.socketio.client.IO;
-import com.github.nkzawa.socketio.client.Socket;
+import io.socket.emitter.Emitter;
+import io.socket.client.IO;
+import io.socket.client.Socket;
import java.net.URISyntaxException;
diff --git a/src/test/java/com/github/nkzawa/socketio/client/executions/ImmediateClose.java b/src/test/java/io/socket/client/executions/ImmediateClose.java
similarity index 80%
rename from src/test/java/com/github/nkzawa/socketio/client/executions/ImmediateClose.java
rename to src/test/java/io/socket/client/executions/ImmediateClose.java
index dc7b317..1e889fd 100644
--- a/src/test/java/com/github/nkzawa/socketio/client/executions/ImmediateClose.java
+++ b/src/test/java/io/socket/client/executions/ImmediateClose.java
@@ -1,8 +1,8 @@
-package com.github.nkzawa.socketio.client.executions;
+package io.socket.client.executions;
-import com.github.nkzawa.emitter.Emitter;
-import com.github.nkzawa.socketio.client.IO;
-import com.github.nkzawa.socketio.client.Socket;
+import io.socket.emitter.Emitter;
+import io.socket.client.IO;
+import io.socket.client.Socket;
import java.net.URISyntaxException;
diff --git a/src/test/java/com/github/nkzawa/hasbinary/HasBinaryTest.java b/src/test/java/io/socket/hasbinary/HasBinaryTest.java
similarity index 98%
rename from src/test/java/com/github/nkzawa/hasbinary/HasBinaryTest.java
rename to src/test/java/io/socket/hasbinary/HasBinaryTest.java
index 81b1f1f..c83fca6 100644
--- a/src/test/java/com/github/nkzawa/hasbinary/HasBinaryTest.java
+++ b/src/test/java/io/socket/hasbinary/HasBinaryTest.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.hasbinary;
+package io.socket.hasbinary;
import org.json.JSONArray;
import org.json.JSONException;
diff --git a/src/test/java/com/github/nkzawa/socketio/parser/ByteArrayTest.java b/src/test/java/io/socket/parser/ByteArrayTest.java
similarity index 97%
rename from src/test/java/com/github/nkzawa/socketio/parser/ByteArrayTest.java
rename to src/test/java/io/socket/parser/ByteArrayTest.java
index 39f19ce..5154cec 100644
--- a/src/test/java/com/github/nkzawa/socketio/parser/ByteArrayTest.java
+++ b/src/test/java/io/socket/parser/ByteArrayTest.java
@@ -1,6 +1,6 @@
-package com.github.nkzawa.socketio.parser;
+package io.socket.parser;
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
diff --git a/src/test/java/com/github/nkzawa/socketio/parser/Helpers.java b/src/test/java/io/socket/parser/Helpers.java
similarity index 97%
rename from src/test/java/com/github/nkzawa/socketio/parser/Helpers.java
rename to src/test/java/io/socket/parser/Helpers.java
index 505b0d2..365969c 100644
--- a/src/test/java/com/github/nkzawa/socketio/parser/Helpers.java
+++ b/src/test/java/io/socket/parser/Helpers.java
@@ -1,6 +1,6 @@
-package com.github.nkzawa.socketio.parser;
+package io.socket.parser;
-import com.github.nkzawa.emitter.Emitter;
+import io.socket.emitter.Emitter;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
diff --git a/src/test/java/com/github/nkzawa/socketio/parser/ParserTest.java b/src/test/java/io/socket/parser/ParserTest.java
similarity index 97%
rename from src/test/java/com/github/nkzawa/socketio/parser/ParserTest.java
rename to src/test/java/io/socket/parser/ParserTest.java
index 9f355e6..d7ff220 100644
--- a/src/test/java/com/github/nkzawa/socketio/parser/ParserTest.java
+++ b/src/test/java/io/socket/parser/ParserTest.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.socketio.parser;
+package io.socket.parser;
import org.json.JSONArray;
import org.json.JSONException;
diff --git a/src/test/java/com/github/nkzawa/util/Optional.java b/src/test/java/io/socket/util/Optional.java
similarity index 96%
rename from src/test/java/com/github/nkzawa/util/Optional.java
rename to src/test/java/io/socket/util/Optional.java
index 1f8c423..b9f5023 100644
--- a/src/test/java/com/github/nkzawa/util/Optional.java
+++ b/src/test/java/io/socket/util/Optional.java
@@ -1,4 +1,4 @@
-package com.github.nkzawa.util;
+package io.socket.util;
import java.util.NoSuchElementException;