commit 489677bd0c8ce676e989708032ad2c8260355366
author Neil Parker <nwp7@cornell.edu> Mon Sep 09 05:26:24 2019 -0700
committer Sarah Zakarias <zarah@google.com> Mon Sep 09 14:26:24 2019 +0200
tree b1d0aa120a16cb64f560a3daf795d6b71e7a5f98
parent 0dcb9a97b89b25b1ef2655f58a196a065031d276

Make mapEntryBuilderInfo public (#280)

protobuf/CHANGELOG.md

diff --git a/protobuf/CHANGELOG.md b/protobuf/CHANGELOG.md
index 5e086ea..9697487 100644
--- a/protobuf/CHANGELOG.md
+++ b/protobuf/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.14.2
+
+*  Expose `mapEntryBuilderInfo` in `MapFieldInfo`.
+
 ## 0.14.1
 
 * Support for `import public`.

protobuf/lib/src/protobuf/field_info.dart

diff --git a/protobuf/lib/src/protobuf/field_info.dart b/protobuf/lib/src/protobuf/field_info.dart
index 91fe8cd..743a55a 100644
--- a/protobuf/lib/src/protobuf/field_info.dart
+++ b/protobuf/lib/src/protobuf/field_info.dart
@@ -199,7 +199,7 @@
   /// `null` if the value type is not a Message type.
   final CreateBuilderFunc valueCreator;
 
-  final BuilderInfo _mapEntryBuilderInfo;
+  final BuilderInfo mapEntryBuilderInfo;
 
   MapFieldInfo(
       String name,
@@ -208,12 +208,12 @@
       int type,
       this.keyFieldType,
       this.valueFieldType,
-      this._mapEntryBuilderInfo,
+      this.mapEntryBuilderInfo,
       this.valueCreator,
       {String protoName})
       : super(name, tagNumber, index, type,
             defaultOrMaker: () =>
-                PbMap<K, V>(keyFieldType, valueFieldType, _mapEntryBuilderInfo),
+                PbMap<K, V>(keyFieldType, valueFieldType, mapEntryBuilderInfo),
             protoName: protoName) {
     assert(name != null);
     assert(tagNumber != null);
@@ -222,7 +222,7 @@
   }
 
   FieldInfo get valueFieldInfo =>
-      _mapEntryBuilderInfo.fieldInfo[PbMap._valueFieldNumber];
+      mapEntryBuilderInfo.fieldInfo[PbMap._valueFieldNumber];
 
   Map<K, V> _ensureMapField(_FieldSet fs) {
     return fs._ensureMapField<K, V>(this);

protobuf/lib/src/protobuf/field_set.dart

diff --git a/protobuf/lib/src/protobuf/field_set.dart b/protobuf/lib/src/protobuf/field_set.dart
index bce29d8..1e3f001 100644
--- a/protobuf/lib/src/protobuf/field_set.dart
+++ b/protobuf/lib/src/protobuf/field_set.dart
@@ -209,7 +209,7 @@
 
     if (_isReadOnly)
       return PbMap<K, V>.unmodifiable(PbMap<K, V>(
-          fi.keyFieldType, fi.valueFieldType, fi._mapEntryBuilderInfo));
+          fi.keyFieldType, fi.valueFieldType, fi.mapEntryBuilderInfo));
 
     var value = fi._createMapField(_message);
     _setNonExtensionFieldUnchecked(fi, value);

protobuf/lib/src/protobuf/generated_message.dart

diff --git a/protobuf/lib/src/protobuf/generated_message.dart b/protobuf/lib/src/protobuf/generated_message.dart
index fa1f0ea..97d6d1a 100644
--- a/protobuf/lib/src/protobuf/generated_message.dart
+++ b/protobuf/lib/src/protobuf/generated_message.dart
@@ -325,7 +325,7 @@
   /// Creates a Map representing a map field.
   Map<K, V> createMapField<K, V>(int tagNumber, MapFieldInfo<K, V> fi) {
     return PbMap<K, V>(
-        fi.keyFieldType, fi.valueFieldType, fi._mapEntryBuilderInfo);
+        fi.keyFieldType, fi.valueFieldType, fi.mapEntryBuilderInfo);
   }
 
   /// Returns the value of a field, ignoring any defaults.

protobuf/pubspec.yaml

diff --git a/protobuf/pubspec.yaml b/protobuf/pubspec.yaml
index 69c2241..4f0d3a5 100644
--- a/protobuf/pubspec.yaml
+++ b/protobuf/pubspec.yaml
@@ -1,5 +1,5 @@
 name: protobuf
-version: 0.14.1
+version: 0.14.2
 author: Dart Team <misc@dartlang.org>
 description: >
   Runtime library for protocol buffers support.