Fix toJsonString default mapper serialize type #1309
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
playLeo
requested review from
reta,
Bukhtawar,
dblock,
szczepanczykd,
madhusudhankonda,
saratvemulapalli,
VachaShah and
Xtansia
as code owners
dblock
previously requested changes
Nov 19, 2024
| @@ -81,15 +81,30 @@ public <T> void serialize(T value, JsonGenerator generator) { | |||
| return; | |||
| } | |||
|
|
|||
| if (value instanceof String) { | |||
There was a problem hiding this comment.
Maybe some else here is better and avoids the early return?
There was a problem hiding this comment.
I think you're right, I'll apply it when I refactoring
reta
requested changes
Nov 19, 2024
java-client/src/main/java/org/opensearch/client/json/JsonpUtils.java
Outdated
Show resolved
Hide resolved
playLeo
pushed a commit
to playLeo/opensearch-java
that referenced
this pull request
Nov 19, 2024
Signed-off-by: Leo <[email protected]>
playLeo
force-pushed
the
fix/toJsonStringMapper
branch
2 times, most recently
from
99b5a6b to
ee4d373
Compare
added 4 commits
November 20, 2024 01:55
Signed-off-by: Leo <[email protected]>
Signed-off-by: Leo <[email protected]>
…y JsonData raw value Signed-off-by: Leo <[email protected]>
Signed-off-by: Leo <[email protected]>
reta
reviewed
Nov 19, 2024
Signed-off-by: Leo <[email protected]>
reta
previously approved these changes
Nov 23, 2024
Signed-off-by: Thomas Farr <[email protected]>
Xtansia
approved these changes
Nov 24, 2024
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/opensearch-java/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/opensearch-java/backport-2.x
# Create a new branch
git switch --create backport/backport-1309-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ca3d488366e72f6d6dce33266c88a6841996332f
# Push it to GitHub
git push --set-upstream origin backport/backport-1309-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/opensearch-java/backport-2.xThen, create a pull request where the |
|
@playLeo Could you please manually backport this PR to |
playLeo
added a commit
to playLeo/opensearch-java
that referenced
this pull request
Nov 25, 2024
* fix toJsonString default mapper serialize type Signed-off-by: Leo <[email protected]> * test range query JsonData type value Signed-off-by: Leo <[email protected]> * refactor don't invoke the mapper's serialize method for the RangeQuery JsonData raw value Signed-off-by: Leo <[email protected]> * update CHANGELOG opensearch-project#1309 PR Signed-off-by: Leo <[email protected]> * add JsonDataImpl serialize value type Signed-off-by: Leo <[email protected]> --------- Signed-off-by: Leo <[email protected]> Signed-off-by: Thomas Farr <[email protected]> Co-authored-by: Leo <[email protected]> Co-authored-by: Thomas Farr <[email protected]> (cherry picked from commit ca3d488)
reta
pushed a commit
that referenced
this pull request
Nov 25, 2024
* fix toJsonString default mapper serialize type Signed-off-by: Leo <[email protected]> * test range query JsonData type value Signed-off-by: Leo <[email protected]> * refactor don't invoke the mapper's serialize method for the RangeQuery JsonData raw value Signed-off-by: Leo <[email protected]> * update CHANGELOG #1309 PR Signed-off-by: Leo <[email protected]> * add JsonDataImpl serialize value type Signed-off-by: Leo <[email protected]> --------- Signed-off-by: Leo <[email protected]> Signed-off-by: Thomas Farr <[email protected]> Co-authored-by: Leo <[email protected]> Co-authored-by: Thomas Farr <[email protected]> (cherry picked from commit ca3d488)
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
The toJsonString method of SearchRequest uses the default mapper provided by JsonpUtils.
This mapper only supports serializing instances of the JsonpSerializable type.
Using JsonData values in a range query cannot be serialized.
To resolve this, add support for serializing Integer, Double, and String types in the default mapper of JsonpUtils.
Issues Resolved
This PR is related to #1171
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.