diff options
Diffstat (limited to 'java/util')
-rw-r--r-- | java/util/src/main/java/com/google/protobuf/util/JsonFormat.java | 5 | ||||
-rw-r--r-- | java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java | 2 |
2 files changed, 4 insertions, 3 deletions
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 5e0f5fe3..37fa194a 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 @@ -104,7 +104,8 @@ public class JsonFormat { */ public static Printer printer() { return new Printer( - TypeRegistry.getEmptyTypeRegistry(), false, Collections.emptySet(), false, false); + TypeRegistry.getEmptyTypeRegistry(), false, Collections.<FieldDescriptor>emptySet(), + false, false); } /** @@ -167,7 +168,7 @@ public class JsonFormat { return new Printer( registry, true, - Collections.emptySet(), + Collections.<FieldDescriptor>emptySet(), preservingProtoFieldNames, omittingInsignificantWhitespace); } 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 6943093f..695176ed 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 @@ -1319,7 +1319,7 @@ public class JsonFormatTest extends TestCase { } try { - JsonFormat.printer().includingDefaultValueFields(Collections.emptySet()); + JsonFormat.printer().includingDefaultValueFields(Collections.<FieldDescriptor>emptySet()); fail("IllegalArgumentException is expected."); } catch (IllegalArgumentException e) { // Expected. |