Repository: thrift Updated Branches: refs/heads/master 0b09887bc -> 04fdd3a7c
THRIFT-3169 go: do not export thrift.TestEnum and thrift.TestStruct Client: Go Patch: Konstantin Shaposhnikov <[email protected]> This closes #506 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/86062717 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/86062717 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/86062717 Branch: refs/heads/master Commit: 8606271759315fa49202521e8eec6d34c6375a6f Parents: 0b09887 Author: Jens Geyer <[email protected]> Authored: Wed May 20 21:55:24 2015 +0200 Committer: Jens Geyer <[email protected]> Committed: Wed May 20 22:44:45 2015 +0200 ---------------------------------------------------------------------- lib/go/thrift/serializer_test.go | 12 +- lib/go/thrift/serializer_types.go | 633 ---------------------------- lib/go/thrift/serializer_types_test.go | 633 ++++++++++++++++++++++++++++ 3 files changed, 639 insertions(+), 639 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/86062717/lib/go/thrift/serializer_test.go ---------------------------------------------------------------------- diff --git a/lib/go/thrift/serializer_test.go b/lib/go/thrift/serializer_test.go index 0f3f7d7..3cdb387 100644 --- a/lib/go/thrift/serializer_test.go +++ b/lib/go/thrift/serializer_test.go @@ -29,7 +29,7 @@ type ProtocolFactory interface { GetProtocol(t TTransport) TProtocol } -func compareStructs(m, m1 TestStruct) (bool, error) { +func compareStructs(m, m1 MyTestStruct) (bool, error) { switch { case m.On != m1.On: return false, errors.New("Boolean not equal") @@ -62,7 +62,7 @@ func compareStructs(m, m1 TestStruct) (bool, error) { return false, errors.New("StringSet size not equal") case m.E != m1.E: - return false, errors.New("TestEnum not equal") + return false, errors.New("MyTestEnum not equal") default: return true, nil @@ -74,7 +74,7 @@ func compareStructs(m, m1 TestStruct) (bool, error) { func ProtocolTest1(test *testing.T, pf ProtocolFactory) (bool, error) { t := NewTSerializer() t.Protocol = pf.GetProtocol(t.Transport) - var m = TestStruct{} + var m = MyTestStruct{} m.On = true m.B = int8(0) m.Int16 = 1 @@ -95,7 +95,7 @@ func ProtocolTest1(test *testing.T, pf ProtocolFactory) (bool, error) { t1 := NewTDeserializer() t1.Protocol = pf.GetProtocol(t1.Transport) - var m1 = TestStruct{} + var m1 = MyTestStruct{} if err = t1.ReadString(&m1, s); err != nil { return false, errors.New(fmt.Sprintf("Unable to Deserialize struct\n\t %s", err)) @@ -108,7 +108,7 @@ func ProtocolTest1(test *testing.T, pf ProtocolFactory) (bool, error) { func ProtocolTest2(test *testing.T, pf ProtocolFactory) (bool, error) { t := NewTSerializer() t.Protocol = pf.GetProtocol(t.Transport) - var m = TestStruct{} + var m = MyTestStruct{} m.On = false m.B = int8(0) m.Int16 = 1 @@ -130,7 +130,7 @@ func ProtocolTest2(test *testing.T, pf ProtocolFactory) (bool, error) { t1 := NewTDeserializer() t1.Protocol = pf.GetProtocol(t1.Transport) - var m1 = TestStruct{} + var m1 = MyTestStruct{} if err = t1.ReadString(&m1, s); err != nil { return false, errors.New(fmt.Sprintf("Unable to Deserialize struct\n\t %s", err)) http://git-wip-us.apache.org/repos/asf/thrift/blob/86062717/lib/go/thrift/serializer_types.go ---------------------------------------------------------------------- diff --git a/lib/go/thrift/serializer_types.go b/lib/go/thrift/serializer_types.go deleted file mode 100644 index 52098a0..0000000 --- a/lib/go/thrift/serializer_types.go +++ /dev/null @@ -1,633 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package thrift - -// Autogenerated by Thrift Compiler (1.0.0-dev) -// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - -/* THE FOLLOWING THRIFT FILE WAS USED TO CREATE THIS - -enum TestEnum { - FIRST = 1, - SECOND = 2, - THIRD = 3, - FOURTH = 4, -} - -struct TestStruct { - 1: bool on, - 2: byte b, - 3: i16 int16, - 4: i32 int32, - 5: i64 int64, - 6: double d, - 7: string st, - 8: binary bin, - 9: map<string, string> stringMap, - 10: list<string> stringList, - 11: set<string> stringSet, - 12: TestEnum e, -} -*/ - -import ( - "fmt" -) - -// (needed to ensure safety because of naive import list construction.) -var _ = ZERO -var _ = fmt.Printf - -var GoUnusedProtection__ int - -type TestEnum int64 - -const ( - TestEnum_FIRST TestEnum = 1 - TestEnum_SECOND TestEnum = 2 - TestEnum_THIRD TestEnum = 3 - TestEnum_FOURTH TestEnum = 4 -) - -func (p TestEnum) String() string { - switch p { - case TestEnum_FIRST: - return "FIRST" - case TestEnum_SECOND: - return "SECOND" - case TestEnum_THIRD: - return "THIRD" - case TestEnum_FOURTH: - return "FOURTH" - } - return "<UNSET>" -} - -func TestEnumFromString(s string) (TestEnum, error) { - switch s { - case "FIRST": - return TestEnum_FIRST, nil - case "SECOND": - return TestEnum_SECOND, nil - case "THIRD": - return TestEnum_THIRD, nil - case "FOURTH": - return TestEnum_FOURTH, nil - } - return TestEnum(0), fmt.Errorf("not a valid TestEnum string") -} - -func TestEnumPtr(v TestEnum) *TestEnum { return &v } - -type TestStruct struct { - On bool `thrift:"on,1" json:"on"` - B int8 `thrift:"b,2" json:"b"` - Int16 int16 `thrift:"int16,3" json:"int16"` - Int32 int32 `thrift:"int32,4" json:"int32"` - Int64 int64 `thrift:"int64,5" json:"int64"` - D float64 `thrift:"d,6" json:"d"` - St string `thrift:"st,7" json:"st"` - Bin []byte `thrift:"bin,8" json:"bin"` - StringMap map[string]string `thrift:"stringMap,9" json:"stringMap"` - StringList []string `thrift:"stringList,10" json:"stringList"` - StringSet map[string]bool `thrift:"stringSet,11" json:"stringSet"` - E TestEnum `thrift:"e,12" json:"e"` -} - -func NewTestStruct() *TestStruct { - return &TestStruct{} -} - -func (p *TestStruct) GetOn() bool { - return p.On -} - -func (p *TestStruct) GetB() int8 { - return p.B -} - -func (p *TestStruct) GetInt16() int16 { - return p.Int16 -} - -func (p *TestStruct) GetInt32() int32 { - return p.Int32 -} - -func (p *TestStruct) GetInt64() int64 { - return p.Int64 -} - -func (p *TestStruct) GetD() float64 { - return p.D -} - -func (p *TestStruct) GetSt() string { - return p.St -} - -func (p *TestStruct) GetBin() []byte { - return p.Bin -} - -func (p *TestStruct) GetStringMap() map[string]string { - return p.StringMap -} - -func (p *TestStruct) GetStringList() []string { - return p.StringList -} - -func (p *TestStruct) GetStringSet() map[string]bool { - return p.StringSet -} - -func (p *TestStruct) GetE() TestEnum { - return p.E -} -func (p *TestStruct) Read(iprot TProtocol) error { - if _, err := iprot.ReadStructBegin(); err != nil { - return PrependError(fmt.Sprintf("%T read error: ", p), err) - } - for { - _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin() - if err != nil { - return PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err) - } - if fieldTypeId == STOP { - break - } - switch fieldId { - case 1: - if err := p.readField1(iprot); err != nil { - return err - } - case 2: - if err := p.readField2(iprot); err != nil { - return err - } - case 3: - if err := p.readField3(iprot); err != nil { - return err - } - case 4: - if err := p.readField4(iprot); err != nil { - return err - } - case 5: - if err := p.readField5(iprot); err != nil { - return err - } - case 6: - if err := p.readField6(iprot); err != nil { - return err - } - case 7: - if err := p.readField7(iprot); err != nil { - return err - } - case 8: - if err := p.readField8(iprot); err != nil { - return err - } - case 9: - if err := p.readField9(iprot); err != nil { - return err - } - case 10: - if err := p.readField10(iprot); err != nil { - return err - } - case 11: - if err := p.readField11(iprot); err != nil { - return err - } - case 12: - if err := p.readField12(iprot); err != nil { - return err - } - default: - if err := iprot.Skip(fieldTypeId); err != nil { - return err - } - } - if err := iprot.ReadFieldEnd(); err != nil { - return err - } - } - if err := iprot.ReadStructEnd(); err != nil { - return PrependError(fmt.Sprintf("%T read struct end error: ", p), err) - } - return nil -} - -func (p *TestStruct) readField1(iprot TProtocol) error { - if v, err := iprot.ReadBool(); err != nil { - return PrependError("error reading field 1: ", err) - } else { - p.On = v - } - return nil -} - -func (p *TestStruct) readField2(iprot TProtocol) error { - if v, err := iprot.ReadByte(); err != nil { - return PrependError("error reading field 2: ", err) - } else { - temp := int8(v) - p.B = temp - } - return nil -} - -func (p *TestStruct) readField3(iprot TProtocol) error { - if v, err := iprot.ReadI16(); err != nil { - return PrependError("error reading field 3: ", err) - } else { - p.Int16 = v - } - return nil -} - -func (p *TestStruct) readField4(iprot TProtocol) error { - if v, err := iprot.ReadI32(); err != nil { - return PrependError("error reading field 4: ", err) - } else { - p.Int32 = v - } - return nil -} - -func (p *TestStruct) readField5(iprot TProtocol) error { - if v, err := iprot.ReadI64(); err != nil { - return PrependError("error reading field 5: ", err) - } else { - p.Int64 = v - } - return nil -} - -func (p *TestStruct) readField6(iprot TProtocol) error { - if v, err := iprot.ReadDouble(); err != nil { - return PrependError("error reading field 6: ", err) - } else { - p.D = v - } - return nil -} - -func (p *TestStruct) readField7(iprot TProtocol) error { - if v, err := iprot.ReadString(); err != nil { - return PrependError("error reading field 7: ", err) - } else { - p.St = v - } - return nil -} - -func (p *TestStruct) readField8(iprot TProtocol) error { - if v, err := iprot.ReadBinary(); err != nil { - return PrependError("error reading field 8: ", err) - } else { - p.Bin = v - } - return nil -} - -func (p *TestStruct) readField9(iprot TProtocol) error { - _, _, size, err := iprot.ReadMapBegin() - if err != nil { - return PrependError("error reading map begin: ", err) - } - tMap := make(map[string]string, size) - p.StringMap = tMap - for i := 0; i < size; i++ { - var _key0 string - if v, err := iprot.ReadString(); err != nil { - return PrependError("error reading field 0: ", err) - } else { - _key0 = v - } - var _val1 string - if v, err := iprot.ReadString(); err != nil { - return PrependError("error reading field 0: ", err) - } else { - _val1 = v - } - p.StringMap[_key0] = _val1 - } - if err := iprot.ReadMapEnd(); err != nil { - return PrependError("error reading map end: ", err) - } - return nil -} - -func (p *TestStruct) readField10(iprot TProtocol) error { - _, size, err := iprot.ReadListBegin() - if err != nil { - return PrependError("error reading list begin: ", err) - } - tSlice := make([]string, 0, size) - p.StringList = tSlice - for i := 0; i < size; i++ { - var _elem2 string - if v, err := iprot.ReadString(); err != nil { - return PrependError("error reading field 0: ", err) - } else { - _elem2 = v - } - p.StringList = append(p.StringList, _elem2) - } - if err := iprot.ReadListEnd(); err != nil { - return PrependError("error reading list end: ", err) - } - return nil -} - -func (p *TestStruct) readField11(iprot TProtocol) error { - _, size, err := iprot.ReadSetBegin() - if err != nil { - return PrependError("error reading set begin: ", err) - } - tSet := make(map[string]bool, size) - p.StringSet = tSet - for i := 0; i < size; i++ { - var _elem3 string - if v, err := iprot.ReadString(); err != nil { - return PrependError("error reading field 0: ", err) - } else { - _elem3 = v - } - p.StringSet[_elem3] = true - } - if err := iprot.ReadSetEnd(); err != nil { - return PrependError("error reading set end: ", err) - } - return nil -} - -func (p *TestStruct) readField12(iprot TProtocol) error { - if v, err := iprot.ReadI32(); err != nil { - return PrependError("error reading field 12: ", err) - } else { - temp := TestEnum(v) - p.E = temp - } - return nil -} - -func (p *TestStruct) Write(oprot TProtocol) error { - if err := oprot.WriteStructBegin("TestStruct"); err != nil { - return PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) - } - if err := p.writeField1(oprot); err != nil { - return err - } - if err := p.writeField2(oprot); err != nil { - return err - } - if err := p.writeField3(oprot); err != nil { - return err - } - if err := p.writeField4(oprot); err != nil { - return err - } - if err := p.writeField5(oprot); err != nil { - return err - } - if err := p.writeField6(oprot); err != nil { - return err - } - if err := p.writeField7(oprot); err != nil { - return err - } - if err := p.writeField8(oprot); err != nil { - return err - } - if err := p.writeField9(oprot); err != nil { - return err - } - if err := p.writeField10(oprot); err != nil { - return err - } - if err := p.writeField11(oprot); err != nil { - return err - } - if err := p.writeField12(oprot); err != nil { - return err - } - if err := oprot.WriteFieldStop(); err != nil { - return PrependError("write field stop error: ", err) - } - if err := oprot.WriteStructEnd(); err != nil { - return PrependError("write struct stop error: ", err) - } - return nil -} - -func (p *TestStruct) writeField1(oprot TProtocol) (err error) { - if err := oprot.WriteFieldBegin("on", BOOL, 1); err != nil { - return PrependError(fmt.Sprintf("%T write field begin error 1:on: ", p), err) - } - if err := oprot.WriteBool(bool(p.On)); err != nil { - return PrependError(fmt.Sprintf("%T.on (1) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return PrependError(fmt.Sprintf("%T write field end error 1:on: ", p), err) - } - return err -} - -func (p *TestStruct) writeField2(oprot TProtocol) (err error) { - if err := oprot.WriteFieldBegin("b", BYTE, 2); err != nil { - return PrependError(fmt.Sprintf("%T write field begin error 2:b: ", p), err) - } - if err := oprot.WriteByte(byte(p.B)); err != nil { - return PrependError(fmt.Sprintf("%T.b (2) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return PrependError(fmt.Sprintf("%T write field end error 2:b: ", p), err) - } - return err -} - -func (p *TestStruct) writeField3(oprot TProtocol) (err error) { - if err := oprot.WriteFieldBegin("int16", I16, 3); err != nil { - return PrependError(fmt.Sprintf("%T write field begin error 3:int16: ", p), err) - } - if err := oprot.WriteI16(int16(p.Int16)); err != nil { - return PrependError(fmt.Sprintf("%T.int16 (3) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return PrependError(fmt.Sprintf("%T write field end error 3:int16: ", p), err) - } - return err -} - -func (p *TestStruct) writeField4(oprot TProtocol) (err error) { - if err := oprot.WriteFieldBegin("int32", I32, 4); err != nil { - return PrependError(fmt.Sprintf("%T write field begin error 4:int32: ", p), err) - } - if err := oprot.WriteI32(int32(p.Int32)); err != nil { - return PrependError(fmt.Sprintf("%T.int32 (4) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return PrependError(fmt.Sprintf("%T write field end error 4:int32: ", p), err) - } - return err -} - -func (p *TestStruct) writeField5(oprot TProtocol) (err error) { - if err := oprot.WriteFieldBegin("int64", I64, 5); err != nil { - return PrependError(fmt.Sprintf("%T write field begin error 5:int64: ", p), err) - } - if err := oprot.WriteI64(int64(p.Int64)); err != nil { - return PrependError(fmt.Sprintf("%T.int64 (5) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return PrependError(fmt.Sprintf("%T write field end error 5:int64: ", p), err) - } - return err -} - -func (p *TestStruct) writeField6(oprot TProtocol) (err error) { - if err := oprot.WriteFieldBegin("d", DOUBLE, 6); err != nil { - return PrependError(fmt.Sprintf("%T write field begin error 6:d: ", p), err) - } - if err := oprot.WriteDouble(float64(p.D)); err != nil { - return PrependError(fmt.Sprintf("%T.d (6) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return PrependError(fmt.Sprintf("%T write field end error 6:d: ", p), err) - } - return err -} - -func (p *TestStruct) writeField7(oprot TProtocol) (err error) { - if err := oprot.WriteFieldBegin("st", STRING, 7); err != nil { - return PrependError(fmt.Sprintf("%T write field begin error 7:st: ", p), err) - } - if err := oprot.WriteString(string(p.St)); err != nil { - return PrependError(fmt.Sprintf("%T.st (7) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return PrependError(fmt.Sprintf("%T write field end error 7:st: ", p), err) - } - return err -} - -func (p *TestStruct) writeField8(oprot TProtocol) (err error) { - if err := oprot.WriteFieldBegin("bin", STRING, 8); err != nil { - return PrependError(fmt.Sprintf("%T write field begin error 8:bin: ", p), err) - } - if err := oprot.WriteBinary(p.Bin); err != nil { - return PrependError(fmt.Sprintf("%T.bin (8) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return PrependError(fmt.Sprintf("%T write field end error 8:bin: ", p), err) - } - return err -} - -func (p *TestStruct) writeField9(oprot TProtocol) (err error) { - if err := oprot.WriteFieldBegin("stringMap", MAP, 9); err != nil { - return PrependError(fmt.Sprintf("%T write field begin error 9:stringMap: ", p), err) - } - if err := oprot.WriteMapBegin(STRING, STRING, len(p.StringMap)); err != nil { - return PrependError("error writing map begin: ", err) - } - for k, v := range p.StringMap { - if err := oprot.WriteString(string(k)); err != nil { - return PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) - } - if err := oprot.WriteString(string(v)); err != nil { - return PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) - } - } - if err := oprot.WriteMapEnd(); err != nil { - return PrependError("error writing map end: ", err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return PrependError(fmt.Sprintf("%T write field end error 9:stringMap: ", p), err) - } - return err -} - -func (p *TestStruct) writeField10(oprot TProtocol) (err error) { - if err := oprot.WriteFieldBegin("stringList", LIST, 10); err != nil { - return PrependError(fmt.Sprintf("%T write field begin error 10:stringList: ", p), err) - } - if err := oprot.WriteListBegin(STRING, len(p.StringList)); err != nil { - return PrependError("error writing list begin: ", err) - } - for _, v := range p.StringList { - if err := oprot.WriteString(string(v)); err != nil { - return PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) - } - } - if err := oprot.WriteListEnd(); err != nil { - return PrependError("error writing list end: ", err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return PrependError(fmt.Sprintf("%T write field end error 10:stringList: ", p), err) - } - return err -} - -func (p *TestStruct) writeField11(oprot TProtocol) (err error) { - if err := oprot.WriteFieldBegin("stringSet", SET, 11); err != nil { - return PrependError(fmt.Sprintf("%T write field begin error 11:stringSet: ", p), err) - } - if err := oprot.WriteSetBegin(STRING, len(p.StringSet)); err != nil { - return PrependError("error writing set begin: ", err) - } - for v, _ := range p.StringSet { - if err := oprot.WriteString(string(v)); err != nil { - return PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) - } - } - if err := oprot.WriteSetEnd(); err != nil { - return PrependError("error writing set end: ", err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return PrependError(fmt.Sprintf("%T write field end error 11:stringSet: ", p), err) - } - return err -} - -func (p *TestStruct) writeField12(oprot TProtocol) (err error) { - if err := oprot.WriteFieldBegin("e", I32, 12); err != nil { - return PrependError(fmt.Sprintf("%T write field begin error 12:e: ", p), err) - } - if err := oprot.WriteI32(int32(p.E)); err != nil { - return PrependError(fmt.Sprintf("%T.e (12) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return PrependError(fmt.Sprintf("%T write field end error 12:e: ", p), err) - } - return err -} - -func (p *TestStruct) String() string { - if p == nil { - return "<nil>" - } - return fmt.Sprintf("TestStruct(%+v)", *p) -} http://git-wip-us.apache.org/repos/asf/thrift/blob/86062717/lib/go/thrift/serializer_types_test.go ---------------------------------------------------------------------- diff --git a/lib/go/thrift/serializer_types_test.go b/lib/go/thrift/serializer_types_test.go new file mode 100644 index 0000000..4b25b1f --- /dev/null +++ b/lib/go/thrift/serializer_types_test.go @@ -0,0 +1,633 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package thrift + +// Autogenerated by Thrift Compiler (1.0.0-dev) +// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + +/* THE FOLLOWING THRIFT FILE WAS USED TO CREATE THIS + +enum MyTestEnum { + FIRST = 1, + SECOND = 2, + THIRD = 3, + FOURTH = 4, +} + +struct MyTestStruct { + 1: bool on, + 2: byte b, + 3: i16 int16, + 4: i32 int32, + 5: i64 int64, + 6: double d, + 7: string st, + 8: binary bin, + 9: map<string, string> stringMap, + 10: list<string> stringList, + 11: set<string> stringSet, + 12: MyTestEnum e, +} +*/ + +import ( + "fmt" +) + +// (needed to ensure safety because of naive import list construction.) +var _ = ZERO +var _ = fmt.Printf + +var GoUnusedProtection__ int + +type MyTestEnum int64 + +const ( + MyTestEnum_FIRST MyTestEnum = 1 + MyTestEnum_SECOND MyTestEnum = 2 + MyTestEnum_THIRD MyTestEnum = 3 + MyTestEnum_FOURTH MyTestEnum = 4 +) + +func (p MyTestEnum) String() string { + switch p { + case MyTestEnum_FIRST: + return "FIRST" + case MyTestEnum_SECOND: + return "SECOND" + case MyTestEnum_THIRD: + return "THIRD" + case MyTestEnum_FOURTH: + return "FOURTH" + } + return "<UNSET>" +} + +func MyTestEnumFromString(s string) (MyTestEnum, error) { + switch s { + case "FIRST": + return MyTestEnum_FIRST, nil + case "SECOND": + return MyTestEnum_SECOND, nil + case "THIRD": + return MyTestEnum_THIRD, nil + case "FOURTH": + return MyTestEnum_FOURTH, nil + } + return MyTestEnum(0), fmt.Errorf("not a valid MyTestEnum string") +} + +func MyTestEnumPtr(v MyTestEnum) *MyTestEnum { return &v } + +type MyTestStruct struct { + On bool `thrift:"on,1" json:"on"` + B int8 `thrift:"b,2" json:"b"` + Int16 int16 `thrift:"int16,3" json:"int16"` + Int32 int32 `thrift:"int32,4" json:"int32"` + Int64 int64 `thrift:"int64,5" json:"int64"` + D float64 `thrift:"d,6" json:"d"` + St string `thrift:"st,7" json:"st"` + Bin []byte `thrift:"bin,8" json:"bin"` + StringMap map[string]string `thrift:"stringMap,9" json:"stringMap"` + StringList []string `thrift:"stringList,10" json:"stringList"` + StringSet map[string]bool `thrift:"stringSet,11" json:"stringSet"` + E MyTestEnum `thrift:"e,12" json:"e"` +} + +func NewMyTestStruct() *MyTestStruct { + return &MyTestStruct{} +} + +func (p *MyTestStruct) GetOn() bool { + return p.On +} + +func (p *MyTestStruct) GetB() int8 { + return p.B +} + +func (p *MyTestStruct) GetInt16() int16 { + return p.Int16 +} + +func (p *MyTestStruct) GetInt32() int32 { + return p.Int32 +} + +func (p *MyTestStruct) GetInt64() int64 { + return p.Int64 +} + +func (p *MyTestStruct) GetD() float64 { + return p.D +} + +func (p *MyTestStruct) GetSt() string { + return p.St +} + +func (p *MyTestStruct) GetBin() []byte { + return p.Bin +} + +func (p *MyTestStruct) GetStringMap() map[string]string { + return p.StringMap +} + +func (p *MyTestStruct) GetStringList() []string { + return p.StringList +} + +func (p *MyTestStruct) GetStringSet() map[string]bool { + return p.StringSet +} + +func (p *MyTestStruct) GetE() MyTestEnum { + return p.E +} +func (p *MyTestStruct) Read(iprot TProtocol) error { + if _, err := iprot.ReadStructBegin(); err != nil { + return PrependError(fmt.Sprintf("%T read error: ", p), err) + } + for { + _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin() + if err != nil { + return PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err) + } + if fieldTypeId == STOP { + break + } + switch fieldId { + case 1: + if err := p.readField1(iprot); err != nil { + return err + } + case 2: + if err := p.readField2(iprot); err != nil { + return err + } + case 3: + if err := p.readField3(iprot); err != nil { + return err + } + case 4: + if err := p.readField4(iprot); err != nil { + return err + } + case 5: + if err := p.readField5(iprot); err != nil { + return err + } + case 6: + if err := p.readField6(iprot); err != nil { + return err + } + case 7: + if err := p.readField7(iprot); err != nil { + return err + } + case 8: + if err := p.readField8(iprot); err != nil { + return err + } + case 9: + if err := p.readField9(iprot); err != nil { + return err + } + case 10: + if err := p.readField10(iprot); err != nil { + return err + } + case 11: + if err := p.readField11(iprot); err != nil { + return err + } + case 12: + if err := p.readField12(iprot); err != nil { + return err + } + default: + if err := iprot.Skip(fieldTypeId); err != nil { + return err + } + } + if err := iprot.ReadFieldEnd(); err != nil { + return err + } + } + if err := iprot.ReadStructEnd(); err != nil { + return PrependError(fmt.Sprintf("%T read struct end error: ", p), err) + } + return nil +} + +func (p *MyTestStruct) readField1(iprot TProtocol) error { + if v, err := iprot.ReadBool(); err != nil { + return PrependError("error reading field 1: ", err) + } else { + p.On = v + } + return nil +} + +func (p *MyTestStruct) readField2(iprot TProtocol) error { + if v, err := iprot.ReadByte(); err != nil { + return PrependError("error reading field 2: ", err) + } else { + temp := int8(v) + p.B = temp + } + return nil +} + +func (p *MyTestStruct) readField3(iprot TProtocol) error { + if v, err := iprot.ReadI16(); err != nil { + return PrependError("error reading field 3: ", err) + } else { + p.Int16 = v + } + return nil +} + +func (p *MyTestStruct) readField4(iprot TProtocol) error { + if v, err := iprot.ReadI32(); err != nil { + return PrependError("error reading field 4: ", err) + } else { + p.Int32 = v + } + return nil +} + +func (p *MyTestStruct) readField5(iprot TProtocol) error { + if v, err := iprot.ReadI64(); err != nil { + return PrependError("error reading field 5: ", err) + } else { + p.Int64 = v + } + return nil +} + +func (p *MyTestStruct) readField6(iprot TProtocol) error { + if v, err := iprot.ReadDouble(); err != nil { + return PrependError("error reading field 6: ", err) + } else { + p.D = v + } + return nil +} + +func (p *MyTestStruct) readField7(iprot TProtocol) error { + if v, err := iprot.ReadString(); err != nil { + return PrependError("error reading field 7: ", err) + } else { + p.St = v + } + return nil +} + +func (p *MyTestStruct) readField8(iprot TProtocol) error { + if v, err := iprot.ReadBinary(); err != nil { + return PrependError("error reading field 8: ", err) + } else { + p.Bin = v + } + return nil +} + +func (p *MyTestStruct) readField9(iprot TProtocol) error { + _, _, size, err := iprot.ReadMapBegin() + if err != nil { + return PrependError("error reading map begin: ", err) + } + tMap := make(map[string]string, size) + p.StringMap = tMap + for i := 0; i < size; i++ { + var _key0 string + if v, err := iprot.ReadString(); err != nil { + return PrependError("error reading field 0: ", err) + } else { + _key0 = v + } + var _val1 string + if v, err := iprot.ReadString(); err != nil { + return PrependError("error reading field 0: ", err) + } else { + _val1 = v + } + p.StringMap[_key0] = _val1 + } + if err := iprot.ReadMapEnd(); err != nil { + return PrependError("error reading map end: ", err) + } + return nil +} + +func (p *MyTestStruct) readField10(iprot TProtocol) error { + _, size, err := iprot.ReadListBegin() + if err != nil { + return PrependError("error reading list begin: ", err) + } + tSlice := make([]string, 0, size) + p.StringList = tSlice + for i := 0; i < size; i++ { + var _elem2 string + if v, err := iprot.ReadString(); err != nil { + return PrependError("error reading field 0: ", err) + } else { + _elem2 = v + } + p.StringList = append(p.StringList, _elem2) + } + if err := iprot.ReadListEnd(); err != nil { + return PrependError("error reading list end: ", err) + } + return nil +} + +func (p *MyTestStruct) readField11(iprot TProtocol) error { + _, size, err := iprot.ReadSetBegin() + if err != nil { + return PrependError("error reading set begin: ", err) + } + tSet := make(map[string]bool, size) + p.StringSet = tSet + for i := 0; i < size; i++ { + var _elem3 string + if v, err := iprot.ReadString(); err != nil { + return PrependError("error reading field 0: ", err) + } else { + _elem3 = v + } + p.StringSet[_elem3] = true + } + if err := iprot.ReadSetEnd(); err != nil { + return PrependError("error reading set end: ", err) + } + return nil +} + +func (p *MyTestStruct) readField12(iprot TProtocol) error { + if v, err := iprot.ReadI32(); err != nil { + return PrependError("error reading field 12: ", err) + } else { + temp := MyTestEnum(v) + p.E = temp + } + return nil +} + +func (p *MyTestStruct) Write(oprot TProtocol) error { + if err := oprot.WriteStructBegin("MyTestStruct"); err != nil { + return PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) + } + if err := p.writeField1(oprot); err != nil { + return err + } + if err := p.writeField2(oprot); err != nil { + return err + } + if err := p.writeField3(oprot); err != nil { + return err + } + if err := p.writeField4(oprot); err != nil { + return err + } + if err := p.writeField5(oprot); err != nil { + return err + } + if err := p.writeField6(oprot); err != nil { + return err + } + if err := p.writeField7(oprot); err != nil { + return err + } + if err := p.writeField8(oprot); err != nil { + return err + } + if err := p.writeField9(oprot); err != nil { + return err + } + if err := p.writeField10(oprot); err != nil { + return err + } + if err := p.writeField11(oprot); err != nil { + return err + } + if err := p.writeField12(oprot); err != nil { + return err + } + if err := oprot.WriteFieldStop(); err != nil { + return PrependError("write field stop error: ", err) + } + if err := oprot.WriteStructEnd(); err != nil { + return PrependError("write struct stop error: ", err) + } + return nil +} + +func (p *MyTestStruct) writeField1(oprot TProtocol) (err error) { + if err := oprot.WriteFieldBegin("on", BOOL, 1); err != nil { + return PrependError(fmt.Sprintf("%T write field begin error 1:on: ", p), err) + } + if err := oprot.WriteBool(bool(p.On)); err != nil { + return PrependError(fmt.Sprintf("%T.on (1) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return PrependError(fmt.Sprintf("%T write field end error 1:on: ", p), err) + } + return err +} + +func (p *MyTestStruct) writeField2(oprot TProtocol) (err error) { + if err := oprot.WriteFieldBegin("b", BYTE, 2); err != nil { + return PrependError(fmt.Sprintf("%T write field begin error 2:b: ", p), err) + } + if err := oprot.WriteByte(byte(p.B)); err != nil { + return PrependError(fmt.Sprintf("%T.b (2) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return PrependError(fmt.Sprintf("%T write field end error 2:b: ", p), err) + } + return err +} + +func (p *MyTestStruct) writeField3(oprot TProtocol) (err error) { + if err := oprot.WriteFieldBegin("int16", I16, 3); err != nil { + return PrependError(fmt.Sprintf("%T write field begin error 3:int16: ", p), err) + } + if err := oprot.WriteI16(int16(p.Int16)); err != nil { + return PrependError(fmt.Sprintf("%T.int16 (3) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return PrependError(fmt.Sprintf("%T write field end error 3:int16: ", p), err) + } + return err +} + +func (p *MyTestStruct) writeField4(oprot TProtocol) (err error) { + if err := oprot.WriteFieldBegin("int32", I32, 4); err != nil { + return PrependError(fmt.Sprintf("%T write field begin error 4:int32: ", p), err) + } + if err := oprot.WriteI32(int32(p.Int32)); err != nil { + return PrependError(fmt.Sprintf("%T.int32 (4) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return PrependError(fmt.Sprintf("%T write field end error 4:int32: ", p), err) + } + return err +} + +func (p *MyTestStruct) writeField5(oprot TProtocol) (err error) { + if err := oprot.WriteFieldBegin("int64", I64, 5); err != nil { + return PrependError(fmt.Sprintf("%T write field begin error 5:int64: ", p), err) + } + if err := oprot.WriteI64(int64(p.Int64)); err != nil { + return PrependError(fmt.Sprintf("%T.int64 (5) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return PrependError(fmt.Sprintf("%T write field end error 5:int64: ", p), err) + } + return err +} + +func (p *MyTestStruct) writeField6(oprot TProtocol) (err error) { + if err := oprot.WriteFieldBegin("d", DOUBLE, 6); err != nil { + return PrependError(fmt.Sprintf("%T write field begin error 6:d: ", p), err) + } + if err := oprot.WriteDouble(float64(p.D)); err != nil { + return PrependError(fmt.Sprintf("%T.d (6) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return PrependError(fmt.Sprintf("%T write field end error 6:d: ", p), err) + } + return err +} + +func (p *MyTestStruct) writeField7(oprot TProtocol) (err error) { + if err := oprot.WriteFieldBegin("st", STRING, 7); err != nil { + return PrependError(fmt.Sprintf("%T write field begin error 7:st: ", p), err) + } + if err := oprot.WriteString(string(p.St)); err != nil { + return PrependError(fmt.Sprintf("%T.st (7) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return PrependError(fmt.Sprintf("%T write field end error 7:st: ", p), err) + } + return err +} + +func (p *MyTestStruct) writeField8(oprot TProtocol) (err error) { + if err := oprot.WriteFieldBegin("bin", STRING, 8); err != nil { + return PrependError(fmt.Sprintf("%T write field begin error 8:bin: ", p), err) + } + if err := oprot.WriteBinary(p.Bin); err != nil { + return PrependError(fmt.Sprintf("%T.bin (8) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return PrependError(fmt.Sprintf("%T write field end error 8:bin: ", p), err) + } + return err +} + +func (p *MyTestStruct) writeField9(oprot TProtocol) (err error) { + if err := oprot.WriteFieldBegin("stringMap", MAP, 9); err != nil { + return PrependError(fmt.Sprintf("%T write field begin error 9:stringMap: ", p), err) + } + if err := oprot.WriteMapBegin(STRING, STRING, len(p.StringMap)); err != nil { + return PrependError("error writing map begin: ", err) + } + for k, v := range p.StringMap { + if err := oprot.WriteString(string(k)); err != nil { + return PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) + } + if err := oprot.WriteString(string(v)); err != nil { + return PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) + } + } + if err := oprot.WriteMapEnd(); err != nil { + return PrependError("error writing map end: ", err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return PrependError(fmt.Sprintf("%T write field end error 9:stringMap: ", p), err) + } + return err +} + +func (p *MyTestStruct) writeField10(oprot TProtocol) (err error) { + if err := oprot.WriteFieldBegin("stringList", LIST, 10); err != nil { + return PrependError(fmt.Sprintf("%T write field begin error 10:stringList: ", p), err) + } + if err := oprot.WriteListBegin(STRING, len(p.StringList)); err != nil { + return PrependError("error writing list begin: ", err) + } + for _, v := range p.StringList { + if err := oprot.WriteString(string(v)); err != nil { + return PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) + } + } + if err := oprot.WriteListEnd(); err != nil { + return PrependError("error writing list end: ", err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return PrependError(fmt.Sprintf("%T write field end error 10:stringList: ", p), err) + } + return err +} + +func (p *MyTestStruct) writeField11(oprot TProtocol) (err error) { + if err := oprot.WriteFieldBegin("stringSet", SET, 11); err != nil { + return PrependError(fmt.Sprintf("%T write field begin error 11:stringSet: ", p), err) + } + if err := oprot.WriteSetBegin(STRING, len(p.StringSet)); err != nil { + return PrependError("error writing set begin: ", err) + } + for v, _ := range p.StringSet { + if err := oprot.WriteString(string(v)); err != nil { + return PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) + } + } + if err := oprot.WriteSetEnd(); err != nil { + return PrependError("error writing set end: ", err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return PrependError(fmt.Sprintf("%T write field end error 11:stringSet: ", p), err) + } + return err +} + +func (p *MyTestStruct) writeField12(oprot TProtocol) (err error) { + if err := oprot.WriteFieldBegin("e", I32, 12); err != nil { + return PrependError(fmt.Sprintf("%T write field begin error 12:e: ", p), err) + } + if err := oprot.WriteI32(int32(p.E)); err != nil { + return PrependError(fmt.Sprintf("%T.e (12) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return PrependError(fmt.Sprintf("%T write field end error 12:e: ", p), err) + } + return err +} + +func (p *MyTestStruct) String() string { + if p == nil { + return "<nil>" + } + return fmt.Sprintf("MyTestStruct(%+v)", *p) +}
