honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed compile errors after cherry-picking

This commit is contained in:
Martijn van Groningen 2019-07-01 08:31:31 +02:00
parent 237f2bd60a
commit 8f3387e7cb
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java
View File

@ -65,7 +65,7 @@ class SimulateExecutionService {
} }
public void execute(SimulatePipelineRequest.Parsed request, ActionListener<SimulatePipelineResponse> listener) { public void execute(SimulatePipelineRequest.Parsed request, ActionListener<SimulatePipelineResponse> listener) {
threadPool.executor(THREAD_POOL_NAME).execute(new ActionRunnable<>(listener) { threadPool.executor(THREAD_POOL_NAME).execute(new ActionRunnable<SimulatePipelineResponse>(listener) {
@Override @Override
protected void doRun() { protected void doRun() {
final AtomicInteger counter = new AtomicInteger(); final AtomicInteger counter = new AtomicInteger();

2
server/src/test/java/org/elasticsearch/action/bulk/BulkRequestModifierTests.java
View File

@ -102,7 +102,7 @@ public class BulkRequestModifierTests extends ESTestCase {
assertThat(bulkRequest.requests().size(), Matchers.equalTo(16)); assertThat(bulkRequest.requests().size(), Matchers.equalTo(16));
List<BulkItemResponse> responses = new ArrayList<>(); List<BulkItemResponse> responses = new ArrayList<>();
ActionListener<BulkResponse> bulkResponseListener = modifier.wrapActionListenerIfNeeded(1L, new ActionListener<>() { ActionListener<BulkResponse> bulkResponseListener = modifier.wrapActionListenerIfNeeded(1L, new ActionListener<BulkResponse>() {
@Override @Override
public void onResponse(BulkResponse bulkItemResponses) { public void onResponse(BulkResponse bulkItemResponses) {
responses.addAll(Arrays.asList(bulkItemResponses.getItems())); responses.addAll(Arrays.asList(bulkItemResponses.getItems()));

4
server/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java
View File

@ -74,7 +74,7 @@ public class SimulateExecutionServiceTests extends ESTestCase {
latch.countDown(); latch.countDown();
}); });
latch.await(); latch.await();
SimulateDocumentResult actualItemResponse = holder.getAcquire(); SimulateDocumentResult actualItemResponse = holder.get();
assertThat(processor.getInvokedCounter(), equalTo(2)); assertThat(processor.getInvokedCounter(), equalTo(2));
assertThat(actualItemResponse, instanceOf(SimulateDocumentVerboseResult.class)); assertThat(actualItemResponse, instanceOf(SimulateDocumentVerboseResult.class));
SimulateDocumentVerboseResult simulateDocumentVerboseResult = (SimulateDocumentVerboseResult) actualItemResponse; SimulateDocumentVerboseResult simulateDocumentVerboseResult = (SimulateDocumentVerboseResult) actualItemResponse;
@ -106,7 +106,7 @@ public class SimulateExecutionServiceTests extends ESTestCase {
latch.countDown(); latch.countDown();
}); });
latch.await(); latch.await();
SimulateDocumentResult actualItemResponse = holder.getAcquire(); SimulateDocumentResult actualItemResponse = holder.get();
assertThat(processor.getInvokedCounter(), equalTo(2)); assertThat(processor.getInvokedCounter(), equalTo(2));
assertThat(actualItemResponse, instanceOf(SimulateDocumentBaseResult.class)); assertThat(actualItemResponse, instanceOf(SimulateDocumentBaseResult.class));
SimulateDocumentBaseResult simulateDocumentBaseResult = (SimulateDocumentBaseResult) actualItemResponse; SimulateDocumentBaseResult simulateDocumentBaseResult = (SimulateDocumentBaseResult) actualItemResponse;

2
server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java
View File

@ -582,7 +582,7 @@ public class IngestServiceTests extends ESTestCase {
ingestService.executeBulkRequest(bulkRequest.numberOfActions(), bulkRequest.requests(), failureHandler, ingestService.executeBulkRequest(bulkRequest.numberOfActions(), bulkRequest.requests(), failureHandler,
completionHandler, indexReq -> {}); completionHandler, indexReq -> {});
verify(failureHandler, times(1)).accept( verify(failureHandler, times(1)).accept(
argThat(new CustomTypeSafeMatcher<>("failure handler was not called with the expected arguments") { argThat(new CustomTypeSafeMatcher<Integer>("failure handler was not called with the expected arguments") {
@Override @Override
protected boolean matchesSafely(Integer item) { protected boolean matchesSafely(Integer item) {
return item == 1; return item == 1;