fix format

Author: milaGGL

firebase-firestore/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
-- [fixed] Fix FAILED_PRECONDITION when writing to a deleted document in a transaction. Ported from web SDK  (#5871).JMASW N
+- [fixed] Fix FAILED_PRECONDITION when writing to a deleted document in a transaction. Ported from web SDK.
+  See the [issue report in GitHub](https://github.com/firebase/firebase-js-sdk/issues/5871).
 - [fixed] Fixed Firestore failing to raise initial snapshot from empty local cache result.
 
 # 24.4.0
@@ -11,7 +12,6 @@
 The Kotlin extensions library transitively includes the updated
   `firebase-firestore` library. The Kotlin extensions library has the following
   additional updates:
-SDEW
 * [feature] Firebase now supports Kotlin coroutines.
   With this release, we added
   [`kotlinx-coroutines-play-services`](https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-play-services/){: .external}

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java

@@ -250,11 +250,6 @@ public void testRunsTransactionsAfterGettingExistingDoc() {
     tt.withExistingDoc().run(get, set1, set2).expectDoc(map("foo", "bar2"));
   }
 
-  // This test is identical to the test above, except that withNonexistentDoc()
-  // is replaced by withDeletedDoc(), to guard against regression of
-  // https://github.com/firebase/firebase-js-sdk/issues/5871, where transactions
-  // would incorrectly fail with FAILED_PRECONDITION when operations were
-  // performed on a deleted document (rather than a non-existent document).
   @Test
   public void testRunsTransactionsAfterGettingNonexistentDoc() {
     FirebaseFirestore firestore = testFirestore();
@@ -273,6 +268,11 @@ public void testRunsTransactionsAfterGettingNonexistentDoc() {
     tt.withNonexistentDoc().run(get, set1, set2).expectDoc(map("foo", "bar2"));
   }
 
+  // This test is identical to the test above, except that withNonexistentDoc()
+  // is replaced by withDeletedDoc(), to guard against regression of
+  // https://github.com/firebase/firebase-js-sdk/issues/5871, where transactions
+  // would incorrectly fail with FAILED_PRECONDITION when operations were
+  // performed on a deleted document (rather than a non-existent document).
   @Test
   public void testRunsTransactionsAfterGettingDeletedDoc() {
     FirebaseFirestore firestore = testFirestore();

firebase-firestore/src/main/java/com/google/firebase/firestore/core/TransactionRunner.java

@@ -95,13 +95,13 @@ private void handleTransactionError(Task task) {
 
   private static boolean isRetryableTransactionError(Exception e) {
     if (e instanceof FirebaseFirestoreException) {
-      // In transactions, the backend will fail outdated reads with FAILED_PRECONDITION,non-matching
-      // document versions with ABORTED, and attempts to create already exists with ALREADY_EXISTS.
-      // These errors should be retried.
+      // In transactions, the backend will fail outdated reads with FAILED_PRECONDITION,
+      // non-matching document versions with ABORTED, and attempts to create already exists with
+      // ALREADY_EXISTS. These errors should be retried.
       FirebaseFirestoreException.Code code = ((FirebaseFirestoreException) e).getCode();
       return code == FirebaseFirestoreException.Code.ABORTED
-          || code == FirebaseFirestoreException.Code.FAILED_PRECONDITION
           || code == FirebaseFirestoreException.Code.ALREADY_EXISTS
+          || code == FirebaseFirestoreException.Code.FAILED_PRECONDITION
           || !Datastore.isPermanentError(((FirebaseFirestoreException) e).getCode());
     }
     return false;