diff options
author | Luca Cavanna <javanna@users.noreply.github.com> | 2017-05-03 11:20:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-03 11:20:53 +0200 |
commit | 92bfd16c5824885ca673c5bb99acac9148c18693 (patch) | |
tree | e78cded3ebf92d44d5fef49228ea7703f7590a6e /core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java | |
parent | be19ccef573b4e9a839159157d7e6c2645261897 (diff) |
Java api: ActionRequestBuilder#execute to return a PlainActionFuture (#24415)
This change makes the request builder code-path same as `Client#execute`. The request builder used to return a `ListenableActionFuture` when calling execute, which allows to associate listeners with the returned future. For async execution though it is recommended to use the `execute` method that accepts an `ActionListener`, like users would do when using `Client#execute`.
Relates to #24412
Relates to #9201
Diffstat (limited to 'core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java')
-rw-r--r-- | core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java b/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java index 7366834391..02607f0c1f 100644 --- a/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java +++ b/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java @@ -19,7 +19,7 @@ package org.elasticsearch.search; -import org.elasticsearch.action.ListenableActionFuture; +import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.admin.cluster.node.tasks.cancel.CancelTasksResponse; import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksResponse; import org.elasticsearch.action.bulk.BulkRequestBuilder; @@ -128,7 +128,7 @@ public class SearchCancellationIT extends ESIntegTestCase { assertThat(cancelTasksResponse.getTasks().get(0).getTaskId(), equalTo(searchTask.getTaskId())); } - private SearchResponse ensureSearchWasCancelled(ListenableActionFuture<SearchResponse> searchResponse) { + private SearchResponse ensureSearchWasCancelled(ActionFuture<SearchResponse> searchResponse) { try { SearchResponse response = searchResponse.actionGet(); logger.info("Search response {}", response); @@ -146,7 +146,7 @@ public class SearchCancellationIT extends ESIntegTestCase { indexTestData(); logger.info("Executing search"); - ListenableActionFuture<SearchResponse> searchResponse = client().prepareSearch("test").setQuery( + ActionFuture<SearchResponse> searchResponse = client().prepareSearch("test").setQuery( scriptQuery(new Script( ScriptType.INLINE, "native", NativeTestScriptedBlockFactory.TEST_NATIVE_BLOCK_SCRIPT, Collections.emptyMap()))) .execute(); @@ -164,7 +164,7 @@ public class SearchCancellationIT extends ESIntegTestCase { indexTestData(); logger.info("Executing search"); - ListenableActionFuture<SearchResponse> searchResponse = client().prepareSearch("test") + ActionFuture<SearchResponse> searchResponse = client().prepareSearch("test") .addScriptField("test_field", new Script(ScriptType.INLINE, "native", NativeTestScriptedBlockFactory.TEST_NATIVE_BLOCK_SCRIPT, Collections.emptyMap()) ).execute(); @@ -182,7 +182,7 @@ public class SearchCancellationIT extends ESIntegTestCase { indexTestData(); logger.info("Executing search"); - ListenableActionFuture<SearchResponse> searchResponse = client().prepareSearch("test") + ActionFuture<SearchResponse> searchResponse = client().prepareSearch("test") .setScroll(TimeValue.timeValueSeconds(10)) .setSize(5) .setQuery( @@ -230,7 +230,7 @@ public class SearchCancellationIT extends ESIntegTestCase { String scrollId = searchResponse.getScrollId(); logger.info("Executing scroll with id {}", scrollId); - ListenableActionFuture<SearchResponse> scrollResponse = client().prepareSearchScroll(searchResponse.getScrollId()) + ActionFuture<SearchResponse> scrollResponse = client().prepareSearchScroll(searchResponse.getScrollId()) .setScroll(keepAlive).execute(); awaitForBlock(plugins); |