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

Core: Remove RequestBuilder from Action (#30966) 

This commit removes the RequestBuilder generic type from Action. It was
needed to be used by the newRequest method, which in turn was used by
client.prepareExecute. Both of these methods are now removed, along with
the existing users of prepareExecute constructing the appropriate
builder directly.
This commit is contained in:
Ryan Ernst 2018-05-31 16:15:00 +02:00 committed by GitHub
parent 0f5e570184
commit 46e8d97813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
318 changed files with 509 additions and 1747 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/benchmark/src/main/java/org/elasticsearch/client/benchmark/transport/TransportClientBenchmark.java
View File

@ -79,7 +79,7 @@ public final class TransportClientBenchmark extends AbstractBenchmark<TransportC
@Override
public boolean bulkIndex(List<String> bulkData) {
NoopBulkRequestBuilder builder = NoopBulkAction.INSTANCE.newRequestBuilder(client);
NoopBulkRequestBuilder builder = new NoopBulkRequestBuilder(client,NoopBulkAction.INSTANCE);
for (String bulkItem : bulkData) {
builder.add(new IndexRequest(indexName, typeName).source(bulkItem.getBytes(StandardCharsets.UTF_8), XContentType.JSON));
}
@ -108,7 +108,7 @@ public final class TransportClientBenchmark extends AbstractBenchmark<TransportC
@Override
public boolean search(String source) {
final SearchResponse response;
NoopSearchRequestBuilder builder = NoopSearchAction.INSTANCE.newRequestBuilder(client);
NoopSearchRequestBuilder builder = new NoopSearchRequestBuilder(client, NoopSearchAction.INSTANCE);
try {
builder.setIndices(indexName);
builder.setQuery(QueryBuilders.wrapperQuery(source));

8
client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/NoopBulkAction.java
View File

@ -21,9 +21,8 @@ package org.elasticsearch.plugin.noop.action.bulk;
import org.elasticsearch.action.Action;
import org.elasticsearch.action.bulk.BulkRequest;
import org.elasticsearch.action.bulk.BulkResponse;
import org.elasticsearch.client.ElasticsearchClient;
public class NoopBulkAction extends Action<BulkRequest, BulkResponse, NoopBulkRequestBuilder> {
public class NoopBulkAction extends Action<BulkRequest, BulkResponse> {
public static final String NAME = "mock:data/write/bulk";
public static final NoopBulkAction INSTANCE = new NoopBulkAction();
@ -32,11 +31,6 @@ public class NoopBulkAction extends Action<BulkRequest, BulkResponse, NoopBulkRe
super(NAME);
}
@Override
public NoopBulkRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new NoopBulkRequestBuilder(client, this);
}
@Override
public BulkResponse newResponse() {
return new BulkResponse(null, 0);

2
client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/NoopBulkRequestBuilder.java
View File

@ -35,7 +35,7 @@ import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentType;
public class NoopBulkRequestBuilder extends ActionRequestBuilder<BulkRequest, BulkResponse, NoopBulkRequestBuilder>
public class NoopBulkRequestBuilder extends ActionRequestBuilder<BulkRequest, BulkResponse>
implements WriteRequestBuilder<NoopBulkRequestBuilder> {
public NoopBulkRequestBuilder(ElasticsearchClient client, NoopBulkAction action) {

8
client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/search/NoopSearchAction.java
View File

@ -21,9 +21,8 @@ package org.elasticsearch.plugin.noop.action.search;
import org.elasticsearch.action.Action;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.ElasticsearchClient;
public class NoopSearchAction extends Action<SearchRequest, SearchResponse, NoopSearchRequestBuilder> {
public class NoopSearchAction extends Action<SearchRequest, SearchResponse> {
public static final NoopSearchAction INSTANCE = new NoopSearchAction();
public static final String NAME = "mock:data/read/search";
@ -31,11 +30,6 @@ public class NoopSearchAction extends Action<SearchRequest, SearchResponse, Noop
super(NAME);
}
@Override
public NoopSearchRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new NoopSearchRequestBuilder(client, this);
}
@Override
public SearchResponse newResponse() {
return new SearchResponse();

2
client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/search/NoopSearchRequestBuilder.java
View File

@ -42,7 +42,7 @@ import org.elasticsearch.search.suggest.SuggestBuilder;
import java.util.Arrays;
import java.util.List;
public class NoopSearchRequestBuilder extends ActionRequestBuilder<SearchRequest, SearchResponse, NoopSearchRequestBuilder> {
public class NoopSearchRequestBuilder extends ActionRequestBuilder<SearchRequest, SearchResponse> {
public NoopSearchRequestBuilder(ElasticsearchClient client, NoopSearchAction action) {
super(client, action, new SearchRequest());

10
modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java
View File

@ -52,8 +52,7 @@ import static org.elasticsearch.ingest.common.IngestCommonPlugin.GROK_PATTERNS;
import static org.elasticsearch.rest.RestRequest.Method.GET;
import static org.elasticsearch.rest.RestStatus.OK;
public class GrokProcessorGetAction extends Action<GrokProcessorGetAction.Request,
GrokProcessorGetAction.Response, GrokProcessorGetAction.RequestBuilder> {
public class GrokProcessorGetAction extends Action<GrokProcessorGetAction.Request, GrokProcessorGetAction.Response> {
public static final GrokProcessorGetAction INSTANCE = new GrokProcessorGetAction();
public static final String NAME = "cluster:admin/ingest/processor/grok/get";
@ -62,11 +61,6 @@ public class GrokProcessorGetAction extends Action<GrokProcessorGetAction.Reques
super(NAME);
}
@Override
public RequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new RequestBuilder(client);
}
@Override
public Response newResponse() {
return new Response(null);
@ -79,7 +73,7 @@ public class GrokProcessorGetAction extends Action<GrokProcessorGetAction.Reques
}
}
public static class RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder> {
public static class RequestBuilder extends ActionRequestBuilder<Request, Response> {
public RequestBuilder(ElasticsearchClient client) {
super(client, GrokProcessorGetAction.INSTANCE, new Request());
}

9
modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateAction.java
View File

@ -20,10 +20,8 @@
package org.elasticsearch.script.mustache;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class MultiSearchTemplateAction
extends Action<MultiSearchTemplateRequest, MultiSearchTemplateResponse, MultiSearchTemplateRequestBuilder> {
public class MultiSearchTemplateAction extends Action<MultiSearchTemplateRequest, MultiSearchTemplateResponse> {
public static final MultiSearchTemplateAction INSTANCE = new MultiSearchTemplateAction();
public static final String NAME = "indices:data/read/msearch/template";
@ -36,9 +34,4 @@ public class MultiSearchTemplateAction
public MultiSearchTemplateResponse newResponse() {
return new MultiSearchTemplateResponse();
}
@Override
public MultiSearchTemplateRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new MultiSearchTemplateRequestBuilder(client, this);
}
}

2
modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateRequestBuilder.java
View File

@ -24,7 +24,7 @@ import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.client.ElasticsearchClient;
public class MultiSearchTemplateRequestBuilder
extends ActionRequestBuilder<MultiSearchTemplateRequest, MultiSearchTemplateResponse, MultiSearchTemplateRequestBuilder> {
extends ActionRequestBuilder<MultiSearchTemplateRequest, MultiSearchTemplateResponse> {
protected MultiSearchTemplateRequestBuilder(ElasticsearchClient client, MultiSearchTemplateAction action) {
super(client, action, new MultiSearchTemplateRequest());

8
modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/SearchTemplateAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.script.mustache;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class SearchTemplateAction extends Action<SearchTemplateRequest, SearchTemplateResponse, SearchTemplateRequestBuilder> {
public class SearchTemplateAction extends Action<SearchTemplateRequest, SearchTemplateResponse> {
public static final SearchTemplateAction INSTANCE = new SearchTemplateAction();
public static final String NAME = "indices:data/read/search/template";
@ -31,11 +30,6 @@ public class SearchTemplateAction extends Action<SearchTemplateRequest, SearchTe
super(NAME);
}
@Override
public SearchTemplateRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new SearchTemplateRequestBuilder(client, this);
}
@Override
public SearchTemplateResponse newResponse() {
return new SearchTemplateResponse();

2
modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/SearchTemplateRequestBuilder.java
View File

@ -27,7 +27,7 @@ import org.elasticsearch.script.ScriptType;
import java.util.Map;
public class SearchTemplateRequestBuilder
extends ActionRequestBuilder<SearchTemplateRequest, SearchTemplateResponse, SearchTemplateRequestBuilder> {
extends ActionRequestBuilder<SearchTemplateRequest, SearchTemplateResponse> {
SearchTemplateRequestBuilder(ElasticsearchClient client, SearchTemplateAction action) {
super(client, action, new SearchTemplateRequest());

10
modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessExecuteAction.java
View File

@ -62,8 +62,7 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
import static org.elasticsearch.rest.RestRequest.Method.POST;
import static org.elasticsearch.rest.RestStatus.OK;
public class PainlessExecuteAction extends Action<PainlessExecuteAction.Request, PainlessExecuteAction.Response,
PainlessExecuteAction.RequestBuilder> {
public class PainlessExecuteAction extends Action<PainlessExecuteAction.Request, PainlessExecuteAction.Response> {
static final PainlessExecuteAction INSTANCE = new PainlessExecuteAction();
private static final String NAME = "cluster:admin/scripts/painless/execute";
@ -72,11 +71,6 @@ public class PainlessExecuteAction extends Action<PainlessExecuteAction.Request,
super(NAME);
}
@Override
public RequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new RequestBuilder(client);
}
@Override
public Response newResponse() {
return new Response();
@ -201,7 +195,7 @@ public class PainlessExecuteAction extends Action<PainlessExecuteAction.Request,
}
public static class RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder> {
public static class RequestBuilder extends ActionRequestBuilder<Request, Response> {
RequestBuilder(ElasticsearchClient client) {
super(client, INSTANCE, new Request());

8
modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.index.rankeval;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Action for explaining evaluating search ranking results.
*/
public class RankEvalAction extends Action<RankEvalRequest, RankEvalResponse, RankEvalRequestBuilder> {
public class RankEvalAction extends Action<RankEvalRequest, RankEvalResponse> {
public static final RankEvalAction INSTANCE = new RankEvalAction();
public static final String NAME = "indices:data/read/rank_eval";
@ -34,11 +33,6 @@ public class RankEvalAction extends Action<RankEvalRequest, RankEvalResponse, Ra
super(NAME);
}
@Override
public RankEvalRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new RankEvalRequestBuilder(client, this, new RankEvalRequest());
}
@Override
public RankEvalResponse newResponse() {
return new RankEvalResponse();

4
modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalRequestBuilder.java
View File

@ -23,9 +23,9 @@ import org.elasticsearch.action.Action;
import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.client.ElasticsearchClient;
public class RankEvalRequestBuilder extends ActionRequestBuilder<RankEvalRequest, RankEvalResponse, RankEvalRequestBuilder> {
public class RankEvalRequestBuilder extends ActionRequestBuilder<RankEvalRequest, RankEvalResponse> {
public RankEvalRequestBuilder(ElasticsearchClient client, Action<RankEvalRequest, RankEvalResponse, RankEvalRequestBuilder> action,
public RankEvalRequestBuilder(ElasticsearchClient client, Action<RankEvalRequest, RankEvalResponse> action,
RankEvalRequest request) {
super(client, action, request);
}

6
modules/reindex/src/main/java/org/elasticsearch/index/reindex/BulkByScrollParallelizationHelper.java
View File

@ -61,7 +61,7 @@ class BulkByScrollParallelizationHelper {
static <Request extends AbstractBulkByScrollRequest<Request>> void startSlicedAction(
Request request,
BulkByScrollTask task,
Action<Request, BulkByScrollResponse, ?> action,
Action<Request, BulkByScrollResponse> action,
ActionListener<BulkByScrollResponse> listener,
Client client,
DiscoveryNode node,
@ -85,7 +85,7 @@ class BulkByScrollParallelizationHelper {
private static <Request extends AbstractBulkByScrollRequest<Request>> void sliceConditionally(
Request request,
BulkByScrollTask task,
Action<Request, BulkByScrollResponse, ?> action,
Action<Request, BulkByScrollResponse> action,
ActionListener<BulkByScrollResponse> listener,
Client client,
DiscoveryNode node,
@ -118,7 +118,7 @@ class BulkByScrollParallelizationHelper {
private static <Request extends AbstractBulkByScrollRequest<Request>> void sendSubRequests(
Client client,
Action<Request, BulkByScrollResponse, ?> action,
Action<Request, BulkByScrollResponse> action,
String localNodeId,
BulkByScrollTask task,
Request request,

8
modules/reindex/src/main/java/org/elasticsearch/index/reindex/RethrottleAction.java
View File

@ -21,9 +21,8 @@ package org.elasticsearch.index.reindex;
import org.elasticsearch.action.Action;
import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
import org.elasticsearch.client.ElasticsearchClient;
public class RethrottleAction extends Action<RethrottleRequest, ListTasksResponse, RethrottleRequestBuilder> {
public class RethrottleAction extends Action<RethrottleRequest, ListTasksResponse> {
public static final RethrottleAction INSTANCE = new RethrottleAction();
public static final String NAME = "cluster:admin/reindex/rethrottle";
@ -31,11 +30,6 @@ public class RethrottleAction extends Action<RethrottleRequest, ListTasksRespons
super(NAME);
}
@Override
public RethrottleRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new RethrottleRequestBuilder(client, this);
}
@Override
public ListTasksResponse newResponse() {
return new ListTasksResponse();

2
modules/reindex/src/main/java/org/elasticsearch/index/reindex/RethrottleRequestBuilder.java
View File

@ -29,7 +29,7 @@ import org.elasticsearch.client.ElasticsearchClient;
*/
public class RethrottleRequestBuilder extends TasksRequestBuilder<RethrottleRequest, ListTasksResponse, RethrottleRequestBuilder> {
public RethrottleRequestBuilder(ElasticsearchClient client,
Action<RethrottleRequest, ListTasksResponse, RethrottleRequestBuilder> action) {
Action<RethrottleRequest, ListTasksResponse> action) {
super(client, action, new RethrottleRequest());
}

26
modules/reindex/src/test/java/org/elasticsearch/client/documentation/ReindexDocumentationIT.java
View File

@ -27,10 +27,12 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.reindex.BulkByScrollResponse;
import org.elasticsearch.index.reindex.BulkByScrollTask;
import org.elasticsearch.index.reindex.DeleteByQueryAction;
import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder;
import org.elasticsearch.index.reindex.ReindexAction;
import org.elasticsearch.index.reindex.ReindexRequest;
import org.elasticsearch.index.reindex.ReindexRequestBuilder;
import org.elasticsearch.index.reindex.RethrottleAction;
import org.elasticsearch.index.reindex.RethrottleRequestBuilder;
import org.elasticsearch.index.reindex.UpdateByQueryAction;
import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder;
import org.elasticsearch.script.Script;
@ -47,7 +49,7 @@ public class ReindexDocumentationIT extends ESIntegTestCase {
public void reindex() {
Client client = client();
// tag::reindex1
BulkByScrollResponse response = ReindexAction.INSTANCE.newRequestBuilder(client)
BulkByScrollResponse response = new ReindexRequestBuilder(client, ReindexAction.INSTANCE)
.destination("target_index")
.filter(QueryBuilders.matchQuery("category", "xzy")) // <1>
.get();
@ -58,14 +60,14 @@ public class ReindexDocumentationIT extends ESIntegTestCase {
Client client = client();
{
// tag::update-by-query
UpdateByQueryRequestBuilder updateByQuery = UpdateByQueryAction.INSTANCE.newRequestBuilder(client);
UpdateByQueryRequestBuilder updateByQuery = new UpdateByQueryRequestBuilder(client, UpdateByQueryAction.INSTANCE);
updateByQuery.source("source_index").abortOnVersionConflict(false);
BulkByScrollResponse response = updateByQuery.get();
// end::update-by-query
}
{
// tag::update-by-query-filter
UpdateByQueryRequestBuilder updateByQuery = UpdateByQueryAction.INSTANCE.newRequestBuilder(client);
UpdateByQueryRequestBuilder updateByQuery = new UpdateByQueryRequestBuilder(client, UpdateByQueryAction.INSTANCE);
updateByQuery.source("source_index")
.filter(QueryBuilders.termQuery("level", "awesome"))
.size(1000)
@ -75,7 +77,7 @@ public class ReindexDocumentationIT extends ESIntegTestCase {
}
{
// tag::update-by-query-size
UpdateByQueryRequestBuilder updateByQuery = UpdateByQueryAction.INSTANCE.newRequestBuilder(client);
UpdateByQueryRequestBuilder updateByQuery = new UpdateByQueryRequestBuilder(client, UpdateByQueryAction.INSTANCE);
updateByQuery.source("source_index")
.source().setSize(500);
BulkByScrollResponse response = updateByQuery.get();
@ -83,7 +85,7 @@ public class ReindexDocumentationIT extends ESIntegTestCase {
}
{
// tag::update-by-query-sort
UpdateByQueryRequestBuilder updateByQuery = UpdateByQueryAction.INSTANCE.newRequestBuilder(client);
UpdateByQueryRequestBuilder updateByQuery = new UpdateByQueryRequestBuilder(client, UpdateByQueryAction.INSTANCE);
updateByQuery.source("source_index").size(100)
.source().addSort("cat", SortOrder.DESC);
BulkByScrollResponse response = updateByQuery.get();
@ -91,7 +93,7 @@ public class ReindexDocumentationIT extends ESIntegTestCase {
}
{
// tag::update-by-query-script
UpdateByQueryRequestBuilder updateByQuery = UpdateByQueryAction.INSTANCE.newRequestBuilder(client);
UpdateByQueryRequestBuilder updateByQuery = new UpdateByQueryRequestBuilder(client, UpdateByQueryAction.INSTANCE);
updateByQuery.source("source_index")
.script(new Script(
ScriptType.INLINE,
@ -108,21 +110,21 @@ public class ReindexDocumentationIT extends ESIntegTestCase {
}
{
// tag::update-by-query-multi-index
UpdateByQueryRequestBuilder updateByQuery = UpdateByQueryAction.INSTANCE.newRequestBuilder(client);
UpdateByQueryRequestBuilder updateByQuery = new UpdateByQueryRequestBuilder(client, UpdateByQueryAction.INSTANCE);
updateByQuery.source("foo", "bar").source().setTypes("a", "b");
BulkByScrollResponse response = updateByQuery.get();
// end::update-by-query-multi-index
}
{
// tag::update-by-query-routing
UpdateByQueryRequestBuilder updateByQuery = UpdateByQueryAction.INSTANCE.newRequestBuilder(client);
UpdateByQueryRequestBuilder updateByQuery = new UpdateByQueryRequestBuilder(client, UpdateByQueryAction.INSTANCE);
updateByQuery.source().setRouting("cat");
BulkByScrollResponse response = updateByQuery.get();
// end::update-by-query-routing
}
{
// tag::update-by-query-pipeline
UpdateByQueryRequestBuilder updateByQuery = UpdateByQueryAction.INSTANCE.newRequestBuilder(client);
UpdateByQueryRequestBuilder updateByQuery = new UpdateByQueryRequestBuilder(client, UpdateByQueryAction.INSTANCE);
updateByQuery.setPipeline("hurray");
BulkByScrollResponse response = updateByQuery.get();
// end::update-by-query-pipeline
@ -156,7 +158,7 @@ public class ReindexDocumentationIT extends ESIntegTestCase {
{
TaskId taskId = null;
// tag::update-by-query-rethrottle
RethrottleAction.INSTANCE.newRequestBuilder(client)
new RethrottleRequestBuilder(client, RethrottleAction.INSTANCE)
.setTaskId(taskId)
.setRequestsPerSecond(2.0f)
.get();
@ -167,7 +169,7 @@ public class ReindexDocumentationIT extends ESIntegTestCase {
public void deleteByQuery() {
Client client = client();
// tag::delete-by-query-sync
BulkByScrollResponse response = DeleteByQueryAction.INSTANCE.newRequestBuilder(client)
BulkByScrollResponse response = new DeleteByQueryRequestBuilder(client, DeleteByQueryAction.INSTANCE)
.filter(QueryBuilders.matchQuery("gender", "male")) // <1>
.source("persons") // <2>
.get(); // <3>
@ -175,7 +177,7 @@ public class ReindexDocumentationIT extends ESIntegTestCase {
// end::delete-by-query-sync
// tag::delete-by-query-async
DeleteByQueryAction.INSTANCE.newRequestBuilder(client)
new DeleteByQueryRequestBuilder(client, DeleteByQueryAction.INSTANCE)
.filter(QueryBuilders.matchQuery("gender", "male")) // <1>
.source("persons") // <2>
.execute(new ActionListener<BulkByScrollResponse>() { // <3>

4
modules/reindex/src/test/java/org/elasticsearch/index/reindex/AsyncBulkByScrollActionTests.java
View File

@ -744,8 +744,8 @@ public class AsyncBulkByScrollActionTests extends ESTestCase {
@Override
@SuppressWarnings("unchecked")
protected <Request extends ActionRequest, Response extends ActionResponse,
RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void doExecute(
Action<Request, Response, RequestBuilder> action, Request request, ActionListener<Response> listener) {
RequestBuilder extends ActionRequestBuilder<Request, Response>> void doExecute(
Action<Request, Response> action, Request request, ActionListener<Response> listener) {
if (false == expectedHeaders.equals(threadPool().getThreadContext().getHeaders())) {
listener.onFailure(
new RuntimeException("Expected " + expectedHeaders + " but got " + threadPool().getThreadContext().getHeaders()));

8
modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWithAuthTests.java
View File

@ -109,13 +109,13 @@ public class ReindexFromRemoteWithAuthTests extends ESSingleNodeTestCase {
}
public void testReindexFromRemoteWithAuthentication() throws Exception {
ReindexRequestBuilder request = ReindexAction.INSTANCE.newRequestBuilder(client()).source("source").destination("dest")
ReindexRequestBuilder request = new ReindexRequestBuilder(client(), ReindexAction.INSTANCE).source("source").destination("dest")
.setRemoteInfo(newRemoteInfo("Aladdin", "open sesame", emptyMap()));
assertThat(request.get(), matcher().created(1));
}
public void testReindexSendsHeaders() throws Exception {
ReindexRequestBuilder request = ReindexAction.INSTANCE.newRequestBuilder(client()).source("source").destination("dest")
ReindexRequestBuilder request = new ReindexRequestBuilder(client(), ReindexAction.INSTANCE).source("source").destination("dest")
.setRemoteInfo(newRemoteInfo(null, null, singletonMap(TestFilter.EXAMPLE_HEADER, "doesn't matter")));
ElasticsearchStatusException e = expectThrows(ElasticsearchStatusException.class, () -> request.get());
assertEquals(RestStatus.BAD_REQUEST, e.status());
@ -123,7 +123,7 @@ public class ReindexFromRemoteWithAuthTests extends ESSingleNodeTestCase {
}
public void testReindexWithoutAuthenticationWhenRequired() throws Exception {
ReindexRequestBuilder request = ReindexAction.INSTANCE.newRequestBuilder(client()).source("source").destination("dest")
ReindexRequestBuilder request = new ReindexRequestBuilder(client(), ReindexAction.INSTANCE).source("source").destination("dest")
.setRemoteInfo(newRemoteInfo(null, null, emptyMap()));
ElasticsearchStatusException e = expectThrows(ElasticsearchStatusException.class, () -> request.get());
assertEquals(RestStatus.UNAUTHORIZED, e.status());
@ -132,7 +132,7 @@ public class ReindexFromRemoteWithAuthTests extends ESSingleNodeTestCase {
}
public void testReindexWithBadAuthentication() throws Exception {
ReindexRequestBuilder request = ReindexAction.INSTANCE.newRequestBuilder(client()).source("source").destination("dest")
ReindexRequestBuilder request = new ReindexRequestBuilder(client(), ReindexAction.INSTANCE).source("source").destination("dest")
.setRemoteInfo(newRemoteInfo("junk", "auth", emptyMap()));
ElasticsearchStatusException e = expectThrows(ElasticsearchStatusException.class, () -> request.get());
assertThat(e.getMessage(), containsString("\"reason\":\"Bad Authorization\""));

8
modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexTestCase.java
View File

@ -47,19 +47,19 @@ public abstract class ReindexTestCase extends ESIntegTestCase {
}
protected ReindexRequestBuilder reindex() {
return ReindexAction.INSTANCE.newRequestBuilder(client());
return new ReindexRequestBuilder(client(), ReindexAction.INSTANCE);
}
protected UpdateByQueryRequestBuilder updateByQuery() {
return UpdateByQueryAction.INSTANCE.newRequestBuilder(client());
return new UpdateByQueryRequestBuilder(client(), UpdateByQueryAction.INSTANCE);
}
protected DeleteByQueryRequestBuilder deleteByQuery() {
return DeleteByQueryAction.INSTANCE.newRequestBuilder(client());
return new DeleteByQueryRequestBuilder(client(), DeleteByQueryAction.INSTANCE);
}
protected RethrottleRequestBuilder rethrottle() {
return RethrottleAction.INSTANCE.newRequestBuilder(client());
return new RethrottleRequestBuilder(client(), RethrottleAction.INSTANCE);
}
public static BulkIndexByScrollResponseMatcher matcher() {

8
modules/reindex/src/test/java/org/elasticsearch/index/reindex/RetryTests.java
View File

@ -106,7 +106,7 @@ public class RetryTests extends ESIntegTestCase {
public void testReindex() throws Exception {
testCase(
ReindexAction.NAME,
client -> ReindexAction.INSTANCE.newRequestBuilder(client).source("source").destination("dest"),
client -> new ReindexRequestBuilder(client, ReindexAction.INSTANCE).source("source").destination("dest"),
matcher().created(DOC_COUNT));
}
@ -127,7 +127,7 @@ public class RetryTests extends ESIntegTestCase {
TransportAddress address = masterNode.getHttp().getAddress().publishAddress();
RemoteInfo remote = new RemoteInfo("http", address.getAddress(), address.getPort(), new BytesArray("{\"match_all\":{}}"), null,
null, emptyMap(), RemoteInfo.DEFAULT_SOCKET_TIMEOUT, RemoteInfo.DEFAULT_CONNECT_TIMEOUT);
ReindexRequestBuilder request = ReindexAction.INSTANCE.newRequestBuilder(client).source("source").destination("dest")
ReindexRequestBuilder request = new ReindexRequestBuilder(client, ReindexAction.INSTANCE).source("source").destination("dest")
.setRemoteInfo(remote);
return request;
};
@ -135,12 +135,12 @@ public class RetryTests extends ESIntegTestCase {
}
public void testUpdateByQuery() throws Exception {
testCase(UpdateByQueryAction.NAME, client -> UpdateByQueryAction.INSTANCE.newRequestBuilder(client).source("source"),
testCase(UpdateByQueryAction.NAME, client -> new UpdateByQueryRequestBuilder(client, UpdateByQueryAction.INSTANCE).source("source"),
matcher().updated(DOC_COUNT));
}
public void testDeleteByQuery() throws Exception {
testCase(DeleteByQueryAction.NAME, client -> DeleteByQueryAction.INSTANCE.newRequestBuilder(client).source("source")
testCase(DeleteByQueryAction.NAME, client -> new DeleteByQueryRequestBuilder(client, DeleteByQueryAction.INSTANCE).source("source")
.filter(QueryBuilders.matchAllQuery()), matcher().deleted(DOC_COUNT));
}

9
server/src/main/java/org/elasticsearch/action/Action.java
View File

@ -19,20 +19,13 @@
package org.elasticsearch.action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Base action. Supports building the <code>Request</code> through a <code>RequestBuilder</code>.
*/
public abstract class Action<Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>>
public abstract class Action<Request extends ActionRequest, Response extends ActionResponse>
extends GenericAction<Request, Response> {
protected Action(String name) {
super(name);
}
/**
* Creates a new request builder given the client provided as argument
*/
public abstract RequestBuilder newRequestBuilder(ElasticsearchClient client);
}

7
server/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java
View File

@ -24,14 +24,13 @@ import org.elasticsearch.common.unit.TimeValue;
import java.util.Objects;
public abstract class ActionRequestBuilder<Request extends ActionRequest, Response extends ActionResponse,
RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> {
public abstract class ActionRequestBuilder<Request extends ActionRequest, Response extends ActionResponse> {
protected final Action<Request, Response, RequestBuilder> action;
protected final Action<Request, Response> action;
protected final Request request;
protected final ElasticsearchClient client;
protected ActionRequestBuilder(ElasticsearchClient client, Action<Request, Response, RequestBuilder> action, Request request) {
protected ActionRequestBuilder(ElasticsearchClient client, Action<Request, Response> action, Request request) {
Objects.requireNonNull(action, "action must not be null");
this.action = action;
this.request = request;

9
server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainAction.java
View File

@ -25,9 +25,7 @@ import org.elasticsearch.client.ElasticsearchClient;
/**
* Action for explaining shard allocation for a shard in the cluster
*/
public class ClusterAllocationExplainAction extends Action<ClusterAllocationExplainRequest,
ClusterAllocationExplainResponse,
ClusterAllocationExplainRequestBuilder> {
public class ClusterAllocationExplainAction extends Action<ClusterAllocationExplainRequest, ClusterAllocationExplainResponse> {
public static final ClusterAllocationExplainAction INSTANCE = new ClusterAllocationExplainAction();
public static final String NAME = "cluster:monitor/allocation/explain";
@ -40,9 +38,4 @@ public class ClusterAllocationExplainAction extends Action<ClusterAllocationExpl
public ClusterAllocationExplainResponse newResponse() {
return new ClusterAllocationExplainResponse();
}
@Override
public ClusterAllocationExplainRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ClusterAllocationExplainRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.cluster.health;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class ClusterHealthAction extends Action<ClusterHealthRequest, ClusterHealthResponse, ClusterHealthRequestBuilder> {
public class ClusterHealthAction extends Action<ClusterHealthRequest, ClusterHealthResponse> {
public static final ClusterHealthAction INSTANCE = new ClusterHealthAction();
public static final String NAME = "cluster:monitor/health";
@ -35,9 +34,4 @@ public class ClusterHealthAction extends Action<ClusterHealthRequest, ClusterHea
public ClusterHealthResponse newResponse() {
return new ClusterHealthResponse();
}
@Override
public ClusterHealthRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ClusterHealthRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.cluster.node.hotthreads;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class NodesHotThreadsAction extends Action<NodesHotThreadsRequest, NodesHotThreadsResponse, NodesHotThreadsRequestBuilder> {
public class NodesHotThreadsAction extends Action<NodesHotThreadsRequest, NodesHotThreadsResponse> {
public static final NodesHotThreadsAction INSTANCE = new NodesHotThreadsAction();
public static final String NAME = "cluster:monitor/nodes/hot_threads";
@ -35,9 +34,4 @@ public class NodesHotThreadsAction extends Action<NodesHotThreadsRequest, NodesH
public NodesHotThreadsResponse newResponse() {
return new NodesHotThreadsResponse();
}
@Override
public NodesHotThreadsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new NodesHotThreadsRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.cluster.node.info;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class NodesInfoAction extends Action<NodesInfoRequest, NodesInfoResponse, NodesInfoRequestBuilder> {
public class NodesInfoAction extends Action<NodesInfoRequest, NodesInfoResponse> {
public static final NodesInfoAction INSTANCE = new NodesInfoAction();
public static final String NAME = "cluster:monitor/nodes/info";
@ -35,9 +34,4 @@ public class NodesInfoAction extends Action<NodesInfoRequest, NodesInfoResponse,
public NodesInfoResponse newResponse() {
return new NodesInfoResponse();
}
@Override
public NodesInfoRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new NodesInfoRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.cluster.node.stats;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class NodesStatsAction extends Action<NodesStatsRequest, NodesStatsResponse, NodesStatsRequestBuilder> {
public class NodesStatsAction extends Action<NodesStatsRequest, NodesStatsResponse> {
public static final NodesStatsAction INSTANCE = new NodesStatsAction();
public static final String NAME = "cluster:monitor/nodes/stats";
@ -35,9 +34,4 @@ public class NodesStatsAction extends Action<NodesStatsRequest, NodesStatsRespon
public NodesStatsResponse newResponse() {
return new NodesStatsResponse();
}
@Override
public NodesStatsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new NodesStatsRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.cluster.node.tasks.cancel;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Action for cancelling running tasks
*/
public class CancelTasksAction extends Action<CancelTasksRequest, CancelTasksResponse, CancelTasksRequestBuilder> {
public class CancelTasksAction extends Action<CancelTasksRequest, CancelTasksResponse> {
public static final CancelTasksAction INSTANCE = new CancelTasksAction();
public static final String NAME = "cluster:admin/tasks/cancel";
@ -38,9 +37,4 @@ public class CancelTasksAction extends Action<CancelTasksRequest, CancelTasksRes
public CancelTasksResponse newResponse() {
return new CancelTasksResponse();
}
@Override
public CancelTasksRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new CancelTasksRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.cluster.node.tasks.get;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Action for retrieving a list of currently running tasks
*/
public class GetTaskAction extends Action<GetTaskRequest, GetTaskResponse, GetTaskRequestBuilder> {
public class GetTaskAction extends Action<GetTaskRequest, GetTaskResponse> {
public static final GetTaskAction INSTANCE = new GetTaskAction();
public static final String NAME = "cluster:monitor/task/get";
@ -38,9 +37,4 @@ public class GetTaskAction extends Action<GetTaskRequest, GetTaskResponse, GetTa
public GetTaskResponse newResponse() {
return new GetTaskResponse();
}
@Override
public GetTaskRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new GetTaskRequestBuilder(client, this);
}
}

2
server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java
View File

@ -27,7 +27,7 @@ import org.elasticsearch.tasks.TaskId;
/**
* Builder for the request to retrieve the list of tasks running on the specified nodes
*/
public class GetTaskRequestBuilder extends ActionRequestBuilder<GetTaskRequest, GetTaskResponse, GetTaskRequestBuilder> {
public class GetTaskRequestBuilder extends ActionRequestBuilder<GetTaskRequest, GetTaskResponse> {
public GetTaskRequestBuilder(ElasticsearchClient client, GetTaskAction action) {
super(client, action, new GetTaskRequest());
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.cluster.node.tasks.list;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Action for retrieving a list of currently running tasks
*/
public class ListTasksAction extends Action<ListTasksRequest, ListTasksResponse, ListTasksRequestBuilder> {
public class ListTasksAction extends Action<ListTasksRequest, ListTasksResponse> {
public static final ListTasksAction INSTANCE = new ListTasksAction();
public static final String NAME = "cluster:monitor/tasks/lists";
@ -38,9 +37,4 @@ public class ListTasksAction extends Action<ListTasksRequest, ListTasksResponse,
public ListTasksResponse newResponse() {
return new ListTasksResponse();
}
@Override
public ListTasksRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ListTasksRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.cluster.node.usage;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class NodesUsageAction extends Action<NodesUsageRequest, NodesUsageResponse, NodesUsageRequestBuilder> {
public class NodesUsageAction extends Action<NodesUsageRequest, NodesUsageResponse> {
public static final NodesUsageAction INSTANCE = new NodesUsageAction();
public static final String NAME = "cluster:monitor/nodes/usage";
@ -31,11 +30,6 @@ public class NodesUsageAction extends Action<NodesUsageRequest, NodesUsageRespon
super(NAME);
}
@Override
public NodesUsageRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new NodesUsageRequestBuilder(client, this);
}
@Override
public NodesUsageResponse newResponse() {
return new NodesUsageResponse();

3
server/src/main/java/org/elasticsearch/action/admin/cluster/node/usage/NodesUsageRequestBuilder.java
View File

@ -26,8 +26,7 @@ import org.elasticsearch.client.ElasticsearchClient;
public class NodesUsageRequestBuilder
extends NodesOperationRequestBuilder<NodesUsageRequest, NodesUsageResponse, NodesUsageRequestBuilder> {
public NodesUsageRequestBuilder(ElasticsearchClient client,
Action<NodesUsageRequest, NodesUsageResponse, NodesUsageRequestBuilder> action) {
public NodesUsageRequestBuilder(ElasticsearchClient client, Action<NodesUsageRequest, NodesUsageResponse> action) {
super(client, action, new NodesUsageRequest());
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.cluster.remote;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public final class RemoteInfoAction extends Action<RemoteInfoRequest, RemoteInfoResponse, RemoteInfoRequestBuilder> {
public final class RemoteInfoAction extends Action<RemoteInfoRequest, RemoteInfoResponse> {
public static final String NAME = "cluster:monitor/remote/info";
public static final RemoteInfoAction INSTANCE = new RemoteInfoAction();
@ -31,11 +30,6 @@ public final class RemoteInfoAction extends Action<RemoteInfoRequest, RemoteInfo
super(NAME);
}
@Override
public RemoteInfoRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new RemoteInfoRequestBuilder(client, INSTANCE);
}
@Override
public RemoteInfoResponse newResponse() {
return new RemoteInfoResponse();

2
server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequestBuilder.java
View File

@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.remote;
import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.client.ElasticsearchClient;
public final class RemoteInfoRequestBuilder extends ActionRequestBuilder<RemoteInfoRequest, RemoteInfoResponse, RemoteInfoRequestBuilder> {
public final class RemoteInfoRequestBuilder extends ActionRequestBuilder<RemoteInfoRequest, RemoteInfoResponse> {
public RemoteInfoRequestBuilder(ElasticsearchClient client, RemoteInfoAction action) {
super(client, action, new RemoteInfoRequest());

8
server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.cluster.repositories.delete;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Unregister repository action
*/
public class DeleteRepositoryAction extends Action<DeleteRepositoryRequest, DeleteRepositoryResponse, DeleteRepositoryRequestBuilder> {
public class DeleteRepositoryAction extends Action<DeleteRepositoryRequest, DeleteRepositoryResponse> {
public static final DeleteRepositoryAction INSTANCE = new DeleteRepositoryAction();
public static final String NAME = "cluster:admin/repository/delete";
@ -38,10 +37,5 @@ public class DeleteRepositoryAction extends Action<DeleteRepositoryRequest, Dele
public DeleteRepositoryResponse newResponse() {
return new DeleteRepositoryResponse();
}
@Override
public DeleteRepositoryRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new DeleteRepositoryRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.cluster.repositories.get;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Get repositories action
*/
public class GetRepositoriesAction extends Action<GetRepositoriesRequest, GetRepositoriesResponse, GetRepositoriesRequestBuilder> {
public class GetRepositoriesAction extends Action<GetRepositoriesRequest, GetRepositoriesResponse> {
public static final GetRepositoriesAction INSTANCE = new GetRepositoriesAction();
public static final String NAME = "cluster:admin/repository/get";
@ -38,10 +37,5 @@ public class GetRepositoriesAction extends Action<GetRepositoriesRequest, GetRep
public GetRepositoriesResponse newResponse() {
return new GetRepositoriesResponse();
}
@Override
public GetRepositoriesRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new GetRepositoriesRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.cluster.repositories.put;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Register repository action
*/
public class PutRepositoryAction extends Action<PutRepositoryRequest, PutRepositoryResponse, PutRepositoryRequestBuilder> {
public class PutRepositoryAction extends Action<PutRepositoryRequest, PutRepositoryResponse> {
public static final PutRepositoryAction INSTANCE = new PutRepositoryAction();
public static final String NAME = "cluster:admin/repository/put";
@ -38,10 +37,5 @@ public class PutRepositoryAction extends Action<PutRepositoryRequest, PutReposit
public PutRepositoryResponse newResponse() {
return new PutRepositoryResponse();
}
@Override
public PutRepositoryRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new PutRepositoryRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.cluster.repositories.verify;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Unregister repository action
*/
public class VerifyRepositoryAction extends Action<VerifyRepositoryRequest, VerifyRepositoryResponse, VerifyRepositoryRequestBuilder> {
public class VerifyRepositoryAction extends Action<VerifyRepositoryRequest, VerifyRepositoryResponse> {
public static final VerifyRepositoryAction INSTANCE = new VerifyRepositoryAction();
public static final String NAME = "cluster:admin/repository/verify";
@ -38,10 +37,5 @@ public class VerifyRepositoryAction extends Action<VerifyRepositoryRequest, Veri
public VerifyRepositoryResponse newResponse() {
return new VerifyRepositoryResponse();
}
@Override
public VerifyRepositoryRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new VerifyRepositoryRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.cluster.reroute;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class ClusterRerouteAction extends Action<ClusterRerouteRequest, ClusterRerouteResponse, ClusterRerouteRequestBuilder> {
public class ClusterRerouteAction extends Action<ClusterRerouteRequest, ClusterRerouteResponse> {
public static final ClusterRerouteAction INSTANCE = new ClusterRerouteAction();
public static final String NAME = "cluster:admin/reroute";
@ -35,9 +34,4 @@ public class ClusterRerouteAction extends Action<ClusterRerouteRequest, ClusterR
public ClusterRerouteResponse newResponse() {
return new ClusterRerouteResponse();
}
@Override
public ClusterRerouteRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ClusterRerouteRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.cluster.settings;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class ClusterUpdateSettingsAction extends Action<ClusterUpdateSettingsRequest, ClusterUpdateSettingsResponse, ClusterUpdateSettingsRequestBuilder> {
public class ClusterUpdateSettingsAction extends Action<ClusterUpdateSettingsRequest, ClusterUpdateSettingsResponse> {
public static final ClusterUpdateSettingsAction INSTANCE = new ClusterUpdateSettingsAction();
public static final String NAME = "cluster:admin/settings/update";
@ -35,9 +34,4 @@ public class ClusterUpdateSettingsAction extends Action<ClusterUpdateSettingsReq
public ClusterUpdateSettingsResponse newResponse() {
return new ClusterUpdateSettingsResponse();
}
@Override
public ClusterUpdateSettingsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ClusterUpdateSettingsRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.cluster.shards;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class ClusterSearchShardsAction extends Action<ClusterSearchShardsRequest, ClusterSearchShardsResponse, ClusterSearchShardsRequestBuilder> {
public class ClusterSearchShardsAction extends Action<ClusterSearchShardsRequest, ClusterSearchShardsResponse> {
public static final ClusterSearchShardsAction INSTANCE = new ClusterSearchShardsAction();
public static final String NAME = "indices:admin/shards/search_shards";
@ -35,9 +34,4 @@ public class ClusterSearchShardsAction extends Action<ClusterSearchShardsRequest
public ClusterSearchShardsResponse newResponse() {
return new ClusterSearchShardsResponse();
}
@Override
public ClusterSearchShardsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ClusterSearchShardsRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.cluster.snapshots.create;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Create snapshot action
*/
public class CreateSnapshotAction extends Action<CreateSnapshotRequest, CreateSnapshotResponse, CreateSnapshotRequestBuilder> {
public class CreateSnapshotAction extends Action<CreateSnapshotRequest, CreateSnapshotResponse> {
public static final CreateSnapshotAction INSTANCE = new CreateSnapshotAction();
public static final String NAME = "cluster:admin/snapshot/create";
@ -38,10 +37,5 @@ public class CreateSnapshotAction extends Action<CreateSnapshotRequest, CreateSn
public CreateSnapshotResponse newResponse() {
return new CreateSnapshotResponse();
}
@Override
public CreateSnapshotRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new CreateSnapshotRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.cluster.snapshots.delete;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Delete snapshot action
*/
public class DeleteSnapshotAction extends Action<DeleteSnapshotRequest, DeleteSnapshotResponse, DeleteSnapshotRequestBuilder> {
public class DeleteSnapshotAction extends Action<DeleteSnapshotRequest, DeleteSnapshotResponse> {
public static final DeleteSnapshotAction INSTANCE = new DeleteSnapshotAction();
public static final String NAME = "cluster:admin/snapshot/delete";
@ -38,10 +37,5 @@ public class DeleteSnapshotAction extends Action<DeleteSnapshotRequest, DeleteSn
public DeleteSnapshotResponse newResponse() {
return new DeleteSnapshotResponse();
}
@Override
public DeleteSnapshotRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new DeleteSnapshotRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.cluster.snapshots.get;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Get snapshots action
*/
public class GetSnapshotsAction extends Action<GetSnapshotsRequest, GetSnapshotsResponse, GetSnapshotsRequestBuilder> {
public class GetSnapshotsAction extends Action<GetSnapshotsRequest, GetSnapshotsResponse> {
public static final GetSnapshotsAction INSTANCE = new GetSnapshotsAction();
public static final String NAME = "cluster:admin/snapshot/get";
@ -38,10 +37,5 @@ public class GetSnapshotsAction extends Action<GetSnapshotsRequest, GetSnapshots
public GetSnapshotsResponse newResponse() {
return new GetSnapshotsResponse();
}
@Override
public GetSnapshotsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new GetSnapshotsRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.cluster.snapshots.restore;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Restore snapshot action
*/
public class RestoreSnapshotAction extends Action<RestoreSnapshotRequest, RestoreSnapshotResponse, RestoreSnapshotRequestBuilder> {
public class RestoreSnapshotAction extends Action<RestoreSnapshotRequest, RestoreSnapshotResponse> {
public static final RestoreSnapshotAction INSTANCE = new RestoreSnapshotAction();
public static final String NAME = "cluster:admin/snapshot/restore";
@ -38,10 +37,5 @@ public class RestoreSnapshotAction extends Action<RestoreSnapshotRequest, Restor
public RestoreSnapshotResponse newResponse() {
return new RestoreSnapshotResponse();
}
@Override
public RestoreSnapshotRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new RestoreSnapshotRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.cluster.snapshots.status;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Snapshots status action
*/
public class SnapshotsStatusAction extends Action<SnapshotsStatusRequest, SnapshotsStatusResponse, SnapshotsStatusRequestBuilder> {
public class SnapshotsStatusAction extends Action<SnapshotsStatusRequest, SnapshotsStatusResponse> {
public static final SnapshotsStatusAction INSTANCE = new SnapshotsStatusAction();
public static final String NAME = "cluster:admin/snapshot/status";
@ -38,10 +37,5 @@ public class SnapshotsStatusAction extends Action<SnapshotsStatusRequest, Snapsh
public SnapshotsStatusResponse newResponse() {
return new SnapshotsStatusResponse();
}
@Override
public SnapshotsStatusRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new SnapshotsStatusRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.cluster.state;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class ClusterStateAction extends Action<ClusterStateRequest, ClusterStateResponse, ClusterStateRequestBuilder> {
public class ClusterStateAction extends Action<ClusterStateRequest, ClusterStateResponse> {
public static final ClusterStateAction INSTANCE = new ClusterStateAction();
public static final String NAME = "cluster:monitor/state";
@ -35,9 +34,4 @@ public class ClusterStateAction extends Action<ClusterStateRequest, ClusterState
public ClusterStateResponse newResponse() {
return new ClusterStateResponse();
}
@Override
public ClusterStateRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ClusterStateRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.cluster.stats;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class ClusterStatsAction extends Action<ClusterStatsRequest, ClusterStatsResponse, ClusterStatsRequestBuilder> {
public class ClusterStatsAction extends Action<ClusterStatsRequest, ClusterStatsResponse> {
public static final ClusterStatsAction INSTANCE = new ClusterStatsAction();
public static final String NAME = "cluster:monitor/stats";
@ -35,9 +34,4 @@ public class ClusterStatsAction extends Action<ClusterStatsRequest, ClusterStats
public ClusterStatsResponse newResponse() {
return new ClusterStatsResponse();
}
@Override
public ClusterStatsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ClusterStatsRequestBuilder(client, this);
}
}

9
server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/DeleteStoredScriptAction.java
View File

@ -20,10 +20,8 @@
package org.elasticsearch.action.admin.cluster.storedscripts;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class DeleteStoredScriptAction extends Action<DeleteStoredScriptRequest, DeleteStoredScriptResponse,
DeleteStoredScriptRequestBuilder> {
public class DeleteStoredScriptAction extends Action<DeleteStoredScriptRequest, DeleteStoredScriptResponse> {
public static final DeleteStoredScriptAction INSTANCE = new DeleteStoredScriptAction();
public static final String NAME = "cluster:admin/script/delete";
@ -36,9 +34,4 @@ public class DeleteStoredScriptAction extends Action<DeleteStoredScriptRequest,
public DeleteStoredScriptResponse newResponse() {
return new DeleteStoredScriptResponse();
}
@Override
public DeleteStoredScriptRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new DeleteStoredScriptRequestBuilder(client, this);
}
}

10
server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetStoredScriptAction.java
View File

@ -20,10 +20,8 @@
package org.elasticsearch.action.admin.cluster.storedscripts;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class GetStoredScriptAction extends Action<GetStoredScriptRequest, GetStoredScriptResponse,
GetStoredScriptRequestBuilder> {
public class GetStoredScriptAction extends Action<GetStoredScriptRequest, GetStoredScriptResponse> {
public static final GetStoredScriptAction INSTANCE = new GetStoredScriptAction();
public static final String NAME = "cluster:admin/script/get";
@ -36,10 +34,4 @@ public class GetStoredScriptAction extends Action<GetStoredScriptRequest, GetSto
public GetStoredScriptResponse newResponse() {
return new GetStoredScriptResponse();
}
@Override
public GetStoredScriptRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new GetStoredScriptRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptAction.java
View File

@ -23,8 +23,7 @@ import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class PutStoredScriptAction extends Action<PutStoredScriptRequest, PutStoredScriptResponse,
PutStoredScriptRequestBuilder> {
public class PutStoredScriptAction extends Action<PutStoredScriptRequest, PutStoredScriptResponse> {
public static final PutStoredScriptAction INSTANCE = new PutStoredScriptAction();
public static final String NAME = "cluster:admin/script/put";
@ -39,9 +38,4 @@ public class PutStoredScriptAction extends Action<PutStoredScriptRequest, PutSto
public PutStoredScriptResponse newResponse() {
return new PutStoredScriptResponse();
}
@Override
public PutStoredScriptRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new PutStoredScriptRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.cluster.tasks;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class PendingClusterTasksAction extends Action<PendingClusterTasksRequest, PendingClusterTasksResponse, PendingClusterTasksRequestBuilder> {
public class PendingClusterTasksAction extends Action<PendingClusterTasksRequest, PendingClusterTasksResponse> {
public static final PendingClusterTasksAction INSTANCE = new PendingClusterTasksAction();
public static final String NAME = "cluster:monitor/task";
@ -35,9 +34,4 @@ public class PendingClusterTasksAction extends Action<PendingClusterTasksRequest
public PendingClusterTasksResponse newResponse() {
return new PendingClusterTasksResponse();
}
@Override
public PendingClusterTasksRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new PendingClusterTasksRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.alias;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class IndicesAliasesAction extends Action<IndicesAliasesRequest, IndicesAliasesResponse, IndicesAliasesRequestBuilder> {
public class IndicesAliasesAction extends Action<IndicesAliasesRequest, IndicesAliasesResponse> {
public static final IndicesAliasesAction INSTANCE = new IndicesAliasesAction();
public static final String NAME = "indices:admin/aliases";
@ -35,9 +34,4 @@ public class IndicesAliasesAction extends Action<IndicesAliasesRequest, IndicesA
public IndicesAliasesResponse newResponse() {
return new IndicesAliasesResponse();
}
@Override
public IndicesAliasesRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new IndicesAliasesRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/AliasesExistAction.java
View File

@ -21,9 +21,8 @@ package org.elasticsearch.action.admin.indices.alias.exists;
import org.elasticsearch.action.Action;
import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
import org.elasticsearch.client.ElasticsearchClient;
public class AliasesExistAction extends Action<GetAliasesRequest, AliasesExistResponse, AliasesExistRequestBuilder> {
public class AliasesExistAction extends Action<GetAliasesRequest, AliasesExistResponse> {
public static final AliasesExistAction INSTANCE = new AliasesExistAction();
public static final String NAME = "indices:admin/aliases/exists";
@ -32,11 +31,6 @@ public class AliasesExistAction extends Action<GetAliasesRequest, AliasesExistRe
super(NAME);
}
@Override
public AliasesExistRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new AliasesExistRequestBuilder(client, this);
}
@Override
public AliasesExistResponse newResponse() {
return new AliasesExistResponse();

2
server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java
View File

@ -28,7 +28,7 @@ import org.elasticsearch.common.util.ArrayUtils;
public abstract class BaseAliasesRequestBuilder<Response extends ActionResponse, Builder extends BaseAliasesRequestBuilder<Response, Builder>> extends MasterNodeReadOperationRequestBuilder<GetAliasesRequest, Response, Builder> {
public BaseAliasesRequestBuilder(ElasticsearchClient client, Action<GetAliasesRequest, Response, Builder> action, String... aliases) {
public BaseAliasesRequestBuilder(ElasticsearchClient client, Action<GetAliasesRequest, Response> action, String... aliases) {
super(client, action, new GetAliasesRequest(aliases));
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.alias.get;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class GetAliasesAction extends Action<GetAliasesRequest, GetAliasesResponse, GetAliasesRequestBuilder> {
public class GetAliasesAction extends Action<GetAliasesRequest, GetAliasesResponse> {
public static final GetAliasesAction INSTANCE = new GetAliasesAction();
public static final String NAME = "indices:admin/aliases/get";
@ -31,11 +30,6 @@ public class GetAliasesAction extends Action<GetAliasesRequest, GetAliasesRespon
super(NAME);
}
@Override
public GetAliasesRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new GetAliasesRequestBuilder(client, this);
}
@Override
public GetAliasesResponse newResponse() {
return new GetAliasesResponse();

8
server/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.analyze;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class AnalyzeAction extends Action<AnalyzeRequest, AnalyzeResponse, AnalyzeRequestBuilder> {
public class AnalyzeAction extends Action<AnalyzeRequest, AnalyzeResponse> {
public static final AnalyzeAction INSTANCE = new AnalyzeAction();
public static final String NAME = "indices:admin/analyze";
@ -35,9 +34,4 @@ public class AnalyzeAction extends Action<AnalyzeRequest, AnalyzeResponse, Analy
public AnalyzeResponse newResponse() {
return new AnalyzeResponse();
}
@Override
public AnalyzeRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new AnalyzeRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheAction.java vendored
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.cache.clear;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class ClearIndicesCacheAction extends Action<ClearIndicesCacheRequest, ClearIndicesCacheResponse, ClearIndicesCacheRequestBuilder> {
public class ClearIndicesCacheAction extends Action<ClearIndicesCacheRequest, ClearIndicesCacheResponse> {
public static final ClearIndicesCacheAction INSTANCE = new ClearIndicesCacheAction();
public static final String NAME = "indices:admin/cache/clear";
@ -35,9 +34,4 @@ public class ClearIndicesCacheAction extends Action<ClearIndicesCacheRequest, Cl
public ClearIndicesCacheResponse newResponse() {
return new ClearIndicesCacheResponse();
}
@Override
public ClearIndicesCacheRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ClearIndicesCacheRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.close;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class CloseIndexAction extends Action<CloseIndexRequest, CloseIndexResponse, CloseIndexRequestBuilder> {
public class CloseIndexAction extends Action<CloseIndexRequest, CloseIndexResponse> {
public static final CloseIndexAction INSTANCE = new CloseIndexAction();
public static final String NAME = "indices:admin/close";
@ -35,9 +34,4 @@ public class CloseIndexAction extends Action<CloseIndexRequest, CloseIndexRespon
public CloseIndexResponse newResponse() {
return new CloseIndexResponse();
}
@Override
public CloseIndexRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new CloseIndexRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.create;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class CreateIndexAction extends Action<CreateIndexRequest, CreateIndexResponse, CreateIndexRequestBuilder> {
public class CreateIndexAction extends Action<CreateIndexRequest, CreateIndexResponse> {
public static final CreateIndexAction INSTANCE = new CreateIndexAction();
public static final String NAME = "indices:admin/create";
@ -35,9 +34,4 @@ public class CreateIndexAction extends Action<CreateIndexRequest, CreateIndexRes
public CreateIndexResponse newResponse() {
return new CreateIndexResponse();
}
@Override
public CreateIndexRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new CreateIndexRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.delete;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class DeleteIndexAction extends Action<DeleteIndexRequest, DeleteIndexResponse, DeleteIndexRequestBuilder> {
public class DeleteIndexAction extends Action<DeleteIndexRequest, DeleteIndexResponse> {
public static final DeleteIndexAction INSTANCE = new DeleteIndexAction();
public static final String NAME = "indices:admin/delete";
@ -35,9 +34,4 @@ public class DeleteIndexAction extends Action<DeleteIndexRequest, DeleteIndexRes
public DeleteIndexResponse newResponse() {
return new DeleteIndexResponse();
}
@Override
public DeleteIndexRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new DeleteIndexRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.exists.indices;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class IndicesExistsAction extends Action<IndicesExistsRequest, IndicesExistsResponse, IndicesExistsRequestBuilder> {
public class IndicesExistsAction extends Action<IndicesExistsRequest, IndicesExistsResponse> {
public static final IndicesExistsAction INSTANCE = new IndicesExistsAction();
public static final String NAME = "indices:admin/exists";
@ -35,9 +34,4 @@ public class IndicesExistsAction extends Action<IndicesExistsRequest, IndicesExi
public IndicesExistsResponse newResponse() {
return new IndicesExistsResponse();
}
@Override
public IndicesExistsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new IndicesExistsRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsAction.java
View File

@ -19,9 +19,8 @@
package org.elasticsearch.action.admin.indices.exists.types;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class TypesExistsAction extends Action<TypesExistsRequest, TypesExistsResponse, TypesExistsRequestBuilder> {
public class TypesExistsAction extends Action<TypesExistsRequest, TypesExistsResponse> {
public static final TypesExistsAction INSTANCE = new TypesExistsAction();
public static final String NAME = "indices:admin/types/exists";
@ -34,9 +33,4 @@ public class TypesExistsAction extends Action<TypesExistsRequest, TypesExistsRes
public TypesExistsResponse newResponse() {
return new TypesExistsResponse();
}
@Override
public TypesExistsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new TypesExistsRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.flush;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class FlushAction extends Action<FlushRequest, FlushResponse, FlushRequestBuilder> {
public class FlushAction extends Action<FlushRequest, FlushResponse> {
public static final FlushAction INSTANCE = new FlushAction();
public static final String NAME = "indices:admin/flush";
@ -35,9 +34,4 @@ public class FlushAction extends Action<FlushRequest, FlushResponse, FlushReques
public FlushResponse newResponse() {
return new FlushResponse();
}
@Override
public FlushRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new FlushRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushAction.java
View File

@ -20,10 +20,9 @@
package org.elasticsearch.action.admin.indices.flush;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class SyncedFlushAction extends Action<SyncedFlushRequest, SyncedFlushResponse, SyncedFlushRequestBuilder> {
public class SyncedFlushAction extends Action<SyncedFlushRequest, SyncedFlushResponse> {
public static final SyncedFlushAction INSTANCE = new SyncedFlushAction();
public static final String NAME = "indices:admin/synced_flush";
@ -36,9 +35,4 @@ public class SyncedFlushAction extends Action<SyncedFlushRequest, SyncedFlushRes
public SyncedFlushResponse newResponse() {
return new SyncedFlushResponse();
}
@Override
public SyncedFlushRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new SyncedFlushRequestBuilder(client, this);
}
}

2
server/src/main/java/org/elasticsearch/action/admin/indices/flush/SyncedFlushRequestBuilder.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.client.ElasticsearchClient;
public class SyncedFlushRequestBuilder extends ActionRequestBuilder<SyncedFlushRequest, SyncedFlushResponse, SyncedFlushRequestBuilder> {
public class SyncedFlushRequestBuilder extends ActionRequestBuilder<SyncedFlushRequest, SyncedFlushResponse> {
public SyncedFlushRequestBuilder(ElasticsearchClient client, SyncedFlushAction action) {
super(client, action, new SyncedFlushRequest());

8
server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.forcemerge;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class ForceMergeAction extends Action<ForceMergeRequest, ForceMergeResponse, ForceMergeRequestBuilder> {
public class ForceMergeAction extends Action<ForceMergeRequest, ForceMergeResponse> {
public static final ForceMergeAction INSTANCE = new ForceMergeAction();
public static final String NAME = "indices:admin/forcemerge";
@ -35,9 +34,4 @@ public class ForceMergeAction extends Action<ForceMergeRequest, ForceMergeRespon
public ForceMergeResponse newResponse() {
return new ForceMergeResponse();
}
@Override
public ForceMergeRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ForceMergeRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.get;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class GetIndexAction extends Action<GetIndexRequest, GetIndexResponse, GetIndexRequestBuilder> {
public class GetIndexAction extends Action<GetIndexRequest, GetIndexResponse> {
public static final GetIndexAction INSTANCE = new GetIndexAction();
public static final String NAME = "indices:admin/get";
@ -31,11 +30,6 @@ public class GetIndexAction extends Action<GetIndexRequest, GetIndexResponse, Ge
super(NAME);
}
@Override
public GetIndexRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new GetIndexRequestBuilder(client, this);
}
@Override
public GetIndexResponse newResponse() {
return new GetIndexResponse();

8
server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.mapping.get;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class GetFieldMappingsAction extends Action<GetFieldMappingsRequest, GetFieldMappingsResponse, GetFieldMappingsRequestBuilder> {
public class GetFieldMappingsAction extends Action<GetFieldMappingsRequest, GetFieldMappingsResponse> {
public static final GetFieldMappingsAction INSTANCE = new GetFieldMappingsAction();
public static final String NAME = "indices:admin/mappings/fields/get";
@ -31,11 +30,6 @@ public class GetFieldMappingsAction extends Action<GetFieldMappingsRequest, GetF
super(NAME);
}
@Override
public GetFieldMappingsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new GetFieldMappingsRequestBuilder(client, this);
}
@Override
public GetFieldMappingsResponse newResponse() {
return new GetFieldMappingsResponse();

2
server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequestBuilder.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.common.util.ArrayUtils;
/** A helper class to build {@link GetFieldMappingsRequest} objects */
public class GetFieldMappingsRequestBuilder extends ActionRequestBuilder<GetFieldMappingsRequest, GetFieldMappingsResponse, GetFieldMappingsRequestBuilder> {
public class GetFieldMappingsRequestBuilder extends ActionRequestBuilder<GetFieldMappingsRequest, GetFieldMappingsResponse> {
public GetFieldMappingsRequestBuilder(ElasticsearchClient client, GetFieldMappingsAction action, String... indices) {
super(client, action, new GetFieldMappingsRequest().indices(indices));

8
server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.mapping.get;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class GetMappingsAction extends Action<GetMappingsRequest, GetMappingsResponse, GetMappingsRequestBuilder> {
public class GetMappingsAction extends Action<GetMappingsRequest, GetMappingsResponse> {
public static final GetMappingsAction INSTANCE = new GetMappingsAction();
public static final String NAME = "indices:admin/mappings/get";
@ -31,11 +30,6 @@ public class GetMappingsAction extends Action<GetMappingsRequest, GetMappingsRes
super(NAME);
}
@Override
public GetMappingsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new GetMappingsRequestBuilder(client, this);
}
@Override
public GetMappingsResponse newResponse() {
return new GetMappingsResponse();

8
server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.mapping.put;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class PutMappingAction extends Action<PutMappingRequest, PutMappingResponse, PutMappingRequestBuilder> {
public class PutMappingAction extends Action<PutMappingRequest, PutMappingResponse> {
public static final PutMappingAction INSTANCE = new PutMappingAction();
public static final String NAME = "indices:admin/mapping/put";
@ -35,9 +34,4 @@ public class PutMappingAction extends Action<PutMappingRequest, PutMappingRespon
public PutMappingResponse newResponse() {
return new PutMappingResponse();
}
@Override
public PutMappingRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new PutMappingRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.open;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class OpenIndexAction extends Action<OpenIndexRequest, OpenIndexResponse, OpenIndexRequestBuilder> {
public class OpenIndexAction extends Action<OpenIndexRequest, OpenIndexResponse> {
public static final OpenIndexAction INSTANCE = new OpenIndexAction();
public static final String NAME = "indices:admin/open";
@ -35,9 +34,4 @@ public class OpenIndexAction extends Action<OpenIndexRequest, OpenIndexResponse,
public OpenIndexResponse newResponse() {
return new OpenIndexResponse();
}
@Override
public OpenIndexRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new OpenIndexRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.indices.recovery;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Recovery information action
*/
public class RecoveryAction extends Action<RecoveryRequest, RecoveryResponse, RecoveryRequestBuilder> {
public class RecoveryAction extends Action<RecoveryRequest, RecoveryResponse> {
public static final RecoveryAction INSTANCE = new RecoveryAction();
public static final String NAME = "indices:monitor/recovery";
@ -34,11 +33,6 @@ public class RecoveryAction extends Action<RecoveryRequest, RecoveryResponse, Re
super(NAME);
}
@Override
public RecoveryRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new RecoveryRequestBuilder(client, this);
}
@Override
public RecoveryResponse newResponse() {
return new RecoveryResponse();

8
server/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.refresh;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class RefreshAction extends Action<RefreshRequest, RefreshResponse, RefreshRequestBuilder> {
public class RefreshAction extends Action<RefreshRequest, RefreshResponse> {
public static final RefreshAction INSTANCE = new RefreshAction();
public static final String NAME = "indices:admin/refresh";
@ -35,9 +34,4 @@ public class RefreshAction extends Action<RefreshRequest, RefreshResponse, Refre
public RefreshResponse newResponse() {
return new RefreshResponse();
}
@Override
public RefreshRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new RefreshRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.rollover;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class RolloverAction extends Action<RolloverRequest, RolloverResponse, RolloverRequestBuilder> {
public class RolloverAction extends Action<RolloverRequest, RolloverResponse> {
public static final RolloverAction INSTANCE = new RolloverAction();
public static final String NAME = "indices:admin/rollover";
@ -35,9 +34,4 @@ public class RolloverAction extends Action<RolloverRequest, RolloverResponse, Ro
public RolloverResponse newResponse() {
return new RolloverResponse();
}
@Override
public RolloverRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new RolloverRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.segments;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class IndicesSegmentsAction extends Action<IndicesSegmentsRequest, IndicesSegmentResponse, IndicesSegmentsRequestBuilder> {
public class IndicesSegmentsAction extends Action<IndicesSegmentsRequest, IndicesSegmentResponse> {
public static final IndicesSegmentsAction INSTANCE = new IndicesSegmentsAction();
public static final String NAME = "indices:monitor/segments";
@ -35,9 +34,4 @@ public class IndicesSegmentsAction extends Action<IndicesSegmentsRequest, Indice
public IndicesSegmentResponse newResponse() {
return new IndicesSegmentResponse();
}
@Override
public IndicesSegmentsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new IndicesSegmentsRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.settings.get;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class GetSettingsAction extends Action<GetSettingsRequest, GetSettingsResponse, GetSettingsRequestBuilder> {
public class GetSettingsAction extends Action<GetSettingsRequest, GetSettingsResponse> {
public static final GetSettingsAction INSTANCE = new GetSettingsAction();
public static final String NAME = "indices:monitor/settings/get";
@ -31,11 +30,6 @@ public class GetSettingsAction extends Action<GetSettingsRequest, GetSettingsRes
super(NAME);
}
@Override
public GetSettingsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new GetSettingsRequestBuilder(client, this);
}
@Override
public GetSettingsResponse newResponse() {
return new GetSettingsResponse();

8
server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.settings.put;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class UpdateSettingsAction extends Action<UpdateSettingsRequest, UpdateSettingsResponse, UpdateSettingsRequestBuilder> {
public class UpdateSettingsAction extends Action<UpdateSettingsRequest, UpdateSettingsResponse> {
public static final UpdateSettingsAction INSTANCE = new UpdateSettingsAction();
public static final String NAME = "indices:admin/settings/update";
@ -35,9 +34,4 @@ public class UpdateSettingsAction extends Action<UpdateSettingsRequest, UpdateSe
public UpdateSettingsResponse newResponse() {
return new UpdateSettingsResponse();
}
@Override
public UpdateSettingsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new UpdateSettingsRequestBuilder(client, this);
}
}

2
server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestBuilder.java
View File

@ -30,7 +30,7 @@ import org.elasticsearch.cluster.health.ClusterHealthStatus;
*/
public class IndicesShardStoreRequestBuilder extends MasterNodeReadOperationRequestBuilder<IndicesShardStoresRequest, IndicesShardStoresResponse, IndicesShardStoreRequestBuilder> {
public IndicesShardStoreRequestBuilder(ElasticsearchClient client, Action<IndicesShardStoresRequest, IndicesShardStoresResponse, IndicesShardStoreRequestBuilder> action, String... indices) {
public IndicesShardStoreRequestBuilder(ElasticsearchClient client, Action<IndicesShardStoresRequest, IndicesShardStoresResponse> action, String... indices) {
super(client, action, new IndicesShardStoresRequest(indices));
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoresAction.java
View File

@ -20,7 +20,6 @@
package org.elasticsearch.action.admin.indices.shards;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Action for {@link TransportIndicesShardStoresAction}
@ -29,7 +28,7 @@ import org.elasticsearch.client.ElasticsearchClient;
* Shard store information reports which nodes hold shard copies, how recent they are
* and any exceptions on opening the shard index or from previous engine failures
*/
public class IndicesShardStoresAction extends Action<IndicesShardStoresRequest, IndicesShardStoresResponse, IndicesShardStoreRequestBuilder> {
public class IndicesShardStoresAction extends Action<IndicesShardStoresRequest, IndicesShardStoresResponse> {
public static final IndicesShardStoresAction INSTANCE = new IndicesShardStoresAction();
public static final String NAME = "indices:monitor/shard_stores";
@ -42,9 +41,4 @@ public class IndicesShardStoresAction extends Action<IndicesShardStoresRequest,
public IndicesShardStoresResponse newResponse() {
return new IndicesShardStoresResponse();
}
@Override
public IndicesShardStoreRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new IndicesShardStoreRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeAction.java
View File

@ -21,9 +21,8 @@ package org.elasticsearch.action.admin.indices.shrink;
import org.elasticsearch.Version;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class ResizeAction extends Action<ResizeRequest, ResizeResponse, ResizeRequestBuilder> {
public class ResizeAction extends Action<ResizeRequest, ResizeResponse> {
public static final ResizeAction INSTANCE = new ResizeAction();
public static final String NAME = "indices:admin/resize";
@ -37,9 +36,4 @@ public class ResizeAction extends Action<ResizeRequest, ResizeResponse, ResizeRe
public ResizeResponse newResponse() {
return new ResizeResponse();
}
@Override
public ResizeRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ResizeRequestBuilder(client, this);
}
}

2
server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeRequestBuilder.java
View File

@ -27,7 +27,7 @@ import org.elasticsearch.common.settings.Settings;
public class ResizeRequestBuilder extends AcknowledgedRequestBuilder<ResizeRequest, ResizeResponse,
ResizeRequestBuilder> {
public ResizeRequestBuilder(ElasticsearchClient client, Action<ResizeRequest, ResizeResponse, ResizeRequestBuilder> action) {
public ResizeRequestBuilder(ElasticsearchClient client, Action<ResizeRequest, ResizeResponse> action) {
super(client, action, new ResizeRequest());
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/shrink/ShrinkAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.shrink;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class ShrinkAction extends Action<ResizeRequest, ResizeResponse, ResizeRequestBuilder> {
public class ShrinkAction extends Action<ResizeRequest, ResizeResponse> {
public static final ShrinkAction INSTANCE = new ShrinkAction();
public static final String NAME = "indices:admin/shrink";
@ -35,9 +34,4 @@ public class ShrinkAction extends Action<ResizeRequest, ResizeResponse, ResizeRe
public ResizeResponse newResponse() {
return new ResizeResponse();
}
@Override
public ResizeRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ResizeRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.stats;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class IndicesStatsAction extends Action<IndicesStatsRequest, IndicesStatsResponse, IndicesStatsRequestBuilder> {
public class IndicesStatsAction extends Action<IndicesStatsRequest, IndicesStatsResponse> {
public static final IndicesStatsAction INSTANCE = new IndicesStatsAction();
public static final String NAME = "indices:monitor/stats";
@ -35,9 +34,4 @@ public class IndicesStatsAction extends Action<IndicesStatsRequest, IndicesStats
public IndicesStatsResponse newResponse() {
return new IndicesStatsResponse();
}
@Override
public IndicesStatsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new IndicesStatsRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.template.delete;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class DeleteIndexTemplateAction extends Action<DeleteIndexTemplateRequest, DeleteIndexTemplateResponse, DeleteIndexTemplateRequestBuilder> {
public class DeleteIndexTemplateAction extends Action<DeleteIndexTemplateRequest, DeleteIndexTemplateResponse> {
public static final DeleteIndexTemplateAction INSTANCE = new DeleteIndexTemplateAction();
public static final String NAME = "indices:admin/template/delete";
@ -35,9 +34,4 @@ public class DeleteIndexTemplateAction extends Action<DeleteIndexTemplateRequest
public DeleteIndexTemplateResponse newResponse() {
return new DeleteIndexTemplateResponse();
}
@Override
public DeleteIndexTemplateRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new DeleteIndexTemplateRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesAction.java
View File

@ -19,9 +19,8 @@
package org.elasticsearch.action.admin.indices.template.get;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class GetIndexTemplatesAction extends Action<GetIndexTemplatesRequest, GetIndexTemplatesResponse, GetIndexTemplatesRequestBuilder> {
public class GetIndexTemplatesAction extends Action<GetIndexTemplatesRequest, GetIndexTemplatesResponse> {
public static final GetIndexTemplatesAction INSTANCE = new GetIndexTemplatesAction();
public static final String NAME = "indices:admin/template/get";
@ -34,9 +33,4 @@ public class GetIndexTemplatesAction extends Action<GetIndexTemplatesRequest, Ge
public GetIndexTemplatesResponse newResponse() {
return new GetIndexTemplatesResponse();
}
@Override
public GetIndexTemplatesRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new GetIndexTemplatesRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.template.put;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class PutIndexTemplateAction extends Action<PutIndexTemplateRequest, PutIndexTemplateResponse, PutIndexTemplateRequestBuilder> {
public class PutIndexTemplateAction extends Action<PutIndexTemplateRequest, PutIndexTemplateResponse> {
public static final PutIndexTemplateAction INSTANCE = new PutIndexTemplateAction();
public static final String NAME = "indices:admin/template/put";
@ -35,9 +34,4 @@ public class PutIndexTemplateAction extends Action<PutIndexTemplateRequest, PutI
public PutIndexTemplateResponse newResponse() {
return new PutIndexTemplateResponse();
}
@Override
public PutIndexTemplateRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new PutIndexTemplateRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.upgrade.get;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class UpgradeStatusAction extends Action<UpgradeStatusRequest, UpgradeStatusResponse, UpgradeStatusRequestBuilder> {
public class UpgradeStatusAction extends Action<UpgradeStatusRequest, UpgradeStatusResponse> {
public static final UpgradeStatusAction INSTANCE = new UpgradeStatusAction();
public static final String NAME = "indices:monitor/upgrade";
@ -35,9 +34,4 @@ public class UpgradeStatusAction extends Action<UpgradeStatusRequest, UpgradeSta
public UpgradeStatusResponse newResponse() {
return new UpgradeStatusResponse();
}
@Override
public UpgradeStatusRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new UpgradeStatusRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.admin.indices.upgrade.post;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Upgrade index/indices action.
*/
public class UpgradeAction extends Action<UpgradeRequest, UpgradeResponse, UpgradeRequestBuilder> {
public class UpgradeAction extends Action<UpgradeRequest, UpgradeResponse> {
public static final UpgradeAction INSTANCE = new UpgradeAction();
public static final String NAME = "indices:admin/upgrade";
@ -38,9 +37,4 @@ public class UpgradeAction extends Action<UpgradeRequest, UpgradeResponse, Upgra
public UpgradeResponse newResponse() {
return new UpgradeResponse();
}
@Override
public UpgradeRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new UpgradeRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.upgrade.post;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class UpgradeSettingsAction extends Action<UpgradeSettingsRequest, UpgradeSettingsResponse, UpgradeSettingsRequestBuilder> {
public class UpgradeSettingsAction extends Action<UpgradeSettingsRequest, UpgradeSettingsResponse> {
public static final UpgradeSettingsAction INSTANCE = new UpgradeSettingsAction();
public static final String NAME = "internal:indices/admin/upgrade";
@ -35,9 +34,4 @@ public class UpgradeSettingsAction extends Action<UpgradeSettingsRequest, Upgrad
public UpgradeSettingsResponse newResponse() {
return new UpgradeSettingsResponse();
}
@Override
public UpgradeSettingsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new UpgradeSettingsRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryAction.java
View File

@ -20,9 +20,8 @@
package org.elasticsearch.action.admin.indices.validate.query;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class ValidateQueryAction extends Action<ValidateQueryRequest, ValidateQueryResponse, ValidateQueryRequestBuilder> {
public class ValidateQueryAction extends Action<ValidateQueryRequest, ValidateQueryResponse> {
public static final ValidateQueryAction INSTANCE = new ValidateQueryAction();
public static final String NAME = "indices:admin/validate/query";
@ -35,9 +34,4 @@ public class ValidateQueryAction extends Action<ValidateQueryRequest, ValidateQu
public ValidateQueryResponse newResponse() {
return new ValidateQueryResponse();
}
@Override
public ValidateQueryRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ValidateQueryRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/bulk/BulkAction.java
View File

@ -20,11 +20,10 @@
package org.elasticsearch.action.bulk;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.transport.TransportRequestOptions;
public class BulkAction extends Action<BulkRequest, BulkResponse, BulkRequestBuilder> {
public class BulkAction extends Action<BulkRequest, BulkResponse> {
public static final BulkAction INSTANCE = new BulkAction();
public static final String NAME = "indices:data/write/bulk";
@ -38,11 +37,6 @@ public class BulkAction extends Action<BulkRequest, BulkResponse, BulkRequestBui
return new BulkResponse();
}
@Override
public BulkRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new BulkRequestBuilder(client, this);
}
@Override
public TransportRequestOptions transportOptions(Settings settings) {
return TransportRequestOptions.builder()

2
server/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java
View File

@ -38,7 +38,7 @@ import org.elasticsearch.common.xcontent.XContentType;
* A bulk request holds an ordered {@link IndexRequest}s and {@link DeleteRequest}s and allows to executes
* it in a single batch.
*/
public class BulkRequestBuilder extends ActionRequestBuilder<BulkRequest, BulkResponse, BulkRequestBuilder>
public class BulkRequestBuilder extends ActionRequestBuilder<BulkRequest, BulkResponse>
implements WriteRequestBuilder<BulkRequestBuilder> {
public BulkRequestBuilder(ElasticsearchClient client, BulkAction action) {

7
server/src/main/java/org/elasticsearch/action/delete/DeleteAction.java
View File

@ -22,7 +22,7 @@ package org.elasticsearch.action.delete;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class DeleteAction extends Action<DeleteRequest, DeleteResponse, DeleteRequestBuilder> {
public class DeleteAction extends Action<DeleteRequest, DeleteResponse> {
public static final DeleteAction INSTANCE = new DeleteAction();
public static final String NAME = "indices:data/write/delete";
@ -35,9 +35,4 @@ public class DeleteAction extends Action<DeleteRequest, DeleteResponse, DeleteRe
public DeleteResponse newResponse() {
return new DeleteResponse();
}
@Override
public DeleteRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new DeleteRequestBuilder(client, this);
}
}

8
server/src/main/java/org/elasticsearch/action/explain/ExplainAction.java
View File

@ -20,12 +20,11 @@
package org.elasticsearch.action.explain;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
/**
* Entry point for the explain feature.
*/
public class ExplainAction extends Action<ExplainRequest, ExplainResponse, ExplainRequestBuilder> {
public class ExplainAction extends Action<ExplainRequest, ExplainResponse> {
public static final ExplainAction INSTANCE = new ExplainAction();
public static final String NAME = "indices:data/read/explain";
@ -34,11 +33,6 @@ public class ExplainAction extends Action<ExplainRequest, ExplainResponse, Expla
super(NAME);
}
@Override
public ExplainRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new ExplainRequestBuilder(client, this);
}
@Override
public ExplainResponse newResponse() {
return new ExplainResponse();

9
server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesAction.java
View File

@ -20,10 +20,8 @@
package org.elasticsearch.action.fieldcaps;
import org.elasticsearch.action.Action;
import org.elasticsearch.client.ElasticsearchClient;
public class FieldCapabilitiesAction extends Action<FieldCapabilitiesRequest,
FieldCapabilitiesResponse, FieldCapabilitiesRequestBuilder> {
public class FieldCapabilitiesAction extends Action<FieldCapabilitiesRequest, FieldCapabilitiesResponse> {
public static final FieldCapabilitiesAction INSTANCE = new FieldCapabilitiesAction();
public static final String NAME = "indices:data/read/field_caps";
@ -36,9 +34,4 @@ public class FieldCapabilitiesAction extends Action<FieldCapabilitiesRequest,
public FieldCapabilitiesResponse newResponse() {
return new FieldCapabilitiesResponse();
}
@Override
public FieldCapabilitiesRequestBuilder newRequestBuilder(ElasticsearchClient client) {
return new FieldCapabilitiesRequestBuilder(client, this);
}
}

4
server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequestBuilder.java
View File

@ -22,9 +22,7 @@ package org.elasticsearch.action.fieldcaps;
import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.client.ElasticsearchClient;
public class FieldCapabilitiesRequestBuilder extends
ActionRequestBuilder<FieldCapabilitiesRequest, FieldCapabilitiesResponse,
FieldCapabilitiesRequestBuilder> {
public class FieldCapabilitiesRequestBuilder extends ActionRequestBuilder<FieldCapabilitiesRequest, FieldCapabilitiesResponse> {
public FieldCapabilitiesRequestBuilder(ElasticsearchClient client,
FieldCapabilitiesAction action,
String... indices) {

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