TermvectorsResponse fix for optionals. #642
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
Signed-off-by: pieper <[email protected]>
MikePieperSer
requested review from
reta,
Bukhtawar,
dblock,
szczepanczykd,
madhusudhankonda,
saratvemulapalli and
VachaShah
as code owners
Signed-off-by: pieper <[email protected]>
dblock
reviewed
Sep 28, 2023
| @@ -157,8 +157,10 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { | |||
| generator.writeKey("took"); | |||
| generator.write(this.took); | |||
|
|
|||
| generator.writeKey("_version"); | |||
| generator.write(this.version); | |||
| if (null != this.version) { | |||
There was a problem hiding this comment.
Tabs vs. spaces looks suspicious here. Also surprised spotless didn't catch it, mind checking please?
| @@ -157,8 +157,10 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { | |||
| generator.writeKey("took"); | |||
| generator.write(this.took); | |||
|
|
|||
| generator.writeKey("_version"); | |||
| generator.write(this.version); | |||
| if (null != this.version) { | |||
There was a problem hiding this comment.
Is this optional? Maybe add a test?
There was a problem hiding this comment.
You have right. According to the server sources https://github.com/opensearch-project/OpenSearch/blob/7dc6683838951e1a211c6ff634d9eea93e2be3c2/server/src/main/java/org/opensearch/action/termvectors/TermVectorsResponse.java#L205 _version is still delivered.
Signed-off-by: pieper <[email protected]>
Signed-off-by: pieper <[email protected]>
|
@MikePieperSer Can you please fix the merge conflicts? Thank you! |
…_optionals_main Signed-off-by: pieper <[email protected]>
dblock
requested changes
Oct 4, 2023
CHANGELOG.md
Outdated
| @@ -30,6 +30,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) | |||
| - Fix version and build ([#254](https://github.com/opensearch-project/opensearch-java/pull/254)) | |||
| - Fix PutMappingRequest by removing unsupported fields ([#597](https://github.com/opensearch-project/opensearch-java/pull/597)) | |||
| - Fix parsing of GetFieldMappingResponse ([#641](https://github.com/opensearch-project/opensearch-java/pull/641)) | |||
| - [BUG] Fix TermvectorsResponse for optional fields. ([#642](https://github.com/opensearch-project/opensearch-java/pull/642)) | |||
There was a problem hiding this comment.
Let's make this look like the other lines. Say Fix ...
Signed-off-by: pieper <[email protected]>
dblock
previously approved these changes
Oct 5, 2023
CHANGELOG.md
Outdated
| @@ -30,6 +30,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) | |||
| - Fix version and build ([#254](https://github.com/opensearch-project/opensearch-java/pull/254)) | |||
| - Fix PutMappingRequest by removing unsupported fields ([#597](https://github.com/opensearch-project/opensearch-java/pull/597)) | |||
| - Fix parsing of GetFieldMappingResponse ([#641](https://github.com/opensearch-project/opensearch-java/pull/641)) | |||
| - Fix TermvectorsResponse for optional fields. ([#642](https://github.com/opensearch-project/opensearch-java/pull/642)) | |||
Signed-off-by: pieper <[email protected]>
dblock
approved these changes
Oct 9, 2023
VachaShah
approved these changes
Oct 9, 2023
VachaShah
pushed a commit
to VachaShah/opensearch-java
that referenced
this pull request
Oct 9, 2023
* TermvectorsResponse fix for optionals. Signed-off-by: pieper <[email protected]> * Add Changelog. Signed-off-by: pieper <[email protected]> * Tabs vs. spaces fix. Signed-off-by: pieper <[email protected]> * Version is not optional. Signed-off-by: pieper <[email protected]> * Changelog fix. Signed-off-by: pieper <[email protected]> * Period removed. Signed-off-by: pieper <[email protected]> --------- Signed-off-by: pieper <[email protected]> Signed-off-by: Vacha Shah <[email protected]>
|
Not sure why the backport workflow did not run, I will look into it. Created a manual backport PR #658 for now. |
dblock
pushed a commit
that referenced
this pull request
Oct 9, 2023
* TermvectorsResponse fix for optionals. * Add Changelog. * Tabs vs. spaces fix. * Version is not optional. * Changelog fix. * Period removed. --------- Signed-off-by: pieper <[email protected]> Signed-off-by: Vacha Shah <[email protected]> Co-authored-by: MikePieperSer <[email protected]>
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
This makes optional fields in TermvectorsResponse optional.
Issues Resolved
Closes [#639 ]
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.