From b0138a5570092d3a25f39cda26cee5722a65e172 Mon Sep 17 00:00:00 2001 From: Chuntao Lu Date: Mon, 15 May 2017 16:05:02 -0700 Subject: [PATCH 1/2] Use latest easyjson --- glide.lock | 14 ++++++-------- glide.yaml | 8 +++----- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/glide.lock b/glide.lock index f4e0ab3b5..24a5e0f88 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: a28318f0b34bba3d32c1641ffefe60232e934cc11545f54b7804dde4a523c4d6 -updated: 2017-05-05T14:32:58.945623178-07:00 +hash: 9c89b932f9af1747c2e0fa0757019541e3260c81e87ca7ca2a8747cbe77e436e +updated: 2017-05-15T16:04:13.094984243-07:00 imports: - name: github.com/anmitsu/go-shlex version: 648efa622239a2f6ff949fed78ee37b48d499ba4 @@ -22,15 +22,13 @@ imports: - name: github.com/go-yaml/yaml version: a83829b6f1293c91addabc89d0571c246397bbf4 - name: github.com/jessevdk/go-flags - version: 0648c820cd4e564706597268ae2d2c7d9e6900c6 + version: 460c7bb0abd6e927f2767cadc91aa6ef776a98b4 - name: github.com/julienschmidt/httprouter version: 8c199fb6259ffc1af525cc3ad52ee60ba8359669 - name: github.com/kardianos/osext version: c2c54e542fb797ad986b31721e1baedf214ca413 - name: github.com/mailru/easyjson - version: c7e8f2b687054e448f35ff2693bd298c1a2f3a10 - repo: https://github.com/Raynos/easyjson.git - vcs: git + version: dffba8d13bbd998df17d8557570cdea0624b9d1d subpackages: - bootstrap - buffer @@ -52,7 +50,7 @@ imports: subpackages: - difflib - name: github.com/stretchr/testify - version: 976c720a22c8eb4eb6a0b4348ad85ad12491a506 + version: 4d4bfba8f1d1027c4fdbe371823030df51419987 subpackages: - assert - require @@ -113,7 +111,7 @@ imports: - zapcore - zaptest/observer - name: golang.org/x/net - version: feeb485667d1fdabe727840fe00adc22431bc86e + version: 34057069f4ab13dc4433c68d368737ebeafcccdc subpackages: - context testImports: [] diff --git a/glide.yaml b/glide.yaml index 8e49e0f44..fa7ea1416 100644 --- a/glide.yaml +++ b/glide.yaml @@ -5,9 +5,7 @@ import: - package: github.com/go-yaml/yaml version: a83829b6f1293c91addabc89d0571c246397bbf4 - package: github.com/mailru/easyjson - version: c7e8f2b687054e448f35ff2693bd298c1a2f3a10 - repo: https://github.com/Raynos/easyjson.git - vcs: git + version: dffba8d13bbd998df17d8557570cdea0624b9d1d subpackages: - buffer - jlexer @@ -44,6 +42,6 @@ import: - package: github.com/buger/jsonparser version: 5b691c8ebc4af5191baa426561d62f1b5115d6e5 -testImport: - - package: github.com/stretchr/testify - - subpackages: + - package: github.com/stretchr/testify + - subpackages: - - assert From e016037b64b5542730b0e0dbbd7a6b4df9a3c3a1 Mon Sep 17 00:00:00 2001 From: Chuntao Lu Date: Mon, 15 May 2017 15:54:30 -0700 Subject: [PATCH 2/2] Fix req/res type case --- codegen/template_bundle/template_files.go | 18 +++++++++--------- codegen/templates/tchannel_client.tmpl | 6 +++--- .../templates/tchannel_client_test_server.tmpl | 4 ++-- codegen/templates/tchannel_endpoint.tmpl | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go index b649a87e5..bdafc0d06 100644 --- a/codegen/template_bundle/template_files.go +++ b/codegen/template_bundle/template_files.go @@ -1260,10 +1260,10 @@ type {{$clientName}} struct { args *{{.RequestType}}, {{end -}} ) ({{- if ne .ResponseType "" -}} *{{.ResponseType}}, {{- end -}}map[string]string, error) { - var result {{.GenCodePkgName}}.{{$svc.Name}}_{{.Name}}_Result + var result {{.GenCodePkgName}}.{{title $svc.Name}}_{{title .Name}}_Result {{if eq .RequestType "" -}} - args := &{{.GenCodePkgName}}.{{$svc.Name}}_{{.Name}}_Args{} + args := &{{.GenCodePkgName}}.{{title $svc.Name}}_{{title .Name}}_Args{} {{end -}} success, respHeaders, err := c.client.Call( ctx, c.thriftService, "{{.Name}}", reqHeaders, args, &result, @@ -1290,7 +1290,7 @@ type {{$clientName}} struct { {{if eq .ResponseType "" -}} return respHeaders, err {{else -}} - resp, err := {{.GenCodePkgName}}.{{$svc.Name}}_{{.Name}}_Helper.UnwrapResponse(&result) + resp, err := {{.GenCodePkgName}}.{{title $svc.Name}}_{{title .Name}}_Helper.UnwrapResponse(&result) return resp, respHeaders, err {{end -}} } @@ -1308,7 +1308,7 @@ func tchannel_clientTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "tchannel_client.tmpl", size: 3107, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "tchannel_client.tmpl", size: 3143, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1362,8 +1362,8 @@ func (h *{{$handler}}) Handle( reqHeaders map[string]string, wireValue *wire.Value, ) (bool, zanzibar.RWTStruct, map[string]string, error) { - var req {{$genCodePkg}}.{{$svc.Name}}_{{.Name}}_Args - var res {{$genCodePkg}}.{{$svc.Name}}_{{.Name}}_Result + var req {{$genCodePkg}}.{{title $svc.Name}}_{{title .Name}}_Args + var res {{$genCodePkg}}.{{title $svc.Name}}_{{title .Name}}_Result if err := req.FromWire(*wireValue); err != nil { return false, nil, nil, err @@ -1422,7 +1422,7 @@ func tchannel_client_test_serverTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "tchannel_client_test_server.tmpl", size: 2780, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "tchannel_client_test_server.tmpl", size: 2804, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -1482,7 +1482,7 @@ func (h *{{$handlerName}}) Handle( } {{- end}} - var res {{$genCodePkg}}.{{.ThriftService}}_{{.Name}}_Result + var res {{$genCodePkg}}.{{title .ThriftService}}_{{title .Name}}_Result {{if ne .RequestType "" -}} var req {{.RequestType}} @@ -1559,7 +1559,7 @@ func tchannel_endpointTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "tchannel_endpoint.tmpl", size: 3168, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "tchannel_endpoint.tmpl", size: 3180, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/codegen/templates/tchannel_client.tmpl b/codegen/templates/tchannel_client.tmpl index 9f2b52873..21ae74ae9 100644 --- a/codegen/templates/tchannel_client.tmpl +++ b/codegen/templates/tchannel_client.tmpl @@ -68,10 +68,10 @@ type {{$clientName}} struct { args *{{.RequestType}}, {{end -}} ) ({{- if ne .ResponseType "" -}} *{{.ResponseType}}, {{- end -}}map[string]string, error) { - var result {{.GenCodePkgName}}.{{$svc.Name}}_{{.Name}}_Result + var result {{.GenCodePkgName}}.{{title $svc.Name}}_{{title .Name}}_Result {{if eq .RequestType "" -}} - args := &{{.GenCodePkgName}}.{{$svc.Name}}_{{.Name}}_Args{} + args := &{{.GenCodePkgName}}.{{title $svc.Name}}_{{title .Name}}_Args{} {{end -}} success, respHeaders, err := c.client.Call( ctx, c.thriftService, "{{.Name}}", reqHeaders, args, &result, @@ -98,7 +98,7 @@ type {{$clientName}} struct { {{if eq .ResponseType "" -}} return respHeaders, err {{else -}} - resp, err := {{.GenCodePkgName}}.{{$svc.Name}}_{{.Name}}_Helper.UnwrapResponse(&result) + resp, err := {{.GenCodePkgName}}.{{title $svc.Name}}_{{title .Name}}_Helper.UnwrapResponse(&result) return resp, respHeaders, err {{end -}} } diff --git a/codegen/templates/tchannel_client_test_server.tmpl b/codegen/templates/tchannel_client_test_server.tmpl index de3ae9be1..83a3abfa6 100644 --- a/codegen/templates/tchannel_client_test_server.tmpl +++ b/codegen/templates/tchannel_client_test_server.tmpl @@ -47,8 +47,8 @@ func (h *{{$handler}}) Handle( reqHeaders map[string]string, wireValue *wire.Value, ) (bool, zanzibar.RWTStruct, map[string]string, error) { - var req {{$genCodePkg}}.{{$svc.Name}}_{{.Name}}_Args - var res {{$genCodePkg}}.{{$svc.Name}}_{{.Name}}_Result + var req {{$genCodePkg}}.{{title $svc.Name}}_{{title .Name}}_Args + var res {{$genCodePkg}}.{{title $svc.Name}}_{{title .Name}}_Result if err := req.FromWire(*wireValue); err != nil { return false, nil, nil, err diff --git a/codegen/templates/tchannel_endpoint.tmpl b/codegen/templates/tchannel_endpoint.tmpl index 9f6e29488..0c78988d8 100644 --- a/codegen/templates/tchannel_endpoint.tmpl +++ b/codegen/templates/tchannel_endpoint.tmpl @@ -53,7 +53,7 @@ func (h *{{$handlerName}}) Handle( } {{- end}} - var res {{$genCodePkg}}.{{.ThriftService}}_{{.Name}}_Result + var res {{$genCodePkg}}.{{title .ThriftService}}_{{title .Name}}_Result {{if ne .RequestType "" -}} var req {{.RequestType}}