From 596b5cf108083bb898c386cb620c8bbc2d87b742 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 23 Oct 2018 17:26:17 -0700 Subject: [PATCH] Test: Fix last reference to SearchScript (#34731) This was accidentally left over when converting to FieldScript. closes #34683 --- .../xpack/ml/transforms/PainlessDomainSplitIT.java | 5 ----- .../xpack/ml/MachineLearningPainlessExtension.java | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/x-pack/plugin/ml/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java b/x-pack/plugin/ml/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java index 34d58ef08bf..7af4453c2d4 100644 --- a/x-pack/plugin/ml/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java +++ b/x-pack/plugin/ml/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java @@ -176,11 +176,6 @@ public class PainlessDomainSplitIT extends ESRestTestCase { tests.add(new TestConfiguration(null, "shishi.xn--fiqs8s","shishi.xn--fiqs8s")); } - public void testEmptyToLetBuildPass() { - // remove this once one of the awaitsfixes are removed!! - } - - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/34683") public void testIsolated() throws Exception { Settings.Builder settings = Settings.builder() .put(IndexMetaData.INDEX_NUMBER_OF_SHARDS_SETTING.getKey(), 1) diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningPainlessExtension.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningPainlessExtension.java index b55936acd06..12d2626db74 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningPainlessExtension.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningPainlessExtension.java @@ -8,8 +8,8 @@ package org.elasticsearch.xpack.ml; import org.elasticsearch.painless.spi.PainlessExtension; import org.elasticsearch.painless.spi.Whitelist; import org.elasticsearch.painless.spi.WhitelistLoader; +import org.elasticsearch.script.FieldScript; import org.elasticsearch.script.ScriptContext; -import org.elasticsearch.script.SearchScript; import java.util.Collections; import java.util.List; @@ -21,6 +21,6 @@ public class MachineLearningPainlessExtension implements PainlessExtension { @Override public Map, List> getContextWhitelists() { - return Collections.singletonMap(SearchScript.CONTEXT, Collections.singletonList(WHITELIST)); + return Collections.singletonMap(FieldScript.CONTEXT, Collections.singletonList(WHITELIST)); } }