honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-09 14:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Internal: refactor copy headers mechanism to not require a client factory

Browse Source 
With #7594 we replaced the static `BaseRestHandler#addUsefulHeaders` by introducing the `RestClientFactory` that can be injected and used to register the relevant headers. To simplify things, we can now register relevant headers through the `RestController` and remove the `RestClientFactory` that was just introduced.

Closes #7675
This commit is contained in:
javanna 2014-09-10 15:52:47 +02:00 committed by Luca Cavanna
parent 8720a4dcd2
commit 4ab268bab2
107 changed files with 384 additions and 424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/main/java/org/elasticsearch/rest/BaseRestHandler.java
View File

@ -19,31 +19,135 @@
package org.elasticsearch.rest;
import org.elasticsearch.action.*;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.ClusterAdminClient;
import org.elasticsearch.client.FilterClient;
import org.elasticsearch.client.IndicesAdminClient;
import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.settings.Settings;
import java.util.Set;
/**
* Base handler for REST requests.
*
* This handler makes sure that the headers & context of the handled {@link RestRequest requests} are copied over to
* the transport requests executed by the associated client. While the context is fully copied over, not all the headers
* are copied, but a selected few. It is possible to control what headers are copied over by registering them using
* {@link RestClientFactory#addRelevantHeaders(String...)}
* {@link org.elasticsearch.rest.RestController#registerRelevantHeaders(String...)}
*/
public abstract class BaseRestHandler extends AbstractComponent implements RestHandler {
private final RestClientFactory restClientFactory;
private final RestController controller;
private final Client client;
protected BaseRestHandler(Settings settings, RestClientFactory restClientFactory) {
protected BaseRestHandler(Settings settings, RestController controller, Client client) {
super(settings);
this.restClientFactory = restClientFactory;
this.controller = controller;
this.client = client;
}
@Override
public final void handleRequest(RestRequest request, RestChannel channel) throws Exception {
handleRequest(request, channel, restClientFactory.client(request));
handleRequest(request, channel, new HeadersAndContextCopyClient(client, request, controller.relevantHeaders()));
}
protected abstract void handleRequest(RestRequest request, RestChannel channel, Client client) throws Exception;
static final class HeadersAndContextCopyClient extends FilterClient {
private final RestRequest restRequest;
private final IndicesAdmin indicesAdmin;
private final ClusterAdmin clusterAdmin;
private final Set<String> headers;
HeadersAndContextCopyClient(Client in, RestRequest restRequest, Set<String> headers) {
super(in);
this.restRequest = restRequest;
this.indicesAdmin = new IndicesAdmin(in.admin().indices(), restRequest, headers);
this.clusterAdmin = new ClusterAdmin(in.admin().cluster(), restRequest, headers);
this.headers = headers;
}
private static void copyHeadersAndContext(ActionRequest actionRequest, RestRequest restRequest, Set<String> headers) {
for (String usefulHeader : headers) {
String headerValue = restRequest.header(usefulHeader);
if (headerValue != null) {
actionRequest.putHeader(usefulHeader, headerValue);
}
}
actionRequest.copyContextFrom(restRequest);
}
@Override
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, Client>> ActionFuture<Response> execute(Action<Request, Response, RequestBuilder, Client> action, Request request) {
copyHeadersAndContext(request, restRequest, headers);
return super.execute(action, request);
}
@Override
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, Client>> void execute(Action<Request, Response, RequestBuilder, Client> action, Request request, ActionListener<Response> listener) {
copyHeadersAndContext(request, restRequest, headers);
super.execute(action, request, listener);
}
@Override
public ClusterAdminClient cluster() {
return clusterAdmin;
}
@Override
public IndicesAdminClient indices() {
return indicesAdmin;
}
private static final class ClusterAdmin extends FilterClient.ClusterAdmin {
private final RestRequest restRequest;
private final Set<String> headers;
private ClusterAdmin(ClusterAdminClient in, RestRequest restRequest, Set<String> headers) {
super(in);
this.restRequest = restRequest;
this.headers = headers;
}
@Override
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, ClusterAdminClient>> ActionFuture<Response> execute(Action<Request, Response, RequestBuilder, ClusterAdminClient> action, Request request) {
copyHeadersAndContext(request, restRequest, headers);
return super.execute(action, request);
}
@Override
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, ClusterAdminClient>> void execute(Action<Request, Response, RequestBuilder, ClusterAdminClient> action, Request request, ActionListener<Response> listener) {
copyHeadersAndContext(request, restRequest, headers);
super.execute(action, request, listener);
}
}
private final class IndicesAdmin extends FilterClient.IndicesAdmin {
private final RestRequest restRequest;
private final Set<String> headers;
private IndicesAdmin(IndicesAdminClient in, RestRequest restRequest, Set<String> headers) {
super(in);
this.restRequest = restRequest;
this.headers = headers;
}
@Override
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, IndicesAdminClient>> ActionFuture<Response> execute(Action<Request, Response, RequestBuilder, IndicesAdminClient> action, Request request) {
copyHeadersAndContext(request, restRequest, headers);
return super.execute(action, request);
}
@Override
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, IndicesAdminClient>> void execute(Action<Request, Response, RequestBuilder, IndicesAdminClient> action, Request request, ActionListener<Response> listener) {
copyHeadersAndContext(request, restRequest, headers);
super.execute(action, request, listener);
}
}
}
}

164
src/main/java/org/elasticsearch/rest/RestClientFactory.java
View File

@ -1,164 +0,0 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.rest;
import com.google.common.collect.Sets;
import org.elasticsearch.action.*;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.ClusterAdminClient;
import org.elasticsearch.client.FilterClient;
import org.elasticsearch.client.IndicesAdminClient;
import org.elasticsearch.common.inject.Inject;
import java.util.Collections;
import java.util.Set;
/**
* Client factory that returns a proper {@link Client} given a {@link org.elasticsearch.rest.RestRequest}.
* Makes it possible to register useful headers that will be copied over from REST requests
* to corresponding transport requests at execution time.
*/
public final class RestClientFactory {
private Set<String> relevantHeaders = Sets.newCopyOnWriteArraySet();
private final Client client;
@Inject
public RestClientFactory(Client client) {
this.client = client;
}
/**
* Returns a proper {@link Client client} given the provided {@link org.elasticsearch.rest.RestRequest}
*/
public Client client(RestRequest restRequest) {
return relevantHeaders.size() == 0 ? client : new HeadersAndContextCopyClient(client, restRequest, relevantHeaders);
}
/**
* Controls which REST headers get copied over from a {@link org.elasticsearch.rest.RestRequest} to
* its corresponding {@link org.elasticsearch.transport.TransportRequest}(s).
*
* By default no headers get copied but it is possible to extend this behaviour via plugins by calling this method.
*/
public void addRelevantHeaders(String... headers) {
Collections.addAll(relevantHeaders, headers);
}
Set<String> relevantHeaders() {
return relevantHeaders;
}
static final class HeadersAndContextCopyClient extends FilterClient {
private final RestRequest restRequest;
private final IndicesAdmin indicesAdmin;
private final ClusterAdmin clusterAdmin;
private final Set<String> headers;
HeadersAndContextCopyClient(Client in, RestRequest restRequest, Set<String> headers) {
super(in);
this.restRequest = restRequest;
this.indicesAdmin = new IndicesAdmin(in.admin().indices(), restRequest, headers);
this.clusterAdmin = new ClusterAdmin(in.admin().cluster(), restRequest, headers);
this.headers = headers;
}
private static void copyHeadersAndContext(ActionRequest actionRequest, RestRequest restRequest, Set<String> headers) {
for (String usefulHeader : headers) {
String headerValue = restRequest.header(usefulHeader);
if (headerValue != null) {
actionRequest.putHeader(usefulHeader, headerValue);
}
}
actionRequest.copyContextFrom(restRequest);
}
@Override
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, Client>> ActionFuture<Response> execute(Action<Request, Response, RequestBuilder, Client> action, Request request) {
copyHeadersAndContext(request, restRequest, headers);
return super.execute(action, request);
}
@Override
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, Client>> void execute(Action<Request, Response, RequestBuilder, Client> action, Request request, ActionListener<Response> listener) {
copyHeadersAndContext(request, restRequest, headers);
super.execute(action, request, listener);
}
@Override
public ClusterAdminClient cluster() {
return clusterAdmin;
}
@Override
public IndicesAdminClient indices() {
return indicesAdmin;
}
private static final class ClusterAdmin extends FilterClient.ClusterAdmin {
private final RestRequest restRequest;
private final Set<String> headers;
private ClusterAdmin(ClusterAdminClient in, RestRequest restRequest, Set<String> headers) {
super(in);
this.restRequest = restRequest;
this.headers = headers;
}
@Override
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, ClusterAdminClient>> ActionFuture<Response> execute(Action<Request, Response, RequestBuilder, ClusterAdminClient> action, Request request) {
copyHeadersAndContext(request, restRequest, headers);
return super.execute(action, request);
}
@Override
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, ClusterAdminClient>> void execute(Action<Request, Response, RequestBuilder, ClusterAdminClient> action, Request request, ActionListener<Response> listener) {
copyHeadersAndContext(request, restRequest, headers);
super.execute(action, request, listener);
}
}
private final class IndicesAdmin extends FilterClient.IndicesAdmin {
private final RestRequest restRequest;
private final Set<String> headers;
private IndicesAdmin(IndicesAdminClient in, RestRequest restRequest, Set<String> headers) {
super(in);
this.restRequest = restRequest;
this.headers = headers;
}
@Override
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, IndicesAdminClient>> ActionFuture<Response> execute(Action<Request, Response, RequestBuilder, IndicesAdminClient> action, Request request) {
copyHeadersAndContext(request, restRequest, headers);
return super.execute(action, request);
}
@Override
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder, IndicesAdminClient>> void execute(Action<Request, Response, RequestBuilder, IndicesAdminClient> action, Request request, ActionListener<Response> listener) {
copyHeadersAndContext(request, restRequest, headers);
super.execute(action, request, listener);
}
}
}
}

22
src/main/java/org/elasticsearch/rest/RestController.java
View File

@ -19,6 +19,7 @@
package org.elasticsearch.rest;
import com.google.common.collect.ImmutableSet;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.ElasticsearchIllegalArgumentException;
import org.elasticsearch.ElasticsearchIllegalStateException;
@ -44,6 +45,8 @@ public class RestController extends AbstractLifecycleComponent<RestController> {
public static final String HTTP_JSON_ENABLE = "http.jsonp.enable";
private ImmutableSet<String> relevantHeaders = ImmutableSet.of();
private final PathTrie<RestHandler> getHandlers = new PathTrie<>(RestUtils.REST_DECODER);
private final PathTrie<RestHandler> postHandlers = new PathTrie<>(RestUtils.REST_DECODER);
private final PathTrie<RestHandler> putHandlers = new PathTrie<>(RestUtils.REST_DECODER);
@ -76,6 +79,25 @@ public class RestController extends AbstractLifecycleComponent<RestController> {
}
}
/**
* Controls which REST headers get copied over from a {@link org.elasticsearch.rest.RestRequest} to
* its corresponding {@link org.elasticsearch.transport.TransportRequest}(s).
*
* By default no headers get copied but it is possible to extend this behaviour via plugins by calling this method.
*/
public synchronized void registerRelevantHeaders(String... headers) {
relevantHeaders = new ImmutableSet.Builder<String>().addAll(relevantHeaders).add(headers).build();
}
/**
* Returns the REST headers that get copied over from a {@link org.elasticsearch.rest.RestRequest} to
* its corresponding {@link org.elasticsearch.transport.TransportRequest}(s).
* By default no headers get copied but it is possible to extend this behaviour via plugins by calling {@link #registerRelevantHeaders(String...)}.
*/
public ImmutableSet<String> relevantHeaders() {
return relevantHeaders;
}
/**
* Registers a pre processor to be executed before the rest request is actually handled.
*/

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java
View File

@ -39,8 +39,8 @@ import static org.elasticsearch.client.Requests.clusterHealthRequest;
public class RestClusterHealthAction extends BaseRestHandler {
@Inject
public RestClusterHealthAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestClusterHealthAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.GET, "/_cluster/health", this);
controller.registerHandler(RestRequest.Method.GET, "/_cluster/health/{index}", this);

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/node/hotthreads/RestNodesHotThreadsAction.java
View File

@ -36,8 +36,8 @@ import org.elasticsearch.rest.action.support.RestResponseListener;
public class RestNodesHotThreadsAction extends BaseRestHandler {
@Inject
public RestNodesHotThreadsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestNodesHotThreadsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.GET, "/_cluster/nodes/hotthreads", this);
controller.registerHandler(RestRequest.Method.GET, "/_cluster/nodes/hot_threads", this);
controller.registerHandler(RestRequest.Method.GET, "/_cluster/nodes/{nodeId}/hotthreads", this);

5
src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java
View File

@ -45,9 +45,8 @@ public class RestNodesInfoAction extends BaseRestHandler {
private final static Set<String> ALLOWED_METRICS = Sets.newHashSet("http", "jvm", "network", "os", "plugins", "process", "settings", "thread_pool", "transport");
@Inject
public RestNodesInfoAction(Settings settings, RestController controller,
SettingsFilter settingsFilter, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestNodesInfoAction(Settings settings, RestController controller, Client client, SettingsFilter settingsFilter) {
super(settings, controller, client);
controller.registerHandler(GET, "/_nodes", this);
// this endpoint is used for metrics, not for nodeIds, like /_nodes/fs
controller.registerHandler(GET, "/_nodes/{nodeId}", this);

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/node/restart/RestNodesRestartAction.java
View File

@ -35,8 +35,8 @@ import org.elasticsearch.rest.action.support.RestBuilderListener;
public class RestNodesRestartAction extends BaseRestHandler {
@Inject
public RestNodesRestartAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestNodesRestartAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.POST, "/_cluster/nodes/_restart", this);
controller.registerHandler(RestRequest.Method.POST, "/_cluster/nodes/{nodeId}/_restart", this);

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/node/shutdown/RestNodesShutdownAction.java
View File

@ -36,8 +36,8 @@ import org.elasticsearch.rest.action.support.RestBuilderListener;
public class RestNodesShutdownAction extends BaseRestHandler {
@Inject
public RestNodesShutdownAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestNodesShutdownAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.POST, "/_shutdown", this);
controller.registerHandler(RestRequest.Method.POST, "/_cluster/nodes/_shutdown", this);

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java
View File

@ -41,8 +41,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestNodesStatsAction extends BaseRestHandler {
@Inject
public RestNodesStatsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestNodesStatsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_nodes/stats", this);
controller.registerHandler(GET, "/_nodes/{nodeId}/stats", this);

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/delete/RestDeleteRepositoryAction.java
View File

@ -36,8 +36,8 @@ import static org.elasticsearch.rest.RestRequest.Method.DELETE;
public class RestDeleteRepositoryAction extends BaseRestHandler {
@Inject
public RestDeleteRepositoryAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestDeleteRepositoryAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(DELETE, "/_snapshot/{repository}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/get/RestGetRepositoriesAction.java
View File

@ -41,8 +41,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetRepositoriesAction extends BaseRestHandler {
@Inject
public RestGetRepositoriesAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestGetRepositoriesAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_snapshot", this);
controller.registerHandler(GET, "/_snapshot/{repository}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/put/RestPutRepositoryAction.java
View File

@ -37,8 +37,8 @@ import static org.elasticsearch.rest.RestRequest.Method.PUT;
public class RestPutRepositoryAction extends BaseRestHandler {
@Inject
public RestPutRepositoryAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestPutRepositoryAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(PUT, "/_snapshot/{repository}", this);
controller.registerHandler(POST, "/_snapshot/{repository}", this);
}

5
src/main/java/org/elasticsearch/rest/action/admin/cluster/reroute/RestClusterRerouteAction.java
View File

@ -45,9 +45,8 @@ public class RestClusterRerouteAction extends BaseRestHandler {
private static String DEFAULT_METRICS = Strings.arrayToCommaDelimitedString(EnumSet.complementOf(EnumSet.of(ClusterState.Metric.METADATA)).toArray());
@Inject
public RestClusterRerouteAction(Settings settings, RestController controller,
SettingsFilter settingsFilter, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestClusterRerouteAction(Settings settings, RestController controller, Client client, SettingsFilter settingsFilter) {
super(settings, controller, client);
this.settingsFilter = settingsFilter;
controller.registerHandler(RestRequest.Method.POST, "/_cluster/reroute", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterGetSettingsAction.java
View File

@ -34,8 +34,8 @@ import org.elasticsearch.rest.action.support.RestBuilderListener;
public class RestClusterGetSettingsAction extends BaseRestHandler {
@Inject
public RestClusterGetSettingsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestClusterGetSettingsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.GET, "/_cluster/settings", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterUpdateSettingsAction.java
View File

@ -38,8 +38,8 @@ import java.util.Map;
public class RestClusterUpdateSettingsAction extends BaseRestHandler {
@Inject
public RestClusterUpdateSettingsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestClusterUpdateSettingsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.PUT, "/_cluster/settings", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/shards/RestClusterSearchShardsAction.java
View File

@ -38,8 +38,8 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestClusterSearchShardsAction extends BaseRestHandler {
@Inject
public RestClusterSearchShardsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestClusterSearchShardsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_search_shards", this);
controller.registerHandler(POST, "/_search_shards", this);
controller.registerHandler(GET, "/{index}/_search_shards", this);

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/create/RestCreateSnapshotAction.java
View File

@ -37,8 +37,8 @@ import static org.elasticsearch.rest.RestRequest.Method.PUT;
public class RestCreateSnapshotAction extends BaseRestHandler {
@Inject
public RestCreateSnapshotAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestCreateSnapshotAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(PUT, "/_snapshot/{repository}/{snapshot}", this);
controller.registerHandler(POST, "/_snapshot/{repository}/{snapshot}/_create", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/delete/RestDeleteSnapshotAction.java
View File

@ -36,8 +36,8 @@ import static org.elasticsearch.rest.RestRequest.Method.DELETE;
public class RestDeleteSnapshotAction extends BaseRestHandler {
@Inject
public RestDeleteSnapshotAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestDeleteSnapshotAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(DELETE, "/_snapshot/{repository}/{snapshot}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/get/RestGetSnapshotsAction.java
View File

@ -37,8 +37,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestGetSnapshotsAction extends BaseRestHandler {
@Inject
public RestGetSnapshotsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestGetSnapshotsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_snapshot/{repository}/{snapshot}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/restore/RestRestoreSnapshotAction.java
View File

@ -36,8 +36,8 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestRestoreSnapshotAction extends BaseRestHandler {
@Inject
public RestRestoreSnapshotAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestRestoreSnapshotAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(POST, "/_snapshot/{repository}/{snapshot}/_restore", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/snapshots/status/RestSnapshotsStatusAction.java
View File

@ -37,8 +37,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestSnapshotsStatusAction extends BaseRestHandler {
@Inject
public RestSnapshotsStatusAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestSnapshotsStatusAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_snapshot/{repository}/{snapshot}/_status", this);
controller.registerHandler(GET, "/_snapshot/{repository}/_status", this);
controller.registerHandler(GET, "/_snapshot/_status", this);

5
src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java
View File

@ -44,9 +44,8 @@ public class RestClusterStateAction extends BaseRestHandler {
private final SettingsFilter settingsFilter;
@Inject
public RestClusterStateAction(Settings settings, RestController controller,
SettingsFilter settingsFilter, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestClusterStateAction(Settings settings, RestController controller, Client client, SettingsFilter settingsFilter) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.GET, "/_cluster/state", this);
controller.registerHandler(RestRequest.Method.GET, "/_cluster/state/{metric}", this);
controller.registerHandler(RestRequest.Method.GET, "/_cluster/state/{metric}/{indices}", this);

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/stats/RestClusterStatsAction.java
View File

@ -34,8 +34,8 @@ import org.elasticsearch.rest.action.support.RestToXContentListener;
public class RestClusterStatsAction extends BaseRestHandler {
@Inject
public RestClusterStatsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestClusterStatsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.GET, "/_cluster/stats", this);
controller.registerHandler(RestRequest.Method.GET, "/_cluster/stats/nodes/{nodeId}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/cluster/tasks/RestPendingClusterTasksAction.java
View File

@ -32,8 +32,8 @@ import org.elasticsearch.rest.action.support.RestToXContentListener;
public class RestPendingClusterTasksAction extends BaseRestHandler {
@Inject
public RestPendingClusterTasksAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestPendingClusterTasksAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.GET, "/_cluster/pending_tasks", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/alias/RestIndicesAliasesAction.java
View File

@ -42,8 +42,8 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestIndicesAliasesAction extends BaseRestHandler {
@Inject
public RestIndicesAliasesAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestIndicesAliasesAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(POST, "/_aliases", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/alias/delete/RestIndexDeleteAliasesAction.java
View File

@ -34,8 +34,8 @@ import static org.elasticsearch.rest.RestRequest.Method.DELETE;
public class RestIndexDeleteAliasesAction extends BaseRestHandler {
@Inject
public RestIndexDeleteAliasesAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestIndexDeleteAliasesAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(DELETE, "/{index}/_alias/{name}", this);
controller.registerHandler(DELETE, "/{index}/_aliases/{name}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/alias/get/RestGetAliasesAction.java
View File

@ -45,8 +45,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetAliasesAction extends BaseRestHandler {
@Inject
public RestGetAliasesAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestGetAliasesAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_alias/{name}", this);
controller.registerHandler(GET, "/{index}/_alias/{name}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/alias/get/RestGetIndicesAliasesAction.java
View File

@ -45,8 +45,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetIndicesAliasesAction extends BaseRestHandler {
@Inject
public RestGetIndicesAliasesAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestGetIndicesAliasesAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/{index}/_aliases/{name}", this);
controller.registerHandler(GET, "/_aliases/{name}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/alias/head/RestAliasesExistAction.java
View File

@ -39,8 +39,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestAliasesExistAction extends BaseRestHandler {
@Inject
public RestAliasesExistAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestAliasesExistAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(HEAD, "/_alias/{name}", this);
controller.registerHandler(HEAD, "/{index}/_alias/{name}", this);
controller.registerHandler(HEAD, "/{index}/_alias", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/alias/put/RestIndexPutAliasAction.java
View File

@ -42,8 +42,8 @@ import static org.elasticsearch.rest.RestRequest.Method.PUT;
public class RestIndexPutAliasAction extends BaseRestHandler {
@Inject
public RestIndexPutAliasAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestIndexPutAliasAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(PUT, "/{index}/_alias/{name}", this);
controller.registerHandler(PUT, "/_alias/{name}", this);
controller.registerHandler(PUT, "/{index}/_aliases/{name}", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/analyze/RestAnalyzeAction.java
View File

@ -36,8 +36,8 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestAnalyzeAction extends BaseRestHandler {
@Inject
public RestAnalyzeAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestAnalyzeAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_analyze", this);
controller.registerHandler(GET, "/{index}/_analyze", this);
controller.registerHandler(POST, "/_analyze", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/cache/clear/RestClearIndicesCacheAction.java vendored
View File

@ -44,8 +44,8 @@ import static org.elasticsearch.rest.action.support.RestActions.buildBroadcastSh
public class RestClearIndicesCacheAction extends BaseRestHandler {
@Inject
public RestClearIndicesCacheAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestClearIndicesCacheAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(POST, "/_cache/clear", this);
controller.registerHandler(POST, "/{index}/_cache/clear", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/close/RestCloseIndexAction.java
View File

@ -35,8 +35,8 @@ import org.elasticsearch.rest.action.support.AcknowledgedRestListener;
public class RestCloseIndexAction extends BaseRestHandler {
@Inject
public RestCloseIndexAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestCloseIndexAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.POST, "/_close", this);
controller.registerHandler(RestRequest.Method.POST, "/{index}/_close", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/create/RestCreateIndexAction.java
View File

@ -33,8 +33,8 @@ import org.elasticsearch.rest.action.support.AcknowledgedRestListener;
public class RestCreateIndexAction extends BaseRestHandler {
@Inject
public RestCreateIndexAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestCreateIndexAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.PUT, "/{index}", this);
controller.registerHandler(RestRequest.Method.POST, "/{index}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/delete/RestDeleteIndexAction.java
View File

@ -35,8 +35,8 @@ import org.elasticsearch.rest.action.support.AcknowledgedRestListener;
public class RestDeleteIndexAction extends BaseRestHandler {
@Inject
public RestDeleteIndexAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestDeleteIndexAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.DELETE, "/", this);
controller.registerHandler(RestRequest.Method.DELETE, "/{index}", this);
}

10
src/main/java/org/elasticsearch/rest/action/admin/indices/exists/indices/RestIndicesExistsAction.java
View File

@ -26,7 +26,6 @@ import org.elasticsearch.client.Client;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.SettingsFilter;
import org.elasticsearch.rest.*;
import org.elasticsearch.rest.action.support.RestResponseListener;
@ -39,15 +38,10 @@ import static org.elasticsearch.rest.RestStatus.OK;
*/
public class RestIndicesExistsAction extends BaseRestHandler {
private final SettingsFilter settingsFilter;
@Inject
public RestIndicesExistsAction(Settings settings, RestController controller,
SettingsFilter settingsFilter, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestIndicesExistsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(HEAD, "/{index}", this);
this.settingsFilter = settingsFilter;
}
@Override

4
src/main/java/org/elasticsearch/rest/action/admin/indices/exists/types/RestTypesExistsAction.java
View File

@ -38,8 +38,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestTypesExistsAction extends BaseRestHandler {
@Inject
public RestTypesExistsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestTypesExistsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(HEAD, "/{index}/{type}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestFlushAction.java
View File

@ -41,8 +41,8 @@ import static org.elasticsearch.rest.action.support.RestActions.buildBroadcastSh
public class RestFlushAction extends BaseRestHandler {
@Inject
public RestFlushAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestFlushAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(POST, "/_flush", this);
controller.registerHandler(POST, "/{index}/_flush", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java
View File

@ -49,8 +49,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetIndicesAction extends BaseRestHandler {
@Inject
public RestGetIndicesAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestGetIndicesAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/{index}", this);
controller.registerHandler(GET, "/{index}/{type}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/delete/RestDeleteMappingAction.java
View File

@ -38,8 +38,8 @@ import static org.elasticsearch.rest.RestRequest.Method.DELETE;
public class RestDeleteMappingAction extends BaseRestHandler {
@Inject
public RestDeleteMappingAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestDeleteMappingAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(DELETE, "/{index}/{type}/_mapping", this);
controller.registerHandler(DELETE, "/{index}/{type}", this);
controller.registerHandler(DELETE, "/{index}/_mapping/{type}", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetFieldMappingAction.java
View File

@ -46,8 +46,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetFieldMappingAction extends BaseRestHandler {
@Inject
public RestGetFieldMappingAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestGetFieldMappingAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_mapping/field/{fields}", this);
controller.registerHandler(GET, "/_mapping/{type}/field/{fields}", this);
controller.registerHandler(GET, "/{index}/_mapping/field/{fields}", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/get/RestGetMappingAction.java
View File

@ -46,8 +46,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetMappingAction extends BaseRestHandler {
@Inject
public RestGetMappingAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestGetMappingAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/{index}/{type}/_mapping", this);
controller.registerHandler(GET, "/{index}/_mappings/{type}", this);
controller.registerHandler(GET, "/{index}/_mapping/{type}", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/mapping/put/RestPutMappingAction.java
View File

@ -40,8 +40,8 @@ public class RestPutMappingAction extends BaseRestHandler {
@Inject
public RestPutMappingAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestPutMappingAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(PUT, "/{index}/_mapping/", this);
controller.registerHandler(PUT, "/{index}/{type}/_mapping", this);
controller.registerHandler(PUT, "/{index}/_mapping/{type}", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/open/RestOpenIndexAction.java
View File

@ -35,8 +35,8 @@ import org.elasticsearch.rest.action.support.AcknowledgedRestListener;
public class RestOpenIndexAction extends BaseRestHandler {
@Inject
public RestOpenIndexAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestOpenIndexAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.POST, "/_open", this);
controller.registerHandler(RestRequest.Method.POST, "/{index}/_open", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/optimize/RestOptimizeAction.java
View File

@ -41,8 +41,8 @@ import static org.elasticsearch.rest.action.support.RestActions.buildBroadcastSh
public class RestOptimizeAction extends BaseRestHandler {
@Inject
public RestOptimizeAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestOptimizeAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(POST, "/_optimize", this);
controller.registerHandler(POST, "/{index}/_optimize", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/recovery/RestRecoveryAction.java
View File

@ -39,8 +39,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestRecoveryAction extends BaseRestHandler {
@Inject
public RestRecoveryAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestRecoveryAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_recovery", this);
controller.registerHandler(GET, "/{index}/_recovery", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/refresh/RestRefreshAction.java
View File

@ -41,8 +41,8 @@ import static org.elasticsearch.rest.action.support.RestActions.buildBroadcastSh
public class RestRefreshAction extends BaseRestHandler {
@Inject
public RestRefreshAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestRefreshAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(POST, "/_refresh", this);
controller.registerHandler(POST, "/{index}/_refresh", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/segments/RestIndicesSegmentsAction.java
View File

@ -39,8 +39,8 @@ import static org.elasticsearch.rest.action.support.RestActions.buildBroadcastSh
public class RestIndicesSegmentsAction extends BaseRestHandler {
@Inject
public RestIndicesSegmentsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestIndicesSegmentsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_segments", this);
controller.registerHandler(GET, "/{index}/_segments", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestGetSettingsAction.java
View File

@ -38,8 +38,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetSettingsAction extends BaseRestHandler {
@Inject
public RestGetSettingsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestGetSettingsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/{index}/_settings/{name}", this);
controller.registerHandler(GET, "/_settings/{name}", this);
controller.registerHandler(GET, "/{index}/_setting/{name}", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/settings/RestUpdateSettingsAction.java
View File

@ -40,8 +40,8 @@ import static org.elasticsearch.client.Requests.updateSettingsRequest;
public class RestUpdateSettingsAction extends BaseRestHandler {
@Inject
public RestUpdateSettingsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestUpdateSettingsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.PUT, "/{index}/_settings", this);
controller.registerHandler(RestRequest.Method.PUT, "/_settings", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/stats/RestIndicesStatsAction.java
View File

@ -41,8 +41,8 @@ import static org.elasticsearch.rest.action.support.RestActions.buildBroadcastSh
public class RestIndicesStatsAction extends BaseRestHandler {
@Inject
public RestIndicesStatsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestIndicesStatsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_stats", this);
controller.registerHandler(GET, "/_stats/{metric}", this);
controller.registerHandler(GET, "/_stats/{metric}/{indexMetric}", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/template/delete/RestDeleteIndexTemplateAction.java
View File

@ -32,8 +32,8 @@ import org.elasticsearch.rest.action.support.AcknowledgedRestListener;
public class RestDeleteIndexTemplateAction extends BaseRestHandler {
@Inject
public RestDeleteIndexTemplateAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestDeleteIndexTemplateAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.DELETE, "/_template/{name}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/template/get/RestGetIndexTemplateAction.java
View File

@ -43,8 +43,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetIndexTemplateAction extends BaseRestHandler {
@Inject
public RestGetIndexTemplateAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestGetIndexTemplateAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_template", this);
controller.registerHandler(GET, "/_template/{name}", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/template/head/RestHeadIndexTemplateAction.java
View File

@ -36,8 +36,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestHeadIndexTemplateAction extends BaseRestHandler {
@Inject
public RestHeadIndexTemplateAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestHeadIndexTemplateAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(HEAD, "/_template/{name}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/template/put/RestPutIndexTemplateAction.java
View File

@ -32,8 +32,8 @@ import org.elasticsearch.rest.action.support.AcknowledgedRestListener;
public class RestPutIndexTemplateAction extends BaseRestHandler {
@Inject
public RestPutIndexTemplateAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestPutIndexTemplateAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(RestRequest.Method.PUT, "/_template/{name}", this);
controller.registerHandler(RestRequest.Method.POST, "/_template/{name}", this);
}

4
src/main/java/org/elasticsearch/rest/action/admin/indices/validate/query/RestValidateQueryAction.java
View File

@ -44,8 +44,8 @@ import static org.elasticsearch.rest.action.support.RestActions.buildBroadcastSh
public class RestValidateQueryAction extends BaseRestHandler {
@Inject
public RestValidateQueryAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestValidateQueryAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_validate/query", this);
controller.registerHandler(POST, "/_validate/query", this);
controller.registerHandler(GET, "/{index}/_validate/query", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/delete/RestDeleteWarmerAction.java
View File

@ -35,8 +35,8 @@ import static org.elasticsearch.rest.RestRequest.Method.DELETE;
public class RestDeleteWarmerAction extends BaseRestHandler {
@Inject
public RestDeleteWarmerAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestDeleteWarmerAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(DELETE, "/{index}/_warmer", this);
controller.registerHandler(DELETE, "/{index}/_warmer/{name}", this);
controller.registerHandler(DELETE, "/{index}/_warmers", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/get/RestGetWarmerAction.java
View File

@ -41,8 +41,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetWarmerAction extends BaseRestHandler {
@Inject
public RestGetWarmerAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestGetWarmerAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_warmer/{name}", this);
controller.registerHandler(GET, "/{index}/_warmer/{name}", this);
controller.registerHandler(GET, "/{index}/_warmers/{name}", this);

4
src/main/java/org/elasticsearch/rest/action/admin/indices/warmer/put/RestPutWarmerAction.java
View File

@ -37,8 +37,8 @@ import static org.elasticsearch.rest.RestRequest.Method.PUT;
public class RestPutWarmerAction extends BaseRestHandler {
@Inject
public RestPutWarmerAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestPutWarmerAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(PUT, "/_warmer/{name}", this);
controller.registerHandler(PUT, "/{index}/_warmer/{name}", this);
controller.registerHandler(PUT, "/{index}/{type}/_warmer/{name}", this);

4
src/main/java/org/elasticsearch/rest/action/bench/RestBenchAction.java
View File

@ -52,8 +52,8 @@ import static org.elasticsearch.rest.RestStatus.*;
public class RestBenchAction extends BaseRestHandler {
@Inject
public RestBenchAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestBenchAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
// List active benchmarks
controller.registerHandler(GET, "/_bench", this);

4
src/main/java/org/elasticsearch/rest/action/bulk/RestBulkAction.java
View File

@ -55,8 +55,8 @@ public class RestBulkAction extends BaseRestHandler {
private final boolean allowExplicitIndex;
@Inject
public RestBulkAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestBulkAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(POST, "/_bulk", this);
controller.registerHandler(PUT, "/_bulk", this);

4
src/main/java/org/elasticsearch/rest/action/cat/AbstractCatAction.java
View File

@ -33,8 +33,8 @@ import static org.elasticsearch.rest.action.support.RestTable.pad;
*/
public abstract class AbstractCatAction extends BaseRestHandler {
public AbstractCatAction(Settings settings, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public AbstractCatAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
}
abstract void doRequest(final RestRequest request, final RestChannel channel, final Client client);

4
src/main/java/org/elasticsearch/rest/action/cat/RestAliasAction.java
View File

@ -41,8 +41,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestAliasAction extends AbstractCatAction {
@Inject
public RestAliasAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestAliasAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_cat/aliases", this);
controller.registerHandler(GET, "/_cat/aliases/{alias}", this);
}

4
src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java
View File

@ -44,8 +44,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestAllocationAction extends AbstractCatAction {
@Inject
public RestAllocationAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestAllocationAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_cat/allocation", this);
controller.registerHandler(GET, "/_cat/allocation/{nodes}", this);
}

4
src/main/java/org/elasticsearch/rest/action/cat/RestCatAction.java
View File

@ -35,8 +35,8 @@ public class RestCatAction extends BaseRestHandler {
private final String HELP;
@Inject
public RestCatAction(Settings settings, RestController controller, Set<AbstractCatAction> catActions, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestCatAction(Settings settings, RestController controller, Set<AbstractCatAction> catActions, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_cat", this);
StringBuilder sb = new StringBuilder();
sb.append(CAT_NL);

4
src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java
View File

@ -41,8 +41,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestCountAction extends AbstractCatAction {
@Inject
protected RestCountAction(Settings settings, RestController restController, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
protected RestCountAction(Settings settings, RestController restController, RestController controller, Client client) {
super(settings, controller, client);
restController.registerHandler(GET, "/_cat/count", this);
restController.registerHandler(GET, "/_cat/count/{index}", this);
}

4
src/main/java/org/elasticsearch/rest/action/cat/RestFielddataAction.java
View File

@ -46,8 +46,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestFielddataAction extends AbstractCatAction {
@Inject
public RestFielddataAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestFielddataAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_cat/fielddata", this);
controller.registerHandler(GET, "/_cat/fielddata/{fields}", this);
}

4
src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java
View File

@ -39,8 +39,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestHealthAction extends AbstractCatAction {
@Inject
public RestHealthAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestHealthAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_cat/health", this);
}

4
src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java
View File

@ -46,8 +46,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestIndicesAction extends AbstractCatAction {
@Inject
public RestIndicesAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestIndicesAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_cat/indices", this);
controller.registerHandler(GET, "/_cat/indices/{index}", this);
}

4
src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java
View File

@ -36,8 +36,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestMasterAction extends AbstractCatAction {
@Inject
public RestMasterAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestMasterAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_cat/master", this);
}

4
src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java
View File

@ -47,8 +47,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestNodesAction extends AbstractCatAction {
@Inject
public RestNodesAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestNodesAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_cat/nodes", this);
}

4
src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java
View File

@ -34,8 +34,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestPendingClusterTasksAction extends AbstractCatAction {
@Inject
public RestPendingClusterTasksAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestPendingClusterTasksAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_cat/pending_tasks", this);
}

4
src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java
View File

@ -41,8 +41,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestPluginsAction extends AbstractCatAction {
@Inject
public RestPluginsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestPluginsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_cat/plugins", this);
}

4
src/main/java/org/elasticsearch/rest/action/cat/RestRecoveryAction.java
View File

@ -48,8 +48,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestRecoveryAction extends AbstractCatAction {
@Inject
protected RestRecoveryAction(Settings settings, RestController restController, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
protected RestRecoveryAction(Settings settings, RestController restController, RestController controller, Client client) {
super(settings, controller, client);
restController.registerHandler(GET, "/_cat/recovery", this);
restController.registerHandler(GET, "/_cat/recovery/{index}", this);
}

4
src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java
View File

@ -42,8 +42,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestSegmentsAction extends AbstractCatAction {
@Inject
public RestSegmentsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestSegmentsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_cat/segments", this);
controller.registerHandler(GET, "/_cat/segments/{index}", this);
}

4
src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java
View File

@ -40,8 +40,8 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestShardsAction extends AbstractCatAction {
@Inject
public RestShardsAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestShardsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_cat/shards", this);
controller.registerHandler(GET, "/_cat/shards/{index}", this);
}

4
src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java
View File

@ -105,8 +105,8 @@ public class RestThreadPoolAction extends AbstractCatAction {
}
@Inject
public RestThreadPoolAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestThreadPoolAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_cat/thread_pool", this);
}

4
src/main/java/org/elasticsearch/rest/action/count/RestCountAction.java
View File

@ -45,8 +45,8 @@ import static org.elasticsearch.rest.action.support.RestActions.buildBroadcastSh
public class RestCountAction extends BaseRestHandler {
@Inject
public RestCountAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestCountAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(POST, "/_count", this);
controller.registerHandler(GET, "/_count", this);
controller.registerHandler(POST, "/{index}/_count", this);

4
src/main/java/org/elasticsearch/rest/action/delete/RestDeleteAction.java
View File

@ -43,8 +43,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestDeleteAction extends BaseRestHandler {
@Inject
public RestDeleteAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestDeleteAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(DELETE, "/{index}/{type}/{id}", this);
}

4
src/main/java/org/elasticsearch/rest/action/deletebyquery/RestDeleteByQueryAction.java
View File

@ -46,8 +46,8 @@ import static org.elasticsearch.rest.RestRequest.Method.DELETE;
public class RestDeleteByQueryAction extends BaseRestHandler {
@Inject
public RestDeleteByQueryAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestDeleteByQueryAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(DELETE, "/{index}/_query", this);
controller.registerHandler(DELETE, "/{index}/{type}/_query", this);
}

4
src/main/java/org/elasticsearch/rest/action/exists/RestExistsAction.java
View File

@ -40,8 +40,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
*/
public class RestExistsAction extends BaseRestHandler {
public RestExistsAction(Settings settings, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestExistsAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
}
@Override

4
src/main/java/org/elasticsearch/rest/action/explain/RestExplainAction.java
View File

@ -51,8 +51,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestExplainAction extends BaseRestHandler {
@Inject
public RestExplainAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestExplainAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/{index}/{type}/{id}/_explain", this);
controller.registerHandler(POST, "/{index}/{type}/{id}/_explain", this);
}

4
src/main/java/org/elasticsearch/rest/action/get/RestGetAction.java
View File

@ -42,8 +42,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetAction extends BaseRestHandler {
@Inject
public RestGetAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestGetAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/{index}/{type}/{id}", this);
}

4
src/main/java/org/elasticsearch/rest/action/get/RestGetSourceAction.java
View File

@ -43,8 +43,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetSourceAction extends BaseRestHandler {
@Inject
public RestGetSourceAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestGetSourceAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/{index}/{type}/{id}/_source", this);
}

4
src/main/java/org/elasticsearch/rest/action/get/RestHeadAction.java
View File

@ -38,8 +38,8 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestHeadAction extends BaseRestHandler {
@Inject
public RestHeadAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestHeadAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(HEAD, "/{index}/{type}/{id}", this);
controller.registerHandler(HEAD, "/{index}/{type}/{id}/_source", this);
}

4
src/main/java/org/elasticsearch/rest/action/get/RestMultiGetAction.java
View File

@ -38,8 +38,8 @@ public class RestMultiGetAction extends BaseRestHandler {
private final boolean allowExplicitIndex;
@Inject
public RestMultiGetAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestMultiGetAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_mget", this);
controller.registerHandler(POST, "/_mget", this);
controller.registerHandler(GET, "/{index}/_mget", this);

10
src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java
View File

@ -46,19 +46,19 @@ import static org.elasticsearch.rest.RestStatus.*;
public class RestIndexAction extends BaseRestHandler {
@Inject
public RestIndexAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestIndexAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(POST, "/{index}/{type}", this); // auto id creation
controller.registerHandler(PUT, "/{index}/{type}/{id}", this);
controller.registerHandler(POST, "/{index}/{type}/{id}", this);
CreateHandler createHandler = new CreateHandler(settings, restClientFactory);
CreateHandler createHandler = new CreateHandler(settings, controller, client);
controller.registerHandler(PUT, "/{index}/{type}/{id}/_create", createHandler);
controller.registerHandler(POST, "/{index}/{type}/{id}/_create", createHandler);
}
final class CreateHandler extends BaseRestHandler {
protected CreateHandler(Settings settings, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
protected CreateHandler(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
}
@Override

4
src/main/java/org/elasticsearch/rest/action/main/RestMainAction.java
View File

@ -45,8 +45,8 @@ public class RestMainAction extends BaseRestHandler {
private final ClusterName clusterName;
@Inject
public RestMainAction(Settings settings, Version version, RestController controller, ClusterName clusterName, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestMainAction(Settings settings, Version version, RestController controller, ClusterName clusterName, Client client) {
super(settings, controller, client);
this.version = version;
this.clusterName = clusterName;
controller.registerHandler(GET, "/", this);

4
src/main/java/org/elasticsearch/rest/action/mlt/RestMoreLikeThisAction.java
View File

@ -40,8 +40,8 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestMoreLikeThisAction extends BaseRestHandler {
@Inject
public RestMoreLikeThisAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestMoreLikeThisAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/{index}/{type}/{id}/_mlt", this);
controller.registerHandler(POST, "/{index}/{type}/{id}/_mlt", this);
}

4
src/main/java/org/elasticsearch/rest/action/percolate/RestMultiPercolateAction.java
View File

@ -40,8 +40,8 @@ public class RestMultiPercolateAction extends BaseRestHandler {
private final boolean allowExplicitIndex;
@Inject
public RestMultiPercolateAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestMultiPercolateAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(POST, "/_mpercolate", this);
controller.registerHandler(POST, "/{index}/_mpercolate", this);
controller.registerHandler(POST, "/{index}/{type}/_mpercolate", this);

22
src/main/java/org/elasticsearch/rest/action/percolate/RestPercolateAction.java
View File

@ -40,20 +40,20 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestPercolateAction extends BaseRestHandler {
@Inject
public RestPercolateAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestPercolateAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/{index}/{type}/_percolate", this);
controller.registerHandler(POST, "/{index}/{type}/_percolate", this);
RestPercolateExistingDocHandler existingDocHandler = new RestPercolateExistingDocHandler(settings, restClientFactory);
RestPercolateExistingDocHandler existingDocHandler = new RestPercolateExistingDocHandler(settings, controller, client);
controller.registerHandler(GET, "/{index}/{type}/{id}/_percolate", existingDocHandler);
controller.registerHandler(POST, "/{index}/{type}/{id}/_percolate", existingDocHandler);
RestCountPercolateDocHandler countHandler = new RestCountPercolateDocHandler(settings, restClientFactory);
RestCountPercolateDocHandler countHandler = new RestCountPercolateDocHandler(settings, controller, client);
controller.registerHandler(GET, "/{index}/{type}/_percolate/count", countHandler);
controller.registerHandler(POST, "/{index}/{type}/_percolate/count", countHandler);
RestCountPercolateExistingDocHandler countExistingDocHandler = new RestCountPercolateExistingDocHandler(settings, restClientFactory);
RestCountPercolateExistingDocHandler countExistingDocHandler = new RestCountPercolateExistingDocHandler(settings, controller, client);
controller.registerHandler(GET, "/{index}/{type}/{id}/_percolate/count", countExistingDocHandler);
controller.registerHandler(POST, "/{index}/{type}/{id}/_percolate/count", countExistingDocHandler);
}
@ -107,8 +107,8 @@ public class RestPercolateAction extends BaseRestHandler {
final class RestCountPercolateDocHandler extends BaseRestHandler {
private RestCountPercolateDocHandler(Settings settings, final RestClientFactory restClientFactory) {
super(settings, restClientFactory);
private RestCountPercolateDocHandler(Settings settings, final RestController controller, Client client) {
super(settings, controller, client);
}
@Override
@ -121,8 +121,8 @@ public class RestPercolateAction extends BaseRestHandler {
final class RestPercolateExistingDocHandler extends BaseRestHandler {
protected RestPercolateExistingDocHandler(Settings settings, final RestClientFactory restClientFactory) {
super(settings, restClientFactory);
protected RestPercolateExistingDocHandler(Settings settings, final RestController controller, Client client) {
super(settings, controller, client);
}
@Override
@ -134,8 +134,8 @@ public class RestPercolateAction extends BaseRestHandler {
final class RestCountPercolateExistingDocHandler extends BaseRestHandler {
protected RestCountPercolateExistingDocHandler(Settings settings, final RestClientFactory restClientFactory) {
super(settings, restClientFactory);
protected RestCountPercolateExistingDocHandler(Settings settings, final RestController controller, Client client) {
super(settings, controller, client);
}
@Override

12
src/main/java/org/elasticsearch/rest/action/script/RestDeleteIndexedScriptAction.java
View File

@ -36,13 +36,15 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestDeleteIndexedScriptAction extends BaseRestHandler {
@Inject
public RestDeleteIndexedScriptAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
controller.registerHandler(DELETE, "/_scripts/{lang}/{id}", this);
public RestDeleteIndexedScriptAction(Settings settings, RestController controller, Client client) {
this(settings, controller, true, client);
}
protected RestDeleteIndexedScriptAction(Settings settings, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
protected RestDeleteIndexedScriptAction(Settings settings, RestController controller, boolean registerDefaultHandlers, Client client) {
super(settings, controller, client);
if (registerDefaultHandlers) {
controller.registerHandler(DELETE, "/_scripts/{lang}/{id}", this);
}
}
protected String getScriptLang(RestRequest request) {

12
src/main/java/org/elasticsearch/rest/action/script/RestGetIndexedScriptAction.java
View File

@ -43,13 +43,15 @@ import static org.elasticsearch.rest.RestStatus.OK;
public class RestGetIndexedScriptAction extends BaseRestHandler {
@Inject
public RestGetIndexedScriptAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
controller.registerHandler(GET, "/_scripts/{lang}/{id}", this);
public RestGetIndexedScriptAction(Settings settings, RestController controller, Client client) {
this(settings, controller, true, client);
}
protected RestGetIndexedScriptAction(Settings settings, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
protected RestGetIndexedScriptAction(Settings settings, RestController controller, boolean registerDefaultHandlers, Client client) {
super(settings, controller, client);
if (registerDefaultHandlers) {
controller.registerHandler(GET, "/_scripts/{lang}/{id}", this);
}
}
protected String getScriptLang(RestRequest request) {

19
src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java
View File

@ -43,23 +43,24 @@ import static org.elasticsearch.rest.RestStatus.*;
public class RestPutIndexedScriptAction extends BaseRestHandler {
@Inject
public RestPutIndexedScriptAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestPutIndexedScriptAction(Settings settings, RestController controller, Client client) {
this(settings, controller, true, client);
}
protected RestPutIndexedScriptAction(Settings settings, RestController controller, boolean registerDefaultHandlers, Client client) {
super(settings, controller, client);
if (registerDefaultHandlers) {
controller.registerHandler(POST, "/_scripts/{lang}/{id}", this);
controller.registerHandler(PUT, "/_scripts/{lang}/{id}", this);
controller.registerHandler(PUT, "/_scripts/{lang}/{id}/_create", new CreateHandler(settings, restClientFactory));
controller.registerHandler(POST, "/_scripts/{lang}/{id}/_create", new CreateHandler(settings, restClientFactory));
controller.registerHandler(PUT, "/_scripts/{lang}/{id}/_create", new CreateHandler(settings, controller, client));
controller.registerHandler(POST, "/_scripts/{lang}/{id}/_create", new CreateHandler(settings, controller, client));
}
protected RestPutIndexedScriptAction(Settings settings, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
}
final class CreateHandler extends BaseRestHandler {
protected CreateHandler(Settings settings, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
protected CreateHandler(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
}
@Override

4
src/main/java/org/elasticsearch/rest/action/search/RestClearScrollAction.java
View File

@ -38,8 +38,8 @@ import static org.elasticsearch.rest.RestRequest.Method.DELETE;
public class RestClearScrollAction extends BaseRestHandler {
@Inject
public RestClearScrollAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestClearScrollAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(DELETE, "/_search/scroll", this);
controller.registerHandler(DELETE, "/_search/scroll/{scroll_id}", this);

4
src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java
View File

@ -40,8 +40,8 @@ public class RestMultiSearchAction extends BaseRestHandler {
private final boolean allowExplicitIndex;
@Inject
public RestMultiSearchAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestMultiSearchAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_msearch", this);
controller.registerHandler(POST, "/_msearch", this);

6
src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
View File

@ -49,8 +49,8 @@ import static org.elasticsearch.search.suggest.SuggestBuilders.termSuggestion;
public class RestSearchAction extends BaseRestHandler {
@Inject
public RestSearchAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestSearchAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_search", this);
controller.registerHandler(POST, "/_search", this);
controller.registerHandler(GET, "/{index}/_search", this);
@ -64,7 +64,7 @@ public class RestSearchAction extends BaseRestHandler {
controller.registerHandler(GET, "/{index}/{type}/_search/template", this);
controller.registerHandler(POST, "/{index}/{type}/_search/template", this);
RestExistsAction restExistsAction = new RestExistsAction(settings, restClientFactory);
RestExistsAction restExistsAction = new RestExistsAction(settings, controller, client);
controller.registerHandler(GET, "/_search/exists", restExistsAction);
controller.registerHandler(POST, "/_search/exists", restExistsAction);
controller.registerHandler(GET, "/{index}/_search/exists", restExistsAction);

4
src/main/java/org/elasticsearch/rest/action/search/RestSearchScrollAction.java
View File

@ -39,8 +39,8 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestSearchScrollAction extends BaseRestHandler {
@Inject
public RestSearchScrollAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestSearchScrollAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(GET, "/_search/scroll", this);
controller.registerHandler(POST, "/_search/scroll", this);

4
src/main/java/org/elasticsearch/rest/action/suggest/RestSuggestAction.java
View File

@ -43,8 +43,8 @@ import static org.elasticsearch.rest.action.support.RestActions.buildBroadcastSh
public class RestSuggestAction extends BaseRestHandler {
@Inject
public RestSuggestAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestSuggestAction(Settings settings, RestController controller, Client client) {
super(settings, controller, client);
controller.registerHandler(POST, "/_suggest", this);
controller.registerHandler(GET, "/_suggest", this);
controller.registerHandler(POST, "/{index}/_suggest", this);

6
src/main/java/org/elasticsearch/rest/action/template/RestDeleteSearchTemplateAction.java
View File

@ -18,9 +18,9 @@
*/
package org.elasticsearch.rest.action.template;
import org.elasticsearch.client.Client;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.rest.RestClientFactory;
import org.elasticsearch.rest.RestController;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.action.script.RestDeleteIndexedScriptAction;
@ -30,8 +30,8 @@ import static org.elasticsearch.rest.RestRequest.Method.DELETE;
public class RestDeleteSearchTemplateAction extends RestDeleteIndexedScriptAction {
@Inject
public RestDeleteSearchTemplateAction(Settings settings, RestController controller, RestClientFactory restClientFactory) {
super(settings, restClientFactory);
public RestDeleteSearchTemplateAction(Settings settings, RestController controller, Client client) {
super(settings, controller, false, client);
controller.registerHandler(DELETE, "/_search/template/{id}", this);
}

Some files were not shown because too many files have changed in this diff Show More