Accommodate changes to XContent classes #125
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,16 +7,17 @@ | |
| */ | ||
| package org.opensearch.search.relevance.transformer.kendraintelligentranking.configuration; | ||
|
|
||
| import org.opensearch.common.ParsingException; | ||
| import org.opensearch.common.io.stream.StreamInput; | ||
| import org.opensearch.common.io.stream.StreamOutput; | ||
| import org.opensearch.common.io.stream.Writeable; | ||
| import org.opensearch.common.settings.Settings; | ||
| import org.opensearch.core.ParseField; | ||
| import org.opensearch.core.xcontent.ObjectParser; | ||
| import org.opensearch.core.xcontent.ToXContent; | ||
| import org.opensearch.core.xcontent.ToXContentObject; | ||
| import org.opensearch.core.xcontent.XContentBuilder; | ||
| import org.opensearch.core.xcontent.XContentParser; | ||
| import org.opensearch.search.relevance.configuration.ResultTransformerConfiguration; | ||
| import org.opensearch.search.relevance.configuration.TransformerConfiguration; | ||
| import org.opensearch.search.relevance.transformer.kendraintelligentranking.KendraIntelligentRanker; | ||
|
|
@@ -76,7 +77,7 @@ public void writeTo(StreamOutput out) throws IOException { | |
| this.properties.writeTo(out); | ||
| } | ||
|
|
||
| public static KendraIntelligentRankingConfiguration parse(XContentParser parser) throws IOException { | ||
| try { | ||
| KendraIntelligentRankingConfiguration configuration = PARSER.parse(parser, null); | ||
| if (configuration != null && configuration.getOrder() <= 0) { | ||
|
|
@@ -90,7 +91,7 @@ public static ResultTransformerConfiguration parse(XContentParser parser) throws | |
| } | ||
|
|
||
| @Override | ||
| public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException { | ||
| builder.startObject(); | ||
| builder.field(TRANSFORMER_ORDER.getPreferredName(), this.order); | ||
| builder.field(TRANSFORMER_PROPERTIES.getPreferredName(), this.properties); | ||
|
|
@@ -154,7 +155,7 @@ public KendraIntelligentRankingProperties(final List<String> bodyFields, | |
|
|
||
| public KendraIntelligentRankingProperties(StreamInput input) throws IOException { | ||
| this.bodyFields = input.readStringList(); | ||
| this.titleFields = input.readStringList(); | ||
|
There was a problem hiding this comment. is this related to the XContent classes change? There was a problem hiding this comment. Not directly. When merging the cherry-picked commit, I also picked up the unit tests that I had previously added (in KendraIntelligentRankingConfigurationTests). When I added those tests in There was a problem hiding this comment. Oh... I just added the There was a problem hiding this comment. Oh, but the backport PR fails to build because we need to merge this PR to fix the XContent stuff: There was a problem hiding this comment.
Looks like there are two ways to handle this issue:
I'm fine with either, but There was a problem hiding this comment. I think #126 shouldn't have any conflicts once this one is merged, because any overlapping changes should be identical. |
||
| this.docLimit = input.readInt(); | ||
| } | ||
|
|
||
|
|
@@ -195,7 +196,7 @@ public boolean equals(Object o) { | |
|
|
||
| KendraIntelligentRankingProperties properties = (KendraIntelligentRankingProperties) o; | ||
|
|
||
| return Objects.equals(bodyFields, properties.bodyFields) && Objects.equals(titleFields, properties.titleFields) && | ||
| (docLimit == properties.docLimit); | ||
| } | ||
|
|
||
|
|
@@ -228,4 +229,6 @@ public void setDocLimit(final int docLimit) { | |
| this.docLimit = docLimit; | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } | ||
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
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
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
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
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
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.
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.
re:naming - is this going from less specific naming to more specific intentionally?
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.
Yes.
a) It helps the unit tests, since we can confirm the specific type.
b) There's a best-practice to take the most general type of argument and return the most specific type. I think it's an application of the Liskov substitution principle.