1- // Copyright 2024 Google LLC
2- //
3- // Licensed under the Apache License, Version 2.0 (the "License");
4- // you may not use this file except in compliance with the License.
5- // You may obtain a copy of the License at
6- //
7- // http://www.apache.org/licenses/LICENSE-2.0
8- //
9- // Unless required by applicable law or agreed to in writing, software
10- // distributed under the License is distributed on an "AS IS" BASIS,
11- // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12- // See the License for the specific language governing permissions and
13- // limitations under the License.
14-
151syntax = "proto2" ;
162
173package cel.expr.conformance.proto2 ;
184
195import "google/protobuf/any.proto" ;
206import "google/protobuf/duration.proto" ;
21- import "google/protobuf/empty.proto" ;
22- import "google/protobuf/field_mask.proto" ;
237import "google/protobuf/struct.proto" ;
248import "google/protobuf/timestamp.proto" ;
259import "google/protobuf/wrappers.proto" ;
@@ -63,9 +47,6 @@ message TestAllTypes {
6347 optional string single_string = 14 [default = "empty" ];
6448 optional bytes single_bytes = 15 [default = "none" ];
6549
66- // Collides with 'in' operator.
67- optional bool in = 18 ;
68-
6950 // Wellknown.
7051 optional google.protobuf.Any single_any = 100 ;
7152 optional google.protobuf.Duration single_duration = 101 ;
@@ -84,8 +65,6 @@ message TestAllTypes {
8465 optional google.protobuf.ListValue list_value = 114 ;
8566 optional google.protobuf.NullValue null_value = 115 ;
8667 optional google.protobuf.NullValue optional_null_value = 116 ;
87- optional google.protobuf.FieldMask field_mask = 117 ;
88- optional google.protobuf.Empty empty = 118 ;
8968
9069 // Nested messages
9170 oneof nested_type {
@@ -117,7 +96,7 @@ message TestAllTypes {
11796 repeated NestedEnum repeated_nested_enum = 52 ;
11897 repeated string repeated_string_piece = 53 [ctype = STRING_PIECE ];
11998 repeated string repeated_cord = 54 [ctype = CORD ];
120- repeated NestedMessage repeated_lazy_message = 55 ;
99+ repeated NestedMessage repeated_lazy_message = 55 [ lazy = true ] ;
121100
122101 // Repeated wellknown.
123102 repeated google.protobuf.Any repeated_any = 120 ;
@@ -307,19 +286,6 @@ message TestAllTypes {
307286 map <string , google.protobuf.StringValue > map_string_string_wrapper = 321 ;
308287 map <string , google.protobuf.BoolValue > map_string_bool_wrapper = 322 ;
309288 map <string , google.protobuf.BytesValue > map_string_bytes_wrapper = 323 ;
310-
311- oneof kind {
312- NestedTestAllTypes oneof_type = 400 ;
313- NestedMessage oneof_msg = 401 ;
314- bool oneof_bool = 402 ;
315- }
316-
317- optional group NestedGroup = 403 {
318- optional int32 single_id = 404;
319- optional string single_name = 405 ;
320- }
321-
322- extensions 1000 to max;
323289}
324290
325291// This proto includes a recursively nested message.
0 commit comments