| Index: third_party/protobuf/java/compatibility_tests/v2.5.0/more_protos/src/proto/com/google/protobuf/nested_builders_test.proto
|
| diff --git a/third_party/protobuf/src/google/protobuf/util/internal/testdata/struct.proto b/third_party/protobuf/java/compatibility_tests/v2.5.0/more_protos/src/proto/com/google/protobuf/nested_builders_test.proto
|
| similarity index 79%
|
| copy from third_party/protobuf/src/google/protobuf/util/internal/testdata/struct.proto
|
| copy to third_party/protobuf/java/compatibility_tests/v2.5.0/more_protos/src/proto/com/google/protobuf/nested_builders_test.proto
|
| index c15aba0d6d9881b8963a0353cdd1e0aa0b4adc11..abffb9d2ba22f44e2454539c25f5815e5cb9bfe5 100644
|
| --- a/third_party/protobuf/src/google/protobuf/util/internal/testdata/struct.proto
|
| +++ b/third_party/protobuf/java/compatibility_tests/v2.5.0/more_protos/src/proto/com/google/protobuf/nested_builders_test.proto
|
| @@ -1,6 +1,6 @@
|
| // Protocol Buffers - Google's data interchange format
|
| // Copyright 2008 Google Inc. All rights reserved.
|
| -// https://developers.google.com/protocol-buffers/
|
| +// http://code.google.com/p/protobuf/
|
| //
|
| // Redistribution and use in source and binary forms, with or without
|
| // modification, are permitted provided that the following conditions are
|
| @@ -28,18 +28,26 @@
|
| // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| -// Proto to test proto3 struct.
|
| -syntax = "proto3";
|
| +// Author: jonp@google.com (Jon Perlow)
|
| +//
|
| +
|
| +package protobuf_unittest;
|
|
|
| -package google.protobuf.testing.structs;
|
| -option java_package = "com.google.protobuf.testing.structs";
|
| +option java_multiple_files = true;
|
| +option java_outer_classname = "NestedBuilders";
|
|
|
| -import "google/protobuf/struct.proto";
|
|
|
| -message StructType {
|
| - google.protobuf.Struct object = 1;
|
| +message Vehicle {
|
| + optional Engine engine = 1;
|
| + repeated Wheel wheel = 2;
|
| +}
|
| +
|
| +message Engine {
|
| + optional int32 cylinder = 1;
|
| + optional int32 liters = 2;
|
| }
|
|
|
| -service TestService {
|
| - rpc Call(StructType) returns (StructType);
|
| +message Wheel {
|
| + optional int32 radius = 1;
|
| + optional int32 width = 2;
|
| }
|
|
|