From d61aede89cf188367766b971f59cf57d7835d8e8 Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Tue, 4 Sep 2018 10:58:54 -0700
Subject: Down-integrate from google3.

---
 .../java/com/google/protobuf/util/JsonFormat.java  |  6 +--
 .../com/google/protobuf/util/JsonFormatTest.java   | 48 ++++++++++------------
 2 files changed, 24 insertions(+), 30 deletions(-)

(limited to 'java/util')

diff --git a/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java b/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java
index 955dfd86..46deb5d1 100644
--- a/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java
+++ b/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java
@@ -1540,7 +1540,7 @@ public class JsonFormat {
         Object key = parseFieldValue(keyField, new JsonPrimitive(entry.getKey()), entryBuilder);
         Object value = parseFieldValue(valueField, entry.getValue(), entryBuilder);
         if (value == null) {
-          if(ignoringUnknownFields && valueField.getType() == Type.ENUM) {
+          if (ignoringUnknownFields && valueField.getType() == Type.ENUM) {
             continue;
           } else {
             throw new InvalidProtocolBufferException("Map value cannot be null.");
@@ -1562,11 +1562,11 @@ public class JsonFormat {
       for (int i = 0; i < array.size(); ++i) {
         Object value = parseFieldValue(field, array.get(i), builder);
         if (value == null) {
-          if(ignoringUnknownFields && field.getType() == Type.ENUM) {
+          if (ignoringUnknownFields && field.getType() == Type.ENUM) {
             continue;
           } else {
             throw new InvalidProtocolBufferException(
-                  "Repeated field elements cannot be null in field: " + field.getFullName());
+                "Repeated field elements cannot be null in field: " + field.getFullName());
           }
         }
         builder.addRepeatedField(field, value);
diff --git a/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java b/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java
index 7637c267..64413bc1 100644
--- a/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java
+++ b/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java
@@ -161,7 +161,8 @@ public class JsonFormatTest extends TestCase {
     JsonFormat.parser().merge(json, builder);
   }
 
-  private void mergeFromJsonIgnoringUnknownFields(String json, Message.Builder builder) throws IOException {
+  private void mergeFromJsonIgnoringUnknownFields(String json, Message.Builder builder)
+      throws IOException {
     JsonFormat.parser().ignoringUnknownFields().merge(json, builder);
   }
 
@@ -677,17 +678,14 @@ public class JsonFormatTest extends TestCase {
       // Exception expected.
     }
   }
-  
+
   public void testMapEnumNullValueIsIgnored() throws Exception {
     TestMap.Builder builder = TestMap.newBuilder();
     mergeFromJsonIgnoringUnknownFields(
-        "{\n"
-            + "  \"int32ToEnumMap\": {\"1\": null}\n"
-            + "}",
-        builder);
-      TestMap map = builder.build();
-      assertEquals(0, map.getInt32ToEnumMapMap().entrySet().size());
- }
+        "{\n" + "  \"int32ToEnumMap\": {\"1\": null}\n" + "}", builder);
+    TestMap map = builder.build();
+    assertEquals(0, map.getInt32ToEnumMapMap().size());
+  }
 
   public void testParserAcceptNonQuotedObjectKey() throws Exception {
     TestMap.Builder builder = TestMap.newBuilder();
@@ -1188,40 +1186,36 @@ public class JsonFormatTest extends TestCase {
     String json = "{\n" + "  \"unknownField\": \"XXX\"\n" + "}";
     JsonFormat.parser().ignoringUnknownFields().merge(json, builder);
   }
-  
+
   public void testParserIgnoringUnknownEnums() throws Exception {
     TestAllTypes.Builder builder = TestAllTypes.newBuilder();
     String json = "{\n" + "  \"optionalNestedEnum\": \"XXX\"\n" + "}";
     JsonFormat.parser().ignoringUnknownFields().merge(json, builder);
     assertEquals(0, builder.getOptionalNestedEnumValue());
   }
-  
+
   public void testUnknownEnumMap() throws Exception {
     TestMap.Builder builder = TestMap.newBuilder();
-    JsonFormat.parser().ignoringUnknownFields().merge(
-      "{\n"
-      + "  \"int32ToEnumMap\": {1: XXX, 2: FOO}"
-      + "}",
-      builder);
-        
-      assertEquals(NestedEnum.FOO, builder.getInt32ToEnumMapMap().get(2));
-      assertEquals(1, builder.getInt32ToEnumMapMap().size());
+    JsonFormat.parser()
+        .ignoringUnknownFields()
+        .merge("{\n" + "  \"int32ToEnumMap\": {1: XXX, 2: FOO}" + "}", builder);
+
+    assertEquals(NestedEnum.FOO, builder.getInt32ToEnumMapMap().get(2));
+    assertEquals(1, builder.getInt32ToEnumMapMap().size());
   }
-  
+
   public void testRepeatedUnknownEnum() throws Exception {
     TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    JsonFormat.parser().ignoringUnknownFields().merge(
-      "{\n"
-      + "  \"repeatedNestedEnum\": [XXX, FOO, BAR, BAZ]"
-      + "}",
-      builder);
-          
+    JsonFormat.parser()
+        .ignoringUnknownFields()
+        .merge("{\n" + "  \"repeatedNestedEnum\": [XXX, FOO, BAR, BAZ]" + "}", builder);
+
     assertEquals(NestedEnum.FOO, builder.getRepeatedNestedEnum(0));
     assertEquals(NestedEnum.BAR, builder.getRepeatedNestedEnum(1));
     assertEquals(NestedEnum.BAZ, builder.getRepeatedNestedEnum(2));
     assertEquals(3, builder.getRepeatedNestedEnumList().size());
   }
-  
+
   public void testParserIntegerEnumValue() throws Exception {
     TestAllTypes.Builder actualBuilder = TestAllTypes.newBuilder();
     mergeFromJson("{\n" + "  \"optionalNestedEnum\": 2\n" + "}", actualBuilder);
-- 
cgit v1.2.3