Merge branch 'master' into mrschmidt/bundle/master

Author: schmidt-sebastian

encoders/firebase-encoders-proto/src/main/java/com/google/firebase/encoders/proto/ProtobufDataEncoderContext.java

@@ -36,6 +36,8 @@ final class ProtobufDataEncoderContext implements ObjectEncoderContext {
   private final Map<Class<?>, ObjectEncoder<?>> objectEncoders;
   private final Map<Class<?>, ValueEncoder<?>> valueEncoders;
   private final ObjectEncoder<Object> fallbackEncoder;
+  private final ProtobufValueEncoderContext valueEncoderContext =
+      new ProtobufValueEncoderContext(this);
 
   private static final FieldDescriptor MAP_KEY_DESC =
       FieldDescriptor.builder("key").withProperty(AtProtobuf.builder().tag(1).build()).build();
@@ -95,12 +97,18 @@ public ObjectEncoderContext add(@NonNull String name, boolean value) throws IOEx
   @Override
   public ObjectEncoderContext add(@NonNull FieldDescriptor field, @Nullable Object obj)
       throws IOException {
+    return add(field, obj, true);
+  }
+
+  ObjectEncoderContext add(
+      @NonNull FieldDescriptor field, @Nullable Object obj, boolean skipDefault)
+      throws IOException {
     if (obj == null) {
       return this;
     }
     if (obj instanceof CharSequence) {
       CharSequence seq = (CharSequence) obj;
-      if (seq.length() == 0) {
+      if (skipDefault && seq.length() == 0) {
         return this;
       }
       int tag = getTag(field);
@@ -115,7 +123,10 @@ public ObjectEncoderContext add(@NonNull FieldDescriptor field, @Nullable Object
       @SuppressWarnings("unchecked")
       Collection<Object> collection = (Collection<Object>) obj;
       for (Object value : collection) {
-        add(field, value);
+        // It's important not to skip "default" values in repeated fields as there is a difference
+        // between having an empty list and a list of "default" items,
+        // e.g. encoding ["", ""] should not result in an empty list when encoded.
+        add(field, value, false);
       }
       return this;
     }
@@ -124,30 +135,33 @@ public ObjectEncoderContext add(@NonNull FieldDescriptor field, @Nullable Object
       @SuppressWarnings("unchecked")
       Map<Object, Object> map = (Map<Object, Object>) obj;
       for (Map.Entry<Object, Object> entry : map.entrySet()) {
-        doEncode(DEFAULT_MAP_ENCODER, field, entry);
+        // It's important not to skip "default" values in map fields as there is a difference
+        // between having an empty map and a map of 2 "default" items,
+        // e.g. encoding {"": 0] should not result in an empty map when encoded.
+        doEncode(DEFAULT_MAP_ENCODER, field, entry, false);
       }
       return this;
     }
 
     if (obj instanceof Double) {
-      return add(field, (double) obj);
+      return add(field, (double) obj, skipDefault);
     }
 
     if (obj instanceof Float) {
-      return add(field, (float) obj);
+      return add(field, (float) obj, skipDefault);
     }
 
     if (obj instanceof Number) {
-      return add(field, ((Number) obj).longValue());
+      return add(field, ((Number) obj).longValue(), skipDefault);
     }
 
     if (obj instanceof Boolean) {
-      return add(field, (boolean) obj);
+      return add(field, (boolean) obj, skipDefault);
     }
 
     if (obj instanceof byte[]) {
       byte[] bytes = (byte[]) obj;
-      if (bytes.length == 0) {
+      if (skipDefault && bytes.length == 0) {
         return this;
       }
       int tag = getTag(field);
@@ -163,12 +177,12 @@ public ObjectEncoderContext add(@NonNull FieldDescriptor field, @Nullable Object
         (ObjectEncoder<Object>) objectEncoders.get(obj.getClass());
 
     if (objectEncoder != null) {
-      return doEncode(objectEncoder, field, obj);
+      return doEncode(objectEncoder, field, obj, skipDefault);
     }
     @SuppressWarnings("unchecked")
     ValueEncoder<Object> valueEncoder = (ValueEncoder<Object>) valueEncoders.get(obj.getClass());
     if (valueEncoder != null) {
-      return doEncode(valueEncoder, field, obj);
+      return doEncode(valueEncoder, field, obj, skipDefault);
     }
 
     if (obj instanceof ProtoEnum) {
@@ -177,13 +191,18 @@ public ObjectEncoderContext add(@NonNull FieldDescriptor field, @Nullable Object
     if (obj instanceof Enum) {
       return add(field, ((Enum<?>) obj).ordinal());
     }
-    return doEncode(fallbackEncoder, field, obj);
+    return doEncode(fallbackEncoder, field, obj, skipDefault);
   }
 
   @NonNull
   @Override
   public ObjectEncoderContext add(@NonNull FieldDescriptor field, double value) throws IOException {
-    if (value == 0) {
+    return add(field, value, true);
+  }
+
+  ObjectEncoderContext add(@NonNull FieldDescriptor field, double value, boolean skipDefault)
+      throws IOException {
+    if (skipDefault && value == 0) {
       return this;
     }
     int tag = getTag(field);
@@ -196,7 +215,13 @@ public ObjectEncoderContext add(@NonNull FieldDescriptor field, double value) th
   @NonNull
   @Override
   public ObjectEncoderContext add(@NonNull FieldDescriptor field, float value) throws IOException {
-    if (value == 0) {
+
+    return add(field, value, true);
+  }
+
+  ObjectEncoderContext add(@NonNull FieldDescriptor field, float value, boolean skipDefault)
+      throws IOException {
+    if (skipDefault && value == 0) {
       return this;
     }
     int tag = getTag(field);
@@ -210,7 +235,12 @@ public ObjectEncoderContext add(@NonNull FieldDescriptor field, float value) thr
   @Override
   public ProtobufDataEncoderContext add(@NonNull FieldDescriptor field, int value)
       throws IOException {
-    if (value == 0) {
+    return add(field, value, true);
+  }
+
+  ProtobufDataEncoderContext add(@NonNull FieldDescriptor field, int value, boolean skipDefault)
+      throws IOException {
+    if (skipDefault && value == 0) {
       return this;
     }
     Protobuf protobuf = getProtobuf(field);
@@ -235,7 +265,12 @@ public ProtobufDataEncoderContext add(@NonNull FieldDescriptor field, int value)
   @Override
   public ProtobufDataEncoderContext add(@NonNull FieldDescriptor field, long value)
       throws IOException {
-    if (value == 0) {
+    return add(field, value, true);
+  }
+
+  ProtobufDataEncoderContext add(@NonNull FieldDescriptor field, long value, boolean skipDefault)
+      throws IOException {
+    if (skipDefault && value == 0) {
       return this;
     }
     Protobuf protobuf = getProtobuf(field);
@@ -260,10 +295,12 @@ public ProtobufDataEncoderContext add(@NonNull FieldDescriptor field, long value
   @Override
   public ProtobufDataEncoderContext add(@NonNull FieldDescriptor field, boolean value)
       throws IOException {
-    if (!value) {
-      return this;
-    }
-    return add(field, 1);
+    return add(field, value, true);
+  }
+
+  ProtobufDataEncoderContext add(@NonNull FieldDescriptor field, boolean value, boolean skipDefault)
+      throws IOException {
+    return add(field, value ? 1 : 0, skipDefault);
   }
 
   @NonNull
@@ -299,10 +336,11 @@ public ObjectEncoderContext nested(@NonNull FieldDescriptor field) throws IOExce
   }
 
   private <T> ProtobufDataEncoderContext doEncode(
-      ObjectEncoder<T> encoder, FieldDescriptor field, T obj) throws IOException {
+      ObjectEncoder<T> encoder, FieldDescriptor field, T obj, boolean skipDefault)
+      throws IOException {
 
     long size = determineSize(encoder, obj);
-    if (size == 0) {
+    if (skipDefault && size == 0) {
       return this;
     }
 
@@ -330,9 +368,10 @@ private <T> long determineSize(ObjectEncoder<T> encoder, T obj) throws IOExcepti
   }
 
   private <T> ProtobufDataEncoderContext doEncode(
-      ValueEncoder<T> encoder, FieldDescriptor field, T obj) throws IOException {
-    // TODO(vkryachko): consider reusing value encoder contexts to avoid allocations.
-    encoder.encode(obj, new ProtobufValueEncoderContext(field, this));
+      ValueEncoder<T> encoder, FieldDescriptor field, T obj, boolean skipDefault)
+      throws IOException {
+    valueEncoderContext.resetContext(field, skipDefault);
+    encoder.encode(obj, valueEncoderContext);
     return this;
   }
 

encoders/firebase-encoders-proto/src/main/java/com/google/firebase/encoders/proto/ProtobufValueEncoderContext.java

@@ -18,20 +18,25 @@
 import androidx.annotation.Nullable;
 import com.google.firebase.encoders.EncodingException;
 import com.google.firebase.encoders.FieldDescriptor;
-import com.google.firebase.encoders.ObjectEncoderContext;
 import com.google.firebase.encoders.ValueEncoderContext;
 import java.io.IOException;
 
 class ProtobufValueEncoderContext implements ValueEncoderContext {
   private boolean encoded = false;
-  private final FieldDescriptor field;
-  private final ObjectEncoderContext objEncoderCtx;
+  private boolean skipDefault = false;
+  private FieldDescriptor field;
+  private final ProtobufDataEncoderContext objEncoderCtx;
 
-  ProtobufValueEncoderContext(FieldDescriptor field, ObjectEncoderContext objEncoderCtx) {
-    this.field = field;
+  ProtobufValueEncoderContext(ProtobufDataEncoderContext objEncoderCtx) {
     this.objEncoderCtx = objEncoderCtx;
   }
 
+  void resetContext(FieldDescriptor field, boolean skipDefault) {
+    this.encoded = false;
+    this.field = field;
+    this.skipDefault = skipDefault;
+  }
+
   private void checkNotUsed() {
     if (encoded) {
       throw new EncodingException("Cannot encode a second value in the ValueEncoderContext");
@@ -43,55 +48,55 @@ private void checkNotUsed() {
   @Override
   public ValueEncoderContext add(@Nullable String value) throws IOException {
     checkNotUsed();
-    objEncoderCtx.add(field, value);
+    objEncoderCtx.add(field, value, skipDefault);
     return this;
   }
 
   @NonNull
   @Override
   public ValueEncoderContext add(float value) throws IOException {
     checkNotUsed();
-    objEncoderCtx.add(field, value);
+    objEncoderCtx.add(field, value, skipDefault);
     return this;
   }
 
   @NonNull
   @Override
   public ValueEncoderContext add(double value) throws IOException {
     checkNotUsed();
-    objEncoderCtx.add(field, value);
+    objEncoderCtx.add(field, value, skipDefault);
     return this;
   }
 
   @NonNull
   @Override
   public ValueEncoderContext add(int value) throws IOException {
     checkNotUsed();
-    objEncoderCtx.add(field, value);
+    objEncoderCtx.add(field, value, skipDefault);
     return this;
   }
 
   @NonNull
   @Override
   public ValueEncoderContext add(long value) throws IOException {
     checkNotUsed();
-    objEncoderCtx.add(field, value);
+    objEncoderCtx.add(field, value, skipDefault);
     return this;
   }
 
   @NonNull
   @Override
   public ValueEncoderContext add(boolean value) throws IOException {
     checkNotUsed();
-    objEncoderCtx.add(field, value);
+    objEncoderCtx.add(field, value, skipDefault);
     return this;
   }
 
   @NonNull
   @Override
   public ValueEncoderContext add(@NonNull byte[] bytes) throws IOException {
     checkNotUsed();
-    objEncoderCtx.add(field, bytes);
+    objEncoderCtx.add(field, bytes, skipDefault);
     return this;
   }
 }

encoders/firebase-encoders-proto/src/test/java/com/google/firebase/encoders/proto/WithCollectionsTests.java

@@ -50,10 +50,12 @@ public void test2() throws InvalidProtocolBufferException {
                 ImmutableMap.<String, Fixed>builder()
                     .put("noValue", new Fixed())
                     .put("value", new Fixed(1, 2, 3, 4))
+                    .put("", new Fixed())
                     .build(),
                 ImmutableList.of(
                     new OtherTypes("hello", new byte[0], false, true),
-                    new OtherTypes("", new byte[] {42}, true, false)))
+                    new OtherTypes("", new byte[] {42}, true, false),
+                    new OtherTypes("", new byte[0], false, false)))
             .encode();
 
     WithCollectionsProto parsed = WithCollectionsProto.parseFrom(result);
@@ -66,13 +68,15 @@ public void test2() throws InvalidProtocolBufferException {
                 .putMyMap(
                     "value",
                     FixedProto.newBuilder().setF32(1).setSf32(2).setF64(3).setSf64(4).build())
+                .putMyMap("", FixedProto.getDefaultInstance())
                 .addOtherTypes(
                     OtherTypesProto.newBuilder().setStr("hello").setWrappedBool(true).build())
                 .addOtherTypes(
                     OtherTypesProto.newBuilder()
                         .setBts(ByteString.copyFrom(new byte[] {42}))
                         .setBl(true)
                         .build())
+                .addOtherTypes(OtherTypesProto.getDefaultInstance())
                 .build());
   }
 }

firebase-crashlytics/firebase-crashlytics.gradle

@@ -67,8 +67,6 @@ dependencies {
     implementation 'com.google.firebase:firebase-measurement-connector:18.0.0'
     implementation "com.google.android.gms:play-services-tasks:17.0.0"
 
-    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
-
     annotationProcessor project(":encoders:firebase-encoders-processor")
     annotationProcessor 'com.google.auto.value:auto-value:1.6.5'