Don't fail Bundle loading if nanos/seconds not set (#2399)

Author: schmidt-sebastian

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

@@ -251,9 +251,9 @@ private Value decodeValue(JSONObject value) throws JSONException {
     } else if (value.has("booleanValue")) {
       builder.setBooleanValue(value.optBoolean("booleanValue", false));
     } else if (value.has("integerValue")) {
-      builder.setIntegerValue(value.optLong("integerValue", 0));
+      builder.setIntegerValue(value.optLong("integerValue"));
     } else if (value.has("doubleValue")) {
-      builder.setDoubleValue(value.optDouble("doubleValue", 0.0));
+      builder.setDoubleValue(value.optDouble("doubleValue"));
     } else if (value.has("timestampValue")) {
       decodeTimestamp(builder, value.get("timestampValue"));
     } else if (value.has("stringValue")) {
@@ -302,12 +302,12 @@ private void decodeMapValue(Value.Builder builder, @Nullable JSONObject map)
   private void decodeGeoPoint(Value.Builder builder, JSONObject geoPoint) {
     builder.setGeoPointValue(
         LatLng.newBuilder()
-            .setLatitude(geoPoint.optDouble("latitude", 0.0))
-            .setLongitude(geoPoint.optDouble("longitude", 0.0)));
+            .setLatitude(geoPoint.optDouble("latitude"))
+            .setLongitude(geoPoint.optDouble("longitude")));
   }
 
-  private Timestamp decodeTimestamp(JSONObject timestamp) throws JSONException {
-    return new Timestamp(timestamp.getLong("seconds"), timestamp.getInt("nanos"));
+  private Timestamp decodeTimestamp(JSONObject timestamp) {
+    return new Timestamp(timestamp.optLong("seconds"), timestamp.optInt("nanos"));
   }
 
   private Timestamp decodeTimestamp(String timestamp) {

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

@@ -148,19 +148,34 @@ public void testDecodesStringValues() throws JSONException {
   public void testDecodesDateValues() throws JSONException {
     String[] json =
         new String[] {
-          "'2020-01-01T01:00:00.001Z'", "{ seconds: 1577840400, nanos: 1000000 }",
-          "'2020-01-01T01:02:00.001002Z'", "{ seconds: '1577840520', nanos: 1002000 }",
-          "'2020-01-01T01:02:03.001002003Z'", "{ seconds: 1577840523, nanos: 1002003 }",
+          "'1970-01-01T00:00:00.000Z'",
+          "{ }",
+          "'1970-01-01T00:00:00.001Z'",
+          "{ nanos: 1000000 }",
+          "'2020-01-01T01:00:00.000Z'",
+          "{ seconds: 1577840400 }",
+          "'2020-01-01T01:00:00.001Z'",
+          "{ seconds: 1577840400, nanos: 1000000 }",
+          "'2020-01-01T01:02:00.001002Z'",
+          "{ seconds: '1577840520', nanos: 1002000 }",
+          "'2020-01-01T01:02:03.001002003Z'",
+          "{ seconds: 1577840523, nanos: 1002003 }",
         };
 
     Timestamp[] timestamps =
         new Timestamp[] {
+          Timestamp.newBuilder().setNanos(0).setSeconds(0).build(),
+          Timestamp.newBuilder().setNanos(0).setSeconds(0).build(),
+          Timestamp.newBuilder().setNanos(1000000).setSeconds(0).build(),
+          Timestamp.newBuilder().setNanos(1000000).setSeconds(0).build(),
+          Timestamp.newBuilder().setNanos(0).setSeconds(1577840400).build(),
+          Timestamp.newBuilder().setNanos(0).setSeconds(1577840400).build(),
           Timestamp.newBuilder().setNanos(1000000).setSeconds(1577840400).build(),
-              Timestamp.newBuilder().setNanos(1000000).setSeconds(1577840400).build(),
+          Timestamp.newBuilder().setNanos(1000000).setSeconds(1577840400).build(),
+          Timestamp.newBuilder().setNanos(1002000).setSeconds(1577840520).build(),
           Timestamp.newBuilder().setNanos(1002000).setSeconds(1577840520).build(),
-              Timestamp.newBuilder().setNanos(1002000).setSeconds(1577840520).build(),
           Timestamp.newBuilder().setNanos(1002003).setSeconds(1577840523).build(),
-              Timestamp.newBuilder().setNanos(1002003).setSeconds(1577840523).build()
+          Timestamp.newBuilder().setNanos(1002003).setSeconds(1577840523).build()
         };
 
     for (int i = 0; i < json.length; i++) {