From d876b6c1bd6fcb8a3ef00189b09731444e7cac74 Mon Sep 17 00:00:00 2001
From: nkzawa <naoyuki.kanezawa@gmail.com>
Date: Sun, 31 Jan 2016 01:13:03 +0900
Subject: [PATCH] replace timestamp with yeast

---
 src/main/java/io/socket/engineio/client/Transport.java      | 2 --
 .../java/io/socket/engineio/client/transports/Polling.java  | 6 +++---
 .../io/socket/engineio/client/transports/WebSocket.java     | 4 ++--
 src/test/java/io/socket/engineio/client/TransportTest.java  | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/socket/engineio/client/Transport.java b/src/main/java/io/socket/engineio/client/Transport.java
index f5414c5..ca79ea9 100644
--- a/src/main/java/io/socket/engineio/client/Transport.java
+++ b/src/main/java/io/socket/engineio/client/Transport.java
@@ -30,8 +30,6 @@ public abstract class Transport extends Emitter {
     public static final String EVENT_REQUEST_HEADERS = "requestHeaders";
     public static final String EVENT_RESPONSE_HEADERS = "responseHeaders";
 
-    protected static int timestamps = 0;
-
     public boolean writable;
     public String name;
     public Map<String, String> query;
diff --git a/src/main/java/io/socket/engineio/client/transports/Polling.java b/src/main/java/io/socket/engineio/client/transports/Polling.java
index 12f43a2..1899241 100644
--- a/src/main/java/io/socket/engineio/client/transports/Polling.java
+++ b/src/main/java/io/socket/engineio/client/transports/Polling.java
@@ -1,15 +1,15 @@
 package io.socket.engineio.client.transports;
 
 
+import io.socket.emitter.Emitter;
 import io.socket.engineio.client.Transport;
 import io.socket.engineio.parser.Packet;
 import io.socket.engineio.parser.Parser;
 import io.socket.parseqs.ParseQS;
 import io.socket.thread.EventThread;
-import io.socket.emitter.Emitter;
 import io.socket.utf8.UTF8Exception;
+import io.socket.yeast.Yeast;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -200,7 +200,7 @@ abstract public class Polling extends Transport {
         String port = "";
 
         if (this.timestampRequests) {
-            query.put(this.timestampParam, String.valueOf(new Date().getTime()) + "-" + Transport.timestamps++);
+            query.put(this.timestampParam, Yeast.yeast());
         }
 
         String _query = ParseQS.encode(query);
diff --git a/src/main/java/io/socket/engineio/client/transports/WebSocket.java b/src/main/java/io/socket/engineio/client/transports/WebSocket.java
index ca1abe9..58a4c48 100644
--- a/src/main/java/io/socket/engineio/client/transports/WebSocket.java
+++ b/src/main/java/io/socket/engineio/client/transports/WebSocket.java
@@ -7,6 +7,7 @@ import io.socket.engineio.parser.Parser;
 import io.socket.parseqs.ParseQS;
 import io.socket.thread.EventThread;
 import io.socket.utf8.UTF8Exception;
+import io.socket.yeast.Yeast;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
@@ -18,7 +19,6 @@ import okio.Buffer;
 
 import javax.net.ssl.SSLSocketFactory;
 import java.io.IOException;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -211,7 +211,7 @@ public class WebSocket extends Transport {
         }
 
         if (this.timestampRequests) {
-            query.put(this.timestampParam, String.valueOf(new Date().getTime()));
+            query.put(this.timestampParam, Yeast.yeast());
         }
 
         String _query = ParseQS.encode(query);
diff --git a/src/test/java/io/socket/engineio/client/TransportTest.java b/src/test/java/io/socket/engineio/client/TransportTest.java
index 6a6272a..c4da70c 100644
--- a/src/test/java/io/socket/engineio/client/TransportTest.java
+++ b/src/test/java/io/socket/engineio/client/TransportTest.java
@@ -84,7 +84,7 @@ public class TransportTest {
         opt.timestampParam = "t";
         opt.timestampRequests = true;
         Polling polling = new Polling(opt);
-        assertThat(polling.uri().matches("http://localhost/engine.io\\?(j=[0-9]+&)?t=[0-9]+-[0-9]+"), is(true));
+        assertThat(polling.uri().matches("http://localhost/engine.io\\?(j=[0-9]+&)?t=[0-9A-Za-z-_.]+"), is(true));
     }
 
     @Test
@@ -144,7 +144,7 @@ public class TransportTest {
         opt.timestampParam = "woot";
         opt.timestampRequests = true;
         WS ws = new WS(opt);
-        assertThat(ws.uri().matches("ws://localhost/engine.io\\?woot=[0-9]+"), is(true));
+        assertThat(ws.uri().matches("ws://localhost/engine.io\\?woot=[0-9A-Za-z-_.]+"), is(true));
     }
 
     @Test