remove callback

Author: apuig

analytics/src/main/java/com/segment/analytics/Analytics.java

@@ -141,7 +141,6 @@ public static class Builder {
     private int maximumFlushAttempts;
     private int maximumQueueSizeInBytes;
     private long flushIntervalInMillis;
-    private List<Callback> callbacks;
     private int queueCapacity;
     private boolean forceTlsV1 = false;
     private GsonBuilder gsonBuilder;
@@ -318,21 +317,6 @@ public Builder threadFactory(ThreadFactory threadFactory) {
       return this;
     }
 
-    /** Add a {@link Callback} to be notified when an event is processed. */
-    public Builder callback(Callback callback) {
-      if (callback == null) {
-        throw new NullPointerException("Null callback");
-      }
-      if (callbacks == null) {
-        callbacks = new ArrayList<>();
-      }
-      if (callbacks.contains(callback)) {
-        throw new IllegalStateException("Callback is already registered.");
-      }
-      callbacks.add(callback);
-      return this;
-    }
-
     /** Use a {@link Plugin} to configure the builder. */
     @Beta
     public Builder plugin(Plugin plugin) {
@@ -407,11 +391,6 @@ public Analytics build() {
       if (threadFactory == null) {
         threadFactory = Platform.get().defaultThreadFactory();
       }
-      if (callbacks == null) {
-        callbacks = Collections.emptyList();
-      } else {
-        callbacks = Collections.unmodifiableList(callbacks);
-      }
 
       HttpLoggingInterceptor interceptor =
           new HttpLoggingInterceptor(
@@ -463,7 +442,6 @@ public void log(String message) {
               log,
               threadFactory,
               networkExecutor,
-              callbacks,
               writeKey,
               gson);
 

analytics/src/main/java/com/segment/analytics/internal/AnalyticsClient.java

@@ -59,7 +59,6 @@ public class AnalyticsClient {
   private final int maximumRetries;
   private final int maximumQueueByteSize;
   private final Log log;
-  private final List<Callback> callbacks;
   private final ExecutorService networkExecutor;
     private final Thread looperThread;
   private final AtomicBoolean isShutDown;
@@ -76,7 +75,6 @@ public static AnalyticsClient create(
       Log log,
       ThreadFactory threadFactory,
       ExecutorService networkExecutor,
-      List<Callback> callbacks,
       String writeKey,
       Gson gsonInstance) {
     return new AnalyticsClient(
@@ -91,7 +89,6 @@ public static AnalyticsClient create(
         log,
         threadFactory,
         networkExecutor,
-        callbacks,
         new AtomicBoolean(false),
         writeKey,
         gsonInstance);
@@ -109,7 +106,6 @@ public AnalyticsClient(
       Log log,
       ThreadFactory threadFactory,
       ExecutorService networkExecutor,
-      List<Callback> callbacks,
       AtomicBoolean isShutDown,
       String writeKey,
       Gson gsonInstance) {
@@ -122,8 +118,7 @@ public AnalyticsClient(
     this.maximumRetries = maximumRetries;
     this.maximumQueueByteSize = maximumQueueSizeInBytes;
     this.log = log;
-    this.callbacks = callbacks;
-        this.looperThread = threadFactory.newThread(new Looper());
+    this.looperThread = threadFactory.newThread(new Looper());
     this.networkExecutor = networkExecutor;
     this.isShutDown = isShutDown;
     this.writeKey = writeKey;
@@ -290,11 +285,7 @@ static BatchUploadTask create(AnalyticsClient client, Batch batch, int maxRetrie
     }
 
     private void notifyCallbacksWithException(Batch batch, Exception exception) {
-      for (Message message : batch.batch()) {
-        for (Callback callback : client.callbacks) {
-          callback.failure(message, exception);          
-        }
-      }
+        // XXX failure
     }
 
     /** Returns {@code true} to indicate a batch should be retried. {@code false} otherwise. */
@@ -308,12 +299,7 @@ boolean upload() {
         if (response.isSuccessful()) {
           client.log.print(VERBOSE, "Uploaded batch %s.", batch.sequence());
 
-          for (Message message : batch.batch()) {
-            for (Callback callback : client.callbacks) {
-              callback.success(message);
-            }
-          }
-
+          // XXX success
           return false;
         }
 

analytics/src/test/java/com/segment/analytics/AnalyticsBuilderTest.java

@@ -381,46 +381,12 @@ public void buildsWithThreadFactory() {
     assertThat(analytics).isNotNull();
   }
 
-  @Test
-  public void nullCallback() {
-    try {
-      builder.callback(null);
-      fail("Should fail for null callback");
-    } catch (NullPointerException e) {
-      assertThat(e).hasMessage("Null callback");
-    }
-  }
-
-  @Test
-  public void duplicateCallback() {
-    Callback callback = mock(Callback.class);
-    try {
-      builder.callback(callback).callback(callback);
-    } catch (IllegalStateException e) {
-      assertThat(e).hasMessage("Callback is already registered.");
-    }
-  }
-
-  @Test
-  public void buildsWithValidCallback() {
-    Analytics analytics = builder.callback(mock(Callback.class)).build();
-    assertThat(analytics).isNotNull();
-  }
-
   @Test
   public void buildsWithForceTlsV1() {
     Analytics analytics = builder.forceTlsVersion1().build();
     assertThat(analytics).isNotNull();
   }
 
-  @Test
-  public void multipleCallbacks() {
-    Analytics analytics =
-        builder.callback(mock(Callback.class)).callback(mock(Callback.class)).build();
-
-    assertThat(analytics).isNotNull();
-  }
-
   @Test
   public void nullPlugin() {
     try {