Modify to not use URLEncodedUtils #999
Merged
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
AntCode97
requested review from
reta,
Bukhtawar,
dblock,
szczepanczykd,
madhusudhankonda,
saratvemulapalli and
VachaShah
as code owners
dblock
requested changes
May 24, 2024
AntCode97
force-pushed
the
modify-to-not-use-url-encoded-utils
branch
2 times, most recently
from
7d546c9 to
2a4b9b5
Compare
|
This works for me. Let's add a line to CHANGELOG? This fixes a bug. You can say "Fix java.lang.NoSuchMethodError: org.apache.http.client.utils.URLEncodedUtils.formatSegments w/o httpclient" or something like that. |
reta
reviewed
May 30, 2024
|
Thank you @AntCode97 , I think we only are missing entry in CHANGELOG.md under [Unreleased 2.x] section, could you please add one? Thank you. |
Okay. I've added it. |
|
@AntCode97 my apologies, there are conflicts and and DCO check is failing |
AntCode97
force-pushed
the
modify-to-not-use-url-encoded-utils
branch
2 times, most recently
from
b0d800c to
0dcf634
Compare
Signed-off-by: AntCode97 <dbswns97@gmail.com>
Signed-off-by: AntCode97 <dbswns97@gmail.com>
Signed-off-by: AntCode97 <dbswns97@gmail.com>
Signed-off-by: AntCode97 <dbswns97@gmail.com>
Signed-off-by: AntCode97 <dbswns97@gmail.com>
Signed-off-by: AntCode97 <dbswns97@gmail.com>
Signed-off-by: AntCode97 <dbswns97@gmail.com>
Signed-off-by: AntCode97 <dbswns97@gmail.com>
Signed-off-by: AntCode97 <dbswns97@gmail.com>
AntCode97
force-pushed
the
modify-to-not-use-url-encoded-utils
branch
from
0dcf634 to
cdf7840
Compare
Oh, I forgot about that, all fixed. |
reta
approved these changes
May 31, 2024
|
@dblock all yours :) |
dblock
approved these changes
May 31, 2024
There was a problem hiding this comment.
@AntCode97 Thank you!
It solves the problem so let's merge.
I dislike the fact that we're using reflection very much. I would have much rather preferred either a neutral implementation or a change in class hierarchy that ends up calling the encode method in the right library. Since I'm only the talking head I opened #1008. Maybe I'll get to it or maybe you or @reta feel like a challenge :)
reta
pushed a commit
to reta/opensearch-java
that referenced
this pull request
Jun 5, 2024
* modify to not use URLEncodedUtils Signed-off-by: AntCode97 <dbswns97@gmail.com> * add a license header Signed-off-by: AntCode97 <dbswns97@gmail.com> * add pathEncoder test Signed-off-by: AntCode97 <dbswns97@gmail.com> * modify to use ByteBuffer in encodeBytes method Signed-off-by: AntCode97 <dbswns97@gmail.com> * modify to use URLEncoder Signed-off-by: AntCode97 <dbswns97@gmail.com> * delete PathEncoder Signed-off-by: AntCode97 <dbswns97@gmail.com> * modify to use URLEncodedUtils per version per Classpath Signed-off-by: AntCode97 <dbswns97@gmail.com> * fix to use MethodHandle instead of reflection Signed-off-by: AntCode97 <dbswns97@gmail.com> * add CHANGELOG.md Signed-off-by: AntCode97 <dbswns97@gmail.com> --------- Signed-off-by: AntCode97 <dbswns97@gmail.com>
reta
pushed a commit
to reta/opensearch-java
that referenced
this pull request
Jun 5, 2024
* modify to not use URLEncodedUtils Signed-off-by: AntCode97 <dbswns97@gmail.com> * add a license header Signed-off-by: AntCode97 <dbswns97@gmail.com> * add pathEncoder test Signed-off-by: AntCode97 <dbswns97@gmail.com> * modify to use ByteBuffer in encodeBytes method Signed-off-by: AntCode97 <dbswns97@gmail.com> * modify to use URLEncoder Signed-off-by: AntCode97 <dbswns97@gmail.com> * delete PathEncoder Signed-off-by: AntCode97 <dbswns97@gmail.com> * modify to use URLEncodedUtils per version per Classpath Signed-off-by: AntCode97 <dbswns97@gmail.com> * fix to use MethodHandle instead of reflection Signed-off-by: AntCode97 <dbswns97@gmail.com> * add CHANGELOG.md Signed-off-by: AntCode97 <dbswns97@gmail.com> --------- Signed-off-by: AntCode97 <dbswns97@gmail.com> Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
reta
pushed a commit
to reta/opensearch-java
that referenced
this pull request
Jun 5, 2024
* modify to not use URLEncodedUtils Signed-off-by: AntCode97 <dbswns97@gmail.com> * add a license header Signed-off-by: AntCode97 <dbswns97@gmail.com> * add pathEncoder test Signed-off-by: AntCode97 <dbswns97@gmail.com> * modify to use ByteBuffer in encodeBytes method Signed-off-by: AntCode97 <dbswns97@gmail.com> * modify to use URLEncoder Signed-off-by: AntCode97 <dbswns97@gmail.com> * delete PathEncoder Signed-off-by: AntCode97 <dbswns97@gmail.com> * modify to use URLEncodedUtils per version per Classpath Signed-off-by: AntCode97 <dbswns97@gmail.com> * fix to use MethodHandle instead of reflection Signed-off-by: AntCode97 <dbswns97@gmail.com> * add CHANGELOG.md Signed-off-by: AntCode97 <dbswns97@gmail.com> --------- Signed-off-by: AntCode97 <dbswns97@gmail.com> Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
dblock
pushed a commit
that referenced
this pull request
Jun 5, 2024
* modify to not use URLEncodedUtils * add a license header * add pathEncoder test * modify to use ByteBuffer in encodeBytes method * modify to use URLEncoder * delete PathEncoder * modify to use URLEncodedUtils per version per Classpath * fix to use MethodHandle instead of reflection * add CHANGELOG.md --------- Signed-off-by: AntCode97 <dbswns97@gmail.com> Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Co-authored-by: AntCode97 <50140266+AntCode97@users.noreply.github.com>
reta
added a commit
to reta/opensearch-java
that referenced
this pull request
Jun 5, 2024
…h-project#1012) * modify to not use URLEncodedUtils * add a license header * add pathEncoder test * modify to use ByteBuffer in encodeBytes method * modify to use URLEncoder * delete PathEncoder * modify to use URLEncodedUtils per version per Classpath * fix to use MethodHandle instead of reflection * add CHANGELOG.md --------- Signed-off-by: AntCode97 <dbswns97@gmail.com> Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Co-authored-by: AntCode97 <50140266+AntCode97@users.noreply.github.com>
dblock
pushed a commit
that referenced
this pull request
Jun 5, 2024
* modify to not use URLEncodedUtils * add a license header * add pathEncoder test * modify to use ByteBuffer in encodeBytes method * modify to use URLEncoder * delete PathEncoder * modify to use URLEncodedUtils per version per Classpath * fix to use MethodHandle instead of reflection * add CHANGELOG.md --------- Signed-off-by: AntCode97 <dbswns97@gmail.com> Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Co-authored-by: AntCode97 <50140266+AntCode97@users.noreply.github.com>
Closed
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.
Description
SimpleEndpoint uses org.apache.hc.core5.net.URLEncodedUtils, but we deprecated it and modified it to use our own implementation of pathEncoder.
This allows us to remove the dependency on HttpClient.
I've referenced URLEncodedUtils and made it work exactly the same, optimizing it by removing parameters that aren't needed.
Issues Resolved
Fixes #998
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.