Fix optionalbody

Author: tchssk

optionalbody/generate.go

@@ -104,7 +104,7 @@ func update(f *codegen.File) {
 			section.Source = strings.Replace(section.Source,
 				`	{{- if .Payload.Request.MustHaveBody }}
 			if errors.Is(err, io.EOF) {
-				return nil, goa.MissingPayloadError()
+				return payload, goa.MissingPayloadError()
 			}
 	{{- else }}
 			if errors.Is(err, io.EOF) {
@@ -113,18 +113,18 @@ func update(f *codegen.File) {
 	{{- end }}
 			var gerr *goa.ServiceError
 			if errors.As(err, &gerr) {
-				return nil, gerr
+				return payload, gerr
 			}
-			return nil, goa.DecodePayloadError(err.Error())
+			return payload, goa.DecodePayloadError(err.Error())
 	{{- if not .Payload.Request.MustHaveBody }}
 			}
 	{{- end }}`,
 				`			if !errors.Is(err, io.EOF) {
 				var gerr *goa.ServiceError
 				if errors.As(err, &gerr) {
-					return nil, gerr
+					return payload, gerr
 				}
-				return nil, goa.DecodePayloadError(err.Error())
+				return payload, goa.DecodePayloadError(err.Error())
 			}
 			emptyBody = true
 			err = nil`,
@@ -134,22 +134,22 @@ func update(f *codegen.File) {
 				`	{{- if .Payload.Request.ServerBody.ValidateRef }}
 		{{ .Payload.Request.ServerBody.ValidateRef }}
 		if err != nil {
-			return nil, err
+			return payload, err
 		}
 	{{- end }}`,
 				`	{{- if .Payload.Request.ServerBody.ValidateRef }}
 		if !emptyBody {
 			{{ .Payload.Request.ServerBody.ValidateRef }}
 			if err != nil {
-				return nil, err
+				return payload, err
 			}
 		}
 	{{- end }}`,
 				-1,
 			)
 			section.Source = strings.Replace(section.Source,
-				`	payload := {{ .Payload.Request.PayloadInit.Name }}({{ range .Payload.Request.PayloadInit.ServerArgs }}{{ .Ref }}, {{ end }})`,
-				`	payload := {{ .Payload.Request.PayloadInit.Name }}`+serverPayloadInitNameSuffix+`({{ range .Payload.Request.PayloadInit.ServerArgs }}{{ .Ref }}, {{ end }})
+				`	payload = {{ .Payload.Request.PayloadInit.Name }}({{ range .Payload.Request.PayloadInit.ServerArgs }}{{ .Ref }}, {{ end }})`,
+				`	payload = {{ .Payload.Request.PayloadInit.Name }}`+serverPayloadInitNameSuffix+`({{ range .Payload.Request.PayloadInit.ServerArgs }}{{ .Ref }}, {{ end }})
 	if !emptyBody {
 		payload = {{ .Payload.Request.PayloadInit.Name }}({{ range .Payload.Request.PayloadInit.ServerArgs }}{{ .Ref }}, {{ end }})
 	}`,

optionalbody/testdata/code.go

@@ -87,6 +87,7 @@ func EncodeMethod1Response(encoder func(context.Context, http.ResponseWriter) go
 // Method1 endpoint.
 func DecodeMethod1Request(mux goahttp.Muxer, decoder func(*http.Request) goahttp.Decoder) func(*http.Request) (*service1.Payload, error) {
 	return func(r *http.Request) (*service1.Payload, error) {
+		var payload *service1.Payload
 		var (
 			body      Method1RequestBody
 			emptyBody bool
@@ -97,20 +98,20 @@ func DecodeMethod1Request(mux goahttp.Muxer, decoder func(*http.Request) goahttp
 			if !errors.Is(err, io.EOF) {
 				var gerr *goa.ServiceError
 				if errors.As(err, &gerr) {
-					return nil, gerr
+					return payload, gerr
 				}
-				return nil, goa.DecodePayloadError(err.Error())
+				return payload, goa.DecodePayloadError(err.Error())
 			}
 			emptyBody = true
 			err = nil
 		}
 		if !emptyBody {
 			err = ValidateMethod1RequestBody(&body)
 			if err != nil {
-				return nil, err
+				return payload, err
 			}
 		}
-		payload := NewMethod1PayloadWithOptionalBody(&body)
+		payload = NewMethod1PayloadWithOptionalBody(&body)
 		if !emptyBody {
 			payload = NewMethod1Payload(&body)
 		}
@@ -132,26 +133,27 @@ func EncodeMethod2Response(encoder func(context.Context, http.ResponseWriter) go
 // Method2 endpoint.
 func DecodeMethod2Request(mux goahttp.Muxer, decoder func(*http.Request) goahttp.Decoder) func(*http.Request) (*service1.Payload, error) {
 	return func(r *http.Request) (*service1.Payload, error) {
+		var payload *service1.Payload
 		var (
 			body Method2RequestBody
 			err  error
 		)
 		err = decoder(r).Decode(&body)
 		if err != nil {
 			if errors.Is(err, io.EOF) {
-				return nil, goa.MissingPayloadError()
+				return payload, goa.MissingPayloadError()
 			}
 			var gerr *goa.ServiceError
 			if errors.As(err, &gerr) {
-				return nil, gerr
+				return payload, gerr
 			}
-			return nil, goa.DecodePayloadError(err.Error())
+			return payload, goa.DecodePayloadError(err.Error())
 		}
 		err = ValidateMethod2RequestBody(&body)
 		if err != nil {
-			return nil, err
+			return payload, err
 		}
-		payload := NewMethod2Payload(&body)
+		payload = NewMethod2Payload(&body)
 
 		return payload, nil
 	}
@@ -172,26 +174,27 @@ func EncodeMethod1Response(encoder func(context.Context, http.ResponseWriter) go
 // Method1 endpoint.
 func DecodeMethod1Request(mux goahttp.Muxer, decoder func(*http.Request) goahttp.Decoder) func(*http.Request) (*service2.Payload, error) {
 	return func(r *http.Request) (*service2.Payload, error) {
+		var payload *service2.Payload
 		var (
 			body Method1RequestBody
 			err  error
 		)
 		err = decoder(r).Decode(&body)
 		if err != nil {
 			if errors.Is(err, io.EOF) {
-				return nil, goa.MissingPayloadError()
+				return payload, goa.MissingPayloadError()
 			}
 			var gerr *goa.ServiceError
 			if errors.As(err, &gerr) {
-				return nil, gerr
+				return payload, gerr
 			}
-			return nil, goa.DecodePayloadError(err.Error())
+			return payload, goa.DecodePayloadError(err.Error())
 		}
 		err = ValidateMethod1RequestBody(&body)
 		if err != nil {
-			return nil, err
+			return payload, err
 		}
-		payload := NewMethod1Payload(&body)
+		payload = NewMethod1Payload(&body)
 
 		return payload, nil
 	}