Elastic 6.3.0 support; closes #168 #169
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
purbon
reviewed
Jun 22, 2018
| zipStorePath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| distributionSha256Sum=6ac2f8f9302f50241bf14cc5f4a3d88504ad20e61bb98c5fd048f7723b61397e |
There was a problem hiding this comment.
sorry for the might be stupid question, what is this sha for?
There was a problem hiding this comment.
I copied it from upstream, I guess it's an extra check to make sure that binary downloaded is valid (probably security concerns?)
purbon
reviewed
Jun 22, 2018
| @@ -164,7 +165,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws | |||
| if (modelAsString) { | |||
| builder.value(rankingModel); | |||
| } else { | |||
| try (XContentParser parser = JsonXContent.jsonXContent.createParser(EMPTY, rankingModel)) { | |||
| try (XContentParser parser = JsonXContent.jsonXContent.createParser(EMPTY, | |||
| LoggingDeprecationHandler.INSTANCE, rankingModel) | |||
There was a problem hiding this comment.
again, sorry for the might be stupid question. Why this is logged as deprecated?
There was a problem hiding this comment.
This is the new signature for createParser, I suppose that now they force us to specify the deprecation policy. (this is part of elastic/elasticsearch#28504 & elastic/elasticsearch#28697)
nomoa
commented
Jun 22, 2018
| @@ -114,7 +114,7 @@ public StoredFeature(String name, List<String> params, String templateLanguage, | |||
| } | |||
|
|
|||
| public StoredFeature(String name, List<String> params, String templateLanguage, XContentBuilder template) { | |||
| this(name, params, templateLanguage, Objects.requireNonNull(template).bytes().utf8ToString(), false); | |||
| this(name, params, templateLanguage, BytesReference.bytes(Objects.requireNonNull(template)).utf8ToString(), false); | |||
There was a problem hiding this comment.
should be Strings.toString
Fixes #168
|
Looks good 👍 smoke tested with demo on ES 6.3.1. Merging... |
softwaredoug
changed the title
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.
Fixes #168