Down integrate to Github (protocolbuffers#5839)

* Down integrate to github
bithium · Mar 6, 2019 · a577eb5 · a577eb5
1 parent 3e89014
commit a577eb5
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 37 deletions.
diff --git a/google/protobuf/descriptor.proto b/google/protobuf/descriptor.proto
@@ -417,7 +417,6 @@ message FileOptions {
   // determining the namespace.
   optional string php_namespace = 41;
 
-
   // Use this option to change the namespace of php generated metadata classes.
   // Default is empty. When this option is empty, the proto file name will be used
   // for determining the namespace.

diff --git a/google/protobuf/unittest_enormous_descriptor.proto b/google/protobuf/unittest_enormous_descriptor.proto
@@ -38,7 +38,7 @@
 
 syntax = "proto2";
 
-package google.protobuf;
+package protobuf_unittest;
 option java_package = "com.google.protobuf";
 
 // Avoid generating insanely long methods.

diff --git a/google/protobuf/unittest_no_generic_services.proto b/google/protobuf/unittest_no_generic_services.proto
@@ -31,7 +31,7 @@
 // Author: kenton@google.com (Kenton Varda)
 
 syntax = "proto2";
-package google.protobuf.no_generic_services_test;
+package protobuf_unittest.no_generic_services_test;
 
 
 // *_generic_services are false by default.

diff --git a/google/protobuf/util/internal/testdata/anys.proto b/google/protobuf/util/internal/testdata/anys.proto
@@ -30,12 +30,12 @@
 
 syntax = "proto3";
 
-package google.protobuf.testing;
+package proto_util_converter.testing;
 
 import "google/protobuf/any.proto";
+import "google/protobuf/duration.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
-import "google/protobuf/duration.proto";
 import "google/protobuf/wrappers.proto";
 
 // Top-level test cases proto used by MarshallingTest. See description

diff --git a/google/protobuf/util/internal/testdata/books.proto b/google/protobuf/util/internal/testdata/books.proto
@@ -37,7 +37,7 @@
 
 syntax = "proto2";
 
-package google.protobuf.testing;
+package proto_util_converter.testing;
 
 import "google/protobuf/util/internal/testdata/anys.proto";
 
@@ -101,10 +101,10 @@ message Author {
 // For testing resiliency of our protostream parser.
 // Field numbers of Author are reused for something else.
 message BadAuthor {
-  optional string id = 1;  // non-length-delimited to length-delimited.
-  repeated uint64 name = 2;  // string to repeated (both length-delimited).
+  optional string id = 1;         // non-length-delimited to length-delimited.
+  repeated uint64 name = 2;       // string to repeated (both length-delimited).
   optional string pseudonym = 3;  // Repeated to optional.
-  repeated bool alive = 4 [packed=true];  // Optional to repeated.
+  repeated bool alive = 4 [packed = true];  // Optional to repeated.
 }
 
 // All primitive types
@@ -156,23 +156,23 @@ message Primitive {
 // The field numbers should match their non-packed version in Primitive message.
 message PackedPrimitive {
   // repeated 32 bit numbers:
-  repeated fixed32 rep_fix32 = 16 [packed=true];
-  repeated uint32 rep_u32 = 17 [packed=true];
-  repeated int32 rep_i32 = 18 [packed=true];
-  repeated sfixed32 rep_sf32 = 19 [packed=true];
-  repeated sint32 rep_s32 = 20 [packed=true];
+  repeated fixed32 rep_fix32 = 16 [packed = true];
+  repeated uint32 rep_u32 = 17 [packed = true];
+  repeated int32 rep_i32 = 18 [packed = true];
+  repeated sfixed32 rep_sf32 = 19 [packed = true];
+  repeated sint32 rep_s32 = 20 [packed = true];
 
   // repeated 64 bit numbers:
-  repeated fixed64 rep_fix64 = 21 [packed=true];
-  repeated uint64 rep_u64 = 22 [packed=true];
-  repeated int64 rep_i64 = 23 [packed=true];
-  repeated sfixed64 rep_sf64 = 24 [packed=true];
-  repeated sint64 rep_s64 = 25 [packed=true];
+  repeated fixed64 rep_fix64 = 21 [packed = true];
+  repeated uint64 rep_u64 = 22 [packed = true];
+  repeated int64 rep_i64 = 23 [packed = true];
+  repeated sfixed64 rep_sf64 = 24 [packed = true];
+  repeated sint64 rep_s64 = 25 [packed = true];
 
   // repeated other stuff:
-  repeated float rep_float = 28 [packed=true];
-  repeated double rep_double = 29 [packed=true];
-  repeated bool rep_bool = 30 [packed=true];
+  repeated float rep_float = 28 [packed = true];
+  repeated double rep_double = 29 [packed = true];
+  repeated bool rep_bool = 30 [packed = true];
 }
 
 // Test extensions.
@@ -192,7 +192,7 @@ message NestedBook {
 // For testing resiliency of our protostream parser.
 // Field number of NestedBook is reused for something else.
 message BadNestedBook {
-  repeated uint32 book = 1 [packed=true];  // Packed to optional message.
+  repeated uint32 book = 1 [packed = true];  // Packed to optional message.
 }
 
 // A recursively defined message.

diff --git a/google/protobuf/util/internal/testdata/default_value.proto b/google/protobuf/util/internal/testdata/default_value.proto
@@ -30,7 +30,7 @@
 
 syntax = "proto3";
 
-package google.protobuf.testing;
+package proto_util_converter.testing;
 
 import "google/protobuf/any.proto";
 import "google/protobuf/struct.proto";

diff --git a/google/protobuf/util/internal/testdata/default_value_test.proto b/google/protobuf/util/internal/testdata/default_value_test.proto
@@ -30,7 +30,7 @@
 
 syntax = "proto3";
 
-package google.protobuf.testing;
+package proto_util_converter.testing;
 
 message DefaultValueTest {
   double double_value = 1;

diff --git a/google/protobuf/util/internal/testdata/field_mask.proto b/google/protobuf/util/internal/testdata/field_mask.proto
@@ -30,7 +30,7 @@
 
 syntax = "proto3";
 
-package google.protobuf.testing;
+package proto_util_converter.testing;
 
 import "google/protobuf/field_mask.proto";
 

diff --git a/google/protobuf/util/internal/testdata/maps.proto b/google/protobuf/util/internal/testdata/maps.proto
@@ -30,7 +30,7 @@
 
 syntax = "proto3";
 
-package google.protobuf.testing;
+package proto_util_converter.testing;
 
 import "google/protobuf/any.proto";
 
@@ -94,8 +94,7 @@ message MapOfObjects {
   map<string, M> map = 1;
 }
 
-message DummyRequest {
-}
+message DummyRequest {}
 
 service MapsTestService {
   rpc Call(DummyRequest) returns (MapsTestCases);

diff --git a/google/protobuf/util/internal/testdata/oneofs.proto b/google/protobuf/util/internal/testdata/oneofs.proto
@@ -31,12 +31,12 @@
 // Proto to test proto3 oneofs.
 syntax = "proto3";
 
+package proto_util_converter.testing.oneofs;
+
 import "google/protobuf/any.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
 
-package google.protobuf.testing.oneofs;
-
 message OneOfsRequest {
   string value = 1;
   oneof data {

diff --git a/google/protobuf/util/internal/testdata/proto3.proto b/google/protobuf/util/internal/testdata/proto3.proto
@@ -30,7 +30,7 @@
 
 syntax = "proto3";
 
-package google.protobuf.testing;
+package proto_util_converter.testing;
 
 message Proto3Message {
   enum NestedEnum {

diff --git a/google/protobuf/util/internal/testdata/struct.proto b/google/protobuf/util/internal/testdata/struct.proto
@@ -30,7 +30,7 @@
 
 syntax = "proto3";
 
-package google.protobuf.testing;
+package proto_util_converter.testing;
 
 import "google/protobuf/struct.proto";
 

diff --git a/google/protobuf/util/internal/testdata/timestamp_duration.proto b/google/protobuf/util/internal/testdata/timestamp_duration.proto
@@ -30,10 +30,10 @@
 
 syntax = "proto3";
 
-package google.protobuf.testing;
+package proto_util_converter.testing;
 
-import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
+import "google/protobuf/timestamp.proto";
 
 message TimestampDurationTestCases {
   // Timestamp tests

diff --git a/google/protobuf/util/internal/testdata/wrappers.proto b/google/protobuf/util/internal/testdata/wrappers.proto
@@ -30,7 +30,7 @@
 
 syntax = "proto3";
 
-package google.protobuf.testing;
+package proto_util_converter.testing;
 
 import "google/protobuf/wrappers.proto";
 

diff --git a/google/protobuf/util/json_format.proto b/google/protobuf/util/json_format.proto
@@ -35,7 +35,7 @@
 // A proto file we will use for unit testing.
 
 syntax = "proto2";
-package google.protobuf;
+package protobuf_unittest;
 
 
 message TestFlagsAndStrings {