summaryrefslogtreecommitdiff
path: root/core/src/test/java/org/elasticsearch/action/support
diff options
context:
space:
mode:
authorjavanna <cavannaluca@gmail.com>2017-05-03 11:40:25 +0200
committerLuca Cavanna <luca@elastic.co>2017-05-03 11:42:06 +0200
commit194742b3f4ec41365da813df2cdbeddb6688bd66 (patch)
tree55b1133a3c491f48c04f492004fba6bc1cceaed9 /core/src/test/java/org/elasticsearch/action/support
parent92bfd16c5824885ca673c5bb99acac9148c18693 (diff)
[TEST] Remove unnecessary usages of ListenableActionFuture
Diffstat (limited to 'core/src/test/java/org/elasticsearch/action/support')
-rw-r--r--core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java17
1 files changed, 3 insertions, 14 deletions
diff --git a/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java b/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java
index aa61c2569d..d5aab07f24 100644
--- a/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java
+++ b/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java
@@ -31,7 +31,6 @@ import org.elasticsearch.test.ESTestCase;
import org.junit.Before;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
@@ -77,12 +76,7 @@ public class TransportActionFilterChainTests extends ESTestCase {
};
ArrayList<ActionFilter> actionFiltersByOrder = new ArrayList<>(filters);
- Collections.sort(actionFiltersByOrder, new Comparator<ActionFilter>() {
- @Override
- public int compare(ActionFilter o1, ActionFilter o2) {
- return Integer.compare(o1.order(), o2.order());
- }
- });
+ actionFiltersByOrder.sort(Comparator.comparingInt(ActionFilter::order));
List<ActionFilter> expectedActionFilters = new ArrayList<>();
boolean errorExpected = false;
@@ -97,7 +91,7 @@ public class TransportActionFilterChainTests extends ESTestCase {
}
}
- PlainListenableActionFuture<TestResponse> future = new PlainListenableActionFuture<>(null);
+ PlainActionFuture<TestResponse> future = new PlainActionFuture<>();
transportAction.execute(new TestRequest(), future);
try {
assertThat(future.get(), notNullValue());
@@ -110,12 +104,7 @@ public class TransportActionFilterChainTests extends ESTestCase {
for (ActionFilter actionFilter : actionFilters.filters()) {
testFiltersByLastExecution.add((RequestTestFilter) actionFilter);
}
- Collections.sort(testFiltersByLastExecution, new Comparator<RequestTestFilter>() {
- @Override
- public int compare(RequestTestFilter o1, RequestTestFilter o2) {
- return Integer.compare(o1.executionToken, o2.executionToken);
- }
- });
+ testFiltersByLastExecution.sort(Comparator.comparingInt(o -> o.executionToken));
ArrayList<RequestTestFilter> finalTestFilters = new ArrayList<>();
for (ActionFilter filter : testFiltersByLastExecution) {