aboutsummaryrefslogtreecommitdiffhomepage
path: root/vendor/github.com/golang/protobuf/jsonpb
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/golang/protobuf/jsonpb')
-rw-r--r--vendor/github.com/golang/protobuf/jsonpb/jsonpb.go1241
-rw-r--r--vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go1150
-rw-r--r--vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.pb.go368
-rw-r--r--vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.proto69
-rw-r--r--vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.pb.go1278
-rw-r--r--vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto171
6 files changed, 0 insertions, 4277 deletions
diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go b/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go
deleted file mode 100644
index ff368f3..0000000
--- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go
+++ /dev/null
@@ -1,1241 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2015 The Go Authors. All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/*
-Package jsonpb provides marshaling and unmarshaling between protocol buffers and JSON.
-It follows the specification at https://developers.google.com/protocol-buffers/docs/proto3#json.
-
-This package produces a different output than the standard "encoding/json" package,
-which does not operate correctly on protocol buffers.
-*/
-package jsonpb
-
-import (
- "bytes"
- "encoding/json"
- "errors"
- "fmt"
- "io"
- "math"
- "reflect"
- "sort"
- "strconv"
- "strings"
- "time"
-
- "github.com/golang/protobuf/proto"
-
- stpb "github.com/golang/protobuf/ptypes/struct"
-)
-
-const secondInNanos = int64(time.Second / time.Nanosecond)
-
-// Marshaler is a configurable object for converting between
-// protocol buffer objects and a JSON representation for them.
-type Marshaler struct {
- // Whether to render enum values as integers, as opposed to string values.
- EnumsAsInts bool
-
- // Whether to render fields with zero values.
- EmitDefaults bool
-
- // A string to indent each level by. The presence of this field will
- // also cause a space to appear between the field separator and
- // value, and for newlines to be appear between fields and array
- // elements.
- Indent string
-
- // Whether to use the original (.proto) name for fields.
- OrigName bool
-
- // A custom URL resolver to use when marshaling Any messages to JSON.
- // If unset, the default resolution strategy is to extract the
- // fully-qualified type name from the type URL and pass that to
- // proto.MessageType(string).
- AnyResolver AnyResolver
-}
-
-// AnyResolver takes a type URL, present in an Any message, and resolves it into
-// an instance of the associated message.
-type AnyResolver interface {
- Resolve(typeUrl string) (proto.Message, error)
-}
-
-func defaultResolveAny(typeUrl string) (proto.Message, error) {
- // Only the part of typeUrl after the last slash is relevant.
- mname := typeUrl
- if slash := strings.LastIndex(mname, "/"); slash >= 0 {
- mname = mname[slash+1:]
- }
- mt := proto.MessageType(mname)
- if mt == nil {
- return nil, fmt.Errorf("unknown message type %q", mname)
- }
- return reflect.New(mt.Elem()).Interface().(proto.Message), nil
-}
-
-// JSONPBMarshaler is implemented by protobuf messages that customize the
-// way they are marshaled to JSON. Messages that implement this should
-// also implement JSONPBUnmarshaler so that the custom format can be
-// parsed.
-type JSONPBMarshaler interface {
- MarshalJSONPB(*Marshaler) ([]byte, error)
-}
-
-// JSONPBUnmarshaler is implemented by protobuf messages that customize
-// the way they are unmarshaled from JSON. Messages that implement this
-// should also implement JSONPBMarshaler so that the custom format can be
-// produced.
-type JSONPBUnmarshaler interface {
- UnmarshalJSONPB(*Unmarshaler, []byte) error
-}
-
-// Marshal marshals a protocol buffer into JSON.
-func (m *Marshaler) Marshal(out io.Writer, pb proto.Message) error {
- v := reflect.ValueOf(pb)
- if pb == nil || (v.Kind() == reflect.Ptr && v.IsNil()) {
- return errors.New("Marshal called with nil")
- }
- // Check for unset required fields first.
- if err := checkRequiredFields(pb); err != nil {
- return err
- }
- writer := &errWriter{writer: out}
- return m.marshalObject(writer, pb, "", "")
-}
-
-// MarshalToString converts a protocol buffer object to JSON string.
-func (m *Marshaler) MarshalToString(pb proto.Message) (string, error) {
- var buf bytes.Buffer
- if err := m.Marshal(&buf, pb); err != nil {
- return "", err
- }
- return buf.String(), nil
-}
-
-type int32Slice []int32
-
-var nonFinite = map[string]float64{
- `"NaN"`: math.NaN(),
- `"Infinity"`: math.Inf(1),
- `"-Infinity"`: math.Inf(-1),
-}
-
-// For sorting extensions ids to ensure stable output.
-func (s int32Slice) Len() int { return len(s) }
-func (s int32Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s int32Slice) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-
-type wkt interface {
- XXX_WellKnownType() string
-}
-
-// marshalObject writes a struct to the Writer.
-func (m *Marshaler) marshalObject(out *errWriter, v proto.Message, indent, typeURL string) error {
- if jsm, ok := v.(JSONPBMarshaler); ok {
- b, err := jsm.MarshalJSONPB(m)
- if err != nil {
- return err
- }
- if typeURL != "" {
- // we are marshaling this object to an Any type
- var js map[string]*json.RawMessage
- if err = json.Unmarshal(b, &js); err != nil {
- return fmt.Errorf("type %T produced invalid JSON: %v", v, err)
- }
- turl, err := json.Marshal(typeURL)
- if err != nil {
- return fmt.Errorf("failed to marshal type URL %q to JSON: %v", typeURL, err)
- }
- js["@type"] = (*json.RawMessage)(&turl)
- if b, err = json.Marshal(js); err != nil {
- return err
- }
- }
-
- out.write(string(b))
- return out.err
- }
-
- s := reflect.ValueOf(v).Elem()
-
- // Handle well-known types.
- if wkt, ok := v.(wkt); ok {
- switch wkt.XXX_WellKnownType() {
- case "DoubleValue", "FloatValue", "Int64Value", "UInt64Value",
- "Int32Value", "UInt32Value", "BoolValue", "StringValue", "BytesValue":
- // "Wrappers use the same representation in JSON
- // as the wrapped primitive type, ..."
- sprop := proto.GetProperties(s.Type())
- return m.marshalValue(out, sprop.Prop[0], s.Field(0), indent)
- case "Any":
- // Any is a bit more involved.
- return m.marshalAny(out, v, indent)
- case "Duration":
- // "Generated output always contains 0, 3, 6, or 9 fractional digits,
- // depending on required precision."
- s, ns := s.Field(0).Int(), s.Field(1).Int()
- if ns <= -secondInNanos || ns >= secondInNanos {
- return fmt.Errorf("ns out of range (%v, %v)", -secondInNanos, secondInNanos)
- }
- if (s > 0 && ns < 0) || (s < 0 && ns > 0) {
- return errors.New("signs of seconds and nanos do not match")
- }
- if s < 0 {
- ns = -ns
- }
- x := fmt.Sprintf("%d.%09d", s, ns)
- x = strings.TrimSuffix(x, "000")
- x = strings.TrimSuffix(x, "000")
- x = strings.TrimSuffix(x, ".000")
- out.write(`"`)
- out.write(x)
- out.write(`s"`)
- return out.err
- case "Struct", "ListValue":
- // Let marshalValue handle the `Struct.fields` map or the `ListValue.values` slice.
- // TODO: pass the correct Properties if needed.
- return m.marshalValue(out, &proto.Properties{}, s.Field(0), indent)
- case "Timestamp":
- // "RFC 3339, where generated output will always be Z-normalized
- // and uses 0, 3, 6 or 9 fractional digits."
- s, ns := s.Field(0).Int(), s.Field(1).Int()
- if ns < 0 || ns >= secondInNanos {
- return fmt.Errorf("ns out of range [0, %v)", secondInNanos)
- }
- t := time.Unix(s, ns).UTC()
- // time.RFC3339Nano isn't exactly right (we need to get 3/6/9 fractional digits).
- x := t.Format("2006-01-02T15:04:05.000000000")
- x = strings.TrimSuffix(x, "000")
- x = strings.TrimSuffix(x, "000")
- x = strings.TrimSuffix(x, ".000")
- out.write(`"`)
- out.write(x)
- out.write(`Z"`)
- return out.err
- case "Value":
- // Value has a single oneof.
- kind := s.Field(0)
- if kind.IsNil() {
- // "absence of any variant indicates an error"
- return errors.New("nil Value")
- }
- // oneof -> *T -> T -> T.F
- x := kind.Elem().Elem().Field(0)
- // TODO: pass the correct Properties if needed.
- return m.marshalValue(out, &proto.Properties{}, x, indent)
- }
- }
-
- out.write("{")
- if m.Indent != "" {
- out.write("\n")
- }
-
- firstField := true
-
- if typeURL != "" {
- if err := m.marshalTypeURL(out, indent, typeURL); err != nil {
- return err
- }
- firstField = false
- }
-
- for i := 0; i < s.NumField(); i++ {
- value := s.Field(i)
- valueField := s.Type().Field(i)
- if strings.HasPrefix(valueField.Name, "XXX_") {
- continue
- }
-
- // IsNil will panic on most value kinds.
- switch value.Kind() {
- case reflect.Chan, reflect.Func, reflect.Interface:
- if value.IsNil() {
- continue
- }
- }
-
- if !m.EmitDefaults {
- switch value.Kind() {
- case reflect.Bool:
- if !value.Bool() {
- continue
- }
- case reflect.Int32, reflect.Int64:
- if value.Int() == 0 {
- continue
- }
- case reflect.Uint32, reflect.Uint64:
- if value.Uint() == 0 {
- continue
- }
- case reflect.Float32, reflect.Float64:
- if value.Float() == 0 {
- continue
- }
- case reflect.String:
- if value.Len() == 0 {
- continue
- }
- case reflect.Map, reflect.Ptr, reflect.Slice:
- if value.IsNil() {
- continue
- }
- }
- }
-
- // Oneof fields need special handling.
- if valueField.Tag.Get("protobuf_oneof") != "" {
- // value is an interface containing &T{real_value}.
- sv := value.Elem().Elem() // interface -> *T -> T
- value = sv.Field(0)
- valueField = sv.Type().Field(0)
- }
- prop := jsonProperties(valueField, m.OrigName)
- if !firstField {
- m.writeSep(out)
- }
- if err := m.marshalField(out, prop, value, indent); err != nil {
- return err
- }
- firstField = false
- }
-
- // Handle proto2 extensions.
- if ep, ok := v.(proto.Message); ok {
- extensions := proto.RegisteredExtensions(v)
- // Sort extensions for stable output.
- ids := make([]int32, 0, len(extensions))
- for id, desc := range extensions {
- if !proto.HasExtension(ep, desc) {
- continue
- }
- ids = append(ids, id)
- }
- sort.Sort(int32Slice(ids))
- for _, id := range ids {
- desc := extensions[id]
- if desc == nil {
- // unknown extension
- continue
- }
- ext, extErr := proto.GetExtension(ep, desc)
- if extErr != nil {
- return extErr
- }
- value := reflect.ValueOf(ext)
- var prop proto.Properties
- prop.Parse(desc.Tag)
- prop.JSONName = fmt.Sprintf("[%s]", desc.Name)
- if !firstField {
- m.writeSep(out)
- }
- if err := m.marshalField(out, &prop, value, indent); err != nil {
- return err
- }
- firstField = false
- }
-
- }
-
- if m.Indent != "" {
- out.write("\n")
- out.write(indent)
- }
- out.write("}")
- return out.err
-}
-
-func (m *Marshaler) writeSep(out *errWriter) {
- if m.Indent != "" {
- out.write(",\n")
- } else {
- out.write(",")
- }
-}
-
-func (m *Marshaler) marshalAny(out *errWriter, any proto.Message, indent string) error {
- // "If the Any contains a value that has a special JSON mapping,
- // it will be converted as follows: {"@type": xxx, "value": yyy}.
- // Otherwise, the value will be converted into a JSON object,
- // and the "@type" field will be inserted to indicate the actual data type."
- v := reflect.ValueOf(any).Elem()
- turl := v.Field(0).String()
- val := v.Field(1).Bytes()
-
- var msg proto.Message
- var err error
- if m.AnyResolver != nil {
- msg, err = m.AnyResolver.Resolve(turl)
- } else {
- msg, err = defaultResolveAny(turl)
- }
- if err != nil {
- return err
- }
-
- if err := proto.Unmarshal(val, msg); err != nil {
- return err
- }
-
- if _, ok := msg.(wkt); ok {
- out.write("{")
- if m.Indent != "" {
- out.write("\n")
- }
- if err := m.marshalTypeURL(out, indent, turl); err != nil {
- return err
- }
- m.writeSep(out)
- if m.Indent != "" {
- out.write(indent)
- out.write(m.Indent)
- out.write(`"value": `)
- } else {
- out.write(`"value":`)
- }
- if err := m.marshalObject(out, msg, indent+m.Indent, ""); err != nil {
- return err
- }
- if m.Indent != "" {
- out.write("\n")
- out.write(indent)
- }
- out.write("}")
- return out.err
- }
-
- return m.marshalObject(out, msg, indent, turl)
-}
-
-func (m *Marshaler) marshalTypeURL(out *errWriter, indent, typeURL string) error {
- if m.Indent != "" {
- out.write(indent)
- out.write(m.Indent)
- }
- out.write(`"@type":`)
- if m.Indent != "" {
- out.write(" ")
- }
- b, err := json.Marshal(typeURL)
- if err != nil {
- return err
- }
- out.write(string(b))
- return out.err
-}
-
-// marshalField writes field description and value to the Writer.
-func (m *Marshaler) marshalField(out *errWriter, prop *proto.Properties, v reflect.Value, indent string) error {
- if m.Indent != "" {
- out.write(indent)
- out.write(m.Indent)
- }
- out.write(`"`)
- out.write(prop.JSONName)
- out.write(`":`)
- if m.Indent != "" {
- out.write(" ")
- }
- if err := m.marshalValue(out, prop, v, indent); err != nil {
- return err
- }
- return nil
-}
-
-// marshalValue writes the value to the Writer.
-func (m *Marshaler) marshalValue(out *errWriter, prop *proto.Properties, v reflect.Value, indent string) error {
- var err error
- v = reflect.Indirect(v)
-
- // Handle nil pointer
- if v.Kind() == reflect.Invalid {
- out.write("null")
- return out.err
- }
-
- // Handle repeated elements.
- if v.Kind() == reflect.Slice && v.Type().Elem().Kind() != reflect.Uint8 {
- out.write("[")
- comma := ""
- for i := 0; i < v.Len(); i++ {
- sliceVal := v.Index(i)
- out.write(comma)
- if m.Indent != "" {
- out.write("\n")
- out.write(indent)
- out.write(m.Indent)
- out.write(m.Indent)
- }
- if err := m.marshalValue(out, prop, sliceVal, indent+m.Indent); err != nil {
- return err
- }
- comma = ","
- }
- if m.Indent != "" {
- out.write("\n")
- out.write(indent)
- out.write(m.Indent)
- }
- out.write("]")
- return out.err
- }
-
- // Handle well-known types.
- // Most are handled up in marshalObject (because 99% are messages).
- if wkt, ok := v.Interface().(wkt); ok {
- switch wkt.XXX_WellKnownType() {
- case "NullValue":
- out.write("null")
- return out.err
- }
- }
-
- // Handle enumerations.
- if !m.EnumsAsInts && prop.Enum != "" {
- // Unknown enum values will are stringified by the proto library as their
- // value. Such values should _not_ be quoted or they will be interpreted
- // as an enum string instead of their value.
- enumStr := v.Interface().(fmt.Stringer).String()
- var valStr string
- if v.Kind() == reflect.Ptr {
- valStr = strconv.Itoa(int(v.Elem().Int()))
- } else {
- valStr = strconv.Itoa(int(v.Int()))
- }
- isKnownEnum := enumStr != valStr
- if isKnownEnum {
- out.write(`"`)
- }
- out.write(enumStr)
- if isKnownEnum {
- out.write(`"`)
- }
- return out.err
- }
-
- // Handle nested messages.
- if v.Kind() == reflect.Struct {
- return m.marshalObject(out, v.Addr().Interface().(proto.Message), indent+m.Indent, "")
- }
-
- // Handle maps.
- // Since Go randomizes map iteration, we sort keys for stable output.
- if v.Kind() == reflect.Map {
- out.write(`{`)
- keys := v.MapKeys()
- sort.Sort(mapKeys(keys))
- for i, k := range keys {
- if i > 0 {
- out.write(`,`)
- }
- if m.Indent != "" {
- out.write("\n")
- out.write(indent)
- out.write(m.Indent)
- out.write(m.Indent)
- }
-
- b, err := json.Marshal(k.Interface())
- if err != nil {
- return err
- }
- s := string(b)
-
- // If the JSON is not a string value, encode it again to make it one.
- if !strings.HasPrefix(s, `"`) {
- b, err := json.Marshal(s)
- if err != nil {
- return err
- }
- s = string(b)
- }
-
- out.write(s)
- out.write(`:`)
- if m.Indent != "" {
- out.write(` `)
- }
-
- if err := m.marshalValue(out, prop, v.MapIndex(k), indent+m.Indent); err != nil {
- return err
- }
- }
- if m.Indent != "" {
- out.write("\n")
- out.write(indent)
- out.write(m.Indent)
- }
- out.write(`}`)
- return out.err
- }
-
- // Handle non-finite floats, e.g. NaN, Infinity and -Infinity.
- if v.Kind() == reflect.Float32 || v.Kind() == reflect.Float64 {
- f := v.Float()
- var sval string
- switch {
- case math.IsInf(f, 1):
- sval = `"Infinity"`
- case math.IsInf(f, -1):
- sval = `"-Infinity"`
- case math.IsNaN(f):
- sval = `"NaN"`
- }
- if sval != "" {
- out.write(sval)
- return out.err
- }
- }
-
- // Default handling defers to the encoding/json library.
- b, err := json.Marshal(v.Interface())
- if err != nil {
- return err
- }
- needToQuote := string(b[0]) != `"` && (v.Kind() == reflect.Int64 || v.Kind() == reflect.Uint64)
- if needToQuote {
- out.write(`"`)
- }
- out.write(string(b))
- if needToQuote {
- out.write(`"`)
- }
- return out.err
-}
-
-// Unmarshaler is a configurable object for converting from a JSON
-// representation to a protocol buffer object.
-type Unmarshaler struct {
- // Whether to allow messages to contain unknown fields, as opposed to
- // failing to unmarshal.
- AllowUnknownFields bool
-
- // A custom URL resolver to use when unmarshaling Any messages from JSON.
- // If unset, the default resolution strategy is to extract the
- // fully-qualified type name from the type URL and pass that to
- // proto.MessageType(string).
- AnyResolver AnyResolver
-}
-
-// UnmarshalNext unmarshals the next protocol buffer from a JSON object stream.
-// This function is lenient and will decode any options permutations of the
-// related Marshaler.
-func (u *Unmarshaler) UnmarshalNext(dec *json.Decoder, pb proto.Message) error {
- inputValue := json.RawMessage{}
- if err := dec.Decode(&inputValue); err != nil {
- return err
- }
- if err := u.unmarshalValue(reflect.ValueOf(pb).Elem(), inputValue, nil); err != nil {
- return err
- }
- return checkRequiredFields(pb)
-}
-
-// Unmarshal unmarshals a JSON object stream into a protocol
-// buffer. This function is lenient and will decode any options
-// permutations of the related Marshaler.
-func (u *Unmarshaler) Unmarshal(r io.Reader, pb proto.Message) error {
- dec := json.NewDecoder(r)
- return u.UnmarshalNext(dec, pb)
-}
-
-// UnmarshalNext unmarshals the next protocol buffer from a JSON object stream.
-// This function is lenient and will decode any options permutations of the
-// related Marshaler.
-func UnmarshalNext(dec *json.Decoder, pb proto.Message) error {
- return new(Unmarshaler).UnmarshalNext(dec, pb)
-}
-
-// Unmarshal unmarshals a JSON object stream into a protocol
-// buffer. This function is lenient and will decode any options
-// permutations of the related Marshaler.
-func Unmarshal(r io.Reader, pb proto.Message) error {
- return new(Unmarshaler).Unmarshal(r, pb)
-}
-
-// UnmarshalString will populate the fields of a protocol buffer based
-// on a JSON string. This function is lenient and will decode any options
-// permutations of the related Marshaler.
-func UnmarshalString(str string, pb proto.Message) error {
- return new(Unmarshaler).Unmarshal(strings.NewReader(str), pb)
-}
-
-// unmarshalValue converts/copies a value into the target.
-// prop may be nil.
-func (u *Unmarshaler) unmarshalValue(target reflect.Value, inputValue json.RawMessage, prop *proto.Properties) error {
- targetType := target.Type()
-
- // Allocate memory for pointer fields.
- if targetType.Kind() == reflect.Ptr {
- // If input value is "null" and target is a pointer type, then the field should be treated as not set
- // UNLESS the target is structpb.Value, in which case it should be set to structpb.NullValue.
- _, isJSONPBUnmarshaler := target.Interface().(JSONPBUnmarshaler)
- if string(inputValue) == "null" && targetType != reflect.TypeOf(&stpb.Value{}) && !isJSONPBUnmarshaler {
- return nil
- }
- target.Set(reflect.New(targetType.Elem()))
-
- return u.unmarshalValue(target.Elem(), inputValue, prop)
- }
-
- if jsu, ok := target.Addr().Interface().(JSONPBUnmarshaler); ok {
- return jsu.UnmarshalJSONPB(u, []byte(inputValue))
- }
-
- // Handle well-known types that are not pointers.
- if w, ok := target.Addr().Interface().(wkt); ok {
- switch w.XXX_WellKnownType() {
- case "DoubleValue", "FloatValue", "Int64Value", "UInt64Value",
- "Int32Value", "UInt32Value", "BoolValue", "StringValue", "BytesValue":
- return u.unmarshalValue(target.Field(0), inputValue, prop)
- case "Any":
- // Use json.RawMessage pointer type instead of value to support pre-1.8 version.
- // 1.8 changed RawMessage.MarshalJSON from pointer type to value type, see
- // https://github.com/golang/go/issues/14493
- var jsonFields map[string]*json.RawMessage
- if err := json.Unmarshal(inputValue, &jsonFields); err != nil {
- return err
- }
-
- val, ok := jsonFields["@type"]
- if !ok || val == nil {
- return errors.New("Any JSON doesn't have '@type'")
- }
-
- var turl string
- if err := json.Unmarshal([]byte(*val), &turl); err != nil {
- return fmt.Errorf("can't unmarshal Any's '@type': %q", *val)
- }
- target.Field(0).SetString(turl)
-
- var m proto.Message
- var err error
- if u.AnyResolver != nil {
- m, err = u.AnyResolver.Resolve(turl)
- } else {
- m, err = defaultResolveAny(turl)
- }
- if err != nil {
- return err
- }
-
- if _, ok := m.(wkt); ok {
- val, ok := jsonFields["value"]
- if !ok {
- return errors.New("Any JSON doesn't have 'value'")
- }
-
- if err := u.unmarshalValue(reflect.ValueOf(m).Elem(), *val, nil); err != nil {
- return fmt.Errorf("can't unmarshal Any nested proto %T: %v", m, err)
- }
- } else {
- delete(jsonFields, "@type")
- nestedProto, err := json.Marshal(jsonFields)
- if err != nil {
- return fmt.Errorf("can't generate JSON for Any's nested proto to be unmarshaled: %v", err)
- }
-
- if err = u.unmarshalValue(reflect.ValueOf(m).Elem(), nestedProto, nil); err != nil {
- return fmt.Errorf("can't unmarshal Any nested proto %T: %v", m, err)
- }
- }
-
- b, err := proto.Marshal(m)
- if err != nil {
- return fmt.Errorf("can't marshal proto %T into Any.Value: %v", m, err)
- }
- target.Field(1).SetBytes(b)
-
- return nil
- case "Duration":
- unq, err := strconv.Unquote(string(inputValue))
- if err != nil {
- return err
- }
-
- d, err := time.ParseDuration(unq)
- if err != nil {
- return fmt.Errorf("bad Duration: %v", err)
- }
-
- ns := d.Nanoseconds()
- s := ns / 1e9
- ns %= 1e9
- target.Field(0).SetInt(s)
- target.Field(1).SetInt(ns)
- return nil
- case "Timestamp":
- unq, err := strconv.Unquote(string(inputValue))
- if err != nil {
- return err
- }
-
- t, err := time.Parse(time.RFC3339Nano, unq)
- if err != nil {
- return fmt.Errorf("bad Timestamp: %v", err)
- }
-
- target.Field(0).SetInt(t.Unix())
- target.Field(1).SetInt(int64(t.Nanosecond()))
- return nil
- case "Struct":
- var m map[string]json.RawMessage
- if err := json.Unmarshal(inputValue, &m); err != nil {
- return fmt.Errorf("bad StructValue: %v", err)
- }
-
- target.Field(0).Set(reflect.ValueOf(map[string]*stpb.Value{}))
- for k, jv := range m {
- pv := &stpb.Value{}
- if err := u.unmarshalValue(reflect.ValueOf(pv).Elem(), jv, prop); err != nil {
- return fmt.Errorf("bad value in StructValue for key %q: %v", k, err)
- }
- target.Field(0).SetMapIndex(reflect.ValueOf(k), reflect.ValueOf(pv))
- }
- return nil
- case "ListValue":
- var s []json.RawMessage
- if err := json.Unmarshal(inputValue, &s); err != nil {
- return fmt.Errorf("bad ListValue: %v", err)
- }
-
- target.Field(0).Set(reflect.ValueOf(make([]*stpb.Value, len(s))))
- for i, sv := range s {
- if err := u.unmarshalValue(target.Field(0).Index(i), sv, prop); err != nil {
- return err
- }
- }
- return nil
- case "Value":
- ivStr := string(inputValue)
- if ivStr == "null" {
- target.Field(0).Set(reflect.ValueOf(&stpb.Value_NullValue{}))
- } else if v, err := strconv.ParseFloat(ivStr, 0); err == nil {
- target.Field(0).Set(reflect.ValueOf(&stpb.Value_NumberValue{v}))
- } else if v, err := strconv.Unquote(ivStr); err == nil {
- target.Field(0).Set(reflect.ValueOf(&stpb.Value_StringValue{v}))
- } else if v, err := strconv.ParseBool(ivStr); err == nil {
- target.Field(0).Set(reflect.ValueOf(&stpb.Value_BoolValue{v}))
- } else if err := json.Unmarshal(inputValue, &[]json.RawMessage{}); err == nil {
- lv := &stpb.ListValue{}
- target.Field(0).Set(reflect.ValueOf(&stpb.Value_ListValue{lv}))
- return u.unmarshalValue(reflect.ValueOf(lv).Elem(), inputValue, prop)
- } else if err := json.Unmarshal(inputValue, &map[string]json.RawMessage{}); err == nil {
- sv := &stpb.Struct{}
- target.Field(0).Set(reflect.ValueOf(&stpb.Value_StructValue{sv}))
- return u.unmarshalValue(reflect.ValueOf(sv).Elem(), inputValue, prop)
- } else {
- return fmt.Errorf("unrecognized type for Value %q", ivStr)
- }
- return nil
- }
- }
-
- // Handle enums, which have an underlying type of int32,
- // and may appear as strings.
- // The case of an enum appearing as a number is handled
- // at the bottom of this function.
- if inputValue[0] == '"' && prop != nil && prop.Enum != "" {
- vmap := proto.EnumValueMap(prop.Enum)
- // Don't need to do unquoting; valid enum names
- // are from a limited character set.
- s := inputValue[1 : len(inputValue)-1]
- n, ok := vmap[string(s)]
- if !ok {
- return fmt.Errorf("unknown value %q for enum %s", s, prop.Enum)
- }
- if target.Kind() == reflect.Ptr { // proto2
- target.Set(reflect.New(targetType.Elem()))
- target = target.Elem()
- }
- target.SetInt(int64(n))
- return nil
- }
-
- // Handle nested messages.
- if targetType.Kind() == reflect.Struct {
- var jsonFields map[string]json.RawMessage
- if err := json.Unmarshal(inputValue, &jsonFields); err != nil {
- return err
- }
-
- consumeField := func(prop *proto.Properties) (json.RawMessage, bool) {
- // Be liberal in what names we accept; both orig_name and camelName are okay.
- fieldNames := acceptedJSONFieldNames(prop)
-
- vOrig, okOrig := jsonFields[fieldNames.orig]
- vCamel, okCamel := jsonFields[fieldNames.camel]
- if !okOrig && !okCamel {
- return nil, false
- }
- // If, for some reason, both are present in the data, favour the camelName.
- var raw json.RawMessage
- if okOrig {
- raw = vOrig
- delete(jsonFields, fieldNames.orig)
- }
- if okCamel {
- raw = vCamel
- delete(jsonFields, fieldNames.camel)
- }
- return raw, true
- }
-
- sprops := proto.GetProperties(targetType)
- for i := 0; i < target.NumField(); i++ {
- ft := target.Type().Field(i)
- if strings.HasPrefix(ft.Name, "XXX_") {
- continue
- }
-
- valueForField, ok := consumeField(sprops.Prop[i])
- if !ok {
- continue
- }
-
- if err := u.unmarshalValue(target.Field(i), valueForField, sprops.Prop[i]); err != nil {
- return err
- }
- }
- // Check for any oneof fields.
- if len(jsonFields) > 0 {
- for _, oop := range sprops.OneofTypes {
- raw, ok := consumeField(oop.Prop)
- if !ok {
- continue
- }
- nv := reflect.New(oop.Type.Elem())
- target.Field(oop.Field).Set(nv)
- if err := u.unmarshalValue(nv.Elem().Field(0), raw, oop.Prop); err != nil {
- return err
- }
- }
- }
- // Handle proto2 extensions.
- if len(jsonFields) > 0 {
- if ep, ok := target.Addr().Interface().(proto.Message); ok {
- for _, ext := range proto.RegisteredExtensions(ep) {
- name := fmt.Sprintf("[%s]", ext.Name)
- raw, ok := jsonFields[name]
- if !ok {
- continue
- }
- delete(jsonFields, name)
- nv := reflect.New(reflect.TypeOf(ext.ExtensionType).Elem())
- if err := u.unmarshalValue(nv.Elem(), raw, nil); err != nil {
- return err
- }
- if err := proto.SetExtension(ep, ext, nv.Interface()); err != nil {
- return err
- }
- }
- }
- }
- if !u.AllowUnknownFields && len(jsonFields) > 0 {
- // Pick any field to be the scapegoat.
- var f string
- for fname := range jsonFields {
- f = fname
- break
- }
- return fmt.Errorf("unknown field %q in %v", f, targetType)
- }
- return nil
- }
-
- // Handle arrays (which aren't encoded bytes)
- if targetType.Kind() == reflect.Slice && targetType.Elem().Kind() != reflect.Uint8 {
- var slc []json.RawMessage
- if err := json.Unmarshal(inputValue, &slc); err != nil {
- return err
- }
- if slc != nil {
- l := len(slc)
- target.Set(reflect.MakeSlice(targetType, l, l))
- for i := 0; i < l; i++ {
- if err := u.unmarshalValue(target.Index(i), slc[i], prop); err != nil {
- return err
- }
- }
- }
- return nil
- }
-
- // Handle maps (whose keys are always strings)
- if targetType.Kind() == reflect.Map {
- var mp map[string]json.RawMessage
- if err := json.Unmarshal(inputValue, &mp); err != nil {
- return err
- }
- if mp != nil {
- target.Set(reflect.MakeMap(targetType))
- for ks, raw := range mp {
- // Unmarshal map key. The core json library already decoded the key into a
- // string, so we handle that specially. Other types were quoted post-serialization.
- var k reflect.Value
- if targetType.Key().Kind() == reflect.String {
- k = reflect.ValueOf(ks)
- } else {
- k = reflect.New(targetType.Key()).Elem()
- // TODO: pass the correct Properties if needed.
- if err := u.unmarshalValue(k, json.RawMessage(ks), nil); err != nil {
- return err
- }
- }
-
- // Unmarshal map value.
- v := reflect.New(targetType.Elem()).Elem()
- // TODO: pass the correct Properties if needed.
- if err := u.unmarshalValue(v, raw, nil); err != nil {
- return err
- }
- target.SetMapIndex(k, v)
- }
- }
- return nil
- }
-
- // 64-bit integers can be encoded as strings. In this case we drop
- // the quotes and proceed as normal.
- isNum := targetType.Kind() == reflect.Int64 || targetType.Kind() == reflect.Uint64
- if isNum && strings.HasPrefix(string(inputValue), `"`) {
- inputValue = inputValue[1 : len(inputValue)-1]
- }
-
- // Non-finite numbers can be encoded as strings.
- isFloat := targetType.Kind() == reflect.Float32 || targetType.Kind() == reflect.Float64
- if isFloat {
- if num, ok := nonFinite[string(inputValue)]; ok {
- target.SetFloat(num)
- return nil
- }
- }
-
- // Use the encoding/json for parsing other value types.
- return json.Unmarshal(inputValue, target.Addr().Interface())
-}
-
-// jsonProperties returns parsed proto.Properties for the field and corrects JSONName attribute.
-func jsonProperties(f reflect.StructField, origName bool) *proto.Properties {
- var prop proto.Properties
- prop.Init(f.Type, f.Name, f.Tag.Get("protobuf"), &f)
- if origName || prop.JSONName == "" {
- prop.JSONName = prop.OrigName
- }
- return &prop
-}
-
-type fieldNames struct {
- orig, camel string
-}
-
-func acceptedJSONFieldNames(prop *proto.Properties) fieldNames {
- opts := fieldNames{orig: prop.OrigName, camel: prop.OrigName}
- if prop.JSONName != "" {
- opts.camel = prop.JSONName
- }
- return opts
-}
-
-// Writer wrapper inspired by https://blog.golang.org/errors-are-values
-type errWriter struct {
- writer io.Writer
- err error
-}
-
-func (w *errWriter) write(str string) {
- if w.err != nil {
- return
- }
- _, w.err = w.writer.Write([]byte(str))
-}
-
-// Map fields may have key types of non-float scalars, strings and enums.
-// The easiest way to sort them in some deterministic order is to use fmt.
-// If this turns out to be inefficient we can always consider other options,
-// such as doing a Schwartzian transform.
-//
-// Numeric keys are sorted in numeric order per
-// https://developers.google.com/protocol-buffers/docs/proto#maps.
-type mapKeys []reflect.Value
-
-func (s mapKeys) Len() int { return len(s) }
-func (s mapKeys) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-func (s mapKeys) Less(i, j int) bool {
- if k := s[i].Kind(); k == s[j].Kind() {
- switch k {
- case reflect.Int32, reflect.Int64:
- return s[i].Int() < s[j].Int()
- case reflect.Uint32, reflect.Uint64:
- return s[i].Uint() < s[j].Uint()
- }
- }
- return fmt.Sprint(s[i].Interface()) < fmt.Sprint(s[j].Interface())
-}
-
-// checkRequiredFields returns an error if any required field in the given proto message is not set.
-// This function is used by both Marshal and Unmarshal. While required fields only exist in a
-// proto2 message, a proto3 message can contain proto2 message(s).
-func checkRequiredFields(pb proto.Message) error {
- // Most well-known type messages do not contain required fields. The "Any" type may contain
- // a message that has required fields.
- //
- // When an Any message is being marshaled, the code will invoked proto.Unmarshal on Any.Value
- // field in order to transform that into JSON, and that should have returned an error if a
- // required field is not set in the embedded message.
- //
- // When an Any message is being unmarshaled, the code will have invoked proto.Marshal on the
- // embedded message to store the serialized message in Any.Value field, and that should have
- // returned an error if a required field is not set.
- if _, ok := pb.(wkt); ok {
- return nil
- }
-
- v := reflect.ValueOf(pb)
- // Skip message if it is not a struct pointer.
- if v.Kind() != reflect.Ptr {
- return nil
- }
- v = v.Elem()
- if v.Kind() != reflect.Struct {
- return nil
- }
-
- for i := 0; i < v.NumField(); i++ {
- field := v.Field(i)
- sfield := v.Type().Field(i)
-
- if sfield.PkgPath != "" {
- // blank PkgPath means the field is exported; skip if not exported
- continue
- }
-
- if strings.HasPrefix(sfield.Name, "XXX_") {
- continue
- }
-
- // Oneof field is an interface implemented by wrapper structs containing the actual oneof
- // field, i.e. an interface containing &T{real_value}.
- if sfield.Tag.Get("protobuf_oneof") != "" {
- if field.Kind() != reflect.Interface {
- continue
- }
- v := field.Elem()
- if v.Kind() != reflect.Ptr || v.IsNil() {
- continue
- }
- v = v.Elem()
- if v.Kind() != reflect.Struct || v.NumField() < 1 {
- continue
- }
- field = v.Field(0)
- sfield = v.Type().Field(0)
- }
-
- protoTag := sfield.Tag.Get("protobuf")
- if protoTag == "" {
- continue
- }
- var prop proto.Properties
- prop.Init(sfield.Type, sfield.Name, protoTag, &sfield)
-
- switch field.Kind() {
- case reflect.Map:
- if field.IsNil() {
- continue
- }
- // Check each map value.
- keys := field.MapKeys()
- for _, k := range keys {
- v := field.MapIndex(k)
- if err := checkRequiredFieldsInValue(v); err != nil {
- return err
- }
- }
- case reflect.Slice:
- // Handle non-repeated type, e.g. bytes.
- if !prop.Repeated {
- if prop.Required && field.IsNil() {
- return fmt.Errorf("required field %q is not set", prop.Name)
- }
- continue
- }
-
- // Handle repeated type.
- if field.IsNil() {
- continue
- }
- // Check each slice item.
- for i := 0; i < field.Len(); i++ {
- v := field.Index(i)
- if err := checkRequiredFieldsInValue(v); err != nil {
- return err
- }
- }
- case reflect.Ptr:
- if field.IsNil() {
- if prop.Required {
- return fmt.Errorf("required field %q is not set", prop.Name)
- }
- continue
- }
- if err := checkRequiredFieldsInValue(field); err != nil {
- return err
- }
- }
- }
-
- // Handle proto2 extensions.
- for _, ext := range proto.RegisteredExtensions(pb) {
- if !proto.HasExtension(pb, ext) {
- continue
- }
- ep, err := proto.GetExtension(pb, ext)
- if err != nil {
- return err
- }
- err = checkRequiredFieldsInValue(reflect.ValueOf(ep))
- if err != nil {
- return err
- }
- }
-
- return nil
-}
-
-func checkRequiredFieldsInValue(v reflect.Value) error {
- if pm, ok := v.Interface().(proto.Message); ok {
- return checkRequiredFields(pm)
- }
- return nil
-}
diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go
deleted file mode 100644
index c9934d9..0000000
--- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go
+++ /dev/null
@@ -1,1150 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2015 The Go Authors. All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package jsonpb
-
-import (
- "bytes"
- "encoding/json"
- "io"
- "math"
- "reflect"
- "strings"
- "testing"
-
- "github.com/golang/protobuf/proto"
-
- pb "github.com/golang/protobuf/jsonpb/jsonpb_test_proto"
- proto3pb "github.com/golang/protobuf/proto/proto3_proto"
- "github.com/golang/protobuf/ptypes"
- anypb "github.com/golang/protobuf/ptypes/any"
- durpb "github.com/golang/protobuf/ptypes/duration"
- stpb "github.com/golang/protobuf/ptypes/struct"
- tspb "github.com/golang/protobuf/ptypes/timestamp"
- wpb "github.com/golang/protobuf/ptypes/wrappers"
-)
-
-var (
- marshaler = Marshaler{}
-
- marshalerAllOptions = Marshaler{
- Indent: " ",
- }
-
- simpleObject = &pb.Simple{
- OInt32: proto.Int32(-32),
- OInt64: proto.Int64(-6400000000),
- OUint32: proto.Uint32(32),
- OUint64: proto.Uint64(6400000000),
- OSint32: proto.Int32(-13),
- OSint64: proto.Int64(-2600000000),
- OFloat: proto.Float32(3.14),
- ODouble: proto.Float64(6.02214179e23),
- OBool: proto.Bool(true),
- OString: proto.String("hello \"there\""),
- OBytes: []byte("beep boop"),
- }
-
- simpleObjectJSON = `{` +
- `"oBool":true,` +
- `"oInt32":-32,` +
- `"oInt64":"-6400000000",` +
- `"oUint32":32,` +
- `"oUint64":"6400000000",` +
- `"oSint32":-13,` +
- `"oSint64":"-2600000000",` +
- `"oFloat":3.14,` +
- `"oDouble":6.02214179e+23,` +
- `"oString":"hello \"there\"",` +
- `"oBytes":"YmVlcCBib29w"` +
- `}`
-
- simpleObjectPrettyJSON = `{
- "oBool": true,
- "oInt32": -32,
- "oInt64": "-6400000000",
- "oUint32": 32,
- "oUint64": "6400000000",
- "oSint32": -13,
- "oSint64": "-2600000000",
- "oFloat": 3.14,
- "oDouble": 6.02214179e+23,
- "oString": "hello \"there\"",
- "oBytes": "YmVlcCBib29w"
-}`
-
- repeatsObject = &pb.Repeats{
- RBool: []bool{true, false, true},
- RInt32: []int32{-3, -4, -5},
- RInt64: []int64{-123456789, -987654321},
- RUint32: []uint32{1, 2, 3},
- RUint64: []uint64{6789012345, 3456789012},
- RSint32: []int32{-1, -2, -3},
- RSint64: []int64{-6789012345, -3456789012},
- RFloat: []float32{3.14, 6.28},
- RDouble: []float64{299792458 * 1e20, 6.62606957e-34},
- RString: []string{"happy", "days"},
- RBytes: [][]byte{[]byte("skittles"), []byte("m&m's")},
- }
-
- repeatsObjectJSON = `{` +
- `"rBool":[true,false,true],` +
- `"rInt32":[-3,-4,-5],` +
- `"rInt64":["-123456789","-987654321"],` +
- `"rUint32":[1,2,3],` +
- `"rUint64":["6789012345","3456789012"],` +
- `"rSint32":[-1,-2,-3],` +
- `"rSint64":["-6789012345","-3456789012"],` +
- `"rFloat":[3.14,6.28],` +
- `"rDouble":[2.99792458e+28,6.62606957e-34],` +
- `"rString":["happy","days"],` +
- `"rBytes":["c2tpdHRsZXM=","bSZtJ3M="]` +
- `}`
-
- repeatsObjectPrettyJSON = `{
- "rBool": [
- true,
- false,
- true
- ],
- "rInt32": [
- -3,
- -4,
- -5
- ],
- "rInt64": [
- "-123456789",
- "-987654321"
- ],
- "rUint32": [
- 1,
- 2,
- 3
- ],
- "rUint64": [
- "6789012345",
- "3456789012"
- ],
- "rSint32": [
- -1,
- -2,
- -3
- ],
- "rSint64": [
- "-6789012345",
- "-3456789012"
- ],
- "rFloat": [
- 3.14,
- 6.28
- ],
- "rDouble": [
- 2.99792458e+28,
- 6.62606957e-34
- ],
- "rString": [
- "happy",
- "days"
- ],
- "rBytes": [
- "c2tpdHRsZXM=",
- "bSZtJ3M="
- ]
-}`
-
- innerSimple = &pb.Simple{OInt32: proto.Int32(-32)}
- innerSimple2 = &pb.Simple{OInt64: proto.Int64(25)}
- innerRepeats = &pb.Repeats{RString: []string{"roses", "red"}}
- innerRepeats2 = &pb.Repeats{RString: []string{"violets", "blue"}}
- complexObject = &pb.Widget{
- Color: pb.Widget_GREEN.Enum(),
- RColor: []pb.Widget_Color{pb.Widget_RED, pb.Widget_GREEN, pb.Widget_BLUE},
- Simple: innerSimple,
- RSimple: []*pb.Simple{innerSimple, innerSimple2},
- Repeats: innerRepeats,
- RRepeats: []*pb.Repeats{innerRepeats, innerRepeats2},
- }
-
- complexObjectJSON = `{"color":"GREEN",` +
- `"rColor":["RED","GREEN","BLUE"],` +
- `"simple":{"oInt32":-32},` +
- `"rSimple":[{"oInt32":-32},{"oInt64":"25"}],` +
- `"repeats":{"rString":["roses","red"]},` +
- `"rRepeats":[{"rString":["roses","red"]},{"rString":["violets","blue"]}]` +
- `}`
-
- complexObjectPrettyJSON = `{
- "color": "GREEN",
- "rColor": [
- "RED",
- "GREEN",
- "BLUE"
- ],
- "simple": {
- "oInt32": -32
- },
- "rSimple": [
- {
- "oInt32": -32
- },
- {
- "oInt64": "25"
- }
- ],
- "repeats": {
- "rString": [
- "roses",
- "red"
- ]
- },
- "rRepeats": [
- {
- "rString": [
- "roses",
- "red"
- ]
- },
- {
- "rString": [
- "violets",
- "blue"
- ]
- }
- ]
-}`
-
- colorPrettyJSON = `{
- "color": 2
-}`
-
- colorListPrettyJSON = `{
- "color": 1000,
- "rColor": [
- "RED"
- ]
-}`
-
- nummyPrettyJSON = `{
- "nummy": {
- "1": 2,
- "3": 4
- }
-}`
-
- objjyPrettyJSON = `{
- "objjy": {
- "1": {
- "dub": 1
- }
- }
-}`
- realNumber = &pb.Real{Value: proto.Float64(3.14159265359)}
- realNumberName = "Pi"
- complexNumber = &pb.Complex{Imaginary: proto.Float64(0.5772156649)}
- realNumberJSON = `{` +
- `"value":3.14159265359,` +
- `"[jsonpb.Complex.real_extension]":{"imaginary":0.5772156649},` +
- `"[jsonpb.name]":"Pi"` +
- `}`
-
- anySimple = &pb.KnownTypes{
- An: &anypb.Any{
- TypeUrl: "something.example.com/jsonpb.Simple",
- Value: []byte{
- // &pb.Simple{OBool:true}
- 1 << 3, 1,
- },
- },
- }
- anySimpleJSON = `{"an":{"@type":"something.example.com/jsonpb.Simple","oBool":true}}`
- anySimplePrettyJSON = `{
- "an": {
- "@type": "something.example.com/jsonpb.Simple",
- "oBool": true
- }
-}`
-
- anyWellKnown = &pb.KnownTypes{
- An: &anypb.Any{
- TypeUrl: "type.googleapis.com/google.protobuf.Duration",
- Value: []byte{
- // &durpb.Duration{Seconds: 1, Nanos: 212000000 }
- 1 << 3, 1, // seconds
- 2 << 3, 0x80, 0xba, 0x8b, 0x65, // nanos
- },
- },
- }
- anyWellKnownJSON = `{"an":{"@type":"type.googleapis.com/google.protobuf.Duration","value":"1.212s"}}`
- anyWellKnownPrettyJSON = `{
- "an": {
- "@type": "type.googleapis.com/google.protobuf.Duration",
- "value": "1.212s"
- }
-}`
-
- nonFinites = &pb.NonFinites{
- FNan: proto.Float32(float32(math.NaN())),
- FPinf: proto.Float32(float32(math.Inf(1))),
- FNinf: proto.Float32(float32(math.Inf(-1))),
- DNan: proto.Float64(float64(math.NaN())),
- DPinf: proto.Float64(float64(math.Inf(1))),
- DNinf: proto.Float64(float64(math.Inf(-1))),
- }
- nonFinitesJSON = `{` +
- `"fNan":"NaN",` +
- `"fPinf":"Infinity",` +
- `"fNinf":"-Infinity",` +
- `"dNan":"NaN",` +
- `"dPinf":"Infinity",` +
- `"dNinf":"-Infinity"` +
- `}`
-)
-
-func init() {
- if err := proto.SetExtension(realNumber, pb.E_Name, &realNumberName); err != nil {
- panic(err)
- }
- if err := proto.SetExtension(realNumber, pb.E_Complex_RealExtension, complexNumber); err != nil {
- panic(err)
- }
-}
-
-var marshalingTests = []struct {
- desc string
- marshaler Marshaler
- pb proto.Message
- json string
-}{
- {"simple flat object", marshaler, simpleObject, simpleObjectJSON},
- {"simple pretty object", marshalerAllOptions, simpleObject, simpleObjectPrettyJSON},
- {"non-finite floats fields object", marshaler, nonFinites, nonFinitesJSON},
- {"repeated fields flat object", marshaler, repeatsObject, repeatsObjectJSON},
- {"repeated fields pretty object", marshalerAllOptions, repeatsObject, repeatsObjectPrettyJSON},
- {"nested message/enum flat object", marshaler, complexObject, complexObjectJSON},
- {"nested message/enum pretty object", marshalerAllOptions, complexObject, complexObjectPrettyJSON},
- {"enum-string flat object", Marshaler{},
- &pb.Widget{Color: pb.Widget_BLUE.Enum()}, `{"color":"BLUE"}`},
- {"enum-value pretty object", Marshaler{EnumsAsInts: true, Indent: " "},
- &pb.Widget{Color: pb.Widget_BLUE.Enum()}, colorPrettyJSON},
- {"unknown enum value object", marshalerAllOptions,
- &pb.Widget{Color: pb.Widget_Color(1000).Enum(), RColor: []pb.Widget_Color{pb.Widget_RED}}, colorListPrettyJSON},
- {"repeated proto3 enum", Marshaler{},
- &proto3pb.Message{RFunny: []proto3pb.Message_Humour{
- proto3pb.Message_PUNS,
- proto3pb.Message_SLAPSTICK,
- }},
- `{"rFunny":["PUNS","SLAPSTICK"]}`},
- {"repeated proto3 enum as int", Marshaler{EnumsAsInts: true},
- &proto3pb.Message{RFunny: []proto3pb.Message_Humour{
- proto3pb.Message_PUNS,
- proto3pb.Message_SLAPSTICK,
- }},
- `{"rFunny":[1,2]}`},
- {"empty value", marshaler, &pb.Simple3{}, `{}`},
- {"empty value emitted", Marshaler{EmitDefaults: true}, &pb.Simple3{}, `{"dub":0}`},
- {"empty repeated emitted", Marshaler{EmitDefaults: true}, &pb.SimpleSlice3{}, `{"slices":[]}`},
- {"empty map emitted", Marshaler{EmitDefaults: true}, &pb.SimpleMap3{}, `{"stringy":{}}`},
- {"nested struct null", Marshaler{EmitDefaults: true}, &pb.SimpleNull3{}, `{"simple":null}`},
- {"map<int64, int32>", marshaler, &pb.Mappy{Nummy: map[int64]int32{1: 2, 3: 4}}, `{"nummy":{"1":2,"3":4}}`},
- {"map<int64, int32>", marshalerAllOptions, &pb.Mappy{Nummy: map[int64]int32{1: 2, 3: 4}}, nummyPrettyJSON},
- {"map<string, string>", marshaler,
- &pb.Mappy{Strry: map[string]string{`"one"`: "two", "three": "four"}},
- `{"strry":{"\"one\"":"two","three":"four"}}`},
- {"map<int32, Object>", marshaler,
- &pb.Mappy{Objjy: map[int32]*pb.Simple3{1: {Dub: 1}}}, `{"objjy":{"1":{"dub":1}}}`},
- {"map<int32, Object>", marshalerAllOptions,
- &pb.Mappy{Objjy: map[int32]*pb.Simple3{1: {Dub: 1}}}, objjyPrettyJSON},
- {"map<int64, string>", marshaler, &pb.Mappy{Buggy: map[int64]string{1234: "yup"}},
- `{"buggy":{"1234":"yup"}}`},
- {"map<bool, bool>", marshaler, &pb.Mappy{Booly: map[bool]bool{false: true}}, `{"booly":{"false":true}}`},
- // TODO: This is broken.
- //{"map<string, enum>", marshaler, &pb.Mappy{Enumy: map[string]pb.Numeral{"XIV": pb.Numeral_ROMAN}}, `{"enumy":{"XIV":"ROMAN"}`},
- {"map<string, enum as int>", Marshaler{EnumsAsInts: true}, &pb.Mappy{Enumy: map[string]pb.Numeral{"XIV": pb.Numeral_ROMAN}}, `{"enumy":{"XIV":2}}`},
- {"map<int32, bool>", marshaler, &pb.Mappy{S32Booly: map[int32]bool{1: true, 3: false, 10: true, 12: false}}, `{"s32booly":{"1":true,"3":false,"10":true,"12":false}}`},
- {"map<int64, bool>", marshaler, &pb.Mappy{S64Booly: map[int64]bool{1: true, 3: false, 10: true, 12: false}}, `{"s64booly":{"1":true,"3":false,"10":true,"12":false}}`},
- {"map<uint32, bool>", marshaler, &pb.Mappy{U32Booly: map[uint32]bool{1: true, 3: false, 10: true, 12: false}}, `{"u32booly":{"1":true,"3":false,"10":true,"12":false}}`},
- {"map<uint64, bool>", marshaler, &pb.Mappy{U64Booly: map[uint64]bool{1: true, 3: false, 10: true, 12: false}}, `{"u64booly":{"1":true,"3":false,"10":true,"12":false}}`},
- {"proto2 map<int64, string>", marshaler, &pb.Maps{MInt64Str: map[int64]string{213: "cat"}},
- `{"mInt64Str":{"213":"cat"}}`},
- {"proto2 map<bool, Object>", marshaler,
- &pb.Maps{MBoolSimple: map[bool]*pb.Simple{true: {OInt32: proto.Int32(1)}}},
- `{"mBoolSimple":{"true":{"oInt32":1}}}`},
- {"oneof, not set", marshaler, &pb.MsgWithOneof{}, `{}`},
- {"oneof, set", marshaler, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_Title{"Grand Poobah"}}, `{"title":"Grand Poobah"}`},
- {"force orig_name", Marshaler{OrigName: true}, &pb.Simple{OInt32: proto.Int32(4)},
- `{"o_int32":4}`},
- {"proto2 extension", marshaler, realNumber, realNumberJSON},
- {"Any with message", marshaler, anySimple, anySimpleJSON},
- {"Any with message and indent", marshalerAllOptions, anySimple, anySimplePrettyJSON},
- {"Any with WKT", marshaler, anyWellKnown, anyWellKnownJSON},
- {"Any with WKT and indent", marshalerAllOptions, anyWellKnown, anyWellKnownPrettyJSON},
- {"Duration", marshaler, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 3}}, `{"dur":"3s"}`},
- {"Duration", marshaler, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 3, Nanos: 1e6}}, `{"dur":"3.001s"}`},
- {"Duration beyond float64 precision", marshaler, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 100000000, Nanos: 1}}, `{"dur":"100000000.000000001s"}`},
- {"negative Duration", marshaler, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: -123, Nanos: -456}}, `{"dur":"-123.000000456s"}`},
- {"Struct", marshaler, &pb.KnownTypes{St: &stpb.Struct{
- Fields: map[string]*stpb.Value{
- "one": {Kind: &stpb.Value_StringValue{"loneliest number"}},
- "two": {Kind: &stpb.Value_NullValue{stpb.NullValue_NULL_VALUE}},
- },
- }}, `{"st":{"one":"loneliest number","two":null}}`},
- {"empty ListValue", marshaler, &pb.KnownTypes{Lv: &stpb.ListValue{}}, `{"lv":[]}`},
- {"basic ListValue", marshaler, &pb.KnownTypes{Lv: &stpb.ListValue{Values: []*stpb.Value{
- {Kind: &stpb.Value_StringValue{"x"}},
- {Kind: &stpb.Value_NullValue{}},
- {Kind: &stpb.Value_NumberValue{3}},
- {Kind: &stpb.Value_BoolValue{true}},
- }}}, `{"lv":["x",null,3,true]}`},
- {"Timestamp", marshaler, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 21e6}}, `{"ts":"2014-05-13T16:53:20.021Z"}`},
- {"Timestamp", marshaler, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 0}}, `{"ts":"2014-05-13T16:53:20Z"}`},
- {"number Value", marshaler, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_NumberValue{1}}}, `{"val":1}`},
- {"null Value", marshaler, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_NullValue{stpb.NullValue_NULL_VALUE}}}, `{"val":null}`},
- {"string number value", marshaler, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_StringValue{"9223372036854775807"}}}, `{"val":"9223372036854775807"}`},
- {"list of lists Value", marshaler, &pb.KnownTypes{Val: &stpb.Value{
- Kind: &stpb.Value_ListValue{&stpb.ListValue{
- Values: []*stpb.Value{
- {Kind: &stpb.Value_StringValue{"x"}},
- {Kind: &stpb.Value_ListValue{&stpb.ListValue{
- Values: []*stpb.Value{
- {Kind: &stpb.Value_ListValue{&stpb.ListValue{
- Values: []*stpb.Value{{Kind: &stpb.Value_StringValue{"y"}}},
- }}},
- {Kind: &stpb.Value_StringValue{"z"}},
- },
- }}},
- },
- }},
- }}, `{"val":["x",[["y"],"z"]]}`},
-
- {"DoubleValue", marshaler, &pb.KnownTypes{Dbl: &wpb.DoubleValue{Value: 1.2}}, `{"dbl":1.2}`},
- {"FloatValue", marshaler, &pb.KnownTypes{Flt: &wpb.FloatValue{Value: 1.2}}, `{"flt":1.2}`},
- {"Int64Value", marshaler, &pb.KnownTypes{I64: &wpb.Int64Value{Value: -3}}, `{"i64":"-3"}`},
- {"UInt64Value", marshaler, &pb.KnownTypes{U64: &wpb.UInt64Value{Value: 3}}, `{"u64":"3"}`},
- {"Int32Value", marshaler, &pb.KnownTypes{I32: &wpb.Int32Value{Value: -4}}, `{"i32":-4}`},
- {"UInt32Value", marshaler, &pb.KnownTypes{U32: &wpb.UInt32Value{Value: 4}}, `{"u32":4}`},
- {"BoolValue", marshaler, &pb.KnownTypes{Bool: &wpb.BoolValue{Value: true}}, `{"bool":true}`},
- {"StringValue", marshaler, &pb.KnownTypes{Str: &wpb.StringValue{Value: "plush"}}, `{"str":"plush"}`},
- {"BytesValue", marshaler, &pb.KnownTypes{Bytes: &wpb.BytesValue{Value: []byte("wow")}}, `{"bytes":"d293"}`},
-
- {"required", marshaler, &pb.MsgWithRequired{Str: proto.String("hello")}, `{"str":"hello"}`},
- {"required bytes", marshaler, &pb.MsgWithRequiredBytes{Byts: []byte{}}, `{"byts":""}`},
-}
-
-func TestMarshaling(t *testing.T) {
- for _, tt := range marshalingTests {
- json, err := tt.marshaler.MarshalToString(tt.pb)
- if err != nil {
- t.Errorf("%s: marshaling error: %v", tt.desc, err)
- } else if tt.json != json {
- t.Errorf("%s: got [%v] want [%v]", tt.desc, json, tt.json)
- }
- }
-}
-
-func TestMarshalingNil(t *testing.T) {
- var msg *pb.Simple
- m := &Marshaler{}
- if _, err := m.MarshalToString(msg); err == nil {
- t.Errorf("mashaling nil returned no error")
- }
-}
-
-func TestMarshalIllegalTime(t *testing.T) {
- tests := []struct {
- pb proto.Message
- fail bool
- }{
- {&pb.KnownTypes{Dur: &durpb.Duration{Seconds: 1, Nanos: 0}}, false},
- {&pb.KnownTypes{Dur: &durpb.Duration{Seconds: -1, Nanos: 0}}, false},
- {&pb.KnownTypes{Dur: &durpb.Duration{Seconds: 1, Nanos: -1}}, true},
- {&pb.KnownTypes{Dur: &durpb.Duration{Seconds: -1, Nanos: 1}}, true},
- {&pb.KnownTypes{Dur: &durpb.Duration{Seconds: 1, Nanos: 1000000000}}, true},
- {&pb.KnownTypes{Dur: &durpb.Duration{Seconds: -1, Nanos: -1000000000}}, true},
- {&pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 1, Nanos: 1}}, false},
- {&pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 1, Nanos: -1}}, true},
- {&pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 1, Nanos: 1000000000}}, true},
- }
- for _, tt := range tests {
- _, err := marshaler.MarshalToString(tt.pb)
- if err == nil && tt.fail {
- t.Errorf("marshaler.MarshalToString(%v) = _, <nil>; want _, <non-nil>", tt.pb)
- }
- if err != nil && !tt.fail {
- t.Errorf("marshaler.MarshalToString(%v) = _, %v; want _, <nil>", tt.pb, err)
- }
- }
-}
-
-func TestMarshalJSONPBMarshaler(t *testing.T) {
- rawJson := `{ "foo": "bar", "baz": [0, 1, 2, 3] }`
- msg := dynamicMessage{rawJson: rawJson}
- str, err := new(Marshaler).MarshalToString(&msg)
- if err != nil {
- t.Errorf("an unexpected error occurred when marshalling JSONPBMarshaler: %v", err)
- }
- if str != rawJson {
- t.Errorf("marshalling JSON produced incorrect output: got %s, wanted %s", str, rawJson)
- }
-}
-
-func TestMarshalAnyJSONPBMarshaler(t *testing.T) {
- msg := dynamicMessage{rawJson: `{ "foo": "bar", "baz": [0, 1, 2, 3] }`}
- a, err := ptypes.MarshalAny(&msg)
- if err != nil {
- t.Errorf("an unexpected error occurred when marshalling to Any: %v", err)
- }
- str, err := new(Marshaler).MarshalToString(a)
- if err != nil {
- t.Errorf("an unexpected error occurred when marshalling Any to JSON: %v", err)
- }
- // after custom marshaling, it's round-tripped through JSON decoding/encoding already,
- // so the keys are sorted, whitespace is compacted, and "@type" key has been added
- expected := `{"@type":"type.googleapis.com/` + dynamicMessageName + `","baz":[0,1,2,3],"foo":"bar"}`
- if str != expected {
- t.Errorf("marshalling JSON produced incorrect output: got %s, wanted %s", str, expected)
- }
-}
-
-func TestMarshalWithCustomValidation(t *testing.T) {
- msg := dynamicMessage{rawJson: `{ "foo": "bar", "baz": [0, 1, 2, 3] }`, dummy: &dynamicMessage{}}
-
- js, err := new(Marshaler).MarshalToString(&msg)
- if err != nil {
- t.Errorf("an unexpected error occurred when marshalling to json: %v", err)
- }
- err = Unmarshal(strings.NewReader(js), &msg)
- if err != nil {
- t.Errorf("an unexpected error occurred when unmarshalling from json: %v", err)
- }
-}
-
-// Test marshaling message containing unset required fields should produce error.
-func TestMarshalUnsetRequiredFields(t *testing.T) {
- msgExt := &pb.Real{}
- proto.SetExtension(msgExt, pb.E_Extm, &pb.MsgWithRequired{})
-
- tests := []struct {
- desc string
- marshaler *Marshaler
- pb proto.Message
- }{
- {
- desc: "direct required field",
- marshaler: &Marshaler{},
- pb: &pb.MsgWithRequired{},
- },
- {
- desc: "direct required field + emit defaults",
- marshaler: &Marshaler{EmitDefaults: true},
- pb: &pb.MsgWithRequired{},
- },
- {
- desc: "indirect required field",
- marshaler: &Marshaler{},
- pb: &pb.MsgWithIndirectRequired{Subm: &pb.MsgWithRequired{}},
- },
- {
- desc: "indirect required field + emit defaults",
- marshaler: &Marshaler{EmitDefaults: true},
- pb: &pb.MsgWithIndirectRequired{Subm: &pb.MsgWithRequired{}},
- },
- {
- desc: "direct required wkt field",
- marshaler: &Marshaler{},
- pb: &pb.MsgWithRequiredWKT{},
- },
- {
- desc: "direct required wkt field + emit defaults",
- marshaler: &Marshaler{EmitDefaults: true},
- pb: &pb.MsgWithRequiredWKT{},
- },
- {
- desc: "direct required bytes field",
- marshaler: &Marshaler{},
- pb: &pb.MsgWithRequiredBytes{},
- },
- {
- desc: "required in map value",
- marshaler: &Marshaler{},
- pb: &pb.MsgWithIndirectRequired{
- MapField: map[string]*pb.MsgWithRequired{
- "key": {},
- },
- },
- },
- {
- desc: "required in repeated item",
- marshaler: &Marshaler{},
- pb: &pb.MsgWithIndirectRequired{
- SliceField: []*pb.MsgWithRequired{
- {Str: proto.String("hello")},
- {},
- },
- },
- },
- {
- desc: "required inside oneof",
- marshaler: &Marshaler{},
- pb: &pb.MsgWithOneof{
- Union: &pb.MsgWithOneof_MsgWithRequired{&pb.MsgWithRequired{}},
- },
- },
- {
- desc: "required inside extension",
- marshaler: &Marshaler{},
- pb: msgExt,
- },
- }
-
- for _, tc := range tests {
- if _, err := tc.marshaler.MarshalToString(tc.pb); err == nil {
- t.Errorf("%s: expecting error in marshaling with unset required fields %+v", tc.desc, tc.pb)
- }
- }
-}
-
-var unmarshalingTests = []struct {
- desc string
- unmarshaler Unmarshaler
- json string
- pb proto.Message
-}{
- {"simple flat object", Unmarshaler{}, simpleObjectJSON, simpleObject},
- {"simple pretty object", Unmarshaler{}, simpleObjectPrettyJSON, simpleObject},
- {"repeated fields flat object", Unmarshaler{}, repeatsObjectJSON, repeatsObject},
- {"repeated fields pretty object", Unmarshaler{}, repeatsObjectPrettyJSON, repeatsObject},
- {"nested message/enum flat object", Unmarshaler{}, complexObjectJSON, complexObject},
- {"nested message/enum pretty object", Unmarshaler{}, complexObjectPrettyJSON, complexObject},
- {"enum-string object", Unmarshaler{}, `{"color":"BLUE"}`, &pb.Widget{Color: pb.Widget_BLUE.Enum()}},
- {"enum-value object", Unmarshaler{}, "{\n \"color\": 2\n}", &pb.Widget{Color: pb.Widget_BLUE.Enum()}},
- {"unknown field with allowed option", Unmarshaler{AllowUnknownFields: true}, `{"unknown": "foo"}`, new(pb.Simple)},
- {"proto3 enum string", Unmarshaler{}, `{"hilarity":"PUNS"}`, &proto3pb.Message{Hilarity: proto3pb.Message_PUNS}},
- {"proto3 enum value", Unmarshaler{}, `{"hilarity":1}`, &proto3pb.Message{Hilarity: proto3pb.Message_PUNS}},
- {"unknown enum value object",
- Unmarshaler{},
- "{\n \"color\": 1000,\n \"r_color\": [\n \"RED\"\n ]\n}",
- &pb.Widget{Color: pb.Widget_Color(1000).Enum(), RColor: []pb.Widget_Color{pb.Widget_RED}}},
- {"repeated proto3 enum", Unmarshaler{}, `{"rFunny":["PUNS","SLAPSTICK"]}`,
- &proto3pb.Message{RFunny: []proto3pb.Message_Humour{
- proto3pb.Message_PUNS,
- proto3pb.Message_SLAPSTICK,
- }}},
- {"repeated proto3 enum as int", Unmarshaler{}, `{"rFunny":[1,2]}`,
- &proto3pb.Message{RFunny: []proto3pb.Message_Humour{
- proto3pb.Message_PUNS,
- proto3pb.Message_SLAPSTICK,
- }}},
- {"repeated proto3 enum as mix of strings and ints", Unmarshaler{}, `{"rFunny":["PUNS",2]}`,
- &proto3pb.Message{RFunny: []proto3pb.Message_Humour{
- proto3pb.Message_PUNS,
- proto3pb.Message_SLAPSTICK,
- }}},
- {"unquoted int64 object", Unmarshaler{}, `{"oInt64":-314}`, &pb.Simple{OInt64: proto.Int64(-314)}},
- {"unquoted uint64 object", Unmarshaler{}, `{"oUint64":123}`, &pb.Simple{OUint64: proto.Uint64(123)}},
- {"NaN", Unmarshaler{}, `{"oDouble":"NaN"}`, &pb.Simple{ODouble: proto.Float64(math.NaN())}},
- {"Inf", Unmarshaler{}, `{"oFloat":"Infinity"}`, &pb.Simple{OFloat: proto.Float32(float32(math.Inf(1)))}},
- {"-Inf", Unmarshaler{}, `{"oDouble":"-Infinity"}`, &pb.Simple{ODouble: proto.Float64(math.Inf(-1))}},
- {"map<int64, int32>", Unmarshaler{}, `{"nummy":{"1":2,"3":4}}`, &pb.Mappy{Nummy: map[int64]int32{1: 2, 3: 4}}},
- {"map<string, string>", Unmarshaler{}, `{"strry":{"\"one\"":"two","three":"four"}}`, &pb.Mappy{Strry: map[string]string{`"one"`: "two", "three": "four"}}},
- {"map<int32, Object>", Unmarshaler{}, `{"objjy":{"1":{"dub":1}}}`, &pb.Mappy{Objjy: map[int32]*pb.Simple3{1: {Dub: 1}}}},
- {"proto2 extension", Unmarshaler{}, realNumberJSON, realNumber},
- {"Any with message", Unmarshaler{}, anySimpleJSON, anySimple},
- {"Any with message and indent", Unmarshaler{}, anySimplePrettyJSON, anySimple},
- {"Any with WKT", Unmarshaler{}, anyWellKnownJSON, anyWellKnown},
- {"Any with WKT and indent", Unmarshaler{}, anyWellKnownPrettyJSON, anyWellKnown},
- // TODO: This is broken.
- //{"map<string, enum>", Unmarshaler{}, `{"enumy":{"XIV":"ROMAN"}`, &pb.Mappy{Enumy: map[string]pb.Numeral{"XIV": pb.Numeral_ROMAN}}},
- {"map<string, enum as int>", Unmarshaler{}, `{"enumy":{"XIV":2}}`, &pb.Mappy{Enumy: map[string]pb.Numeral{"XIV": pb.Numeral_ROMAN}}},
- {"oneof", Unmarshaler{}, `{"salary":31000}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_Salary{31000}}},
- {"oneof spec name", Unmarshaler{}, `{"Country":"Australia"}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_Country{"Australia"}}},
- {"oneof orig_name", Unmarshaler{}, `{"Country":"Australia"}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_Country{"Australia"}}},
- {"oneof spec name2", Unmarshaler{}, `{"homeAddress":"Australia"}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_HomeAddress{"Australia"}}},
- {"oneof orig_name2", Unmarshaler{}, `{"home_address":"Australia"}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_HomeAddress{"Australia"}}},
- {"orig_name input", Unmarshaler{}, `{"o_bool":true}`, &pb.Simple{OBool: proto.Bool(true)}},
- {"camelName input", Unmarshaler{}, `{"oBool":true}`, &pb.Simple{OBool: proto.Bool(true)}},
-
- {"Duration", Unmarshaler{}, `{"dur":"3.000s"}`, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 3}}},
- {"Duration", Unmarshaler{}, `{"dur":"4s"}`, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 4}}},
- {"null Duration", Unmarshaler{}, `{"dur":null}`, &pb.KnownTypes{Dur: nil}},
- {"Timestamp", Unmarshaler{}, `{"ts":"2014-05-13T16:53:20.021Z"}`, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 21e6}}},
- {"Timestamp", Unmarshaler{}, `{"ts":"2014-05-13T16:53:20Z"}`, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 0}}},
- {"PreEpochTimestamp", Unmarshaler{}, `{"ts":"1969-12-31T23:59:58.999999995Z"}`, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: -2, Nanos: 999999995}}},
- {"ZeroTimeTimestamp", Unmarshaler{}, `{"ts":"0001-01-01T00:00:00Z"}`, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: -62135596800, Nanos: 0}}},
- {"null Timestamp", Unmarshaler{}, `{"ts":null}`, &pb.KnownTypes{Ts: nil}},
- {"null Struct", Unmarshaler{}, `{"st": null}`, &pb.KnownTypes{St: nil}},
- {"empty Struct", Unmarshaler{}, `{"st": {}}`, &pb.KnownTypes{St: &stpb.Struct{}}},
- {"basic Struct", Unmarshaler{}, `{"st": {"a": "x", "b": null, "c": 3, "d": true}}`, &pb.KnownTypes{St: &stpb.Struct{Fields: map[string]*stpb.Value{
- "a": {Kind: &stpb.Value_StringValue{"x"}},
- "b": {Kind: &stpb.Value_NullValue{}},
- "c": {Kind: &stpb.Value_NumberValue{3}},
- "d": {Kind: &stpb.Value_BoolValue{true}},
- }}}},
- {"nested Struct", Unmarshaler{}, `{"st": {"a": {"b": 1, "c": [{"d": true}, "f"]}}}`, &pb.KnownTypes{St: &stpb.Struct{Fields: map[string]*stpb.Value{
- "a": {Kind: &stpb.Value_StructValue{&stpb.Struct{Fields: map[string]*stpb.Value{
- "b": {Kind: &stpb.Value_NumberValue{1}},
- "c": {Kind: &stpb.Value_ListValue{&stpb.ListValue{Values: []*stpb.Value{
- {Kind: &stpb.Value_StructValue{&stpb.Struct{Fields: map[string]*stpb.Value{"d": {Kind: &stpb.Value_BoolValue{true}}}}}},
- {Kind: &stpb.Value_StringValue{"f"}},
- }}}},
- }}}},
- }}}},
- {"null ListValue", Unmarshaler{}, `{"lv": null}`, &pb.KnownTypes{Lv: nil}},
- {"empty ListValue", Unmarshaler{}, `{"lv": []}`, &pb.KnownTypes{Lv: &stpb.ListValue{}}},
- {"basic ListValue", Unmarshaler{}, `{"lv": ["x", null, 3, true]}`, &pb.KnownTypes{Lv: &stpb.ListValue{Values: []*stpb.Value{
- {Kind: &stpb.Value_StringValue{"x"}},
- {Kind: &stpb.Value_NullValue{}},
- {Kind: &stpb.Value_NumberValue{3}},
- {Kind: &stpb.Value_BoolValue{true}},
- }}}},
- {"number Value", Unmarshaler{}, `{"val":1}`, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_NumberValue{1}}}},
- {"null Value", Unmarshaler{}, `{"val":null}`, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_NullValue{stpb.NullValue_NULL_VALUE}}}},
- {"bool Value", Unmarshaler{}, `{"val":true}`, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_BoolValue{true}}}},
- {"string Value", Unmarshaler{}, `{"val":"x"}`, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_StringValue{"x"}}}},
- {"string number value", Unmarshaler{}, `{"val":"9223372036854775807"}`, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_StringValue{"9223372036854775807"}}}},
- {"list of lists Value", Unmarshaler{}, `{"val":["x", [["y"], "z"]]}`, &pb.KnownTypes{Val: &stpb.Value{
- Kind: &stpb.Value_ListValue{&stpb.ListValue{
- Values: []*stpb.Value{
- {Kind: &stpb.Value_StringValue{"x"}},
- {Kind: &stpb.Value_ListValue{&stpb.ListValue{
- Values: []*stpb.Value{
- {Kind: &stpb.Value_ListValue{&stpb.ListValue{
- Values: []*stpb.Value{{Kind: &stpb.Value_StringValue{"y"}}},
- }}},
- {Kind: &stpb.Value_StringValue{"z"}},
- },
- }}},
- },
- }}}}},
-
- {"DoubleValue", Unmarshaler{}, `{"dbl":1.2}`, &pb.KnownTypes{Dbl: &wpb.DoubleValue{Value: 1.2}}},
- {"FloatValue", Unmarshaler{}, `{"flt":1.2}`, &pb.KnownTypes{Flt: &wpb.FloatValue{Value: 1.2}}},
- {"Int64Value", Unmarshaler{}, `{"i64":"-3"}`, &pb.KnownTypes{I64: &wpb.Int64Value{Value: -3}}},
- {"UInt64Value", Unmarshaler{}, `{"u64":"3"}`, &pb.KnownTypes{U64: &wpb.UInt64Value{Value: 3}}},
- {"Int32Value", Unmarshaler{}, `{"i32":-4}`, &pb.KnownTypes{I32: &wpb.Int32Value{Value: -4}}},
- {"UInt32Value", Unmarshaler{}, `{"u32":4}`, &pb.KnownTypes{U32: &wpb.UInt32Value{Value: 4}}},
- {"BoolValue", Unmarshaler{}, `{"bool":true}`, &pb.KnownTypes{Bool: &wpb.BoolValue{Value: true}}},
- {"StringValue", Unmarshaler{}, `{"str":"plush"}`, &pb.KnownTypes{Str: &wpb.StringValue{Value: "plush"}}},
- {"BytesValue", Unmarshaler{}, `{"bytes":"d293"}`, &pb.KnownTypes{Bytes: &wpb.BytesValue{Value: []byte("wow")}}},
-
- // Ensure that `null` as a value ends up with a nil pointer instead of a [type]Value struct.
- {"null DoubleValue", Unmarshaler{}, `{"dbl":null}`, &pb.KnownTypes{Dbl: nil}},
- {"null FloatValue", Unmarshaler{}, `{"flt":null}`, &pb.KnownTypes{Flt: nil}},
- {"null Int64Value", Unmarshaler{}, `{"i64":null}`, &pb.KnownTypes{I64: nil}},
- {"null UInt64Value", Unmarshaler{}, `{"u64":null}`, &pb.KnownTypes{U64: nil}},
- {"null Int32Value", Unmarshaler{}, `{"i32":null}`, &pb.KnownTypes{I32: nil}},
- {"null UInt32Value", Unmarshaler{}, `{"u32":null}`, &pb.KnownTypes{U32: nil}},
- {"null BoolValue", Unmarshaler{}, `{"bool":null}`, &pb.KnownTypes{Bool: nil}},
- {"null StringValue", Unmarshaler{}, `{"str":null}`, &pb.KnownTypes{Str: nil}},
- {"null BytesValue", Unmarshaler{}, `{"bytes":null}`, &pb.KnownTypes{Bytes: nil}},
-
- {"required", Unmarshaler{}, `{"str":"hello"}`, &pb.MsgWithRequired{Str: proto.String("hello")}},
- {"required bytes", Unmarshaler{}, `{"byts": []}`, &pb.MsgWithRequiredBytes{Byts: []byte{}}},
-}
-
-func TestUnmarshaling(t *testing.T) {
- for _, tt := range unmarshalingTests {
- // Make a new instance of the type of our expected object.
- p := reflect.New(reflect.TypeOf(tt.pb).Elem()).Interface().(proto.Message)
-
- err := tt.unmarshaler.Unmarshal(strings.NewReader(tt.json), p)
- if err != nil {
- t.Errorf("%s: %v", tt.desc, err)
- continue
- }
-
- // For easier diffs, compare text strings of the protos.
- exp := proto.MarshalTextString(tt.pb)
- act := proto.MarshalTextString(p)
- if string(exp) != string(act) {
- t.Errorf("%s: got [%s] want [%s]", tt.desc, act, exp)
- }
- }
-}
-
-func TestUnmarshalNullArray(t *testing.T) {
- var repeats pb.Repeats
- if err := UnmarshalString(`{"rBool":null}`, &repeats); err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(repeats, pb.Repeats{}) {
- t.Errorf("got non-nil fields in [%#v]", repeats)
- }
-}
-
-func TestUnmarshalNullObject(t *testing.T) {
- var maps pb.Maps
- if err := UnmarshalString(`{"mInt64Str":null}`, &maps); err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(maps, pb.Maps{}) {
- t.Errorf("got non-nil fields in [%#v]", maps)
- }
-}
-
-func TestUnmarshalNext(t *testing.T) {
- // We only need to check against a few, not all of them.
- tests := unmarshalingTests[:5]
-
- // Create a buffer with many concatenated JSON objects.
- var b bytes.Buffer
- for _, tt := range tests {
- b.WriteString(tt.json)
- }
-
- dec := json.NewDecoder(&b)
- for _, tt := range tests {
- // Make a new instance of the type of our expected object.
- p := reflect.New(reflect.TypeOf(tt.pb).Elem()).Interface().(proto.Message)
-
- err := tt.unmarshaler.UnmarshalNext(dec, p)
- if err != nil {
- t.Errorf("%s: %v", tt.desc, err)
- continue
- }
-
- // For easier diffs, compare text strings of the protos.
- exp := proto.MarshalTextString(tt.pb)
- act := proto.MarshalTextString(p)
- if string(exp) != string(act) {
- t.Errorf("%s: got [%s] want [%s]", tt.desc, act, exp)
- }
- }
-
- p := &pb.Simple{}
- err := new(Unmarshaler).UnmarshalNext(dec, p)
- if err != io.EOF {
- t.Errorf("eof: got %v, expected io.EOF", err)
- }
-}
-
-var unmarshalingShouldError = []struct {
- desc string
- in string
- pb proto.Message
-}{
- {"a value", "666", new(pb.Simple)},
- {"gibberish", "{adskja123;l23=-=", new(pb.Simple)},
- {"unknown field", `{"unknown": "foo"}`, new(pb.Simple)},
- {"unknown enum name", `{"hilarity":"DAVE"}`, new(proto3pb.Message)},
-}
-
-func TestUnmarshalingBadInput(t *testing.T) {
- for _, tt := range unmarshalingShouldError {
- err := UnmarshalString(tt.in, tt.pb)
- if err == nil {
- t.Errorf("an error was expected when parsing %q instead of an object", tt.desc)
- }
- }
-}
-
-type funcResolver func(turl string) (proto.Message, error)
-
-func (fn funcResolver) Resolve(turl string) (proto.Message, error) {
- return fn(turl)
-}
-
-func TestAnyWithCustomResolver(t *testing.T) {
- var resolvedTypeUrls []string
- resolver := funcResolver(func(turl string) (proto.Message, error) {
- resolvedTypeUrls = append(resolvedTypeUrls, turl)
- return new(pb.Simple), nil
- })
- msg := &pb.Simple{
- OBytes: []byte{1, 2, 3, 4},
- OBool: proto.Bool(true),
- OString: proto.String("foobar"),
- OInt64: proto.Int64(1020304),
- }
- msgBytes, err := proto.Marshal(msg)
- if err != nil {
- t.Errorf("an unexpected error occurred when marshaling message: %v", err)
- }
- // make an Any with a type URL that won't resolve w/out custom resolver
- any := &anypb.Any{
- TypeUrl: "https://foobar.com/some.random.MessageKind",
- Value: msgBytes,
- }
-
- m := Marshaler{AnyResolver: resolver}
- js, err := m.MarshalToString(any)
- if err != nil {
- t.Errorf("an unexpected error occurred when marshaling any to JSON: %v", err)
- }
- if len(resolvedTypeUrls) != 1 {
- t.Errorf("custom resolver was not invoked during marshaling")
- } else if resolvedTypeUrls[0] != "https://foobar.com/some.random.MessageKind" {
- t.Errorf("custom resolver was invoked with wrong URL: got %q, wanted %q", resolvedTypeUrls[0], "https://foobar.com/some.random.MessageKind")
- }
- wanted := `{"@type":"https://foobar.com/some.random.MessageKind","oBool":true,"oInt64":"1020304","oString":"foobar","oBytes":"AQIDBA=="}`
- if js != wanted {
- t.Errorf("marshalling JSON produced incorrect output: got %s, wanted %s", js, wanted)
- }
-
- u := Unmarshaler{AnyResolver: resolver}
- roundTrip := &anypb.Any{}
- err = u.Unmarshal(bytes.NewReader([]byte(js)), roundTrip)
- if err != nil {
- t.Errorf("an unexpected error occurred when unmarshaling any from JSON: %v", err)
- }
- if len(resolvedTypeUrls) != 2 {
- t.Errorf("custom resolver was not invoked during marshaling")
- } else if resolvedTypeUrls[1] != "https://foobar.com/some.random.MessageKind" {
- t.Errorf("custom resolver was invoked with wrong URL: got %q, wanted %q", resolvedTypeUrls[1], "https://foobar.com/some.random.MessageKind")
- }
- if !proto.Equal(any, roundTrip) {
- t.Errorf("message contents not set correctly after unmarshalling JSON: got %s, wanted %s", roundTrip, any)
- }
-}
-
-func TestUnmarshalJSONPBUnmarshaler(t *testing.T) {
- rawJson := `{ "foo": "bar", "baz": [0, 1, 2, 3] }`
- var msg dynamicMessage
- if err := Unmarshal(strings.NewReader(rawJson), &msg); err != nil {
- t.Errorf("an unexpected error occurred when parsing into JSONPBUnmarshaler: %v", err)
- }
- if msg.rawJson != rawJson {
- t.Errorf("message contents not set correctly after unmarshalling JSON: got %s, wanted %s", msg.rawJson, rawJson)
- }
-}
-
-func TestUnmarshalNullWithJSONPBUnmarshaler(t *testing.T) {
- rawJson := `{"stringField":null}`
- var ptrFieldMsg ptrFieldMessage
- if err := Unmarshal(strings.NewReader(rawJson), &ptrFieldMsg); err != nil {
- t.Errorf("unmarshal error: %v", err)
- }
-
- want := ptrFieldMessage{StringField: &stringField{IsSet: true, StringValue: "null"}}
- if !proto.Equal(&ptrFieldMsg, &want) {
- t.Errorf("unmarshal result StringField: got %v, want %v", ptrFieldMsg, want)
- }
-}
-
-func TestUnmarshalAnyJSONPBUnmarshaler(t *testing.T) {
- rawJson := `{ "@type": "blah.com/` + dynamicMessageName + `", "foo": "bar", "baz": [0, 1, 2, 3] }`
- var got anypb.Any
- if err := Unmarshal(strings.NewReader(rawJson), &got); err != nil {
- t.Errorf("an unexpected error occurred when parsing into JSONPBUnmarshaler: %v", err)
- }
-
- dm := &dynamicMessage{rawJson: `{"baz":[0,1,2,3],"foo":"bar"}`}
- var want anypb.Any
- if b, err := proto.Marshal(dm); err != nil {
- t.Errorf("an unexpected error occurred when marshaling message: %v", err)
- } else {
- want.TypeUrl = "blah.com/" + dynamicMessageName
- want.Value = b
- }
-
- if !proto.Equal(&got, &want) {
- t.Errorf("message contents not set correctly after unmarshalling JSON: got %v, wanted %v", got, want)
- }
-}
-
-const (
- dynamicMessageName = "google.protobuf.jsonpb.testing.dynamicMessage"
-)
-
-func init() {
- // we register the custom type below so that we can use it in Any types
- proto.RegisterType((*dynamicMessage)(nil), dynamicMessageName)
-}
-
-type ptrFieldMessage struct {
- StringField *stringField `protobuf:"bytes,1,opt,name=stringField"`
-}
-
-func (m *ptrFieldMessage) Reset() {
-}
-
-func (m *ptrFieldMessage) String() string {
- return m.StringField.StringValue
-}
-
-func (m *ptrFieldMessage) ProtoMessage() {
-}
-
-type stringField struct {
- IsSet bool `protobuf:"varint,1,opt,name=isSet"`
- StringValue string `protobuf:"bytes,2,opt,name=stringValue"`
-}
-
-func (s *stringField) Reset() {
-}
-
-func (s *stringField) String() string {
- return s.StringValue
-}
-
-func (s *stringField) ProtoMessage() {
-}
-
-func (s *stringField) UnmarshalJSONPB(jum *Unmarshaler, js []byte) error {
- s.IsSet = true
- s.StringValue = string(js)
- return nil
-}
-
-// dynamicMessage implements protobuf.Message but is not a normal generated message type.
-// It provides implementations of JSONPBMarshaler and JSONPBUnmarshaler for JSON support.
-type dynamicMessage struct {
- rawJson string `protobuf:"bytes,1,opt,name=rawJson"`
-
- // an unexported nested message is present just to ensure that it
- // won't result in a panic (see issue #509)
- dummy *dynamicMessage `protobuf:"bytes,2,opt,name=dummy"`
-}
-
-func (m *dynamicMessage) Reset() {
- m.rawJson = "{}"
-}
-
-func (m *dynamicMessage) String() string {
- return m.rawJson
-}
-
-func (m *dynamicMessage) ProtoMessage() {
-}
-
-func (m *dynamicMessage) MarshalJSONPB(jm *Marshaler) ([]byte, error) {
- return []byte(m.rawJson), nil
-}
-
-func (m *dynamicMessage) UnmarshalJSONPB(jum *Unmarshaler, js []byte) error {
- m.rawJson = string(js)
- return nil
-}
-
-// Test unmarshaling message containing unset required fields should produce error.
-func TestUnmarshalUnsetRequiredFields(t *testing.T) {
- tests := []struct {
- desc string
- pb proto.Message
- json string
- }{
- {
- desc: "direct required field missing",
- pb: &pb.MsgWithRequired{},
- json: `{}`,
- },
- {
- desc: "direct required field set to null",
- pb: &pb.MsgWithRequired{},
- json: `{"str": null}`,
- },
- {
- desc: "indirect required field missing",
- pb: &pb.MsgWithIndirectRequired{},
- json: `{"subm": {}}`,
- },
- {
- desc: "indirect required field set to null",
- pb: &pb.MsgWithIndirectRequired{},
- json: `{"subm": {"str": null}}`,
- },
- {
- desc: "direct required bytes field missing",
- pb: &pb.MsgWithRequiredBytes{},
- json: `{}`,
- },
- {
- desc: "direct required bytes field set to null",
- pb: &pb.MsgWithRequiredBytes{},
- json: `{"byts": null}`,
- },
- {
- desc: "direct required wkt field missing",
- pb: &pb.MsgWithRequiredWKT{},
- json: `{}`,
- },
- {
- desc: "direct required wkt field set to null",
- pb: &pb.MsgWithRequiredWKT{},
- json: `{"str": null}`,
- },
- {
- desc: "any containing message with required field set to null",
- pb: &pb.KnownTypes{},
- json: `{"an": {"@type": "example.com/jsonpb.MsgWithRequired", "str": null}}`,
- },
- {
- desc: "any containing message with missing required field",
- pb: &pb.KnownTypes{},
- json: `{"an": {"@type": "example.com/jsonpb.MsgWithRequired"}}`,
- },
- {
- desc: "missing required in map value",
- pb: &pb.MsgWithIndirectRequired{},
- json: `{"map_field": {"a": {}, "b": {"str": "hi"}}}`,
- },
- {
- desc: "required in map value set to null",
- pb: &pb.MsgWithIndirectRequired{},
- json: `{"map_field": {"a": {"str": "hello"}, "b": {"str": null}}}`,
- },
- {
- desc: "missing required in slice item",
- pb: &pb.MsgWithIndirectRequired{},
- json: `{"slice_field": [{}, {"str": "hi"}]}`,
- },
- {
- desc: "required in slice item set to null",
- pb: &pb.MsgWithIndirectRequired{},
- json: `{"slice_field": [{"str": "hello"}, {"str": null}]}`,
- },
- {
- desc: "required inside oneof missing",
- pb: &pb.MsgWithOneof{},
- json: `{"msgWithRequired": {}}`,
- },
- {
- desc: "required inside oneof set to null",
- pb: &pb.MsgWithOneof{},
- json: `{"msgWithRequired": {"str": null}}`,
- },
- {
- desc: "required field in extension missing",
- pb: &pb.Real{},
- json: `{"[jsonpb.extm]":{}}`,
- },
- {
- desc: "required field in extension set to null",
- pb: &pb.Real{},
- json: `{"[jsonpb.extm]":{"str": null}}`,
- },
- }
-
- for _, tc := range tests {
- if err := UnmarshalString(tc.json, tc.pb); err == nil {
- t.Errorf("%s: expecting error in unmarshaling with unset required fields %s", tc.desc, tc.json)
- }
- }
-}
diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.pb.go b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
deleted file mode 100644
index 1bcce02..0000000
--- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
+++ /dev/null
@@ -1,368 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: more_test_objects.proto
-
-package jsonpb
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type Numeral int32
-
-const (
- Numeral_UNKNOWN Numeral = 0
- Numeral_ARABIC Numeral = 1
- Numeral_ROMAN Numeral = 2
-)
-
-var Numeral_name = map[int32]string{
- 0: "UNKNOWN",
- 1: "ARABIC",
- 2: "ROMAN",
-}
-var Numeral_value = map[string]int32{
- "UNKNOWN": 0,
- "ARABIC": 1,
- "ROMAN": 2,
-}
-
-func (x Numeral) String() string {
- return proto.EnumName(Numeral_name, int32(x))
-}
-func (Numeral) EnumDescriptor() ([]byte, []int) {
- return fileDescriptor_more_test_objects_bef0d79b901f4c4a, []int{0}
-}
-
-type Simple3 struct {
- Dub float64 `protobuf:"fixed64,1,opt,name=dub" json:"dub,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *Simple3) Reset() { *m = Simple3{} }
-func (m *Simple3) String() string { return proto.CompactTextString(m) }
-func (*Simple3) ProtoMessage() {}
-func (*Simple3) Descriptor() ([]byte, []int) {
- return fileDescriptor_more_test_objects_bef0d79b901f4c4a, []int{0}
-}
-func (m *Simple3) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_Simple3.Unmarshal(m, b)
-}
-func (m *Simple3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_Simple3.Marshal(b, m, deterministic)
-}
-func (dst *Simple3) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Simple3.Merge(dst, src)
-}
-func (m *Simple3) XXX_Size() int {
- return xxx_messageInfo_Simple3.Size(m)
-}
-func (m *Simple3) XXX_DiscardUnknown() {
- xxx_messageInfo_Simple3.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Simple3 proto.InternalMessageInfo
-
-func (m *Simple3) GetDub() float64 {
- if m != nil {
- return m.Dub
- }
- return 0
-}
-
-type SimpleSlice3 struct {
- Slices []string `protobuf:"bytes,1,rep,name=slices" json:"slices,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *SimpleSlice3) Reset() { *m = SimpleSlice3{} }
-func (m *SimpleSlice3) String() string { return proto.CompactTextString(m) }
-func (*SimpleSlice3) ProtoMessage() {}
-func (*SimpleSlice3) Descriptor() ([]byte, []int) {
- return fileDescriptor_more_test_objects_bef0d79b901f4c4a, []int{1}
-}
-func (m *SimpleSlice3) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_SimpleSlice3.Unmarshal(m, b)
-}
-func (m *SimpleSlice3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_SimpleSlice3.Marshal(b, m, deterministic)
-}
-func (dst *SimpleSlice3) XXX_Merge(src proto.Message) {
- xxx_messageInfo_SimpleSlice3.Merge(dst, src)
-}
-func (m *SimpleSlice3) XXX_Size() int {
- return xxx_messageInfo_SimpleSlice3.Size(m)
-}
-func (m *SimpleSlice3) XXX_DiscardUnknown() {
- xxx_messageInfo_SimpleSlice3.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_SimpleSlice3 proto.InternalMessageInfo
-
-func (m *SimpleSlice3) GetSlices() []string {
- if m != nil {
- return m.Slices
- }
- return nil
-}
-
-type SimpleMap3 struct {
- Stringy map[string]string `protobuf:"bytes,1,rep,name=stringy" json:"stringy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *SimpleMap3) Reset() { *m = SimpleMap3{} }
-func (m *SimpleMap3) String() string { return proto.CompactTextString(m) }
-func (*SimpleMap3) ProtoMessage() {}
-func (*SimpleMap3) Descriptor() ([]byte, []int) {
- return fileDescriptor_more_test_objects_bef0d79b901f4c4a, []int{2}
-}
-func (m *SimpleMap3) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_SimpleMap3.Unmarshal(m, b)
-}
-func (m *SimpleMap3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_SimpleMap3.Marshal(b, m, deterministic)
-}
-func (dst *SimpleMap3) XXX_Merge(src proto.Message) {
- xxx_messageInfo_SimpleMap3.Merge(dst, src)
-}
-func (m *SimpleMap3) XXX_Size() int {
- return xxx_messageInfo_SimpleMap3.Size(m)
-}
-func (m *SimpleMap3) XXX_DiscardUnknown() {
- xxx_messageInfo_SimpleMap3.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_SimpleMap3 proto.InternalMessageInfo
-
-func (m *SimpleMap3) GetStringy() map[string]string {
- if m != nil {
- return m.Stringy
- }
- return nil
-}
-
-type SimpleNull3 struct {
- Simple *Simple3 `protobuf:"bytes,1,opt,name=simple" json:"simple,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *SimpleNull3) Reset() { *m = SimpleNull3{} }
-func (m *SimpleNull3) String() string { return proto.CompactTextString(m) }
-func (*SimpleNull3) ProtoMessage() {}
-func (*SimpleNull3) Descriptor() ([]byte, []int) {
- return fileDescriptor_more_test_objects_bef0d79b901f4c4a, []int{3}
-}
-func (m *SimpleNull3) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_SimpleNull3.Unmarshal(m, b)
-}
-func (m *SimpleNull3) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_SimpleNull3.Marshal(b, m, deterministic)
-}
-func (dst *SimpleNull3) XXX_Merge(src proto.Message) {
- xxx_messageInfo_SimpleNull3.Merge(dst, src)
-}
-func (m *SimpleNull3) XXX_Size() int {
- return xxx_messageInfo_SimpleNull3.Size(m)
-}
-func (m *SimpleNull3) XXX_DiscardUnknown() {
- xxx_messageInfo_SimpleNull3.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_SimpleNull3 proto.InternalMessageInfo
-
-func (m *SimpleNull3) GetSimple() *Simple3 {
- if m != nil {
- return m.Simple
- }
- return nil
-}
-
-type Mappy struct {
- Nummy map[int64]int32 `protobuf:"bytes,1,rep,name=nummy" json:"nummy,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
- Strry map[string]string `protobuf:"bytes,2,rep,name=strry" json:"strry,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
- Objjy map[int32]*Simple3 `protobuf:"bytes,3,rep,name=objjy" json:"objjy,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
- Buggy map[int64]string `protobuf:"bytes,4,rep,name=buggy" json:"buggy,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
- Booly map[bool]bool `protobuf:"bytes,5,rep,name=booly" json:"booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
- Enumy map[string]Numeral `protobuf:"bytes,6,rep,name=enumy" json:"enumy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=jsonpb.Numeral"`
- S32Booly map[int32]bool `protobuf:"bytes,7,rep,name=s32booly" json:"s32booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
- S64Booly map[int64]bool `protobuf:"bytes,8,rep,name=s64booly" json:"s64booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
- U32Booly map[uint32]bool `protobuf:"bytes,9,rep,name=u32booly" json:"u32booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
- U64Booly map[uint64]bool `protobuf:"bytes,10,rep,name=u64booly" json:"u64booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *Mappy) Reset() { *m = Mappy{} }
-func (m *Mappy) String() string { return proto.CompactTextString(m) }
-func (*Mappy) ProtoMessage() {}
-func (*Mappy) Descriptor() ([]byte, []int) {
- return fileDescriptor_more_test_objects_bef0d79b901f4c4a, []int{4}
-}
-func (m *Mappy) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_Mappy.Unmarshal(m, b)
-}
-func (m *Mappy) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_Mappy.Marshal(b, m, deterministic)
-}
-func (dst *Mappy) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Mappy.Merge(dst, src)
-}
-func (m *Mappy) XXX_Size() int {
- return xxx_messageInfo_Mappy.Size(m)
-}
-func (m *Mappy) XXX_DiscardUnknown() {
- xxx_messageInfo_Mappy.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Mappy proto.InternalMessageInfo
-
-func (m *Mappy) GetNummy() map[int64]int32 {
- if m != nil {
- return m.Nummy
- }
- return nil
-}
-
-func (m *Mappy) GetStrry() map[string]string {
- if m != nil {
- return m.Strry
- }
- return nil
-}
-
-func (m *Mappy) GetObjjy() map[int32]*Simple3 {
- if m != nil {
- return m.Objjy
- }
- return nil
-}
-
-func (m *Mappy) GetBuggy() map[int64]string {
- if m != nil {
- return m.Buggy
- }
- return nil
-}
-
-func (m *Mappy) GetBooly() map[bool]bool {
- if m != nil {
- return m.Booly
- }
- return nil
-}
-
-func (m *Mappy) GetEnumy() map[string]Numeral {
- if m != nil {
- return m.Enumy
- }
- return nil
-}
-
-func (m *Mappy) GetS32Booly() map[int32]bool {
- if m != nil {
- return m.S32Booly
- }
- return nil
-}
-
-func (m *Mappy) GetS64Booly() map[int64]bool {
- if m != nil {
- return m.S64Booly
- }
- return nil
-}
-
-func (m *Mappy) GetU32Booly() map[uint32]bool {
- if m != nil {
- return m.U32Booly
- }
- return nil
-}
-
-func (m *Mappy) GetU64Booly() map[uint64]bool {
- if m != nil {
- return m.U64Booly
- }
- return nil
-}
-
-func init() {
- proto.RegisterType((*Simple3)(nil), "jsonpb.Simple3")
- proto.RegisterType((*SimpleSlice3)(nil), "jsonpb.SimpleSlice3")
- proto.RegisterType((*SimpleMap3)(nil), "jsonpb.SimpleMap3")
- proto.RegisterMapType((map[string]string)(nil), "jsonpb.SimpleMap3.StringyEntry")
- proto.RegisterType((*SimpleNull3)(nil), "jsonpb.SimpleNull3")
- proto.RegisterType((*Mappy)(nil), "jsonpb.Mappy")
- proto.RegisterMapType((map[bool]bool)(nil), "jsonpb.Mappy.BoolyEntry")
- proto.RegisterMapType((map[int64]string)(nil), "jsonpb.Mappy.BuggyEntry")
- proto.RegisterMapType((map[string]Numeral)(nil), "jsonpb.Mappy.EnumyEntry")
- proto.RegisterMapType((map[int64]int32)(nil), "jsonpb.Mappy.NummyEntry")
- proto.RegisterMapType((map[int32]*Simple3)(nil), "jsonpb.Mappy.ObjjyEntry")
- proto.RegisterMapType((map[int32]bool)(nil), "jsonpb.Mappy.S32boolyEntry")
- proto.RegisterMapType((map[int64]bool)(nil), "jsonpb.Mappy.S64boolyEntry")
- proto.RegisterMapType((map[string]string)(nil), "jsonpb.Mappy.StrryEntry")
- proto.RegisterMapType((map[uint32]bool)(nil), "jsonpb.Mappy.U32boolyEntry")
- proto.RegisterMapType((map[uint64]bool)(nil), "jsonpb.Mappy.U64boolyEntry")
- proto.RegisterEnum("jsonpb.Numeral", Numeral_name, Numeral_value)
-}
-
-func init() {
- proto.RegisterFile("more_test_objects.proto", fileDescriptor_more_test_objects_bef0d79b901f4c4a)
-}
-
-var fileDescriptor_more_test_objects_bef0d79b901f4c4a = []byte{
- // 526 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xdd, 0x6b, 0xdb, 0x3c,
- 0x14, 0x87, 0x5f, 0x27, 0xf5, 0xd7, 0x49, 0xfb, 0x2e, 0x88, 0xb1, 0x99, 0xf4, 0x62, 0xc5, 0xb0,
- 0xad, 0x0c, 0xe6, 0x8b, 0x78, 0x74, 0x5d, 0x77, 0x95, 0x8e, 0x5e, 0x94, 0x11, 0x07, 0x1c, 0xc2,
- 0x2e, 0x4b, 0xdc, 0x99, 0x90, 0xcc, 0x5f, 0xd8, 0xd6, 0xc0, 0xd7, 0xfb, 0xbb, 0x07, 0xe3, 0x48,
- 0x72, 0x2d, 0x07, 0x85, 0x6c, 0x77, 0x52, 0x7e, 0xcf, 0xe3, 0x73, 0x24, 0x1d, 0x02, 0x2f, 0xd3,
- 0xbc, 0x8c, 0x1f, 0xea, 0xb8, 0xaa, 0x1f, 0xf2, 0x68, 0x17, 0x3f, 0xd6, 0x95, 0x57, 0x94, 0x79,
- 0x9d, 0x13, 0x63, 0x57, 0xe5, 0x59, 0x11, 0xb9, 0xe7, 0x60, 0x2e, 0xb7, 0x69, 0x91, 0xc4, 0x3e,
- 0x19, 0xc3, 0xf0, 0x3b, 0x8d, 0x1c, 0xed, 0x42, 0xbb, 0xd4, 0x42, 0x5c, 0xba, 0x6f, 0xe0, 0x94,
- 0x87, 0xcb, 0x64, 0xfb, 0x18, 0xfb, 0xe4, 0x05, 0x18, 0x15, 0xae, 0x2a, 0x47, 0xbb, 0x18, 0x5e,
- 0xda, 0xa1, 0xd8, 0xb9, 0xbf, 0x34, 0x00, 0x0e, 0xce, 0xd7, 0x85, 0x4f, 0x3e, 0x81, 0x59, 0xd5,
- 0xe5, 0x36, 0xdb, 0x34, 0x8c, 0x1b, 0x4d, 0x5f, 0x79, 0xbc, 0x9a, 0xd7, 0x41, 0xde, 0x92, 0x13,
- 0x77, 0x59, 0x5d, 0x36, 0x61, 0xcb, 0x4f, 0x6e, 0xe0, 0x54, 0x0e, 0xb0, 0xa7, 0x1f, 0x71, 0xc3,
- 0x7a, 0xb2, 0x43, 0x5c, 0x92, 0xe7, 0xa0, 0xff, 0x5c, 0x27, 0x34, 0x76, 0x06, 0xec, 0x37, 0xbe,
- 0xb9, 0x19, 0x5c, 0x6b, 0xee, 0x15, 0x8c, 0xf8, 0xf7, 0x03, 0x9a, 0x24, 0x3e, 0x79, 0x0b, 0x46,
- 0xc5, 0xb6, 0xcc, 0x1e, 0x4d, 0x9f, 0xf5, 0x9b, 0xf0, 0x43, 0x11, 0xbb, 0xbf, 0x2d, 0xd0, 0xe7,
- 0xeb, 0xa2, 0x68, 0x88, 0x07, 0x7a, 0x46, 0xd3, 0xb4, 0x6d, 0xdb, 0x69, 0x0d, 0x96, 0x7a, 0x01,
- 0x46, 0xbc, 0x5f, 0x8e, 0x21, 0x5f, 0xd5, 0x65, 0xd9, 0x38, 0x03, 0x15, 0xbf, 0xc4, 0x48, 0xf0,
- 0x0c, 0x43, 0x3e, 0x8f, 0x76, 0xbb, 0xc6, 0x19, 0xaa, 0xf8, 0x05, 0x46, 0x82, 0x67, 0x18, 0xf2,
- 0x11, 0xdd, 0x6c, 0x1a, 0xe7, 0x44, 0xc5, 0xdf, 0x62, 0x24, 0x78, 0x86, 0x31, 0x3e, 0xcf, 0x93,
- 0xc6, 0xd1, 0x95, 0x3c, 0x46, 0x2d, 0x8f, 0x6b, 0xe4, 0xe3, 0x8c, 0xa6, 0x8d, 0x63, 0xa8, 0xf8,
- 0x3b, 0x8c, 0x04, 0xcf, 0x30, 0xf2, 0x11, 0xac, 0xca, 0x9f, 0xf2, 0x12, 0x26, 0x53, 0xce, 0xf7,
- 0x8e, 0x2c, 0x52, 0x6e, 0x3d, 0xc1, 0x4c, 0xbc, 0xfa, 0xc0, 0x45, 0x4b, 0x29, 0x8a, 0xb4, 0x15,
- 0xc5, 0x16, 0x45, 0xda, 0x56, 0xb4, 0x55, 0xe2, 0xaa, 0x5f, 0x91, 0x4a, 0x15, 0x69, 0x5b, 0x11,
- 0x94, 0x62, 0xbf, 0x62, 0x0b, 0x4f, 0xae, 0x01, 0xba, 0x87, 0x96, 0xe7, 0x6f, 0xa8, 0x98, 0x3f,
- 0x5d, 0x9a, 0x3f, 0x34, 0xbb, 0x27, 0xff, 0x97, 0xc9, 0x9d, 0xdc, 0x03, 0x74, 0x8f, 0x2f, 0x9b,
- 0x3a, 0x37, 0x5f, 0xcb, 0xa6, 0x62, 0x92, 0xfb, 0x4d, 0x74, 0x73, 0x71, 0xac, 0x7d, 0x7b, 0xdf,
- 0x7c, 0xba, 0x10, 0xd9, 0xb4, 0x14, 0xa6, 0xb5, 0xd7, 0x7e, 0x37, 0x2b, 0x8a, 0x83, 0xf7, 0xda,
- 0xff, 0xbf, 0x6b, 0x3f, 0xa0, 0x69, 0x5c, 0xae, 0x13, 0xf9, 0x53, 0x9f, 0xe1, 0xac, 0x37, 0x43,
- 0x8a, 0xcb, 0x38, 0xdc, 0x07, 0xca, 0xf2, 0xab, 0x1e, 0x3b, 0xfe, 0xbe, 0xbc, 0x3a, 0x54, 0xf9,
- 0xec, 0x6f, 0xe4, 0x43, 0x95, 0x4f, 0x8e, 0xc8, 0xef, 0xde, 0x83, 0x29, 0x6e, 0x82, 0x8c, 0xc0,
- 0x5c, 0x05, 0x5f, 0x83, 0xc5, 0xb7, 0x60, 0xfc, 0x1f, 0x01, 0x30, 0x66, 0xe1, 0xec, 0xf6, 0xfe,
- 0xcb, 0x58, 0x23, 0x36, 0xe8, 0xe1, 0x62, 0x3e, 0x0b, 0xc6, 0x83, 0xc8, 0x60, 0x7f, 0xe0, 0xfe,
- 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdc, 0x84, 0x34, 0xaf, 0xdb, 0x05, 0x00, 0x00,
-}
diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.proto b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.proto
deleted file mode 100644
index d254fa5..0000000
--- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.proto
+++ /dev/null
@@ -1,69 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2015 The Go Authors. All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package jsonpb;
-
-message Simple3 {
- double dub = 1;
-}
-
-message SimpleSlice3 {
- repeated string slices = 1;
-}
-
-message SimpleMap3 {
- map<string,string> stringy = 1;
-}
-
-message SimpleNull3 {
- Simple3 simple = 1;
-}
-
-enum Numeral {
- UNKNOWN = 0;
- ARABIC = 1;
- ROMAN = 2;
-}
-
-message Mappy {
- map<int64, int32> nummy = 1;
- map<string, string> strry = 2;
- map<int32, Simple3> objjy = 3;
- map<int64, string> buggy = 4;
- map<bool, bool> booly = 5;
- map<string, Numeral> enumy = 6;
- map<int32, bool> s32booly = 7;
- map<int64, bool> s64booly = 8;
- map<uint32, bool> u32booly = 9;
- map<uint64, bool> u64booly = 10;
-}
diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.pb.go b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.pb.go
deleted file mode 100644
index d9e24db..0000000
--- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.pb.go
+++ /dev/null
@@ -1,1278 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: test_objects.proto
-
-package jsonpb
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import any "github.com/golang/protobuf/ptypes/any"
-import duration "github.com/golang/protobuf/ptypes/duration"
-import _struct "github.com/golang/protobuf/ptypes/struct"
-import timestamp "github.com/golang/protobuf/ptypes/timestamp"
-import wrappers "github.com/golang/protobuf/ptypes/wrappers"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type Widget_Color int32
-
-const (
- Widget_RED Widget_Color = 0
- Widget_GREEN Widget_Color = 1
- Widget_BLUE Widget_Color = 2
-)
-
-var Widget_Color_name = map[int32]string{
- 0: "RED",
- 1: "GREEN",
- 2: "BLUE",
-}
-var Widget_Color_value = map[string]int32{
- "RED": 0,
- "GREEN": 1,
- "BLUE": 2,
-}
-
-func (x Widget_Color) Enum() *Widget_Color {
- p := new(Widget_Color)
- *p = x
- return p
-}
-func (x Widget_Color) String() string {
- return proto.EnumName(Widget_Color_name, int32(x))
-}
-func (x *Widget_Color) UnmarshalJSON(data []byte) error {
- value, err := proto.UnmarshalJSONEnum(Widget_Color_value, data, "Widget_Color")
- if err != nil {
- return err
- }
- *x = Widget_Color(value)
- return nil
-}
-func (Widget_Color) EnumDescriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{3, 0}
-}
-
-// Test message for holding primitive types.
-type Simple struct {
- OBool *bool `protobuf:"varint,1,opt,name=o_bool,json=oBool" json:"o_bool,omitempty"`
- OInt32 *int32 `protobuf:"varint,2,opt,name=o_int32,json=oInt32" json:"o_int32,omitempty"`
- OInt64 *int64 `protobuf:"varint,3,opt,name=o_int64,json=oInt64" json:"o_int64,omitempty"`
- OUint32 *uint32 `protobuf:"varint,4,opt,name=o_uint32,json=oUint32" json:"o_uint32,omitempty"`
- OUint64 *uint64 `protobuf:"varint,5,opt,name=o_uint64,json=oUint64" json:"o_uint64,omitempty"`
- OSint32 *int32 `protobuf:"zigzag32,6,opt,name=o_sint32,json=oSint32" json:"o_sint32,omitempty"`
- OSint64 *int64 `protobuf:"zigzag64,7,opt,name=o_sint64,json=oSint64" json:"o_sint64,omitempty"`
- OFloat *float32 `protobuf:"fixed32,8,opt,name=o_float,json=oFloat" json:"o_float,omitempty"`
- ODouble *float64 `protobuf:"fixed64,9,opt,name=o_double,json=oDouble" json:"o_double,omitempty"`
- OString *string `protobuf:"bytes,10,opt,name=o_string,json=oString" json:"o_string,omitempty"`
- OBytes []byte `protobuf:"bytes,11,opt,name=o_bytes,json=oBytes" json:"o_bytes,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *Simple) Reset() { *m = Simple{} }
-func (m *Simple) String() string { return proto.CompactTextString(m) }
-func (*Simple) ProtoMessage() {}
-func (*Simple) Descriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{0}
-}
-func (m *Simple) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_Simple.Unmarshal(m, b)
-}
-func (m *Simple) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_Simple.Marshal(b, m, deterministic)
-}
-func (dst *Simple) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Simple.Merge(dst, src)
-}
-func (m *Simple) XXX_Size() int {
- return xxx_messageInfo_Simple.Size(m)
-}
-func (m *Simple) XXX_DiscardUnknown() {
- xxx_messageInfo_Simple.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Simple proto.InternalMessageInfo
-
-func (m *Simple) GetOBool() bool {
- if m != nil && m.OBool != nil {
- return *m.OBool
- }
- return false
-}
-
-func (m *Simple) GetOInt32() int32 {
- if m != nil && m.OInt32 != nil {
- return *m.OInt32
- }
- return 0
-}
-
-func (m *Simple) GetOInt64() int64 {
- if m != nil && m.OInt64 != nil {
- return *m.OInt64
- }
- return 0
-}
-
-func (m *Simple) GetOUint32() uint32 {
- if m != nil && m.OUint32 != nil {
- return *m.OUint32
- }
- return 0
-}
-
-func (m *Simple) GetOUint64() uint64 {
- if m != nil && m.OUint64 != nil {
- return *m.OUint64
- }
- return 0
-}
-
-func (m *Simple) GetOSint32() int32 {
- if m != nil && m.OSint32 != nil {
- return *m.OSint32
- }
- return 0
-}
-
-func (m *Simple) GetOSint64() int64 {
- if m != nil && m.OSint64 != nil {
- return *m.OSint64
- }
- return 0
-}
-
-func (m *Simple) GetOFloat() float32 {
- if m != nil && m.OFloat != nil {
- return *m.OFloat
- }
- return 0
-}
-
-func (m *Simple) GetODouble() float64 {
- if m != nil && m.ODouble != nil {
- return *m.ODouble
- }
- return 0
-}
-
-func (m *Simple) GetOString() string {
- if m != nil && m.OString != nil {
- return *m.OString
- }
- return ""
-}
-
-func (m *Simple) GetOBytes() []byte {
- if m != nil {
- return m.OBytes
- }
- return nil
-}
-
-// Test message for holding special non-finites primitives.
-type NonFinites struct {
- FNan *float32 `protobuf:"fixed32,1,opt,name=f_nan,json=fNan" json:"f_nan,omitempty"`
- FPinf *float32 `protobuf:"fixed32,2,opt,name=f_pinf,json=fPinf" json:"f_pinf,omitempty"`
- FNinf *float32 `protobuf:"fixed32,3,opt,name=f_ninf,json=fNinf" json:"f_ninf,omitempty"`
- DNan *float64 `protobuf:"fixed64,4,opt,name=d_nan,json=dNan" json:"d_nan,omitempty"`
- DPinf *float64 `protobuf:"fixed64,5,opt,name=d_pinf,json=dPinf" json:"d_pinf,omitempty"`
- DNinf *float64 `protobuf:"fixed64,6,opt,name=d_ninf,json=dNinf" json:"d_ninf,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *NonFinites) Reset() { *m = NonFinites{} }
-func (m *NonFinites) String() string { return proto.CompactTextString(m) }
-func (*NonFinites) ProtoMessage() {}
-func (*NonFinites) Descriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{1}
-}
-func (m *NonFinites) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_NonFinites.Unmarshal(m, b)
-}
-func (m *NonFinites) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_NonFinites.Marshal(b, m, deterministic)
-}
-func (dst *NonFinites) XXX_Merge(src proto.Message) {
- xxx_messageInfo_NonFinites.Merge(dst, src)
-}
-func (m *NonFinites) XXX_Size() int {
- return xxx_messageInfo_NonFinites.Size(m)
-}
-func (m *NonFinites) XXX_DiscardUnknown() {
- xxx_messageInfo_NonFinites.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_NonFinites proto.InternalMessageInfo
-
-func (m *NonFinites) GetFNan() float32 {
- if m != nil && m.FNan != nil {
- return *m.FNan
- }
- return 0
-}
-
-func (m *NonFinites) GetFPinf() float32 {
- if m != nil && m.FPinf != nil {
- return *m.FPinf
- }
- return 0
-}
-
-func (m *NonFinites) GetFNinf() float32 {
- if m != nil && m.FNinf != nil {
- return *m.FNinf
- }
- return 0
-}
-
-func (m *NonFinites) GetDNan() float64 {
- if m != nil && m.DNan != nil {
- return *m.DNan
- }
- return 0
-}
-
-func (m *NonFinites) GetDPinf() float64 {
- if m != nil && m.DPinf != nil {
- return *m.DPinf
- }
- return 0
-}
-
-func (m *NonFinites) GetDNinf() float64 {
- if m != nil && m.DNinf != nil {
- return *m.DNinf
- }
- return 0
-}
-
-// Test message for holding repeated primitives.
-type Repeats struct {
- RBool []bool `protobuf:"varint,1,rep,name=r_bool,json=rBool" json:"r_bool,omitempty"`
- RInt32 []int32 `protobuf:"varint,2,rep,name=r_int32,json=rInt32" json:"r_int32,omitempty"`
- RInt64 []int64 `protobuf:"varint,3,rep,name=r_int64,json=rInt64" json:"r_int64,omitempty"`
- RUint32 []uint32 `protobuf:"varint,4,rep,name=r_uint32,json=rUint32" json:"r_uint32,omitempty"`
- RUint64 []uint64 `protobuf:"varint,5,rep,name=r_uint64,json=rUint64" json:"r_uint64,omitempty"`
- RSint32 []int32 `protobuf:"zigzag32,6,rep,name=r_sint32,json=rSint32" json:"r_sint32,omitempty"`
- RSint64 []int64 `protobuf:"zigzag64,7,rep,name=r_sint64,json=rSint64" json:"r_sint64,omitempty"`
- RFloat []float32 `protobuf:"fixed32,8,rep,name=r_float,json=rFloat" json:"r_float,omitempty"`
- RDouble []float64 `protobuf:"fixed64,9,rep,name=r_double,json=rDouble" json:"r_double,omitempty"`
- RString []string `protobuf:"bytes,10,rep,name=r_string,json=rString" json:"r_string,omitempty"`
- RBytes [][]byte `protobuf:"bytes,11,rep,name=r_bytes,json=rBytes" json:"r_bytes,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *Repeats) Reset() { *m = Repeats{} }
-func (m *Repeats) String() string { return proto.CompactTextString(m) }
-func (*Repeats) ProtoMessage() {}
-func (*Repeats) Descriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{2}
-}
-func (m *Repeats) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_Repeats.Unmarshal(m, b)
-}
-func (m *Repeats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_Repeats.Marshal(b, m, deterministic)
-}
-func (dst *Repeats) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Repeats.Merge(dst, src)
-}
-func (m *Repeats) XXX_Size() int {
- return xxx_messageInfo_Repeats.Size(m)
-}
-func (m *Repeats) XXX_DiscardUnknown() {
- xxx_messageInfo_Repeats.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Repeats proto.InternalMessageInfo
-
-func (m *Repeats) GetRBool() []bool {
- if m != nil {
- return m.RBool
- }
- return nil
-}
-
-func (m *Repeats) GetRInt32() []int32 {
- if m != nil {
- return m.RInt32
- }
- return nil
-}
-
-func (m *Repeats) GetRInt64() []int64 {
- if m != nil {
- return m.RInt64
- }
- return nil
-}
-
-func (m *Repeats) GetRUint32() []uint32 {
- if m != nil {
- return m.RUint32
- }
- return nil
-}
-
-func (m *Repeats) GetRUint64() []uint64 {
- if m != nil {
- return m.RUint64
- }
- return nil
-}
-
-func (m *Repeats) GetRSint32() []int32 {
- if m != nil {
- return m.RSint32
- }
- return nil
-}
-
-func (m *Repeats) GetRSint64() []int64 {
- if m != nil {
- return m.RSint64
- }
- return nil
-}
-
-func (m *Repeats) GetRFloat() []float32 {
- if m != nil {
- return m.RFloat
- }
- return nil
-}
-
-func (m *Repeats) GetRDouble() []float64 {
- if m != nil {
- return m.RDouble
- }
- return nil
-}
-
-func (m *Repeats) GetRString() []string {
- if m != nil {
- return m.RString
- }
- return nil
-}
-
-func (m *Repeats) GetRBytes() [][]byte {
- if m != nil {
- return m.RBytes
- }
- return nil
-}
-
-// Test message for holding enums and nested messages.
-type Widget struct {
- Color *Widget_Color `protobuf:"varint,1,opt,name=color,enum=jsonpb.Widget_Color" json:"color,omitempty"`
- RColor []Widget_Color `protobuf:"varint,2,rep,name=r_color,json=rColor,enum=jsonpb.Widget_Color" json:"r_color,omitempty"`
- Simple *Simple `protobuf:"bytes,10,opt,name=simple" json:"simple,omitempty"`
- RSimple []*Simple `protobuf:"bytes,11,rep,name=r_simple,json=rSimple" json:"r_simple,omitempty"`
- Repeats *Repeats `protobuf:"bytes,20,opt,name=repeats" json:"repeats,omitempty"`
- RRepeats []*Repeats `protobuf:"bytes,21,rep,name=r_repeats,json=rRepeats" json:"r_repeats,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *Widget) Reset() { *m = Widget{} }
-func (m *Widget) String() string { return proto.CompactTextString(m) }
-func (*Widget) ProtoMessage() {}
-func (*Widget) Descriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{3}
-}
-func (m *Widget) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_Widget.Unmarshal(m, b)
-}
-func (m *Widget) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_Widget.Marshal(b, m, deterministic)
-}
-func (dst *Widget) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Widget.Merge(dst, src)
-}
-func (m *Widget) XXX_Size() int {
- return xxx_messageInfo_Widget.Size(m)
-}
-func (m *Widget) XXX_DiscardUnknown() {
- xxx_messageInfo_Widget.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Widget proto.InternalMessageInfo
-
-func (m *Widget) GetColor() Widget_Color {
- if m != nil && m.Color != nil {
- return *m.Color
- }
- return Widget_RED
-}
-
-func (m *Widget) GetRColor() []Widget_Color {
- if m != nil {
- return m.RColor
- }
- return nil
-}
-
-func (m *Widget) GetSimple() *Simple {
- if m != nil {
- return m.Simple
- }
- return nil
-}
-
-func (m *Widget) GetRSimple() []*Simple {
- if m != nil {
- return m.RSimple
- }
- return nil
-}
-
-func (m *Widget) GetRepeats() *Repeats {
- if m != nil {
- return m.Repeats
- }
- return nil
-}
-
-func (m *Widget) GetRRepeats() []*Repeats {
- if m != nil {
- return m.RRepeats
- }
- return nil
-}
-
-type Maps struct {
- MInt64Str map[int64]string `protobuf:"bytes,1,rep,name=m_int64_str,json=mInt64Str" json:"m_int64_str,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
- MBoolSimple map[bool]*Simple `protobuf:"bytes,2,rep,name=m_bool_simple,json=mBoolSimple" json:"m_bool_simple,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *Maps) Reset() { *m = Maps{} }
-func (m *Maps) String() string { return proto.CompactTextString(m) }
-func (*Maps) ProtoMessage() {}
-func (*Maps) Descriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{4}
-}
-func (m *Maps) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_Maps.Unmarshal(m, b)
-}
-func (m *Maps) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_Maps.Marshal(b, m, deterministic)
-}
-func (dst *Maps) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Maps.Merge(dst, src)
-}
-func (m *Maps) XXX_Size() int {
- return xxx_messageInfo_Maps.Size(m)
-}
-func (m *Maps) XXX_DiscardUnknown() {
- xxx_messageInfo_Maps.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Maps proto.InternalMessageInfo
-
-func (m *Maps) GetMInt64Str() map[int64]string {
- if m != nil {
- return m.MInt64Str
- }
- return nil
-}
-
-func (m *Maps) GetMBoolSimple() map[bool]*Simple {
- if m != nil {
- return m.MBoolSimple
- }
- return nil
-}
-
-type MsgWithOneof struct {
- // Types that are valid to be assigned to Union:
- // *MsgWithOneof_Title
- // *MsgWithOneof_Salary
- // *MsgWithOneof_Country
- // *MsgWithOneof_HomeAddress
- // *MsgWithOneof_MsgWithRequired
- Union isMsgWithOneof_Union `protobuf_oneof:"union"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *MsgWithOneof) Reset() { *m = MsgWithOneof{} }
-func (m *MsgWithOneof) String() string { return proto.CompactTextString(m) }
-func (*MsgWithOneof) ProtoMessage() {}
-func (*MsgWithOneof) Descriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{5}
-}
-func (m *MsgWithOneof) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_MsgWithOneof.Unmarshal(m, b)
-}
-func (m *MsgWithOneof) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_MsgWithOneof.Marshal(b, m, deterministic)
-}
-func (dst *MsgWithOneof) XXX_Merge(src proto.Message) {
- xxx_messageInfo_MsgWithOneof.Merge(dst, src)
-}
-func (m *MsgWithOneof) XXX_Size() int {
- return xxx_messageInfo_MsgWithOneof.Size(m)
-}
-func (m *MsgWithOneof) XXX_DiscardUnknown() {
- xxx_messageInfo_MsgWithOneof.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MsgWithOneof proto.InternalMessageInfo
-
-type isMsgWithOneof_Union interface {
- isMsgWithOneof_Union()
-}
-
-type MsgWithOneof_Title struct {
- Title string `protobuf:"bytes,1,opt,name=title,oneof"`
-}
-type MsgWithOneof_Salary struct {
- Salary int64 `protobuf:"varint,2,opt,name=salary,oneof"`
-}
-type MsgWithOneof_Country struct {
- Country string `protobuf:"bytes,3,opt,name=Country,oneof"`
-}
-type MsgWithOneof_HomeAddress struct {
- HomeAddress string `protobuf:"bytes,4,opt,name=home_address,json=homeAddress,oneof"`
-}
-type MsgWithOneof_MsgWithRequired struct {
- MsgWithRequired *MsgWithRequired `protobuf:"bytes,5,opt,name=msg_with_required,json=msgWithRequired,oneof"`
-}
-
-func (*MsgWithOneof_Title) isMsgWithOneof_Union() {}
-func (*MsgWithOneof_Salary) isMsgWithOneof_Union() {}
-func (*MsgWithOneof_Country) isMsgWithOneof_Union() {}
-func (*MsgWithOneof_HomeAddress) isMsgWithOneof_Union() {}
-func (*MsgWithOneof_MsgWithRequired) isMsgWithOneof_Union() {}
-
-func (m *MsgWithOneof) GetUnion() isMsgWithOneof_Union {
- if m != nil {
- return m.Union
- }
- return nil
-}
-
-func (m *MsgWithOneof) GetTitle() string {
- if x, ok := m.GetUnion().(*MsgWithOneof_Title); ok {
- return x.Title
- }
- return ""
-}
-
-func (m *MsgWithOneof) GetSalary() int64 {
- if x, ok := m.GetUnion().(*MsgWithOneof_Salary); ok {
- return x.Salary
- }
- return 0
-}
-
-func (m *MsgWithOneof) GetCountry() string {
- if x, ok := m.GetUnion().(*MsgWithOneof_Country); ok {
- return x.Country
- }
- return ""
-}
-
-func (m *MsgWithOneof) GetHomeAddress() string {
- if x, ok := m.GetUnion().(*MsgWithOneof_HomeAddress); ok {
- return x.HomeAddress
- }
- return ""
-}
-
-func (m *MsgWithOneof) GetMsgWithRequired() *MsgWithRequired {
- if x, ok := m.GetUnion().(*MsgWithOneof_MsgWithRequired); ok {
- return x.MsgWithRequired
- }
- return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*MsgWithOneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
- return _MsgWithOneof_OneofMarshaler, _MsgWithOneof_OneofUnmarshaler, _MsgWithOneof_OneofSizer, []interface{}{
- (*MsgWithOneof_Title)(nil),
- (*MsgWithOneof_Salary)(nil),
- (*MsgWithOneof_Country)(nil),
- (*MsgWithOneof_HomeAddress)(nil),
- (*MsgWithOneof_MsgWithRequired)(nil),
- }
-}
-
-func _MsgWithOneof_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
- m := msg.(*MsgWithOneof)
- // union
- switch x := m.Union.(type) {
- case *MsgWithOneof_Title:
- b.EncodeVarint(1<<3 | proto.WireBytes)
- b.EncodeStringBytes(x.Title)
- case *MsgWithOneof_Salary:
- b.EncodeVarint(2<<3 | proto.WireVarint)
- b.EncodeVarint(uint64(x.Salary))
- case *MsgWithOneof_Country:
- b.EncodeVarint(3<<3 | proto.WireBytes)
- b.EncodeStringBytes(x.Country)
- case *MsgWithOneof_HomeAddress:
- b.EncodeVarint(4<<3 | proto.WireBytes)
- b.EncodeStringBytes(x.HomeAddress)
- case *MsgWithOneof_MsgWithRequired:
- b.EncodeVarint(5<<3 | proto.WireBytes)
- if err := b.EncodeMessage(x.MsgWithRequired); err != nil {
- return err
- }
- case nil:
- default:
- return fmt.Errorf("MsgWithOneof.Union has unexpected type %T", x)
- }
- return nil
-}
-
-func _MsgWithOneof_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
- m := msg.(*MsgWithOneof)
- switch tag {
- case 1: // union.title
- if wire != proto.WireBytes {
- return true, proto.ErrInternalBadWireType
- }
- x, err := b.DecodeStringBytes()
- m.Union = &MsgWithOneof_Title{x}
- return true, err
- case 2: // union.salary
- if wire != proto.WireVarint {
- return true, proto.ErrInternalBadWireType
- }
- x, err := b.DecodeVarint()
- m.Union = &MsgWithOneof_Salary{int64(x)}
- return true, err
- case 3: // union.Country
- if wire != proto.WireBytes {
- return true, proto.ErrInternalBadWireType
- }
- x, err := b.DecodeStringBytes()
- m.Union = &MsgWithOneof_Country{x}
- return true, err
- case 4: // union.home_address
- if wire != proto.WireBytes {
- return true, proto.ErrInternalBadWireType
- }
- x, err := b.DecodeStringBytes()
- m.Union = &MsgWithOneof_HomeAddress{x}
- return true, err
- case 5: // union.msg_with_required
- if wire != proto.WireBytes {
- return true, proto.ErrInternalBadWireType
- }
- msg := new(MsgWithRequired)
- err := b.DecodeMessage(msg)
- m.Union = &MsgWithOneof_MsgWithRequired{msg}
- return true, err
- default:
- return false, nil
- }
-}
-
-func _MsgWithOneof_OneofSizer(msg proto.Message) (n int) {
- m := msg.(*MsgWithOneof)
- // union
- switch x := m.Union.(type) {
- case *MsgWithOneof_Title:
- n += 1 // tag and wire
- n += proto.SizeVarint(uint64(len(x.Title)))
- n += len(x.Title)
- case *MsgWithOneof_Salary:
- n += 1 // tag and wire
- n += proto.SizeVarint(uint64(x.Salary))
- case *MsgWithOneof_Country:
- n += 1 // tag and wire
- n += proto.SizeVarint(uint64(len(x.Country)))
- n += len(x.Country)
- case *MsgWithOneof_HomeAddress:
- n += 1 // tag and wire
- n += proto.SizeVarint(uint64(len(x.HomeAddress)))
- n += len(x.HomeAddress)
- case *MsgWithOneof_MsgWithRequired:
- s := proto.Size(x.MsgWithRequired)
- n += 1 // tag and wire
- n += proto.SizeVarint(uint64(s))
- n += s
- case nil:
- default:
- panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
- }
- return n
-}
-
-type Real struct {
- Value *float64 `protobuf:"fixed64,1,opt,name=value" json:"value,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- proto.XXX_InternalExtensions `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *Real) Reset() { *m = Real{} }
-func (m *Real) String() string { return proto.CompactTextString(m) }
-func (*Real) ProtoMessage() {}
-func (*Real) Descriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{6}
-}
-
-var extRange_Real = []proto.ExtensionRange{
- {Start: 100, End: 536870911},
-}
-
-func (*Real) ExtensionRangeArray() []proto.ExtensionRange {
- return extRange_Real
-}
-func (m *Real) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_Real.Unmarshal(m, b)
-}
-func (m *Real) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_Real.Marshal(b, m, deterministic)
-}
-func (dst *Real) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Real.Merge(dst, src)
-}
-func (m *Real) XXX_Size() int {
- return xxx_messageInfo_Real.Size(m)
-}
-func (m *Real) XXX_DiscardUnknown() {
- xxx_messageInfo_Real.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Real proto.InternalMessageInfo
-
-func (m *Real) GetValue() float64 {
- if m != nil && m.Value != nil {
- return *m.Value
- }
- return 0
-}
-
-type Complex struct {
- Imaginary *float64 `protobuf:"fixed64,1,opt,name=imaginary" json:"imaginary,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- proto.XXX_InternalExtensions `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *Complex) Reset() { *m = Complex{} }
-func (m *Complex) String() string { return proto.CompactTextString(m) }
-func (*Complex) ProtoMessage() {}
-func (*Complex) Descriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{7}
-}
-
-var extRange_Complex = []proto.ExtensionRange{
- {Start: 100, End: 536870911},
-}
-
-func (*Complex) ExtensionRangeArray() []proto.ExtensionRange {
- return extRange_Complex
-}
-func (m *Complex) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_Complex.Unmarshal(m, b)
-}
-func (m *Complex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_Complex.Marshal(b, m, deterministic)
-}
-func (dst *Complex) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Complex.Merge(dst, src)
-}
-func (m *Complex) XXX_Size() int {
- return xxx_messageInfo_Complex.Size(m)
-}
-func (m *Complex) XXX_DiscardUnknown() {
- xxx_messageInfo_Complex.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Complex proto.InternalMessageInfo
-
-func (m *Complex) GetImaginary() float64 {
- if m != nil && m.Imaginary != nil {
- return *m.Imaginary
- }
- return 0
-}
-
-var E_Complex_RealExtension = &proto.ExtensionDesc{
- ExtendedType: (*Real)(nil),
- ExtensionType: (*Complex)(nil),
- Field: 123,
- Name: "jsonpb.Complex.real_extension",
- Tag: "bytes,123,opt,name=real_extension,json=realExtension",
- Filename: "test_objects.proto",
-}
-
-type KnownTypes struct {
- An *any.Any `protobuf:"bytes,14,opt,name=an" json:"an,omitempty"`
- Dur *duration.Duration `protobuf:"bytes,1,opt,name=dur" json:"dur,omitempty"`
- St *_struct.Struct `protobuf:"bytes,12,opt,name=st" json:"st,omitempty"`
- Ts *timestamp.Timestamp `protobuf:"bytes,2,opt,name=ts" json:"ts,omitempty"`
- Lv *_struct.ListValue `protobuf:"bytes,15,opt,name=lv" json:"lv,omitempty"`
- Val *_struct.Value `protobuf:"bytes,16,opt,name=val" json:"val,omitempty"`
- Dbl *wrappers.DoubleValue `protobuf:"bytes,3,opt,name=dbl" json:"dbl,omitempty"`
- Flt *wrappers.FloatValue `protobuf:"bytes,4,opt,name=flt" json:"flt,omitempty"`
- I64 *wrappers.Int64Value `protobuf:"bytes,5,opt,name=i64" json:"i64,omitempty"`
- U64 *wrappers.UInt64Value `protobuf:"bytes,6,opt,name=u64" json:"u64,omitempty"`
- I32 *wrappers.Int32Value `protobuf:"bytes,7,opt,name=i32" json:"i32,omitempty"`
- U32 *wrappers.UInt32Value `protobuf:"bytes,8,opt,name=u32" json:"u32,omitempty"`
- Bool *wrappers.BoolValue `protobuf:"bytes,9,opt,name=bool" json:"bool,omitempty"`
- Str *wrappers.StringValue `protobuf:"bytes,10,opt,name=str" json:"str,omitempty"`
- Bytes *wrappers.BytesValue `protobuf:"bytes,11,opt,name=bytes" json:"bytes,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *KnownTypes) Reset() { *m = KnownTypes{} }
-func (m *KnownTypes) String() string { return proto.CompactTextString(m) }
-func (*KnownTypes) ProtoMessage() {}
-func (*KnownTypes) Descriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{8}
-}
-func (m *KnownTypes) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_KnownTypes.Unmarshal(m, b)
-}
-func (m *KnownTypes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_KnownTypes.Marshal(b, m, deterministic)
-}
-func (dst *KnownTypes) XXX_Merge(src proto.Message) {
- xxx_messageInfo_KnownTypes.Merge(dst, src)
-}
-func (m *KnownTypes) XXX_Size() int {
- return xxx_messageInfo_KnownTypes.Size(m)
-}
-func (m *KnownTypes) XXX_DiscardUnknown() {
- xxx_messageInfo_KnownTypes.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_KnownTypes proto.InternalMessageInfo
-
-func (m *KnownTypes) GetAn() *any.Any {
- if m != nil {
- return m.An
- }
- return nil
-}
-
-func (m *KnownTypes) GetDur() *duration.Duration {
- if m != nil {
- return m.Dur
- }
- return nil
-}
-
-func (m *KnownTypes) GetSt() *_struct.Struct {
- if m != nil {
- return m.St
- }
- return nil
-}
-
-func (m *KnownTypes) GetTs() *timestamp.Timestamp {
- if m != nil {
- return m.Ts
- }
- return nil
-}
-
-func (m *KnownTypes) GetLv() *_struct.ListValue {
- if m != nil {
- return m.Lv
- }
- return nil
-}
-
-func (m *KnownTypes) GetVal() *_struct.Value {
- if m != nil {
- return m.Val
- }
- return nil
-}
-
-func (m *KnownTypes) GetDbl() *wrappers.DoubleValue {
- if m != nil {
- return m.Dbl
- }
- return nil
-}
-
-func (m *KnownTypes) GetFlt() *wrappers.FloatValue {
- if m != nil {
- return m.Flt
- }
- return nil
-}
-
-func (m *KnownTypes) GetI64() *wrappers.Int64Value {
- if m != nil {
- return m.I64
- }
- return nil
-}
-
-func (m *KnownTypes) GetU64() *wrappers.UInt64Value {
- if m != nil {
- return m.U64
- }
- return nil
-}
-
-func (m *KnownTypes) GetI32() *wrappers.Int32Value {
- if m != nil {
- return m.I32
- }
- return nil
-}
-
-func (m *KnownTypes) GetU32() *wrappers.UInt32Value {
- if m != nil {
- return m.U32
- }
- return nil
-}
-
-func (m *KnownTypes) GetBool() *wrappers.BoolValue {
- if m != nil {
- return m.Bool
- }
- return nil
-}
-
-func (m *KnownTypes) GetStr() *wrappers.StringValue {
- if m != nil {
- return m.Str
- }
- return nil
-}
-
-func (m *KnownTypes) GetBytes() *wrappers.BytesValue {
- if m != nil {
- return m.Bytes
- }
- return nil
-}
-
-// Test messages for marshaling/unmarshaling required fields.
-type MsgWithRequired struct {
- Str *string `protobuf:"bytes,1,req,name=str" json:"str,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *MsgWithRequired) Reset() { *m = MsgWithRequired{} }
-func (m *MsgWithRequired) String() string { return proto.CompactTextString(m) }
-func (*MsgWithRequired) ProtoMessage() {}
-func (*MsgWithRequired) Descriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{9}
-}
-func (m *MsgWithRequired) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_MsgWithRequired.Unmarshal(m, b)
-}
-func (m *MsgWithRequired) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_MsgWithRequired.Marshal(b, m, deterministic)
-}
-func (dst *MsgWithRequired) XXX_Merge(src proto.Message) {
- xxx_messageInfo_MsgWithRequired.Merge(dst, src)
-}
-func (m *MsgWithRequired) XXX_Size() int {
- return xxx_messageInfo_MsgWithRequired.Size(m)
-}
-func (m *MsgWithRequired) XXX_DiscardUnknown() {
- xxx_messageInfo_MsgWithRequired.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MsgWithRequired proto.InternalMessageInfo
-
-func (m *MsgWithRequired) GetStr() string {
- if m != nil && m.Str != nil {
- return *m.Str
- }
- return ""
-}
-
-type MsgWithIndirectRequired struct {
- Subm *MsgWithRequired `protobuf:"bytes,1,opt,name=subm" json:"subm,omitempty"`
- MapField map[string]*MsgWithRequired `protobuf:"bytes,2,rep,name=map_field,json=mapField" json:"map_field,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
- SliceField []*MsgWithRequired `protobuf:"bytes,3,rep,name=slice_field,json=sliceField" json:"slice_field,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *MsgWithIndirectRequired) Reset() { *m = MsgWithIndirectRequired{} }
-func (m *MsgWithIndirectRequired) String() string { return proto.CompactTextString(m) }
-func (*MsgWithIndirectRequired) ProtoMessage() {}
-func (*MsgWithIndirectRequired) Descriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{10}
-}
-func (m *MsgWithIndirectRequired) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_MsgWithIndirectRequired.Unmarshal(m, b)
-}
-func (m *MsgWithIndirectRequired) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_MsgWithIndirectRequired.Marshal(b, m, deterministic)
-}
-func (dst *MsgWithIndirectRequired) XXX_Merge(src proto.Message) {
- xxx_messageInfo_MsgWithIndirectRequired.Merge(dst, src)
-}
-func (m *MsgWithIndirectRequired) XXX_Size() int {
- return xxx_messageInfo_MsgWithIndirectRequired.Size(m)
-}
-func (m *MsgWithIndirectRequired) XXX_DiscardUnknown() {
- xxx_messageInfo_MsgWithIndirectRequired.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MsgWithIndirectRequired proto.InternalMessageInfo
-
-func (m *MsgWithIndirectRequired) GetSubm() *MsgWithRequired {
- if m != nil {
- return m.Subm
- }
- return nil
-}
-
-func (m *MsgWithIndirectRequired) GetMapField() map[string]*MsgWithRequired {
- if m != nil {
- return m.MapField
- }
- return nil
-}
-
-func (m *MsgWithIndirectRequired) GetSliceField() []*MsgWithRequired {
- if m != nil {
- return m.SliceField
- }
- return nil
-}
-
-type MsgWithRequiredBytes struct {
- Byts []byte `protobuf:"bytes,1,req,name=byts" json:"byts,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *MsgWithRequiredBytes) Reset() { *m = MsgWithRequiredBytes{} }
-func (m *MsgWithRequiredBytes) String() string { return proto.CompactTextString(m) }
-func (*MsgWithRequiredBytes) ProtoMessage() {}
-func (*MsgWithRequiredBytes) Descriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{11}
-}
-func (m *MsgWithRequiredBytes) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_MsgWithRequiredBytes.Unmarshal(m, b)
-}
-func (m *MsgWithRequiredBytes) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_MsgWithRequiredBytes.Marshal(b, m, deterministic)
-}
-func (dst *MsgWithRequiredBytes) XXX_Merge(src proto.Message) {
- xxx_messageInfo_MsgWithRequiredBytes.Merge(dst, src)
-}
-func (m *MsgWithRequiredBytes) XXX_Size() int {
- return xxx_messageInfo_MsgWithRequiredBytes.Size(m)
-}
-func (m *MsgWithRequiredBytes) XXX_DiscardUnknown() {
- xxx_messageInfo_MsgWithRequiredBytes.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MsgWithRequiredBytes proto.InternalMessageInfo
-
-func (m *MsgWithRequiredBytes) GetByts() []byte {
- if m != nil {
- return m.Byts
- }
- return nil
-}
-
-type MsgWithRequiredWKT struct {
- Str *wrappers.StringValue `protobuf:"bytes,1,req,name=str" json:"str,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *MsgWithRequiredWKT) Reset() { *m = MsgWithRequiredWKT{} }
-func (m *MsgWithRequiredWKT) String() string { return proto.CompactTextString(m) }
-func (*MsgWithRequiredWKT) ProtoMessage() {}
-func (*MsgWithRequiredWKT) Descriptor() ([]byte, []int) {
- return fileDescriptor_test_objects_c6f6c615ab823e65, []int{12}
-}
-func (m *MsgWithRequiredWKT) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_MsgWithRequiredWKT.Unmarshal(m, b)
-}
-func (m *MsgWithRequiredWKT) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_MsgWithRequiredWKT.Marshal(b, m, deterministic)
-}
-func (dst *MsgWithRequiredWKT) XXX_Merge(src proto.Message) {
- xxx_messageInfo_MsgWithRequiredWKT.Merge(dst, src)
-}
-func (m *MsgWithRequiredWKT) XXX_Size() int {
- return xxx_messageInfo_MsgWithRequiredWKT.Size(m)
-}
-func (m *MsgWithRequiredWKT) XXX_DiscardUnknown() {
- xxx_messageInfo_MsgWithRequiredWKT.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MsgWithRequiredWKT proto.InternalMessageInfo
-
-func (m *MsgWithRequiredWKT) GetStr() *wrappers.StringValue {
- if m != nil {
- return m.Str
- }
- return nil
-}
-
-var E_Name = &proto.ExtensionDesc{
- ExtendedType: (*Real)(nil),
- ExtensionType: (*string)(nil),
- Field: 124,
- Name: "jsonpb.name",
- Tag: "bytes,124,opt,name=name",
- Filename: "test_objects.proto",
-}
-
-var E_Extm = &proto.ExtensionDesc{
- ExtendedType: (*Real)(nil),
- ExtensionType: (*MsgWithRequired)(nil),
- Field: 125,
- Name: "jsonpb.extm",
- Tag: "bytes,125,opt,name=extm",
- Filename: "test_objects.proto",
-}
-
-func init() {
- proto.RegisterType((*Simple)(nil), "jsonpb.Simple")
- proto.RegisterType((*NonFinites)(nil), "jsonpb.NonFinites")
- proto.RegisterType((*Repeats)(nil), "jsonpb.Repeats")
- proto.RegisterType((*Widget)(nil), "jsonpb.Widget")
- proto.RegisterType((*Maps)(nil), "jsonpb.Maps")
- proto.RegisterMapType((map[bool]*Simple)(nil), "jsonpb.Maps.MBoolSimpleEntry")
- proto.RegisterMapType((map[int64]string)(nil), "jsonpb.Maps.MInt64StrEntry")
- proto.RegisterType((*MsgWithOneof)(nil), "jsonpb.MsgWithOneof")
- proto.RegisterType((*Real)(nil), "jsonpb.Real")
- proto.RegisterType((*Complex)(nil), "jsonpb.Complex")
- proto.RegisterType((*KnownTypes)(nil), "jsonpb.KnownTypes")
- proto.RegisterType((*MsgWithRequired)(nil), "jsonpb.MsgWithRequired")
- proto.RegisterType((*MsgWithIndirectRequired)(nil), "jsonpb.MsgWithIndirectRequired")
- proto.RegisterMapType((map[string]*MsgWithRequired)(nil), "jsonpb.MsgWithIndirectRequired.MapFieldEntry")
- proto.RegisterType((*MsgWithRequiredBytes)(nil), "jsonpb.MsgWithRequiredBytes")
- proto.RegisterType((*MsgWithRequiredWKT)(nil), "jsonpb.MsgWithRequiredWKT")
- proto.RegisterEnum("jsonpb.Widget_Color", Widget_Color_name, Widget_Color_value)
- proto.RegisterExtension(E_Complex_RealExtension)
- proto.RegisterExtension(E_Name)
- proto.RegisterExtension(E_Extm)
-}
-
-func init() { proto.RegisterFile("test_objects.proto", fileDescriptor_test_objects_c6f6c615ab823e65) }
-
-var fileDescriptor_test_objects_c6f6c615ab823e65 = []byte{
- // 1357 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xdd, 0x72, 0x13, 0xc7,
- 0x12, 0xf6, 0xee, 0x6a, 0xf5, 0xd3, 0xf2, 0x1f, 0x83, 0x81, 0xc5, 0x87, 0x73, 0x8e, 0x4a, 0x70,
- 0x38, 0x0a, 0xc4, 0xa2, 0x22, 0xbb, 0x5c, 0x84, 0xe4, 0x06, 0x63, 0x13, 0x08, 0xe0, 0xa4, 0xc6,
- 0x26, 0x5c, 0xaa, 0x56, 0xde, 0x91, 0x59, 0xb2, 0xbb, 0xa3, 0xcc, 0xcc, 0xda, 0xa8, 0x92, 0x54,
- 0xf9, 0x19, 0x52, 0x79, 0x82, 0x54, 0x25, 0x8f, 0x90, 0x8b, 0xbc, 0x45, 0xde, 0x28, 0x35, 0x3d,
- 0xb3, 0x5a, 0x59, 0x42, 0x95, 0x5c, 0x79, 0xbb, 0xfb, 0xeb, 0x4f, 0x33, 0xfd, 0xf5, 0x74, 0x1b,
- 0x88, 0x62, 0x52, 0xf5, 0xf9, 0xe0, 0x1d, 0x3b, 0x51, 0xb2, 0x3b, 0x12, 0x5c, 0x71, 0x52, 0x7d,
- 0x27, 0x79, 0x36, 0x1a, 0x6c, 0xde, 0x3c, 0xe5, 0xfc, 0x34, 0x61, 0x0f, 0xd0, 0x3b, 0xc8, 0x87,
- 0x0f, 0xc2, 0x6c, 0x6c, 0x20, 0x9b, 0xff, 0x99, 0x0d, 0x45, 0xb9, 0x08, 0x55, 0xcc, 0x33, 0x1b,
- 0xbf, 0x35, 0x1b, 0x97, 0x4a, 0xe4, 0x27, 0xca, 0x46, 0xff, 0x3b, 0x1b, 0x55, 0x71, 0xca, 0xa4,
- 0x0a, 0xd3, 0xd1, 0x22, 0xfa, 0x73, 0x11, 0x8e, 0x46, 0x4c, 0xd8, 0x13, 0xb6, 0x7f, 0x75, 0xa1,
- 0x7a, 0x14, 0xa7, 0xa3, 0x84, 0x91, 0x6b, 0x50, 0xe5, 0xfd, 0x01, 0xe7, 0x49, 0xe0, 0xb4, 0x9c,
- 0x4e, 0x9d, 0xfa, 0x7c, 0x8f, 0xf3, 0x84, 0xdc, 0x80, 0x1a, 0xef, 0xc7, 0x99, 0xda, 0xee, 0x05,
- 0x6e, 0xcb, 0xe9, 0xf8, 0xb4, 0xca, 0x9f, 0x6b, 0x6b, 0x12, 0xd8, 0xdd, 0x09, 0xbc, 0x96, 0xd3,
- 0xf1, 0x4c, 0x60, 0x77, 0x87, 0xdc, 0x84, 0x3a, 0xef, 0xe7, 0x26, 0xa5, 0xd2, 0x72, 0x3a, 0x2b,
- 0xb4, 0xc6, 0x5f, 0xa3, 0x59, 0x86, 0x76, 0x77, 0x02, 0xbf, 0xe5, 0x74, 0x2a, 0x36, 0x54, 0x64,
- 0x49, 0x93, 0x55, 0x6d, 0x39, 0x9d, 0x2b, 0xb4, 0xc6, 0x8f, 0xa6, 0xb2, 0xa4, 0xc9, 0xaa, 0xb5,
- 0x9c, 0x0e, 0xb1, 0xa1, 0xdd, 0x1d, 0x73, 0x88, 0x61, 0xc2, 0x43, 0x15, 0xd4, 0x5b, 0x4e, 0xc7,
- 0xa5, 0x55, 0xfe, 0x54, 0x5b, 0x26, 0x27, 0xe2, 0xf9, 0x20, 0x61, 0x41, 0xa3, 0xe5, 0x74, 0x1c,
- 0x5a, 0xe3, 0xfb, 0x68, 0x5a, 0x3a, 0x25, 0xe2, 0xec, 0x34, 0x80, 0x96, 0xd3, 0x69, 0x68, 0x3a,
- 0x34, 0x0d, 0xdd, 0x60, 0xac, 0x98, 0x0c, 0x9a, 0x2d, 0xa7, 0xb3, 0x4c, 0xab, 0x7c, 0x4f, 0x5b,
- 0xed, 0x9f, 0x1c, 0x80, 0x43, 0x9e, 0x3d, 0x8d, 0xb3, 0x58, 0x31, 0x49, 0xae, 0x82, 0x3f, 0xec,
- 0x67, 0x61, 0x86, 0xa5, 0x72, 0x69, 0x65, 0x78, 0x18, 0x66, 0xba, 0x80, 0xc3, 0xfe, 0x28, 0xce,
- 0x86, 0x58, 0x28, 0x97, 0xfa, 0xc3, 0xaf, 0xe3, 0x6c, 0x68, 0xdc, 0x99, 0x76, 0x7b, 0xd6, 0x7d,
- 0xa8, 0xdd, 0x57, 0xc1, 0x8f, 0x90, 0xa2, 0x82, 0xa7, 0xab, 0x44, 0x96, 0x22, 0x32, 0x14, 0x3e,
- 0x7a, 0xfd, 0xa8, 0xa0, 0x88, 0x0c, 0x45, 0xd5, 0xba, 0x35, 0x45, 0xfb, 0x37, 0x17, 0x6a, 0x94,
- 0x8d, 0x58, 0xa8, 0xa4, 0x86, 0x88, 0x42, 0x3d, 0x4f, 0xab, 0x27, 0x0a, 0xf5, 0xc4, 0x44, 0x3d,
- 0x4f, 0xab, 0x27, 0x26, 0xea, 0x89, 0x89, 0x7a, 0x9e, 0x56, 0x4f, 0x4c, 0xd4, 0x13, 0xa5, 0x7a,
- 0x9e, 0x56, 0x4f, 0x94, 0xea, 0x89, 0x52, 0x3d, 0x4f, 0xab, 0x27, 0x4a, 0xf5, 0x44, 0xa9, 0x9e,
- 0xa7, 0xd5, 0x13, 0x47, 0x53, 0x59, 0x13, 0xf5, 0x3c, 0xad, 0x9e, 0x28, 0xd5, 0x13, 0x13, 0xf5,
- 0x3c, 0xad, 0x9e, 0x98, 0xa8, 0x27, 0x4a, 0xf5, 0x3c, 0xad, 0x9e, 0x28, 0xd5, 0x13, 0xa5, 0x7a,
- 0x9e, 0x56, 0x4f, 0x94, 0xea, 0x89, 0x89, 0x7a, 0x9e, 0x56, 0x4f, 0x18, 0xf5, 0x7e, 0x77, 0xa1,
- 0xfa, 0x26, 0x8e, 0x4e, 0x99, 0x22, 0xf7, 0xc0, 0x3f, 0xe1, 0x09, 0x17, 0xa8, 0xdc, 0x6a, 0x6f,
- 0xa3, 0x6b, 0x9e, 0x68, 0xd7, 0x84, 0xbb, 0x4f, 0x74, 0x8c, 0x1a, 0x08, 0xd9, 0xd2, 0x7c, 0x06,
- 0xad, 0x8b, 0xb7, 0x08, 0x5d, 0x15, 0xf8, 0x97, 0xdc, 0x85, 0xaa, 0xc4, 0xa7, 0x84, 0x5d, 0xd5,
- 0xec, 0xad, 0x16, 0x68, 0xf3, 0xc0, 0xa8, 0x8d, 0x92, 0x8f, 0x4c, 0x41, 0x10, 0xa9, 0xcf, 0x39,
- 0x8f, 0xd4, 0x05, 0xb2, 0xd0, 0x9a, 0x30, 0x02, 0x07, 0x1b, 0xc8, 0xb9, 0x56, 0x20, 0xad, 0xee,
- 0xb4, 0x88, 0x93, 0x8f, 0xa1, 0x21, 0xfa, 0x05, 0xf8, 0x1a, 0xd2, 0xce, 0x81, 0xeb, 0xc2, 0x7e,
- 0xb5, 0xff, 0x07, 0xbe, 0x39, 0x74, 0x0d, 0x3c, 0x7a, 0xb0, 0xbf, 0xbe, 0x44, 0x1a, 0xe0, 0x7f,
- 0x41, 0x0f, 0x0e, 0x0e, 0xd7, 0x1d, 0x52, 0x87, 0xca, 0xde, 0xcb, 0xd7, 0x07, 0xeb, 0x6e, 0xfb,
- 0x67, 0x17, 0x2a, 0xaf, 0xc2, 0x91, 0x24, 0x9f, 0x41, 0x33, 0x35, 0xed, 0xa2, 0x6b, 0x8f, 0x3d,
- 0xd6, 0xec, 0xfd, 0xab, 0xe0, 0xd7, 0x90, 0xee, 0x2b, 0xec, 0x9f, 0x23, 0x25, 0x0e, 0x32, 0x25,
- 0xc6, 0xb4, 0x91, 0x16, 0x36, 0x79, 0x0c, 0x2b, 0x29, 0xf6, 0x66, 0x71, 0x6b, 0x17, 0xd3, 0xff,
- 0x7d, 0x39, 0x5d, 0xf7, 0xab, 0xb9, 0xb6, 0x21, 0x68, 0xa6, 0xa5, 0x67, 0xf3, 0x73, 0x58, 0xbd,
- 0xcc, 0x4f, 0xd6, 0xc1, 0xfb, 0x96, 0x8d, 0x51, 0x46, 0x8f, 0xea, 0x4f, 0xb2, 0x01, 0xfe, 0x59,
- 0x98, 0xe4, 0x0c, 0x9f, 0x5f, 0x83, 0x1a, 0xe3, 0x91, 0xfb, 0xd0, 0xd9, 0x3c, 0x84, 0xf5, 0x59,
- 0xfa, 0xe9, 0xfc, 0xba, 0xc9, 0xbf, 0x33, 0x9d, 0x3f, 0x2f, 0x4a, 0xc9, 0xd7, 0xfe, 0xd3, 0x81,
- 0xe5, 0x57, 0xf2, 0xf4, 0x4d, 0xac, 0xde, 0x7e, 0x95, 0x31, 0x3e, 0x24, 0xd7, 0xc1, 0x57, 0xb1,
- 0x4a, 0x18, 0xd2, 0x35, 0x9e, 0x2d, 0x51, 0x63, 0x92, 0x00, 0xaa, 0x32, 0x4c, 0x42, 0x31, 0x46,
- 0x4e, 0xef, 0xd9, 0x12, 0xb5, 0x36, 0xd9, 0x84, 0xda, 0x13, 0x9e, 0xeb, 0x93, 0xe0, 0x58, 0xd0,
- 0x39, 0x85, 0x83, 0xdc, 0x86, 0xe5, 0xb7, 0x3c, 0x65, 0xfd, 0x30, 0x8a, 0x04, 0x93, 0x12, 0x27,
- 0x84, 0x06, 0x34, 0xb5, 0xf7, 0xb1, 0x71, 0x92, 0x03, 0xb8, 0x92, 0xca, 0xd3, 0xfe, 0x79, 0xac,
- 0xde, 0xf6, 0x05, 0xfb, 0x2e, 0x8f, 0x05, 0x8b, 0x70, 0x6a, 0x34, 0x7b, 0x37, 0x26, 0x85, 0x35,
- 0x67, 0xa4, 0x36, 0xfc, 0x6c, 0x89, 0xae, 0xa5, 0x97, 0x5d, 0x7b, 0x35, 0xf0, 0xf3, 0x2c, 0xe6,
- 0x59, 0xfb, 0x2e, 0x54, 0x28, 0x0b, 0x93, 0xb2, 0x8a, 0x8e, 0x19, 0x35, 0x68, 0xdc, 0xab, 0xd7,
- 0xa3, 0xf5, 0x8b, 0x8b, 0x8b, 0x0b, 0xb7, 0x7d, 0xae, 0x0f, 0xae, 0x0b, 0xf2, 0x9e, 0xdc, 0x82,
- 0x46, 0x9c, 0x86, 0xa7, 0x71, 0xa6, 0x2f, 0x68, 0xe0, 0xa5, 0xa3, 0x4c, 0xe9, 0xed, 0xc3, 0xaa,
- 0x60, 0x61, 0xd2, 0x67, 0xef, 0x15, 0xcb, 0x64, 0xcc, 0x33, 0xb2, 0x5c, 0x76, 0x66, 0x98, 0x04,
- 0xdf, 0x5f, 0x6e, 0x6d, 0x4b, 0x4f, 0x57, 0x74, 0xd2, 0x41, 0x91, 0xd3, 0xfe, 0xc3, 0x07, 0x78,
- 0x91, 0xf1, 0xf3, 0xec, 0x78, 0x3c, 0x62, 0x92, 0xdc, 0x01, 0x37, 0xcc, 0x82, 0x55, 0x4c, 0xdd,
- 0xe8, 0x9a, 0x35, 0xd7, 0x2d, 0xd6, 0x5c, 0xf7, 0x71, 0x36, 0xa6, 0x6e, 0x98, 0x91, 0xfb, 0xe0,
- 0x45, 0xb9, 0x79, 0xec, 0xcd, 0xde, 0xcd, 0x39, 0xd8, 0xbe, 0x5d, 0xb6, 0x54, 0xa3, 0xc8, 0xff,
- 0xc1, 0x95, 0x2a, 0x58, 0xb6, 0x35, 0x9c, 0xc5, 0x1e, 0xe1, 0xe2, 0xa5, 0xae, 0xd4, 0x43, 0xc4,
- 0x55, 0xd2, 0xb6, 0xc9, 0xe6, 0x1c, 0xf0, 0xb8, 0xd8, 0xc1, 0xd4, 0x55, 0x52, 0x63, 0x93, 0xb3,
- 0x60, 0x6d, 0x01, 0xf6, 0x65, 0x2c, 0xd5, 0x37, 0xba, 0xc2, 0xd4, 0x4d, 0xce, 0x48, 0x07, 0xbc,
- 0xb3, 0x30, 0x09, 0xd6, 0x11, 0x7c, 0x7d, 0x0e, 0x6c, 0x80, 0x1a, 0x42, 0xba, 0xe0, 0x45, 0x83,
- 0x04, 0x5b, 0xa7, 0xd9, 0xbb, 0x35, 0x7f, 0x2f, 0x9c, 0x95, 0x16, 0x1f, 0x0d, 0x12, 0xb2, 0x05,
- 0xde, 0x30, 0x51, 0xd8, 0x49, 0xfa, 0xdd, 0xce, 0xe2, 0x71, 0xea, 0x5a, 0xf8, 0x30, 0x51, 0x1a,
- 0x1e, 0xdb, 0x15, 0xfd, 0x21, 0x38, 0xbe, 0x44, 0x0b, 0x8f, 0x77, 0x77, 0xf4, 0x69, 0xf2, 0xdd,
- 0x1d, 0x5c, 0x4e, 0x1f, 0x3a, 0xcd, 0xeb, 0x69, 0x7c, 0xbe, 0xbb, 0x83, 0xf4, 0xdb, 0x3d, 0xdc,
- 0xe5, 0x0b, 0xe8, 0xb7, 0x7b, 0x05, 0xfd, 0x76, 0x0f, 0xe9, 0xb7, 0x7b, 0xb8, 0xe0, 0x17, 0xd1,
- 0x4f, 0xf0, 0x39, 0xe2, 0x2b, 0xb8, 0x09, 0x1b, 0x0b, 0x8a, 0xae, 0x47, 0x81, 0x81, 0x23, 0x4e,
- 0xf3, 0xeb, 0xa1, 0x06, 0x0b, 0xf8, 0xcd, 0x76, 0xb1, 0xfc, 0x52, 0x09, 0xf2, 0x09, 0xf8, 0xe5,
- 0xff, 0x08, 0x1f, 0xba, 0x00, 0x6e, 0x1d, 0x93, 0x60, 0x90, 0xed, 0xdb, 0xb0, 0x36, 0xf3, 0x18,
- 0xf5, 0x00, 0x32, 0xa3, 0xd4, 0xed, 0x34, 0x90, 0xb7, 0xfd, 0x8b, 0x0b, 0x37, 0x2c, 0xea, 0x79,
- 0x16, 0xc5, 0x82, 0x9d, 0xa8, 0x09, 0xfa, 0x3e, 0x54, 0x64, 0x3e, 0x48, 0x6d, 0x27, 0x2f, 0x7a,
- 0xe1, 0x14, 0x41, 0xe4, 0x4b, 0x68, 0xa4, 0xe1, 0xa8, 0x3f, 0x8c, 0x59, 0x12, 0xd9, 0x61, 0xbb,
- 0x35, 0x93, 0x31, 0xfb, 0x03, 0x7a, 0x08, 0x3f, 0xd5, 0x78, 0x33, 0x7c, 0xeb, 0xa9, 0x35, 0xc9,
- 0x43, 0x68, 0xca, 0x24, 0x3e, 0x61, 0x96, 0xcd, 0x43, 0xb6, 0x85, 0xbf, 0x0f, 0x88, 0xc5, 0xcc,
- 0xcd, 0x63, 0x58, 0xb9, 0x44, 0x3a, 0x3d, 0x72, 0x1b, 0x66, 0xe4, 0x6e, 0x5d, 0x1e, 0xb9, 0x0b,
- 0x69, 0xa7, 0x66, 0xef, 0x3d, 0xd8, 0x98, 0x89, 0x62, 0xb5, 0x09, 0x81, 0xca, 0x60, 0xac, 0x24,
- 0xd6, 0x73, 0x99, 0xe2, 0x77, 0x7b, 0x1f, 0xc8, 0x0c, 0xf6, 0xcd, 0x8b, 0xe3, 0x42, 0x6e, 0x0d,
- 0xfc, 0x27, 0x72, 0x3f, 0x6a, 0x41, 0x25, 0x0b, 0x53, 0x36, 0x33, 0xb4, 0x7e, 0xc0, 0x5b, 0x60,
- 0xe4, 0xd1, 0xa7, 0x50, 0x61, 0xef, 0x55, 0x3a, 0x83, 0xf8, 0xf1, 0x6f, 0xa4, 0xd2, 0x29, 0x7f,
- 0x05, 0x00, 0x00, 0xff, 0xff, 0xea, 0x06, 0x1a, 0xa9, 0x37, 0x0c, 0x00, 0x00,
-}
diff --git a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto b/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto
deleted file mode 100644
index 36eb6e8..0000000
--- a/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto
+++ /dev/null
@@ -1,171 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2015 The Go Authors. All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-import "google/protobuf/any.proto";
-import "google/protobuf/duration.proto";
-import "google/protobuf/struct.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/wrappers.proto";
-
-package jsonpb;
-
-// Test message for holding primitive types.
-message Simple {
- optional bool o_bool = 1;
- optional int32 o_int32 = 2;
- optional int64 o_int64 = 3;
- optional uint32 o_uint32 = 4;
- optional uint64 o_uint64 = 5;
- optional sint32 o_sint32 = 6;
- optional sint64 o_sint64 = 7;
- optional float o_float = 8;
- optional double o_double = 9;
- optional string o_string = 10;
- optional bytes o_bytes = 11;
-}
-
-// Test message for holding special non-finites primitives.
-message NonFinites {
- optional float f_nan = 1;
- optional float f_pinf = 2;
- optional float f_ninf = 3;
- optional double d_nan = 4;
- optional double d_pinf = 5;
- optional double d_ninf = 6;
-}
-
-// Test message for holding repeated primitives.
-message Repeats {
- repeated bool r_bool = 1;
- repeated int32 r_int32 = 2;
- repeated int64 r_int64 = 3;
- repeated uint32 r_uint32 = 4;
- repeated uint64 r_uint64 = 5;
- repeated sint32 r_sint32 = 6;
- repeated sint64 r_sint64 = 7;
- repeated float r_float = 8;
- repeated double r_double = 9;
- repeated string r_string = 10;
- repeated bytes r_bytes = 11;
-}
-
-// Test message for holding enums and nested messages.
-message Widget {
- enum Color {
- RED = 0;
- GREEN = 1;
- BLUE = 2;
- };
- optional Color color = 1;
- repeated Color r_color = 2;
-
- optional Simple simple = 10;
- repeated Simple r_simple = 11;
-
- optional Repeats repeats = 20;
- repeated Repeats r_repeats = 21;
-}
-
-message Maps {
- map<int64, string> m_int64_str = 1;
- map<bool, Simple> m_bool_simple = 2;
-}
-
-message MsgWithOneof {
- oneof union {
- string title = 1;
- int64 salary = 2;
- string Country = 3;
- string home_address = 4;
- MsgWithRequired msg_with_required = 5;
- }
-}
-
-message Real {
- optional double value = 1;
- extensions 100 to max;
-}
-
-extend Real {
- optional string name = 124;
-}
-
-message Complex {
- extend Real {
- optional Complex real_extension = 123;
- }
- optional double imaginary = 1;
- extensions 100 to max;
-}
-
-message KnownTypes {
- optional google.protobuf.Any an = 14;
- optional google.protobuf.Duration dur = 1;
- optional google.protobuf.Struct st = 12;
- optional google.protobuf.Timestamp ts = 2;
- optional google.protobuf.ListValue lv = 15;
- optional google.protobuf.Value val = 16;
-
- optional google.protobuf.DoubleValue dbl = 3;
- optional google.protobuf.FloatValue flt = 4;
- optional google.protobuf.Int64Value i64 = 5;
- optional google.protobuf.UInt64Value u64 = 6;
- optional google.protobuf.Int32Value i32 = 7;
- optional google.protobuf.UInt32Value u32 = 8;
- optional google.protobuf.BoolValue bool = 9;
- optional google.protobuf.StringValue str = 10;
- optional google.protobuf.BytesValue bytes = 11;
-}
-
-// Test messages for marshaling/unmarshaling required fields.
-message MsgWithRequired {
- required string str = 1;
-}
-
-message MsgWithIndirectRequired {
- optional MsgWithRequired subm = 1;
- map<string, MsgWithRequired> map_field = 2;
- repeated MsgWithRequired slice_field = 3;
-}
-
-message MsgWithRequiredBytes {
- required bytes byts = 1;
-}
-
-message MsgWithRequiredWKT {
- required google.protobuf.StringValue str = 1;
-}
-
-extend Real {
- optional MsgWithRequired extm = 125;
-}