Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign upFixup for 2e83b0dfdd45e1e54615606924dca565b547b08b #900
Conversation
This was referenced Nov 21, 2016
referenced
this pull request
Nov 21, 2016
raphael
reviewed
Nov 21, 2016
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 != "*/*" { | |||
This comment has been minimized.
This comment has been minimized.
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!
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
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 |
This comment has been minimized.
This comment has been minimized.
|
Thank you! |
raphael
merged commit c72c2cd
into
goadesign:master
Nov 21, 2016
1 check passed
continuous-integration/travis-ci/pr
The Travis CI build passed
Details
added a commit
to kwk/goa
that referenced
this pull request
Nov 21, 2016
kwk
deleted the
kwk:patch-2
branch
Nov 21, 2016
added a commit
to kwk/goa
that referenced
this pull request
Nov 21, 2016
This comment has been minimized.
This comment has been minimized.
added a commit
that referenced
this pull request
Nov 21, 2016
ikawaha
referenced this pull request
Dec 13, 2016
Closed
There are unmerged features/fixes that were announced in v1.1.0. #964
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.
kwk commentedNov 21, 2016
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.