Merge pull request protocolbuffers#6245 from haon4/201906111559

Down Integrate to GitHub
bithium · Jun 12, 2019 · 6d117a4 · 6d117a4
2 parents 2a78f9f + d01fa6a
commit 6d117a4
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/google/protobuf/util/json_format.proto b/google/protobuf/util/json_format.proto
@@ -117,3 +117,14 @@ message TestStringSerializer {
   repeated string repeated_string = 2;
   map<string, string> string_map = 3;
 }
+
+message TestMessageWithExtension {
+  extensions 100 to max;
+}
+
+message TestExtension {
+  extend TestMessageWithExtension {
+    optional TestExtension ext = 100;
+  }
+  optional string value = 1;
+}