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

Fix compile errors - ingest still used old context and headers APIs

This commit is contained in:
Simon Willnauer 2016-01-27 11:48:03 +01:00
parent 71c3e57aee
commit 21dc50966f
6 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,7 @@ public final class IngestActionFilter extends AbstractComponent implements Actio
if (itemResponses.isEmpty()) {
return bulkRequest;
} else {
BulkRequest modifiedBulkRequest = new BulkRequest(bulkRequest);
BulkRequest modifiedBulkRequest = new BulkRequest();
modifiedBulkRequest.refresh(bulkRequest.refresh());
modifiedBulkRequest.consistencyLevel(bulkRequest.consistencyLevel());
modifiedBulkRequest.timeout(bulkRequest.timeout());

1
core/src/main/java/org/elasticsearch/ingest/InternalTemplateService.java
View File

@ -47,7 +47,6 @@ public class InternalTemplateService implements TemplateService {
CompiledScript compiledScript = scriptService.compile(
script,
ScriptContext.Standard.INGEST,
null /* we can supply null here, because ingest doesn't use indexed scripts */,
Collections.emptyMap()
);
return new Template() {

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

@ -33,7 +33,7 @@ public class RestDeletePipelineAction extends BaseRestHandler {
@Inject
public RestDeletePipelineAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
super(settings, client);
controller.registerHandler(RestRequest.Method.DELETE, "/_ingest/pipeline/{id}", this);
}

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

@ -34,7 +34,7 @@ public class RestGetPipelineAction extends BaseRestHandler {
@Inject
public RestGetPipelineAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
super(settings, client);
controller.registerHandler(RestRequest.Method.GET, "/_ingest/pipeline/{id}", this);
}

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

@ -34,7 +34,7 @@ public class RestPutPipelineAction extends BaseRestHandler {
@Inject
public RestPutPipelineAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
super(settings, client);
controller.registerHandler(RestRequest.Method.PUT, "/_ingest/pipeline/{id}", this);
}

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

@ -34,7 +34,7 @@ public class RestSimulatePipelineAction extends BaseRestHandler {
@Inject
public RestSimulatePipelineAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
super(settings, client);
controller.registerHandler(RestRequest.Method.POST, "/_ingest/pipeline/{id}/_simulate", this);
controller.registerHandler(RestRequest.Method.GET, "/_ingest/pipeline/{id}/_simulate", this);
controller.registerHandler(RestRequest.Method.POST, "/_ingest/pipeline/_simulate", this);