diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2017-10-18 14:21:22 -0700 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2017-10-18 14:21:22 -0700 |
commit | ecf29571061337e6fbd70283f0a6ad0202e94b24 (patch) | |
tree | d7f655fd3c0218167dee82859d039d2e1487ef33 | |
parent | 6b5912b1e31641a43bf8227fab81a95581701fe0 (diff) | |
download | protobuf-ecf29571061337e6fbd70283f0a6ad0202e94b24.tar.gz protobuf-ecf29571061337e6fbd70283f0a6ad0202e94b24.tar.bz2 protobuf-ecf29571061337e6fbd70283f0a6ad0202e94b24.zip |
Update descriptor protos
4 files changed, 20 insertions, 4 deletions
diff --git a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs index 8c37ba86..6aad0e99 100644 --- a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs +++ b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs @@ -3478,7 +3478,8 @@ namespace Google.Protobuf.Reflection { = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser); private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>(); /// <summary> - /// The parser stores options it doesn't recognize here. See above. + /// The parser stores options it doesn't recognize here. + /// See the documentation for the "Options" section above. /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption { diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs index ef3bc10a..ee4561ff 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs @@ -239,6 +239,12 @@ namespace Google.Protobuf.WellKnownTypes { /// /// Note that oneof type names ("test_oneof" in this case) cannot be used in /// paths. + /// + /// ## Field Mask Verification + /// + /// The implementation of the all the API methods, which have any FieldMask type + /// field in the request, should verify the included field paths, and return + /// `INVALID_ARGUMENT` error if any path is duplicated or unmappable. /// </summary> public sealed partial class FieldMask : pb::IMessage<FieldMask> { private static readonly pb::MessageParser<FieldMask> _parser = new pb::MessageParser<FieldMask>(() => new FieldMask()); diff --git a/objectivec/google/protobuf/FieldMask.pbobjc.h b/objectivec/google/protobuf/FieldMask.pbobjc.h index 07e60818..75cf856c 100644 --- a/objectivec/google/protobuf/FieldMask.pbobjc.h +++ b/objectivec/google/protobuf/FieldMask.pbobjc.h @@ -252,6 +252,12 @@ typedef GPB_ENUM(GPBFieldMask_FieldNumber) { * * Note that oneof type names ("test_oneof" in this case) cannot be used in * paths. + * + * ## Field Mask Verification + * + * The implementation of the all the API methods, which have any FieldMask type + * field in the request, should verify the included field paths, and return + * `INVALID_ARGUMENT` error if any path is duplicated or unmappable. **/ @interface GPBFieldMask : GPBMessage diff --git a/php/src/Google/Protobuf/Internal/FileOptions.php b/php/src/Google/Protobuf/Internal/FileOptions.php index ee64e4e0..f3bacad6 100644 --- a/php/src/Google/Protobuf/Internal/FileOptions.php +++ b/php/src/Google/Protobuf/Internal/FileOptions.php @@ -174,7 +174,8 @@ class FileOptions extends \Google\Protobuf\Internal\Message private $php_namespace = ''; private $has_php_namespace = false; /** - * The parser stores options it doesn't recognize here. See above. + * The parser stores options it doesn't recognize here. + * See the documentation for the "Options" section above. * * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code> */ @@ -827,7 +828,8 @@ class FileOptions extends \Google\Protobuf\Internal\Message } /** - * The parser stores options it doesn't recognize here. See above. + * The parser stores options it doesn't recognize here. + * See the documentation for the "Options" section above. * * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code> * @return \Google\Protobuf\Internal\RepeatedField @@ -838,7 +840,8 @@ class FileOptions extends \Google\Protobuf\Internal\Message } /** - * The parser stores options it doesn't recognize here. See above. + * The parser stores options it doesn't recognize here. + * See the documentation for the "Options" section above. * * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code> * @param \Google\Protobuf\Internal\UninterpretedOption[]|\Google\Protobuf\Internal\RepeatedField $var |