Skip to content

Commit da5b384

Browse files
chenjunbiaochenjunbiao
authored
refactor(*) fix for golint, etc. (#56)
1 parent 403078b commit da5b384

File tree

12 files changed

+62
-54
lines changed

12 files changed

+62
-54
lines changed

‎basic.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ func (e *basicEncoderImpl) encodeBasic(input interface{}, signals []*PrimitivePa
9898
}
9999
root.AddPrimitivePacket(primitiveEncoder)
100100
return root.Encode(), nil
101-
} else {
102-
buf := make([][]byte, 0)
103-
for _, signal := range signals {
104-
buf = append(buf, signal.Encode())
105-
}
106-
buf = append(buf, primitiveEncoder.Encode())
107-
return bytes.Join(buf, []byte{}), nil
108101
}
102+
103+
buf := make([][]byte, 0)
104+
for _, signal := range signals {
105+
buf = append(buf, signal.Encode())
106+
}
107+
buf = append(buf, primitiveEncoder.Encode())
108+
return bytes.Join(buf, []byte{}), nil
109109
}
110110

111111
// encodeBasicSlice encode reflect.Value of slice, and inserting signals
@@ -148,14 +148,14 @@ func (e *basicEncoderImpl) encodeBasicSlice(value reflect.Value, signals []*Prim
148148
}
149149
root.AddNodePacket(nodeEncoder)
150150
return root.Encode(), nil
151-
} else {
152-
buf := make([][]byte, 0)
153-
for _, signal := range signals {
154-
buf = append(buf, signal.Encode())
155-
}
156-
buf = append(buf, nodeEncoder.Encode())
157-
return bytes.Join(buf, []byte{}), nil
158151
}
152+
153+
buf := make([][]byte, 0)
154+
for _, signal := range signals {
155+
buf = append(buf, signal.Encode())
156+
}
157+
buf = append(buf, nodeEncoder.Encode())
158+
return bytes.Join(buf, []byte{}), nil
159159
}
160160

161161
// encodeBasicString encode string to PrimitivePacketEncoder
@@ -216,7 +216,7 @@ func (e *basicEncoderImpl) encodeBasicBool(input interface{}) *PrimitivePacketEn
216216

217217
// encodeBasicStringSlice encode reflect.Value of []string to NodePacketEncoder
218218
func (e *basicEncoderImpl) encodeBasicStringSlice(value reflect.Value) *NodePacketEncoder {
219-
var node = NewNodeArrayPacketEncoder(int(e.observe))
219+
var node = NewNodeSlicePacketEncoder(int(e.observe))
220220
if out, ok := utils.ToStringSliceArray(value.Interface()); ok {
221221
for _, v := range out {
222222
var item = NewPrimitivePacketEncoder(utils.KeyOfSliceItem)
@@ -229,7 +229,7 @@ func (e *basicEncoderImpl) encodeBasicStringSlice(value reflect.Value) *NodePack
229229

230230
// encodeBasicInt32Slice encode reflect.Value of []int32 to NodePacketEncoder
231231
func (e *basicEncoderImpl) encodeBasicInt32Slice(value reflect.Value) *NodePacketEncoder {
232-
var node = NewNodeArrayPacketEncoder(int(e.observe))
232+
var node = NewNodeSlicePacketEncoder(int(e.observe))
233233
if out, ok := utils.ToInt64SliceArray(value.Interface()); ok {
234234
for _, v := range out {
235235
var item = NewPrimitivePacketEncoder(utils.KeyOfSliceItem)
@@ -242,7 +242,7 @@ func (e *basicEncoderImpl) encodeBasicInt32Slice(value reflect.Value) *NodePacke
242242

243243
// encodeBasicUint32Slice encode reflect.Value of []uint32 to NodePacketEncoder
244244
func (e *basicEncoderImpl) encodeBasicUint32Slice(value reflect.Value) *NodePacketEncoder {
245-
var node = NewNodeArrayPacketEncoder(int(e.observe))
245+
var node = NewNodeSlicePacketEncoder(int(e.observe))
246246
if out, ok := utils.ToUInt64SliceArray(value.Interface()); ok {
247247
for _, v := range out {
248248
var item = NewPrimitivePacketEncoder(utils.KeyOfSliceItem)
@@ -255,7 +255,7 @@ func (e *basicEncoderImpl) encodeBasicUint32Slice(value reflect.Value) *NodePack
255255

256256
// encodeBasicInt64Slice encode reflect.Value of []int64 to NodePacketEncoder
257257
func (e *basicEncoderImpl) encodeBasicInt64Slice(value reflect.Value) *NodePacketEncoder {
258-
var node = NewNodeArrayPacketEncoder(int(e.observe))
258+
var node = NewNodeSlicePacketEncoder(int(e.observe))
259259
if out, ok := utils.ToInt64SliceArray(value.Interface()); ok {
260260
for _, v := range out {
261261
var item = NewPrimitivePacketEncoder(utils.KeyOfSliceItem)
@@ -268,7 +268,7 @@ func (e *basicEncoderImpl) encodeBasicInt64Slice(value reflect.Value) *NodePacke
268268

269269
// encodeBasicUint64Slice encode reflect.Value of []uint64 to NodePacketEncoder
270270
func (e *basicEncoderImpl) encodeBasicUint64Slice(value reflect.Value) *NodePacketEncoder {
271-
var node = NewNodeArrayPacketEncoder(int(e.observe))
271+
var node = NewNodeSlicePacketEncoder(int(e.observe))
272272
if out, ok := utils.ToUInt64SliceArray(value.Interface()); ok {
273273
for _, v := range out {
274274
var item = NewPrimitivePacketEncoder(utils.KeyOfSliceItem)
@@ -281,7 +281,7 @@ func (e *basicEncoderImpl) encodeBasicUint64Slice(value reflect.Value) *NodePack
281281

282282
// encodeBasicFloat32Slice encode reflect.Value of []float32 to NodePacketEncoder
283283
func (e *basicEncoderImpl) encodeBasicFloat32Slice(value reflect.Value) *NodePacketEncoder {
284-
var node = NewNodeArrayPacketEncoder(int(e.observe))
284+
var node = NewNodeSlicePacketEncoder(int(e.observe))
285285
if out, ok := utils.ToUFloat64SliceArray(value.Interface()); ok {
286286
for _, v := range out {
287287
var item = NewPrimitivePacketEncoder(utils.KeyOfSliceItem)
@@ -294,7 +294,7 @@ func (e *basicEncoderImpl) encodeBasicFloat32Slice(value reflect.Value) *NodePac
294294

295295
// encodeBasicFloat64Slice encode reflect.Value of []float64 to NodePacketEncoder
296296
func (e *basicEncoderImpl) encodeBasicFloat64Slice(value reflect.Value) *NodePacketEncoder {
297-
var node = NewNodeArrayPacketEncoder(int(e.observe))
297+
var node = NewNodeSlicePacketEncoder(int(e.observe))
298298
if out, ok := utils.ToUFloat64SliceArray(value.Interface()); ok {
299299
for _, v := range out {
300300
var item = NewPrimitivePacketEncoder(utils.KeyOfSliceItem)
@@ -307,7 +307,7 @@ func (e *basicEncoderImpl) encodeBasicFloat64Slice(value reflect.Value) *NodePac
307307

308308
// encodeBasicBoolSlice encode reflect.Value of []bool to NodePacketEncoder
309309
func (e *basicEncoderImpl) encodeBasicBoolSlice(value reflect.Value) *NodePacketEncoder {
310-
var node = NewNodeArrayPacketEncoder(int(e.observe))
310+
var node = NewNodeSlicePacketEncoder(int(e.observe))
311311
if out, ok := utils.ToBoolSliceArray(value.Interface()); ok {
312312
for _, v := range out {
313313
var item = NewPrimitivePacketEncoder(utils.KeyOfSliceItem)

‎codec.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ import (
44
"reflect"
55
)
66

7-
// Y3Codec encode the user's data according to the Y3 encoding rules
8-
type Y3Codec interface {
7+
// Codec encode the user's data according to the Y3 encoding rules
8+
type Codec interface {
99
// Marshal encode interface to []byte
1010
Marshal(input interface{}) ([]byte, error)
1111
}
1212

13-
// NewCodec create a Y3Codec interface
14-
func NewCodec(observe byte) Y3Codec {
13+
// NewCodec create a Codec interface
14+
func NewCodec(observe byte) Codec {
1515
return &y3Codec{
1616
observe: observe,
1717
}
1818
}
1919

20-
// y3Codec is implementation of the Y3Codec interface
20+
// y3Codec is implementation of the Codec interface
2121
type y3Codec struct {
2222
observe byte
2323
}

‎encoder.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ func (enc *PrimitivePacketEncoder) SetStringValue(v string) {
135135
enc.valbuf = []byte(v)
136136
}
137137

138+
// SetBytes set bytes to internal buf variable
138139
func (enc *PrimitivePacketEncoder) SetBytes(buf []byte) {
139140
enc.valbuf = buf
140141
}
@@ -157,7 +158,8 @@ func NewNodePacketEncoder(sid int) *NodePacketEncoder {
157158
return nodeEnc
158159
}
159160

160-
func NewNodeArrayPacketEncoder(sid int) *NodePacketEncoder {
161+
// NewNodeSlicePacketEncoder returns an Encoder for node packet that is a slice
162+
func NewNodeSlicePacketEncoder(sid int) *NodePacketEncoder {
161163
nodeEnc := &NodePacketEncoder{
162164
encoder: encoder{
163165
isNode: true,

‎examples/packet/decode.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func encodeArrayPacket() {
102102
var club = y3.NewNodePacketEncoder(0x01)
103103

104104
// 0xc2 - []*bar
105-
var bars = y3.NewNodeArrayPacketEncoder(0x02)
105+
var bars = y3.NewNodeSlicePacketEncoder(0x02)
106106

107107
// 0x03 - Name="a1"
108108
var bar1 = y3.NewNodePacketEncoder(0x00)
@@ -119,7 +119,7 @@ func encodeArrayPacket() {
119119
bars.AddNodePacket(bar2)
120120

121121
// 0x44 - kinds
122-
var kinds = y3.NewNodeArrayPacketEncoder(0x04)
122+
var kinds = y3.NewNodeSlicePacketEncoder(0x04)
123123

124124
// 0x44 - item1
125125
var item1 = y3.NewPrimitivePacketEncoder(0x00)

‎observable.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ import (
77
"github.com/yomorun/y3-codec-golang/pkg/encoding"
88
)
99

10+
// Iterable iterate through and get the data of observe
1011
type Iterable interface {
1112
Observe() <-chan interface{}
1213
}
1314

15+
// Observable provide subscription and notification processing
1416
type Observable interface {
1517
Iterable
1618
Subscribe(key byte) Observable

‎observable_test.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,18 @@ func TestObservable(t *testing.T) {
2020
if (v[0] == 17) && (v[1] == 2) && (v[2] == 67) && (v[3] == 228) {
2121
count1++
2222
return "ok1", nil
23-
} else {
24-
err1 = errors.New("fail")
25-
return nil, errors.New("fail")
2623
}
27-
24+
err1 = errors.New("fail")
25+
return nil, errors.New("fail")
2826
}
2927

3028
callback2 := func(v []byte) (interface{}, error) {
3129
if (v[0] == 19) && (v[1] == 2) && (v[2] == 65) && (v[3] == 240) {
3230
count2++
3331
return "ok2", nil
34-
} else {
35-
err2 = errors.New("fail")
36-
return nil, errors.New("fail")
3732
}
38-
33+
err2 = errors.New("fail")
34+
return nil, errors.New("fail")
3935
}
4036

4137
reader := bytes.NewReader(buf)

‎structure_decoder.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,9 @@ func (d *structDecoderImpl) decodeSlice(data *NodePacket, val reflect.Value) err
128128
elemType := val.Type().Elem()
129129

130130
items := make([]reflect.Value, 0)
131-
for _, node := range data.NodePackets {
131+
for i := range data.NodePackets {
132132
elemValue := reflect.Indirect(reflect.New(elemType))
133+
node := data.NodePackets[i]
133134
err := d.decodeStruct(&node, elemValue)
134135
if err != nil {
135136
return err
@@ -408,11 +409,11 @@ func (d *structDecoderImpl) matchingKey(key byte, node *NodePacket) (flag bool,
408409
}
409410

410411
if len(node.NodePackets) > 0 {
411-
for _, n := range node.NodePackets {
412+
for i := range node.NodePackets {
413+
n := node.NodePackets[i]
412414
if key == n.SeqID() {
413415
return true, true, n
414416
}
415-
//return matchingKey(key, &n)
416417
flag, isNode, packet = d.matchingKey(key, &n)
417418
if flag {
418419
return

‎structure_decoder_test.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ func TestBasic_Struct(t *testing.T) {
3232
}
3333

3434
func runDecode(t *testing.T, inputBuf []byte, output interface{}) {
35-
_, err := newStructDecoder(output).Decode(inputBuf)
35+
_, err := newStructDecoder(output, structDecoderOptionConfig(&structDecoderConfig{
36+
ZeroFields: true,
37+
TagName: "yomo",
38+
})).Decode(inputBuf)
3639
if err != nil {
3740
t.Errorf("got an err: %s", err.Error())
3841
t.FailNow()

‎structure_encoder.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ func (e *structEncoderImpl) encode(input interface{}, signals []*PrimitivePacket
110110
}
111111
root.AddNodePacket(nodeEncoder)
112112
return root.Encode(), nil
113-
} else {
114-
buf := make([][]byte, 0)
115-
for _, signal := range signals {
116-
buf = append(buf, signal.Encode())
117-
}
118-
buf = append(buf, nodeEncoder.Encode())
119-
return bytes.Join(buf, []byte{}), nil
120113
}
114+
115+
buf := make([][]byte, 0)
116+
for _, signal := range signals {
117+
buf = append(buf, signal.Encode())
118+
}
119+
buf = append(buf, nodeEncoder.Encode())
120+
return bytes.Join(buf, []byte{}), nil
121121
}
122122

123123
// encodeSlice encode slice to NodePacketEncoder
@@ -199,12 +199,12 @@ func (e *structEncoderImpl) encodeStructFromField(fieldType reflect.Type, fieldN
199199
case reflect.Bool:
200200
ppe.SetBoolValue(e.fieldValueToBool(fieldType, fieldValue))
201201
case reflect.Array:
202-
arrNode := NewNodeArrayPacketEncoder(int(utils.KeyOf(fieldName)))
202+
arrNode := NewNodeSlicePacketEncoder(int(utils.KeyOf(fieldName)))
203203
e.encodeArrayFromField(fieldValue, arrNode)
204204
en.AddNodePacket(arrNode)
205205
return
206206
case reflect.Slice:
207-
sliceNode := NewNodeArrayPacketEncoder(int(utils.KeyOf(fieldName)))
207+
sliceNode := NewNodeSlicePacketEncoder(int(utils.KeyOf(fieldName)))
208208
e.encodeSliceFromField(fieldValue, sliceNode)
209209
en.AddNodePacket(sliceNode)
210210
return

‎structure_encoder_test.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ func TestStructEncoderWithSignals(t *testing.T) {
1616
Therm: thermometer{Temperature: float32(30), Humidity: float32(40)},
1717
}
1818

19-
encoder := newStructEncoder(0x30, structEncoderOptionRoot(rootToken))
19+
encoder := newStructEncoder(0x30, structEncoderOptionRoot(rootToken),
20+
structEncoderOptionConfig(&structEncoderConfig{
21+
ZeroFields: true,
22+
TagName: "yomo",
23+
}))
2024
inputBuf, _ := encoder.Encode(input,
2125
createSignal(0x02).SetString("a"),
2226
createSignal(0x03).SetString("b"))

0 commit comments

Comments
 (0)