Skip to content

Commit 6e5fab3

Browse files
nkzawankzawa
committed
Merge branch 'master' into fix/compatible-v2
2 parents ad4449b + 9b5c684 commit 6e5fab3

File tree

6 files changed

+50
-31
lines changed

6 files changed

+50
-31
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Add the following dependency to your `pom.xml`.
2121
<dependency>
2222
<groupId>io.socket</groupId>
2323
<artifactId>socket.io-client</artifactId>
24-
<version>0.8.3</version>
24+
<version>0.9.0</version>
2525
</dependency>
2626
</dependencies>
2727
```
@@ -30,7 +30,7 @@ Add the following dependency to your `pom.xml`.
3030
Add it as a gradle dependency for Android Studio, in `build.gradle`:
3131

3232
```groovy
33-
compile ('io.socket:socket.io-client:0.8.3') {
33+
compile ('io.socket:socket.io-client:0.9.0') {
3434
// excluding org.json which is provided by Android
3535
exclude group: 'org.json', module: 'json'
3636
}
@@ -131,8 +131,8 @@ OkHttpClient okHttpClient = new OkHttpClient.Builder()
131131
.build();
132132

133133
// default settings for all sockets
134-
Socket.setDefaultOkHttpWebSocketFactory(okHttpClient);
135-
Socket.setDefaultOkHttpCallFactory(okHttpClient);
134+
IO.setDefaultOkHttpWebSocketFactory(okHttpClient);
135+
IO.setDefaultOkHttpCallFactory(okHttpClient);
136136

137137
// set as an option
138138
opts = new IO.Options();

‎src/main/java/io/socket/client/IO.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import okhttp3.OkHttpClient;
77
import okhttp3.WebSocket;
88

9+
import java.util.logging.Level;
910
import javax.net.ssl.HostnameVerifier;
1011
import javax.net.ssl.SSLContext;
1112
import java.net.URI;
@@ -75,11 +76,15 @@ public static Socket socket(URI uri, Options opts) {
7576
Manager io;
7677

7778
if (newConnection) {
78-
logger.fine(String.format("ignoring socket cache for %s", source));
79+
if (logger.isLoggable(Level.FINE)) {
80+
logger.fine(String.format("ignoring socket cache for %s", source));
81+
}
7982
io = new Manager(source, opts);
8083
} else {
8184
if (!managers.containsKey(id)) {
82-
logger.fine(String.format("new io instance for %s", source));
85+
if (logger.isLoggable(Level.FINE)) {
86+
logger.fine(String.format("new io instance for %s", source));
87+
}
8388
managers.putIfAbsent(id, new Manager(source, opts));
8489
}
8590
io = managers.get(id);

‎src/main/java/io/socket/client/Manager.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,14 @@ public Manager open(final OpenCallback fn) {
259259
EventThread.exec(new Runnable() {
260260
@Override
261261
public void run() {
262-
logger.fine(String.format("readyState %s", Manager.this.readyState));
262+
if (logger.isLoggable(Level.FINE)) {
263+
logger.fine(String.format("readyState %s", Manager.this.readyState));
264+
}
263265
if (Manager.this.readyState == ReadyState.OPEN || Manager.this.readyState == ReadyState.OPENING) return;
264266

265-
logger.fine(String.format("opening %s", Manager.this.uri));
267+
if (logger.isLoggable(Level.FINE)) {
268+
logger.fine(String.format("opening %s", Manager.this.uri));
269+
}
266270
Manager.this.engine = new Engine(Manager.this.uri, Manager.this.opts);
267271
final io.socket.engineio.client.Socket socket = Manager.this.engine;
268272
final Manager self = Manager.this;
@@ -467,7 +471,9 @@ public Socket socket(String nsp) {
467471
}
468472

469473
/*package*/ void packet(Packet packet) {
470-
logger.fine(String.format("writing packet %s", packet));
474+
if (logger.isLoggable(Level.FINE)) {
475+
logger.fine(String.format("writing packet %s", packet));
476+
}
471477
final Manager self = this;
472478

473479
if (packet.query != null && !packet.query.isEmpty() && packet.type == Parser.CONNECT) {

‎src/main/java/io/socket/client/Socket.java‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,9 @@ private void onopen() {
262262
}
263263

264264
private void onclose(String reason) {
265-
logger.fine(String.format("close (%s)", reason));
265+
if (logger.isLoggable(Level.FINE)) {
266+
logger.fine(String.format("close (%s)", reason));
267+
}
266268
this.connected = false;
267269
this.id = null;
268270
this.emit(EVENT_DISCONNECT, reason);
@@ -316,7 +318,9 @@ private void onpacket(Packet<?> packet) {
316318

317319
private void onevent(Packet<JSONArray> packet) {
318320
List<Object> args = new ArrayList<Object>(Arrays.asList(toArray(packet.data)));
319-
logger.fine(String.format("emitting event %s", args));
321+
if (logger.isLoggable(Level.FINE)) {
322+
logger.fine(String.format("emitting event %s", args));
323+
}
320324

321325
if (packet.id >= 0) {
322326
logger.fine("attaching ack callback to event");
@@ -343,7 +347,9 @@ public void call(final Object... args) {
343347
public void run() {
344348
if (sent[0]) return;
345349
sent[0] = true;
346-
logger.fine(String.format("sending ack %s", args.length != 0 ? args : null));
350+
if (logger.isLoggable(Level.FINE)) {
351+
logger.fine(String.format("sending ack %s", args.length != 0 ? args : null));
352+
}
347353

348354
JSONArray jsonArgs = new JSONArray();
349355
for (Object arg : args) {
@@ -362,10 +368,14 @@ public void run() {
362368
private void onack(Packet<JSONArray> packet) {
363369
Ack fn = this.acks.remove(packet.id);
364370
if (fn != null) {
365-
logger.fine(String.format("calling ack %s with %s", packet.id, packet.data));
371+
if (logger.isLoggable(Level.FINE)) {
372+
logger.fine(String.format("calling ack %s with %s", packet.id, packet.data));
373+
}
366374
fn.call(toArray(packet.data));
367375
} else {
368-
logger.fine(String.format("bad ack %s", packet.id));
376+
if (logger.isLoggable(Level.FINE)) {
377+
logger.fine(String.format("bad ack %s", packet.id));
378+
}
369379
}
370380
}
371381

@@ -391,7 +401,9 @@ private void emitBuffered() {
391401
}
392402

393403
private void ondisconnect() {
394-
logger.fine(String.format("server disconnect (%s)", this.nsp));
404+
if (logger.isLoggable(Level.FINE)) {
405+
logger.fine(String.format("server disconnect (%s)", this.nsp));
406+
}
395407
this.destroy();
396408
this.onclose("io server disconnect");
397409
}
@@ -418,7 +430,9 @@ public Socket close() {
418430
@Override
419431
public void run() {
420432
if (Socket.this.connected) {
421-
logger.fine(String.format("performing disconnect (%s)", Socket.this.nsp));
433+
if (logger.isLoggable(Level.FINE)) {
434+
logger.fine(String.format("performing disconnect (%s)", Socket.this.nsp));
435+
}
422436
Socket.this.packet(new Packet(Parser.DISCONNECT));
423437
}
424438

‎src/main/java/io/socket/parser/IOParser.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.socket.parser;
22

3-
import io.socket.client.IO;
43
import io.socket.hasbinary.HasBinary;
54
import org.json.JSONException;
65
import org.json.JSONTokener;
@@ -31,7 +30,9 @@ public void encode(Packet obj, Callback callback) {
3130
obj.type = obj.type == EVENT ? BINARY_EVENT : BINARY_ACK;
3231
}
3332

34-
logger.fine(String.format("encoding packet %s", obj));
33+
if (logger.isLoggable(Level.FINE)) {
34+
logger.fine(String.format("encoding packet %s", obj));
35+
}
3536

3637
if (BINARY_EVENT == obj.type || BINARY_ACK == obj.type) {
3738
encodeAsBinary(obj, callback);
@@ -62,7 +63,9 @@ private String encodeAsString(Packet obj) {
6263
str.append(obj.data);
6364
}
6465

65-
logger.fine(String.format("encoded %s as %s", obj, str));
66+
if (logger.isLoggable(Level.FINE)) {
67+
logger.fine(String.format("encoded %s as %s", obj, str));
68+
}
6669
return str.toString();
6770
}
6871

@@ -182,7 +185,9 @@ private static Packet decodeString(String str) {
182185
}
183186
}
184187

185-
logger.fine(String.format("decoded %s as %s", str, p));
188+
if (logger.isLoggable(Level.FINE)) {
189+
logger.fine(String.format("decoded %s as %s", str, p));
190+
}
186191
return p;
187192
}
188193

‎src/main/java/io/socket/parser/Parser.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
package io.socket.parser;
22

3-
import io.socket.emitter.Emitter;
4-
import io.socket.hasbinary.HasBinary;
5-
import org.json.JSONException;
6-
import org.json.JSONTokener;
7-
8-
import java.util.ArrayList;
9-
import java.util.Arrays;
10-
import java.util.List;
11-
import java.util.logging.Level;
12-
import java.util.logging.Logger;
13-
143
public interface Parser {
154

165
/**

0 commit comments

Comments
 (0)