Skip to content

Commit 950b6a7

Browse files
authored
Remove redundant checkNotNull calls from pre-null-safe days (#958)
1 parent d00f905 commit 950b6a7

File tree

5 files changed

+8
-22
lines changed

5 files changed

+8
-22
lines changed

protobuf/lib/src/protobuf/coded_buffer.dart

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ void _writeToCodedBufferWriter(_FieldSet fs, CodedBufferWriter out) {
3131

3232
void _mergeFromCodedBufferReader(BuilderInfo meta, _FieldSet fs,
3333
CodedBufferReader input, ExtensionRegistry registry) {
34-
ArgumentError.checkNotNull(registry);
3534
fs._ensureWritable();
3635
while (true) {
3736
final tag = input.readTag();

protobuf/lib/src/protobuf/extension.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Extension<T> extends FieldInfo<T> {
2222
protoName: protoName);
2323

2424
Extension.repeated(this.extendee, String name, int tagNumber, int fieldType,
25-
{CheckFunc<T>? check,
25+
{required CheckFunc<T> check,
2626
CreateBuilderFunc? subBuilder,
2727
ValueOfFunc? valueOf,
2828
List<ProtobufEnum>? enumValues,

protobuf/lib/src/protobuf/field_info.dart

+7-13
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,12 @@ class FieldInfo<T> {
128128
subBuilder = null;
129129

130130
FieldInfo.repeated(this.name, this.tagNumber, this.index, this.type,
131-
this.check, this.subBuilder,
131+
CheckFunc<T> this.check, this.subBuilder,
132132
{this.valueOf, this.enumValues, this.defaultEnumValue, String? protoName})
133-
: makeDefault = (() => PbList<T>(check: check!)),
134-
_protoName = protoName {
135-
ArgumentError.checkNotNull(name, 'name');
136-
ArgumentError.checkNotNull(tagNumber, 'tagNumber');
137-
assert(_isRepeated(type));
138-
assert(check != null);
139-
assert(!_isEnum(type) || valueOf != null);
140-
}
133+
: makeDefault = (() => PbList<T>(check: check)),
134+
_protoName = protoName,
135+
assert(_isRepeated(type)),
136+
assert(!_isEnum(type) || valueOf != null);
141137

142138
static MakeDefaultFunc? findMakeDefault(int type, dynamic defaultOrMaker) {
143139
if (defaultOrMaker == null) return PbFieldType._defaultForType(type);
@@ -276,13 +272,11 @@ class MapFieldInfo<K, V> extends FieldInfo<PbMap<K, V>?> {
276272
this.valueCreator,
277273
{ProtobufEnum? defaultEnumValue,
278274
String? protoName})
279-
: super(name, tagNumber, index, type,
275+
: assert(_isMapField(type)),
276+
super(name, tagNumber, index, type,
280277
defaultOrMaker: () => PbMap<K, V>(keyFieldType, valueFieldType),
281278
defaultEnumValue: defaultEnumValue,
282279
protoName: protoName) {
283-
ArgumentError.checkNotNull(name, 'name');
284-
ArgumentError.checkNotNull(tagNumber, 'tagNumber');
285-
assert(_isMapField(type));
286280
assert(!_isEnum(type) || valueOf != null);
287281
}
288282

protobuf/lib/src/protobuf/field_set.dart

-3
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,6 @@ class _FieldSet {
258258
/// Works for both extended and non-extended fields.
259259
/// Suitable for public API.
260260
void _setField(int tagNumber, Object value) {
261-
ArgumentError.checkNotNull(value, 'value');
262-
263261
final meta = _meta;
264262
final fi = _nonExtensionInfo(meta, tagNumber);
265263
if (fi == null) {
@@ -284,7 +282,6 @@ class _FieldSet {
284282
/// Works for both extended and non-extended fields.
285283
/// Suitable for decoders that do their own validation.
286284
void _setFieldUnchecked(BuilderInfo meta, FieldInfo fi, value) {
287-
ArgumentError.checkNotNull(fi, 'fi');
288285
assert(!fi.isRepeated);
289286
if (fi.index == null) {
290287
_ensureExtensions()

protobuf/lib/src/protobuf/generated_message.dart

-4
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ abstract class GeneratedMessage {
396396

397397
/// Sets the value of a non-repeated extension field to [value].
398398
void setExtension(Extension extension, Object value) {
399-
ArgumentError.checkNotNull(value, 'value');
400399
if (_isRepeated(extension.type)) {
401400
throw ArgumentError(_fieldSet._setFieldFailedMessage(
402401
extension, value, 'repeating field (use get + .add())'));
@@ -489,7 +488,6 @@ abstract class GeneratedMessage {
489488
/// For generated code only.
490489
/// @nodoc
491490
void $_setFloat(int index, double value) {
492-
ArgumentError.checkNotNull(value, 'value');
493491
if (!_isFloat32(value)) {
494492
_fieldSet._$check(index, value);
495493
}
@@ -503,7 +501,6 @@ abstract class GeneratedMessage {
503501
/// For generated code only.
504502
/// @nodoc
505503
void $_setSignedInt32(int index, int value) {
506-
ArgumentError.checkNotNull(value, 'value');
507504
if (!_isSigned32(value)) {
508505
_fieldSet._$check(index, value);
509506
}
@@ -513,7 +510,6 @@ abstract class GeneratedMessage {
513510
/// For generated code only.
514511
/// @nodoc
515512
void $_setUnsignedInt32(int index, int value) {
516-
ArgumentError.checkNotNull(value, 'value');
517513
if (!_isUnsigned32(value)) {
518514
_fieldSet._$check(index, value);
519515
}

0 commit comments

Comments
 (0)