Fix all strong mode warnings in protoc-plugin

test/file_generator_test.dart

 #!/usr/bin/env dart
 // Copyright (c) 2013, 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.
 
 library file_generator_test;
 
 import 'package:protoc_plugin/indenting_writer.dart';
 import 'package:protoc_plugin/src/descriptor.pb.dart';
 import 'package:protoc_plugin/src/plugin.pb.dart';
 import 'package:protoc_plugin/protoc.dart';
 import 'package:test/test.dart';
 
 FileDescriptorProto buildFileDescriptor(
     {phoneNumber: true, topLevelEnum: false}) {
-
-  FileDescriptorProto fd = new FileDescriptorProto()
-    ..name = 'test';
+  FileDescriptorProto fd = new FileDescriptorProto()..name = 'test';
 
   if (topLevelEnum) {
     fd.enumType.add(new EnumDescriptorProto()
       ..name = 'PhoneType'
       ..value.addAll([
-          new EnumValueDescriptorProto()
-              ..name = 'MOBILE'
-              ..number = 0,
-          new EnumValueDescriptorProto()
-              ..name = 'HOME'
-              ..number = 1,
-          new EnumValueDescriptorProto()
-              ..name = 'WORK'
-              ..number = 2,
-          new EnumValueDescriptorProto()
-              ..name = 'BUSINESS'
-              ..number = 2]));
+        new EnumValueDescriptorProto()
+          ..name = 'MOBILE'
+          ..number = 0,
+        new EnumValueDescriptorProto()
+          ..name = 'HOME'
+          ..number = 1,
+        new EnumValueDescriptorProto()
+          ..name = 'WORK'
+          ..number = 2,
+        new EnumValueDescriptorProto()
+          ..name = 'BUSINESS'
+          ..number = 2
+      ]));
   }
 
   if (phoneNumber) {
     fd.messageType.add(new DescriptorProto()
       ..name = 'PhoneNumber'
       ..field.addAll([
-          // required string number = 1;
-          new FieldDescriptorProto()
-              ..name = 'number'
-              ..number = 1
-              ..label = FieldDescriptorProto_Label.LABEL_REQUIRED
-              ..type = FieldDescriptorProto_Type.TYPE_STRING,
-          // optional int32 type = 2;
-          // OR
-          // optional PhoneType type = 2;
-          new FieldDescriptorProto()
-              ..name = 'type'
-              ..number = 2
-              ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
-              ..type = topLevelEnum ? FieldDescriptorProto_Type.TYPE_ENUM
-                                    : FieldDescriptorProto_Type.TYPE_INT32
-              ..typeName = topLevelEnum ? '.PhoneType' : '',
-          // optional string name = 3 [default = "$"];
-          new FieldDescriptorProto()
-              ..name = 'name'
-              ..number = 3
-              ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
-              ..type = FieldDescriptorProto_Type.TYPE_STRING
-              ..defaultValue = r'$'
-          ]));
+        // required string number = 1;
+        new FieldDescriptorProto()
+          ..name = 'number'
+          ..number = 1
+          ..label = FieldDescriptorProto_Label.LABEL_REQUIRED
+          ..type = FieldDescriptorProto_Type.TYPE_STRING,
+        // optional int32 type = 2;
+        // OR
+        // optional PhoneType type = 2;
+        new FieldDescriptorProto()
+          ..name = 'type'
+          ..number = 2
+          ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
+          ..type = topLevelEnum
+              ? FieldDescriptorProto_Type.TYPE_ENUM
+              : FieldDescriptorProto_Type.TYPE_INT32
+          ..typeName = topLevelEnum ? '.PhoneType' : '',
+        // optional string name = 3 [default = "$"];
+        new FieldDescriptorProto()
+          ..name = 'name'
+          ..number = 3
+          ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
+          ..type = FieldDescriptorProto_Type.TYPE_STRING
+          ..defaultValue = r'$'
+      ]));
   }
 
   return fd;
 }
 
 void main() {
   test('FileGenerator output for a proto with one message', () {
     // NOTE: Below > 80 cols because it is matching generated code > 80 cols.
     String expected = r'''
 ///
 //  Generated code. Do not modify.
 ///
 library test;
 
 import 'package:protobuf/protobuf.dart';
 
 class PhoneNumber extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('PhoneNumber')
-    ..a(1, 'number', PbFieldType.QS)
-    ..a(2, 'type', PbFieldType.O3)
-    ..a(3, 'name', PbFieldType.OS, '\$')
+    ..a/*<String>*/(1, 'number', PbFieldType.QS)
+    ..a/*<int>*/(2, 'type', PbFieldType.O3)
+    ..a/*<String>*/(3, 'name', PbFieldType.OS, '\$')
   ;
 
   PhoneNumber() : super();
   PhoneNumber.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
   PhoneNumber.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
   PhoneNumber clone() => new PhoneNumber()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static PhoneNumber create() => new PhoneNumber();
   static PbList<PhoneNumber> createRepeated() => new PbList<PhoneNumber>();
   static PhoneNumber getDefault() {
@@ skipping 60 matching lines @@
   static const PhoneType WORK = const PhoneType._(2, 'WORK');
 
   static const PhoneType BUSINESS = WORK;
 
   static const List<PhoneType> values = const <PhoneType> [
     MOBILE,
     HOME,
     WORK,
   ];
 
-  static final Map<int, PhoneType> _byValue = ProtobufEnum.initByValue(values);
-  static PhoneType valueOf(int value) => _byValue[value];
+  static final Map<int, dynamic> _byValue = ProtobufEnum.initByValue(values);
+  static PhoneType valueOf(int value) => _byValue[value] as PhoneType;
   static void $checkItem(PhoneType v) {
     if (v is !PhoneType) checkItemFailed(v, 'PhoneType');
   }
 
   const PhoneType._(int v, String n) : super(v, n);
 }
 
 const PhoneType$json = const {
   '1': 'PhoneType',
   '2': const [
     const {'1': 'MOBILE', '2': 0},
     const {'1': 'HOME', '2': 1},
     const {'1': 'WORK', '2': 2},
     const {'1': 'BUSINESS', '2': 2},
   ],
 };
 
 ''';
-    FileDescriptorProto fd = buildFileDescriptor(
-        phoneNumber: false,
-        topLevelEnum: true);
+    FileDescriptorProto fd =
+        buildFileDescriptor(phoneNumber: false, topLevelEnum: true);
     var options = parseGenerationOptions(
         new CodeGeneratorRequest(), new CodeGeneratorResponse());
 
     FileGenerator fg = new FileGenerator(fd);
     link(options, [fg]);
 
     var writer = new IndentingWriter();
     fg.generate(writer);
     expect(writer.toString(), expected);
   });
@@ skipping 28 matching lines @@
 ///
 library test;
 
 import 'package:fixnum/fixnum.dart';
 import 'package:protobuf/protobuf.dart';
 
 ''';
     FileDescriptorProto fd = new FileDescriptorProto()
       ..name = 'test'
       ..messageType.add(new DescriptorProto()
-      ..name = 'Count'
-      ..field.addAll([
-        new FieldDescriptorProto()
-          ..name = 'count'
-          ..number = 1
-          ..type = FieldDescriptorProto_Type.TYPE_INT64
-    ]));
+        ..name = 'Count'
+        ..field.addAll([
+          new FieldDescriptorProto()
+            ..name = 'count'
+            ..number = 1
+            ..type = FieldDescriptorProto_Type.TYPE_INT64
+        ]));
 
     var options = parseGenerationOptions(
         new CodeGeneratorRequest(), new CodeGeneratorResponse());
 
     FileGenerator fg = new FileGenerator(fd);
     link(options, [fg]);
 
     var writer = new IndentingWriter();
     fg.generateHeader(writer, Uri.parse("test.proto"));
     expect(writer.toString(), expected);
   });
 
-
   test('FileGenerator handles field_name options', () {
     // NOTE: Below > 80 cols because it is matching generated code > 80 cols.
     String expected = r'''
 ///
 //  Generated code. Do not modify.
 ///
 library test;
 
 import 'package:protobuf/protobuf.dart';
 
 class PhoneNumber extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('PhoneNumber')
-    ..a(1, 'no', PbFieldType.QS)
-    ..a(2, 'the_type', PbFieldType.O3)
-    ..a(3, 'name_', PbFieldType.OS, '\$')
+    ..a/*<String>*/(1, 'no', PbFieldType.QS)
+    ..a/*<int>*/(2, 'the_type', PbFieldType.O3)
+    ..a/*<String>*/(3, 'name_', PbFieldType.OS, '\$')
   ;
 
   PhoneNumber() : super();
   PhoneNumber.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
   PhoneNumber.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
   PhoneNumber clone() => new PhoneNumber()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static PhoneNumber create() => new PhoneNumber();
   static PbList<PhoneNumber> createRepeated() => new PbList<PhoneNumber>();
   static PhoneNumber getDefault() {
@@ skipping 29 matching lines @@
     const {'1': 'number', '3': 1, '4': 2, '5': 9},
     const {'1': 'type', '3': 2, '4': 1, '5': 5, '6': ''},
     const {'1': 'name', '3': 3, '4': 1, '5': 9, '7': r'$'},
   ],
 };
 
 ''';
     FileDescriptorProto fd = buildFileDescriptor();
     var request = new CodeGeneratorRequest();
     request.parameter = 'field_name=PhoneNumber.number|No,'
-                        'field_name=PhoneNumber.name|Name_,'
-                        'field_name=PhoneNumber.type|The_type';
-    var options = parseGenerationOptions(
-        request, new CodeGeneratorResponse());
+        'field_name=PhoneNumber.name|Name_,'
+        'field_name=PhoneNumber.type|The_type';
+    var options = parseGenerationOptions(request, new CodeGeneratorResponse());
 
     FileGenerator fg = new FileGenerator(fd);
     link(options, [fg]);
 
     var writer = new IndentingWriter();
     fg.generate(writer);
     expect(writer.toString(), expected);
   });
 
   test('FileGenerator generates imports for .pb.dart files', () {
     // NOTE: Below > 80 cols because it is matching generated code > 80 cols.
     String expected = r'''
 ///
 //  Generated code. Do not modify.
 ///
 library test;
 
 import 'package:protobuf/protobuf.dart';
 import 'package1.pb.dart' as p1;
 import 'package2.pb.dart' as p2;
 
 class M extends GeneratedMessage {
   static final BuilderInfo _i = new BuilderInfo('M')
-    ..a(1, 'm', PbFieldType.OM, M.getDefault, M.create)
-    ..a(2, 'm1', PbFieldType.OM, p1.M.getDefault, p1.M.create)
-    ..a(3, 'm2', PbFieldType.OM, p2.M.getDefault, p2.M.create)
+    ..a/*<M>*/(1, 'm', PbFieldType.OM, M.getDefault, M.create)
+    ..a/*<p1.M>*/(2, 'm1', PbFieldType.OM, p1.M.getDefault, p1.M.create)
+    ..a/*<p2.M>*/(3, 'm2', PbFieldType.OM, p2.M.getDefault, p2.M.create)
     ..hasRequiredFields = false
   ;
 
   M() : super();
   M.fromBuffer(List<int> i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromBuffer(i, r);
   M.fromJson(String i, [ExtensionRegistry r = ExtensionRegistry.EMPTY]) : super.fromJson(i, r);
   M clone() => new M()..mergeFromMessage(this);
   BuilderInfo get info_ => _i;
   static M create() => new M();
   static PbList<M> createRepeated() => new PbList<M>();
@@ skipping 58 matching lines @@
     // import "package1.proto";
     // import "package2.proto";
     // message M {
     //   optional M m = 1;
     //   optional p1.M m1 = 2;
     //   optional p2.M m2 = 3;
     // }
 
     // Description of package1.proto.
     DescriptorProto md1 = new DescriptorProto()
-        ..name = 'M'
-        ..field.addAll([
-            // optional M m = 1;
-            new FieldDescriptorProto()
-                ..name = 'm'
-                ..number = 1
-                ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
-                ..type = FieldDescriptorProto_Type.TYPE_MESSAGE
-                ..typeName = ".p1.M",
-            ]);
+      ..name = 'M'
+      ..field.addAll([
+        // optional M m = 1;
+        new FieldDescriptorProto()
+          ..name = 'm'
+          ..number = 1
+          ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
+          ..type = FieldDescriptorProto_Type.TYPE_MESSAGE
+          ..typeName = ".p1.M",
+      ]);
     FileDescriptorProto fd1 = new FileDescriptorProto()
-        ..package = 'p1'
-        ..name = 'package1.proto'
-        ..messageType.add(md1);
+      ..package = 'p1'
+      ..name = 'package1.proto'
+      ..messageType.add(md1);
 
     // Description of package1.proto.
     DescriptorProto md2 = new DescriptorProto()
-        ..name = 'M'
-        ..field.addAll([
-            // optional M m = 1;
-            new FieldDescriptorProto()
-                ..name = 'x'
-                ..number = 1
-                ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
-                ..type = FieldDescriptorProto_Type.TYPE_MESSAGE
-                ..typeName = ".p2.M",
-            ]);
+      ..name = 'M'
+      ..field.addAll([
+        // optional M m = 1;
+        new FieldDescriptorProto()
+          ..name = 'x'
+          ..number = 1
+          ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
+          ..type = FieldDescriptorProto_Type.TYPE_MESSAGE
+          ..typeName = ".p2.M",
+      ]);
     FileDescriptorProto fd2 = new FileDescriptorProto()
-        ..package = 'p2'
-        ..name = 'package2.proto'
-        ..messageType.add(md2);
+      ..package = 'p2'
+      ..name = 'package2.proto'
+      ..messageType.add(md2);
 
     // Description of test.proto.
     DescriptorProto md = new DescriptorProto()
-        ..name = 'M'
-        ..field.addAll([
-            // optional M m = 1;
-            new FieldDescriptorProto()
-                ..name = 'm'
-                ..number = 1
-                ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
-                ..type = FieldDescriptorProto_Type.TYPE_MESSAGE
-                ..typeName = ".M",
-            // optional p1.M m1 = 2;
-            new FieldDescriptorProto()
-                ..name = 'm1'
-                ..number = 2
-                ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
-                ..type = FieldDescriptorProto_Type.TYPE_MESSAGE
-                ..typeName = ".p1.M",
-            // optional p2.M m2 = 3;
-            new FieldDescriptorProto()
-                ..name = 'm2'
-                ..number = 3
-                ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
-                ..type = FieldDescriptorProto_Type.TYPE_MESSAGE
-                ..typeName = ".p2.M",
-            ]);
+      ..name = 'M'
+      ..field.addAll([
+        // optional M m = 1;
+        new FieldDescriptorProto()
+          ..name = 'm'
+          ..number = 1
+          ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
+          ..type = FieldDescriptorProto_Type.TYPE_MESSAGE
+          ..typeName = ".M",
+        // optional p1.M m1 = 2;
+        new FieldDescriptorProto()
+          ..name = 'm1'
+          ..number = 2
+          ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
+          ..type = FieldDescriptorProto_Type.TYPE_MESSAGE
+          ..typeName = ".p1.M",
+        // optional p2.M m2 = 3;
+        new FieldDescriptorProto()
+          ..name = 'm2'
+          ..number = 3
+          ..label = FieldDescriptorProto_Label.LABEL_OPTIONAL
+          ..type = FieldDescriptorProto_Type.TYPE_MESSAGE
+          ..typeName = ".p2.M",
+      ]);
     FileDescriptorProto fd = new FileDescriptorProto()
-        ..name = 'test.proto'
-        ..messageType.add(md);
+      ..name = 'test.proto'
+      ..messageType.add(md);
     fd.dependency.addAll(['package1.proto', 'package2.proto']);
     var request = new CodeGeneratorRequest();
     var response = new CodeGeneratorResponse();
     var options = parseGenerationOptions(request, response);
 
     FileGenerator fg = new FileGenerator(fd);
     link(options, [fg, new FileGenerator(fd1), new FileGenerator(fd2)]);
 
     var writer = new IndentingWriter();
     fg.generate(writer);
     expect(writer.toString(), expected);
   });
 }