uber · Raynos · May 10, 2017 · May 2, 2017 · May 2, 2017 · May 2, 2017
diff --git a/codegen/method.go b/codegen/method.go
@@ -24,8 +24,6 @@ import (
 	"strconv"
 	"strings"
 
-	"fmt"
-
 	"github.com/pkg/errors"
 	"go.uber.org/thriftrw/compile"
 )
@@ -64,8 +62,7 @@ type MethodSpec struct {
 	ExceptionsIndex  map[string]ExceptionSpec
 	ValidStatusCodes []int
 	// Additional struct generated from the bundle of request args.
-	RequestBoxed  bool
-	RequestStruct []StructSpec
+	RequestBoxed bool
 	// Thrift service name the method belongs to.
 	ThriftService string
 	// The thriftrw-generated go package name
@@ -196,10 +193,17 @@ func (ms *MethodSpec) setRequestType(curThriftFile string, funcSpec *compile.Fun
 	var err error
 	if isRequestBoxed(funcSpec) {
 		ms.RequestBoxed = true
-		ms.RequestType, err = packageHelper.TypeFullName(curThriftFile, funcSpec.ArgsSpec[0].Type)
+		ms.RequestType, err = packageHelper.TypeFullName(
+			curThriftFile, funcSpec.ArgsSpec[0].Type,
+		)
 	} else {
 		ms.RequestBoxed = false
-		ms.RequestType, err = ms.newRequestType(curThriftFile, funcSpec, packageHelper)
+
+		goPackageName, err := packageHelper.TypePackageName(curThriftFile)
+		if err == nil {
+			ms.RequestType = goPackageName + "." +
+				ms.ThriftService + "_" + strings.Title(ms.Name) + "_Args"
+		}
 	}
 	if err != nil {
 		return errors.Wrap(err, "failed to set request type")
@@ -213,38 +217,6 @@ func isStructType(spec compile.TypeSpec) bool {
 	return isStruct
 }
 
-func (ms *MethodSpec) newRequestType(curThriftFile string, f *compile.FunctionSpec, h *PackageHelper) (string, error) {
-	var requestType string
-	// TODO: (lu) the assumption here is 'no annotation == tchannel', good enough until new protocol is introduced
-	if ms.WantAnnot {
-		requestType = strings.Title(f.Name) + "HTTPRequest"
-	} else {
-		// This is specifically generating the "Args" type that thriftrw generates.
-		requestType = fmt.Sprintf(
-			"%s.%s_%s_Args",
-			ms.GenCodePkgName, strings.Title(ms.ThriftService), strings.Title(f.Name),
-		)
-
-	}
-
-	ms.RequestStruct = make([]StructSpec, len(f.ArgsSpec))
-	for i, arg := range f.ArgsSpec {
-		typeName, err := h.TypeFullName(curThriftFile, arg.Type)
-		if err != nil {
-			return "", errors.Wrap(err, "failed to generate new request type")
-		}
-		if isStructType(arg.Type) {
-			typeName = "*" + typeName
-		}
-		ms.RequestStruct[i] = StructSpec{
-			Type:        typeName,
-			Name:        arg.Name,
-			Annotations: arg.Annotations,
-		}
-	}
-	return requestType, nil
-}
-
 func (ms *MethodSpec) setResponseType(curThriftFile string, respSpec *compile.ResultSpec, packageHelper *PackageHelper) error {
 	if respSpec == nil {
 		ms.ResponseType = ""

diff --git a/codegen/runner/pre-steps.sh b/codegen/runner/pre-steps.sh
@@ -43,10 +43,11 @@ echo "Compiled thriftrw : +$runtime"
 echo "Generating Go code from Thrift files"
 mkdir -p "$BUILD_DIR/gen-code"
 for tfile in $(find "$CONFIG_DIR/idl" -name '*.thrift'); do
-    "$THRIFTRW_BINARY" --out="$BUILD_DIR/gen-code" \
+	"$THRIFTRW_BINARY" --out="$BUILD_DIR/gen-code" \
 		--no-embed-idl \
-        --thrift-root="$CONFIG_DIR/idl" "$tfile"
+		--thrift-root="$CONFIG_DIR/idl" "$tfile"
 done
+gofmt -w "$BUILD_DIR/gen-code/"
 
 end=`date +%s`
 runtime=$((end-start))

diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
diff --git a/codegen/templates/endpoint.tmpl b/codegen/templates/endpoint.tmpl
@@ -248,7 +248,7 @@ func (w {{$workflow}}) Handle(
 }
 
 {{if and (ne .RequestType "") (ne $clientReqType "") -}}
-func convertTo{{title .Name}}ClientRequest(body *{{title .RequestType}}) *{{$clientReqType}} {
+func convertTo{{title .Name}}ClientRequest(body *{{.RequestType}}) *{{$clientReqType}} {
 	clientRequest := &{{$clientReqType}}{}
 
 	{{ range $key, $value := .RequestFieldMap -}}

diff --git a/codegen/templates/structs.tmpl b/codegen/templates/structs.tmpl
@@ -16,19 +16,3 @@ func getDirName() string {
 	_, file, _, _ := runtime.Caller(0)
 	return zanzibar.GetDirnameFromRuntimeCaller(file)
 }
-
-{{range .Services}}
-
-{{/*  ========================= Method =========================  */ -}}
-
-{{range .Methods}}
-{{if len .RequestStruct | ne 0}} {{- /* generate struct to wrap request args*/ -}}
-// {{.RequestType}} is the http body type for endpoint {{.Name}}.
-type {{.RequestType}} struct {
-	{{range .RequestStruct -}}
-	{{title .Name}} {{.Type}} `json:"{{.Name}}"`
-	{{end -}}
-}{{end -}}
-
-{{end}} {{- /* <range .Methods> */ -}}
-{{end}} {{- /* <range .Services> */ -}}
diff --git a/codegen/test_data/bar.json b/codegen/test_data/bar.json
@@ -39,7 +39,7 @@
 					],
 					"ReqHeaders": null,
 					"ResHeaders": null,
-					"RequestType": "ArgNotStructHTTPRequest",
+					"RequestType": "endpointsBarBar.Bar_ArgNotStruct_Args",
 					"ResponseType": "",
 					"OKStatusCode": {
 						"Code": 200,
@@ -76,13 +76,6 @@
 						403
 					],
 					"RequestBoxed": false,
-					"RequestStruct": [
-						{
-							"Type": "string",
-							"Name": "request",
-							"Annotations": null
-						}
-					],
 					"ThriftService": "Bar",
 					"GenCodePkgName": "endpointsBarBar",
 					"WantAnnot": true,
@@ -149,7 +142,6 @@
 						403
 					],
 					"RequestBoxed": false,
-					"RequestStruct": null,
 					"ThriftService": "Bar",
 					"GenCodePkgName": "endpointsBarBar",
 					"WantAnnot": true,
@@ -216,7 +208,6 @@
 						403
 					],
 					"RequestBoxed": false,
-					"RequestStruct": null,
 					"ThriftService": "Bar",
 					"GenCodePkgName": "endpointsBarBar",
 					"WantAnnot": true,
@@ -246,7 +237,7 @@
 					],
 					"ReqHeaders": null,
 					"ResHeaders": null,
-					"RequestType": "NormalHTTPRequest",
+					"RequestType": "endpointsBarBar.Bar_Normal_Args",
 					"ResponseType": "endpointsBarBar.BarResponse",
 					"OKStatusCode": {
 						"Code": 200,
@@ -283,13 +274,6 @@
 						403
 					],
 					"RequestBoxed": false,
-					"RequestStruct": [
-						{
-							"Type": "*endpointsBarBar.BarRequest",
-							"Name": "request",
-							"Annotations": null
-						}
-					],
 					"ThriftService": "Bar",
 					"GenCodePkgName": "endpointsBarBar",
 					"WantAnnot": true,
@@ -325,7 +309,7 @@
 						"x-uuid",
 						"x-token"
 					],
-					"RequestType": "TooManyArgsHTTPRequest",
+					"RequestType": "endpointsBarBar.Bar_TooManyArgs_Args",
 					"ResponseType": "endpointsBarBar.BarResponse",
 					"OKStatusCode": {
 						"Code": 200,
@@ -362,18 +346,6 @@
 						403
 					],
 					"RequestBoxed": false,
-					"RequestStruct": [
-						{
-							"Type": "*endpointsBarBar.BarRequest",
-							"Name": "request",
-							"Annotations": null
-						},
-						{
-							"Type": "*endpointsFooFoo.FooStruct",
-							"Name": "foo",
-							"Annotations": null
-						}
-					],
 					"ThriftService": "Bar",
 					"GenCodePkgName": "endpointsBarBar",
 					"WantAnnot": true,

diff --git a/codegen/test_data/clients/bar.gogen b/codegen/test_data/clients/bar.gogen
@@ -56,7 +56,7 @@ func NewClient(
 func (c *BarClient) ArgNotStruct(
 	ctx context.Context,
 	headers map[string]string,
-	r *ArgNotStructHTTPRequest,
+	r *clientsBarBar.Bar_ArgNotStruct_Args,
 ) (map[string]string, error) {
 
 	req := zanzibar.NewClientHTTPRequest(
@@ -237,7 +237,7 @@ func (c *BarClient) NoRequest(
 func (c *BarClient) Normal(
 	ctx context.Context,
 	headers map[string]string,
-	r *NormalHTTPRequest,
+	r *clientsBarBar.Bar_Normal_Args,
 ) (*clientsBarBar.BarResponse, map[string]string, error) {
 
 	req := zanzibar.NewClientHTTPRequest(
@@ -298,7 +298,7 @@ func (c *BarClient) Normal(
 func (c *BarClient) TooManyArgs(
 	ctx context.Context,
 	headers map[string]string,
-	r *TooManyArgsHTTPRequest,
+	r *clientsBarBar.Bar_TooManyArgs_Args,
 ) (*clientsBarBar.BarResponse, map[string]string, error) {
 
 	req := zanzibar.NewClientHTTPRequest(

diff --git a/codegen/test_data/clients/bar_structs.gogen b/codegen/test_data/clients/bar_structs.gogen
@@ -26,28 +26,10 @@ package barClient
 import (
 	"runtime"
 
-	clientsBarBar "github.com/uber/zanzibar/examples/example-gateway/build/gen-code/clients/bar/bar"
-	clientsFooFoo "github.com/uber/zanzibar/examples/example-gateway/build/gen-code/clients/foo/foo"
 	"github.com/uber/zanzibar/runtime"
 )
 
 func getDirName() string {
 	_, file, _, _ := runtime.Caller(0)
 	return zanzibar.GetDirnameFromRuntimeCaller(file)
 }
-
-// ArgNotStructHTTPRequest is the http body type for endpoint argNotStruct.
-type ArgNotStructHTTPRequest struct {
-	Request string `json:"request"`
-}
-
-// NormalHTTPRequest is the http body type for endpoint normal.
-type NormalHTTPRequest struct {
-	Request *clientsBarBar.BarRequest `json:"request"`
-}
-
-// TooManyArgsHTTPRequest is the http body type for endpoint tooManyArgs.
-type TooManyArgsHTTPRequest struct {
-	Request *clientsBarBar.BarRequest `json:"request"`
-	Foo     *clientsFooFoo.FooStruct  `json:"foo"`
-}
diff --git a/codegen/test_data/endpoint_tests/bar_bar_method_argnotstruct_test.gogen b/codegen/test_data/endpoint_tests/bar_bar_method_argnotstruct_test.gogen
@@ -68,7 +68,7 @@ func TestArgNotStructSuccessfulRequestOKResponse(t *testing.T) {
 		"POST",
 		"/bar/arg-not-struct-path",
 		headers,
-		bytes.NewReader([]byte(`{}`)),
+		bytes.NewReader([]byte(`{"request":"foo"}`)),
 	)
 	if !assert.NoError(t, err, "got http error") {
 		return

diff --git a/codegen/test_data/endpoint_tests/bar_bar_method_normal_test.gogen b/codegen/test_data/endpoint_tests/bar_bar_method_normal_test.gogen
@@ -68,7 +68,7 @@ func TestNormalSuccessfulRequestOKResponse(t *testing.T) {
 		"POST",
 		"/bar/bar-path",
 		headers,
-		bytes.NewReader([]byte(`{}`)),
+		bytes.NewReader([]byte(`{"request":{"boolField":true,"stringField":"foo"}}`)),
 	)
 	if !assert.NoError(t, err, "got http error") {
 		return

diff --git a/codegen/test_data/endpoint_tests/bar_bar_method_toomanyargs_test.gogen b/codegen/test_data/endpoint_tests/bar_bar_method_toomanyargs_test.gogen
@@ -82,7 +82,7 @@ func TestTooManyArgsSuccessfulRequestOKResponse(t *testing.T) {
 		"POST",
 		"/bar/too-many-args-path",
 		headers,
-		bytes.NewReader([]byte(`{}`)),
+		bytes.NewReader([]byte(`{"request":{"boolField":true,"stringField":"foo"}}`)),
 	)
 	if !assert.NoError(t, err, "got http error") {
 		return

diff --git a/codegen/test_data/endpoints/bar_bar_method_argnotstruct.gogen b/codegen/test_data/endpoints/bar_bar_method_argnotstruct.gogen
@@ -30,7 +30,6 @@ import (
 	zanzibar "github.com/uber/zanzibar/runtime"
 	"go.uber.org/zap"
 
-	"github.com/uber/zanzibar/.tmp_gen/clients/bar"
 	clientsBarBar "github.com/uber/zanzibar/examples/example-gateway/build/gen-code/clients/bar/bar"
 	endpointsBarBar "github.com/uber/zanzibar/examples/example-gateway/build/gen-code/endpoints/bar/bar"
 )
@@ -55,7 +54,7 @@ func (handler *ArgNotStructHandler) HandleRequest(
 	req *zanzibar.ServerHTTPRequest,
 	res *zanzibar.ServerHTTPResponse,
 ) {
-	var requestBody ArgNotStructHTTPRequest
+	var requestBody endpointsBarBar.Bar_ArgNotStruct_Args
 	if ok := req.ReadAndUnmarshalBody(&requestBody); !ok {
 		return
 	}
@@ -99,7 +98,7 @@ type ArgNotStructEndpoint struct {
 func (w ArgNotStructEndpoint) Handle(
 	ctx context.Context,
 	reqHeaders zanzibar.Header,
-	r *ArgNotStructHTTPRequest,
+	r *endpointsBarBar.Bar_ArgNotStruct_Args,
 ) (zanzibar.Header, error) {
 	clientRequest := convertToArgNotStructClientRequest(r)
 
@@ -139,8 +138,8 @@ func (w ArgNotStructEndpoint) Handle(
 	return resHeaders, nil
 }
 
-func convertToArgNotStructClientRequest(body *ArgNotStructHTTPRequest) *barClient.ArgNotStructHTTPRequest {
-	clientRequest := &barClient.ArgNotStructHTTPRequest{}
+func convertToArgNotStructClientRequest(body *endpointsBarBar.Bar_ArgNotStruct_Args) *clientsBarBar.Bar_ArgNotStruct_Args {
+	clientRequest := &clientsBarBar.Bar_ArgNotStruct_Args{}
 
 	clientRequest.Request = string(body.Request)