feat: add flag to allow UrlEncodedContent to use UriPath escaping #1100
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ad of the deprecated urlEncoder
google-cla
bot
added
the
cla: yes
guillaumeblaquiere
added a commit
to guillaumeblaquiere/google-auth-library-java
that referenced
this pull request
Aug 28, 2020
idTokenWithAudience method not tested (I don't know how to do this to be useful) Depend on this update googleapis/google-http-java-client#1100
elharo
suggested changes
Aug 29, 2020
google-http-client/src/main/java/com/google/api/client/http/UrlEncodedContent.java
Outdated
Show resolved
Hide resolved
google-http-client/src/main/java/com/google/api/client/http/UrlEncodedContent.java
Outdated
Show resolved
Hide resolved
| } | ||
|
|
||
| /** | ||
| * @param data key name/value data |
There was a problem hiding this comment.
the key is a name and a value? That's surprising.
There was a problem hiding this comment.
Copy paste of the legacy comment (see line 56 of the file.) I kept the legacy signature and behavior, and I added mine with additional parameter. This one is unchanged (and I guess its description also!)
There was a problem hiding this comment.
Let me know if you want me to improve both or if keeping the existing description is ok.
There was a problem hiding this comment.
The more I look at this the weirder it is. Why is this an object instead of a Map?
There was a problem hiding this comment.
I agree; it's strange and I don't know why to use an Object instead of a Map! However to ensure the compatibility with other app that depends on this library, I kept the existing signature.
google-http-client/src/main/java/com/google/api/client/http/UrlEncodedContent.java
Outdated
Show resolved
Hide resolved
Improve variable naming Improve documentation more user oriented.
elharo
changed the title
kokoro-team
removed
the
kokoro:run
elharo
reviewed
Oct 12, 2020
| public UrlEncodedContent(Object data) { | ||
| super(UrlEncodedParser.MEDIA_TYPE); | ||
| setData(data); | ||
| this.uriPathEncodingFlag = false; | ||
| } | ||
|
|
||
| /** | ||
| * Initialize the UrlEncodedContent with our without the legacy and deprecated escapeUri encoder |
| * @param useUriPathEncoding Escapes the string value so it can be safely included in URI path segments. For details on | ||
| * * escaping URIs, see <a href="http://tools.ietf.org/html/rfc3986#section-2.4">RFC 3986 - section | ||
| * * 2.4</a> | ||
| * @param useUriPathEncoding Escapes the string value so it can be safely included in URI path segments. |
| * * 2.4</a> | ||
| * @param useUriPathEncoding Escapes the string value so it can be safely included in URI path segments. | ||
| * For details on escaping URIs, see <a href="http://tools.ietf.org/html/rfc3986#section-2.4">RFC 3986 - | ||
| * section 2.4</a> | ||
| */ | ||
| public UrlEncodedContent(Object data, Boolean useUriPathEncoding) { |
There was a problem hiding this comment.
Boolean --> boolean
per Effective Java
elharo
approved these changes
Oct 12, 2020
chingor13
added
the
kokoro:force-run
kokoro-team
removed
the
kokoro:force-run
chingor13
changed the title
chingor13
changed the title
chingor13
added
the
kokoro:force-run
kokoro-team
removed
the
kokoro:force-run
chingor13
added
the
automerge
gcf-merge-on-green
bot
removed
the
automerge
gcf-merge-on-green bot
pushed a commit
that referenced
this pull request
Oct 13, 2020
🤖 I have created a release \*beep\* \*boop\* --- ## [1.37.0](https://www.github.com/googleapis/google-http-java-client/compare/v1.36.0...v1.37.0) (2020-10-13) ### Features * add flag to allow UrlEncodedContent to use UriPath escaping ([#1100](https://www.github.com/googleapis/google-http-java-client/issues/1100)) ([9ab7016](https://www.github.com/googleapis/google-http-java-client/commit/9ab7016032327f6fb0f91970dfbd511b029dd949)), closes [#1098](https://www.github.com/googleapis/google-http-java-client/issues/1098) ### Bug Fixes * make google-http-client.properties file shading friendly ([#1046](https://www.github.com/googleapis/google-http-java-client/issues/1046)) ([860bb05](https://www.github.com/googleapis/google-http-java-client/commit/860bb0541bcd7fc516cad14dd0d52481c7c7b414)) ### Dependencies * update protobuf-java to 3.13.0 ([#1093](https://www.github.com/googleapis/google-http-java-client/issues/1093)) ([b7e9663](https://www.github.com/googleapis/google-http-java-client/commit/b7e96632234e944e0e476dedfc822333716756bb)) ### Documentation * libraries-bom 12.0.0 ([#1136](https://www.github.com/googleapis/google-http-java-client/issues/1136)) ([450fcb2](https://www.github.com/googleapis/google-http-java-client/commit/450fcb2293cf3fa7c788cf0cc8ae48e865ae8de8)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please).
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.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1098
The legacy behavior is kept. Test has been updated