Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: allow all fields to be null values #1450

Merged
merged 3 commits into from Dec 23, 2021
Merged

fix: allow all fields to be null values #1450

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
136ac18
fix: allow all fields to be null values
yirutang Dec 22, 2021
24d805c
fix tests
yirutang Dec 22, 2021
b35a97a
🦉 Updates from OwlBot
gcf-owl-bot[bot] Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions ...igquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessage.java
View file
Open in desktop
Expand Up @@ -154,9 +154,6 @@ private static DynamicMessage convertJsonToProtoMessageImpl(
String.format(
"JSONObject does not have the required field %s.%s.", jsonScope, missingFieldName));
}
if (topLevel && msg.getSerializedSize() == 0) {
throw new IllegalArgumentException("The created protobuf message is empty.");
}
return msg;
}

Expand Down
21 changes: 14 additions & 7 deletions ...erystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonToProtoMessageTest.java
View file
Open in desktop
Expand Up @@ -1033,13 +1033,9 @@ public void testEmptyProtoMessage() throws Exception {
JSONObject json = new JSONObject();
json.put("test_repeated", new JSONArray(new int[0]));

try {
DynamicMessage protoMsg =
JsonToProtoMessage.convertJsonToProtoMessage(RepeatedInt64.getDescriptor(), json);
Assert.fail("Should fail");
} catch (IllegalArgumentException e) {
assertEquals("The created protobuf message is empty.", e.getMessage());
}
DynamicMessage protoMsg =
JsonToProtoMessage.convertJsonToProtoMessage(RepeatedInt64.getDescriptor(), json);
assertEquals(protoMsg.getAllFields().size(), 0);
}

@Test
Expand Down Expand Up @@ -1121,4 +1117,15 @@ public void testJsonNullValue() throws Exception {
JsonToProtoMessage.convertJsonToProtoMessage(TestInt64.getDescriptor(), json);
assertEquals(expectedProto, protoMsg);
}

@Test
public void testJsonAllFieldsNullValue() throws Exception {
TestInt64 expectedProto = TestInt64.newBuilder().build();
JSONObject json = new JSONObject();
json.put("long", JSONObject.NULL);
json.put("int", JSONObject.NULL);
DynamicMessage protoMsg =
JsonToProtoMessage.convertJsonToProtoMessage(TestInt64.getDescriptor(), json);
assertEquals(expectedProto, protoMsg);
}
}