Generate XXX_WellKnownType method for recognised well-known types.
Just Duration and Timestamp for now.
Make jsonpb recognise them and format/parse according to the spec.
diff --git a/jsonpb/jsonpb.go b/jsonpb/jsonpb.go
index a453527..f4523f5 100644
--- a/jsonpb/jsonpb.go
+++ b/jsonpb/jsonpb.go
@@ -47,6 +47,7 @@
"sort"
"strconv"
"strings"
+ "time"
"github.com/golang/protobuf/proto"
)
@@ -98,12 +99,47 @@
// marshalObject writes a struct to the Writer.
func (m *Marshaler) marshalObject(out *errWriter, v proto.Message, indent string) error {
+ s := reflect.ValueOf(v).Elem()
+
+ // Handle well-known types.
+ type wkt interface {
+ XXX_WellKnownType() string
+ }
+ if wkt, ok := v.(wkt); ok {
+ switch wkt.XXX_WellKnownType() {
+ case "Duration":
+ // "Generated output always contains 3, 6, or 9 fractional digits,
+ // depending on required precision."
+ s, ns := s.Field(0).Int(), s.Field(1).Int()
+ d := time.Duration(s)*time.Second + time.Duration(ns)*time.Nanosecond
+ x := fmt.Sprintf("%.9f", d.Seconds())
+ x = strings.TrimSuffix(x, "000")
+ x = strings.TrimSuffix(x, "000")
+ out.write(`"`)
+ out.write(x)
+ out.write(`s"`)
+ return out.err
+ case "Timestamp":
+ // "RFC 3339, where generated output will always be Z-normalized
+ // and uses 3, 6 or 9 fractional digits."
+ s, ns := s.Field(0).Int(), s.Field(1).Int()
+ 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")
+ out.write(`"`)
+ out.write(x)
+ out.write(`Z"`)
+ return out.err
+ }
+ }
+
out.write("{")
if m.Indent != "" {
out.write("\n")
}
- s := reflect.ValueOf(v).Elem()
firstField := true
for i := 0; i < s.NumField(); i++ {
value := s.Field(i)
@@ -385,6 +421,45 @@
return unmarshalValue(target.Elem(), inputValue)
}
+ // Handle well-known types.
+ type wkt interface {
+ XXX_WellKnownType() string
+ }
+ if wkt, ok := target.Addr().Interface().(wkt); ok {
+ switch wkt.XXX_WellKnownType() {
+ 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)
+ }
+ ns := t.UnixNano()
+ s := ns / 1e9
+ ns %= 1e9
+ target.Field(0).SetInt(s)
+ target.Field(1).SetInt(ns)
+ return nil
+ }
+ }
+
// Handle nested messages.
if targetType.Kind() == reflect.Struct {
var jsonFields map[string]json.RawMessage
diff --git a/jsonpb/jsonpb_test.go b/jsonpb/jsonpb_test.go
index df93a89..f5612b9 100644
--- a/jsonpb/jsonpb_test.go
+++ b/jsonpb/jsonpb_test.go
@@ -35,9 +35,12 @@
"reflect"
"testing"
- pb "github.com/golang/protobuf/jsonpb/jsonpb_test_proto"
"github.com/golang/protobuf/proto"
+
+ pb "github.com/golang/protobuf/jsonpb/jsonpb_test_proto"
proto3pb "github.com/golang/protobuf/proto/proto3_proto"
+ durpb "github.com/golang/protobuf/ptypes/duration"
+ tspb "github.com/golang/protobuf/ptypes/timestamp"
)
var (
@@ -315,6 +318,9 @@
{"force orig_name", Marshaler{OrigName: true}, &pb.Simple{OInt32: proto.Int32(4)},
`{"o_int32":4}`},
{"proto2 extension", marshaler, realNumber, realNumberJSON},
+
+ {"Duration", marshaler, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 3}}, `{"dur":"3.000s"}`},
+ {"Timestamp", marshaler, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 21e6}}, `{"ts":"2014-05-13T16:53:20.021Z"}`},
}
func TestMarshaling(t *testing.T) {
@@ -354,6 +360,9 @@
{"oneof", `{"salary":31000}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_Salary{31000}}},
{"orig_name input", `{"o_bool":true}`, &pb.Simple{OBool: proto.Bool(true)}},
{"camelName input", `{"oBool":true}`, &pb.Simple{OBool: proto.Bool(true)}},
+
+ {"Duration", `{"dur":"3.000s"}`, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 3}}},
+ {"Timestamp", `{"ts":"2014-05-13T16:53:20.021Z"}`, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 21e6}}},
}
func TestUnmarshaling(t *testing.T) {
@@ -363,7 +372,7 @@
err := UnmarshalString(tt.json, p)
if err != nil {
- t.Error(err)
+ t.Errorf("%s: %v", tt.desc, err)
continue
}
diff --git a/jsonpb/jsonpb_test_proto/Makefile b/jsonpb/jsonpb_test_proto/Makefile
index e53e6a6..d16e916 100644
--- a/jsonpb/jsonpb_test_proto/Makefile
+++ b/jsonpb/jsonpb_test_proto/Makefile
@@ -30,4 +30,4 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
regenerate:
- protoc --go_out=. *.proto
+ protoc --go_out=Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration,Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp:. *.proto
diff --git a/jsonpb/jsonpb_test_proto/more_test_objects.pb.go b/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
index 34cd2db..3ff477b 100644
--- a/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
+++ b/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
@@ -19,6 +19,7 @@
MsgWithOneof
Real
Complex
+ KnownTypes
*/
package jsonpb
diff --git a/jsonpb/jsonpb_test_proto/test_objects.pb.go b/jsonpb/jsonpb_test_proto/test_objects.pb.go
index 38dfce4..cf6f0e3 100644
--- a/jsonpb/jsonpb_test_proto/test_objects.pb.go
+++ b/jsonpb/jsonpb_test_proto/test_objects.pb.go
@@ -7,6 +7,8 @@
import proto "github.com/golang/protobuf/proto"
import fmt "fmt"
import math "math"
+import google_protobuf "github.com/golang/protobuf/ptypes/duration"
+import google_protobuf1 "github.com/golang/protobuf/ptypes/timestamp"
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
@@ -514,6 +516,31 @@
Tag: "bytes,123,opt,name=real_extension,json=realExtension",
}
+type KnownTypes struct {
+ Dur *google_protobuf.Duration `protobuf:"bytes,1,opt,name=dur" json:"dur,omitempty"`
+ Ts *google_protobuf1.Timestamp `protobuf:"bytes,2,opt,name=ts" json:"ts,omitempty"`
+ XXX_unrecognized []byte `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 fileDescriptor1, []int{7} }
+
+func (m *KnownTypes) GetDur() *google_protobuf.Duration {
+ if m != nil {
+ return m.Dur
+ }
+ return nil
+}
+
+func (m *KnownTypes) GetTs() *google_protobuf1.Timestamp {
+ if m != nil {
+ return m.Ts
+ }
+ return nil
+}
+
var E_Name = &proto.ExtensionDesc{
ExtendedType: (*Real)(nil),
ExtensionType: (*string)(nil),
@@ -530,57 +557,63 @@
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.RegisterEnum("jsonpb.Widget_Color", Widget_Color_name, Widget_Color_value)
proto.RegisterExtension(E_Complex_RealExtension)
proto.RegisterExtension(E_Name)
}
var fileDescriptor1 = []byte{
- // 724 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x94, 0x51, 0x4f, 0xd3, 0x5e,
- 0x18, 0xc6, 0x59, 0xcf, 0xba, 0xb6, 0xef, 0x60, 0xff, 0xfd, 0x4f, 0x40, 0x2b, 0x6a, 0x42, 0x16,
- 0x25, 0x4a, 0x74, 0x17, 0x93, 0x10, 0x83, 0xde, 0x38, 0x98, 0x4a, 0x22, 0x98, 0x94, 0x10, 0x2e,
- 0x97, 0x0e, 0xca, 0x2c, 0x76, 0x3d, 0xcb, 0xdb, 0x4e, 0x59, 0xf4, 0xc2, 0x0f, 0xe1, 0x57, 0xd0,
- 0x8f, 0xe0, 0xe7, 0xf3, 0xbc, 0xe7, 0xb4, 0x3d, 0x03, 0x22, 0x37, 0xec, 0xed, 0xf3, 0x3e, 0xcf,
- 0x4e, 0x7f, 0xe7, 0xc9, 0x80, 0xe7, 0x51, 0x96, 0x0f, 0xc5, 0xe8, 0x32, 0x3a, 0xcb, 0xb3, 0xee,
- 0x14, 0x45, 0x2e, 0x78, 0xe3, 0x32, 0x13, 0xe9, 0x74, 0xd4, 0xf9, 0x65, 0x41, 0xe3, 0x38, 0x9e,
- 0x4c, 0x93, 0x88, 0xaf, 0x41, 0x43, 0x0c, 0x47, 0x42, 0x24, 0x7e, 0x6d, 0xa3, 0xf6, 0xc4, 0x0d,
- 0x6c, 0xd1, 0x97, 0x03, 0xbf, 0x0b, 0x8e, 0x18, 0xc6, 0x69, 0xfe, 0xa2, 0xe7, 0x5b, 0xf2, 0xb9,
- 0x1d, 0x34, 0xc4, 0x01, 0x4d, 0x95, 0xb0, 0xb3, 0xed, 0x33, 0x29, 0x30, 0x2d, 0xec, 0x6c, 0xf3,
- 0x7b, 0xe0, 0x8a, 0xe1, 0x4c, 0x5b, 0xea, 0x52, 0x59, 0x09, 0x1c, 0x71, 0xa2, 0x46, 0x23, 0x49,
- 0x93, 0x2d, 0xa5, 0x7a, 0x21, 0x95, 0xae, 0x4c, 0xbb, 0x1a, 0x52, 0xfa, 0x5f, 0x4a, 0xc7, 0x0b,
- 0xae, 0x4c, 0xbb, 0x1c, 0x29, 0xf1, 0x42, 0x92, 0x2e, 0x75, 0x88, 0x8b, 0x44, 0x84, 0xb9, 0xef,
- 0x4a, 0xc5, 0x92, 0x87, 0x78, 0x4b, 0x93, 0xf6, 0x9c, 0x8b, 0xd9, 0x28, 0x89, 0x7c, 0x4f, 0x2a,
- 0x35, 0xe9, 0xd9, 0x57, 0x63, 0x11, 0x97, 0x63, 0x9c, 0x8e, 0x7d, 0x90, 0x92, 0x47, 0x71, 0x6a,
- 0xd4, 0x71, 0xa3, 0xb9, 0x04, 0xe6, 0x37, 0xa5, 0xb2, 0x2c, 0xe3, 0xfa, 0x34, 0x75, 0x7e, 0x5b,
- 0xe0, 0x04, 0xd1, 0x34, 0x0a, 0xf3, 0x8c, 0x40, 0x61, 0x09, 0x8a, 0x11, 0x28, 0x2c, 0x41, 0x61,
- 0x05, 0x8a, 0x11, 0x28, 0xac, 0x40, 0x61, 0x05, 0x8a, 0x11, 0x28, 0xac, 0x40, 0xa1, 0x01, 0xc5,
- 0x08, 0x14, 0x1a, 0x50, 0x68, 0x40, 0x31, 0x02, 0x85, 0x06, 0x14, 0x1a, 0x50, 0x8c, 0x40, 0xe1,
- 0xf1, 0x82, 0xab, 0x02, 0xc5, 0x08, 0x14, 0x1a, 0x50, 0x58, 0x81, 0x62, 0x04, 0x0a, 0x2b, 0x50,
- 0x68, 0x40, 0x31, 0x02, 0x85, 0x06, 0x14, 0x1a, 0x50, 0x8c, 0x40, 0xa1, 0x01, 0x85, 0x15, 0x28,
- 0x46, 0xa0, 0x50, 0x83, 0xfa, 0x23, 0x0b, 0x75, 0x1a, 0x9f, 0x8f, 0xa3, 0x9c, 0x6f, 0x81, 0x7d,
- 0x26, 0x12, 0x81, 0xaa, 0x4f, 0xad, 0xde, 0x6a, 0x57, 0x77, 0xae, 0xab, 0xe5, 0xee, 0x1e, 0x69,
- 0x81, 0x5e, 0xe1, 0xcf, 0x29, 0x4f, 0x6f, 0x13, 0xbc, 0x7f, 0x6d, 0x37, 0x50, 0xfd, 0xe7, 0x9b,
- 0xd0, 0xc8, 0x54, 0x6b, 0xd5, 0x05, 0x36, 0x7b, 0xad, 0x72, 0x5b, 0x77, 0x39, 0x28, 0x54, 0xfe,
- 0x54, 0x03, 0x51, 0x9b, 0x74, 0xce, 0xdb, 0x9b, 0x04, 0xa8, 0x58, 0x75, 0x50, 0x5f, 0xb0, 0xbf,
- 0xaa, 0x32, 0xff, 0x2b, 0x37, 0x8b, 0x7b, 0x0f, 0x4a, 0x9d, 0x3f, 0x03, 0x0f, 0x87, 0xe5, 0xf2,
- 0x9a, 0x8a, 0xbd, 0xb5, 0xec, 0x62, 0xf1, 0xa9, 0xf3, 0x18, 0x6c, 0x7d, 0x68, 0x07, 0x58, 0x30,
- 0xd8, 0x6f, 0x2f, 0x71, 0x0f, 0xec, 0x77, 0xc1, 0x60, 0x70, 0xd4, 0xae, 0x71, 0x17, 0xea, 0xfd,
- 0x0f, 0x27, 0x83, 0xb6, 0xd5, 0xf9, 0x69, 0x41, 0xfd, 0x30, 0x9c, 0x66, 0xfc, 0x15, 0x34, 0x27,
- 0xba, 0x2e, 0xc4, 0x5e, 0x75, 0xac, 0xd9, 0xbb, 0x5f, 0xe6, 0xd3, 0x4a, 0xf7, 0x50, 0xf5, 0x47,
- 0x5e, 0xc5, 0x20, 0xcd, 0x71, 0x1e, 0x78, 0x93, 0x72, 0xe6, 0x6f, 0x60, 0x65, 0xa2, 0xba, 0x59,
- 0xbe, 0xb5, 0xa5, 0xec, 0x0f, 0xaf, 0xdb, 0xa9, 0xaf, 0xfa, 0xb5, 0x75, 0x40, 0x73, 0x62, 0x9e,
- 0xac, 0xbf, 0x86, 0xd6, 0xf5, 0x7c, 0xde, 0x06, 0xf6, 0x39, 0x9a, 0xab, 0x6b, 0x64, 0x01, 0x7d,
- 0xe4, 0xab, 0x60, 0x7f, 0x09, 0x93, 0x59, 0xa4, 0x7e, 0x12, 0xbc, 0x40, 0x0f, 0xbb, 0xd6, 0xcb,
- 0xda, 0xfa, 0x11, 0xb4, 0x6f, 0xc6, 0x2f, 0xfa, 0x5d, 0xed, 0x7f, 0xb4, 0xe8, 0xbf, 0x7d, 0x29,
- 0x26, 0xaf, 0x73, 0x00, 0xcb, 0x87, 0xd9, 0xf8, 0x34, 0xce, 0x3f, 0x7d, 0x4c, 0x23, 0x71, 0xc1,
- 0xef, 0x80, 0x9d, 0xc7, 0xb9, 0x7c, 0x31, 0x4a, 0xf3, 0xde, 0x2f, 0x05, 0x7a, 0xe4, 0xbe, 0x6c,
- 0x44, 0x98, 0x84, 0x38, 0x57, 0x91, 0x4c, 0x0a, 0xc5, 0xdc, 0x77, 0xc0, 0x9e, 0xa5, 0xb1, 0x48,
- 0x3b, 0x9b, 0x50, 0x0f, 0xa2, 0x30, 0x31, 0x87, 0xaf, 0xa9, 0xdf, 0x05, 0x3d, 0x6c, 0xb9, 0xee,
- 0x79, 0xfb, 0x87, 0xfc, 0xb3, 0x3a, 0x5f, 0xc1, 0xd9, 0x13, 0x74, 0x8e, 0x2b, 0xfe, 0x00, 0xbc,
- 0x78, 0x12, 0x8e, 0xe3, 0x94, 0x82, 0xf5, 0xba, 0x79, 0x60, 0x2c, 0xbd, 0x7d, 0x68, 0xa1, 0x8c,
- 0x1e, 0x46, 0x57, 0x79, 0x94, 0x66, 0xf2, 0xcb, 0xf8, 0xb2, 0x29, 0x44, 0x98, 0xf8, 0xdf, 0xae,
- 0x37, 0xaa, 0x88, 0x0f, 0x56, 0xc8, 0x34, 0x28, 0x3d, 0xbb, 0x1b, 0x50, 0x4f, 0xc3, 0x49, 0x74,
- 0xc3, 0xfb, 0x5d, 0x21, 0x56, 0xca, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0e, 0xd7, 0x26, 0x3c,
- 0xcb, 0x05, 0x00, 0x00,
+ // 812 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x94, 0xdf, 0x8e, 0xdb, 0x44,
+ 0x14, 0xc6, 0x1b, 0x4f, 0x9c, 0xd8, 0x27, 0xbb, 0x4b, 0x18, 0x6d, 0xc1, 0x0d, 0xff, 0x2a, 0x0b,
+ 0x2a, 0x28, 0xe0, 0x4a, 0xa1, 0xaa, 0x50, 0xe1, 0x86, 0xed, 0x06, 0xa8, 0x60, 0x8b, 0x34, 0xdb,
+ 0xaa, 0x97, 0x91, 0xd3, 0x9d, 0x0d, 0x2e, 0xb6, 0x27, 0x3a, 0x9e, 0xd0, 0x46, 0x70, 0xc1, 0x43,
+ 0xf0, 0x0a, 0xf0, 0x08, 0x3c, 0x1f, 0x67, 0x66, 0x6c, 0xcf, 0xfe, 0x51, 0xf7, 0x66, 0x73, 0xfc,
+ 0x9d, 0xef, 0xcb, 0xf8, 0x37, 0x27, 0x07, 0xb8, 0x96, 0x8d, 0x5e, 0xaa, 0xd5, 0x4b, 0xf9, 0x42,
+ 0x37, 0xd9, 0x06, 0x95, 0x56, 0x7c, 0xf4, 0xb2, 0x51, 0xf5, 0x66, 0x35, 0xfb, 0x70, 0xad, 0xd4,
+ 0xba, 0x94, 0xf7, 0xec, 0xd3, 0xd5, 0xf6, 0xfc, 0xde, 0xd9, 0x16, 0x73, 0x5d, 0xa8, 0xda, 0xf5,
+ 0xcd, 0x3e, 0xba, 0xaa, 0xeb, 0xa2, 0xa2, 0xb4, 0xbc, 0xda, 0xb8, 0x86, 0xf4, 0x9f, 0x00, 0x46,
+ 0xa7, 0x45, 0xb5, 0x29, 0x25, 0xbf, 0x09, 0x23, 0xb5, 0x5c, 0x29, 0x55, 0x26, 0x83, 0xdb, 0x83,
+ 0x4f, 0x23, 0x11, 0xaa, 0x23, 0x2a, 0xf8, 0xbb, 0x30, 0x56, 0xcb, 0xa2, 0xd6, 0x5f, 0xcd, 0x93,
+ 0x80, 0x9e, 0x87, 0x62, 0xa4, 0x1e, 0x9b, 0xaa, 0x17, 0x1e, 0xdc, 0x4f, 0x18, 0x09, 0xcc, 0x09,
+ 0x0f, 0xee, 0xf3, 0x5b, 0x10, 0xa9, 0xe5, 0xd6, 0x59, 0x86, 0xa4, 0xec, 0x8b, 0xb1, 0x7a, 0x66,
+ 0x4b, 0x2f, 0x91, 0x29, 0x24, 0x69, 0xd8, 0x4a, 0x9d, 0xab, 0x71, 0xae, 0x11, 0x49, 0x6f, 0x93,
+ 0x74, 0x7a, 0xc1, 0xd5, 0x38, 0xd7, 0x98, 0x24, 0xde, 0x4a, 0xe4, 0xb2, 0x87, 0x38, 0x2f, 0x55,
+ 0xae, 0x93, 0x88, 0x94, 0x80, 0x0e, 0xf1, 0xbd, 0xa9, 0x9c, 0xe7, 0x4c, 0x6d, 0x57, 0xa5, 0x4c,
+ 0x62, 0x52, 0x06, 0xe4, 0x39, 0xb6, 0x65, 0x1b, 0xa7, 0xb1, 0xa8, 0xd7, 0x09, 0x90, 0x14, 0x9b,
+ 0x38, 0x5b, 0xba, 0xb8, 0xd5, 0x8e, 0x88, 0x27, 0x13, 0x52, 0xf6, 0x28, 0xee, 0xc8, 0x54, 0xe9,
+ 0xbf, 0x01, 0x8c, 0x85, 0xdc, 0xc8, 0x5c, 0x37, 0x06, 0x14, 0x76, 0xa0, 0x98, 0x01, 0x85, 0x1d,
+ 0x28, 0xec, 0x41, 0x31, 0x03, 0x0a, 0x7b, 0x50, 0xd8, 0x83, 0x62, 0x06, 0x14, 0xf6, 0xa0, 0xd0,
+ 0x83, 0x62, 0x06, 0x14, 0x7a, 0x50, 0xe8, 0x41, 0x31, 0x03, 0x0a, 0x3d, 0x28, 0xf4, 0xa0, 0x98,
+ 0x01, 0x85, 0xa7, 0x17, 0x5c, 0x3d, 0x28, 0x66, 0x40, 0xa1, 0x07, 0x85, 0x3d, 0x28, 0x66, 0x40,
+ 0x61, 0x0f, 0x0a, 0x3d, 0x28, 0x66, 0x40, 0xa1, 0x07, 0x85, 0x1e, 0x14, 0x33, 0xa0, 0xd0, 0x83,
+ 0xc2, 0x1e, 0x14, 0x33, 0xa0, 0xd0, 0x81, 0xfa, 0x8f, 0x06, 0xea, 0x79, 0x71, 0xb6, 0x96, 0x9a,
+ 0xdf, 0x85, 0xf0, 0x85, 0x2a, 0x15, 0xda, 0x79, 0x3a, 0x98, 0x1f, 0x66, 0x6e, 0x68, 0x33, 0x27,
+ 0x67, 0x8f, 0x8c, 0x26, 0x5c, 0x0b, 0xff, 0xd2, 0xe4, 0xb9, 0x6e, 0x03, 0xef, 0x4d, 0xdd, 0x23,
+ 0xb4, 0xff, 0xf9, 0x1d, 0x18, 0x35, 0x76, 0x6a, 0xed, 0x05, 0x4e, 0xe6, 0x07, 0x5d, 0xb7, 0x9b,
+ 0x65, 0xd1, 0xaa, 0xfc, 0x33, 0x07, 0xc4, 0x76, 0x9a, 0x73, 0x5e, 0xef, 0x34, 0x80, 0xda, 0xd6,
+ 0x31, 0xba, 0x0b, 0x4e, 0x0e, 0x6d, 0xe6, 0x5b, 0x5d, 0x67, 0x7b, 0xef, 0xa2, 0xd3, 0xf9, 0x17,
+ 0x10, 0xe3, 0xb2, 0x6b, 0xbe, 0x69, 0x63, 0xaf, 0x35, 0x47, 0xd8, 0x7e, 0x4a, 0x3f, 0x81, 0xd0,
+ 0x1d, 0x7a, 0x0c, 0x4c, 0x2c, 0x8e, 0xa7, 0x37, 0x78, 0x0c, 0xe1, 0x0f, 0x62, 0xb1, 0x78, 0x32,
+ 0x1d, 0xf0, 0x08, 0x86, 0x47, 0x3f, 0x3f, 0x5b, 0x4c, 0x83, 0xf4, 0xef, 0x00, 0x86, 0x27, 0xf9,
+ 0xa6, 0xe1, 0xdf, 0xc0, 0xa4, 0x72, 0xe3, 0x62, 0xd8, 0xdb, 0x19, 0x9b, 0xcc, 0xdf, 0xeb, 0xf2,
+ 0x4d, 0x4b, 0x76, 0x62, 0xe7, 0x87, 0xae, 0x62, 0x51, 0x6b, 0xdc, 0x89, 0xb8, 0xea, 0x6a, 0xfe,
+ 0x1d, 0xec, 0x57, 0x76, 0x36, 0xbb, 0xb7, 0x0e, 0xac, 0xfd, 0x83, 0xcb, 0x76, 0x33, 0xaf, 0xee,
+ 0xb5, 0x5d, 0xc0, 0xa4, 0xf2, 0x4f, 0x66, 0xdf, 0xc2, 0xc1, 0xe5, 0x7c, 0x3e, 0x05, 0xf6, 0x9b,
+ 0xdc, 0xd9, 0x6b, 0x64, 0xc2, 0x7c, 0xe4, 0x87, 0x10, 0xfe, 0x9e, 0x97, 0x5b, 0x69, 0x57, 0x42,
+ 0x2c, 0x5c, 0xf1, 0x30, 0xf8, 0x7a, 0x30, 0x7b, 0x02, 0xd3, 0xab, 0xf1, 0x17, 0xfd, 0x91, 0xf3,
+ 0x7f, 0x7c, 0xd1, 0x7f, 0xfd, 0x52, 0x7c, 0x5e, 0xfa, 0x18, 0xf6, 0x4e, 0x9a, 0xf5, 0xf3, 0x42,
+ 0xff, 0xfa, 0x4b, 0x2d, 0xd5, 0x39, 0x7f, 0x07, 0x42, 0x5d, 0x68, 0x7a, 0x31, 0x93, 0x16, 0xff,
+ 0x78, 0x43, 0xb8, 0x92, 0x27, 0x34, 0x11, 0x79, 0x99, 0xe3, 0xce, 0x46, 0x32, 0x12, 0xda, 0xfa,
+ 0x68, 0x0c, 0xe1, 0xb6, 0xa6, 0x95, 0x98, 0xde, 0x81, 0xa1, 0x90, 0x79, 0xe9, 0x0f, 0x3f, 0xb0,
+ 0x7b, 0xc1, 0x15, 0x77, 0xa3, 0xe8, 0x6c, 0xfa, 0x17, 0xfd, 0x05, 0xe9, 0x2b, 0x18, 0x3f, 0x52,
+ 0xe6, 0x1c, 0xaf, 0xf9, 0xfb, 0x10, 0x17, 0x55, 0xbe, 0x2e, 0x6a, 0x13, 0xec, 0xda, 0xfd, 0x03,
+ 0x6f, 0x99, 0x1f, 0xc3, 0x01, 0x52, 0xf4, 0x52, 0xbe, 0xd6, 0xb2, 0x6e, 0xe8, 0xcb, 0xf8, 0x9e,
+ 0x1f, 0x88, 0xbc, 0x4c, 0xfe, 0xb8, 0x3c, 0x51, 0x6d, 0xbc, 0xd8, 0x37, 0xa6, 0x45, 0xe7, 0x49,
+ 0x25, 0xc0, 0x4f, 0xb5, 0x7a, 0x55, 0x3f, 0xdd, 0x6d, 0x64, 0xc3, 0x3f, 0x07, 0x46, 0xdb, 0xdc,
+ 0x7e, 0xeb, 0x64, 0x7e, 0x2b, 0x73, 0x9b, 0x3c, 0xeb, 0x36, 0x79, 0x76, 0xdc, 0x6e, 0x7a, 0x61,
+ 0xba, 0xe8, 0xb7, 0x16, 0xd0, 0x2c, 0x3a, 0x9a, 0xb3, 0x6b, 0xbd, 0x4f, 0xbb, 0xad, 0x2f, 0xa8,
+ 0xeb, 0xe1, 0x6d, 0x18, 0xd6, 0x79, 0x25, 0xaf, 0x1c, 0xf1, 0x4f, 0x7b, 0x93, 0x56, 0xf9, 0x3f,
+ 0x00, 0x00, 0xff, 0xff, 0x73, 0x4f, 0x6f, 0xec, 0x73, 0x06, 0x00, 0x00,
}
diff --git a/jsonpb/jsonpb_test_proto/test_objects.proto b/jsonpb/jsonpb_test_proto/test_objects.proto
index 77f7fba..8087f71 100644
--- a/jsonpb/jsonpb_test_proto/test_objects.proto
+++ b/jsonpb/jsonpb_test_proto/test_objects.proto
@@ -31,6 +31,9 @@
syntax = "proto2";
+import "google/protobuf/duration.proto";
+import "google/protobuf/timestamp.proto";
+
package jsonpb;
// Test message for holding primitive types.
@@ -108,3 +111,8 @@
optional double imaginary = 1;
extensions 100 to max;
}
+
+message KnownTypes {
+ optional google.protobuf.Duration dur = 1;
+ optional google.protobuf.Timestamp ts = 2;
+}
diff --git a/protoc-gen-go/generator/generator.go b/protoc-gen-go/generator/generator.go
index 004b2d8..0e40162 100644
--- a/protoc-gen-go/generator/generator.go
+++ b/protoc-gen-go/generator/generator.go
@@ -1652,6 +1652,13 @@
"Descriptor",
}
+// Names of messages in the `google.protobuf` package for which
+// we will generate XXX_WellKnownType methods.
+var wellKnownTypes = map[string]bool{
+ "Duration": true,
+ "Timestamp": true,
+}
+
// Generate the type and default constant definitions for this Descriptor.
func (g *Generator) generateMessage(message *Descriptor) {
// The full type name
@@ -1840,6 +1847,11 @@
}
g.P("func (*", ccTypeName, ") Descriptor() ([]byte, []int) { return fileDescriptor", g.file.index, ", []int{", strings.Join(indexes, ", "), "} }")
}
+ // TODO: Revisit the decision to use a XXX_WellKnownType method
+ // if we change proto.MessageName to work with multiple equivalents.
+ if message.file.GetPackage() == "google.protobuf" && wellKnownTypes[message.GetName()] {
+ g.P("func (*", ccTypeName, `) XXX_WellKnownType() string { return "`, message.GetName(), `" }`)
+ }
// Extension support methods
var hasExtensions, isMessageSet bool
diff --git a/ptypes/any/any.pb.go b/ptypes/any/any.pb.go
index b93383f..c30c737 100644
--- a/ptypes/any/any.pb.go
+++ b/ptypes/any/any.pb.go
@@ -1,12 +1,12 @@
// Code generated by protoc-gen-go.
-// source: github.com/golang/protobuf/types/any/any.proto
+// source: github.com/golang/protobuf/ptypes/any/any.proto
// DO NOT EDIT!
/*
Package any is a generated protocol buffer package.
It is generated from these files:
- github.com/golang/protobuf/types/any/any.proto
+ github.com/golang/protobuf/ptypes/any/any.proto
It has these top-level messages:
Any
@@ -94,17 +94,17 @@
}
var fileDescriptor0 = []byte{
- // 183 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x4b, 0xcf, 0x2c, 0xc9,
+ // 184 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xd2, 0x4f, 0xcf, 0x2c, 0xc9,
0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x49, 0xcc, 0x4b, 0xd7, 0x2f, 0x28,
- 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0xcc, 0xab,
- 0x04, 0x61, 0x3d, 0xb0, 0xb0, 0x10, 0x7f, 0x7a, 0x7e, 0x7e, 0x7a, 0x4e, 0xaa, 0x1e, 0x4c, 0x91,
- 0x92, 0x19, 0x17, 0xb3, 0x63, 0x5e, 0xa5, 0x90, 0x24, 0x17, 0x07, 0x48, 0x79, 0x7c, 0x69, 0x51,
- 0x8e, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x67, 0x10, 0x3b, 0x88, 0x1f, 0x5a, 0x94, 0x23, 0x24, 0xc2,
- 0xc5, 0x5a, 0x96, 0x98, 0x53, 0x9a, 0x2a, 0xc1, 0x04, 0x14, 0xe7, 0x09, 0x82, 0x70, 0x9c, 0x02,
- 0xb8, 0x84, 0x81, 0x76, 0xea, 0xa1, 0x19, 0xe7, 0xc4, 0x01, 0x34, 0x2c, 0x00, 0xc4, 0x09, 0x60,
- 0x8c, 0x62, 0x06, 0x5a, 0xbb, 0x80, 0x91, 0x71, 0x11, 0x13, 0xb3, 0x7b, 0x80, 0xd3, 0x2a, 0x26,
- 0x39, 0x77, 0x88, 0xda, 0x00, 0xa8, 0x5a, 0xbd, 0xf0, 0xd4, 0x9c, 0x1c, 0xef, 0xbc, 0xfc, 0xf2,
- 0xbc, 0x10, 0x90, 0x43, 0x93, 0xd8, 0xc0, 0x86, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x69,
- 0x04, 0x7f, 0x3b, 0xd3, 0x00, 0x00, 0x00,
+ 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0x28, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0xcc,
+ 0xab, 0x04, 0x61, 0x3d, 0xb0, 0xb8, 0x10, 0x7f, 0x7a, 0x7e, 0x7e, 0x7a, 0x4e, 0xaa, 0x1e, 0x4c,
+ 0x95, 0x92, 0x19, 0x17, 0xb3, 0x63, 0x5e, 0xa5, 0x90, 0x24, 0x17, 0x07, 0x48, 0x79, 0x7c, 0x69,
+ 0x51, 0x8e, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x67, 0x10, 0x3b, 0x88, 0x1f, 0x5a, 0x94, 0x23, 0x24,
+ 0xc2, 0xc5, 0x5a, 0x96, 0x98, 0x53, 0x9a, 0x2a, 0xc1, 0x04, 0x14, 0xe7, 0x09, 0x82, 0x70, 0x9c,
+ 0x02, 0xb8, 0x84, 0x81, 0x96, 0xea, 0xa1, 0x19, 0xe7, 0xc4, 0x01, 0x34, 0x2c, 0x00, 0xc4, 0x09,
+ 0x60, 0x8c, 0x62, 0x06, 0x5a, 0xbb, 0x80, 0x91, 0x71, 0x11, 0x13, 0xb3, 0x7b, 0x80, 0xd3, 0x2a,
+ 0x26, 0x39, 0x77, 0x88, 0xda, 0x00, 0xa8, 0x5a, 0xbd, 0xf0, 0xd4, 0x9c, 0x1c, 0xef, 0xbc, 0xfc,
+ 0xf2, 0xbc, 0x10, 0x90, 0x43, 0x93, 0xd8, 0xc0, 0x86, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff,
+ 0x5c, 0xa1, 0xa0, 0xf2, 0xd4, 0x00, 0x00, 0x00,
}
diff --git a/ptypes/duration/duration.pb.go b/ptypes/duration/duration.pb.go
index 3ac552e..2d0a6b7 100644
--- a/ptypes/duration/duration.pb.go
+++ b/ptypes/duration/duration.pb.go
@@ -1,12 +1,12 @@
// Code generated by protoc-gen-go.
-// source: github.com/golang/protobuf/types/duration/duration.proto
+// source: github.com/golang/protobuf/ptypes/duration/duration.proto
// DO NOT EDIT!
/*
Package duration is a generated protocol buffer package.
It is generated from these files:
- github.com/golang/protobuf/types/duration/duration.proto
+ github.com/golang/protobuf/ptypes/duration/duration.proto
It has these top-level messages:
Duration
@@ -84,23 +84,24 @@
func (m *Duration) String() string { return proto.CompactTextString(m) }
func (*Duration) ProtoMessage() {}
func (*Duration) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (*Duration) XXX_WellKnownType() string { return "Duration" }
func init() {
proto.RegisterType((*Duration)(nil), "google.protobuf.Duration")
}
var fileDescriptor0 = []byte{
- // 186 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x48, 0xcf, 0x2c, 0xc9,
+ // 187 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x4c, 0xcf, 0x2c, 0xc9,
0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x49, 0xcc, 0x4b, 0xd7, 0x2f, 0x28,
- 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0x29, 0x2d,
- 0x4a, 0x2c, 0xc9, 0xcc, 0xcf, 0x83, 0x33, 0xf4, 0xc0, 0x0a, 0x84, 0xf8, 0xd3, 0xf3, 0xf3, 0xd3,
- 0x73, 0x52, 0xf5, 0x60, 0xca, 0x95, 0xac, 0xb8, 0x38, 0x5c, 0xa0, 0x4a, 0x84, 0x24, 0xb8, 0xd8,
- 0x8b, 0x53, 0x93, 0xf3, 0xf3, 0x52, 0x8a, 0x25, 0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0x60, 0x5c,
- 0x21, 0x11, 0x2e, 0xd6, 0xbc, 0xc4, 0xbc, 0xfc, 0x62, 0x09, 0x26, 0xa0, 0x38, 0x6b, 0x10, 0x84,
- 0xe3, 0x14, 0xc5, 0x25, 0x0c, 0x74, 0x81, 0x1e, 0x9a, 0x91, 0x4e, 0xbc, 0x30, 0x03, 0x03, 0x40,
- 0x22, 0x01, 0x8c, 0x51, 0x1c, 0x30, 0x47, 0x2c, 0x60, 0x64, 0x5c, 0xc4, 0xc4, 0xec, 0x1e, 0xe0,
- 0xb4, 0x8a, 0x49, 0xce, 0x1d, 0xa2, 0x2b, 0x00, 0xaa, 0x4b, 0x2f, 0x3c, 0x35, 0x27, 0xc7, 0x3b,
- 0x2f, 0xbf, 0x3c, 0x2f, 0x04, 0xe4, 0x81, 0x24, 0x36, 0xb0, 0x71, 0xc6, 0x80, 0x00, 0x00, 0x00,
- 0xff, 0xff, 0x04, 0x47, 0x33, 0x15, 0xeb, 0x00, 0x00, 0x00,
+ 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0x28, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0x29,
+ 0x2d, 0x4a, 0x2c, 0xc9, 0xcc, 0xcf, 0x83, 0x33, 0xf4, 0xc0, 0x2a, 0x84, 0xf8, 0xd3, 0xf3, 0xf3,
+ 0xd3, 0x73, 0x52, 0xf5, 0x60, 0xea, 0x95, 0xac, 0xb8, 0x38, 0x5c, 0xa0, 0x4a, 0x84, 0x24, 0xb8,
+ 0xd8, 0x8b, 0x53, 0x93, 0xf3, 0xf3, 0x52, 0x8a, 0x25, 0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0x60,
+ 0x5c, 0x21, 0x11, 0x2e, 0xd6, 0xbc, 0xc4, 0xbc, 0xfc, 0x62, 0x09, 0x26, 0xa0, 0x38, 0x6b, 0x10,
+ 0x84, 0xe3, 0x14, 0xc5, 0x25, 0x0c, 0x74, 0x82, 0x1e, 0x9a, 0x91, 0x4e, 0xbc, 0x30, 0x03, 0x03,
+ 0x40, 0x22, 0x01, 0x8c, 0x51, 0x1c, 0x30, 0x47, 0x2c, 0x60, 0x64, 0x5c, 0xc4, 0xc4, 0xec, 0x1e,
+ 0xe0, 0xb4, 0x8a, 0x49, 0xce, 0x1d, 0xa2, 0x2b, 0x00, 0xaa, 0x4b, 0x2f, 0x3c, 0x35, 0x27, 0xc7,
+ 0x3b, 0x2f, 0xbf, 0x3c, 0x2f, 0x04, 0xe4, 0x81, 0x24, 0x36, 0xb0, 0x71, 0xc6, 0x80, 0x00, 0x00,
+ 0x00, 0xff, 0xff, 0xa2, 0x2c, 0xaf, 0x9f, 0xec, 0x00, 0x00, 0x00,
}
diff --git a/ptypes/empty/empty.pb.go b/ptypes/empty/empty.pb.go
index ab3f972..75513c4 100644
--- a/ptypes/empty/empty.pb.go
+++ b/ptypes/empty/empty.pb.go
@@ -1,12 +1,12 @@
// Code generated by protoc-gen-go.
-// source: github.com/golang/protobuf/types/empty/empty.proto
+// source: github.com/golang/protobuf/ptypes/empty/empty.proto
// DO NOT EDIT!
/*
Package empty is a generated protocol buffer package.
It is generated from these files:
- github.com/golang/protobuf/types/empty/empty.proto
+ github.com/golang/protobuf/ptypes/empty/empty.proto
It has these top-level messages:
Empty
@@ -49,14 +49,14 @@
var fileDescriptor0 = []byte{
// 148 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x32, 0x4a, 0xcf, 0x2c, 0xc9,
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x32, 0x4e, 0xcf, 0x2c, 0xc9,
0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x49, 0xcc, 0x4b, 0xd7, 0x2f, 0x28,
- 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0xcd, 0x2d,
- 0x28, 0xa9, 0x84, 0x90, 0x7a, 0x60, 0x29, 0x21, 0xfe, 0xf4, 0xfc, 0xfc, 0xf4, 0x9c, 0x54, 0x3d,
- 0x98, 0x42, 0x25, 0x76, 0x2e, 0x56, 0x57, 0x90, 0xbc, 0x53, 0x38, 0x97, 0x30, 0xd0, 0x20, 0x3d,
- 0x34, 0x79, 0x27, 0x2e, 0xb0, 0x6c, 0x00, 0x88, 0x1b, 0xc0, 0x18, 0xc5, 0x0a, 0x36, 0x6b, 0x01,
- 0x23, 0xe3, 0x0f, 0x46, 0xc6, 0x45, 0x4c, 0xcc, 0xee, 0x01, 0x4e, 0xab, 0x98, 0xe4, 0xdc, 0x21,
- 0x5a, 0x02, 0xa0, 0x5a, 0xf4, 0xc2, 0x53, 0x73, 0x72, 0xbc, 0xf3, 0xf2, 0xcb, 0xf3, 0x42, 0x40,
- 0x8e, 0x48, 0x62, 0x03, 0x9b, 0x65, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x29, 0x06, 0xae, 0x32,
- 0xaf, 0x00, 0x00, 0x00,
+ 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0x28, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0xcd,
+ 0x05, 0x32, 0x20, 0xa4, 0x1e, 0x58, 0x4e, 0x88, 0x3f, 0x3d, 0x3f, 0x3f, 0x3d, 0x27, 0x55, 0x0f,
+ 0xa6, 0x52, 0x89, 0x9d, 0x8b, 0xd5, 0x15, 0x24, 0xef, 0x14, 0xce, 0x25, 0x0c, 0x34, 0x49, 0x0f,
+ 0x4d, 0xde, 0x89, 0x0b, 0x2c, 0x1b, 0x00, 0xe2, 0x06, 0x30, 0x46, 0xb1, 0x82, 0xcd, 0x5a, 0xc0,
+ 0xc8, 0xf8, 0x83, 0x91, 0x71, 0x11, 0x13, 0xb3, 0x7b, 0x80, 0xd3, 0x2a, 0x26, 0x39, 0x77, 0x88,
+ 0x96, 0x00, 0xa8, 0x16, 0xbd, 0xf0, 0xd4, 0x9c, 0x1c, 0xef, 0xbc, 0xfc, 0xf2, 0xbc, 0x10, 0x90,
+ 0x23, 0x92, 0xd8, 0xc0, 0x66, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x64, 0x1d, 0x6e, 0x09,
+ 0xb0, 0x00, 0x00, 0x00,
}
diff --git a/ptypes/regen.sh b/ptypes/regen.sh
index 4166d9e..c93ecb5 100755
--- a/ptypes/regen.sh
+++ b/ptypes/regen.sh
@@ -5,7 +5,7 @@
# see https://github.com/golang/protobuf for instructions.
# You also need Go and Git installed.
-PKG=github.com/golang/protobuf/types
+PKG=github.com/golang/protobuf/ptypes
UPSTREAM=https://github.com/google/protobuf
UPSTREAM_SUBDIR=src/google/protobuf
PROTO_FILES='
diff --git a/ptypes/struct/struct.pb.go b/ptypes/struct/struct.pb.go
index 9489166..9f2ef62 100644
--- a/ptypes/struct/struct.pb.go
+++ b/ptypes/struct/struct.pb.go
@@ -1,12 +1,12 @@
// Code generated by protoc-gen-go.
-// source: github.com/golang/protobuf/types/struct/struct.proto
+// source: github.com/golang/protobuf/ptypes/struct/struct.proto
// DO NOT EDIT!
/*
Package structpb is a generated protocol buffer package.
It is generated from these files:
- github.com/golang/protobuf/types/struct/struct.proto
+ github.com/golang/protobuf/ptypes/struct/struct.proto
It has these top-level messages:
Struct
@@ -342,31 +342,31 @@
}
var fileDescriptor0 = []byte{
- // 405 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x92, 0x4f, 0x8b, 0xda, 0x40,
- 0x18, 0xc6, 0x9d, 0x44, 0x83, 0x79, 0x53, 0xac, 0xa4, 0xd0, 0x8a, 0x85, 0xb6, 0xe8, 0x45, 0x4a,
- 0x49, 0xc0, 0xf6, 0x50, 0x6a, 0x2f, 0x0d, 0x58, 0x0b, 0x0d, 0x92, 0xa6, 0xd5, 0x96, 0x5e, 0xc4,
- 0x68, 0xcc, 0x06, 0xc7, 0x19, 0xc9, 0x9f, 0x5d, 0xfc, 0x26, 0x7b, 0x5c, 0xf6, 0xb8, 0xc7, 0xfd,
- 0x84, 0x3b, 0x7f, 0x92, 0xec, 0xa2, 0x78, 0xca, 0xcc, 0x33, 0xbf, 0xf7, 0x99, 0xf7, 0x79, 0x33,
- 0xf0, 0x29, 0x8a, 0xb3, 0x8b, 0x3c, 0xb0, 0x56, 0x74, 0x67, 0x47, 0x14, 0x2f, 0x49, 0x64, 0xef,
- 0x13, 0x9a, 0xd1, 0x20, 0xdf, 0xd8, 0xd9, 0x61, 0x1f, 0xa6, 0x76, 0x9a, 0x25, 0xf9, 0x2a, 0x2b,
- 0x3e, 0x96, 0x38, 0x34, 0x9f, 0x47, 0x94, 0x46, 0x38, 0xb4, 0x4a, 0xb4, 0x77, 0x8d, 0x40, 0xfb,
- 0x2d, 0x08, 0x73, 0x04, 0xda, 0x26, 0x0e, 0xf1, 0x3a, 0xed, 0xa0, 0x77, 0xea, 0xc0, 0x18, 0xf6,
- 0xad, 0x23, 0xd8, 0x92, 0xa0, 0xf5, 0x5d, 0x50, 0x63, 0x92, 0x25, 0x07, 0xbf, 0x28, 0xe9, 0xfe,
- 0x02, 0xe3, 0x89, 0x6c, 0xb6, 0x41, 0xdd, 0x86, 0x07, 0x66, 0x84, 0x06, 0xba, 0xcf, 0x97, 0xe6,
- 0x07, 0x68, 0x5c, 0x2e, 0x71, 0x1e, 0x76, 0x14, 0xa6, 0x19, 0xc3, 0x97, 0x27, 0xe6, 0x73, 0x7e,
- 0xea, 0x4b, 0xe8, 0x8b, 0xf2, 0x19, 0xf5, 0xee, 0x15, 0x68, 0x08, 0x91, 0x75, 0x06, 0x24, 0xc7,
- 0x78, 0x21, 0x0d, 0xb8, 0x69, 0x6b, 0xd8, 0x3d, 0x31, 0x98, 0x32, 0x44, 0xf0, 0x3f, 0x6a, 0xbe,
- 0x4e, 0xca, 0x8d, 0xd9, 0x87, 0x67, 0x24, 0xdf, 0x05, 0x61, 0xb2, 0x78, 0xbc, 0x1f, 0x31, 0xc4,
- 0x90, 0x6a, 0x05, 0xb1, 0x39, 0xc5, 0x24, 0x2a, 0x20, 0x95, 0x37, 0xce, 0x21, 0xa9, 0x4a, 0xe8,
- 0x2d, 0x40, 0x40, 0x69, 0xd9, 0x46, 0x9d, 0x21, 0x4d, 0x7e, 0x15, 0xd7, 0x24, 0xf0, 0x55, 0xb8,
- 0xb0, 0x11, 0x15, 0x48, 0x43, 0x44, 0x7d, 0x75, 0x66, 0x8e, 0x85, 0x3d, 0x5b, 0x55, 0x29, 0x71,
- 0x9c, 0x96, 0xb5, 0x9a, 0xa8, 0x3d, 0x4d, 0xe9, 0x32, 0xa4, 0x4a, 0x89, 0xcb, 0x8d, 0xa3, 0x41,
- 0x7d, 0x1b, 0x93, 0x75, 0x6f, 0x04, 0x7a, 0x45, 0x98, 0x16, 0x68, 0xc2, 0xac, 0xfc, 0xa3, 0xe7,
- 0x86, 0x5e, 0x50, 0xef, 0x5f, 0x83, 0x5e, 0x0d, 0xd1, 0x6c, 0x01, 0x4c, 0x67, 0xae, 0xbb, 0x98,
- 0x7f, 0x73, 0x67, 0xe3, 0x76, 0xcd, 0xf9, 0x07, 0x2f, 0xd8, 0x5b, 0x3b, 0x76, 0x70, 0x0c, 0x19,
- 0xc6, 0xe3, 0x7b, 0x0f, 0xfd, 0x6f, 0xca, 0x44, 0xfb, 0xe0, 0x06, 0xa1, 0x5b, 0x45, 0x9d, 0x78,
- 0xce, 0x9d, 0xf2, 0x66, 0x22, 0x6b, 0xbc, 0xf2, 0xd6, 0xbf, 0x21, 0xc6, 0x3f, 0x09, 0xbd, 0x22,
- 0x7f, 0xf8, 0x43, 0x0d, 0x34, 0x61, 0xf6, 0xf1, 0x21, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x20, 0x17,
- 0xd4, 0xd3, 0x02, 0x00, 0x00,
+ // 406 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x92, 0x4f, 0x8b, 0xd3, 0x40,
+ 0x18, 0xc6, 0x3b, 0x49, 0x1b, 0x9a, 0x37, 0x52, 0x4b, 0x04, 0x2d, 0x15, 0x54, 0xda, 0x4b, 0x11,
+ 0x49, 0xa0, 0x22, 0x88, 0xf5, 0x62, 0xa0, 0x56, 0x30, 0x94, 0x18, 0x6d, 0x15, 0x2f, 0xa5, 0x69,
+ 0xd3, 0x18, 0x3a, 0x9d, 0x09, 0xf9, 0xa3, 0xf4, 0x9b, 0x78, 0x5c, 0xf6, 0xb8, 0xc7, 0xfd, 0x84,
+ 0x3b, 0x7f, 0x92, 0xec, 0xd2, 0xd2, 0x53, 0x66, 0x9e, 0xf9, 0xbd, 0xcf, 0xbc, 0xcf, 0x9b, 0x81,
+ 0x77, 0x51, 0x9c, 0xff, 0x29, 0x02, 0x6b, 0x43, 0x0f, 0x76, 0x44, 0xf1, 0x9a, 0x44, 0x76, 0x92,
+ 0xd2, 0x9c, 0x06, 0xc5, 0xce, 0x4e, 0xf2, 0x63, 0x12, 0x66, 0x76, 0x96, 0xa7, 0xc5, 0x26, 0x2f,
+ 0x3f, 0x96, 0x38, 0x35, 0x1f, 0x47, 0x94, 0x46, 0x38, 0xb4, 0x2a, 0x76, 0xf0, 0x1f, 0x81, 0xf6,
+ 0x5d, 0x10, 0xe6, 0x04, 0xb4, 0x5d, 0x1c, 0xe2, 0x6d, 0xd6, 0x43, 0xaf, 0xd4, 0x91, 0x31, 0x1e,
+ 0x5a, 0x27, 0xb0, 0x25, 0x41, 0xeb, 0xb3, 0xa0, 0xa6, 0x24, 0x4f, 0x8f, 0x7e, 0x59, 0xd2, 0xff,
+ 0x06, 0xc6, 0x03, 0xd9, 0xec, 0x82, 0xba, 0x0f, 0x8f, 0xcc, 0x08, 0x8d, 0x74, 0x9f, 0x2f, 0xcd,
+ 0x37, 0xd0, 0xfa, 0xbb, 0xc6, 0x45, 0xd8, 0x53, 0x98, 0x66, 0x8c, 0x9f, 0x9e, 0x99, 0x2f, 0xf9,
+ 0xa9, 0x2f, 0xa1, 0x0f, 0xca, 0x7b, 0x34, 0xb8, 0x55, 0xa0, 0x25, 0x44, 0xd6, 0x19, 0x90, 0x02,
+ 0xe3, 0x95, 0x34, 0xe0, 0xa6, 0x9d, 0x71, 0xff, 0xcc, 0x60, 0xce, 0x10, 0xc1, 0x7f, 0x69, 0xf8,
+ 0x3a, 0xa9, 0x36, 0xe6, 0x10, 0x1e, 0x91, 0xe2, 0x10, 0x84, 0xe9, 0xea, 0xfe, 0x7e, 0xc4, 0x10,
+ 0x43, 0xaa, 0x35, 0xc4, 0xe6, 0x14, 0x93, 0xa8, 0x84, 0x54, 0xde, 0x38, 0x87, 0xa4, 0x2a, 0xa1,
+ 0x97, 0x00, 0x01, 0xa5, 0x55, 0x1b, 0x4d, 0x86, 0xb4, 0xf9, 0x55, 0x5c, 0x93, 0xc0, 0x47, 0xe1,
+ 0xc2, 0x46, 0x54, 0x22, 0x2d, 0x11, 0xf5, 0xd9, 0x85, 0x39, 0x96, 0xf6, 0x6c, 0x55, 0xa7, 0xc4,
+ 0x71, 0x56, 0xd5, 0x6a, 0xa2, 0xf6, 0x3c, 0xa5, 0xcb, 0x90, 0x3a, 0x25, 0xae, 0x36, 0x8e, 0x06,
+ 0xcd, 0x7d, 0x4c, 0xb6, 0x83, 0x09, 0xe8, 0x35, 0x61, 0x5a, 0xa0, 0x09, 0xb3, 0xea, 0x8f, 0x5e,
+ 0x1a, 0x7a, 0x49, 0xbd, 0x7e, 0x0e, 0x7a, 0x3d, 0x44, 0xb3, 0x03, 0x30, 0x5f, 0xb8, 0xee, 0x6a,
+ 0xf9, 0xc9, 0x5d, 0x4c, 0xbb, 0x0d, 0xe7, 0x17, 0x3c, 0x61, 0x8f, 0xed, 0xd4, 0xc1, 0x31, 0x64,
+ 0x18, 0x8f, 0xef, 0x3d, 0xf4, 0xbb, 0x2d, 0x13, 0x25, 0xc1, 0x15, 0x42, 0xd7, 0x8a, 0x3a, 0xf3,
+ 0x9c, 0x1b, 0xe5, 0xc5, 0x4c, 0xd6, 0x78, 0xd5, 0xad, 0x3f, 0x43, 0x8c, 0xbf, 0x12, 0xfa, 0x8f,
+ 0xfc, 0xe0, 0x0f, 0x35, 0xd0, 0x84, 0xd9, 0xdb, 0xbb, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb1, 0x28,
+ 0x9b, 0x97, 0xd4, 0x02, 0x00, 0x00,
}
diff --git a/ptypes/timestamp/timestamp.pb.go b/ptypes/timestamp/timestamp.pb.go
index ac27c4b..eabbb91 100644
--- a/ptypes/timestamp/timestamp.pb.go
+++ b/ptypes/timestamp/timestamp.pb.go
@@ -1,12 +1,12 @@
// Code generated by protoc-gen-go.
-// source: github.com/golang/protobuf/types/timestamp/timestamp.proto
+// source: github.com/golang/protobuf/ptypes/timestamp/timestamp.proto
// DO NOT EDIT!
/*
Package timestamp is a generated protocol buffer package.
It is generated from these files:
- github.com/golang/protobuf/types/timestamp/timestamp.proto
+ github.com/golang/protobuf/ptypes/timestamp/timestamp.proto
It has these top-level messages:
Timestamp
@@ -97,23 +97,24 @@
func (m *Timestamp) String() string { return proto.CompactTextString(m) }
func (*Timestamp) ProtoMessage() {}
func (*Timestamp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (*Timestamp) XXX_WellKnownType() string { return "Timestamp" }
func init() {
proto.RegisterType((*Timestamp)(nil), "google.protobuf.Timestamp")
}
var fileDescriptor0 = []byte{
- // 190 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x4a, 0xcf, 0x2c, 0xc9,
+ // 191 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x4e, 0xcf, 0x2c, 0xc9,
0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x49, 0xcc, 0x4b, 0xd7, 0x2f, 0x28,
- 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2f, 0xc9, 0xcc,
- 0x4d, 0x2d, 0x2e, 0x49, 0xcc, 0x2d, 0x40, 0xb0, 0xf4, 0xc0, 0x4a, 0x84, 0xf8, 0xd3, 0xf3, 0xf3,
- 0xd3, 0x73, 0x52, 0xf5, 0x60, 0x1a, 0x94, 0xac, 0xb9, 0x38, 0x43, 0x60, 0x6a, 0x84, 0x24, 0xb8,
- 0xd8, 0x8b, 0x53, 0x93, 0xf3, 0xf3, 0x52, 0x8a, 0x25, 0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0x60,
- 0x5c, 0x21, 0x11, 0x2e, 0xd6, 0xbc, 0xc4, 0xbc, 0xfc, 0x62, 0x09, 0x26, 0xa0, 0x38, 0x6b, 0x10,
- 0x84, 0xe3, 0x14, 0xcf, 0x25, 0x0c, 0x74, 0x84, 0x1e, 0x9a, 0x99, 0x4e, 0x7c, 0x70, 0x13, 0x03,
- 0x40, 0x42, 0x01, 0x8c, 0x51, 0x9c, 0x70, 0x77, 0x2c, 0x60, 0x64, 0xfc, 0xc1, 0xc8, 0xb8, 0x88,
- 0x89, 0xd9, 0x3d, 0xc0, 0x69, 0x15, 0x93, 0x9c, 0x3b, 0x44, 0x6b, 0x00, 0x54, 0xab, 0x5e, 0x78,
- 0x6a, 0x4e, 0x8e, 0x77, 0x5e, 0x7e, 0x79, 0x5e, 0x08, 0xc8, 0x23, 0x49, 0x6c, 0x60, 0x33, 0x8d,
- 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xdd, 0x30, 0x93, 0xf3, 0x00, 0x00, 0x00,
+ 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0x28, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2f, 0xc9,
+ 0xcc, 0x4d, 0x2d, 0x2e, 0x49, 0xcc, 0x2d, 0x40, 0xb0, 0xf4, 0xc0, 0x6a, 0x84, 0xf8, 0xd3, 0xf3,
+ 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0x60, 0x3a, 0x94, 0xac, 0xb9, 0x38, 0x43, 0x60, 0x6a, 0x84, 0x24,
+ 0xb8, 0xd8, 0x8b, 0x53, 0x93, 0xf3, 0xf3, 0x52, 0x8a, 0x25, 0x18, 0x15, 0x18, 0x35, 0x98, 0x83,
+ 0x60, 0x5c, 0x21, 0x11, 0x2e, 0xd6, 0xbc, 0xc4, 0xbc, 0xfc, 0x62, 0x09, 0x26, 0xa0, 0x38, 0x6b,
+ 0x10, 0x84, 0xe3, 0x14, 0xcf, 0x25, 0x0c, 0x74, 0x85, 0x1e, 0x9a, 0x99, 0x4e, 0x7c, 0x70, 0x13,
+ 0x03, 0x40, 0x42, 0x01, 0x8c, 0x51, 0x9c, 0x70, 0x77, 0x2c, 0x60, 0x64, 0xfc, 0xc1, 0xc8, 0xb8,
+ 0x88, 0x89, 0xd9, 0x3d, 0xc0, 0x69, 0x15, 0x93, 0x9c, 0x3b, 0x44, 0x6b, 0x00, 0x54, 0xab, 0x5e,
+ 0x78, 0x6a, 0x4e, 0x8e, 0x77, 0x5e, 0x7e, 0x79, 0x5e, 0x08, 0xc8, 0x23, 0x49, 0x6c, 0x60, 0x33,
+ 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xab, 0x67, 0x0c, 0x88, 0xf4, 0x00, 0x00, 0x00,
}
diff --git a/ptypes/wrappers/wrappers.pb.go b/ptypes/wrappers/wrappers.pb.go
index e90bdea..1363bb6 100644
--- a/ptypes/wrappers/wrappers.pb.go
+++ b/ptypes/wrappers/wrappers.pb.go
@@ -1,12 +1,12 @@
// Code generated by protoc-gen-go.
-// source: github.com/golang/protobuf/types/wrappers/wrappers.proto
+// source: github.com/golang/protobuf/ptypes/wrappers/wrappers.proto
// DO NOT EDIT!
/*
Package wrappers is a generated protocol buffer package.
It is generated from these files:
- github.com/golang/protobuf/types/wrappers/wrappers.proto
+ github.com/golang/protobuf/ptypes/wrappers/wrappers.proto
It has these top-level messages:
DoubleValue
@@ -164,22 +164,22 @@
}
var fileDescriptor0 = []byte{
- // 257 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x48, 0xcf, 0x2c, 0xc9,
+ // 258 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x4c, 0xcf, 0x2c, 0xc9,
0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x49, 0xcc, 0x4b, 0xd7, 0x2f, 0x28,
- 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2f, 0x2f, 0x4a,
- 0x2c, 0x28, 0x48, 0x2d, 0x42, 0x30, 0xf4, 0xc0, 0x0a, 0x84, 0xf8, 0xd3, 0xf3, 0xf3, 0xd3, 0x73,
- 0x52, 0xf5, 0x60, 0xca, 0x95, 0x94, 0xb9, 0xb8, 0x5d, 0xf2, 0x4b, 0x93, 0x72, 0x52, 0xc3, 0x12,
- 0x73, 0x4a, 0x53, 0x85, 0x44, 0xb8, 0x58, 0xcb, 0x40, 0x0c, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xc6,
- 0x20, 0x08, 0x47, 0x49, 0x89, 0x8b, 0xcb, 0x2d, 0x27, 0x3f, 0xb1, 0x04, 0x8b, 0x1a, 0x26, 0x24,
- 0x35, 0x9e, 0x79, 0x25, 0x66, 0x26, 0x58, 0xd4, 0x30, 0xc3, 0xd4, 0x00, 0x2d, 0x0b, 0xc5, 0xa5,
- 0x88, 0x05, 0xd5, 0x20, 0x63, 0x23, 0x2c, 0x6a, 0x58, 0xd1, 0x0c, 0xc2, 0xaa, 0x88, 0x17, 0xa6,
- 0x48, 0x91, 0x8b, 0xd3, 0x29, 0x3f, 0x3f, 0x07, 0x8b, 0x12, 0x0e, 0x24, 0x73, 0x82, 0x4b, 0x8a,
- 0x32, 0xf3, 0xd2, 0xb1, 0x28, 0xe2, 0x44, 0x72, 0x90, 0x53, 0x65, 0x49, 0x6a, 0x31, 0x16, 0x35,
- 0x3c, 0x50, 0x35, 0x4e, 0xb1, 0x5c, 0xc2, 0xc0, 0xc8, 0xd0, 0x43, 0x0b, 0x5d, 0x27, 0xde, 0x70,
- 0x68, 0xf0, 0x07, 0x80, 0x44, 0x02, 0x18, 0xa3, 0x38, 0x60, 0xf1, 0xb1, 0x80, 0x91, 0xf1, 0x07,
- 0x23, 0xe3, 0x22, 0x26, 0x66, 0xf7, 0x00, 0xa7, 0x55, 0x4c, 0x72, 0xee, 0x10, 0x8d, 0x01, 0x50,
- 0x8d, 0x7a, 0xe1, 0xa9, 0x39, 0x39, 0xde, 0x79, 0xf9, 0xe5, 0x79, 0x21, 0xa0, 0xe8, 0x4c, 0x62,
- 0x03, 0x9b, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x9a, 0x07, 0x71, 0xf9, 0x01, 0x00,
- 0x00,
+ 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0x28, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2f, 0x2f,
+ 0x4a, 0x2c, 0x28, 0x48, 0x2d, 0x42, 0x30, 0xf4, 0xc0, 0x2a, 0x84, 0xf8, 0xd3, 0xf3, 0xf3, 0xd3,
+ 0x73, 0x52, 0xf5, 0x60, 0xea, 0x95, 0x94, 0xb9, 0xb8, 0x5d, 0xf2, 0x4b, 0x93, 0x72, 0x52, 0xc3,
+ 0x12, 0x73, 0x4a, 0x53, 0x85, 0x44, 0xb8, 0x58, 0xcb, 0x40, 0x0c, 0x09, 0x46, 0x05, 0x46, 0x0d,
+ 0xc6, 0x20, 0x08, 0x47, 0x49, 0x89, 0x8b, 0xcb, 0x2d, 0x27, 0x3f, 0xb1, 0x04, 0x8b, 0x1a, 0x26,
+ 0x24, 0x35, 0x9e, 0x79, 0x25, 0x66, 0x26, 0x58, 0xd4, 0x30, 0xc3, 0xd4, 0x00, 0x2d, 0x0b, 0xc5,
+ 0xa5, 0x88, 0x05, 0xd5, 0x20, 0x63, 0x23, 0x2c, 0x6a, 0x58, 0xd1, 0x0c, 0xc2, 0xaa, 0x88, 0x17,
+ 0xa6, 0x48, 0x91, 0x8b, 0xd3, 0x29, 0x3f, 0x3f, 0x07, 0x8b, 0x12, 0x0e, 0x24, 0x73, 0x82, 0x4b,
+ 0x8a, 0x32, 0xf3, 0xd2, 0xb1, 0x28, 0xe2, 0x44, 0x72, 0x90, 0x53, 0x65, 0x49, 0x6a, 0x31, 0x16,
+ 0x35, 0x3c, 0x50, 0x35, 0x4e, 0xb1, 0x5c, 0xc2, 0xc0, 0xd8, 0xd0, 0x43, 0x0b, 0x5d, 0x27, 0xde,
+ 0x70, 0x68, 0xf0, 0x07, 0x80, 0x44, 0x02, 0x18, 0xa3, 0x38, 0x60, 0xf1, 0xb1, 0x80, 0x91, 0xf1,
+ 0x07, 0x23, 0xe3, 0x22, 0x26, 0x66, 0xf7, 0x00, 0xa7, 0x55, 0x4c, 0x72, 0xee, 0x10, 0x8d, 0x01,
+ 0x50, 0x8d, 0x7a, 0xe1, 0xa9, 0x39, 0x39, 0xde, 0x79, 0xf9, 0xe5, 0x79, 0x21, 0xa0, 0xe8, 0x4c,
+ 0x62, 0x03, 0x9b, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xa9, 0xa6, 0x85, 0xcd, 0xfa, 0x01,
+ 0x00, 0x00,
}
