Refactor protos to add package and license lines (#696)

Follow official protobuf style guide:

1. License header (if applicable)
2. File overview
3. Syntax
4. Package
5. Imports (sorted)
6. File options
7. Everything else

Internally we want a `package` line in every proto, and it's easier to
do add `package` lines to protos than to add them as exceptions.

License headers added the old files based on creation date.

protos in google/protobuf are not updated as they are copied from
protoc.

The proto file `unittest_nested_any.proto` was added #568. Since it's
not copied from protoc I moved it to test/protos.

Fixes #692

Author: osa1

protoc_plugin/Makefile

@@ -21,7 +21,6 @@ TEST_PROTO_LIST = \
 	google/protobuf/timestamp \
 	google/protobuf/type \
 	google/protobuf/unittest_import \
-	google/protobuf/unittest_nested_any \
 	google/protobuf/unittest_optimize_for \
 	google/protobuf/unittest_well_known_types \
 	google/protobuf/unittest \
@@ -46,6 +45,7 @@ TEST_PROTO_LIST = \
 	map_field \
 	mixins \
 	multiple_files_test \
+	nested_any \
 	nested_extension \
 	nested_message \
 	non_nested_extension \

protoc_plugin/test/any_test.dart

@@ -13,10 +13,10 @@ import '../out/protos/using_any.pb.dart';
 void main() {
   test('pack -> unpack', () {
     var any = Any.pack(SearchRequest()..query = 'hest');
-    expect(any.typeUrl, 'type.googleapis.com/SearchRequest');
+    expect(any.typeUrl, 'type.googleapis.com/service.SearchRequest');
     var any1 = Any.pack(SearchRequest()..query = 'hest1',
         typeUrlPrefix: 'example.com');
-    expect(any1.typeUrl, 'example.com/SearchRequest');
+    expect(any1.typeUrl, 'example.com/service.SearchRequest');
     expect(any1.canUnpackInto(SearchRequest.getDefault()), true);
     expect(any1.canUnpackInto(SearchResponse.getDefault()), false);
     var searchRequest = any.unpackInto(SearchRequest());
@@ -42,7 +42,7 @@ void main() {
     var any = Any.pack(toplevel.T()
       ..a = 127
       ..b = 'hest');
-    expect(any.typeUrl, 'type.googleapis.com/T');
+    expect(any.typeUrl, 'type.googleapis.com/toplevel.T');
     var t2 = any.unpackInto(toplevel.T());
     expect(t2.a, 127);
     expect(t2.b, 'hest');

protoc_plugin/test/proto3_json_test.dart

@@ -16,10 +16,10 @@ import '../out/protos/google/protobuf/field_mask.pb.dart';
 import '../out/protos/google/protobuf/struct.pb.dart';
 import '../out/protos/google/protobuf/timestamp.pb.dart';
 import '../out/protos/google/protobuf/unittest.pb.dart';
-import '../out/protos/google/protobuf/unittest_nested_any.pb.dart';
 import '../out/protos/google/protobuf/unittest_well_known_types.pb.dart';
 import '../out/protos/google/protobuf/wrappers.pb.dart';
 import '../out/protos/map_field.pb.dart';
+import '../out/protos/nested_any.pb.dart';
 import '../out/protos/oneof.pb.dart';
 import 'oneof_test.dart';
 import 'test_util.dart';
@@ -281,12 +281,10 @@ void main() {
           {
             'anyField2': {
               'value': '1',
-              '@type':
-                  'type.googleapis.com/protobuf_unittest_nested_any.AnyMessage1'
+              '@type': 'type.googleapis.com/nested_any.AnyMessage1'
             },
             'value': '2',
-            '@type':
-                'type.googleapis.com/protobuf_unittest_nested_any.AnyMessage2'
+            '@type': 'type.googleapis.com/nested_any.AnyMessage2'
           });
     });
 
@@ -941,12 +939,10 @@ void main() {
         ..mergeFromProto3Json({
           'anyField2': {
             'value': '1',
-            '@type':
-                'type.googleapis.com/protobuf_unittest_nested_any.AnyMessage1'
+            '@type': 'type.googleapis.com/nested_any.AnyMessage1'
           },
           'value': '2',
-          '@type':
-              'type.googleapis.com/protobuf_unittest_nested_any.AnyMessage2'
+          '@type': 'type.googleapis.com/nested_any.AnyMessage2'
         }, typeRegistry: TypeRegistry([AnyMessage1(), AnyMessage2()]));
 
       expect(

protoc_plugin/test/protos/ExtensionEnumNameConflict.proto

@@ -1,3 +1,7 @@
+// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
 syntax = "proto2";
 
 package protobuf_unittest;

protoc_plugin/test/protos/ExtensionNameConflict.proto

@@ -1,3 +1,7 @@
+// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
 syntax = "proto2";
 
 package protobuf_unittest;

protoc_plugin/test/protos/bytes.proto

@@ -1,5 +1,11 @@
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
 syntax = "proto2";
 
+package bytes;
+
 message BytesEntity {
   optional bytes value = 1;
   repeated bytes values = 2;

protoc_plugin/test/protos/custom_option.proto

@@ -4,6 +4,8 @@
 
 syntax = "proto2";
 
+package custom_option;
+
 import "descriptor.proto";
 
 extend google.protobuf.MessageOptions {

protoc_plugin/test/protos/dart_name.proto

@@ -4,10 +4,10 @@
 
 syntax = "proto2";
 
-import "dart_options.proto";
-
 package dart_name;
 
+import "dart_options.proto";
+
 message DartName {
   optional string field = 1 [
     (dart_options.dart_name) = "renamedField"

protoc_plugin/test/protos/default_value_escape.proto

@@ -4,6 +4,8 @@
 
 syntax = "proto2";
 
+package default_value_escape;
+
 message F {
   optional string a = 1 [default = "a\nb"];
   optional string b = 2 [default = "a'b"];

protoc_plugin/test/protos/enum_name.proto

@@ -1,3 +1,7 @@
+// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
 syntax = "proto2";
 
 package enum.name;