protocol: add nullable string support

vincentbernat · Mar 24, 2018 · c98abb7 · c98abb7
1 parent f50f5b4
commit c98abb7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/protocol/decoder.go b/protocol/decoder.go
@@ -19,6 +19,7 @@ type PacketDecoder interface {
 	ArrayLength() (int, error)
 	Bytes() ([]byte, error)
 	String() (string, error)
+	NullableString() (*string, error)
 	Int32Array() ([]int32, error)
 	Int64Array() ([]int64, error)
 	StringArray() ([]string, error)
@@ -168,6 +169,12 @@ func (d *ByteDecoder) String() (string, error) {
 	return tmpStr, nil
 }
 
+func (d *ByteDecoder) NullableString() (*string, error) {
+	tmpStr, err := d.String()
+	return &tmpStr, err
+
+}
+
 func (d *ByteDecoder) Int32Array() ([]int32, error) {
 	if d.remaining() < 4 {
 		d.off = len(d.b)

diff --git a/protocol/encoder.go b/protocol/encoder.go
@@ -12,6 +12,7 @@ type PacketEncoder interface {
 	PutRawBytes(in []byte) error
 	PutBytes(in []byte) error
 	PutString(in string) error
+	PutNullableString(in *string) error
 	PutStringArray(in []string) error
 	PutInt32Array(in []int32) error
 	PutInt64Array(in []int64) error
@@ -110,6 +111,14 @@ func (e *LenEncoder) PutString(in string) error {
 	return nil
 }
 
+func (e *LenEncoder) PutNullableString(in *string) error {
+	if in == nil {
+		e.Length += 2
+		return nil
+	}
+	return e.PutString(*in)
+}
+
 func (e *LenEncoder) PutStringArray(in []string) error {
 	err := e.PutArrayLength(len(in))
 	if err != nil {
@@ -219,6 +228,14 @@ func (e *ByteEncoder) PutString(in string) error {
 	return nil
 }
 
+func (e *ByteEncoder) PutNullableString(in *string) error {
+	if in == nil {
+		e.PutInt16(-1)
+		return nil
+	}
+	return e.PutString(*in)
+}
+
 func (e *ByteEncoder) PutStringArray(in []string) error {
 	err := e.PutArrayLength(len(in))
 	if err != nil {