From aeb97ff41298e26b107a733837dfe17f123c0c9b Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Thu, 10 Nov 2016 09:59:13 -0800 Subject: Clean up of Script. Closes #21321 --- .../java/org/elasticsearch/search/SearchCancellationIT.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java') diff --git a/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java b/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java index 53653392e6..d615e95499 100644 --- a/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java +++ b/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java @@ -147,7 +147,8 @@ public class SearchCancellationIT extends ESIntegTestCase { logger.info("Executing search"); ListenableActionFuture searchResponse = client().prepareSearch("test").setQuery( - scriptQuery(new Script(NativeTestScriptedBlockFactory.TEST_NATIVE_BLOCK_SCRIPT, ScriptType.INLINE, "native", null))) + scriptQuery(new Script( + ScriptType.INLINE, "native", NativeTestScriptedBlockFactory.TEST_NATIVE_BLOCK_SCRIPT, Collections.emptyMap()))) .execute(); awaitForBlock(plugins); @@ -165,7 +166,7 @@ public class SearchCancellationIT extends ESIntegTestCase { logger.info("Executing search"); ListenableActionFuture searchResponse = client().prepareSearch("test") .addScriptField("test_field", - new Script(NativeTestScriptedBlockFactory.TEST_NATIVE_BLOCK_SCRIPT, ScriptType.INLINE, "native", null) + new Script(ScriptType.INLINE, "native", NativeTestScriptedBlockFactory.TEST_NATIVE_BLOCK_SCRIPT, Collections.emptyMap()) ).execute(); awaitForBlock(plugins); @@ -186,7 +187,8 @@ public class SearchCancellationIT extends ESIntegTestCase { .setScroll(TimeValue.timeValueSeconds(10)) .setSize(5) .setQuery( - scriptQuery(new Script(NativeTestScriptedBlockFactory.TEST_NATIVE_BLOCK_SCRIPT, ScriptType.INLINE, "native", null))) + scriptQuery(new Script( + ScriptType.INLINE, "native", NativeTestScriptedBlockFactory.TEST_NATIVE_BLOCK_SCRIPT, Collections.emptyMap()))) .execute(); awaitForBlock(plugins); @@ -211,7 +213,8 @@ public class SearchCancellationIT extends ESIntegTestCase { .setScroll(keepAlive) .setSize(2) .setQuery( - scriptQuery(new Script(NativeTestScriptedBlockFactory.TEST_NATIVE_BLOCK_SCRIPT, ScriptType.INLINE, "native", null))) + scriptQuery(new Script( + ScriptType.INLINE, "native", NativeTestScriptedBlockFactory.TEST_NATIVE_BLOCK_SCRIPT, Collections.emptyMap()))) .get(); assertNotNull(searchResponse.getScrollId()); -- cgit v1.2.3