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

Fixes due to changes in master branch.

This commit is contained in:
Martijn van Groningen 2016-01-19 22:03:26 +01:00
parent 602a0f183e
commit e2e207687d
8 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.action.ingest;
import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.support.master.AcknowledgedRequest;
import org.elasticsearch.common.io.stream.StreamInput;
@ -29,7 +28,7 @@ import java.io.IOException;
import static org.elasticsearch.action.ValidateActions.addValidationError;
public class DeletePipelineRequest extends AcknowledgedRequest {
public class DeletePipelineRequest extends AcknowledgedRequest<DeletePipelineRequest> {
private String id;

6
core/src/main/java/org/elasticsearch/action/ingest/IngestActionFilter.java
View File

@ -55,7 +55,7 @@ public final class IngestActionFilter extends AbstractComponent implements Actio
}
@Override
public void apply(Task task, String action, ActionRequest request, ActionListener listener, ActionFilterChain chain) {
public void apply(Task task, String action, ActionRequest<?> request, ActionListener<?> listener, ActionFilterChain chain) {
if (IndexAction.NAME.equals(action)) {
assert request instanceof IndexRequest;
IndexRequest indexRequest = (IndexRequest) request;
@ -89,7 +89,7 @@ public final class IngestActionFilter extends AbstractComponent implements Actio
}
@Override
public void apply(String action, ActionResponse response, ActionListener listener, ActionFilterChain chain) {
public void apply(String action, ActionResponse response, ActionListener<?> listener, ActionFilterChain chain) {
chain.proceed(action, response, listener);
}
@ -131,7 +131,7 @@ public final class IngestActionFilter extends AbstractComponent implements Actio
return Integer.MAX_VALUE;
}
final static class BulkRequestModifier implements Iterator<ActionRequest> {
final static class BulkRequestModifier implements Iterator<ActionRequest<?>> {
final BulkRequest bulkRequest;
final Set<Integer> failedSlots;

4
core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java
View File

@ -19,10 +19,8 @@
package org.elasticsearch.action.ingest;
import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.support.master.AcknowledgedRequest;
import org.elasticsearch.cluster.ack.AckedRequest;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
@ -31,7 +29,7 @@ import java.io.IOException;
import static org.elasticsearch.action.ValidateActions.addValidationError;
public class PutPipelineRequest extends AcknowledgedRequest {
public class PutPipelineRequest extends AcknowledgedRequest<PutPipelineRequest> {
private String id;
private BytesReference source;

2
core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java
View File

@ -38,7 +38,7 @@ import java.util.Map;
import static org.elasticsearch.action.ValidateActions.addValidationError;
import static org.elasticsearch.ingest.core.IngestDocument.MetaData;
public class SimulatePipelineRequest extends ActionRequest {
public class SimulatePipelineRequest extends ActionRequest<SimulatePipelineRequest> {
private String id;
private boolean verbose;

2
core/src/main/java/org/elasticsearch/ingest/PipelineExecutionService.java
View File

@ -52,7 +52,7 @@ public class PipelineExecutionService {
});
}
public void execute(Iterable<ActionRequest> actionRequests,
public void execute(Iterable<ActionRequest<?>> actionRequests,
BiConsumer<IndexRequest, Throwable> itemFailureHandler, Consumer<Boolean> completionHandler) {
threadPool.executor(ThreadPool.Names.INDEX).execute(() -> {
for (ActionRequest actionRequest : actionRequests) {

2
core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java
View File

@ -211,7 +211,7 @@ public class IngestClientIT extends ESIntegTestCase {
@Override
protected Collection<Class<? extends Plugin>> getMockPlugins() {
return Collections.emptyList();
return Collections.singletonList(TestSeedPlugin.class);
}
public static class IngestPlugin extends Plugin {

5
modules/ingest-grok/src/test/java/org/elasticsearch/ingest/grok/IngestGrokRestIT.java
View File

@ -32,11 +32,6 @@ import java.util.Collection;
public class IngestGrokRestIT extends ESRestTestCase {
@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
return pluginList(IngestGrokPlugin.class);
}
public IngestGrokRestIT(@Name("yaml") RestTestCandidate testCandidate) {
super(testCandidate);
}

5
plugins/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/IngestGeoIpRestIT.java
View File

@ -31,11 +31,6 @@ import java.util.Collection;
public class IngestGeoIpRestIT extends ESRestTestCase {
@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
return pluginList(IngestGeoIpPlugin.class);
}
public IngestGeoIpRestIT(@Name("yaml") RestTestCandidate testCandidate) {
super(testCandidate);
}