diff options
author | Adam Cozzette <acozzette@gmail.com> | 2017-12-05 13:02:36 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-05 13:02:36 -0800 |
commit | 9021f623e1420f513268a01a5ad43a23618a84ba (patch) | |
tree | 25e753e41ea561c1bc8eb5a51a9d6985d73a31a7 /objectivec | |
parent | 173f3043d30317c16caa6a5c1e16db2540e8170c (diff) | |
parent | e372df5c975dc9720c9252e9b0b25c03e7c4b713 (diff) | |
download | protobuf-9021f623e1420f513268a01a5ad43a23618a84ba.tar.gz protobuf-9021f623e1420f513268a01a5ad43a23618a84ba.tar.bz2 protobuf-9021f623e1420f513268a01a5ad43a23618a84ba.zip |
Merge pull request #3988 from acozzette/down-integrate
Integrated internal changes from Google
Diffstat (limited to 'objectivec')
-rw-r--r-- | objectivec/google/protobuf/Any.pbobjc.h | 21 | ||||
-rw-r--r-- | objectivec/google/protobuf/Timestamp.pbobjc.h | 4 |
2 files changed, 15 insertions, 10 deletions
diff --git a/objectivec/google/protobuf/Any.pbobjc.h b/objectivec/google/protobuf/Any.pbobjc.h index b17e76f0..89c99bdb 100644 --- a/objectivec/google/protobuf/Any.pbobjc.h +++ b/objectivec/google/protobuf/Any.pbobjc.h @@ -135,17 +135,18 @@ typedef GPB_ENUM(GPBAny_FieldNumber) { @interface GPBAny : GPBMessage /** - * A URL/resource name whose content describes the type of the - * serialized protocol buffer message. + * A URL/resource name that uniquely identifies the type of the serialized + * protocol buffer message. The last segment of the URL's path must represent + * the fully qualified name of the type (as in + * `path/google.protobuf.Duration`). The name should be in a canonical form + * (e.g., leading "." is not accepted). * - * For URLs which use the scheme `http`, `https`, or no scheme, the - * following restrictions and interpretations apply: + * In practice, teams usually precompile into the binary all types that they + * expect it to use in the context of Any. However, for URLs which use the + * scheme `http`, `https`, or no scheme, one can optionally set up a type + * server that maps type URLs to message definitions as follows: * * * If no scheme is provided, `https` is assumed. - * * The last segment of the URL's path must represent the fully - * qualified name of the type (as in `path/google.protobuf.Duration`). - * The name should be in a canonical form (e.g., leading "." is - * not accepted). * * An HTTP GET on the URL must yield a [google.protobuf.Type][] * value in binary format, or produce an error. * * Applications are allowed to cache lookup results based on the @@ -154,6 +155,10 @@ typedef GPB_ENUM(GPBAny_FieldNumber) { * on changes to types. (Use versioned type names to manage * breaking changes.) * + * Note: this functionality is not currently available in the official + * protobuf release, and it is not used for type URLs beginning with + * type.googleapis.com. + * * Schemes other than `http`, `https` (or the empty scheme) might be * used with implementation specific semantics. **/ diff --git a/objectivec/google/protobuf/Timestamp.pbobjc.h b/objectivec/google/protobuf/Timestamp.pbobjc.h index 0b670c35..998bc15d 100644 --- a/objectivec/google/protobuf/Timestamp.pbobjc.h +++ b/objectivec/google/protobuf/Timestamp.pbobjc.h @@ -126,8 +126,8 @@ typedef GPB_ENUM(GPBTimestamp_FieldNumber) { * to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) * with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one * can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( - * http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--) - * to obtain a formatter capable of generating timestamps in this format. + * http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime-- + * ) to obtain a formatter capable of generating timestamps in this format. **/ @interface GPBTimestamp : GPBMessage |