-
Notifications
You must be signed in to change notification settings - Fork 190
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix queries losing inherited data when toBuilder is called. #1181
Conversation
java-client/src/main/java/org/opensearch/client/opensearch/_types/query_dsl/BoolQuery.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@PiSoup Changes look great thanks! Could you please just fix your DCO signoff on your two most recent commits? Should be able to do it via git rebase --signoff HEAD~3
@PiSoup Unfortunately DCO is still unhappy as your commit author email is different to the email that signs off the commits: |
Calling `toBuilder` on classes which implement `QueryBase` will now preserve `boost` and `queryName`. Signed-off-by: Chris Danisch <[email protected]>
Signed-off-by: Chris Danisch <[email protected]>
Signed-off-by: Chris Danisch <[email protected]>
Oh for Pete's sake. Third time's the charm hopefully. |
@PiSoup Thanks for sticking with it despite the pain 😅 |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1181-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 020e0b053cb0d33ec44a8692a3ae558178ecc160
# Push it to GitHub
git push --set-upstream origin backport/backport-1181-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x Then, create a pull request where the |
…ch-project#1181) * Fixes opensearch-project#1172 Calling `toBuilder` on classes which implement `QueryBase` will now preserve `boost` and `queryName`. Signed-off-by: Chris Danisch <[email protected]> * Updated changelog Signed-off-by: Chris Danisch <[email protected]> * Added toBuilder to QueryBase instead. Signed-off-by: Chris Danisch <[email protected]> --------- Signed-off-by: Chris Danisch <[email protected]> (cherry picked from commit 020e0b0)
…ch-project#1181) * Fixes opensearch-project#1172 Calling `toBuilder` on classes which implement `QueryBase` will now preserve `boost` and `queryName`. Signed-off-by: Chris Danisch <[email protected]> * Updated changelog Signed-off-by: Chris Danisch <[email protected]> * Added toBuilder to QueryBase instead. Signed-off-by: Chris Danisch <[email protected]> --------- Signed-off-by: Chris Danisch <[email protected]> (cherry picked from commit 020e0b0) Signed-off-by: Thomas Farr <[email protected]>
…1184) * Fixes #1172 Calling `toBuilder` on classes which implement `QueryBase` will now preserve `boost` and `queryName`. * Updated changelog * Added toBuilder to QueryBase instead. --------- (cherry picked from commit 020e0b0) Signed-off-by: Chris Danisch <[email protected]> Signed-off-by: Thomas Farr <[email protected]> Co-authored-by: Chris Danisch <[email protected]>
Description
Calling
toBuilder
on classes which implementQueryBase
will now preserveboost
andqueryName
.Issues Resolved
Fixes #1172
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.