Add support for non-primitive Booleans. (#2237)

Author: vkryachko

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

@@ -141,6 +141,10 @@ public ObjectEncoderContext add(@NonNull FieldDescriptor field, @Nullable Object
       return add(field, ((Number) obj).longValue());
     }
 
+    if (obj instanceof Boolean) {
+      return add(field, (boolean) obj);
+    }
+
     if (obj instanceof byte[]) {
       byte[] bytes = (byte[]) obj;
       if (bytes.length == 0) {

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

@@ -29,21 +29,22 @@
 @RunWith(JUnit4.class)
 public class OtherTypesEncodingTests {
   @Test
-  public void test() {
+  public void encode_withDefaults() {
     assertThat(new OtherTypes().encode()).isEmpty();
   }
 
   @Test
-  public void test2() throws InvalidProtocolBufferException {
+  public void encode_withNonDefaultValues() throws InvalidProtocolBufferException {
     byte[] result =
-        new OtherTypes("hello", "world".getBytes(Charset.forName("UTF-8")), true).encode();
+        new OtherTypes("hello", "world".getBytes(Charset.forName("UTF-8")), true, true).encode();
     OtherTypesProto parsed = OtherTypesProto.parseFrom(result);
     assertThat(parsed)
         .isEqualTo(
             OtherTypesProto.newBuilder()
                 .setStr("hello")
                 .setBts(ByteString.copyFrom("world", Charset.forName("UTF-8")))
                 .setBl(true)
+                .setWrappedBool(true)
                 .build());
   }
 }

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

@@ -52,8 +52,8 @@ public void test2() throws InvalidProtocolBufferException {
                     .put("value", new Fixed(1, 2, 3, 4))
                     .build(),
                 ImmutableList.of(
-                    new OtherTypes("hello", new byte[0], false),
-                    new OtherTypes("", new byte[] {42}, true)))
+                    new OtherTypes("hello", new byte[0], false, true),
+                    new OtherTypes("", new byte[] {42}, true, false)))
             .encode();
 
     WithCollectionsProto parsed = WithCollectionsProto.parseFrom(result);
@@ -66,7 +66,8 @@ public void test2() throws InvalidProtocolBufferException {
                 .putMyMap(
                     "value",
                     FixedProto.newBuilder().setF32(1).setSf32(2).setF64(3).setSf64(4).build())
-                .addOtherTypes(OtherTypesProto.newBuilder().setStr("hello").build())
+                .addOtherTypes(
+                    OtherTypesProto.newBuilder().setStr("hello").setWrappedBool(true).build())
                 .addOtherTypes(
                     OtherTypesProto.newBuilder()
                         .setBts(ByteString.copyFrom(new byte[] {42}))

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

@@ -25,16 +25,18 @@ public class OtherTypes {
 
   private final String str;
   private final byte[] bytes;
-  private final boolean bl;
+  private final boolean bool;
+  private final Boolean wrappedBool;
 
-  public OtherTypes(String str, byte[] bytes, boolean bl) {
+  public OtherTypes(String str, byte[] bytes, boolean bool, Boolean wrappedBool) {
     this.str = str;
     this.bytes = bytes;
-    this.bl = bl;
+    this.bool = bool;
+    this.wrappedBool = wrappedBool;
   }
 
   public OtherTypes() {
-    this("", new byte[0], false);
+    this("", new byte[0], false, null);
   }
 
   @Protobuf(tag = 1)
@@ -48,8 +50,13 @@ public byte[] getBytes() {
   }
 
   @Protobuf(tag = 3)
-  public boolean isBl() {
-    return bl;
+  public boolean isBool() {
+    return bool;
+  }
+
+  @Protobuf(tag = 4)
+  public Boolean getWrappedBool() {
+    return wrappedBool;
   }
 
   public byte[] encode() {

encoders/firebase-encoders-proto/src/test/java/com/google/firebase/encoders/proto/pojos/OtherTypes.java

@@ -43,6 +43,7 @@ message OtherTypesProto {
   string str = 1;
   bytes bts = 2;
   bool bl = 3;
+  bool wrappedBool = 4;
 }
 
 message WithCollectionsProto {