Getting Java Tracker ready for release

Author: jbeemster

build.gradle

@@ -31,8 +31,8 @@ apply plugin: 'propdeps-idea'
 
 group = 'com.snowplowanalytics'
 version = '0.8.0'
-sourceCompatibility = '1.6'
-targetCompatibility = '1.6'
+sourceCompatibility = '1.7'
+targetCompatibility = '1.7'
 
 repositories {
     // Use 'maven central' for resolving our dependencies

src/main/java/com/snowplowanalytics/snowplow/tracker/Subject.java

@@ -24,7 +24,7 @@
  */
 public class Subject {
 
-    private HashMap<String, String> standardPairs = new HashMap<String, String>();
+    private HashMap<String, String> standardPairs = new HashMap<>();
 
     /**
      * Creates a Subject which will add extra data to each event.

src/main/java/com/snowplowanalytics/snowplow/tracker/Tracker.java

@@ -306,9 +306,9 @@ private void addTrackerPayload(TrackerPayload payload, List<SelfDescribingJson>
 
         // Add subject if available
         if (eventSubject != null) {
-            payload.addMap(new HashMap<String, String>(eventSubject.getSubject()));
+            payload.addMap(new HashMap<>(eventSubject.getSubject()));
         } else if (this.subject != null) {
-            payload.addMap(new HashMap<String, String>(this.subject.getSubject()));
+            payload.addMap(new HashMap<>(this.subject.getSubject()));
         }
 
         // Send the event!
@@ -323,7 +323,7 @@ private void addTrackerPayload(TrackerPayload payload, List<SelfDescribingJson>
      * many contexts inside
      */
     private SelfDescribingJson getFinalContext(List<SelfDescribingJson> contexts) {
-        List<Map> contextMaps = new LinkedList<Map>();
+        List<Map> contextMaps = new LinkedList<>();
         for (SelfDescribingJson selfDescribingJson : contexts) {
             contextMaps.add(selfDescribingJson.getMap());
         }

src/main/java/com/snowplowanalytics/snowplow/tracker/emitter/AbstractEmitter.java

@@ -34,7 +34,7 @@ public abstract class AbstractEmitter implements Emitter {
     protected HttpClientAdapter httpClientAdapter;
     protected RequestCallback requestCallback;
     protected ExecutorService executor;
-    protected List<TrackerPayload> buffer = new ArrayList<TrackerPayload>();
+    protected List<TrackerPayload> buffer = new ArrayList<>();
     protected int bufferSize = 1;
 
     public static abstract class Builder<T extends Builder<T>> {
@@ -124,6 +124,13 @@ public void setBufferSize(int bufferSize) {
         this.bufferSize = bufferSize;
     }
 
+    /**
+     * When the buffer limit is reached sending of the buffer is
+     * initiated.
+     */
+    @Override
+    public abstract void flushBuffer();
+
     /**
      * Gets the Emitter Buffer Size
      * - Will always be 1 for SimpleEmitter

src/main/java/com/snowplowanalytics/snowplow/tracker/emitter/BatchEmitter.java

@@ -94,9 +94,9 @@ public synchronized void emit(TrackerPayload payload) {
      * When the buffer limit is reached sending of the buffer is
      * initiated.
      */
-    void flushBuffer() {
+    public void flushBuffer() {
         execute(getRequestRunnable(buffer));
-        buffer = new ArrayList<TrackerPayload>();
+        buffer = new ArrayList<>();
     }
 
     /**
@@ -146,7 +146,7 @@ public void run() {
      * @return the constructed POST payload
      */
     private SelfDescribingJson getFinalPost(List<TrackerPayload> buffer) {
-        List<Map> toSendPayloads = new ArrayList<Map>();
+        List<Map> toSendPayloads = new ArrayList<>();
         for (TrackerPayload payload : buffer) {
             toSendPayloads.add(payload.getMap());
         }

src/main/java/com/snowplowanalytics/snowplow/tracker/emitter/Emitter.java

@@ -40,6 +40,14 @@ public interface Emitter {
      */
     void setBufferSize(int bufferSize);
 
+    /**
+     * When the buffer limit is reached sending of the buffer is
+     * initiated.
+     *
+     * This can be used to manually start sending.
+     */
+    void flushBuffer();
+
     /**
      * Gets the Emitter Buffer Size
      * - Will always be 1 for SimpleEmitter

src/main/java/com/snowplowanalytics/snowplow/tracker/emitter/SimpleEmitter.java

@@ -62,6 +62,14 @@ public void emit(TrackerPayload payload) {
         execute(getRequestRunnable(payload));
     }
 
+    /**
+     * When the buffer limit is reached sending of the buffer is
+     * initiated.
+     */
+    public void flushBuffer() {
+        // Do nothing!
+    }
+
     /**
      * Returns a Runnable GET Request operation
      *
@@ -88,7 +96,7 @@ public void run() {
                 // Send the callback if available
                 if (requestCallback != null) {
                     if (failure != 0) {
-                        List<TrackerPayload> buffer = new ArrayList<TrackerPayload>();
+                        List<TrackerPayload> buffer = new ArrayList<>();
                         buffer.add(payload);
                         requestCallback.onFailure(success, buffer);
                     } else {

src/main/java/com/snowplowanalytics/snowplow/tracker/events/AbstractEvent.java

@@ -45,7 +45,7 @@ public abstract class AbstractEvent implements Event {
 
     public static abstract class Builder<T extends Builder<T>> {
 
-        private List<SelfDescribingJson> context = new LinkedList<SelfDescribingJson>();
+        private List<SelfDescribingJson> context = new LinkedList<>();
         private long timestamp = System.currentTimeMillis();
         private String eventId = Utils.getEventId();
         private Subject subject = null;
@@ -127,7 +127,7 @@ protected AbstractEvent(Builder<?> builder) {
      */
     @Override
     public List<SelfDescribingJson> getContext() {
-        return new ArrayList<SelfDescribingJson>(this.context);
+        return new ArrayList<>(this.context);
     }
 
     /**

src/main/java/com/snowplowanalytics/snowplow/tracker/events/EcommerceTransaction.java

@@ -146,7 +146,7 @@ public T items(List<EcommerceTransactionItem> items) {
          * @return itself
          */
         public T items(EcommerceTransactionItem... itemArgs) {
-            List<EcommerceTransactionItem> items = new ArrayList<EcommerceTransactionItem>();
+            List<EcommerceTransactionItem> items = new ArrayList<>();
             Collections.addAll(items, itemArgs);
             this.items = items;
             return self();

src/main/java/com/snowplowanalytics/snowplow/tracker/http/AbstractHttpClientAdapter.java

@@ -14,13 +14,6 @@
 
 // Java
 import java.util.Map;
-import java.util.Objects;
-
-// SquareUp
-import com.squareup.okhttp.OkHttpClient;
-
-// Apache
-import org.apache.http.impl.client.CloseableHttpClient;
 
 // Google
 import com.google.common.base.Preconditions;