Revert back some invalid nanoTime usage, close AsyncHttpClient#280

Author: Stephane Landelle

api/src/main/java/com/ning/http/client/Realm.java

@@ -16,7 +16,6 @@
  */
 package com.ning.http.client;
 
-import static com.ning.http.util.DateUtil.millisTime;
 import static com.ning.http.util.MiscUtil.isNonEmpty;
 
 import java.io.UnsupportedEncodingException;
@@ -483,7 +482,7 @@ public RealmBuilder clone(Realm clone) {
         private void newCnonce() {
             try {
                 MessageDigest md = MessageDigest.getInstance("MD5");
-                byte[] b = md.digest(String.valueOf(millisTime()).getBytes("ISO-8859-1"));
+                byte[] b = md.digest(String.valueOf(System.currentTimeMillis()).getBytes("ISO-8859-1"));
                 cnonce = toHexString(b);
             } catch (Exception e) {
                 throw new SecurityException(e);

api/src/main/java/com/ning/http/client/ntlm/NTLMEngine.java

@@ -38,7 +38,6 @@
 
 package com.ning.http.client.ntlm;
 
-import static com.ning.http.util.DateUtil.millisTime;
 import com.ning.http.util.Base64;
 
 import javax.crypto.Cipher;
@@ -514,7 +513,7 @@ private static byte[] createBlob(byte[] clientChallenge, byte[] targetInformatio
         byte[] blobSignature = new byte[]{(byte) 0x01, (byte) 0x01, (byte) 0x00, (byte) 0x00};
         byte[] reserved = new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00};
         byte[] unknown1 = new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00};
-        long time = millisTime();
+        long time = System.currentTimeMillis();
         time += 11644473600000l; // milliseconds from January 1, 1601 -> epoch.
         time *= 10000; // tenths of a microsecond.
         // convert to little-endian byte array.

api/src/main/java/com/ning/http/client/oauth/OAuthSignatureCalculator.java

@@ -16,7 +16,6 @@
  */
 package com.ning.http.client.oauth;
 
-import static com.ning.http.util.DateUtil.millisTime;
 import com.ning.http.client.FluentStringsMap;
 import com.ning.http.client.Request;
 import com.ning.http.client.RequestBuilderBase;
@@ -78,15 +77,15 @@ public OAuthSignatureCalculator(ConsumerKey consumerAuth, RequestToken userAuth)
         mac = new ThreadSafeHMAC(consumerAuth, userAuth);
         this.consumerAuth = consumerAuth;
         this.userAuth = userAuth;
-        random = new Random(System.identityHashCode(this) + millisTime());
+        random = new Random(System.identityHashCode(this) + System.currentTimeMillis());
     }
 
     //@Override // silly 1.5; doesn't allow this for interfaces
 
     public void calculateAndAddSignature(String baseURL, Request request, RequestBuilderBase<?> requestBuilder) {
         String method = request.getMethod(); // POST etc
         String nonce = generateNonce();
-        long timestamp = millisTime() / 1000L;
+        long timestamp = System.currentTimeMillis() / 1000L;
         String signature = calculateSignature(method, baseURL, timestamp, nonce, request.getParams(), request.getQueryParams());
         String headerValue = constructAuthHeader(signature, nonce, timestamp);
         requestBuilder.setHeader(HEADER_AUTHORIZATION, headerValue);

api/src/main/java/com/ning/http/util/AsyncHttpProviderUtils.java

@@ -12,8 +12,6 @@
  */
 package com.ning.http.util;
 
-import static com.ning.http.util.DateUtil.millisTime;
-
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -547,7 +545,7 @@ public static int convertExpireField(String timestring) {
         for (SimpleDateFormat sdf : simpleDateFormat.get()) {
             Date date = sdf.parse(trimmedTimeString, new ParsePosition(0));
             if (date != null) {
-                long now = millisTime();
+                long now = System.currentTimeMillis();
                 long maxAgeMillis = date.getTime() - now;
                 return (int) (maxAgeMillis / 1000) + (maxAgeMillis % 1000 != 0 ? 1 : 0);
             }

providers/grizzly/src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -13,7 +13,6 @@
 
 package com.ning.http.client.providers.grizzly;
 
-import static com.ning.http.util.DateUtil.millisTime;
 import com.ning.org.jboss.netty.handler.codec.http.CookieDecoder;
 import com.ning.http.client.AsyncHandler;
 import com.ning.http.client.AsyncHttpClientConfig;
@@ -429,7 +428,7 @@ void touchConnection(final Connection c, final Request request) {
         int requestTimeout = AsyncHttpProviderUtils.requestTimeout(clientConfig, request);
         if (requestTimeout > 0) {
             if (resolver != null) {
-                resolver.setTimeoutMillis(c, millisTime() + requestTimeout);
+                resolver.setTimeoutMillis(c, System.currentTimeMillis() + requestTimeout);
             }
         }
 

providers/grizzly/src/main/java/com/ning/http/client/providers/grizzly/GrizzlyConnectionsPool.java

@@ -13,7 +13,6 @@
 
 package com.ning.http.client.providers.grizzly;
 
-import static com.ning.http.util.DateUtil.millisTime;
 import com.ning.http.client.AsyncHttpClientConfig;
 import com.ning.http.client.ConnectionsPool;
 
@@ -310,7 +309,7 @@ private class DelayedRunnable implements Runnable {
             @Override
             public void run() {
                 while (isStarted) {
-                    final long currentTimeMs = millisTime();
+                    final long currentTimeMs = System.currentTimeMillis();
 
                     for (final IdleConnectionQueue delayQueue : queues) {
                         if (delayQueue.queue.isEmpty()) continue;
@@ -381,7 +380,7 @@ public IdleConnectionQueue(final long timeout) {
 
             void offer(final Connection c) {
                 if (timeout >= 0) {
-                    resolver.setTimeoutMs(c, millisTime() + timeout);
+                    resolver.setTimeoutMs(c, System.currentTimeMillis() + timeout);
                 }
                 queue.offer(c);
                 count.incrementAndGet();

providers/netty/src/test/java/com/ning/http/client/providers/netty/NettyAsyncResponseTest.java

@@ -13,7 +13,6 @@
 
 package com.ning.http.client.providers.netty;
 
-import static com.ning.http.util.DateUtil.millisTime;
 import com.ning.http.client.Cookie;
 import com.ning.http.client.FluentCaseInsensitiveStringsMap;
 import com.ning.http.client.HttpResponseHeaders;
@@ -39,7 +38,7 @@ public void testCookieParseExpires() {
         SimpleDateFormat sdf = new SimpleDateFormat("EEE, dd-MMM-yyyy HH:mm:ss z", Locale.US);
         sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
 
-        Date date = new Date(millisTime() + 60000); // sdf.parse( dateString );
+        Date date = new Date(System.currentTimeMillis() + 60000); // sdf.parse( dateString );
         final String cookieDef = String.format("efmembercheck=true; expires=%s; path=/; domain=.eclipse.org", sdf.format(date));
 
         NettyResponse response = new NettyResponse(new ResponseStatus(null, null, null), new HttpResponseHeaders(null, null, false) {