Merge pull request #24 from ColinHebert/constant_delay

Refactor ConstantDelayReconnector

Author: komamitsu

src/main/java/org/fluentd/logger/sender/ConstantDelayReconnector.java

@@ -3,19 +3,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Deque;
 import java.util.LinkedList;
 
 /**
  * Calculate exponential delay for reconnecting
  */
 public class ConstantDelayReconnector implements Reconnector {
-    private static final Logger LOG = LoggerFactory.getLogger(ExponentialDelayReconnector.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConstantDelayReconnector.class);
 
     private double wait = 50; // Default wait to 50 ms
 
-    private int maxErrorHistorySize = 100;
+    private static final int MAX_ERROR_HISTORY_SIZE = 100;
 
-    private LinkedList<Long> errorHistory = new LinkedList<Long>();
+    private Deque<Long> errorHistory = new LinkedList<Long>();
 
     public ConstantDelayReconnector() {
         errorHistory = new LinkedList<Long>();
@@ -28,7 +29,7 @@ public ConstantDelayReconnector(int wait) {
 
     public void addErrorHistory(long timestamp) {
         errorHistory.addLast(timestamp);
-        if (errorHistory.size() > maxErrorHistorySize) {
+        if (errorHistory.size() > MAX_ERROR_HISTORY_SIZE) {
             errorHistory.removeFirst();
         }
     }
@@ -42,12 +43,6 @@ public void clearErrorHistory() {
     }
 
     public boolean enableReconnection(long timestamp) {
-        int size = errorHistory.size();
-        if (size == 0) {
-            return true;
-        }
-
-        return (!(timestamp - errorHistory.getLast() < wait));
+        return errorHistory.isEmpty() || timestamp - errorHistory.getLast() >= wait;
     }
-
-}
+}