Fix decimal mapping when value is array (#1357)

Added missing return, when processing big decimal field which has its value in byte array format. Previously algorithm would do the mapping, set the values, but would not exit with return and fallback to IllegalArgumentException at the end of the method. Fixes #1356☕️
googleapis · Oct 18, 2021 · 21b9e25 · 21b9e25
1 parent b705783
commit 21b9e25
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/...igquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java b/...igquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java
@@ -229,6 +229,7 @@ private static void fillField(
               }
             }
             protoMsg.setField(fieldDescriptor, bytes);
+            return;
           } catch (JSONException e) {
             throw new IllegalArgumentException(
                 String.format("Error: " + currentScope + "could not be converted to byte[]."));

diff --git a/...rystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/JsonToProtoMessage.java b/...rystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/JsonToProtoMessage.java
@@ -227,6 +227,7 @@ private static void fillField(
               }
             }
             protoMsg.setField(fieldDescriptor, bytes);
+            return;
           } catch (JSONException e) {
             throw new IllegalArgumentException(
                 String.format("Error: " + currentScope + "could not be converted to byte[]."));

diff --git a/...erystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessageTest.java b/...erystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessageTest.java
@@ -60,7 +60,10 @@ public class JsonToProtoMessageTest {
           .put(
               BytesType.getDescriptor(),
               new Message[] {
-                BytesType.newBuilder().setTestFieldType(ByteString.copyFromUtf8("test")).build()
+                BytesType.newBuilder().setTestFieldType(ByteString.copyFromUtf8("test")).build(),
+                BytesType.newBuilder()
+                    .setTestFieldType(ByteString.copyFrom(new byte[] {1, 2, 3}))
+                    .build()
               })
           .put(
               Int64Type.getDescriptor(),
@@ -599,7 +602,8 @@ public void testAllTypes() throws Exception {
               e.getMessage());
         }
       }
-      if (entry.getKey() == Int64Type.getDescriptor()) {
+      if (entry.getKey() == Int64Type.getDescriptor()
+          || entry.getKey() == BytesType.getDescriptor()) {
         assertEquals(entry.getKey().getFullName(), 2, success);
       } else {
         assertEquals(entry.getKey().getFullName(), 1, success);

diff --git a/...orage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/JsonToProtoMessageTest.java b/...orage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/JsonToProtoMessageTest.java
@@ -60,7 +60,10 @@ public class JsonToProtoMessageTest {
           .put(
               BytesType.getDescriptor(),
               new Message[] {
-                BytesType.newBuilder().setTestFieldType(ByteString.copyFromUtf8("test")).build()
+                BytesType.newBuilder().setTestFieldType(ByteString.copyFromUtf8("test")).build(),
+                BytesType.newBuilder()
+                    .setTestFieldType(ByteString.copyFrom(new byte[] {1, 2, 3}))
+                    .build()
               })
           .put(
               Int64Type.getDescriptor(),
@@ -600,7 +603,8 @@ public void testAllTypes() throws Exception {
               e.getMessage());
         }
       }
-      if (entry.getKey() == Int64Type.getDescriptor()) {
+      if (entry.getKey() == Int64Type.getDescriptor()
+          || entry.getKey() == BytesType.getDescriptor()) {
         assertEquals(entry.getKey().getFullName(), 2, success);
       } else {
         assertEquals(entry.getKey().getFullName(), 1, success);