From 8ee6ee05cd572307a4c3bbd13ea6c13993340ffb Mon Sep 17 00:00:00 2001 From: Shay Banon Date: Sun, 15 Jan 2012 12:44:48 +0200 Subject: [PATCH] Java API: Move all request builders to org.elasticsearch.action... from org.elasticsearch.client.action, closes #1611. --- .../action/ActionRequestBuilder.java | 7 +--- .../health/ClusterHealthRequestBuilder.java | 7 +--- .../node/info/NodesInfoRequestBuilder.java | 6 +-- .../restart/NodesRestartRequestBuilder.java | 6 +-- .../shutdown/NodesShutdownRequestBuilder.java | 6 +-- .../node/stats/NodesStatsRequestBuilder.java | 6 +-- .../BroadcastPingRequestBuilder.java | 6 +-- .../ReplicationPingRequestBuilder.java | 6 +-- .../ping/single/SinglePingRequestBuilder.java | 6 +-- .../reroute/ClusterRerouteRequestBuilder.java | 6 +-- .../ClusterUpdateSettingsRequestBuilder.java | 6 +-- .../state/ClusterStateRequestBuilder.java | 6 +-- .../support/BaseClusterRequestBuilder.java | 8 +--- .../alias/IndicesAliasesRequestBuilder.java | 6 +-- .../analyze/AnalyzeRequestBuilder.java | 6 +-- .../ClearIndicesCacheRequestBuilder.java | 6 +-- .../close/CloseIndexRequestBuilder.java | 6 +-- .../create/CreateIndexRequestBuilder.java | 6 +-- .../delete/DeleteIndexRequestBuilder.java | 6 +-- .../exists/IndicesExistsRequestBuilder.java | 6 +-- .../indices/flush/FlushRequestBuilder.java | 6 +-- .../GatewaySnapshotRequestBuilder.java | 6 +-- .../delete/DeleteMappingRequestBuilder.java | 6 +-- .../mapping/put/PutMappingRequestBuilder.java | 6 +-- .../indices/open/OpenIndexRequestBuilder.java | 6 +-- .../optimize/OptimizeRequestBuilder.java | 8 +--- .../refresh/RefreshRequestBuilder.java | 8 +--- .../IndicesSegmentsRequestBuilder.java | 6 +-- .../UpdateSettingsRequestBuilder.java | 6 +-- .../stats/IndicesStatsRequestBuilder.java | 6 +-- .../status/IndicesStatusRequestBuilder.java | 6 +-- .../support/BaseIndicesRequestBuilder.java | 8 +--- .../DeleteIndexTemplateRequestBuilder.java | 6 +-- .../put/PutIndexTemplateRequestBuilder.java | 6 +-- .../query/ValidateQueryRequestBuilder.java | 6 +-- .../action/bulk/BulkRequestBuilder.java | 12 ++---- .../action/count/CountRequestBuilder.java | 8 +--- .../action/delete/DeleteRequestBuilder.java | 8 +--- .../DeleteByQueryRequestBuilder.java | 6 +-- .../action/get/GetRequestBuilder.java | 8 +--- .../action/get/MultiGetRequestBuilder.java | 8 +--- .../action/index/IndexRequestBuilder.java | 8 +--- .../mlt/MoreLikeThisRequestBuilder.java | 5 +-- .../percolate/PercolateRequestBuilder.java | 6 +-- .../action/search/SearchRequestBuilder.java | 8 +--- .../search/SearchScrollRequestBuilder.java | 9 +--- .../action/support/BaseRequestBuilder.java | 9 +--- .../action/update/UpdateRequestBuilder.java | 6 +-- .../java/org/elasticsearch/client/Client.java | 29 +++++-------- .../client/ClusterAdminClient.java | 23 +++++----- .../client/IndicesAdminClient.java | 42 +++++++++---------- .../client/support/AbstractClient.java | 24 +++++------ .../support/AbstractClusterAdminClient.java | 22 +++++----- .../support/AbstractIndicesAdminClient.java | 42 +++++++++---------- .../indices/ttl/IndicesTTLService.java | 2 +- .../search/child/ChildSearchBenchmark.java | 2 +- .../facet/HistogramFacetSearchBenchmark.java | 2 +- .../QueryFilterFacetSearchBenchmark.java | 2 +- .../facet/TermsFacetSearchBenchmark.java | 2 +- .../stress/SingleThreadBulkStress.java | 2 +- .../indices/analyze/AnalyzeActionTests.java | 2 +- .../percolator/SimplePercolatorTests.java | 2 +- .../ClusterAndIndexReaderOnlyTests.java | 6 +-- .../fullrestart/FullRestartStressTest.java | 2 +- .../indexing/BulkIndexingStressTest.java | 2 +- .../stress/search1/ParentChildStressTest.java | 2 +- .../stress/search1/Search1StressTest.java | 2 +- 67 files changed, 198 insertions(+), 335 deletions(-) rename src/main/java/org/elasticsearch/{client => }/action/ActionRequestBuilder.java (81%) rename src/main/java/org/elasticsearch/{client => }/action/admin/cluster/health/ClusterHealthRequestBuilder.java (89%) rename src/main/java/org/elasticsearch/{client => }/action/admin/cluster/node/info/NodesInfoRequestBuilder.java (91%) rename src/main/java/org/elasticsearch/{client => }/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java (86%) rename src/main/java/org/elasticsearch/{client => }/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java (88%) rename src/main/java/org/elasticsearch/{client => }/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java (90%) rename src/main/java/org/elasticsearch/{client => }/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java (86%) rename src/main/java/org/elasticsearch/{client => }/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java (86%) rename src/main/java/org/elasticsearch/{client => }/action/admin/cluster/ping/single/SinglePingRequestBuilder.java (86%) rename src/main/java/org/elasticsearch/{client => }/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java (86%) rename src/main/java/org/elasticsearch/{client => }/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java (91%) rename src/main/java/org/elasticsearch/{client => }/action/admin/cluster/state/ClusterStateRequestBuilder.java (91%) rename src/main/java/org/elasticsearch/{client => }/action/admin/cluster/support/BaseClusterRequestBuilder.java (85%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/alias/IndicesAliasesRequestBuilder.java (92%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/analyze/AnalyzeRequestBuilder.java (90%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java (89%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/close/CloseIndexRequestBuilder.java (89%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/create/CreateIndexRequestBuilder.java (94%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/delete/DeleteIndexRequestBuilder.java (89%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/exists/IndicesExistsRequestBuilder.java (83%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/flush/FlushRequestBuilder.java (85%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java (81%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/mapping/delete/DeleteMappingRequestBuilder.java (85%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/mapping/put/PutMappingRequestBuilder.java (92%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/open/OpenIndexRequestBuilder.java (89%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/optimize/OptimizeRequestBuilder.java (92%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/refresh/RefreshRequestBuilder.java (89%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java (82%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/settings/UpdateSettingsRequestBuilder.java (88%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/stats/IndicesStatsRequestBuilder.java (92%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/status/IndicesStatusRequestBuilder.java (86%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/support/BaseIndicesRequestBuilder.java (85%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java (88%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java (94%) rename src/main/java/org/elasticsearch/{client => }/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java (86%) rename src/main/java/org/elasticsearch/{client => }/action/bulk/BulkRequestBuilder.java (92%) rename src/main/java/org/elasticsearch/{client => }/action/count/CountRequestBuilder.java (94%) rename src/main/java/org/elasticsearch/{client => }/action/delete/DeleteRequestBuilder.java (94%) rename src/main/java/org/elasticsearch/{client => }/action/deletebyquery/DeleteByQueryRequestBuilder.java (95%) rename src/main/java/org/elasticsearch/{client => }/action/get/GetRequestBuilder.java (94%) rename src/main/java/org/elasticsearch/{client => }/action/get/MultiGetRequestBuilder.java (93%) rename src/main/java/org/elasticsearch/{client => }/action/index/IndexRequestBuilder.java (97%) rename src/main/java/org/elasticsearch/{client => }/action/mlt/MoreLikeThisRequestBuilder.java (97%) rename src/main/java/org/elasticsearch/{client => }/action/percolate/PercolateRequestBuilder.java (95%) rename src/main/java/org/elasticsearch/{client => }/action/search/SearchRequestBuilder.java (98%) rename src/main/java/org/elasticsearch/{client => }/action/search/SearchScrollRequestBuilder.java (89%) rename src/main/java/org/elasticsearch/{client => }/action/support/BaseRequestBuilder.java (82%) rename src/main/java/org/elasticsearch/{client => }/action/update/UpdateRequestBuilder.java (95%) diff --git a/src/main/java/org/elasticsearch/client/action/ActionRequestBuilder.java b/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java similarity index 81% rename from src/main/java/org/elasticsearch/client/action/ActionRequestBuilder.java rename to src/main/java/org/elasticsearch/action/ActionRequestBuilder.java index 55de41a6c5c..a40663ef910 100644 --- a/src/main/java/org/elasticsearch/client/action/ActionRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java @@ -17,12 +17,7 @@ * under the License. */ -package org.elasticsearch.client.action; - -import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; -import org.elasticsearch.action.ActionResponse; -import org.elasticsearch.action.ListenableActionFuture; +package org.elasticsearch.action; /** * diff --git a/src/main/java/org/elasticsearch/client/action/admin/cluster/health/ClusterHealthRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java similarity index 89% rename from src/main/java/org/elasticsearch/client/action/admin/cluster/health/ClusterHealthRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java index 00dd52a3df5..df62b48a564 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/cluster/health/ClusterHealthRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java @@ -17,14 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.cluster.health; +package org.elasticsearch.action.admin.cluster.health; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest; -import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; -import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; +import org.elasticsearch.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/src/main/java/org/elasticsearch/client/action/admin/cluster/node/info/NodesInfoRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java similarity index 91% rename from src/main/java/org/elasticsearch/client/action/admin/cluster/node/info/NodesInfoRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java index aad47e0ee4d..87723b48020 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/cluster/node/info/NodesInfoRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.cluster.node.info; +package org.elasticsearch.action.admin.cluster.node.info; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest; -import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; +import org.elasticsearch.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder; /** * diff --git a/src/main/java/org/elasticsearch/client/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java similarity index 86% rename from src/main/java/org/elasticsearch/client/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java index d8ddb9a71b4..bf06fbaf8bc 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/restart/NodesRestartRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.cluster.node.restart; +package org.elasticsearch.action.admin.cluster.node.restart; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.cluster.node.restart.NodesRestartRequest; -import org.elasticsearch.action.admin.cluster.node.restart.NodesRestartResponse; +import org.elasticsearch.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/src/main/java/org/elasticsearch/client/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java similarity index 88% rename from src/main/java/org/elasticsearch/client/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java index 2c2ba568869..9a1b7514022 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/NodesShutdownRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.cluster.node.shutdown; +package org.elasticsearch.action.admin.cluster.node.shutdown; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownRequest; -import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownResponse; +import org.elasticsearch.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/src/main/java/org/elasticsearch/client/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java similarity index 90% rename from src/main/java/org/elasticsearch/client/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java index 074d0647a8f..d5724bc7947 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.cluster.node.stats; +package org.elasticsearch.action.admin.cluster.node.stats; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsRequest; -import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse; +import org.elasticsearch.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder; /** * diff --git a/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java similarity index 86% rename from src/main/java/org/elasticsearch/client/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java index e0e63be6a05..e04703c49e7 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/ping/broadcast/BroadcastPingRequestBuilder.java @@ -17,14 +17,12 @@ * under the License. */ -package org.elasticsearch.client.action.admin.cluster.ping.broadcast; +package org.elasticsearch.action.admin.cluster.ping.broadcast; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingRequest; -import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingResponse; +import org.elasticsearch.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder; /** * diff --git a/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java similarity index 86% rename from src/main/java/org/elasticsearch/client/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java index 624b62993ac..c3151391caa 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/ReplicationPingRequestBuilder.java @@ -17,14 +17,12 @@ * under the License. */ -package org.elasticsearch.client.action.admin.cluster.ping.replication; +package org.elasticsearch.action.admin.cluster.ping.replication; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingRequest; -import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingResponse; +import org.elasticsearch.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.action.support.replication.ReplicationType; import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/single/SinglePingRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/SinglePingRequestBuilder.java similarity index 86% rename from src/main/java/org/elasticsearch/client/action/admin/cluster/ping/single/SinglePingRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/cluster/ping/single/SinglePingRequestBuilder.java index da73bffbc5b..ffd70b03e3c 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/cluster/ping/single/SinglePingRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/ping/single/SinglePingRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.cluster.ping.single; +package org.elasticsearch.action.admin.cluster.ping.single; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.cluster.ping.single.SinglePingRequest; -import org.elasticsearch.action.admin.cluster.ping.single.SinglePingResponse; +import org.elasticsearch.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder; /** * diff --git a/src/main/java/org/elasticsearch/client/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java similarity index 86% rename from src/main/java/org/elasticsearch/client/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java index 50b0702b879..0748bedb1e8 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.cluster.reroute; +package org.elasticsearch.action.admin.cluster.reroute; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteRequest; -import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteResponse; +import org.elasticsearch.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/src/main/java/org/elasticsearch/client/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java similarity index 91% rename from src/main/java/org/elasticsearch/client/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java index d34b59c7334..c343d836460 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.cluster.settings; +package org.elasticsearch.action.admin.cluster.settings; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest; -import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse; +import org.elasticsearch.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; diff --git a/src/main/java/org/elasticsearch/client/action/admin/cluster/state/ClusterStateRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java similarity index 91% rename from src/main/java/org/elasticsearch/client/action/admin/cluster/state/ClusterStateRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java index c8cb3c0ffd8..bf5f997bd8b 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/cluster/state/ClusterStateRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.cluster.state; +package org.elasticsearch.action.admin.cluster.state; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest; -import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; +import org.elasticsearch.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.action.admin.cluster.support.BaseClusterRequestBuilder; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/src/main/java/org/elasticsearch/client/action/admin/cluster/support/BaseClusterRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/cluster/support/BaseClusterRequestBuilder.java similarity index 85% rename from src/main/java/org/elasticsearch/client/action/admin/cluster/support/BaseClusterRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/cluster/support/BaseClusterRequestBuilder.java index c73ea90416c..1318a7cb398 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/cluster/support/BaseClusterRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/support/BaseClusterRequestBuilder.java @@ -17,15 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.cluster.support; +package org.elasticsearch.action.admin.cluster.support; -import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; -import org.elasticsearch.action.ActionResponse; -import org.elasticsearch.action.ListenableActionFuture; +import org.elasticsearch.action.*; import org.elasticsearch.action.support.PlainListenableActionFuture; import org.elasticsearch.client.ClusterAdminClient; -import org.elasticsearch.client.action.ActionRequestBuilder; import org.elasticsearch.client.internal.InternalClusterAdminClient; /** diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/alias/IndicesAliasesRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java similarity index 92% rename from src/main/java/org/elasticsearch/client/action/admin/indices/alias/IndicesAliasesRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java index 96d82314681..99e7ceefca9 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/alias/IndicesAliasesRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.alias; +package org.elasticsearch.action.admin.indices.alias; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest; -import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.cluster.metadata.AliasAction; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.query.FilterBuilder; diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/analyze/AnalyzeRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java similarity index 90% rename from src/main/java/org/elasticsearch/client/action/admin/indices/analyze/AnalyzeRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java index 0753879ae4a..8fa274268f9 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/analyze/AnalyzeRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.analyze; +package org.elasticsearch.action.admin.indices.analyze; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequest; -import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; /** * diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java similarity index 89% rename from src/main/java/org/elasticsearch/client/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java index 448ed2b38a6..5fa2eaa74b9 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequestBuilder.java @@ -17,14 +17,12 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.cache.clear; +package org.elasticsearch.action.admin.indices.cache.clear; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheRequest; -import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; /** * diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/close/CloseIndexRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java similarity index 89% rename from src/main/java/org/elasticsearch/client/action/admin/indices/close/CloseIndexRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java index 15a7863442a..656c656b38e 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/close/CloseIndexRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.close; +package org.elasticsearch.action.admin.indices.close; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.close.CloseIndexRequest; -import org.elasticsearch.action.admin.indices.close.CloseIndexResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/create/CreateIndexRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java similarity index 94% rename from src/main/java/org/elasticsearch/client/action/admin/indices/create/CreateIndexRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java index 75a14c30c4b..0af6832f6e7 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/create/CreateIndexRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.create; +package org.elasticsearch.action.admin.indices.create; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; -import org.elasticsearch.action.admin.indices.create.CreateIndexResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/delete/DeleteIndexRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java similarity index 89% rename from src/main/java/org/elasticsearch/client/action/admin/indices/delete/DeleteIndexRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java index 432132e4633..510eed6f779 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/delete/DeleteIndexRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.delete; +package org.elasticsearch.action.admin.indices.delete; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; -import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/exists/IndicesExistsRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsRequestBuilder.java similarity index 83% rename from src/main/java/org/elasticsearch/client/action/admin/indices/exists/IndicesExistsRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsRequestBuilder.java index 494c36e2228..5385a7b4b30 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/exists/IndicesExistsRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/exists/IndicesExistsRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.exists; +package org.elasticsearch.action.admin.indices.exists; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.exists.IndicesExistsRequest; -import org.elasticsearch.action.admin.indices.exists.IndicesExistsResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; /** * diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/flush/FlushRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java similarity index 85% rename from src/main/java/org/elasticsearch/client/action/admin/indices/flush/FlushRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java index 5de79176965..db773010eed 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/flush/FlushRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.flush; +package org.elasticsearch.action.admin.indices.flush; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.flush.FlushRequest; -import org.elasticsearch.action.admin.indices.flush.FlushResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; /** * diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java similarity index 81% rename from src/main/java/org/elasticsearch/client/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java index 0302333ea8c..8e5759433e9 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.gateway.snapshot; +package org.elasticsearch.action.admin.indices.gateway.snapshot; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotRequest; -import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; /** * diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/delete/DeleteMappingRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingRequestBuilder.java similarity index 85% rename from src/main/java/org/elasticsearch/client/action/admin/indices/mapping/delete/DeleteMappingRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingRequestBuilder.java index 05bc9818be1..c3f0739da1d 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/delete/DeleteMappingRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/mapping/delete/DeleteMappingRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.mapping.delete; +package org.elasticsearch.action.admin.indices.mapping.delete; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.mapping.delete.DeleteMappingRequest; -import org.elasticsearch.action.admin.indices.mapping.delete.DeleteMappingResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/put/PutMappingRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java similarity index 92% rename from src/main/java/org/elasticsearch/client/action/admin/indices/mapping/put/PutMappingRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java index c4cac43cb8f..76301b5a9a2 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/mapping/put/PutMappingRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.mapping.put; +package org.elasticsearch.action.admin.indices.mapping.put; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest; -import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.common.Required; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/open/OpenIndexRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java similarity index 89% rename from src/main/java/org/elasticsearch/client/action/admin/indices/open/OpenIndexRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java index 0a4299b7b6f..64f425dfeb8 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/open/OpenIndexRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.open; +package org.elasticsearch.action.admin.indices.open; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.open.OpenIndexRequest; -import org.elasticsearch.action.admin.indices.open.OpenIndexResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/optimize/OptimizeRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequestBuilder.java similarity index 92% rename from src/main/java/org/elasticsearch/client/action/admin/indices/optimize/OptimizeRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequestBuilder.java index 5ded31f388d..ed8b4d3ba18 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/optimize/OptimizeRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequestBuilder.java @@ -17,14 +17,12 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.optimize; +package org.elasticsearch.action.admin.indices.optimize; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.optimize.OptimizeRequest; -import org.elasticsearch.action.admin.indices.optimize.OptimizeResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; /** * A request to optimize one or more indices. In order to optimize on all the indices, pass an empty array or @@ -35,8 +33,6 @@ import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestB *

*

{@link #setMaxNumSegments(int)} allows to control the number of segments to optimize down to. By default, will * cause the optimize process to optimize down to half the configured number of segments. - * - * */ public class OptimizeRequestBuilder extends BaseIndicesRequestBuilder { diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/refresh/RefreshRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java similarity index 89% rename from src/main/java/org/elasticsearch/client/action/admin/indices/refresh/RefreshRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java index b0e33065bb0..228964cd85d 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/refresh/RefreshRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequestBuilder.java @@ -17,21 +17,17 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.refresh; +package org.elasticsearch.action.admin.indices.refresh; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; -import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; /** * A refresh request making all operations performed since the last refresh available for search. The (near) real-time * capabilities depends on the index engine used. For example, the robin one requires refresh to be called, but by * default a refresh is scheduled periodically. - * - * */ public class RefreshRequestBuilder extends BaseIndicesRequestBuilder { diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java similarity index 82% rename from src/main/java/org/elasticsearch/client/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java index 8c8214e30eb..6a511f2e725 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.segments; +package org.elasticsearch.action.admin.indices.segments; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.segments.IndicesSegmentResponse; -import org.elasticsearch.action.admin.indices.segments.IndicesSegmentsRequest; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; /** * diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/settings/UpdateSettingsRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/settings/UpdateSettingsRequestBuilder.java similarity index 88% rename from src/main/java/org/elasticsearch/client/action/admin/indices/settings/UpdateSettingsRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/settings/UpdateSettingsRequestBuilder.java index c420cfac3b4..5d86f35b33d 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/settings/UpdateSettingsRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/settings/UpdateSettingsRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.settings; +package org.elasticsearch.action.admin.indices.settings; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.settings.UpdateSettingsRequest; -import org.elasticsearch.action.admin.indices.settings.UpdateSettingsResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.common.settings.Settings; import java.util.Map; diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/stats/IndicesStatsRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java similarity index 92% rename from src/main/java/org/elasticsearch/client/action/admin/indices/stats/IndicesStatsRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java index 5a894b4fc28..b44a78faa0b 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/stats/IndicesStatsRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.stats; +package org.elasticsearch.action.admin.indices.stats; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.stats.IndicesStats; -import org.elasticsearch.action.admin.indices.stats.IndicesStatsRequest; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; /** * A request to get indices level stats. Allow to enable different stats to be returned. diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/status/IndicesStatusRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusRequestBuilder.java similarity index 86% rename from src/main/java/org/elasticsearch/client/action/admin/indices/status/IndicesStatusRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusRequestBuilder.java index 9b01f8fc75d..4540e4a7fd7 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/status/IndicesStatusRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/status/IndicesStatusRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.status; +package org.elasticsearch.action.admin.indices.status; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.status.IndicesStatusRequest; -import org.elasticsearch.action.admin.indices.status.IndicesStatusResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; /** * diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/support/BaseIndicesRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/support/BaseIndicesRequestBuilder.java similarity index 85% rename from src/main/java/org/elasticsearch/client/action/admin/indices/support/BaseIndicesRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/support/BaseIndicesRequestBuilder.java index b15d1e17028..30462a903e9 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/support/BaseIndicesRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/support/BaseIndicesRequestBuilder.java @@ -17,15 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.support; +package org.elasticsearch.action.admin.indices.support; -import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; -import org.elasticsearch.action.ActionResponse; -import org.elasticsearch.action.ListenableActionFuture; +import org.elasticsearch.action.*; import org.elasticsearch.action.support.PlainListenableActionFuture; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.ActionRequestBuilder; import org.elasticsearch.client.internal.InternalIndicesAdminClient; /** diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java similarity index 88% rename from src/main/java/org/elasticsearch/client/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java index 92a34a23599..d4c8c14d1a0 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.template.delete; +package org.elasticsearch.action.admin.indices.template.delete; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest; -import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.common.unit.TimeValue; /** diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java similarity index 94% rename from src/main/java/org/elasticsearch/client/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java index 16c71e86687..6c1c7a737cd 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.admin.indices.template.put; +package org.elasticsearch.action.admin.indices.template.put; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest; -import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/src/main/java/org/elasticsearch/client/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java similarity index 86% rename from src/main/java/org/elasticsearch/client/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java rename to src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java index 65c3399a2af..02982e685fe 100644 --- a/src/main/java/org/elasticsearch/client/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequestBuilder.java @@ -1,11 +1,9 @@ -package org.elasticsearch.client.action.admin.indices.validate.query; +package org.elasticsearch.action.admin.indices.validate.query; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequest; -import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryResponse; +import org.elasticsearch.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.client.IndicesAdminClient; -import org.elasticsearch.client.action.admin.indices.support.BaseIndicesRequestBuilder; import org.elasticsearch.index.query.QueryBuilder; /** diff --git a/src/main/java/org/elasticsearch/client/action/bulk/BulkRequestBuilder.java b/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java similarity index 92% rename from src/main/java/org/elasticsearch/client/action/bulk/BulkRequestBuilder.java rename to src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java index ac7ec8ef1b9..0013d039104 100644 --- a/src/main/java/org/elasticsearch/client/action/bulk/BulkRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/bulk/BulkRequestBuilder.java @@ -17,26 +17,22 @@ * under the License. */ -package org.elasticsearch.client.action.bulk; +package org.elasticsearch.action.bulk; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.WriteConsistencyLevel; -import org.elasticsearch.action.bulk.BulkRequest; -import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.delete.DeleteRequest; +import org.elasticsearch.action.delete.DeleteRequestBuilder; import org.elasticsearch.action.index.IndexRequest; +import org.elasticsearch.action.index.IndexRequestBuilder; +import org.elasticsearch.action.support.BaseRequestBuilder; import org.elasticsearch.action.support.replication.ReplicationType; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.delete.DeleteRequestBuilder; -import org.elasticsearch.client.action.index.IndexRequestBuilder; -import org.elasticsearch.client.action.support.BaseRequestBuilder; import org.elasticsearch.common.Nullable; /** * 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 BaseRequestBuilder { diff --git a/src/main/java/org/elasticsearch/client/action/count/CountRequestBuilder.java b/src/main/java/org/elasticsearch/action/count/CountRequestBuilder.java similarity index 94% rename from src/main/java/org/elasticsearch/client/action/count/CountRequestBuilder.java rename to src/main/java/org/elasticsearch/action/count/CountRequestBuilder.java index d3d041a286b..34f79e7e38f 100644 --- a/src/main/java/org/elasticsearch/client/action/count/CountRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/count/CountRequestBuilder.java @@ -17,20 +17,16 @@ * under the License. */ -package org.elasticsearch.client.action.count; +package org.elasticsearch.action.count; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.count.CountRequest; -import org.elasticsearch.action.count.CountResponse; +import org.elasticsearch.action.support.BaseRequestBuilder; import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.support.BaseRequestBuilder; import org.elasticsearch.index.query.QueryBuilder; /** * A count action request builder. - * - * */ public class CountRequestBuilder extends BaseRequestBuilder { diff --git a/src/main/java/org/elasticsearch/client/action/delete/DeleteRequestBuilder.java b/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java similarity index 94% rename from src/main/java/org/elasticsearch/client/action/delete/DeleteRequestBuilder.java rename to src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java index 647267c2a00..c2bffc94d62 100644 --- a/src/main/java/org/elasticsearch/client/action/delete/DeleteRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/delete/DeleteRequestBuilder.java @@ -17,22 +17,18 @@ * under the License. */ -package org.elasticsearch.client.action.delete; +package org.elasticsearch.action.delete; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.WriteConsistencyLevel; -import org.elasticsearch.action.delete.DeleteRequest; -import org.elasticsearch.action.delete.DeleteResponse; +import org.elasticsearch.action.support.BaseRequestBuilder; import org.elasticsearch.action.support.replication.ReplicationType; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.support.BaseRequestBuilder; import org.elasticsearch.common.Nullable; import org.elasticsearch.index.VersionType; /** * A delete document action request builder. - * - * */ public class DeleteRequestBuilder extends BaseRequestBuilder { diff --git a/src/main/java/org/elasticsearch/client/action/deletebyquery/DeleteByQueryRequestBuilder.java b/src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryRequestBuilder.java similarity index 95% rename from src/main/java/org/elasticsearch/client/action/deletebyquery/DeleteByQueryRequestBuilder.java rename to src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryRequestBuilder.java index 3cc32a8510b..60e19655455 100644 --- a/src/main/java/org/elasticsearch/client/action/deletebyquery/DeleteByQueryRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/deletebyquery/DeleteByQueryRequestBuilder.java @@ -17,15 +17,13 @@ * under the License. */ -package org.elasticsearch.client.action.deletebyquery; +package org.elasticsearch.action.deletebyquery; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.WriteConsistencyLevel; -import org.elasticsearch.action.deletebyquery.DeleteByQueryRequest; -import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse; +import org.elasticsearch.action.support.BaseRequestBuilder; import org.elasticsearch.action.support.replication.ReplicationType; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.support.BaseRequestBuilder; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.QueryBuilder; diff --git a/src/main/java/org/elasticsearch/client/action/get/GetRequestBuilder.java b/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java similarity index 94% rename from src/main/java/org/elasticsearch/client/action/get/GetRequestBuilder.java rename to src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java index 983de0780bb..e61c3e344b0 100644 --- a/src/main/java/org/elasticsearch/client/action/get/GetRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/get/GetRequestBuilder.java @@ -17,19 +17,15 @@ * under the License. */ -package org.elasticsearch.client.action.get; +package org.elasticsearch.action.get; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.get.GetRequest; -import org.elasticsearch.action.get.GetResponse; +import org.elasticsearch.action.support.BaseRequestBuilder; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.support.BaseRequestBuilder; import org.elasticsearch.common.Nullable; /** * A get document action request builder. - * - * */ public class GetRequestBuilder extends BaseRequestBuilder { diff --git a/src/main/java/org/elasticsearch/client/action/get/MultiGetRequestBuilder.java b/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java similarity index 93% rename from src/main/java/org/elasticsearch/client/action/get/MultiGetRequestBuilder.java rename to src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java index 6e73f5e316c..39fe159d41a 100644 --- a/src/main/java/org/elasticsearch/client/action/get/MultiGetRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/get/MultiGetRequestBuilder.java @@ -17,19 +17,15 @@ * under the License. */ -package org.elasticsearch.client.action.get; +package org.elasticsearch.action.get; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.get.MultiGetRequest; -import org.elasticsearch.action.get.MultiGetResponse; +import org.elasticsearch.action.support.BaseRequestBuilder; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.support.BaseRequestBuilder; import org.elasticsearch.common.Nullable; /** * A multi get document action request builder. - * - * */ public class MultiGetRequestBuilder extends BaseRequestBuilder { diff --git a/src/main/java/org/elasticsearch/client/action/index/IndexRequestBuilder.java b/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java similarity index 97% rename from src/main/java/org/elasticsearch/client/action/index/IndexRequestBuilder.java rename to src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java index 98f134c024a..94837d4d5e2 100644 --- a/src/main/java/org/elasticsearch/client/action/index/IndexRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java @@ -17,15 +17,13 @@ * under the License. */ -package org.elasticsearch.client.action.index; +package org.elasticsearch.action.index; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.WriteConsistencyLevel; -import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.action.index.IndexResponse; +import org.elasticsearch.action.support.BaseRequestBuilder; import org.elasticsearch.action.support.replication.ReplicationType; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.support.BaseRequestBuilder; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -36,8 +34,6 @@ import java.util.Map; /** * An index document action request builder. - * - * */ public class IndexRequestBuilder extends BaseRequestBuilder { diff --git a/src/main/java/org/elasticsearch/client/action/mlt/MoreLikeThisRequestBuilder.java b/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequestBuilder.java similarity index 97% rename from src/main/java/org/elasticsearch/client/action/mlt/MoreLikeThisRequestBuilder.java rename to src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequestBuilder.java index 5b24cc2c687..3e34539b3f5 100644 --- a/src/main/java/org/elasticsearch/client/action/mlt/MoreLikeThisRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequestBuilder.java @@ -17,15 +17,14 @@ * under the License. */ -package org.elasticsearch.client.action.mlt; +package org.elasticsearch.action.mlt; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.mlt.MoreLikeThisRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; +import org.elasticsearch.action.support.BaseRequestBuilder; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.support.BaseRequestBuilder; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.Scroll; import org.elasticsearch.search.builder.SearchSourceBuilder; diff --git a/src/main/java/org/elasticsearch/client/action/percolate/PercolateRequestBuilder.java b/src/main/java/org/elasticsearch/action/percolate/PercolateRequestBuilder.java similarity index 95% rename from src/main/java/org/elasticsearch/client/action/percolate/PercolateRequestBuilder.java rename to src/main/java/org/elasticsearch/action/percolate/PercolateRequestBuilder.java index 9770ceecaf9..5d17c4b9437 100644 --- a/src/main/java/org/elasticsearch/client/action/percolate/PercolateRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/percolate/PercolateRequestBuilder.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.client.action.percolate; +package org.elasticsearch.action.percolate; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.percolate.PercolateRequest; -import org.elasticsearch.action.percolate.PercolateResponse; +import org.elasticsearch.action.support.BaseRequestBuilder; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.support.BaseRequestBuilder; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; diff --git a/src/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java b/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java similarity index 98% rename from src/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java rename to src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java index 6428625162c..7a69053243a 100644 --- a/src/main/java/org/elasticsearch/client/action/search/SearchRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java @@ -17,16 +17,12 @@ * under the License. */ -package org.elasticsearch.client.action.search; +package org.elasticsearch.action.search; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.search.SearchOperationThreading; -import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.action.search.SearchType; +import org.elasticsearch.action.support.BaseRequestBuilder; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.support.BaseRequestBuilder; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/src/main/java/org/elasticsearch/client/action/search/SearchScrollRequestBuilder.java b/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java similarity index 89% rename from src/main/java/org/elasticsearch/client/action/search/SearchScrollRequestBuilder.java rename to src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java index 743d3dc4892..4d92029ed56 100644 --- a/src/main/java/org/elasticsearch/client/action/search/SearchScrollRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/search/SearchScrollRequestBuilder.java @@ -17,21 +17,16 @@ * under the License. */ -package org.elasticsearch.client.action.search; +package org.elasticsearch.action.search; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.search.SearchOperationThreading; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.action.search.SearchScrollRequest; +import org.elasticsearch.action.support.BaseRequestBuilder; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.support.BaseRequestBuilder; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.Scroll; /** * A search scroll action request builder. - * - * */ public class SearchScrollRequestBuilder extends BaseRequestBuilder { diff --git a/src/main/java/org/elasticsearch/client/action/support/BaseRequestBuilder.java b/src/main/java/org/elasticsearch/action/support/BaseRequestBuilder.java similarity index 82% rename from src/main/java/org/elasticsearch/client/action/support/BaseRequestBuilder.java rename to src/main/java/org/elasticsearch/action/support/BaseRequestBuilder.java index c16da2f177e..f4a5d1c9a91 100644 --- a/src/main/java/org/elasticsearch/client/action/support/BaseRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/support/BaseRequestBuilder.java @@ -17,15 +17,10 @@ * under the License. */ -package org.elasticsearch.client.action.support; +package org.elasticsearch.action.support; -import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; -import org.elasticsearch.action.ActionResponse; -import org.elasticsearch.action.ListenableActionFuture; -import org.elasticsearch.action.support.PlainListenableActionFuture; +import org.elasticsearch.action.*; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.ActionRequestBuilder; import org.elasticsearch.client.internal.InternalClient; /** diff --git a/src/main/java/org/elasticsearch/client/action/update/UpdateRequestBuilder.java b/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java similarity index 95% rename from src/main/java/org/elasticsearch/client/action/update/UpdateRequestBuilder.java rename to src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java index dd5c4e3e90d..6b19d66ce83 100644 --- a/src/main/java/org/elasticsearch/client/action/update/UpdateRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java @@ -17,15 +17,13 @@ * under the License. */ -package org.elasticsearch.client.action.update; +package org.elasticsearch.action.update; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.WriteConsistencyLevel; +import org.elasticsearch.action.support.BaseRequestBuilder; import org.elasticsearch.action.support.replication.ReplicationType; -import org.elasticsearch.action.update.UpdateRequest; -import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.support.BaseRequestBuilder; import org.elasticsearch.common.unit.TimeValue; import java.util.Map; diff --git a/src/main/java/org/elasticsearch/client/Client.java b/src/main/java/org/elasticsearch/client/Client.java index e72ef413c72..6e019eab6d1 100644 --- a/src/main/java/org/elasticsearch/client/Client.java +++ b/src/main/java/org/elasticsearch/client/Client.java @@ -22,39 +22,30 @@ package org.elasticsearch.client; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.bulk.BulkRequest; +import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.count.CountRequest; +import org.elasticsearch.action.count.CountRequestBuilder; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.action.delete.DeleteRequest; +import org.elasticsearch.action.delete.DeleteRequestBuilder; import org.elasticsearch.action.delete.DeleteResponse; import org.elasticsearch.action.deletebyquery.DeleteByQueryRequest; +import org.elasticsearch.action.deletebyquery.DeleteByQueryRequestBuilder; import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse; -import org.elasticsearch.action.get.GetRequest; -import org.elasticsearch.action.get.GetResponse; -import org.elasticsearch.action.get.MultiGetRequest; -import org.elasticsearch.action.get.MultiGetResponse; +import org.elasticsearch.action.get.*; import org.elasticsearch.action.index.IndexRequest; +import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.mlt.MoreLikeThisRequest; +import org.elasticsearch.action.mlt.MoreLikeThisRequestBuilder; import org.elasticsearch.action.percolate.PercolateRequest; +import org.elasticsearch.action.percolate.PercolateRequestBuilder; import org.elasticsearch.action.percolate.PercolateResponse; -import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.action.search.SearchScrollRequest; +import org.elasticsearch.action.search.*; import org.elasticsearch.action.update.UpdateRequest; +import org.elasticsearch.action.update.UpdateRequestBuilder; import org.elasticsearch.action.update.UpdateResponse; -import org.elasticsearch.client.action.bulk.BulkRequestBuilder; -import org.elasticsearch.client.action.count.CountRequestBuilder; -import org.elasticsearch.client.action.delete.DeleteRequestBuilder; -import org.elasticsearch.client.action.deletebyquery.DeleteByQueryRequestBuilder; -import org.elasticsearch.client.action.get.GetRequestBuilder; -import org.elasticsearch.client.action.get.MultiGetRequestBuilder; -import org.elasticsearch.client.action.index.IndexRequestBuilder; -import org.elasticsearch.client.action.mlt.MoreLikeThisRequestBuilder; -import org.elasticsearch.client.action.percolate.PercolateRequestBuilder; -import org.elasticsearch.client.action.search.SearchRequestBuilder; -import org.elasticsearch.client.action.search.SearchScrollRequestBuilder; -import org.elasticsearch.client.action.update.UpdateRequestBuilder; import org.elasticsearch.common.Nullable; /** diff --git a/src/main/java/org/elasticsearch/client/ClusterAdminClient.java b/src/main/java/org/elasticsearch/client/ClusterAdminClient.java index a56e753bc6d..3784ba2f564 100644 --- a/src/main/java/org/elasticsearch/client/ClusterAdminClient.java +++ b/src/main/java/org/elasticsearch/client/ClusterAdminClient.java @@ -22,43 +22,42 @@ package org.elasticsearch.client; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest; +import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequestBuilder; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest; +import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequestBuilder; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.action.admin.cluster.node.restart.NodesRestartRequest; +import org.elasticsearch.action.admin.cluster.node.restart.NodesRestartRequestBuilder; import org.elasticsearch.action.admin.cluster.node.restart.NodesRestartResponse; import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownRequest; +import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownRequestBuilder; import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownResponse; import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsRequest; +import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsRequestBuilder; import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse; import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingRequest; +import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingRequestBuilder; import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingResponse; import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingRequest; +import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingRequestBuilder; import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingResponse; import org.elasticsearch.action.admin.cluster.ping.single.SinglePingRequest; +import org.elasticsearch.action.admin.cluster.ping.single.SinglePingRequestBuilder; import org.elasticsearch.action.admin.cluster.ping.single.SinglePingResponse; import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteRequest; +import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteRequestBuilder; import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteResponse; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest; +import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequestBuilder; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse; import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest; +import org.elasticsearch.action.admin.cluster.state.ClusterStateRequestBuilder; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; -import org.elasticsearch.client.action.admin.cluster.health.ClusterHealthRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.node.info.NodesInfoRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.node.restart.NodesRestartRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.node.shutdown.NodesShutdownRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.node.stats.NodesStatsRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.ping.broadcast.BroadcastPingRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.ping.replication.ReplicationPingRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.ping.single.SinglePingRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.reroute.ClusterRerouteRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.settings.ClusterUpdateSettingsRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.state.ClusterStateRequestBuilder; /** * Administrative actions/operations against indices. * - * * @see AdminClient#cluster() */ public interface ClusterAdminClient { diff --git a/src/main/java/org/elasticsearch/client/IndicesAdminClient.java b/src/main/java/org/elasticsearch/client/IndicesAdminClient.java index 323de8a8a8a..1ee20f70650 100644 --- a/src/main/java/org/elasticsearch/client/IndicesAdminClient.java +++ b/src/main/java/org/elasticsearch/client/IndicesAdminClient.java @@ -22,68 +22,68 @@ package org.elasticsearch.client; import org.elasticsearch.action.ActionFuture; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest; +import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse; import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequest; +import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequestBuilder; import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse; import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheRequest; +import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheRequestBuilder; import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse; import org.elasticsearch.action.admin.indices.close.CloseIndexRequest; +import org.elasticsearch.action.admin.indices.close.CloseIndexRequestBuilder; import org.elasticsearch.action.admin.indices.close.CloseIndexResponse; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; +import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.action.admin.indices.create.CreateIndexResponse; import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; +import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequestBuilder; import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse; import org.elasticsearch.action.admin.indices.exists.IndicesExistsRequest; +import org.elasticsearch.action.admin.indices.exists.IndicesExistsRequestBuilder; import org.elasticsearch.action.admin.indices.exists.IndicesExistsResponse; import org.elasticsearch.action.admin.indices.flush.FlushRequest; +import org.elasticsearch.action.admin.indices.flush.FlushRequestBuilder; import org.elasticsearch.action.admin.indices.flush.FlushResponse; import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotRequest; +import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotRequestBuilder; import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotResponse; import org.elasticsearch.action.admin.indices.mapping.delete.DeleteMappingRequest; +import org.elasticsearch.action.admin.indices.mapping.delete.DeleteMappingRequestBuilder; import org.elasticsearch.action.admin.indices.mapping.delete.DeleteMappingResponse; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest; +import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; import org.elasticsearch.action.admin.indices.open.OpenIndexRequest; +import org.elasticsearch.action.admin.indices.open.OpenIndexRequestBuilder; import org.elasticsearch.action.admin.indices.open.OpenIndexResponse; import org.elasticsearch.action.admin.indices.optimize.OptimizeRequest; +import org.elasticsearch.action.admin.indices.optimize.OptimizeRequestBuilder; import org.elasticsearch.action.admin.indices.optimize.OptimizeResponse; import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; +import org.elasticsearch.action.admin.indices.refresh.RefreshRequestBuilder; import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; import org.elasticsearch.action.admin.indices.segments.IndicesSegmentResponse; import org.elasticsearch.action.admin.indices.segments.IndicesSegmentsRequest; +import org.elasticsearch.action.admin.indices.segments.IndicesSegmentsRequestBuilder; import org.elasticsearch.action.admin.indices.settings.UpdateSettingsRequest; +import org.elasticsearch.action.admin.indices.settings.UpdateSettingsRequestBuilder; import org.elasticsearch.action.admin.indices.settings.UpdateSettingsResponse; import org.elasticsearch.action.admin.indices.stats.IndicesStats; import org.elasticsearch.action.admin.indices.stats.IndicesStatsRequest; +import org.elasticsearch.action.admin.indices.stats.IndicesStatsRequestBuilder; import org.elasticsearch.action.admin.indices.status.IndicesStatusRequest; +import org.elasticsearch.action.admin.indices.status.IndicesStatusRequestBuilder; import org.elasticsearch.action.admin.indices.status.IndicesStatusResponse; import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest; +import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequestBuilder; import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateResponse; import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest; +import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequestBuilder; import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateResponse; import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequest; +import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequestBuilder; import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryResponse; -import org.elasticsearch.client.action.admin.indices.alias.IndicesAliasesRequestBuilder; -import org.elasticsearch.client.action.admin.indices.analyze.AnalyzeRequestBuilder; -import org.elasticsearch.client.action.admin.indices.cache.clear.ClearIndicesCacheRequestBuilder; -import org.elasticsearch.client.action.admin.indices.close.CloseIndexRequestBuilder; -import org.elasticsearch.client.action.admin.indices.create.CreateIndexRequestBuilder; -import org.elasticsearch.client.action.admin.indices.delete.DeleteIndexRequestBuilder; -import org.elasticsearch.client.action.admin.indices.exists.IndicesExistsRequestBuilder; -import org.elasticsearch.client.action.admin.indices.flush.FlushRequestBuilder; -import org.elasticsearch.client.action.admin.indices.gateway.snapshot.GatewaySnapshotRequestBuilder; -import org.elasticsearch.client.action.admin.indices.mapping.delete.DeleteMappingRequestBuilder; -import org.elasticsearch.client.action.admin.indices.mapping.put.PutMappingRequestBuilder; -import org.elasticsearch.client.action.admin.indices.open.OpenIndexRequestBuilder; -import org.elasticsearch.client.action.admin.indices.optimize.OptimizeRequestBuilder; -import org.elasticsearch.client.action.admin.indices.refresh.RefreshRequestBuilder; -import org.elasticsearch.client.action.admin.indices.segments.IndicesSegmentsRequestBuilder; -import org.elasticsearch.client.action.admin.indices.settings.UpdateSettingsRequestBuilder; -import org.elasticsearch.client.action.admin.indices.stats.IndicesStatsRequestBuilder; -import org.elasticsearch.client.action.admin.indices.status.IndicesStatusRequestBuilder; -import org.elasticsearch.client.action.admin.indices.template.delete.DeleteIndexTemplateRequestBuilder; -import org.elasticsearch.client.action.admin.indices.template.put.PutIndexTemplateRequestBuilder; -import org.elasticsearch.client.action.admin.indices.validate.query.ValidateQueryRequestBuilder; import org.elasticsearch.common.Nullable; /** diff --git a/src/main/java/org/elasticsearch/client/support/AbstractClient.java b/src/main/java/org/elasticsearch/client/support/AbstractClient.java index 4012ad515db..add13aa15b7 100644 --- a/src/main/java/org/elasticsearch/client/support/AbstractClient.java +++ b/src/main/java/org/elasticsearch/client/support/AbstractClient.java @@ -19,18 +19,18 @@ package org.elasticsearch.client.support; -import org.elasticsearch.client.action.bulk.BulkRequestBuilder; -import org.elasticsearch.client.action.count.CountRequestBuilder; -import org.elasticsearch.client.action.delete.DeleteRequestBuilder; -import org.elasticsearch.client.action.deletebyquery.DeleteByQueryRequestBuilder; -import org.elasticsearch.client.action.get.GetRequestBuilder; -import org.elasticsearch.client.action.get.MultiGetRequestBuilder; -import org.elasticsearch.client.action.index.IndexRequestBuilder; -import org.elasticsearch.client.action.mlt.MoreLikeThisRequestBuilder; -import org.elasticsearch.client.action.percolate.PercolateRequestBuilder; -import org.elasticsearch.client.action.search.SearchRequestBuilder; -import org.elasticsearch.client.action.search.SearchScrollRequestBuilder; -import org.elasticsearch.client.action.update.UpdateRequestBuilder; +import org.elasticsearch.action.bulk.BulkRequestBuilder; +import org.elasticsearch.action.count.CountRequestBuilder; +import org.elasticsearch.action.delete.DeleteRequestBuilder; +import org.elasticsearch.action.deletebyquery.DeleteByQueryRequestBuilder; +import org.elasticsearch.action.get.GetRequestBuilder; +import org.elasticsearch.action.get.MultiGetRequestBuilder; +import org.elasticsearch.action.index.IndexRequestBuilder; +import org.elasticsearch.action.mlt.MoreLikeThisRequestBuilder; +import org.elasticsearch.action.percolate.PercolateRequestBuilder; +import org.elasticsearch.action.search.SearchRequestBuilder; +import org.elasticsearch.action.search.SearchScrollRequestBuilder; +import org.elasticsearch.action.update.UpdateRequestBuilder; import org.elasticsearch.client.internal.InternalClient; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/client/support/AbstractClusterAdminClient.java b/src/main/java/org/elasticsearch/client/support/AbstractClusterAdminClient.java index 2475b63c6e9..2fce446801a 100644 --- a/src/main/java/org/elasticsearch/client/support/AbstractClusterAdminClient.java +++ b/src/main/java/org/elasticsearch/client/support/AbstractClusterAdminClient.java @@ -19,17 +19,17 @@ package org.elasticsearch.client.support; -import org.elasticsearch.client.action.admin.cluster.health.ClusterHealthRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.node.info.NodesInfoRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.node.restart.NodesRestartRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.node.shutdown.NodesShutdownRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.node.stats.NodesStatsRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.ping.broadcast.BroadcastPingRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.ping.replication.ReplicationPingRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.ping.single.SinglePingRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.reroute.ClusterRerouteRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.settings.ClusterUpdateSettingsRequestBuilder; -import org.elasticsearch.client.action.admin.cluster.state.ClusterStateRequestBuilder; +import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequestBuilder; +import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequestBuilder; +import org.elasticsearch.action.admin.cluster.node.restart.NodesRestartRequestBuilder; +import org.elasticsearch.action.admin.cluster.node.shutdown.NodesShutdownRequestBuilder; +import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsRequestBuilder; +import org.elasticsearch.action.admin.cluster.ping.broadcast.BroadcastPingRequestBuilder; +import org.elasticsearch.action.admin.cluster.ping.replication.ReplicationPingRequestBuilder; +import org.elasticsearch.action.admin.cluster.ping.single.SinglePingRequestBuilder; +import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteRequestBuilder; +import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequestBuilder; +import org.elasticsearch.action.admin.cluster.state.ClusterStateRequestBuilder; import org.elasticsearch.client.internal.InternalClusterAdminClient; /** diff --git a/src/main/java/org/elasticsearch/client/support/AbstractIndicesAdminClient.java b/src/main/java/org/elasticsearch/client/support/AbstractIndicesAdminClient.java index 04356b9be77..fb81126e924 100644 --- a/src/main/java/org/elasticsearch/client/support/AbstractIndicesAdminClient.java +++ b/src/main/java/org/elasticsearch/client/support/AbstractIndicesAdminClient.java @@ -19,27 +19,27 @@ package org.elasticsearch.client.support; -import org.elasticsearch.client.action.admin.indices.alias.IndicesAliasesRequestBuilder; -import org.elasticsearch.client.action.admin.indices.analyze.AnalyzeRequestBuilder; -import org.elasticsearch.client.action.admin.indices.cache.clear.ClearIndicesCacheRequestBuilder; -import org.elasticsearch.client.action.admin.indices.close.CloseIndexRequestBuilder; -import org.elasticsearch.client.action.admin.indices.create.CreateIndexRequestBuilder; -import org.elasticsearch.client.action.admin.indices.delete.DeleteIndexRequestBuilder; -import org.elasticsearch.client.action.admin.indices.exists.IndicesExistsRequestBuilder; -import org.elasticsearch.client.action.admin.indices.flush.FlushRequestBuilder; -import org.elasticsearch.client.action.admin.indices.gateway.snapshot.GatewaySnapshotRequestBuilder; -import org.elasticsearch.client.action.admin.indices.mapping.delete.DeleteMappingRequestBuilder; -import org.elasticsearch.client.action.admin.indices.mapping.put.PutMappingRequestBuilder; -import org.elasticsearch.client.action.admin.indices.open.OpenIndexRequestBuilder; -import org.elasticsearch.client.action.admin.indices.optimize.OptimizeRequestBuilder; -import org.elasticsearch.client.action.admin.indices.refresh.RefreshRequestBuilder; -import org.elasticsearch.client.action.admin.indices.segments.IndicesSegmentsRequestBuilder; -import org.elasticsearch.client.action.admin.indices.settings.UpdateSettingsRequestBuilder; -import org.elasticsearch.client.action.admin.indices.stats.IndicesStatsRequestBuilder; -import org.elasticsearch.client.action.admin.indices.status.IndicesStatusRequestBuilder; -import org.elasticsearch.client.action.admin.indices.template.delete.DeleteIndexTemplateRequestBuilder; -import org.elasticsearch.client.action.admin.indices.template.put.PutIndexTemplateRequestBuilder; -import org.elasticsearch.client.action.admin.indices.validate.query.ValidateQueryRequestBuilder; +import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder; +import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequestBuilder; +import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheRequestBuilder; +import org.elasticsearch.action.admin.indices.close.CloseIndexRequestBuilder; +import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; +import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequestBuilder; +import org.elasticsearch.action.admin.indices.exists.IndicesExistsRequestBuilder; +import org.elasticsearch.action.admin.indices.flush.FlushRequestBuilder; +import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotRequestBuilder; +import org.elasticsearch.action.admin.indices.mapping.delete.DeleteMappingRequestBuilder; +import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder; +import org.elasticsearch.action.admin.indices.open.OpenIndexRequestBuilder; +import org.elasticsearch.action.admin.indices.optimize.OptimizeRequestBuilder; +import org.elasticsearch.action.admin.indices.refresh.RefreshRequestBuilder; +import org.elasticsearch.action.admin.indices.segments.IndicesSegmentsRequestBuilder; +import org.elasticsearch.action.admin.indices.settings.UpdateSettingsRequestBuilder; +import org.elasticsearch.action.admin.indices.stats.IndicesStatsRequestBuilder; +import org.elasticsearch.action.admin.indices.status.IndicesStatusRequestBuilder; +import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequestBuilder; +import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequestBuilder; +import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequestBuilder; import org.elasticsearch.client.internal.InternalIndicesAdminClient; import org.elasticsearch.common.Nullable; diff --git a/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java b/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java index d4a2b518caa..f79c2088139 100644 --- a/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java +++ b/src/main/java/org/elasticsearch/indices/ttl/IndicesTTLService.java @@ -27,10 +27,10 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.Scorer; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.ActionListener; +import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.bulk.BulkRequestBuilder; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.inject.Inject; diff --git a/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java index 4935e00adbf..864a680bfa7 100644 --- a/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java +++ b/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java @@ -20,11 +20,11 @@ package org.elasticsearch.benchmark.search.child; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; +import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; -import org.elasticsearch.client.action.bulk.BulkRequestBuilder; import org.elasticsearch.common.StopWatch; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.SizeValue; diff --git a/src/test/java/org/elasticsearch/benchmark/search/facet/HistogramFacetSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/facet/HistogramFacetSearchBenchmark.java index d2b33a59474..4912a791d3e 100644 --- a/src/test/java/org/elasticsearch/benchmark/search/facet/HistogramFacetSearchBenchmark.java +++ b/src/test/java/org/elasticsearch/benchmark/search/facet/HistogramFacetSearchBenchmark.java @@ -20,11 +20,11 @@ package org.elasticsearch.benchmark.search.facet; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; +import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; -import org.elasticsearch.client.action.bulk.BulkRequestBuilder; import org.elasticsearch.common.StopWatch; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.SizeValue; diff --git a/src/test/java/org/elasticsearch/benchmark/search/facet/QueryFilterFacetSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/facet/QueryFilterFacetSearchBenchmark.java index 34397a4f290..0cac33d19cd 100644 --- a/src/test/java/org/elasticsearch/benchmark/search/facet/QueryFilterFacetSearchBenchmark.java +++ b/src/test/java/org/elasticsearch/benchmark/search/facet/QueryFilterFacetSearchBenchmark.java @@ -21,12 +21,12 @@ package org.elasticsearch.benchmark.search.facet; import jsr166y.ThreadLocalRandom; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; +import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; -import org.elasticsearch.client.action.bulk.BulkRequestBuilder; import org.elasticsearch.common.StopWatch; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.SizeValue; diff --git a/src/test/java/org/elasticsearch/benchmark/search/facet/TermsFacetSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/facet/TermsFacetSearchBenchmark.java index 3fab24656d3..9444308f89f 100644 --- a/src/test/java/org/elasticsearch/benchmark/search/facet/TermsFacetSearchBenchmark.java +++ b/src/test/java/org/elasticsearch/benchmark/search/facet/TermsFacetSearchBenchmark.java @@ -22,12 +22,12 @@ package org.elasticsearch.benchmark.search.facet; import com.google.common.collect.Lists; import jsr166y.ThreadLocalRandom; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; +import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; -import org.elasticsearch.client.action.bulk.BulkRequestBuilder; import org.elasticsearch.common.RandomStringGenerator; import org.elasticsearch.common.StopWatch; import org.elasticsearch.common.settings.Settings; diff --git a/src/test/java/org/elasticsearch/benchmark/stress/SingleThreadBulkStress.java b/src/test/java/org/elasticsearch/benchmark/stress/SingleThreadBulkStress.java index b1c8ee1c545..e415158ad00 100644 --- a/src/test/java/org/elasticsearch/benchmark/stress/SingleThreadBulkStress.java +++ b/src/test/java/org/elasticsearch/benchmark/stress/SingleThreadBulkStress.java @@ -19,10 +19,10 @@ package org.elasticsearch.benchmark.stress; +import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; -import org.elasticsearch.client.action.bulk.BulkRequestBuilder; import org.elasticsearch.common.StopWatch; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.SizeValue; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java b/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java index 949ac274f56..8eadfffcc8b 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java +++ b/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java @@ -19,9 +19,9 @@ package org.elasticsearch.test.integration.indices.analyze; +import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequestBuilder; import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.admin.indices.analyze.AnalyzeRequestBuilder; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java b/src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java index be720b5693b..11c51abe6c6 100644 --- a/src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java +++ b/src/test/java/org/elasticsearch/test/integration/percolator/SimplePercolatorTests.java @@ -20,11 +20,11 @@ package org.elasticsearch.test.integration.percolator; import org.elasticsearch.action.bulk.BulkItemResponse; +import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.percolate.PercolateResponse; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.bulk.BulkRequestBuilder; import org.elasticsearch.test.integration.AbstractNodesTests; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/src/test/java/org/elasticsearch/test/integration/readonly/ClusterAndIndexReaderOnlyTests.java b/src/test/java/org/elasticsearch/test/integration/readonly/ClusterAndIndexReaderOnlyTests.java index b3a61be9185..2b0b1d3716f 100644 --- a/src/test/java/org/elasticsearch/test/integration/readonly/ClusterAndIndexReaderOnlyTests.java +++ b/src/test/java/org/elasticsearch/test/integration/readonly/ClusterAndIndexReaderOnlyTests.java @@ -19,15 +19,15 @@ package org.elasticsearch.test.integration.readonly; +import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequestBuilder; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse; import org.elasticsearch.action.admin.indices.create.CreateIndexResponse; import org.elasticsearch.action.admin.indices.exists.IndicesExistsResponse; +import org.elasticsearch.action.admin.indices.settings.UpdateSettingsRequestBuilder; import org.elasticsearch.action.admin.indices.settings.UpdateSettingsResponse; +import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.client.Client; -import org.elasticsearch.client.action.admin.cluster.settings.ClusterUpdateSettingsRequestBuilder; -import org.elasticsearch.client.action.admin.indices.settings.UpdateSettingsRequestBuilder; -import org.elasticsearch.client.action.index.IndexRequestBuilder; import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; diff --git a/src/test/java/org/elasticsearch/test/stress/fullrestart/FullRestartStressTest.java b/src/test/java/org/elasticsearch/test/stress/fullrestart/FullRestartStressTest.java index 2a1d7783d45..a9707f8f222 100644 --- a/src/test/java/org/elasticsearch/test/stress/fullrestart/FullRestartStressTest.java +++ b/src/test/java/org/elasticsearch/test/stress/fullrestart/FullRestartStressTest.java @@ -21,10 +21,10 @@ package org.elasticsearch.test.stress.fullrestart; import jsr166y.ThreadLocalRandom; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; +import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Requests; -import org.elasticsearch.client.action.bulk.BulkRequestBuilder; import org.elasticsearch.common.UUID; import org.elasticsearch.common.io.FileSystemUtils; import org.elasticsearch.common.logging.ESLogger; diff --git a/src/test/java/org/elasticsearch/test/stress/indexing/BulkIndexingStressTest.java b/src/test/java/org/elasticsearch/test/stress/indexing/BulkIndexingStressTest.java index c36f0412bfc..3bedcad4a71 100644 --- a/src/test/java/org/elasticsearch/test/stress/indexing/BulkIndexingStressTest.java +++ b/src/test/java/org/elasticsearch/test/stress/indexing/BulkIndexingStressTest.java @@ -20,9 +20,9 @@ package org.elasticsearch.test.stress.indexing; import jsr166y.ThreadLocalRandom; +import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; -import org.elasticsearch.client.action.bulk.BulkRequestBuilder; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.Node; diff --git a/src/test/java/org/elasticsearch/test/stress/search1/ParentChildStressTest.java b/src/test/java/org/elasticsearch/test/stress/search1/ParentChildStressTest.java index 536e760a717..85529e9295d 100644 --- a/src/test/java/org/elasticsearch/test/stress/search1/ParentChildStressTest.java +++ b/src/test/java/org/elasticsearch/test/stress/search1/ParentChildStressTest.java @@ -20,12 +20,12 @@ package org.elasticsearch.test.stress.search1; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; +import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; -import org.elasticsearch.client.action.index.IndexRequestBuilder; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; diff --git a/src/test/java/org/elasticsearch/test/stress/search1/Search1StressTest.java b/src/test/java/org/elasticsearch/test/stress/search1/Search1StressTest.java index 15beece477a..2a7cb103e40 100644 --- a/src/test/java/org/elasticsearch/test/stress/search1/Search1StressTest.java +++ b/src/test/java/org/elasticsearch/test/stress/search1/Search1StressTest.java @@ -20,9 +20,9 @@ package org.elasticsearch.test.stress.search1; import jsr166y.ThreadLocalRandom; +import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; -import org.elasticsearch.client.action.search.SearchRequestBuilder; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings;