Merge pull request #37 from volkov/master

Null field from json deserialization fix

Author: scr

src/main/java/com/googlecode/protobuf/format/JsonJacksonFormat.java

@@ -539,6 +539,9 @@ private Object handleObject(JsonParser parser,
         }
 
         JsonToken token = parser.getCurrentToken();
+        if (JsonToken.VALUE_NULL == token) {
+            return null;
+        }
 
         if (unknown) {
         	ByteString data = ByteString.copyFrom(parser.getBinaryValue());

src/test/java/com/googlecode/protobuf/format/JsonFormatTest.java

@@ -16,6 +16,7 @@
 import java.nio.charset.Charset;
 import java.util.Arrays;
 
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
@@ -75,4 +76,14 @@ public void testIssue23() throws Exception {
         JSON_FORMATTER.merge(message, extensionRegistry, issue23Builder);
         assertThat("No unknown field 4", issue23Builder.getUnknownFields().hasField(4));
     }
+
+    @Test
+    public void testDeserializeNullFieldFromJson() throws Exception {
+        UnittestProto.TestNullField.Builder builder = UnittestProto.TestNullField.newBuilder();
+        new JsonJacksonFormat().merge(JsonFormatTest.class.getResourceAsStream("/json_format_null_field_data.txt"), builder);
+
+        final UnittestProto.TestNullField actual = builder.build();
+        System.out.println(actual);
+        assertThat(actual, equalTo(UnittestProto.TestNullField.newBuilder().build()));
+    }
 }

src/test/resources/json_format_null_field_data.txt

@@ -0,0 +1 @@
+{"field" : null}

src/test/resources/proto/unittest.proto

@@ -629,3 +629,7 @@ service TestService {
 
 message BarRequest  {}
 message BarResponse {}
+
+message TestNullField {
+  optional TestNullField field = 1;
+}