fix response check

uber · Apr 10, 2018 · 66a2576 · 66a2576
1 parent a920526
commit 66a2576
Show file tree

Hide file tree

Showing 24 changed files with 49 additions and 97 deletions.
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
@@ -163,10 +163,8 @@ func (h *{{$handlerName}}) HandleRequest(
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
 		{{- if ne .ResponseType ""}}
-		if response != nil {
-			if body, err := json.Marshal(response); err == nil {
-				zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
-			}
+		if body, err := json.Marshal(response); err == nil {
+			zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
 		}
 		{{- end}}
 		for _, k := range cliRespHeaders.Keys() {

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithheaders.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithheaders.gogen
@@ -110,10 +110,8 @@ func (h *BarArgWithHeadersHandler) HandleRequest(
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
-		if response != nil {
-			if body, err := json.Marshal(response); err == nil {
-				zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
-			}
+		if body, err := json.Marshal(response); err == nil {
+			zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
 		}
 		for _, k := range cliRespHeaders.Keys() {
 			if val, ok := cliRespHeaders.Get(k); ok {

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithmanyqueryparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithmanyqueryparams.gogen
@@ -232,10 +232,8 @@ func (h *BarArgWithManyQueryParamsHandler) HandleRequest(
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
-		if response != nil {
-			if body, err := json.Marshal(response); err == nil {
-				zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
-			}
+		if body, err := json.Marshal(response); err == nil {
+			zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
 		}
 		for _, k := range cliRespHeaders.Keys() {
 			if val, ok := cliRespHeaders.Get(k); ok {

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithnestedqueryparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithnestedqueryparams.gogen
@@ -176,10 +176,8 @@ func (h *BarArgWithNestedQueryParamsHandler) HandleRequest(
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
-		if response != nil {
-			if body, err := json.Marshal(response); err == nil {
-				zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
-			}
+		if body, err := json.Marshal(response); err == nil {
+			zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
 		}
 		for _, k := range cliRespHeaders.Keys() {
 			if val, ok := cliRespHeaders.Get(k); ok {

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithparams.gogen
@@ -107,10 +107,8 @@ func (h *BarArgWithParamsHandler) HandleRequest(
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
-		if response != nil {
-			if body, err := json.Marshal(response); err == nil {
-				zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
-			}
+		if body, err := json.Marshal(response); err == nil {
+			zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
 		}
 		for _, k := range cliRespHeaders.Keys() {
 			if val, ok := cliRespHeaders.Get(k); ok {

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithqueryheader.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithqueryheader.gogen
@@ -104,10 +104,8 @@ func (h *BarArgWithQueryHeaderHandler) HandleRequest(
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
-		if response != nil {
-			if body, err := json.Marshal(response); err == nil {
-				zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
-			}
+		if body, err := json.Marshal(response); err == nil {
+			zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
 		}
 		for _, k := range cliRespHeaders.Keys() {
 			if val, ok := cliRespHeaders.Get(k); ok {

diff --git a/codegen/test_data/endpoints/bar_bar_method_argwithqueryparams.gogen b/codegen/test_data/endpoints/bar_bar_method_argwithqueryparams.gogen
@@ -118,10 +118,8 @@ func (h *BarArgWithQueryParamsHandler) HandleRequest(
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
-		if response != nil {
-			if body, err := json.Marshal(response); err == nil {
-				zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
-			}
+		if body, err := json.Marshal(response); err == nil {
+			zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
 		}
 		for _, k := range cliRespHeaders.Keys() {
 			if val, ok := cliRespHeaders.Get(k); ok {

diff --git a/codegen/test_data/endpoints/bar_bar_method_normal.gogen b/codegen/test_data/endpoints/bar_bar_method_normal.gogen
@@ -110,10 +110,8 @@ func (h *BarNormalHandler) HandleRequest(
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
-		if response != nil {
-			if body, err := json.Marshal(response); err == nil {
-				zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
-			}
+		if body, err := json.Marshal(response); err == nil {
+			zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
 		}
 		for _, k := range cliRespHeaders.Keys() {
 			if val, ok := cliRespHeaders.Get(k); ok {

diff --git a/codegen/test_data/endpoints/bar_bar_method_toomanyargs.gogen b/codegen/test_data/endpoints/bar_bar_method_toomanyargs.gogen
@@ -102,10 +102,8 @@ func (h *BarTooManyArgsHandler) HandleRequest(
 		zfields := []zapcore.Field{
 			zap.String("endpoint", h.endpoint.EndpointName),
 		}
-		if response != nil {
-			if body, err := json.Marshal(response); err == nil {
-				zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
-			}
+		if body, err := json.Marshal(response); err == nil {
+			zfields = append(zfields, zap.String("body", fmt.Sprintf("%s", body)))
 		}
 		for _, k := range cliRespHeaders.Keys() {
 			if val, ok := cliRespHeaders.Get(k); ok {

diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithheaders.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithheaders.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithmanyqueryparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithmanyqueryparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithnestedqueryparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithnestedqueryparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryheader.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryheader.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryparams.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_argwithqueryparams.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_normal.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_normal.go
diff --git a/examples/example-gateway/build/endpoints/bar/bar_bar_method_toomanyargs.go b/examples/example-gateway/build/endpoints/bar/bar_bar_method_toomanyargs.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_compare.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_compare.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_headerschema.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_headerschema.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_trans.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_trans.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_transheaders.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_transheaders.go
diff --git a/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_transheaderstype.go b/examples/example-gateway/build/endpoints/baz/baz_simpleservice_method_transheaderstype.go
diff --git a/examples/example-gateway/build/endpoints/contacts/contacts_contacts_method_savecontacts.go b/examples/example-gateway/build/endpoints/contacts/contacts_contacts_method_savecontacts.go