2019-07-17 23:52:10 +00:00
|
|
|
// Copyright 2018 The Go Authors. All rights reserved.
|
|
|
|
// Use of this source code is governed by a BSD-style
|
|
|
|
// license that can be found in the LICENSE file.
|
|
|
|
|
|
|
|
package impl
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"reflect"
|
|
|
|
|
|
|
|
pref "google.golang.org/protobuf/reflect/protoreflect"
|
|
|
|
)
|
|
|
|
|
2019-09-03 23:30:39 +00:00
|
|
|
// unwrapper unwraps the value to the underlying value.
|
2019-07-17 23:52:10 +00:00
|
|
|
// This is implemented by List and Map.
|
2019-09-03 23:30:39 +00:00
|
|
|
type unwrapper interface {
|
|
|
|
protoUnwrap() interface{}
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// A Converter coverts to/from Go reflect.Value types and protobuf protoreflect.Value types.
|
|
|
|
type Converter interface {
|
all: make handling of zero-value composites more consistent
We occasionally need to work with immutable, empty lists, maps, and
messages. Notably, Message.Get on an empty repeated field will return a
"frozen" empty value.
Move handling of these immutable, zero-length composites into Converter,
to unify the behavior of regular and extension fields.
Add a Zero method to Converter, MessageType, and ExtensionType, to
provide a consistent way to get an empty, frozen value of a composite
type. Adding this method to the public {Message,Extension}Type
interfaces does increase our API surface, but lets us (for example)
cleanly represent an empty map as a nil map rather than a non-nil
one wrapped in a frozenMap type.
Drop the frozen{List,Map,Message} types as no longer necessary.
(These types did have support for creating a read-only view of a
non-empty value, but we are not currently using that feature.)
Change-Id: Ia76f149d591da07b40ce75b7404a7ab8a60cb9d8
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189339
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-07 19:21:41 +00:00
|
|
|
// PBValueOf converts a reflect.Value to a protoreflect.Value.
|
2019-07-17 23:52:10 +00:00
|
|
|
PBValueOf(reflect.Value) pref.Value
|
all: make handling of zero-value composites more consistent
We occasionally need to work with immutable, empty lists, maps, and
messages. Notably, Message.Get on an empty repeated field will return a
"frozen" empty value.
Move handling of these immutable, zero-length composites into Converter,
to unify the behavior of regular and extension fields.
Add a Zero method to Converter, MessageType, and ExtensionType, to
provide a consistent way to get an empty, frozen value of a composite
type. Adding this method to the public {Message,Extension}Type
interfaces does increase our API surface, but lets us (for example)
cleanly represent an empty map as a nil map rather than a non-nil
one wrapped in a frozenMap type.
Drop the frozen{List,Map,Message} types as no longer necessary.
(These types did have support for creating a read-only view of a
non-empty value, but we are not currently using that feature.)
Change-Id: Ia76f149d591da07b40ce75b7404a7ab8a60cb9d8
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189339
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-07 19:21:41 +00:00
|
|
|
|
|
|
|
// GoValueOf converts a protoreflect.Value to a reflect.Value.
|
2019-07-17 23:52:10 +00:00
|
|
|
GoValueOf(pref.Value) reflect.Value
|
all: make handling of zero-value composites more consistent
We occasionally need to work with immutable, empty lists, maps, and
messages. Notably, Message.Get on an empty repeated field will return a
"frozen" empty value.
Move handling of these immutable, zero-length composites into Converter,
to unify the behavior of regular and extension fields.
Add a Zero method to Converter, MessageType, and ExtensionType, to
provide a consistent way to get an empty, frozen value of a composite
type. Adding this method to the public {Message,Extension}Type
interfaces does increase our API surface, but lets us (for example)
cleanly represent an empty map as a nil map rather than a non-nil
one wrapped in a frozenMap type.
Drop the frozen{List,Map,Message} types as no longer necessary.
(These types did have support for creating a read-only view of a
non-empty value, but we are not currently using that feature.)
Change-Id: Ia76f149d591da07b40ce75b7404a7ab8a60cb9d8
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189339
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-07 19:21:41 +00:00
|
|
|
|
2019-08-29 21:08:28 +00:00
|
|
|
// IsValidPB returns whether a protoreflect.Value is compatible with this type.
|
|
|
|
IsValidPB(pref.Value) bool
|
|
|
|
|
|
|
|
// IsValidGo returns whether a reflect.Value is compatible with this type.
|
|
|
|
IsValidGo(reflect.Value) bool
|
|
|
|
|
all: make handling of zero-value composites more consistent
We occasionally need to work with immutable, empty lists, maps, and
messages. Notably, Message.Get on an empty repeated field will return a
"frozen" empty value.
Move handling of these immutable, zero-length composites into Converter,
to unify the behavior of regular and extension fields.
Add a Zero method to Converter, MessageType, and ExtensionType, to
provide a consistent way to get an empty, frozen value of a composite
type. Adding this method to the public {Message,Extension}Type
interfaces does increase our API surface, but lets us (for example)
cleanly represent an empty map as a nil map rather than a non-nil
one wrapped in a frozenMap type.
Drop the frozen{List,Map,Message} types as no longer necessary.
(These types did have support for creating a read-only view of a
non-empty value, but we are not currently using that feature.)
Change-Id: Ia76f149d591da07b40ce75b7404a7ab8a60cb9d8
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189339
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-07 19:21:41 +00:00
|
|
|
// New returns a new field value.
|
|
|
|
// For scalars, it returns the default value of the field.
|
|
|
|
// For composite types, it returns a new mutable value.
|
2019-07-17 23:52:10 +00:00
|
|
|
New() pref.Value
|
all: make handling of zero-value composites more consistent
We occasionally need to work with immutable, empty lists, maps, and
messages. Notably, Message.Get on an empty repeated field will return a
"frozen" empty value.
Move handling of these immutable, zero-length composites into Converter,
to unify the behavior of regular and extension fields.
Add a Zero method to Converter, MessageType, and ExtensionType, to
provide a consistent way to get an empty, frozen value of a composite
type. Adding this method to the public {Message,Extension}Type
interfaces does increase our API surface, but lets us (for example)
cleanly represent an empty map as a nil map rather than a non-nil
one wrapped in a frozenMap type.
Drop the frozen{List,Map,Message} types as no longer necessary.
(These types did have support for creating a read-only view of a
non-empty value, but we are not currently using that feature.)
Change-Id: Ia76f149d591da07b40ce75b7404a7ab8a60cb9d8
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189339
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-07 19:21:41 +00:00
|
|
|
|
|
|
|
// Zero returns a new field value.
|
|
|
|
// For scalars, it returns the default value of the field.
|
|
|
|
// For composite types, it returns an immutable, empty value.
|
|
|
|
Zero() pref.Value
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// NewConverter matches a Go type with a protobuf field and returns a Converter
|
|
|
|
// that converts between the two. Enums must be a named int32 kind that
|
|
|
|
// implements protoreflect.Enum, and messages must be pointer to a named
|
|
|
|
// struct type that implements protoreflect.ProtoMessage.
|
|
|
|
//
|
|
|
|
// This matcher deliberately supports a wider range of Go types than what
|
|
|
|
// protoc-gen-go historically generated to be able to automatically wrap some
|
|
|
|
// v1 messages generated by other forks of protoc-gen-go.
|
|
|
|
func NewConverter(t reflect.Type, fd pref.FieldDescriptor) Converter {
|
|
|
|
switch {
|
|
|
|
case fd.IsList():
|
|
|
|
return newListConverter(t, fd)
|
|
|
|
case fd.IsMap():
|
|
|
|
return newMapConverter(t, fd)
|
|
|
|
default:
|
|
|
|
return newSingularConverter(t, fd)
|
|
|
|
}
|
|
|
|
panic(fmt.Sprintf("invalid Go type %v for field %v", t, fd.FullName()))
|
|
|
|
}
|
|
|
|
|
|
|
|
var (
|
|
|
|
boolType = reflect.TypeOf(bool(false))
|
|
|
|
int32Type = reflect.TypeOf(int32(0))
|
|
|
|
int64Type = reflect.TypeOf(int64(0))
|
|
|
|
uint32Type = reflect.TypeOf(uint32(0))
|
|
|
|
uint64Type = reflect.TypeOf(uint64(0))
|
|
|
|
float32Type = reflect.TypeOf(float32(0))
|
|
|
|
float64Type = reflect.TypeOf(float64(0))
|
|
|
|
stringType = reflect.TypeOf(string(""))
|
|
|
|
bytesType = reflect.TypeOf([]byte(nil))
|
|
|
|
byteType = reflect.TypeOf(byte(0))
|
|
|
|
)
|
|
|
|
|
all: add NewField, NewElement, NewValue
Add methods to protoreflect.{Message,List,Map} to constrict values
assignable to a message field, list element, or map value. These
methods return the default value for scalar fields, the zero value for
scalar list elements and map values, and an empty, mutable value for
messages, lists, and maps.
Deprecate the NewMessage methods on these types, which are superseded.
Updates golang/protobuf#879
Change-Id: I0f064f60c89a239330ccea81523f559f14fd2c4f
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188997
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-05 17:48:38 +00:00
|
|
|
var (
|
2019-09-17 20:38:48 +00:00
|
|
|
boolZero = pref.ValueOfBool(false)
|
|
|
|
int32Zero = pref.ValueOfInt32(0)
|
|
|
|
int64Zero = pref.ValueOfInt64(0)
|
|
|
|
uint32Zero = pref.ValueOfUint32(0)
|
|
|
|
uint64Zero = pref.ValueOfUint64(0)
|
|
|
|
float32Zero = pref.ValueOfFloat32(0)
|
|
|
|
float64Zero = pref.ValueOfFloat64(0)
|
|
|
|
stringZero = pref.ValueOfString("")
|
|
|
|
bytesZero = pref.ValueOfBytes(nil)
|
all: add NewField, NewElement, NewValue
Add methods to protoreflect.{Message,List,Map} to constrict values
assignable to a message field, list element, or map value. These
methods return the default value for scalar fields, the zero value for
scalar list elements and map values, and an empty, mutable value for
messages, lists, and maps.
Deprecate the NewMessage methods on these types, which are superseded.
Updates golang/protobuf#879
Change-Id: I0f064f60c89a239330ccea81523f559f14fd2c4f
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188997
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-05 17:48:38 +00:00
|
|
|
)
|
|
|
|
|
2019-07-17 23:52:10 +00:00
|
|
|
func newSingularConverter(t reflect.Type, fd pref.FieldDescriptor) Converter {
|
all: add NewField, NewElement, NewValue
Add methods to protoreflect.{Message,List,Map} to constrict values
assignable to a message field, list element, or map value. These
methods return the default value for scalar fields, the zero value for
scalar list elements and map values, and an empty, mutable value for
messages, lists, and maps.
Deprecate the NewMessage methods on these types, which are superseded.
Updates golang/protobuf#879
Change-Id: I0f064f60c89a239330ccea81523f559f14fd2c4f
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188997
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-05 17:48:38 +00:00
|
|
|
defVal := func(fd pref.FieldDescriptor, zero pref.Value) pref.Value {
|
|
|
|
if fd.Cardinality() == pref.Repeated {
|
|
|
|
// Default isn't defined for repeated fields.
|
|
|
|
return zero
|
|
|
|
}
|
|
|
|
return fd.Default()
|
|
|
|
}
|
2019-07-17 23:52:10 +00:00
|
|
|
switch fd.Kind() {
|
|
|
|
case pref.BoolKind:
|
|
|
|
if t.Kind() == reflect.Bool {
|
2019-08-23 00:01:56 +00:00
|
|
|
return &boolConverter{t, defVal(fd, boolZero)}
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
case pref.Int32Kind, pref.Sint32Kind, pref.Sfixed32Kind:
|
|
|
|
if t.Kind() == reflect.Int32 {
|
2019-08-23 00:01:56 +00:00
|
|
|
return &int32Converter{t, defVal(fd, int32Zero)}
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
case pref.Int64Kind, pref.Sint64Kind, pref.Sfixed64Kind:
|
|
|
|
if t.Kind() == reflect.Int64 {
|
2019-08-23 00:01:56 +00:00
|
|
|
return &int64Converter{t, defVal(fd, int64Zero)}
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
case pref.Uint32Kind, pref.Fixed32Kind:
|
|
|
|
if t.Kind() == reflect.Uint32 {
|
2019-08-23 00:01:56 +00:00
|
|
|
return &uint32Converter{t, defVal(fd, uint32Zero)}
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
case pref.Uint64Kind, pref.Fixed64Kind:
|
|
|
|
if t.Kind() == reflect.Uint64 {
|
2019-08-23 00:01:56 +00:00
|
|
|
return &uint64Converter{t, defVal(fd, uint64Zero)}
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
case pref.FloatKind:
|
|
|
|
if t.Kind() == reflect.Float32 {
|
2019-08-23 00:01:56 +00:00
|
|
|
return &float32Converter{t, defVal(fd, float32Zero)}
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
case pref.DoubleKind:
|
|
|
|
if t.Kind() == reflect.Float64 {
|
2019-08-23 00:01:56 +00:00
|
|
|
return &float64Converter{t, defVal(fd, float64Zero)}
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
case pref.StringKind:
|
|
|
|
if t.Kind() == reflect.String || (t.Kind() == reflect.Slice && t.Elem() == byteType) {
|
2019-08-23 00:01:56 +00:00
|
|
|
return &stringConverter{t, defVal(fd, stringZero)}
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
case pref.BytesKind:
|
|
|
|
if t.Kind() == reflect.String || (t.Kind() == reflect.Slice && t.Elem() == byteType) {
|
2019-08-23 00:01:56 +00:00
|
|
|
return &bytesConverter{t, defVal(fd, bytesZero)}
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
case pref.EnumKind:
|
|
|
|
// Handle enums, which must be a named int32 type.
|
|
|
|
if t.Kind() == reflect.Int32 {
|
|
|
|
return newEnumConverter(t, fd)
|
|
|
|
}
|
|
|
|
case pref.MessageKind, pref.GroupKind:
|
|
|
|
return newMessageConverter(t)
|
|
|
|
}
|
|
|
|
panic(fmt.Sprintf("invalid Go type %v for field %v", t, fd.FullName()))
|
|
|
|
}
|
|
|
|
|
2019-08-23 00:01:56 +00:00
|
|
|
type boolConverter struct {
|
|
|
|
goType reflect.Type
|
|
|
|
def pref.Value
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *boolConverter) PBValueOf(v reflect.Value) pref.Value {
|
2019-07-17 23:52:10 +00:00
|
|
|
if v.Type() != c.goType {
|
|
|
|
panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType))
|
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
return pref.ValueOfBool(v.Bool())
|
|
|
|
}
|
|
|
|
func (c *boolConverter) GoValueOf(v pref.Value) reflect.Value {
|
|
|
|
return reflect.ValueOf(v.Bool()).Convert(c.goType)
|
|
|
|
}
|
2019-08-29 21:08:28 +00:00
|
|
|
func (c *boolConverter) IsValidPB(v pref.Value) bool {
|
|
|
|
_, ok := v.Interface().(bool)
|
|
|
|
return ok
|
|
|
|
}
|
|
|
|
func (c *boolConverter) IsValidGo(v reflect.Value) bool {
|
|
|
|
return v.Type() == c.goType
|
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
func (c *boolConverter) New() pref.Value { return c.def }
|
|
|
|
func (c *boolConverter) Zero() pref.Value { return c.def }
|
|
|
|
|
|
|
|
type int32Converter struct {
|
|
|
|
goType reflect.Type
|
|
|
|
def pref.Value
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *int32Converter) PBValueOf(v reflect.Value) pref.Value {
|
|
|
|
if v.Type() != c.goType {
|
|
|
|
panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType))
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
return pref.ValueOfInt32(int32(v.Int()))
|
|
|
|
}
|
|
|
|
func (c *int32Converter) GoValueOf(v pref.Value) reflect.Value {
|
|
|
|
return reflect.ValueOf(int32(v.Int())).Convert(c.goType)
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
2019-08-29 21:08:28 +00:00
|
|
|
func (c *int32Converter) IsValidPB(v pref.Value) bool {
|
|
|
|
_, ok := v.Interface().(int32)
|
|
|
|
return ok
|
|
|
|
}
|
|
|
|
func (c *int32Converter) IsValidGo(v reflect.Value) bool {
|
|
|
|
return v.Type() == c.goType
|
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
func (c *int32Converter) New() pref.Value { return c.def }
|
|
|
|
func (c *int32Converter) Zero() pref.Value { return c.def }
|
2019-07-17 23:52:10 +00:00
|
|
|
|
2019-08-23 00:01:56 +00:00
|
|
|
type int64Converter struct {
|
|
|
|
goType reflect.Type
|
|
|
|
def pref.Value
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *int64Converter) PBValueOf(v reflect.Value) pref.Value {
|
|
|
|
if v.Type() != c.goType {
|
|
|
|
panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType))
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
return pref.ValueOfInt64(int64(v.Int()))
|
|
|
|
}
|
|
|
|
func (c *int64Converter) GoValueOf(v pref.Value) reflect.Value {
|
|
|
|
return reflect.ValueOf(int64(v.Int())).Convert(c.goType)
|
|
|
|
}
|
2019-08-29 21:08:28 +00:00
|
|
|
func (c *int64Converter) IsValidPB(v pref.Value) bool {
|
|
|
|
_, ok := v.Interface().(int64)
|
|
|
|
return ok
|
|
|
|
}
|
|
|
|
func (c *int64Converter) IsValidGo(v reflect.Value) bool {
|
|
|
|
return v.Type() == c.goType
|
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
func (c *int64Converter) New() pref.Value { return c.def }
|
|
|
|
func (c *int64Converter) Zero() pref.Value { return c.def }
|
|
|
|
|
|
|
|
type uint32Converter struct {
|
|
|
|
goType reflect.Type
|
|
|
|
def pref.Value
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *uint32Converter) PBValueOf(v reflect.Value) pref.Value {
|
|
|
|
if v.Type() != c.goType {
|
|
|
|
panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType))
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
return pref.ValueOfUint32(uint32(v.Uint()))
|
|
|
|
}
|
|
|
|
func (c *uint32Converter) GoValueOf(v pref.Value) reflect.Value {
|
|
|
|
return reflect.ValueOf(uint32(v.Uint())).Convert(c.goType)
|
|
|
|
}
|
2019-08-29 21:08:28 +00:00
|
|
|
func (c *uint32Converter) IsValidPB(v pref.Value) bool {
|
|
|
|
_, ok := v.Interface().(uint32)
|
|
|
|
return ok
|
|
|
|
}
|
|
|
|
func (c *uint32Converter) IsValidGo(v reflect.Value) bool {
|
|
|
|
return v.Type() == c.goType
|
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
func (c *uint32Converter) New() pref.Value { return c.def }
|
|
|
|
func (c *uint32Converter) Zero() pref.Value { return c.def }
|
|
|
|
|
|
|
|
type uint64Converter struct {
|
|
|
|
goType reflect.Type
|
|
|
|
def pref.Value
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
|
2019-08-23 00:01:56 +00:00
|
|
|
func (c *uint64Converter) PBValueOf(v reflect.Value) pref.Value {
|
|
|
|
if v.Type() != c.goType {
|
|
|
|
panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType))
|
all: add NewField, NewElement, NewValue
Add methods to protoreflect.{Message,List,Map} to constrict values
assignable to a message field, list element, or map value. These
methods return the default value for scalar fields, the zero value for
scalar list elements and map values, and an empty, mutable value for
messages, lists, and maps.
Deprecate the NewMessage methods on these types, which are superseded.
Updates golang/protobuf#879
Change-Id: I0f064f60c89a239330ccea81523f559f14fd2c4f
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188997
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-05 17:48:38 +00:00
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
return pref.ValueOfUint64(uint64(v.Uint()))
|
|
|
|
}
|
|
|
|
func (c *uint64Converter) GoValueOf(v pref.Value) reflect.Value {
|
|
|
|
return reflect.ValueOf(uint64(v.Uint())).Convert(c.goType)
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
2019-08-29 21:08:28 +00:00
|
|
|
func (c *uint64Converter) IsValidPB(v pref.Value) bool {
|
|
|
|
_, ok := v.Interface().(uint64)
|
|
|
|
return ok
|
|
|
|
}
|
|
|
|
func (c *uint64Converter) IsValidGo(v reflect.Value) bool {
|
|
|
|
return v.Type() == c.goType
|
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
func (c *uint64Converter) New() pref.Value { return c.def }
|
|
|
|
func (c *uint64Converter) Zero() pref.Value { return c.def }
|
2019-07-17 23:52:10 +00:00
|
|
|
|
2019-08-23 00:01:56 +00:00
|
|
|
type float32Converter struct {
|
|
|
|
goType reflect.Type
|
|
|
|
def pref.Value
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *float32Converter) PBValueOf(v reflect.Value) pref.Value {
|
|
|
|
if v.Type() != c.goType {
|
|
|
|
panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType))
|
|
|
|
}
|
|
|
|
return pref.ValueOfFloat32(float32(v.Float()))
|
|
|
|
}
|
|
|
|
func (c *float32Converter) GoValueOf(v pref.Value) reflect.Value {
|
|
|
|
return reflect.ValueOf(float32(v.Float())).Convert(c.goType)
|
|
|
|
}
|
2019-08-29 21:08:28 +00:00
|
|
|
func (c *float32Converter) IsValidPB(v pref.Value) bool {
|
|
|
|
_, ok := v.Interface().(float32)
|
|
|
|
return ok
|
|
|
|
}
|
|
|
|
func (c *float32Converter) IsValidGo(v reflect.Value) bool {
|
|
|
|
return v.Type() == c.goType
|
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
func (c *float32Converter) New() pref.Value { return c.def }
|
|
|
|
func (c *float32Converter) Zero() pref.Value { return c.def }
|
|
|
|
|
|
|
|
type float64Converter struct {
|
|
|
|
goType reflect.Type
|
|
|
|
def pref.Value
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *float64Converter) PBValueOf(v reflect.Value) pref.Value {
|
|
|
|
if v.Type() != c.goType {
|
|
|
|
panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType))
|
|
|
|
}
|
|
|
|
return pref.ValueOfFloat64(float64(v.Float()))
|
|
|
|
}
|
|
|
|
func (c *float64Converter) GoValueOf(v pref.Value) reflect.Value {
|
|
|
|
return reflect.ValueOf(float64(v.Float())).Convert(c.goType)
|
|
|
|
}
|
2019-08-29 21:08:28 +00:00
|
|
|
func (c *float64Converter) IsValidPB(v pref.Value) bool {
|
|
|
|
_, ok := v.Interface().(float64)
|
|
|
|
return ok
|
|
|
|
}
|
|
|
|
func (c *float64Converter) IsValidGo(v reflect.Value) bool {
|
|
|
|
return v.Type() == c.goType
|
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
func (c *float64Converter) New() pref.Value { return c.def }
|
|
|
|
func (c *float64Converter) Zero() pref.Value { return c.def }
|
|
|
|
|
|
|
|
type stringConverter struct {
|
|
|
|
goType reflect.Type
|
|
|
|
def pref.Value
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *stringConverter) PBValueOf(v reflect.Value) pref.Value {
|
|
|
|
if v.Type() != c.goType {
|
|
|
|
panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType))
|
|
|
|
}
|
|
|
|
return pref.ValueOfString(v.Convert(stringType).String())
|
|
|
|
}
|
|
|
|
func (c *stringConverter) GoValueOf(v pref.Value) reflect.Value {
|
|
|
|
// pref.Value.String never panics, so we go through an interface
|
|
|
|
// conversion here to check the type.
|
|
|
|
s := v.Interface().(string)
|
|
|
|
if c.goType.Kind() == reflect.Slice && s == "" {
|
|
|
|
return reflect.Zero(c.goType) // ensure empty string is []byte(nil)
|
|
|
|
}
|
|
|
|
return reflect.ValueOf(s).Convert(c.goType)
|
|
|
|
}
|
2019-08-29 21:08:28 +00:00
|
|
|
func (c *stringConverter) IsValidPB(v pref.Value) bool {
|
|
|
|
_, ok := v.Interface().(string)
|
|
|
|
return ok
|
|
|
|
}
|
|
|
|
func (c *stringConverter) IsValidGo(v reflect.Value) bool {
|
|
|
|
return v.Type() == c.goType
|
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
func (c *stringConverter) New() pref.Value { return c.def }
|
|
|
|
func (c *stringConverter) Zero() pref.Value { return c.def }
|
|
|
|
|
|
|
|
type bytesConverter struct {
|
|
|
|
goType reflect.Type
|
|
|
|
def pref.Value
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *bytesConverter) PBValueOf(v reflect.Value) pref.Value {
|
|
|
|
if v.Type() != c.goType {
|
|
|
|
panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType))
|
|
|
|
}
|
|
|
|
if c.goType.Kind() == reflect.String && v.Len() == 0 {
|
|
|
|
return pref.ValueOfBytes(nil) // ensure empty string is []byte(nil)
|
|
|
|
}
|
|
|
|
return pref.ValueOfBytes(v.Convert(bytesType).Bytes())
|
|
|
|
}
|
|
|
|
func (c *bytesConverter) GoValueOf(v pref.Value) reflect.Value {
|
|
|
|
return reflect.ValueOf(v.Bytes()).Convert(c.goType)
|
all: make handling of zero-value composites more consistent
We occasionally need to work with immutable, empty lists, maps, and
messages. Notably, Message.Get on an empty repeated field will return a
"frozen" empty value.
Move handling of these immutable, zero-length composites into Converter,
to unify the behavior of regular and extension fields.
Add a Zero method to Converter, MessageType, and ExtensionType, to
provide a consistent way to get an empty, frozen value of a composite
type. Adding this method to the public {Message,Extension}Type
interfaces does increase our API surface, but lets us (for example)
cleanly represent an empty map as a nil map rather than a non-nil
one wrapped in a frozenMap type.
Drop the frozen{List,Map,Message} types as no longer necessary.
(These types did have support for creating a read-only view of a
non-empty value, but we are not currently using that feature.)
Change-Id: Ia76f149d591da07b40ce75b7404a7ab8a60cb9d8
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189339
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-07 19:21:41 +00:00
|
|
|
}
|
2019-08-29 21:08:28 +00:00
|
|
|
func (c *bytesConverter) IsValidPB(v pref.Value) bool {
|
|
|
|
_, ok := v.Interface().([]byte)
|
|
|
|
return ok
|
|
|
|
}
|
|
|
|
func (c *bytesConverter) IsValidGo(v reflect.Value) bool {
|
|
|
|
return v.Type() == c.goType
|
|
|
|
}
|
2019-08-23 00:01:56 +00:00
|
|
|
func (c *bytesConverter) New() pref.Value { return c.def }
|
|
|
|
func (c *bytesConverter) Zero() pref.Value { return c.def }
|
all: make handling of zero-value composites more consistent
We occasionally need to work with immutable, empty lists, maps, and
messages. Notably, Message.Get on an empty repeated field will return a
"frozen" empty value.
Move handling of these immutable, zero-length composites into Converter,
to unify the behavior of regular and extension fields.
Add a Zero method to Converter, MessageType, and ExtensionType, to
provide a consistent way to get an empty, frozen value of a composite
type. Adding this method to the public {Message,Extension}Type
interfaces does increase our API surface, but lets us (for example)
cleanly represent an empty map as a nil map rather than a non-nil
one wrapped in a frozenMap type.
Drop the frozen{List,Map,Message} types as no longer necessary.
(These types did have support for creating a read-only view of a
non-empty value, but we are not currently using that feature.)
Change-Id: Ia76f149d591da07b40ce75b7404a7ab8a60cb9d8
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189339
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-07 19:21:41 +00:00
|
|
|
|
2019-07-17 23:52:10 +00:00
|
|
|
type enumConverter struct {
|
|
|
|
goType reflect.Type
|
|
|
|
def pref.Value
|
|
|
|
}
|
|
|
|
|
|
|
|
func newEnumConverter(goType reflect.Type, fd pref.FieldDescriptor) Converter {
|
all: add NewField, NewElement, NewValue
Add methods to protoreflect.{Message,List,Map} to constrict values
assignable to a message field, list element, or map value. These
methods return the default value for scalar fields, the zero value for
scalar list elements and map values, and an empty, mutable value for
messages, lists, and maps.
Deprecate the NewMessage methods on these types, which are superseded.
Updates golang/protobuf#879
Change-Id: I0f064f60c89a239330ccea81523f559f14fd2c4f
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188997
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-05 17:48:38 +00:00
|
|
|
var def pref.Value
|
|
|
|
if fd.Cardinality() == pref.Repeated {
|
2019-09-17 20:38:48 +00:00
|
|
|
def = pref.ValueOfEnum(fd.Enum().Values().Get(0).Number())
|
all: add NewField, NewElement, NewValue
Add methods to protoreflect.{Message,List,Map} to constrict values
assignable to a message field, list element, or map value. These
methods return the default value for scalar fields, the zero value for
scalar list elements and map values, and an empty, mutable value for
messages, lists, and maps.
Deprecate the NewMessage methods on these types, which are superseded.
Updates golang/protobuf#879
Change-Id: I0f064f60c89a239330ccea81523f559f14fd2c4f
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188997
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-05 17:48:38 +00:00
|
|
|
} else {
|
|
|
|
def = fd.Default()
|
|
|
|
}
|
|
|
|
return &enumConverter{goType, def}
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func (c *enumConverter) PBValueOf(v reflect.Value) pref.Value {
|
|
|
|
if v.Type() != c.goType {
|
|
|
|
panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType))
|
|
|
|
}
|
2019-09-17 20:38:48 +00:00
|
|
|
return pref.ValueOfEnum(pref.EnumNumber(v.Int()))
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func (c *enumConverter) GoValueOf(v pref.Value) reflect.Value {
|
|
|
|
return reflect.ValueOf(v.Enum()).Convert(c.goType)
|
|
|
|
}
|
|
|
|
|
2019-08-29 21:08:28 +00:00
|
|
|
func (c *enumConverter) IsValidPB(v pref.Value) bool {
|
|
|
|
_, ok := v.Interface().(pref.EnumNumber)
|
|
|
|
return ok
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *enumConverter) IsValidGo(v reflect.Value) bool {
|
|
|
|
return v.Type() == c.goType
|
|
|
|
}
|
|
|
|
|
2019-07-17 23:52:10 +00:00
|
|
|
func (c *enumConverter) New() pref.Value {
|
|
|
|
return c.def
|
|
|
|
}
|
|
|
|
|
all: make handling of zero-value composites more consistent
We occasionally need to work with immutable, empty lists, maps, and
messages. Notably, Message.Get on an empty repeated field will return a
"frozen" empty value.
Move handling of these immutable, zero-length composites into Converter,
to unify the behavior of regular and extension fields.
Add a Zero method to Converter, MessageType, and ExtensionType, to
provide a consistent way to get an empty, frozen value of a composite
type. Adding this method to the public {Message,Extension}Type
interfaces does increase our API surface, but lets us (for example)
cleanly represent an empty map as a nil map rather than a non-nil
one wrapped in a frozenMap type.
Drop the frozen{List,Map,Message} types as no longer necessary.
(These types did have support for creating a read-only view of a
non-empty value, but we are not currently using that feature.)
Change-Id: Ia76f149d591da07b40ce75b7404a7ab8a60cb9d8
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189339
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-07 19:21:41 +00:00
|
|
|
func (c *enumConverter) Zero() pref.Value {
|
|
|
|
return c.def
|
|
|
|
}
|
|
|
|
|
2019-07-17 23:52:10 +00:00
|
|
|
type messageConverter struct {
|
|
|
|
goType reflect.Type
|
|
|
|
}
|
|
|
|
|
|
|
|
func newMessageConverter(goType reflect.Type) Converter {
|
|
|
|
return &messageConverter{goType}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *messageConverter) PBValueOf(v reflect.Value) pref.Value {
|
|
|
|
if v.Type() != c.goType {
|
|
|
|
panic(fmt.Sprintf("invalid type: got %v, want %v", v.Type(), c.goType))
|
|
|
|
}
|
|
|
|
if m, ok := v.Interface().(pref.ProtoMessage); ok {
|
2019-09-17 20:38:48 +00:00
|
|
|
return pref.ValueOfMessage(m.ProtoReflect())
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
2020-04-01 18:47:49 +00:00
|
|
|
return pref.ValueOfMessage(legacyWrapMessage(v))
|
2019-07-17 23:52:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func (c *messageConverter) GoValueOf(v pref.Value) reflect.Value {
|
|
|
|
m := v.Message()
|
|
|
|
var rv reflect.Value
|
2019-09-03 23:30:39 +00:00
|
|
|
if u, ok := m.(unwrapper); ok {
|
|
|
|
rv = reflect.ValueOf(u.protoUnwrap())
|
2019-07-17 23:52:10 +00:00
|
|
|
} else {
|
|
|
|
rv = reflect.ValueOf(m.Interface())
|
|
|
|
}
|
|
|
|
if rv.Type() != c.goType {
|
|
|
|
panic(fmt.Sprintf("invalid type: got %v, want %v", rv.Type(), c.goType))
|
|
|
|
}
|
|
|
|
return rv
|
|
|
|
}
|
|
|
|
|
2019-08-29 21:08:28 +00:00
|
|
|
func (c *messageConverter) IsValidPB(v pref.Value) bool {
|
|
|
|
m := v.Message()
|
|
|
|
var rv reflect.Value
|
2019-09-03 23:30:39 +00:00
|
|
|
if u, ok := m.(unwrapper); ok {
|
|
|
|
rv = reflect.ValueOf(u.protoUnwrap())
|
2019-08-29 21:08:28 +00:00
|
|
|
} else {
|
|
|
|
rv = reflect.ValueOf(m.Interface())
|
|
|
|
}
|
|
|
|
return rv.Type() == c.goType
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *messageConverter) IsValidGo(v reflect.Value) bool {
|
|
|
|
return v.Type() == c.goType
|
|
|
|
}
|
|
|
|
|
2019-07-17 23:52:10 +00:00
|
|
|
func (c *messageConverter) New() pref.Value {
|
|
|
|
return c.PBValueOf(reflect.New(c.goType.Elem()))
|
|
|
|
}
|
all: make handling of zero-value composites more consistent
We occasionally need to work with immutable, empty lists, maps, and
messages. Notably, Message.Get on an empty repeated field will return a
"frozen" empty value.
Move handling of these immutable, zero-length composites into Converter,
to unify the behavior of regular and extension fields.
Add a Zero method to Converter, MessageType, and ExtensionType, to
provide a consistent way to get an empty, frozen value of a composite
type. Adding this method to the public {Message,Extension}Type
interfaces does increase our API surface, but lets us (for example)
cleanly represent an empty map as a nil map rather than a non-nil
one wrapped in a frozenMap type.
Drop the frozen{List,Map,Message} types as no longer necessary.
(These types did have support for creating a read-only view of a
non-empty value, but we are not currently using that feature.)
Change-Id: Ia76f149d591da07b40ce75b7404a7ab8a60cb9d8
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189339
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-07 19:21:41 +00:00
|
|
|
|
|
|
|
func (c *messageConverter) Zero() pref.Value {
|
|
|
|
return c.PBValueOf(reflect.Zero(c.goType))
|
|
|
|
}
|