Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1395)

Side by Side Diff: third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)
Patch Set: Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2008 Google Inc. All rights reserved. 2 // Copyright 2008 Google Inc. All rights reserved.
3 // https://developers.google.com/protocol-buffers/ 3 // https://developers.google.com/protocol-buffers/
4 // 4 //
5 // Redistribution and use in source and binary forms, with or without 5 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 6 // modification, are permitted provided that the following conditions are
7 // met: 7 // met:
8 // 8 //
9 // * Redistributions of source code must retain the above copyright 9 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 10 // notice, this list of conditions and the following disclaimer.
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 repeated string repeated_string = 44; 117 repeated string repeated_string = 44;
118 repeated bytes repeated_bytes = 45; 118 repeated bytes repeated_bytes = 45;
119 repeated NestedMessage repeated_nested_message = 48; 119 repeated NestedMessage repeated_nested_message = 48;
120 repeated NestedEnum repeated_nested_enum = 51; 120 repeated NestedEnum repeated_nested_enum = 51;
121 } 121 }
122 122
123 message TestOneof { 123 message TestOneof {
124 oneof oneof_field { 124 oneof oneof_field {
125 int32 oneof_int32 = 1; 125 int32 oneof_int32 = 1;
126 TestAllTypes.NestedMessage oneof_nested_message = 2; 126 TestAllTypes.NestedMessage oneof_nested_message = 2;
127 google.protobuf.NullValue oneof_null_value = 3;
128 } 127 }
129 } 128 }
130 129
131 message TestMap { 130 message TestMap {
132 // Instead of testing all combinations (too many), we only make sure all 131 // Instead of testing all combinations (too many), we only make sure all
133 // valid types have been used at least in one field as key and in one 132 // valid types have been used at least in one field as key and in one
134 // field as value. 133 // field as value.
135 map<int32, int32> int32_to_int32_map = 1; 134 map<int32, int32> int32_to_int32_map = 1;
136 map<int64, int32> int64_to_int32_map = 2; 135 map<int64, int32> int64_to_int32_map = 2;
137 map<uint32, int32> uint32_to_int32_map = 3; 136 map<uint32, int32> uint32_to_int32_map = 3;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 } 187 }
189 188
190 message TestStruct { 189 message TestStruct {
191 google.protobuf.Struct struct_value = 1; 190 google.protobuf.Struct struct_value = 1;
192 google.protobuf.Value value = 2; 191 google.protobuf.Value value = 2;
193 google.protobuf.ListValue list_value = 3; 192 google.protobuf.ListValue list_value = 3;
194 } 193 }
195 194
196 message TestAny { 195 message TestAny {
197 google.protobuf.Any any_value = 1; 196 google.protobuf.Any any_value = 1;
198 map<string, google.protobuf.Any> any_map = 2;
199 } 197 }
200 198
201 message TestCustomJsonName { 199 message TestCustomJsonName {
202 int32 value = 1 [json_name = "@value"]; 200 int32 value = 1 [json_name = "@value"];
203 } 201 }
204
205 message TestRecursive {
206 int32 value = 1;
207 TestRecursive nested = 2;
208 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698