Removing Task references from database, iid and fcm APIs

src/main/java/com/google/firebase/database/DatabaseReference.java

@@ -33,8 +33,6 @@
 import com.google.firebase.database.utilities.Utilities;
 import com.google.firebase.database.utilities.Validation;
 import com.google.firebase.database.utilities.encoding.CustomClassMapper;
-import com.google.firebase.internal.TaskToApiFuture;
-import com.google.firebase.tasks.Task;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -177,7 +175,7 @@ public DatabaseReference push() {
    * @return The ApiFuture for this operation.
    */
   public ApiFuture<Void> setValueAsync(Object value) {
-    return new TaskToApiFuture<>(setValue(value));
+    return setValueInternal(value, PriorityUtilities.parsePriority(this.path, null), null);
   }
 
   /**
@@ -215,29 +213,6 @@ public ApiFuture<Void> setValueAsync(Object value) {
    * @return The ApiFuture for this operation.
    */
   public ApiFuture<Void> setValueAsync(Object value, Object priority) {
-    return new TaskToApiFuture<>(setValue(value, priority));
-  }
-
-  /**
-   * Similar to {@link #setValueAsync(Object)} but returns a Task.
-   *
-   * @param value The value to set at this location
-   * @return The {@link Task} for this operation.
-   * @deprecated Use {@link #setValueAsync(Object)}
-   */
-  public Task<Void> setValue(Object value) {
-    return setValueInternal(value, PriorityUtilities.parsePriority(this.path, null), null);
-  }
-
-  /**
-   * Similar to {@link #setValueAsync(Object, Object)} but returns a Task.
-   *
-   * @param value The value to set at this location
-   * @param priority The priority to set at this location
-   * @return The {@link Task} for this operation.
-   * @deprecated Use {@link #setValueAsync(Object, Object)}
-   */
-  public Task<Void> setValue(Object value, Object priority) {
     return setValueInternal(value, PriorityUtilities.parsePriority(this.path, priority), null);
   }
 
@@ -315,13 +290,14 @@ public void setValue(Object value, Object priority, CompletionListener listener)
     setValueInternal(value, PriorityUtilities.parsePriority(this.path, priority), listener);
   }
 
-  private Task<Void> setValueInternal(Object value, Node priority, CompletionListener optListener) {
+  private ApiFuture<Void> setValueInternal(Object value, Node priority, CompletionListener
+      optListener) {
     Validation.validateWritablePath(getPath());
     ValidationPath.validateWithObject(getPath(), value);
     Object bouncedValue = CustomClassMapper.convertToPlainJavaTypes(value);
     Validation.validateWritableObject(bouncedValue);
     final Node node = NodeUtilities.NodeFromJSON(bouncedValue, priority);
-    final Pair<Task<Void>, CompletionListener> wrapped = Utilities.wrapOnComplete(optListener);
+    final Pair<ApiFuture<Void>, CompletionListener> wrapped = Utilities.wrapOnComplete(optListener);
     repo.scheduleNow(
         new Runnable() {
           @Override
@@ -364,17 +340,6 @@ public void run() {
    * @return The ApiFuture for this operation.
    */
   public ApiFuture<Void> setPriorityAsync(Object priority) {
-    return new TaskToApiFuture<>(setPriority(priority));
-  }
-
-  /**
-   * Similar to {@link #setPriorityAsync(Object)} but returns a Task.
-   *
-   * @param priority The priority to set at the specified location.
-   * @return The {@link Task} for this operation.
-   * @deprecated Use {@link #setPriorityAsync(Object)}
-   */
-  public Task<Void> setPriority(Object priority) {
     return setPriorityInternal(PriorityUtilities.parsePriority(this.path, priority), null);
   }
 
@@ -413,10 +378,10 @@ public void setPriority(Object priority, CompletionListener listener) {
 
   // Remove
 
-  private Task<Void> setPriorityInternal(final Node priority, CompletionListener optListener) {
+  private ApiFuture<Void> setPriorityInternal(final Node priority, CompletionListener optListener) {
     Validation.validateWritablePath(getPath());
 
-    final Pair<Task<Void>, CompletionListener> wrapped = Utilities.wrapOnComplete(optListener);
+    final Pair<ApiFuture<Void>, CompletionListener> wrapped = Utilities.wrapOnComplete(optListener);
     repo.scheduleNow(
         new Runnable() {
           @Override
@@ -438,17 +403,6 @@ public void run() {
    * @return The ApiFuture for this operation.
    */
   public ApiFuture<Void> updateChildrenAsync(Map<String, Object> update) {
-    return new TaskToApiFuture<>(updateChildren(update));
-  }
-
-  /**
-   * Similar to {@link #updateChildrenAsync(Map)} but returns a Task.
-   *
-   * @param update The paths to update and their new values
-   * @return The {@link Task} for this operation.
-   * @deprecated Use {@link #updateChildrenAsync(Map)}
-   */
-  public Task<Void> updateChildren(Map<String, Object> update) {
     return updateChildrenInternal(update, null);
   }
 
@@ -467,7 +421,7 @@ public void updateChildren(final Map<String, Object> update, final CompletionLis
 
   // Transactions
 
-  private Task<Void> updateChildrenInternal(
+  private ApiFuture<Void> updateChildrenInternal(
       final Map<String, Object> update, final CompletionListener optListener) {
     if (update == null) {
       throw new NullPointerException("Can't pass null for argument 'update' in updateChildren()");
@@ -477,7 +431,7 @@ private Task<Void> updateChildrenInternal(
         Validation.parseAndValidateUpdate(getPath(), bouncedUpdate);
     final CompoundWrite merge = CompoundWrite.fromPathMerge(parsedUpdate);
 
-    final Pair<Task<Void>, CompletionListener> wrapped = Utilities.wrapOnComplete(optListener);
+    final Pair<ApiFuture<Void>, CompletionListener> wrapped = Utilities.wrapOnComplete(optListener);
     repo.scheduleNow(
         new Runnable() {
           @Override
@@ -494,17 +448,7 @@ public void run() {
    * @return The ApiFuture for this operation.
    */
   public ApiFuture<Void> removeValueAsync() {
-    return new TaskToApiFuture<>(removeValue());
-  }
-
-  /**
-   * Similar to {@link #removeValueAsync()} but returns a Task.
-   *
-   * @return The Task for this operation.
-   * @deprecated Use {@link #removeValueAsync()}
-   */
-  public Task<Void> removeValue() {
-    return setValue(null);
+    return setValueAsync(null);
   }
 
   // Manual Connection Management

src/main/java/com/google/firebase/database/OnDisconnect.java

@@ -28,8 +28,6 @@
 import com.google.firebase.database.utilities.Utilities;
 import com.google.firebase.database.utilities.Validation;
 import com.google.firebase.database.utilities.encoding.CustomClassMapper;
-import com.google.firebase.internal.TaskToApiFuture;
-import com.google.firebase.tasks.Task;
 
 import java.util.Map;
 
@@ -52,41 +50,6 @@ public class OnDisconnect {
     this.path = path;
   }
 
-  /**
-   * Similar to {@link #setValueAsync(Object)}, but returns a Task.
-   *
-   * @param value The value to be set when a disconnect occurs
-   * @return The {@link Task} for this operation.
-   * @deprecated Use {@link #setValueAsync(Object)}
-   */
-  public Task<Void> setValue(Object value) {
-    return onDisconnectSetInternal(value, PriorityUtilities.NullPriority(), null);
-  }
-
-  /**
-   * Similar to {@link #setValueAsync(Object, String)}, but returns a Task.
-   *
-   * @param value The value to be set when a disconnect occurs
-   * @param priority The priority to be set when a disconnect occurs
-   * @return The {@link Task} for this operation.
-   * @deprecated Use {@link #setValueAsync(Object, String)}
-   */
-  public Task<Void> setValue(Object value, String priority) {
-    return onDisconnectSetInternal(value, PriorityUtilities.parsePriority(path, priority), null);
-  }
-
-  /**
-   * Similar to {@link #setValueAsync(Object, double)}, but returns a Task.
-   *
-   * @param value The value to be set when a disconnect occurs
-   * @param priority The priority to be set when a disconnect occurs
-   * @return The {@link Task} for this operation.
-   * @deprecated Use {@link #setValueAsync(Object, double)}
-   */
-  public Task<Void> setValue(Object value, double priority) {
-    return onDisconnectSetInternal(value, PriorityUtilities.parsePriority(path, priority), null);
-  }
-
   /**
    * Ensure the data at this location is set to the specified value when the client is disconnected
    * (due to closing the browser, navigating to a new page, or network issues). <br>
@@ -157,7 +120,7 @@ public void setValue(Object value, Map priority, CompletionListener listener) {
    * @return The ApiFuture for this operation.
    */
   public ApiFuture<Void> setValueAsync(Object value) {
-    return new TaskToApiFuture<>(setValue(value));
+    return onDisconnectSetInternal(value, PriorityUtilities.NullPriority(), null);
   }
 
   /**
@@ -172,7 +135,7 @@ public ApiFuture<Void> setValueAsync(Object value) {
    * @return The ApiFuture for this operation.
    */
   public ApiFuture<Void> setValueAsync(Object value, String priority) {
-    return new TaskToApiFuture<>(setValue(value, priority));
+    return onDisconnectSetInternal(value, PriorityUtilities.parsePriority(path, priority), null);
   }
 
   /**
@@ -187,17 +150,17 @@ public ApiFuture<Void> setValueAsync(Object value, String priority) {
    * @return The ApiFuture for this operation.
    */
   public ApiFuture<Void> setValueAsync(Object value, double priority) {
-    return new TaskToApiFuture<>(setValue(value, priority));
+    return onDisconnectSetInternal(value, PriorityUtilities.parsePriority(path, priority), null);
   }
 
-  private Task<Void> onDisconnectSetInternal(
+  private ApiFuture<Void> onDisconnectSetInternal(
       Object value, Node priority, final CompletionListener optListener) {
     Validation.validateWritablePath(path);
     ValidationPath.validateWithObject(path, value);
     Object bouncedValue = CustomClassMapper.convertToPlainJavaTypes(value);
     Validation.validateWritableObject(bouncedValue);
     final Node node = NodeUtilities.NodeFromJSON(bouncedValue, priority);
-    final Pair<Task<Void>, CompletionListener> wrapped = Utilities.wrapOnComplete(optListener);
+    final Pair<ApiFuture<Void>, CompletionListener> wrapped = Utilities.wrapOnComplete(optListener);
     repo.scheduleNow(
         new Runnable() {
           @Override
@@ -210,17 +173,6 @@ public void run() {
 
   // Update
 
-  /**
-   * Similar to {@link #updateChildrenAsync(Map)}, but returns a Task.
-   *
-   * @param update The paths to update, along with their desired values
-   * @return The {@link Task} for this operation.
-   * @deprecated Use {@link #updateChildrenAsync(Map)}
-   */
-  public Task<Void> updateChildren(Map<String, Object> update) {
-    return updateChildrenInternal(update, null);
-  }
-
   /**
    * Ensure the data has the specified child values updated when the client is disconnected
    *
@@ -238,13 +190,13 @@ public void updateChildren(final Map<String, Object> update, final CompletionLis
    * @return The ApiFuture for this operation.
    */
   public ApiFuture<Void> updateChildrenAsync(Map<String, Object> update) {
-    return new TaskToApiFuture<>(updateChildren(update));
+    return updateChildrenInternal(update, null);
   }
 
-  private Task<Void> updateChildrenInternal(
+  private ApiFuture<Void> updateChildrenInternal(
       final Map<String, Object> update, final CompletionListener optListener) {
     final Map<Path, Node> parsedUpdate = Validation.parseAndValidateUpdate(path, update);
-    final Pair<Task<Void>, CompletionListener> wrapped = Utilities.wrapOnComplete(optListener);
+    final Pair<ApiFuture<Void>, CompletionListener> wrapped = Utilities.wrapOnComplete(optListener);
     repo.scheduleNow(
         new Runnable() {
           @Override
@@ -257,16 +209,6 @@ public void run() {
 
   // Remove
 
-  /**
-   * Similar to {@link #removeValueAsync()}, but returns a Task.
-   *
-   * @return The {@link Task} for this operation.
-   * @deprecated Use {@link #removeValueAsync()}
-   */
-  public Task<Void> removeValue() {
-    return setValue(null);
-  }
-
   /**
    * Remove the value at this location when the client disconnects
    *
@@ -282,21 +224,11 @@ public void removeValue(CompletionListener listener) {
    * @return The ApiFuture for this operation.
    */
   public ApiFuture<Void> removeValueAsync() {
-    return new TaskToApiFuture<>(removeValue());
+    return setValueAsync(null);
   }
 
   // Cancel the operation
 
-  /**
-   * Similar to {@link #cancelAsync()} ()}, but returns a Task.
-   *
-   * @return The {@link Task} for this operation.
-   * @deprecated Use {@link #cancelAsync()}.
-   */
-  public Task<Void> cancel() {
-    return cancelInternal(null);
-  }
-
   /**
    * Cancel any disconnect operations that are queued up at this location
    *
@@ -312,11 +244,11 @@ public void cancel(final CompletionListener listener) {
    * @return The ApiFuture for this operation.
    */
   public ApiFuture<Void> cancelAsync() {
-    return new TaskToApiFuture<>(cancel());
+    return cancelInternal(null);
   }
 
-  private Task<Void> cancelInternal(final CompletionListener optListener) {
-    final Pair<Task<Void>, CompletionListener> wrapped = Utilities.wrapOnComplete(optListener);
+  private ApiFuture<Void> cancelInternal(final CompletionListener optListener) {
+    final Pair<ApiFuture<Void>, CompletionListener> wrapped = Utilities.wrapOnComplete(optListener);
     repo.scheduleNow(
         new Runnable() {
           @Override

src/main/java/com/google/firebase/database/utilities/Utilities.java

@@ -16,6 +16,8 @@
 
 package com.google.firebase.database.utilities;
 
+import com.google.api.core.ApiFuture;
+import com.google.api.core.SettableApiFuture;
 import com.google.common.io.BaseEncoding;
 import com.google.firebase.database.DatabaseError;
 import com.google.firebase.database.DatabaseException;
@@ -237,22 +239,22 @@ public static void hardAssert(boolean condition, String message) {
     }
   }
 
-  public static Pair<Task<Void>, DatabaseReference.CompletionListener> wrapOnComplete(
+  public static Pair<ApiFuture<Void>, DatabaseReference.CompletionListener> wrapOnComplete(
       DatabaseReference.CompletionListener optListener) {
     if (optListener == null) {
-      final TaskCompletionSource<Void> source = new TaskCompletionSource<>();
+      final SettableApiFuture<Void> future = SettableApiFuture.create();
       DatabaseReference.CompletionListener listener =
           new DatabaseReference.CompletionListener() {
             @Override
             public void onComplete(DatabaseError error, DatabaseReference ref) {
               if (error != null) {
-                source.setException(error.toException());
+                future.setException(error.toException());
               } else {
-                source.setResult(null);
+                future.set(null);
               }
             }
           };
-      return new Pair<>(source.getTask(), listener);
+      return new Pair<ApiFuture<Void>, DatabaseReference.CompletionListener>(future, listener);
     } else {
       // If a listener is supplied we do not want to create a Task
       return new Pair<>(null, optListener);