Minor fixes and additions

- added rate limit support to SnapshotState
- added some additional utility function to Utils

Author: jpasqua

src/org/noroomattheinn/tesla/APICall.java

@@ -32,7 +32,6 @@ public abstract class APICall {
     private static double MaxRequestRate = 20.0 / (1000.0 * 60.0);  // 20 requests/minute
     private static long startTime = new Date().getTime();
     protected static long requestCount = 0;
-    private static final Logger logger = Logger.getLogger(APICall.class.getName());
 
     // Instance Variables
     private Resty       api;
@@ -73,11 +72,13 @@ public final boolean setAndRefresh(String newEndpoint) {
     public boolean refresh() {
         try {
             honorRateLimit();
-            if (endpoint != null)  setState(api.json(endpoint).object());
-            requestCount++;
+            if (endpoint != null) {
+                requestCount++;     // Count it even if it fails
+                setState(api.json(endpoint).object());
+            }
             return true;
         } catch (IOException | JSONException ex) {
-            Tesla.logger.log(Level.FINEST, null, ex);
+            Tesla.logger.log(Level.FINEST, "Failed refreshing. HANDLED.", ex);
             theState = new JSONObject();
             hasValidData = false;
             return false;
@@ -134,12 +135,12 @@ protected void honorRateLimit() {
             double rate = ((double) requestCount) / elapsedMillis;
             if (rate > MaxRequestRate) {
                 try {
-                    logger.log(
+                    Tesla.logger.log(
                         Level.INFO, "Throttling request rate. Requests: {0}, Millis: {1}\n",
                         new Object[]{requestCount, elapsedMillis});
-                    Thread.sleep(  (long) (((double)requestCount)/MaxRequestRate +  startTime - now ) );
+                    Thread.sleep(5 * 1000);     // Arbitrary amount of wait time
                 } catch (InterruptedException ex) {
-                    logger.log(Level.SEVERE, null, ex);
+                    Tesla.logger.log(Level.SEVERE, null, ex);
                 }
             } else return;
         }

src/org/noroomattheinn/tesla/SnapshotState.java

@@ -151,12 +151,12 @@ private BufferedReader prepareInternal() {
                         endpointFormat, vehicleWithToken.getStreamingVID(), allKeys);
 
                 honorRateLimit();
+                requestCount++;     // Count it even if it fails...
                 TextResource r = getAuthAPI(vehicleWithToken).text(endpoint);
-                requestCount++;
                 return new BufferedReader(new InputStreamReader(r.stream()));
             } catch (IOException ex) {
                 // Timed out or other problem
-                Tesla.logger.log(Level.INFO, null, ex);
+                Tesla.logger.log(Level.INFO, "Failed getting streaming data. HANDLED.", ex);
             }
             vehicleWithToken = null;    // Tokens may have expired, force refetch
             return null;

src/org/noroomattheinn/utils/Utils.java

@@ -6,6 +6,7 @@
 
 package org.noroomattheinn.utils;
 
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -127,14 +128,23 @@ public static double percentChange(double oldValue, double newValue) {
     }
 
     public static void sleep(long timeInMillis) {
-        long timeToSleep = timeInMillis;
-        long now = System.currentTimeMillis();
         try {
-            while (timeToSleep > 0) {
-                Thread.sleep(timeToSleep);
-                timeToSleep = timeInMillis - (System.currentTimeMillis() - now);
-                timeToSleep = Math.min(timeToSleep, timeInMillis);
-            }
+            Thread.sleep(timeInMillis);
         } catch (InterruptedException ex) { }
     }
+    
+    public static int compareVersions(String versionA, String versionB) {
+        String[] partsOfA = versionA.split("\\.");
+        String[] partsOfB = versionB.split("\\.");
+        int shortest = Math.min(partsOfA.length, partsOfB.length);
+
+        int i = 0;
+        while (i < shortest && partsOfA[i].equals(partsOfB[i])) { i++; }
+
+        if (i < shortest)
+            return Integer.valueOf(partsOfA[i]) - Integer.valueOf(partsOfB[i]);
+
+        return partsOfA.length - partsOfB.length;
+    }
+
 }