commit db7b9c2fe12866a43091fb440f03a635bc8011a9
author Mikhail Gurevich <mig35@users.noreply.github.com> Wed Oct 23 14:33:43 2019 +0700
committer Sigurd Meldgaard <sigurdm@google.com> Wed Oct 23 09:33:43 2019 +0200
tree 39f0f2ef9296ca22b83ae3a214f73e59105a4ab9
parent 4da8148db9c2d8422d4e0b207ac85a981d970f3e

Add missed `protoName` population (#313)

protobuf/CHANGELOG.md

diff --git a/protobuf/CHANGELOG.md b/protobuf/CHANGELOG.md
index fa3c989..b645d30 100644
--- a/protobuf/CHANGELOG.md
+++ b/protobuf/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.1
+
+* Fix issue with the non-json name of a field (`protoName`) not being set correctly.
+
 ## 1.0.0
 
 * Graduate package to 1.0. No functional changes.

protobuf/lib/src/protobuf/builder_info.dart

diff --git a/protobuf/lib/src/protobuf/builder_info.dart b/protobuf/lib/src/protobuf/builder_info.dart
index 86e6b82..a492f96 100644
--- a/protobuf/lib/src/protobuf/builder_info.dart
+++ b/protobuf/lib/src/protobuf/builder_info.dart
@@ -102,34 +102,40 @@
       List<ProtobufEnum> enumValues,
       String protoName}) {
     add<T>(tagNumber, name, fieldType, defaultOrMaker, subBuilder, valueOf,
-        enumValues);
+        enumValues,
+        protoName: protoName);
   }
 
   /// Adds PbFieldType.OS String with no default value to reduce generated
   /// code size.
   void aOS(int tagNumber, String name, {String protoName}) {
-    add<String>(tagNumber, name, PbFieldType.OS, null, null, null, null);
+    add<String>(tagNumber, name, PbFieldType.OS, null, null, null, null,
+        protoName: protoName);
   }
 
   /// Adds PbFieldType.PS String with no default value.
   void pPS(int tagNumber, String name, {String protoName}) {
     addRepeated<String>(tagNumber, name, PbFieldType.PS,
-        getCheckFunction(PbFieldType.PS), null, null, null);
+        getCheckFunction(PbFieldType.PS), null, null, null,
+        protoName: protoName);
   }
 
   /// Adds PbFieldType.QS String with no default value.
   void aQS(int tagNumber, String name, {String protoName}) {
-    add<String>(tagNumber, name, PbFieldType.QS, null, null, null, null);
+    add<String>(tagNumber, name, PbFieldType.QS, null, null, null, null,
+        protoName: protoName);
   }
 
   /// Adds Int64 field with Int64.ZERO default.
   void aInt64(int tagNumber, String name, {String protoName}) {
-    add<Int64>(tagNumber, name, PbFieldType.O6, Int64.ZERO, null, null, null);
+    add<Int64>(tagNumber, name, PbFieldType.O6, Int64.ZERO, null, null, null,
+        protoName: protoName);
   }
 
   /// Adds a boolean with no default value.
   void aOB(int tagNumber, String name, {String protoName}) {
-    add<bool>(tagNumber, name, PbFieldType.OB, null, null, null, null);
+    add<bool>(tagNumber, name, PbFieldType.OB, null, null, null, null,
+        protoName: protoName);
   }
 
   // Enum.
@@ -139,14 +145,16 @@
       List<ProtobufEnum> enumValues,
       String protoName}) {
     add<T>(
-        tagNumber, name, fieldType, defaultOrMaker, null, valueOf, enumValues);
+        tagNumber, name, fieldType, defaultOrMaker, null, valueOf, enumValues,
+        protoName: protoName);
   }
 
   // Repeated, not a message, group, or enum.
   void p<T>(int tagNumber, String name, int fieldType, {String protoName}) {
     assert(!_isGroupOrMessage(fieldType) && !_isEnum(fieldType));
     addRepeated<T>(tagNumber, name, fieldType, getCheckFunction(fieldType),
-        null, null, null);
+        null, null, null,
+        protoName: protoName);
   }
 
   // Repeated message, group, or enum.
@@ -157,7 +165,8 @@
       String protoName}) {
     assert(_isGroupOrMessage(fieldType) || _isEnum(fieldType));
     addRepeated<T>(tagNumber, name, fieldType, _checkNotNull, subBuilder,
-        valueOf, enumValues);
+        valueOf, enumValues,
+        protoName: protoName);
   }
 
   void aOM<T extends GeneratedMessage>(int tagNumber, String name,
@@ -169,7 +178,8 @@
         GeneratedMessage._defaultMakerFor<T>(subBuilder),
         subBuilder,
         null,
-        null);
+        null,
+        protoName: protoName);
   }
 
   void aQM<T extends GeneratedMessage>(int tagNumber, String name,
@@ -181,7 +191,8 @@
         GeneratedMessage._defaultMakerFor<T>(subBuilder),
         subBuilder,
         null,
-        null);
+        null,
+        protoName: protoName);
   }
 
   // oneof declarations.

protobuf/pubspec.yaml

diff --git a/protobuf/pubspec.yaml b/protobuf/pubspec.yaml
index c94bcd2..0f6616b 100644
--- a/protobuf/pubspec.yaml
+++ b/protobuf/pubspec.yaml
@@ -1,5 +1,5 @@
 name: protobuf
-version: 1.0.0
+version: 1.0.1
 author: Dart Team <misc@dartlang.org>
 description: >
   Runtime library for protocol buffers support.

protoc_plugin/test/names_test.dart

diff --git a/protoc_plugin/test/names_test.dart b/protoc_plugin/test/names_test.dart
index 29b8c58..158c6cb 100644
--- a/protoc_plugin/test/names_test.dart
+++ b/protoc_plugin/test/names_test.dart
@@ -219,6 +219,11 @@
     expect(json_name.JsonNamedMessage().getTagNumber('barName'), 1);
   });
 
+  test('The proto name is set correctly', () {
+    expect(json_name.JsonNamedMessage().info_.byName['barName'].protoName,
+        'foo_name');
+  });
+
   test('Invalid characters are escaped from json_name', () {
     expect(json_name.JsonNamedMessage().getTagNumber('\$name'), 2);
   });