Fixup for 2e83b0dfdd45e1e54615606924dca565b547b08b #900
Conversation
We are using the v1 branch and lately there seems to be a change about the `contentType` parameter. I've commented on the recent commit [here](2e83b0d#commitcomment-19905560). This change removes the parameter `contentType` parameter from a function call under the same conditions as introduced in 2e83b0d. Also, I've added a workaround to remove the `header declared and not used error` which was caused because no content type is being anymore.
This was referenced Nov 21, 2016
kwk
referenced
this pull request
Nov 21, 2016
That is only if API supports multiple inbound content types.
goagen/gen_client/generator.go
Outdated
| @@ -990,6 +990,7 @@ func (c *Client) {{ $funcName }}(ctx context.Context, path string{{ if .Params } | |||
| return nil, err | |||
| } | |||
| {{ if or .Headers .HasPayload }} header := req.Header | |||
| _ = header // Avoid "header declared and not used" error | |||
| {{ if .HasPayload }}{{ if .HasMultiContent }} if contentType != "*/*" { | |||
raphael
Nov 21, 2016
•
Member
It seems moving the check for HasMultiContent might be better, something like:
{{ if or .Headers (and .HasPayload .HasMultiContent) }} header := req.Header
{{ if and .HasPayload .HasMultiContent }} if contentType != "*/*" {
The idea being that we only need to set headers if there's a payload and a contentType parameter or if there are headers to be set. The code above also combines the two if on line 994 into one which means one of the end below (on line 997) must be removed. Thank you!
It seems moving the check for HasMultiContent might be better, something like:
{{ if or .Headers (and .HasPayload .HasMultiContent) }} header := req.Header
{{ if and .HasPayload .HasMultiContent }} if contentType != "*/*" {The idea being that we only need to set headers if there's a payload and a contentType parameter or if there are headers to be set. The code above also combines the two if on line 994 into one which means one of the end below (on line 997) must be removed. Thank you!
|
Thank you! I added a comment in the commit, do you think you could make that change? and once you've made it could you also make a PR against branch |
See #900 (review) for change request.
|
Thank you! |
kwk
added a commit
to kwk/goa
that referenced
this pull request
Nov 21, 2016
* Fixup for 2e83b0d We are using the v1 branch and lately there seems to be a change about the `contentType` parameter. I've commented on the recent commit [here](goadesign@2e83b0d#commitcomment-19905560). This change removes the parameter `contentType` parameter from a function call under the same conditions as introduced in 2e83b0d. Also, I've added a workaround to remove the `header declared and not used error` which was caused because no content type is being anymore. * Create header if .HasPayload .HasMultiContent See goadesign#900 (review) for change request.
kwk
added a commit
to kwk/goa
that referenced
this pull request
Nov 21, 2016
* Fixup for 2e83b0d We are using the v1 branch and lately there seems to be a change about the `contentType` parameter. I've commented on the recent commit [here](goadesign@2e83b0d#commitcomment-19905560). This change removes the parameter `contentType` parameter from a function call under the same conditions as introduced in 2e83b0d. Also, I've added a workaround to remove the `header declared and not used error` which was caused because no content type is being anymore. * Create header if .HasPayload .HasMultiContent See goadesign#900 (review) for change request.
Merged
raphael
pushed a commit
that referenced
this pull request
Nov 21, 2016
* Fixup for 2e83b0d We are using the v1 branch and lately there seems to be a change about the `contentType` parameter. I've commented on the recent commit [here](2e83b0d#commitcomment-19905560). This change removes the parameter `contentType` parameter from a function call under the same conditions as introduced in 2e83b0d. Also, I've added a workaround to remove the `header declared and not used error` which was caused because no content type is being anymore. * Create header if .HasPayload .HasMultiContent See #900 (review) for change request.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
We are using the v1 branch and lately there seems to be a change about the
contentTypeparameter. I've commented on the recent commit here.This change removes the parameter
contentTypeparameter from a function call under the same conditions as introduced in 2e83b0d.Also, I've added a workaround to remove the
header declared and not used errorwhich was caused because no content type is being anymore.