github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

apimachinery: runtime: cleanup code

Browse Source 
1. variable type can be inferred from right-hand side
2. receiver names should be consistent with previous receiver names
This commit is contained in:
Cong Ding 2018-07-02 17:29:30 -07:00
parent 65a5e68147
commit 3cd867fa6b
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
staging/src/k8s.io/apimachinery/pkg/runtime/embedded.go
View File

@ -31,7 +31,7 @@ type encodable struct {
func (e encodable) GetObjectKind() schema.ObjectKind { return e.obj.GetObjectKind() } func (e encodable) GetObjectKind() schema.ObjectKind { return e.obj.GetObjectKind() }
func (e encodable) DeepCopyObject() Object { func (e encodable) DeepCopyObject() Object {
var out encodable = e out := e
out.obj = e.obj.DeepCopyObject() out.obj = e.obj.DeepCopyObject()
copy(out.versions, e.versions) copy(out.versions, e.versions)
return out return out
@ -46,14 +46,14 @@ func NewEncodable(e Encoder, obj Object, versions ...schema.GroupVersion) Object
return encodable{e, obj, versions} return encodable{e, obj, versions}
} }
func (re encodable) UnmarshalJSON(in []byte) error { func (e encodable) UnmarshalJSON(in []byte) error {
return errors.New("runtime.encodable cannot be unmarshalled from JSON") return errors.New("runtime.encodable cannot be unmarshalled from JSON")
} }
// Marshal may get called on pointers or values, so implement MarshalJSON on value. // Marshal may get called on pointers or values, so implement MarshalJSON on value.
// http://stackoverflow.com/questions/21390979/custom-marshaljson-never-gets-called-in-go // http://stackoverflow.com/questions/21390979/custom-marshaljson-never-gets-called-in-go
func (re encodable) MarshalJSON() ([]byte, error) { func (e encodable) MarshalJSON() ([]byte, error) {
return Encode(re.E, re.obj) return Encode(e.E, e.obj)
} }
// NewEncodableList creates an object that will be encoded with the provided codec on demand. // NewEncodableList creates an object that will be encoded with the provided codec on demand.
@ -70,28 +70,28 @@ func NewEncodableList(e Encoder, objects []Object, versions ...schema.GroupVersi
return out return out
} }
func (re *Unknown) UnmarshalJSON(in []byte) error { func (e *Unknown) UnmarshalJSON(in []byte) error {
if re == nil { if e == nil {
return errors.New("runtime.Unknown: UnmarshalJSON on nil pointer") return errors.New("runtime.Unknown: UnmarshalJSON on nil pointer")
} }
re.TypeMeta = TypeMeta{} e.TypeMeta = TypeMeta{}
re.Raw = append(re.Raw[0:0], in...) e.Raw = append(e.Raw[0:0], in...)
re.ContentEncoding = "" e.ContentEncoding = ""
re.ContentType = ContentTypeJSON e.ContentType = ContentTypeJSON
return nil return nil
} }
// Marshal may get called on pointers or values, so implement MarshalJSON on value. // Marshal may get called on pointers or values, so implement MarshalJSON on value.
// http://stackoverflow.com/questions/21390979/custom-marshaljson-never-gets-called-in-go // http://stackoverflow.com/questions/21390979/custom-marshaljson-never-gets-called-in-go
func (re Unknown) MarshalJSON() ([]byte, error) { func (e Unknown) MarshalJSON() ([]byte, error) {
// If ContentType is unset, we assume this is JSON. // If ContentType is unset, we assume this is JSON.
if re.ContentType != "" && re.ContentType != ContentTypeJSON { if e.ContentType != "" && e.ContentType != ContentTypeJSON {
return nil, errors.New("runtime.Unknown: MarshalJSON on non-json data") return nil, errors.New("runtime.Unknown: MarshalJSON on non-json data")
} }
if re.Raw == nil { if e.Raw == nil {
return []byte("null"), nil return []byte("null"), nil
} }
return re.Raw, nil return e.Raw, nil
} }
func Convert_runtime_Object_To_runtime_RawExtension(in *Object, out *RawExtension, s conversion.Scope) error { func Convert_runtime_Object_To_runtime_RawExtension(in *Object, out *RawExtension, s conversion.Scope) error {