Merge remote-tracking branch 'origin/master' into refactor_field_type

protobuf/lib/src/protobuf/pb_list.dart

@@ -23,15 +23,9 @@ class PbList<E> extends ListBase<E> {
         _check = _checkNotNull,
         _isReadOnly = true;
 
-  PbList.from(List from) : super._from(from);
-
-  @Deprecated('Instead use the default constructor with a check function.'
-      'This constructor will be removed in the next major version.')
-  PbList.forFieldType(FieldType fieldType)
-      : super._noList(check: getCheckFunction(fieldType));
-
-  /// Freezes the list by converting to [FrozenPbList].
-  FrozenPbList<E> toFrozenPbList() => FrozenPbList<E>.from(this);
+  PbList.from(List from)
+      : _wrappedList = List<E>.from(from),
+        _check = _checkNotNull;
 
   @override
   void add(E element) {

protobuf/lib/src/protobuf/proto3_json.dart

@@ -252,7 +252,7 @@ void _mergeFromProto3Json(
             throw context.parseException(
                 'Expected int or stringified int', value);
           }
-          return check32BitUnsigned(result);
+          return _check32BitUnsignedProto3(result, context);
 
         case FieldBaseType.int32:
         case FieldBaseType.sint32:
@@ -328,22 +328,24 @@ void _mergeFromProto3Json(
         case FieldBaseType.uint64:
           // TODO(sigurdm): We do not throw on negative values here.
           // That would probably require going via bignum.
-          return tryParse64Bit(key);
+          return _tryParse64BitProto3(json, key, context);
 
         case FieldBaseType.int64:
         case FieldBaseType.sint64:
         case FieldBaseType.sfixed64:
         case FieldBaseType.fixed64:
-          return tryParse64Bit(key);
+          return _tryParse64BitProto3(json, key, context);
 
         case FieldBaseType.int32:
         case FieldBaseType.sint32:
         case FieldBaseType.fixed32:
         case FieldBaseType.sfixed32:
-          return check32BitSigned(tryParse32Bit(key));
+          return _check32BitSignedProto3(
+              _tryParse32BitProto3(key, context), context);
 
         case FieldBaseType.uint32:
-          return check32BitUnsigned(tryParse32Bit(key));
+          return _check32BitUnsignedProto3(
+              _tryParse32BitProto3(key, context), context);
 
         case FieldBaseType.bytes:
         case FieldBaseType.double:

protobuf/test/readonly_message_test.dart

@@ -11,9 +11,8 @@ import 'package:protobuf/protobuf.dart'
         FieldBaseType,
         FieldType,
         GeneratedMessage,
-        UnknownFieldSetField,
-        frozenMessageModificationHandler,
-        defaultFrozenMessageModificationHandler;
+        PbFieldType,
+        UnknownFieldSetField;
 import 'package:test/test.dart';
 
 Matcher throwsError(Type expectedType, Matcher expectedMessage) =>