Remove LastResult implementations

PiperOrigin-RevId: 319034882

Author: wilhuff

firestore/src/android/collection_reference_android.cc

@@ -121,10 +121,6 @@ Future<DocumentReference> CollectionReferenceInternal::Add(
   return promise.GetFuture();
 }
 
-Future<DocumentReference> CollectionReferenceInternal::AddLastResult() {
-  return promises_.LastResult<DocumentReference>(CollectionReferenceFn::kAdd);
-}
-
 /* static */
 bool CollectionReferenceInternal::Initialize(App* app) {
   JNIEnv* env = app->GetJNIEnv();

firestore/src/android/collection_reference_android.h

@@ -11,10 +11,10 @@ namespace firestore {
 
 // To make things simple, CollectionReferenceInternal uses the Future management
 // from its base class, QueryInternal. Each API of CollectionReference that
-// returns a Future needs to define an enum value to QueryFn. For example, Foo()
-// and FooLastResult() implementation relies on the enum value QueryFn::kFoo.
-// The enum values are used to identify and manage Future in the Firestore
-// Future manager.
+// returns a Future needs to define an enum value to QueryFn. For example, a
+// Future-returning method Foo() relies on the enum value QueryFn::kFoo. The
+// enum values are used to identify and manage Future in the Firestore Future
+// manager.
 using CollectionReferenceFn = QueryFn;
 
 // This is the Android implementation of CollectionReference.
@@ -29,7 +29,6 @@ class CollectionReferenceInternal : public QueryInternal {
   DocumentReference Document() const;
   DocumentReference Document(const std::string& document_path) const;
   Future<DocumentReference> Add(const MapFieldValue& data);
-  Future<DocumentReference> AddLastResult();
 
  private:
   friend class FirestoreInternal;

firestore/src/android/document_reference_android.cc

@@ -126,10 +126,6 @@ Future<DocumentSnapshot> DocumentReferenceInternal::Get(Source source) {
   return promise.GetFuture();
 }
 
-Future<DocumentSnapshot> DocumentReferenceInternal::GetLastResult() {
-  return promises_.LastResult<DocumentSnapshot>(DocumentReferenceFn::kGet);
-}
-
 Future<void> DocumentReferenceInternal::Set(const MapFieldValue& data,
                                             const SetOptions& options) {
   FieldValueInternal map_value(data);
@@ -149,10 +145,6 @@ Future<void> DocumentReferenceInternal::Set(const MapFieldValue& data,
   return promise.GetFuture();
 }
 
-Future<void> DocumentReferenceInternal::SetLastResult() {
-  return promises_.LastResult<void>(DocumentReferenceFn::kSet);
-}
-
 Future<void> DocumentReferenceInternal::Update(const MapFieldValue& data) {
   FieldValueInternal map_value(data);
   JNIEnv* env = firestore_->app()->GetJNIEnv();
@@ -197,10 +189,6 @@ Future<void> DocumentReferenceInternal::Update(const MapFieldPathValue& data) {
   return promise.GetFuture();
 }
 
-Future<void> DocumentReferenceInternal::UpdateLastResult() {
-  return promises_.LastResult<void>(DocumentReferenceFn::kUpdate);
-}
-
 Future<void> DocumentReferenceInternal::Delete() {
   JNIEnv* env = firestore_->app()->GetJNIEnv();
   jobject task = env->CallObjectMethod(
@@ -214,10 +202,6 @@ Future<void> DocumentReferenceInternal::Delete() {
   return promise.GetFuture();
 }
 
-Future<void> DocumentReferenceInternal::DeleteLastResult() {
-  return promises_.LastResult<void>(DocumentReferenceFn::kDelete);
-}
-
 #if defined(FIREBASE_USE_STD_FUNCTION)
 
 ListenerRegistration DocumentReferenceInternal::AddSnapshotListener(

firestore/src/android/document_reference_android.h

@@ -84,14 +84,6 @@ class DocumentReferenceInternal : public Wrapper {
    */
   Future<DocumentSnapshot> Get(Source source);
 
-  /**
-   * Gets the result of the most recent call to either of the Get() methods.
-   *
-   * @return The result of last call to Get() or an invalid Future, if there is
-   * no such call.
-   */
-  Future<DocumentSnapshot> GetLastResult();
-
   /**
    * Writes to this document.
    *
@@ -105,15 +97,6 @@ class DocumentReferenceInternal : public Wrapper {
    */
   Future<void> Set(const MapFieldValue& data, const SetOptions& options);
 
-  /**
-   * Gets the result of the most recent call to either of the Set()
-   * methods.
-   *
-   * @return The result of last call to Set() or an invalid Future, if there is
-   * no such call.
-   */
-  Future<void> SetLastResult();
-
   /**
    * Updates fields in this document.
    *
@@ -137,29 +120,13 @@ class DocumentReferenceInternal : public Wrapper {
    */
   Future<void> Update(const MapFieldPathValue& data);
 
-  /**
-   * Gets the result of the most recent call to Update().
-   *
-   * @return The result of last call to Update() or an invalid Future, if there
-   * is no such call.
-   */
-  Future<void> UpdateLastResult();
-
   /**
    * Removes this document.
    *
    * @return A Future that will be resolved when the delete completes.
    */
   Future<void> Delete();
 
-  /**
-   * Gets the result of the most recent call to Delete().
-   *
-   * @return The result of last call to Delete() or an invalid Future, if there
-   * is no such call.
-   */
-  Future<void> DeleteLastResult();
-
 #if defined(FIREBASE_USE_STD_FUNCTION)
   /**
    * @brief Starts listening to the document referenced by this

firestore/src/android/firestore_android.cc

@@ -411,10 +411,6 @@ Future<void> FirestoreInternal::RunTransaction(
 }
 #endif  // defined(FIREBASE_USE_STD_FUNCTION) || defined(DOXYGEN)
 
-Future<void> FirestoreInternal::RunTransactionLastResult() {
-  return LastResult(FirestoreFn::kRunTransaction);
-}
-
 Future<void> FirestoreInternal::DisableNetwork() {
   JNIEnv* env = app_->GetJNIEnv();
   jobject task = env->CallObjectMethod(
@@ -429,10 +425,6 @@ Future<void> FirestoreInternal::DisableNetwork() {
   return promise.GetFuture();
 }
 
-Future<void> FirestoreInternal::DisableNetworkLastResult() {
-  return LastResult(FirestoreFn::kDisableNetwork);
-}
-
 Future<void> FirestoreInternal::EnableNetwork() {
   JNIEnv* env = app_->GetJNIEnv();
   jobject task = env->CallObjectMethod(
@@ -447,10 +439,6 @@ Future<void> FirestoreInternal::EnableNetwork() {
   return promise.GetFuture();
 }
 
-Future<void> FirestoreInternal::EnableNetworkLastResult() {
-  return LastResult(FirestoreFn::kEnableNetwork);
-}
-
 Future<void> FirestoreInternal::Terminate() {
   JNIEnv* env = app_->GetJNIEnv();
 
@@ -466,10 +454,6 @@ Future<void> FirestoreInternal::Terminate() {
   return promise.GetFuture();
 }
 
-Future<void> FirestoreInternal::TerminateLastResult() {
-  return LastResult(FirestoreFn::kTerminate);
-}
-
 Future<void> FirestoreInternal::WaitForPendingWrites() {
   JNIEnv* env = app_->GetJNIEnv();
   jobject task = env->CallObjectMethod(
@@ -484,10 +468,6 @@ Future<void> FirestoreInternal::WaitForPendingWrites() {
   return promise.GetFuture();
 }
 
-Future<void> FirestoreInternal::WaitForPendingWritesLastResult() {
-  return LastResult(FirestoreFn::kWaitForPendingWrites);
-}
-
 Future<void> FirestoreInternal::ClearPersistence() {
   JNIEnv* env = app_->GetJNIEnv();
   jobject task = env->CallObjectMethod(
@@ -502,10 +482,6 @@ Future<void> FirestoreInternal::ClearPersistence() {
   return promise.GetFuture();
 }
 
-Future<void> FirestoreInternal::ClearPersistenceLastResult() {
-  return LastResult(FirestoreFn::kClearPersistence);
-}
-
 ListenerRegistration FirestoreInternal::AddSnapshotsInSyncListener(
     EventListener<void>* listener, bool passing_listener_ownership) {
   JNIEnv* env = app_->GetJNIEnv();

firestore/src/android/firestore_android.h

@@ -33,9 +33,9 @@ class WriteBatch;
 extern const char kApiIdentifier[];
 
 // Each API of Firestore that returns a Future needs to define an enum
-// value here. For example, Foo() and FooLastResult() implementation relies on
-// the enum value kFoo. The enum values are used to identify and manage Future
-// in the Firestore Future manager.
+// value here. For example, a Future-returning method Foo() relies on the enum
+// value kFoo. The enum values are used to identify and manage Future in the
+// Firestore Future manager.
 enum class FirestoreFn {
   kEnableNetwork = 0,
   kDisableNetwork,
@@ -93,24 +93,18 @@ class FirestoreInternal {
   Future<void> RunTransaction(
       std::function<Error(Transaction&, std::string&)> update);
 #endif  // defined(FIREBASE_USE_STD_FUNCTION) || defined(DOXYGEN)
-  Future<void> RunTransactionLastResult();
 
   // Disables network and gets anything from cache instead of server.
   Future<void> DisableNetwork();
-  Future<void> DisableNetworkLastResult();
 
   // Re-enables network after a prior call to DisableNetwork().
   Future<void> EnableNetwork();
-  Future<void> EnableNetworkLastResult();
 
   Future<void> Terminate();
-  Future<void> TerminateLastResult();
 
   Future<void> WaitForPendingWrites();
-  Future<void> WaitForPendingWritesLastResult();
 
   Future<void> ClearPersistence();
-  Future<void> ClearPersistenceLastResult();
 
   ListenerRegistration AddSnapshotsInSyncListener(
       EventListener<void>* listener, bool passing_listener_ownership = false);
@@ -160,11 +154,6 @@ class FirestoreInternal {
     return future_manager_.GetFutureApi(this);
   }
 
-  Future<void> LastResult(FirestoreFn id) {
-    const auto& result = ref_future()->LastResult(static_cast<int>(id));
-    return static_cast<const Future<void>&>(result);
-  }
-
   void ShutdownUserCallbackExecutor();
 
   static bool Initialize(App* app);

firestore/src/android/promise_factory_android.h

@@ -40,14 +40,6 @@ class PromiseFactory {
     return Promise<PublicT, InternalT, EnumT>{future_api(), firestore_};
   }
 
-  // A helper that generalizes the logic for FooLastResult() of each Foo()
-  // defined.
-  template <typename ResultType>
-  Future<ResultType> LastResult(EnumT index) {
-    const auto& result = future_api()->LastResult(static_cast<int>(index));
-    return static_cast<const Future<ResultType>&>(result);
-  }
-
  private:
   // Gets the reference-counted Future implementation of this instance, which
   // can be used to create a Future.

firestore/src/android/query_android.cc

@@ -86,10 +86,6 @@ Future<QuerySnapshot> QueryInternal::Get(Source source) {
   return promise.GetFuture();
 }
 
-Future<QuerySnapshot> QueryInternal::GetLastResult() {
-  return promises_.LastResult<QuerySnapshot>(QueryFn::kGet);
-}
-
 /* static */
 bool QueryInternal::Initialize(App* app) {
   JNIEnv* env = app->GetJNIEnv();

firestore/src/android/query_android.h

@@ -389,15 +389,6 @@ class QueryInternal : public Wrapper {
    */
   virtual Future<QuerySnapshot> Get(Source source);
 
-  /**
-   * @brief Gets the result of the most recent call to either of the Get()
-   * methods.
-   *
-   * @return The result of last call to Get() or an invalid Future, if there is
-   * no such call.
-   */
-  virtual Future<QuerySnapshot> GetLastResult();
-
 #if defined(FIREBASE_USE_STD_FUNCTION)
   /**
    * @brief Starts listening to the QuerySnapshot events referenced by this

firestore/src/android/write_batch_android.cc

@@ -111,10 +111,6 @@ Future<void> WriteBatchInternal::Commit() {
   return promise.GetFuture();
 }
 
-Future<void> WriteBatchInternal::CommitLastResult() {
-  return promises_.LastResult<void>(WriteBatchFn::kCommit);
-}
-
 /* static */
 bool WriteBatchInternal::Initialize(App* app) {
   JNIEnv* env = app->GetJNIEnv();