Accept Proto3 JSON limits in Bundled Queries (#2463)

Author: schmidt-sebastian

firebase-firestore/CHANGELOG.md

@@ -1,4 +1,8 @@
-# Unreleased (22.1.0)
+# Unreleased (22.1.1)
+- [fixed] Fixed an issue that dropped the limit for queries loaded from
+  Bundles that were generated by the NodeJS SDK.
+
+# 22.10
 - [feature] Added support for Firestore Bundles via
   `FirebaseFirestore.loadBundle()` and `FirebaseFirestore.getNamedQuery()`.
   Bundles contain pre-packaged data produced with the NodeJS Server SDK and

firebase-firestore/src/main/java/com/google/firebase/firestore/bundle/BundleSerializer.java

@@ -162,7 +162,12 @@ private BundledQuery decodeBundledQuery(JSONObject bundledQuery) throws JSONExce
 
   private int decodeLimit(JSONObject structuredQuery) {
     JSONObject limit = structuredQuery.optJSONObject("limit");
-    return limit != null ? limit.optInt("value", -1) : -1;
+
+    if (limit != null) {
+      return limit.optInt("value", -1); // ProtobufJS
+    } else {
+      return structuredQuery.optInt("limit", -1); // Proto3 JSON
+    }
   }
 
   private Bound decodeBound(@Nullable JSONObject bound) throws JSONException {

firebase-firestore/src/test/java/com/google/firebase/firestore/bundle/BundleSerializerTest.java

@@ -553,9 +553,16 @@ public void testDecodeOrderByQuery() throws JSONException {
 
   @Test
   public void testDecodesLimitQuery() throws JSONException {
-    String json = "{ from: [ { collectionId: 'coll' } ], limit: { value: 5 } }";
-    Query query = TestUtil.query("coll").limitToFirst(5);
-    assertDecodesNamedQuery(json, query);
+    String[] json =
+        new String[] {
+          "{ from: [ { collectionId: 'coll' } ], limit: { value: 5 } }", // ProtobufJS
+          "{ from: [ { collectionId: 'coll' } ], limit: 5 }" // Proto3 JSON
+        };
+
+    for (String encoded : json) {
+      Query query = TestUtil.query("coll").limitToFirst(5);
+      assertDecodesNamedQuery(encoded, query);
+    }
   }
 
   @Test