diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java index f373689566f1b..aff58a7b32714 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.common.Priority; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -37,7 +37,7 @@ /** * */ -public class ClusterHealthRequest extends MasterNodeReadOperationRequest implements IndicesRequest.Replaceable { +public class ClusterHealthRequest extends MasterNodeReadRequest implements IndicesRequest.Replaceable { private String[] indices; private TimeValue timeout = new TimeValue(30, TimeUnit.SECONDS); diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java index d183ddd865c0f..c4cb95c501b78 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.common.Strings; @@ -37,7 +37,7 @@ /** * */ -public class TransportClusterHealthAction extends TransportMasterNodeReadOperationAction { +public class TransportClusterHealthAction extends TransportMasterNodeReadAction { private final ClusterName clusterName; private final GatewayAllocator gatewayAllocator; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java index 9485395057efd..635be28a646d6 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.cluster.node.hotthreads; -import org.elasticsearch.action.support.nodes.NodeOperationResponse; +import org.elasticsearch.action.support.nodes.BaseNodeResponse; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -28,7 +28,7 @@ /** */ -public class NodeHotThreads extends NodeOperationResponse { +public class NodeHotThreads extends BaseNodeResponse { private String hotThreads; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java index fe092d7dc81bf..f7ab360c59f14 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.cluster.node.hotthreads; import org.elasticsearch.Version; -import org.elasticsearch.action.support.nodes.NodesOperationRequest; +import org.elasticsearch.action.support.nodes.BaseNodesRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.TimeValue; @@ -30,7 +30,7 @@ /** */ -public class NodesHotThreadsRequest extends NodesOperationRequest { +public class NodesHotThreadsRequest extends BaseNodesRequest { int threads = 3; String type = "cpu"; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java index 2b04435eeb45b..22d4795fc9566 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.cluster.node.hotthreads; -import org.elasticsearch.action.support.nodes.NodesOperationResponse; +import org.elasticsearch.action.support.nodes.BaseNodesResponse; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -28,7 +28,7 @@ /** */ -public class NodesHotThreadsResponse extends NodesOperationResponse { +public class NodesHotThreadsResponse extends BaseNodesResponse { NodesHotThreadsResponse() { } diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java index 8b509ef2d941e..a73982e5c0c6d 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java @@ -22,8 +22,8 @@ import com.google.common.collect.Lists; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.nodes.NodeOperationRequest; -import org.elasticsearch.action.support.nodes.TransportNodesOperationAction; +import org.elasticsearch.action.support.nodes.BaseNodeRequest; +import org.elasticsearch.action.support.nodes.TransportNodesAction; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.common.inject.Inject; @@ -41,7 +41,7 @@ /** * */ -public class TransportNodesHotThreadsAction extends TransportNodesOperationAction { +public class TransportNodesHotThreadsAction extends TransportNodesAction { @Inject public TransportNodesHotThreadsAction(Settings settings, ClusterName clusterName, ThreadPool threadPool, @@ -92,7 +92,7 @@ protected boolean accumulateExceptions() { return false; } - static class NodeRequest extends NodeOperationRequest { + static class NodeRequest extends BaseNodeRequest { NodesHotThreadsRequest request; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java index 66904933db4d0..f3c5eb7e1fc16 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java @@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableMap; import org.elasticsearch.Build; import org.elasticsearch.Version; -import org.elasticsearch.action.support.nodes.NodeOperationResponse; +import org.elasticsearch.action.support.nodes.BaseNodeResponse; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; @@ -42,7 +42,7 @@ /** * Node information (static, does not change over time). */ -public class NodeInfo extends NodeOperationResponse { +public class NodeInfo extends BaseNodeResponse { @Nullable private ImmutableMap serviceAttributes; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java index 589471af36dfd..d01167ceecaaf 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.cluster.node.info; -import org.elasticsearch.action.support.nodes.NodesOperationRequest; +import org.elasticsearch.action.support.nodes.BaseNodesRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -28,7 +28,7 @@ /** * A request to get node (cluster) level information. */ -public class NodesInfoRequest extends NodesOperationRequest { +public class NodesInfoRequest extends BaseNodesRequest { private boolean settings = true; private boolean os = true; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java index b7ce109484de0..e872be90142a3 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.cluster.node.info; -import org.elasticsearch.action.support.nodes.NodesOperationResponse; +import org.elasticsearch.action.support.nodes.BaseNodesResponse; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -34,7 +34,7 @@ /** * */ -public class NodesInfoResponse extends NodesOperationResponse implements ToXContent { +public class NodesInfoResponse extends BaseNodesResponse implements ToXContent { public NodesInfoResponse() { } diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java index 29a904fa551ba..74221fc79ed37 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java @@ -20,8 +20,8 @@ package org.elasticsearch.action.admin.cluster.node.info; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.nodes.NodeOperationRequest; -import org.elasticsearch.action.support.nodes.TransportNodesOperationAction; +import org.elasticsearch.action.support.nodes.BaseNodeRequest; +import org.elasticsearch.action.support.nodes.TransportNodesAction; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.common.inject.Inject; @@ -40,7 +40,7 @@ /** * */ -public class TransportNodesInfoAction extends TransportNodesOperationAction { +public class TransportNodesInfoAction extends TransportNodesAction { private final NodeService nodeService; @@ -87,7 +87,7 @@ protected boolean accumulateExceptions() { return false; } - static class NodeInfoRequest extends NodeOperationRequest { + static class NodeInfoRequest extends BaseNodeRequest { NodesInfoRequest request; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java index 87ec019192f5c..c7a6f4615a33c 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java @@ -19,11 +19,9 @@ package org.elasticsearch.action.admin.cluster.node.stats; -import org.elasticsearch.Version; -import org.elasticsearch.action.support.nodes.NodeOperationResponse; +import org.elasticsearch.action.support.nodes.BaseNodeResponse; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContent; @@ -31,7 +29,6 @@ import org.elasticsearch.http.HttpStats; import org.elasticsearch.indices.NodeIndicesStats; import org.elasticsearch.indices.breaker.AllCircuitBreakerStats; -import org.elasticsearch.indices.breaker.CircuitBreakerStats; import org.elasticsearch.monitor.fs.FsStats; import org.elasticsearch.monitor.jvm.JvmStats; import org.elasticsearch.monitor.network.NetworkStats; @@ -46,7 +43,7 @@ /** * Node statistics (dynamic, changes depending on when created). */ -public class NodeStats extends NodeOperationResponse implements ToXContent { +public class NodeStats extends BaseNodeResponse implements ToXContent { private long timestamp; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java index f37208ddd2eff..4fa654e725984 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.cluster.node.stats; import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags; -import org.elasticsearch.action.support.nodes.NodesOperationRequest; +import org.elasticsearch.action.support.nodes.BaseNodesRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -29,7 +29,7 @@ /** * A request to get node (cluster) level stats. */ -public class NodesStatsRequest extends NodesOperationRequest { +public class NodesStatsRequest extends BaseNodesRequest { private CommonStatsFlags indices = new CommonStatsFlags(); private boolean os; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java index 27affe2b8981d..e57fd552d7c54 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.cluster.node.stats; -import org.elasticsearch.action.support.nodes.NodesOperationResponse; +import org.elasticsearch.action.support.nodes.BaseNodesResponse; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +32,7 @@ /** * */ -public class NodesStatsResponse extends NodesOperationResponse implements ToXContent { +public class NodesStatsResponse extends BaseNodesResponse implements ToXContent { NodesStatsResponse() { } diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java index 1f8dea37aae07..d808f859037fb 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java @@ -21,8 +21,8 @@ import com.google.common.collect.Lists; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.nodes.NodeOperationRequest; -import org.elasticsearch.action.support.nodes.TransportNodesOperationAction; +import org.elasticsearch.action.support.nodes.BaseNodeRequest; +import org.elasticsearch.action.support.nodes.TransportNodesAction; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.common.inject.Inject; @@ -40,7 +40,7 @@ /** * */ -public class TransportNodesStatsAction extends TransportNodesOperationAction { +public class TransportNodesStatsAction extends TransportNodesAction { private final NodeService nodeService; @@ -87,7 +87,7 @@ protected boolean accumulateExceptions() { return false; } - static class NodeStatsRequest extends NodeOperationRequest { + static class NodeStatsRequest extends BaseNodeRequest { NodesStatsRequest request; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java index a7c73f32df567..e4c0640083186 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse; @@ -36,7 +36,7 @@ /** * Transport action for unregister repository operation */ -public class TransportDeleteRepositoryAction extends TransportMasterNodeOperationAction { +public class TransportDeleteRepositoryAction extends TransportMasterNodeAction { private final RepositoriesService repositoriesService; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java index 86c999982d152..4f5f99b20729b 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java @@ -19,9 +19,8 @@ package org.elasticsearch.action.admin.cluster.repositories.get; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -33,7 +32,7 @@ /** * Get repository request */ -public class GetRepositoriesRequest extends MasterNodeReadOperationRequest { +public class GetRepositoriesRequest extends MasterNodeReadRequest { private String[] repositories = Strings.EMPTY_ARRAY; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java index 45026f0878642..5c58628dc35e2 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java @@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableList; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -39,7 +39,7 @@ /** * Transport action for get repositories operation */ -public class TransportGetRepositoriesAction extends TransportMasterNodeReadOperationAction { +public class TransportGetRepositoriesAction extends TransportMasterNodeReadAction { @Inject public TransportGetRepositoriesAction(Settings settings, TransportService transportService, ClusterService clusterService, diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java index bde461ccf8a14..a395d9b9ef292 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse; @@ -36,7 +36,7 @@ /** * Transport action for register repository operation */ -public class TransportPutRepositoryAction extends TransportMasterNodeOperationAction { +public class TransportPutRepositoryAction extends TransportMasterNodeAction { private final RepositoriesService repositoriesService; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java index 978738d9f8c0c..ed687ae2bfdfe 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -37,7 +37,7 @@ /** * Transport action for verifying repository operation */ -public class TransportVerifyRepositoryAction extends TransportMasterNodeOperationAction { +public class TransportVerifyRepositoryAction extends TransportMasterNodeAction { private final RepositoriesService repositoriesService; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java index 1d4f0a6185e64..d9829d1e078a9 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.AckedClusterStateUpdateTask; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -38,7 +38,7 @@ /** */ -public class TransportClusterRerouteAction extends TransportMasterNodeOperationAction { +public class TransportClusterRerouteAction extends TransportMasterNodeAction { private final AllocationService allocationService; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java index db872f868fd3c..31375a8912d6f 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java @@ -22,7 +22,7 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.AckedClusterStateUpdateTask; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -49,7 +49,7 @@ /** * */ -public class TransportClusterUpdateSettingsAction extends TransportMasterNodeOperationAction { +public class TransportClusterUpdateSettingsAction extends TransportMasterNodeAction { private final AllocationService allocationService; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java index de8e1fcdfab01..21ecf8a4c4feb 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -32,7 +32,7 @@ /** */ -public class ClusterSearchShardsRequest extends MasterNodeReadOperationRequest implements IndicesRequest.Replaceable { +public class ClusterSearchShardsRequest extends MasterNodeReadRequest implements IndicesRequest.Replaceable { private String[] indices; @Nullable private String routing; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java index 1575f3c61a835..10ef0348e4691 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -42,7 +42,7 @@ /** */ -public class TransportClusterSearchShardsAction extends TransportMasterNodeReadOperationAction { +public class TransportClusterSearchShardsAction extends TransportMasterNodeReadAction { @Inject public TransportClusterSearchShardsAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters) { diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java index 9e8c87bbbaee8..1373eed1507b8 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.MasterNodeOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -60,7 +60,7 @@ *
  • must not contain invalid file name characters {@link org.elasticsearch.common.Strings#INVALID_FILENAME_CHARS}
    • * */ -public class CreateSnapshotRequest extends MasterNodeOperationRequest implements IndicesRequest.Replaceable { +public class CreateSnapshotRequest extends MasterNodeRequest implements IndicesRequest.Replaceable { private String snapshot; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java index 533d077892576..e97633932d1c1 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -37,7 +37,7 @@ /** * Transport action for create snapshot operation */ -public class TransportCreateSnapshotAction extends TransportMasterNodeOperationAction { +public class TransportCreateSnapshotAction extends TransportMasterNodeAction { private final SnapshotsService snapshotsService; @Inject diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java index 5d6c5544184fe..d997786d5fcf9 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.delete; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.support.master.MasterNodeOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -35,7 +35,7 @@ * files that are associated with this particular snapshot. All files that are shared with * at least one other existing snapshot are left intact. */ -public class DeleteSnapshotRequest extends MasterNodeOperationRequest { +public class DeleteSnapshotRequest extends MasterNodeRequest { private String repository; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java index 5b5a31bedded8..97f89c9f64768 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -36,7 +36,7 @@ /** * Transport action for delete snapshot operation */ -public class TransportDeleteSnapshotAction extends TransportMasterNodeOperationAction { +public class TransportDeleteSnapshotAction extends TransportMasterNodeAction { private final SnapshotsService snapshotsService; @Inject diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java index 6b6927b5e0d97..03edadd755be2 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.get; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.support.master.MasterNodeOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +32,7 @@ /** * Get snapshot request */ -public class GetSnapshotsRequest extends MasterNodeOperationRequest { +public class GetSnapshotsRequest extends MasterNodeRequest { public static final String ALL_SNAPSHOTS = "_all"; public static final String CURRENT_SNAPSHOT = "_current"; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java index 9ead855494335..6f48021985755 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java @@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableList; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -39,7 +39,7 @@ /** * Transport Action for get snapshots operation */ -public class TransportGetSnapshotsAction extends TransportMasterNodeOperationAction { +public class TransportGetSnapshotsAction extends TransportMasterNodeAction { private final SnapshotsService snapshotsService; @Inject diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java index 63f595747a1ab..ddb177e273b15 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java @@ -23,7 +23,7 @@ import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.MasterNodeOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -48,7 +48,7 @@ /** * Restore snapshot request */ -public class RestoreSnapshotRequest extends MasterNodeOperationRequest { +public class RestoreSnapshotRequest extends MasterNodeRequest { private String snapshot; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java index 70ab71b6e8f74..205a2d1178b99 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -37,7 +37,7 @@ /** * Transport action for restore snapshot operation */ -public class TransportRestoreSnapshotAction extends TransportMasterNodeOperationAction { +public class TransportRestoreSnapshotAction extends TransportMasterNodeAction { private final RestoreService restoreService; @Inject diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java index 878ca704345b4..1f358915662b3 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.status; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContent; @@ -32,7 +32,7 @@ /** */ -public class SnapshotIndexShardStatus extends BroadcastShardOperationResponse implements ToXContent { +public class SnapshotIndexShardStatus extends BroadcastShardResponse implements ToXContent { private SnapshotIndexShardStage stage = SnapshotIndexShardStage.INIT; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java index c84ad073bd851..b7b2b631b31f7 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.status; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.support.master.MasterNodeOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +32,7 @@ /** * Get snapshot status request */ -public class SnapshotsStatusRequest extends MasterNodeOperationRequest { +public class SnapshotsStatusRequest extends MasterNodeRequest { private String repository = "_all"; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java index b23010e3ecc34..22a1753660e8f 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java @@ -47,7 +47,7 @@ /** * Transport client that collects snapshot shard statuses from data nodes */ -public class TransportNodesSnapshotsStatus extends TransportNodesOperationAction { +public class TransportNodesSnapshotsStatus extends TransportNodesAction { public static final String ACTION_NAME = SnapshotsStatusAction.NAME + "[nodes]"; @@ -128,7 +128,7 @@ protected boolean accumulateExceptions() { return true; } - static class Request extends NodesOperationRequest { + static class Request extends BaseNodesRequest { private SnapshotId[] snapshotIds; @@ -157,7 +157,7 @@ public void writeTo(StreamOutput out) throws IOException { } } - public static class NodesSnapshotStatus extends NodesOperationResponse { + public static class NodesSnapshotStatus extends BaseNodesResponse { private FailedNodeException[] failures; @@ -194,7 +194,7 @@ public void writeTo(StreamOutput out) throws IOException { } - static class NodeRequest extends NodeOperationRequest { + static class NodeRequest extends BaseNodeRequest { private SnapshotId[] snapshotIds; @@ -230,7 +230,7 @@ public void writeTo(StreamOutput out) throws IOException { } } - public static class NodeSnapshotStatus extends NodeOperationResponse { + public static class NodeSnapshotStatus extends BaseNodeResponse { private ImmutableMap> status; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java index edfc9d5fd3277..a38e894e90f0c 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java @@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableMap; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -49,7 +49,7 @@ /** */ -public class TransportSnapshotsStatusAction extends TransportMasterNodeOperationAction { +public class TransportSnapshotsStatusAction extends TransportMasterNodeAction { private final SnapshotsService snapshotsService; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java index 574ed0170f316..4edd26812a092 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java @@ -19,11 +19,10 @@ package org.elasticsearch.action.admin.cluster.state; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -33,7 +32,7 @@ /** * */ -public class ClusterStateRequest extends MasterNodeReadOperationRequest implements IndicesRequest.Replaceable { +public class ClusterStateRequest extends MasterNodeReadRequest implements IndicesRequest.Replaceable { private boolean routingTable = true; private boolean nodes = true; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java index d4d647b99b019..e989b7a5df8c8 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java @@ -22,7 +22,7 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -39,7 +39,7 @@ /** * */ -public class TransportClusterStateAction extends TransportMasterNodeReadOperationAction { +public class TransportClusterStateAction extends TransportMasterNodeReadAction { private final ClusterName clusterName; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java index 24222da8b5a64..d0f91f7e9b908 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.admin.cluster.node.info.NodeInfo; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; import org.elasticsearch.action.admin.indices.stats.ShardStats; -import org.elasticsearch.action.support.nodes.NodeOperationResponse; +import org.elasticsearch.action.support.nodes.BaseNodeResponse; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; @@ -31,7 +31,7 @@ import java.io.IOException; -public class ClusterStatsNodeResponse extends NodeOperationResponse { +public class ClusterStatsNodeResponse extends BaseNodeResponse { private NodeInfo nodeInfo; private NodeStats nodeStats; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java index 3a0c26af10cd9..d33f9acf296b3 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.cluster.stats; -import org.elasticsearch.action.support.nodes.NodesOperationRequest; +import org.elasticsearch.action.support.nodes.BaseNodesRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -28,7 +28,7 @@ /** * A request to get cluster level stats. */ -public class ClusterStatsRequest extends NodesOperationRequest { +public class ClusterStatsRequest extends BaseNodesRequest { ClusterStatsRequest() { } diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java index 3b84e86ea8e1e..aebdf6c31c341 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.cluster.stats; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; -import org.elasticsearch.action.support.nodes.NodesOperationResponse; +import org.elasticsearch.action.support.nodes.BaseNodesResponse; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -37,7 +37,7 @@ /** * */ -public class ClusterStatsResponse extends NodesOperationResponse implements ToXContent { +public class ClusterStatsResponse extends BaseNodesResponse implements ToXContent { ClusterStatsNodes nodesStats; ClusterStatsIndices indicesStats; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java index c2254ed129495..40c1c8b9e7463 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java @@ -26,8 +26,8 @@ import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags; import org.elasticsearch.action.admin.indices.stats.ShardStats; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.nodes.NodeOperationRequest; -import org.elasticsearch.action.support.nodes.TransportNodesOperationAction; +import org.elasticsearch.action.support.nodes.BaseNodeRequest; +import org.elasticsearch.action.support.nodes.TransportNodesAction; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -51,7 +51,7 @@ /** * */ -public class TransportClusterStatsAction extends TransportNodesOperationAction { private static final CommonStatsFlags SHARD_STATS_FLAGS = new CommonStatsFlags(CommonStatsFlags.Flag.Docs, CommonStatsFlags.Flag.Store, @@ -142,7 +142,7 @@ protected boolean accumulateExceptions() { return false; } - static class ClusterStatsNodeRequest extends NodeOperationRequest { + static class ClusterStatsNodeRequest extends BaseNodeRequest { ClusterStatsRequest request; diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java index a7392cc734db2..09f25feb90f49 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java @@ -19,17 +19,12 @@ package org.elasticsearch.action.admin.cluster.tasks; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest; -import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.common.io.stream.StreamOutput; - -import java.io.IOException; +import org.elasticsearch.action.support.master.MasterNodeReadRequest; /** */ -public class PendingClusterTasksRequest extends MasterNodeReadOperationRequest { +public class PendingClusterTasksRequest extends MasterNodeReadRequest { @Override public ActionRequestValidationException validate() { diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java index 40f634cef2c7c..5b7f2a881c3a0 100644 --- a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java +++ b/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -33,7 +33,7 @@ /** */ -public class TransportPendingClusterTasksAction extends TransportMasterNodeReadOperationAction { +public class TransportPendingClusterTasksAction extends TransportMasterNodeReadAction { private final ClusterService clusterService; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java index 2ba0c606614a5..4bedc3e3ee8ef 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse; @@ -42,7 +42,7 @@ /** * Add/remove aliases action */ -public class TransportIndicesAliasesAction extends TransportMasterNodeOperationAction { +public class TransportIndicesAliasesAction extends TransportMasterNodeAction { private final MetaDataIndexAliasesService indexAliasesService; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java index a85202a308c17..29754edeb6f13 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -33,7 +33,7 @@ /** */ -public class TransportAliasesExistAction extends TransportMasterNodeReadOperationAction { +public class TransportAliasesExistAction extends TransportMasterNodeReadAction { @Inject public TransportAliasesExistAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters) { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java index e22e110c942d0..182b86fd149b6 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java @@ -18,11 +18,10 @@ */ package org.elasticsearch.action.admin.indices.alias.get; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.AliasesRequest; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -31,7 +30,7 @@ /** */ -public class GetAliasesRequest extends MasterNodeReadOperationRequest implements AliasesRequest { +public class GetAliasesRequest extends MasterNodeReadRequest implements AliasesRequest { private String[] indices = Strings.EMPTY_ARRAY; private String[] aliases = Strings.EMPTY_ARRAY; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java index 9c1475136a87d..a1088d4fbcd9b 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java @@ -20,7 +20,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -36,7 +36,7 @@ /** */ -public class TransportGetAliasesAction extends TransportMasterNodeReadOperationAction { +public class TransportGetAliasesAction extends TransportMasterNodeReadAction { @Inject public TransportGetAliasesAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters) { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java index 323d886902494..cf471ab0c7738 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java @@ -19,8 +19,7 @@ package org.elasticsearch.action.admin.indices.cache.clear; -import org.elasticsearch.Version; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -29,7 +28,7 @@ /** * */ -public class ClearIndicesCacheRequest extends BroadcastOperationRequest { +public class ClearIndicesCacheRequest extends BroadcastRequest { private boolean filterCache = false; private boolean fieldDataCache = false; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java index a9f094892d49a..cd3355cae8766 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.cache.clear; import org.elasticsearch.action.ShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +32,7 @@ * * */ -public class ClearIndicesCacheResponse extends BroadcastOperationResponse { +public class ClearIndicesCacheResponse extends BroadcastResponse { ClearIndicesCacheResponse() { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java index 46044b7862d99..8aefde1eb70e9 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java @@ -19,8 +19,7 @@ package org.elasticsearch.action.admin.indices.cache.clear; -import org.elasticsearch.Version; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.index.shard.ShardId; @@ -30,7 +29,7 @@ /** * */ -class ShardClearIndicesCacheRequest extends BroadcastShardOperationRequest { +class ShardClearIndicesCacheRequest extends BroadcastShardRequest { private boolean filterCache = false; private boolean fieldDataCache = false; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java index d89bfe088f604..c2931df600349 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java @@ -19,13 +19,13 @@ package org.elasticsearch.action.admin.indices.cache.clear; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.index.shard.ShardId; /** * */ -class ShardClearIndicesCacheResponse extends BroadcastShardOperationResponse { +class ShardClearIndicesCacheResponse extends BroadcastShardResponse { ShardClearIndicesCacheResponse() { } diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java index 8e356f2fd8475..88595c7064709 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction; +import org.elasticsearch.action.support.broadcast.TransportBroadcastAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -47,7 +47,7 @@ /** * Indices clear cache action. */ -public class TransportClearIndicesCacheAction extends TransportBroadcastOperationAction { +public class TransportClearIndicesCacheAction extends TransportBroadcastAction { private final IndicesService indicesService; private final IndicesQueryCache indicesQueryCache; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java index 43343e8389475..26a7fa1ffdffb 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DestructiveOperations; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse; @@ -38,7 +38,7 @@ /** * Close index action */ -public class TransportCloseIndexAction extends TransportMasterNodeOperationAction { +public class TransportCloseIndexAction extends TransportMasterNodeAction { private final MetaDataIndexStateService indexStateService; private final DestructiveOperations destructiveOperations; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java index eca8894e43d51..9c671cc9505dd 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse; @@ -37,7 +37,7 @@ /** * Create index action. */ -public class TransportCreateIndexAction extends TransportMasterNodeOperationAction { +public class TransportCreateIndexAction extends TransportMasterNodeAction { private final MetaDataCreateIndexService createIndexService; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java index c52fc57e6536e..3720f5fe78bb4 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.AcknowledgedRequest; -import org.elasticsearch.action.support.master.MasterNodeOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.TimeValue; @@ -37,7 +37,7 @@ /** * A request to delete an index. Best created with {@link org.elasticsearch.client.Requests#deleteIndexRequest(String)}. */ -public class DeleteIndexRequest extends MasterNodeOperationRequest implements IndicesRequest.Replaceable { +public class DeleteIndexRequest extends MasterNodeRequest implements IndicesRequest.Replaceable { private String[] indices; // Delete index should work by default on both open and closed indices. diff --git a/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java index 4c0de6d799ba5..a25b56eef47ee 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DestructiveOperations; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -38,7 +38,7 @@ /** * Delete index action. */ -public class TransportDeleteIndexAction extends TransportMasterNodeOperationAction { +public class TransportDeleteIndexAction extends TransportMasterNodeAction { private final MetaDataDeleteIndexService deleteIndexService; private final DestructiveOperations destructiveOperations; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java index e104090e96234..e822f45e7f69e 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java @@ -19,11 +19,10 @@ package org.elasticsearch.action.admin.indices.exists.indices; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +31,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class IndicesExistsRequest extends MasterNodeReadOperationRequest implements IndicesRequest.Replaceable { +public class IndicesExistsRequest extends MasterNodeReadRequest implements IndicesRequest.Replaceable { private String[] indices = Strings.EMPTY_ARRAY; private IndicesOptions indicesOptions = IndicesOptions.fromOptions(false, false, true, true); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java index 0c360468e9879..019e8c2f34bed 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -36,7 +36,7 @@ /** * Indices exists action. */ -public class TransportIndicesExistsAction extends TransportMasterNodeReadOperationAction { +public class TransportIndicesExistsAction extends TransportMasterNodeReadAction { @Inject public TransportIndicesExistsAction(Settings settings, TransportService transportService, ClusterService clusterService, diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java index fb617f233d39a..ef1dc16b190ef 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java @@ -20,7 +20,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -35,7 +35,7 @@ /** * Types exists transport action. */ -public class TransportTypesExistsAction extends TransportMasterNodeReadOperationAction { +public class TransportTypesExistsAction extends TransportMasterNodeReadAction { @Inject public TransportTypesExistsAction(Settings settings, TransportService transportService, ClusterService clusterService, diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java index 868f32a7a784f..8eeb7422bf3a8 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java @@ -18,11 +18,10 @@ */ package org.elasticsearch.action.admin.indices.exists.types; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +31,7 @@ /** */ -public class TypesExistsRequest extends MasterNodeReadOperationRequest implements IndicesRequest.Replaceable { +public class TypesExistsRequest extends MasterNodeReadRequest implements IndicesRequest.Replaceable { private String[] indices; private String[] types; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java index e34ac8cfab5c8..57d9455ff9128 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java @@ -19,9 +19,8 @@ package org.elasticsearch.action.admin.indices.flush; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequest; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -38,7 +37,7 @@ * @see org.elasticsearch.client.IndicesAdminClient#flush(FlushRequest) * @see FlushResponse */ -public class FlushRequest extends BroadcastOperationRequest { +public class FlushRequest extends BroadcastRequest { private boolean force = false; private boolean waitIfOngoing = false; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java index c4c52e7071ca6..a158b02611bf1 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.flush; import org.elasticsearch.action.ShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +32,7 @@ * * */ -public class FlushResponse extends BroadcastOperationResponse { +public class FlushResponse extends BroadcastResponse { FlushResponse() { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java index 55153562c15f7..0e38181fa6173 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java @@ -19,8 +19,7 @@ package org.elasticsearch.action.admin.indices.flush; -import org.elasticsearch.Version; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.index.shard.ShardId; @@ -30,7 +29,7 @@ /** * */ -class ShardFlushRequest extends BroadcastShardOperationRequest { +class ShardFlushRequest extends BroadcastShardRequest { private FlushRequest request = new FlushRequest(); ShardFlushRequest() { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java index 3ba9176873279..6f2cc6a552213 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java @@ -19,13 +19,13 @@ package org.elasticsearch.action.admin.indices.flush; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.index.shard.ShardId; /** * */ -class ShardFlushResponse extends BroadcastShardOperationResponse { +class ShardFlushResponse extends BroadcastShardResponse { ShardFlushResponse() { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java index c9f637e437105..e546d6f616b04 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction; +import org.elasticsearch.action.support.broadcast.TransportBroadcastAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -45,7 +45,7 @@ /** * Flush Action. */ -public class TransportFlushAction extends TransportBroadcastOperationAction { +public class TransportFlushAction extends TransportBroadcastAction { private final IndicesService indicesService; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java index 9772754d330b3..1f853b6b397c2 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse; @@ -36,7 +36,7 @@ /** * Put mapping action. */ -public class TransportPutMappingAction extends TransportMasterNodeOperationAction { +public class TransportPutMappingAction extends TransportMasterNodeAction { private final MetaDataMappingService metaDataMappingService; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java index 83063492c0715..1df33c56463ba 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DestructiveOperations; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse; @@ -38,7 +38,7 @@ /** * Open index action */ -public class TransportOpenIndexAction extends TransportMasterNodeOperationAction { +public class TransportOpenIndexAction extends TransportMasterNodeAction { private final MetaDataIndexStateService indexStateService; private final DestructiveOperations destructiveOperations; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java index d5b822f58cb1b..3510a3b7f964c 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java @@ -19,8 +19,7 @@ package org.elasticsearch.action.admin.indices.optimize; -import org.elasticsearch.Version; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -37,7 +36,7 @@ * @see org.elasticsearch.client.IndicesAdminClient#optimize(OptimizeRequest) * @see OptimizeResponse */ -public class OptimizeRequest extends BroadcastOperationRequest { +public class OptimizeRequest extends BroadcastRequest { public static final class Defaults { public static final int MAX_NUM_SEGMENTS = -1; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java index d4a189eb7f494..88341ef26194b 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.optimize; import org.elasticsearch.action.ShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +32,7 @@ * * */ -public class OptimizeResponse extends BroadcastOperationResponse { +public class OptimizeResponse extends BroadcastResponse { OptimizeResponse() { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java index 9113581038b6b..05aeabe21a653 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java @@ -20,8 +20,7 @@ package org.elasticsearch.action.admin.indices.optimize; -import org.elasticsearch.Version; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.index.shard.ShardId; @@ -31,7 +30,7 @@ /** * */ -final class ShardOptimizeRequest extends BroadcastShardOperationRequest { +final class ShardOptimizeRequest extends BroadcastShardRequest { private OptimizeRequest request = new OptimizeRequest(); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java index 61adb62f1d60a..1c9dc4482d98c 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java @@ -19,13 +19,13 @@ package org.elasticsearch.action.admin.indices.optimize; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.index.shard.ShardId; /** * */ -class ShardOptimizeResponse extends BroadcastShardOperationResponse { +class ShardOptimizeResponse extends BroadcastShardResponse { ShardOptimizeResponse() { } diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java index c4f276126fad2..17a18bae9716a 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction; +import org.elasticsearch.action.support.broadcast.TransportBroadcastAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -45,7 +45,7 @@ /** * Optimize index/indices action. */ -public class TransportOptimizeAction extends TransportBroadcastOperationAction { +public class TransportOptimizeAction extends TransportBroadcastAction { private final IndicesService indicesService; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java index f2a97ef5fb500..8878713765ba0 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java @@ -19,17 +19,17 @@ package org.elasticsearch.action.admin.indices.recovery; -import java.io.IOException; - -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; +import java.io.IOException; + /** * Request for recovery information */ -public class RecoveryRequest extends BroadcastOperationRequest { +public class RecoveryRequest extends BroadcastRequest { private boolean detailed = false; // Provides extra details in the response private boolean activeOnly = false; // Only reports on active recoveries diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java index 9fd15cd371ebc..fea33688c1454 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.recovery; import org.elasticsearch.action.ShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContent; @@ -35,7 +35,7 @@ /** * Information regarding the recovery state of indices and their associated shards. */ -public class RecoveryResponse extends BroadcastOperationResponse implements ToXContent { +public class RecoveryResponse extends BroadcastResponse implements ToXContent { private boolean detailed = false; private Map> shardResponses = new HashMap<>(); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/ShardRecoveryResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/recovery/ShardRecoveryResponse.java index 2e12de4f39f1a..a4104fbc4499b 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/recovery/ShardRecoveryResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/recovery/ShardRecoveryResponse.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.indices.recovery; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -33,7 +33,7 @@ /** * Information regarding the recovery state of a shard. */ -public class ShardRecoveryResponse extends BroadcastShardOperationResponse implements ToXContent { +public class ShardRecoveryResponse extends BroadcastShardResponse implements ToXContent { RecoveryState recoveryState; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java b/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java index 2996247963f86..2483efbc498d8 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java @@ -23,8 +23,8 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest; -import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction; +import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; +import org.elasticsearch.action.support.broadcast.TransportBroadcastAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -51,7 +51,7 @@ * Transport action for shard recovery operation. This transport action does not actually * perform shard recovery, it only reports on recoveries (both active and complete). */ -public class TransportRecoveryAction extends TransportBroadcastOperationAction { +public class TransportRecoveryAction extends TransportBroadcastAction { private final IndicesService indicesService; @@ -149,7 +149,7 @@ protected ClusterBlockException checkRequestBlock(ClusterState state, RecoveryRe return state.blocks().indicesBlockedException(ClusterBlockLevel.READ, concreteIndices); } - static class ShardRecoveryRequest extends BroadcastShardOperationRequest { + static class ShardRecoveryRequest extends BroadcastShardRequest { ShardRecoveryRequest() { } diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java index 44544ec049c98..8f871307135a3 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java @@ -20,11 +20,7 @@ package org.elasticsearch.action.admin.indices.refresh; import org.elasticsearch.action.ActionRequest; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; -import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.common.io.stream.StreamOutput; - -import java.io.IOException; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; /** * A refresh request making all operations performed since the last refresh available for search. The (near) real-time @@ -35,7 +31,7 @@ * @see org.elasticsearch.client.IndicesAdminClient#refresh(RefreshRequest) * @see RefreshResponse */ -public class RefreshRequest extends BroadcastOperationRequest { +public class RefreshRequest extends BroadcastRequest { RefreshRequest() { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java index 3130b0713dac6..28295fdd0a074 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.refresh; import org.elasticsearch.action.ShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +32,7 @@ * * */ -public class RefreshResponse extends BroadcastOperationResponse { +public class RefreshResponse extends BroadcastResponse { RefreshResponse() { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java index da3c5fea9eb45..37ea2cc46dea3 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java @@ -19,17 +19,13 @@ package org.elasticsearch.action.admin.indices.refresh; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest; -import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.common.io.stream.StreamOutput; +import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; import org.elasticsearch.index.shard.ShardId; -import java.io.IOException; - /** * */ -class ShardRefreshRequest extends BroadcastShardOperationRequest { +class ShardRefreshRequest extends BroadcastShardRequest { ShardRefreshRequest() { } diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java index c2ab17890ebd5..4de0f5877ddf6 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java @@ -19,13 +19,13 @@ package org.elasticsearch.action.admin.indices.refresh; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.index.shard.ShardId; /** * */ -class ShardRefreshResponse extends BroadcastShardOperationResponse { +class ShardRefreshResponse extends BroadcastShardResponse { ShardRefreshResponse() { } diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java index 001793ecd1709..e2fe442f95193 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction; +import org.elasticsearch.action.support.broadcast.TransportBroadcastAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -45,7 +45,7 @@ /** * Refresh action. */ -public class TransportRefreshAction extends TransportBroadcastOperationAction { +public class TransportRefreshAction extends TransportBroadcastAction { private final IndicesService indicesService; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequest.java index 42cdc51ed320a..2e8e3ac0cf877 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequest.java @@ -19,14 +19,14 @@ package org.elasticsearch.action.admin.indices.seal; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import java.util.Arrays; /** * A request to seal one or more indices. */ -public class SealIndicesRequest extends BroadcastOperationRequest { +public class SealIndicesRequest extends BroadcastRequest { SealIndicesRequest() { } diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java index 983e5350a5d2a..6b0dc8697f321 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java @@ -24,7 +24,7 @@ import com.google.common.collect.Sets; import org.apache.lucene.util.Accountable; import org.elasticsearch.action.ShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -36,12 +36,11 @@ import java.io.IOException; import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -public class IndicesSegmentResponse extends BroadcastOperationResponse implements ToXContent { +public class IndicesSegmentResponse extends BroadcastResponse implements ToXContent { private ShardSegments[] shards; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java index cefc2ebc3bfbb..570fa89e0262b 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java @@ -19,15 +19,14 @@ package org.elasticsearch.action.admin.indices.segments; -import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; -public class IndicesSegmentsRequest extends BroadcastOperationRequest { +public class IndicesSegmentsRequest extends BroadcastRequest { protected boolean verbose = false; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java index 09d20271776af..d33df00fc8ca4 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.segments; import com.google.common.collect.ImmutableList; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -33,7 +33,7 @@ import static org.elasticsearch.cluster.routing.ImmutableShardRouting.readShardRoutingEntry; -public class ShardSegments extends BroadcastShardOperationResponse implements Iterable { +public class ShardSegments extends BroadcastShardResponse implements Iterable { private ShardRouting shardRouting; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java index fa9639424b4b8..f043d8ebdb0f7 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java @@ -23,8 +23,8 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest; -import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction; +import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; +import org.elasticsearch.action.support.broadcast.TransportBroadcastAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -36,8 +36,8 @@ import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.IndexShard; +import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; @@ -51,7 +51,7 @@ /** * */ -public class TransportIndicesSegmentsAction extends TransportBroadcastOperationAction { +public class TransportIndicesSegmentsAction extends TransportBroadcastAction { private final IndicesService indicesService; @@ -122,7 +122,7 @@ protected ShardSegments shardOperation(IndexShardSegmentRequest request) { return new ShardSegments(indexShard.routingEntry(), indexShard.engine().segments(request.verbose)); } - static class IndexShardSegmentRequest extends BroadcastShardOperationRequest { + static class IndexShardSegmentRequest extends BroadcastShardRequest { boolean verbose; IndexShardSegmentRequest() { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java index 2f01e28f969e1..daf011ece62f9 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java @@ -19,12 +19,11 @@ package org.elasticsearch.action.admin.indices.settings.get; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -33,7 +32,7 @@ /** */ -public class GetSettingsRequest extends MasterNodeReadOperationRequest implements IndicesRequest.Replaceable { +public class GetSettingsRequest extends MasterNodeReadRequest implements IndicesRequest.Replaceable { private String[] indices = Strings.EMPTY_ARRAY; private IndicesOptions indicesOptions = IndicesOptions.fromOptions(false, true, true, true); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java index c3a8948d1bb2e..f48b2c4853f58 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -40,7 +40,7 @@ /** */ -public class TransportGetSettingsAction extends TransportMasterNodeReadOperationAction { +public class TransportGetSettingsAction extends TransportMasterNodeReadAction { private final SettingsFilter settingsFilter; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java index 8185badb5afd5..1278b97934b40 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse; @@ -37,7 +37,7 @@ /** * */ -public class TransportUpdateSettingsAction extends TransportMasterNodeOperationAction { +public class TransportUpdateSettingsAction extends TransportMasterNodeAction { private final MetaDataUpdateSettingsService updateSettingsService; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java index b8a94ab4d51d6..a99c0f52defc5 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.stats; import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags.Flag; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -34,7 +34,7 @@ *

    All the stats to be returned can be cleared using {@link #clear()}, at which point, specific * stats can be enabled. */ -public class IndicesStatsRequest extends BroadcastOperationRequest { +public class IndicesStatsRequest extends BroadcastRequest { private CommonStatsFlags flags = new CommonStatsFlags(); diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java index f2f10c48f0a9b..2d9bf1e78f989 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java @@ -24,7 +24,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.elasticsearch.action.ShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.common.io.stream.StreamInput; @@ -41,7 +41,7 @@ /** */ -public class IndicesStatsResponse extends BroadcastOperationResponse implements ToXContent { +public class IndicesStatsResponse extends BroadcastResponse implements ToXContent { private ShardStats[] shards; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java index 951c4b952235e..fbba68cbee928 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.indices.stats; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; @@ -36,7 +36,7 @@ /** */ -public class ShardStats extends BroadcastShardOperationResponse implements ToXContent { +public class ShardStats extends BroadcastShardResponse implements ToXContent { private ShardRouting shardRouting; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java index 75191bb903f83..b4b0d6a443547 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java @@ -24,8 +24,8 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest; -import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction; +import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; +import org.elasticsearch.action.support.broadcast.TransportBroadcastAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -52,7 +52,7 @@ /** */ -public class TransportIndicesStatsAction extends TransportBroadcastOperationAction { +public class TransportIndicesStatsAction extends TransportBroadcastAction { private final IndicesService indicesService; @@ -190,7 +190,7 @@ protected ShardStats shardOperation(IndexShardStatsRequest request) { return new ShardStats(indexShard, indexShard.routingEntry(), flags); } - static class IndexShardStatsRequest extends BroadcastShardOperationRequest { + static class IndexShardStatsRequest extends BroadcastShardRequest { // TODO if there are many indices, the request might hold a large indices array..., we don't really need to serialize it IndicesStatsRequest request; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java index 0880143486865..429077878032f 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.indices.template.delete; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.support.master.MasterNodeOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -30,7 +30,7 @@ /** * A request to delete an index template. */ -public class DeleteIndexTemplateRequest extends MasterNodeOperationRequest { +public class DeleteIndexTemplateRequest extends MasterNodeRequest { private String name; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java index c1a063e666285..d66b0bb0a96be 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java @@ -20,7 +20,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -34,7 +34,7 @@ /** * Delete index action. */ -public class TransportDeleteIndexTemplateAction extends TransportMasterNodeOperationAction { +public class TransportDeleteIndexTemplateAction extends TransportMasterNodeAction { private final MetaDataIndexTemplateService indexTemplateService; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java index 949944fa61ebb..aeefc63bfa0c4 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java @@ -18,9 +18,8 @@ */ package org.elasticsearch.action.admin.indices.template.get; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +31,7 @@ /** * Request that allows to retrieve index templates */ -public class GetIndexTemplatesRequest extends MasterNodeReadOperationRequest { +public class GetIndexTemplatesRequest extends MasterNodeReadRequest { private String[] names; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java b/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java index c260011254287..039ca1a726f58 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java @@ -22,7 +22,7 @@ import com.google.common.collect.Lists; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -39,7 +39,7 @@ /** * */ -public class TransportGetIndexTemplatesAction extends TransportMasterNodeReadOperationAction { +public class TransportGetIndexTemplatesAction extends TransportMasterNodeReadAction { @Inject public TransportGetIndexTemplatesAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters) { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java index 6e21ba4753f9c..a4b10cb7783f3 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.MasterNodeOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; @@ -50,7 +50,7 @@ /** * A request to create an index template. */ -public class PutIndexTemplateRequest extends MasterNodeOperationRequest implements IndicesRequest { +public class PutIndexTemplateRequest extends MasterNodeRequest implements IndicesRequest { private String name; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java b/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java index 5c4979e625396..492dbf352c70c 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java @@ -20,7 +20,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -34,7 +34,7 @@ /** * Put index template action. */ -public class TransportPutIndexTemplateAction extends TransportMasterNodeOperationAction { +public class TransportPutIndexTemplateAction extends TransportMasterNodeAction { private final MetaDataIndexTemplateService indexTemplateService; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java index 7b771f3209170..648ab21afd623 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.indices.validate.query; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; @@ -32,7 +32,7 @@ /** * Internal validate request executed directly against a specific index shard. */ -class ShardValidateQueryRequest extends BroadcastShardOperationRequest { +class ShardValidateQueryRequest extends BroadcastShardRequest { private BytesReference source; private String[] types = Strings.EMPTY_ARRAY; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java index d4e75578f1f80..43d3ad823053d 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.admin.indices.validate.query; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.index.shard.ShardId; @@ -31,7 +31,7 @@ * * */ -class ShardValidateQueryResponse extends BroadcastShardOperationResponse { +class ShardValidateQueryResponse extends BroadcastShardResponse { private boolean valid; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java index baa4949d29d56..5d8e98beac1a9 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java @@ -27,7 +27,7 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction; +import org.elasticsearch.action.support.broadcast.TransportBroadcastAction; import org.elasticsearch.cache.recycler.PageCacheRecycler; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -63,7 +63,7 @@ /** * */ -public class TransportValidateQueryAction extends TransportBroadcastOperationAction { +public class TransportValidateQueryAction extends TransportBroadcastAction { private final IndicesService indicesService; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java index d5612235995ed..3499852c51557 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.QuerySourceBuilder; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.client.Requests; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesArray; @@ -44,7 +44,7 @@ *

    The request requires the query source to be set either using {@link #source(QuerySourceBuilder)}, * or {@link #source(byte[])}. */ -public class ValidateQueryRequest extends BroadcastOperationRequest { +public class ValidateQueryRequest extends BroadcastRequest { private BytesReference source; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java index 6c0a065d3d281..3d1ef78d2bfef 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableList; import org.elasticsearch.action.ShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -36,7 +36,7 @@ * * */ -public class ValidateQueryResponse extends BroadcastOperationResponse { +public class ValidateQueryResponse extends BroadcastResponse { private boolean valid; diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java b/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java index bcf3bad07fc0f..9e135e9a71578 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java @@ -21,7 +21,7 @@ import com.google.common.collect.Lists; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.AckedClusterStateUpdateTask; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -47,7 +47,7 @@ * * Note: this is an internal API and should not be used / called by any client code. */ -public class TransportDeleteWarmerAction extends TransportMasterNodeOperationAction { +public class TransportDeleteWarmerAction extends TransportMasterNodeAction { @Inject public TransportDeleteWarmerAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters) { diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java b/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java index e92eb3195d702..0b11e0bcf5d66 100644 --- a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java +++ b/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.TransportSearchAction; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeAction; import org.elasticsearch.cluster.AckedClusterStateUpdateTask; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -51,7 +51,7 @@ * * Note: this is an internal API and should not be used / called by any client code. */ -public class TransportPutWarmerAction extends TransportMasterNodeOperationAction { +public class TransportPutWarmerAction extends TransportMasterNodeAction { private final TransportSearchAction searchAction; diff --git a/src/main/java/org/elasticsearch/action/count/CountRequest.java b/src/main/java/org/elasticsearch/action/count/CountRequest.java index dfee07b2ee993..1d35af42e53c7 100644 --- a/src/main/java/org/elasticsearch/action/count/CountRequest.java +++ b/src/main/java/org/elasticsearch/action/count/CountRequest.java @@ -22,7 +22,7 @@ import org.elasticsearch.ElasticsearchGenerationException; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.support.QuerySourceBuilder; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.client.Requests; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; @@ -52,7 +52,7 @@ * @see org.elasticsearch.client.Client#count(CountRequest) * @see org.elasticsearch.client.Requests#countRequest(String...) */ -public class CountRequest extends BroadcastOperationRequest { +public class CountRequest extends BroadcastRequest { public static final float DEFAULT_MIN_SCORE = -1f; diff --git a/src/main/java/org/elasticsearch/action/count/CountResponse.java b/src/main/java/org/elasticsearch/action/count/CountResponse.java index 91fd77e596b0d..916c4ef93737d 100644 --- a/src/main/java/org/elasticsearch/action/count/CountResponse.java +++ b/src/main/java/org/elasticsearch/action/count/CountResponse.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.count; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.rest.RestStatus; @@ -31,7 +31,7 @@ /** * The response of the count action. */ -public class CountResponse extends BroadcastOperationResponse { +public class CountResponse extends BroadcastResponse { private final boolean terminatedEarly; private final long count; diff --git a/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java b/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java index 84c5d32aaf57a..32ff0b1e01435 100644 --- a/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java +++ b/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java @@ -22,7 +22,7 @@ import org.elasticsearch.ElasticsearchGenerationException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.QuerySourceBuilder; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.client.Requests; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; @@ -38,7 +38,7 @@ import java.util.Arrays; import java.util.Map; -public class ExistsRequest extends BroadcastOperationRequest { +public class ExistsRequest extends BroadcastRequest { public static final float DEFAULT_MIN_SCORE = -1f; private float minScore = DEFAULT_MIN_SCORE; diff --git a/src/main/java/org/elasticsearch/action/exists/ExistsResponse.java b/src/main/java/org/elasticsearch/action/exists/ExistsResponse.java index 6b1c58990dd6c..f271dc65f7f07 100644 --- a/src/main/java/org/elasticsearch/action/exists/ExistsResponse.java +++ b/src/main/java/org/elasticsearch/action/exists/ExistsResponse.java @@ -20,14 +20,14 @@ package org.elasticsearch.action.exists; import org.elasticsearch.action.ShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; import java.util.List; -public class ExistsResponse extends BroadcastOperationResponse { +public class ExistsResponse extends BroadcastResponse { private boolean exists = false; diff --git a/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java b/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java index a8f8bff91fad2..276e6ea117e78 100644 --- a/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java +++ b/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.exists; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; @@ -29,7 +29,7 @@ import java.io.IOException; -class ShardExistsRequest extends BroadcastShardOperationRequest { +class ShardExistsRequest extends BroadcastShardRequest { private float minScore; diff --git a/src/main/java/org/elasticsearch/action/exists/ShardExistsResponse.java b/src/main/java/org/elasticsearch/action/exists/ShardExistsResponse.java index e94330c042f55..25f813ee4245d 100644 --- a/src/main/java/org/elasticsearch/action/exists/ShardExistsResponse.java +++ b/src/main/java/org/elasticsearch/action/exists/ShardExistsResponse.java @@ -19,14 +19,14 @@ package org.elasticsearch.action.exists; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.index.shard.ShardId; import java.io.IOException; -class ShardExistsResponse extends BroadcastShardOperationResponse { +class ShardExistsResponse extends BroadcastShardResponse { private boolean exists; diff --git a/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java b/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java index cf4e41ce9653a..f9118e8c05af0 100644 --- a/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java +++ b/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction; +import org.elasticsearch.action.support.broadcast.TransportBroadcastAction; import org.elasticsearch.cache.recycler.PageCacheRecycler; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -39,8 +39,8 @@ import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.BigArrays; -import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.index.IndexService; +import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.script.ScriptService; @@ -61,7 +61,7 @@ import static com.google.common.collect.Lists.newArrayList; import static org.elasticsearch.action.exists.ExistsRequest.DEFAULT_MIN_SCORE; -public class TransportExistsAction extends TransportBroadcastOperationAction { +public class TransportExistsAction extends TransportBroadcastAction { private final IndicesService indicesService; private final ScriptService scriptService; diff --git a/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java b/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java index f1b7b57183388..8a8eaee36cf2f 100644 --- a/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java +++ b/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.action.support.QuerySourceBuilder; -import org.elasticsearch.action.support.single.shard.SingleShardOperationRequest; +import org.elasticsearch.action.support.single.shard.SingleShardRequest; import org.elasticsearch.client.Requests; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; @@ -35,7 +35,7 @@ /** * Explain request encapsulating the explain query and document identifier to get an explanation for. */ -public class ExplainRequest extends SingleShardOperationRequest { +public class ExplainRequest extends SingleShardRequest { private String type = "_all"; private String id; diff --git a/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java b/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java index c2ca4c7558a62..8cfba3dd1ce5b 100644 --- a/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java +++ b/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.RoutingMissingException; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.single.shard.TransportShardSingleOperationAction; +import org.elasticsearch.action.support.single.shard.TransportSingleShardAction; import org.elasticsearch.cache.recycler.PageCacheRecycler; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; @@ -33,13 +33,13 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.BigArrays; +import org.elasticsearch.index.IndexService; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.get.GetResult; import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.index.mapper.internal.UidFieldMapper; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.IndexShard; +import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.script.ScriptService; import org.elasticsearch.search.internal.DefaultSearchContext; @@ -56,7 +56,7 @@ * Explain transport action. Computes the explain on the targeted shard. */ // TODO: AggregatedDfs. Currently the idf can be different then when executing a normal search with explain. -public class TransportExplainAction extends TransportShardSingleOperationAction { +public class TransportExplainAction extends TransportSingleShardAction { private final IndicesService indicesService; diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java index ff61fe88ee94f..e157865ecdfe6 100644 --- a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java +++ b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -29,7 +29,7 @@ /** */ -public class FieldStatsRequest extends BroadcastOperationRequest { +public class FieldStatsRequest extends BroadcastRequest { public final static String DEFAULT_LEVEL = "cluster"; diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsResponse.java b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsResponse.java index e6f69e9791a25..a8f66ca56ea2e 100644 --- a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsResponse.java +++ b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsResponse.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.fieldstats; import org.elasticsearch.action.ShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +32,7 @@ /** */ -public class FieldStatsResponse extends BroadcastOperationResponse { +public class FieldStatsResponse extends BroadcastResponse { private Map> indicesMergedFieldStats; diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardRequest.java b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardRequest.java index fb46ff66d3b26..0ce83d99296e5 100644 --- a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardRequest.java +++ b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardRequest.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.fieldstats; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.index.shard.ShardId; @@ -28,7 +28,7 @@ /** */ -public class FieldStatsShardRequest extends BroadcastShardOperationRequest { +public class FieldStatsShardRequest extends BroadcastShardRequest { private String[] fields; diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardResponse.java b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardResponse.java index ada4552e94cdf..c1094ce4d3e2c 100644 --- a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardResponse.java +++ b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardResponse.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.fieldstats; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.index.shard.ShardId; @@ -30,7 +30,7 @@ /** */ -public class FieldStatsShardResponse extends BroadcastShardOperationResponse { +public class FieldStatsShardResponse extends BroadcastShardResponse { private Map fieldStats; diff --git a/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java b/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java index 12a6f41e13df8..43e78ec5b87e8 100644 --- a/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java +++ b/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java @@ -27,7 +27,7 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction; +import org.elasticsearch.action.support.broadcast.TransportBroadcastAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -47,10 +47,13 @@ import org.elasticsearch.transport.TransportService; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.atomic.AtomicReferenceArray; -public class TransportFieldStatsTransportAction extends TransportBroadcastOperationAction { +public class TransportFieldStatsTransportAction extends TransportBroadcastAction { private final IndicesService indicesService; diff --git a/src/main/java/org/elasticsearch/action/get/GetRequest.java b/src/main/java/org/elasticsearch/action/get/GetRequest.java index 6a8497ace7137..1d2769017bc53 100644 --- a/src/main/java/org/elasticsearch/action/get/GetRequest.java +++ b/src/main/java/org/elasticsearch/action/get/GetRequest.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ValidateActions; -import org.elasticsearch.action.support.single.shard.SingleShardOperationRequest; +import org.elasticsearch.action.support.single.shard.SingleShardRequest; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -43,7 +43,7 @@ * @see org.elasticsearch.client.Requests#getRequest(String) * @see org.elasticsearch.client.Client#get(GetRequest) */ -public class GetRequest extends SingleShardOperationRequest { +public class GetRequest extends SingleShardRequest { private String type; private String id; diff --git a/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java b/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java index eb3e25c133087..8a6d552807ba9 100644 --- a/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java +++ b/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java @@ -20,19 +20,15 @@ package org.elasticsearch.action.get; import com.carrotsearch.hppc.IntArrayList; -import com.carrotsearch.hppc.LongArrayList; -import org.elasticsearch.Version; -import org.elasticsearch.action.support.single.shard.SingleShardOperationRequest; +import org.elasticsearch.action.support.single.shard.SingleShardRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.index.VersionType; -import org.elasticsearch.search.fetch.source.FetchSourceContext; import java.io.IOException; import java.util.ArrayList; import java.util.List; -public class MultiGetShardRequest extends SingleShardOperationRequest { +public class MultiGetShardRequest extends SingleShardRequest { private int shardId; private String preference; diff --git a/src/main/java/org/elasticsearch/action/get/TransportGetAction.java b/src/main/java/org/elasticsearch/action/get/TransportGetAction.java index 2324835b9dc27..08774a2b421a6 100644 --- a/src/main/java/org/elasticsearch/action/get/TransportGetAction.java +++ b/src/main/java/org/elasticsearch/action/get/TransportGetAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.RoutingMissingException; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.single.shard.TransportShardSingleOperationAction; +import org.elasticsearch.action.support.single.shard.TransportSingleShardAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -40,7 +40,7 @@ /** * Performs the get operation. */ -public class TransportGetAction extends TransportShardSingleOperationAction { +public class TransportGetAction extends TransportSingleShardAction { private final IndicesService indicesService; private final boolean realtime; diff --git a/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java b/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java index fb6bac8cdc843..fb1b751a9eb28 100644 --- a/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java +++ b/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java @@ -23,21 +23,21 @@ import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.TransportActions; -import org.elasticsearch.action.support.single.shard.TransportShardSingleOperationAction; +import org.elasticsearch.action.support.single.shard.TransportSingleShardAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.index.get.GetResult; import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.shard.ShardId; +import org.elasticsearch.index.get.GetResult; import org.elasticsearch.index.shard.IndexShard; +import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -public class TransportShardMultiGetAction extends TransportShardSingleOperationAction { +public class TransportShardMultiGetAction extends TransportSingleShardAction { private static final String ACTION_NAME = MultiGetAction.NAME + "[shard]"; diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java b/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java index f68745e0adf68..9c9a3859585a4 100644 --- a/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java +++ b/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.CompositeIndicesRequest; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.get.GetRequest; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.client.Requests; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; @@ -43,7 +43,7 @@ /** * A request to execute a percolate operation. */ -public class PercolateRequest extends BroadcastOperationRequest implements CompositeIndicesRequest { +public class PercolateRequest extends BroadcastRequest implements CompositeIndicesRequest { private String documentType; private String routing; @@ -55,7 +55,7 @@ public class PercolateRequest extends BroadcastOperationRequest, ToXContent { +public class PercolateResponse extends BroadcastResponse implements Iterable, ToXContent { public static final Match[] EMPTY = new Match[0]; diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java b/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java index 8364eb1610d40..f0b1a96e1d564 100644 --- a/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java +++ b/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java @@ -19,9 +19,8 @@ package org.elasticsearch.action.percolate; -import org.elasticsearch.Version; import org.elasticsearch.action.OriginalIndices; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -31,7 +30,7 @@ /** */ -public class PercolateShardRequest extends BroadcastShardOperationRequest { +public class PercolateShardRequest extends BroadcastShardRequest { private String documentType; private BytesReference source; diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateShardResponse.java b/src/main/java/org/elasticsearch/action/percolate/PercolateShardResponse.java index b731208def7af..c626cda581ed1 100644 --- a/src/main/java/org/elasticsearch/action/percolate/PercolateShardResponse.java +++ b/src/main/java/org/elasticsearch/action/percolate/PercolateShardResponse.java @@ -19,9 +19,8 @@ package org.elasticsearch.action.percolate; import com.google.common.collect.ImmutableList; - import org.apache.lucene.util.BytesRef; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -42,7 +41,7 @@ /** */ -public class PercolateShardResponse extends BroadcastShardOperationResponse { +public class PercolateShardResponse extends BroadcastShardResponse { private static final BytesRef[] EMPTY_MATCHES = new BytesRef[0]; private static final float[] EMPTY_SCORES = new float[0]; diff --git a/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java b/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java index d1ee7be3b19c3..622b541a0eada 100644 --- a/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java +++ b/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction; +import org.elasticsearch.action.support.broadcast.TransportBroadcastAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -52,7 +52,7 @@ /** * */ -public class TransportPercolateAction extends TransportBroadcastOperationAction { +public class TransportPercolateAction extends TransportBroadcastAction { private final PercolatorService percolatorService; private final TransportGetAction getAction; diff --git a/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java b/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java index ce38859174fbe..adca1883470b1 100644 --- a/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java +++ b/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java @@ -26,8 +26,8 @@ import org.elasticsearch.action.OriginalIndices; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.TransportActions; -import org.elasticsearch.action.support.single.shard.SingleShardOperationRequest; -import org.elasticsearch.action.support.single.shard.TransportShardSingleOperationAction; +import org.elasticsearch.action.support.single.shard.SingleShardRequest; +import org.elasticsearch.action.support.single.shard.TransportSingleShardAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.ShardIterator; @@ -49,7 +49,7 @@ /** */ -public class TransportShardMultiPercolateAction extends TransportShardSingleOperationAction { +public class TransportShardMultiPercolateAction extends TransportSingleShardAction { private final PercolatorService percolatorService; @@ -108,7 +108,7 @@ protected Response shardOperation(Request request, ShardId shardId) { } - public static class Request extends SingleShardOperationRequest implements IndicesRequest { + public static class Request extends SingleShardRequest implements IndicesRequest { private int shardId; private String preference; diff --git a/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java b/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java index d4c48e5034f37..794dd9badf76d 100644 --- a/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java +++ b/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.suggest; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -30,7 +30,7 @@ /** * Internal suggest request executed directly against a specific index shard. */ -final class ShardSuggestRequest extends BroadcastShardOperationRequest { +final class ShardSuggestRequest extends BroadcastShardRequest { private BytesReference suggestSource; diff --git a/src/main/java/org/elasticsearch/action/suggest/ShardSuggestResponse.java b/src/main/java/org/elasticsearch/action/suggest/ShardSuggestResponse.java index f6495c6016324..bca29800bd111 100644 --- a/src/main/java/org/elasticsearch/action/suggest/ShardSuggestResponse.java +++ b/src/main/java/org/elasticsearch/action/suggest/ShardSuggestResponse.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.suggest; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.index.shard.ShardId; @@ -30,7 +30,7 @@ /** * Internal suggest response of a shard suggest request executed directly against a specific shard. */ -class ShardSuggestResponse extends BroadcastShardOperationResponse { +class ShardSuggestResponse extends BroadcastShardResponse { private final Suggest suggest; diff --git a/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java b/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java index fdb5d7a0117c9..c75e262bac499 100644 --- a/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java +++ b/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.suggest; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.client.Requests; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; @@ -48,7 +48,7 @@ * @see org.elasticsearch.client.Requests#suggestRequest(String...) * @see org.elasticsearch.search.suggest.SuggestBuilders */ -public final class SuggestRequest extends BroadcastOperationRequest { +public final class SuggestRequest extends BroadcastRequest { @Nullable private String routing; diff --git a/src/main/java/org/elasticsearch/action/suggest/SuggestResponse.java b/src/main/java/org/elasticsearch/action/suggest/SuggestResponse.java index 24a8922c5f98b..445e804b5b589 100644 --- a/src/main/java/org/elasticsearch/action/suggest/SuggestResponse.java +++ b/src/main/java/org/elasticsearch/action/suggest/SuggestResponse.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.suggest; import org.elasticsearch.action.ShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -35,7 +35,7 @@ /** * The response of the suggest action. */ -public final class SuggestResponse extends BroadcastOperationResponse { +public final class SuggestResponse extends BroadcastResponse { private final Suggest suggest; diff --git a/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java b/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java index 9874783ae792e..ac046e6552dd7 100644 --- a/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java +++ b/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction; +import org.elasticsearch.action.support.broadcast.TransportBroadcastAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -36,8 +36,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.IndexService; +import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.suggest.stats.ShardSuggestService; import org.elasticsearch.indices.IndicesService; @@ -58,7 +58,7 @@ /** * Defines the transport of a suggestion request across the cluster */ -public class TransportSuggestAction extends TransportBroadcastOperationAction { +public class TransportSuggestAction extends TransportBroadcastAction { private final IndicesService indicesService; private final SuggestPhase suggestPhase; diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java index 50fb7b097f2f4..6170d967002b9 100644 --- a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java @@ -26,7 +26,7 @@ /** */ -public abstract class BroadcastOperationRequestBuilder, Response extends BroadcastOperationResponse, RequestBuilder extends BroadcastOperationRequestBuilder> +public abstract class BroadcastOperationRequestBuilder, Response extends BroadcastResponse, RequestBuilder extends BroadcastOperationRequestBuilder> extends ActionRequestBuilder { protected BroadcastOperationRequestBuilder(ElasticsearchClient client, Action action, Request request) { diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java similarity index 88% rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java index 80eeacedbba83..19adbdce01a5b 100644 --- a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java +++ b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java @@ -31,20 +31,20 @@ /** * */ -public abstract class BroadcastOperationRequest extends ActionRequest implements IndicesRequest.Replaceable { +public abstract class BroadcastRequest extends ActionRequest implements IndicesRequest.Replaceable { protected String[] indices; private IndicesOptions indicesOptions = IndicesOptions.strictExpandOpenAndForbidClosed(); - protected BroadcastOperationRequest() { + protected BroadcastRequest() { } - protected BroadcastOperationRequest(ActionRequest originalRequest) { + protected BroadcastRequest(ActionRequest originalRequest) { super(originalRequest); } - protected BroadcastOperationRequest(String[] indices) { + protected BroadcastRequest(String[] indices) { this.indices = indices; } diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java similarity index 90% rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java index e8e2a2aa0ce06..560c7ec986936 100644 --- a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java +++ b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java @@ -32,17 +32,17 @@ /** * Base class for all broadcast operation based responses. */ -public abstract class BroadcastOperationResponse extends ActionResponse { +public abstract class BroadcastResponse extends ActionResponse { private static final ShardOperationFailedException[] EMPTY = new ShardOperationFailedException[0]; private int totalShards; private int successfulShards; private int failedShards; private ShardOperationFailedException[] shardFailures = EMPTY; - protected BroadcastOperationResponse() { + protected BroadcastResponse() { } - protected BroadcastOperationResponse(int totalShards, int successfulShards, int failedShards, List shardFailures) { + protected BroadcastResponse(int totalShards, int successfulShards, int failedShards, List shardFailures) { this.totalShards = totalShards; this.successfulShards = successfulShards; this.failedShards = failedShards; @@ -73,7 +73,7 @@ public int getFailedShards() { /** * The list of shard failures exception. */ - public ShardOperationFailedException[] getShardFailures() { + public ShardOperationFailedException[] getShardFailures() { return shardFailures; } diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationRequest.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java similarity index 86% rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java index f6c917fbf9b1a..e416cd517e118 100644 --- a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationRequest.java +++ b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java @@ -32,22 +32,22 @@ /** * */ -public abstract class BroadcastShardOperationRequest extends TransportRequest implements IndicesRequest { +public abstract class BroadcastShardRequest extends TransportRequest implements IndicesRequest { private ShardId shardId; protected OriginalIndices originalIndices; - protected BroadcastShardOperationRequest() { + protected BroadcastShardRequest() { } - protected BroadcastShardOperationRequest(ShardId shardId, BroadcastOperationRequest request) { + protected BroadcastShardRequest(ShardId shardId, BroadcastRequest request) { super(request); this.shardId = shardId; this.originalIndices = new OriginalIndices(request); } - protected BroadcastShardOperationRequest(ShardId shardId, OriginalIndices originalIndices) { + protected BroadcastShardRequest(ShardId shardId, OriginalIndices originalIndices) { this.shardId = shardId; this.originalIndices = originalIndices; } diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationResponse.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java similarity index 89% rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationResponse.java rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java index cc0c64b532d17..bf7d271bb6f40 100644 --- a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationResponse.java +++ b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java @@ -29,15 +29,15 @@ /** * */ -public abstract class BroadcastShardOperationResponse extends TransportResponse { +public abstract class BroadcastShardResponse extends TransportResponse { ShardId shardId; - protected BroadcastShardOperationResponse() { + protected BroadcastShardResponse() { } - protected BroadcastShardOperationResponse(ShardId shardId) { + protected BroadcastShardResponse(ShardId shardId) { this.shardId = shardId; } diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java b/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java similarity index 95% rename from src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java rename to src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java index 6ff55467f7d91..c77f3ec766b3f 100644 --- a/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java +++ b/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java @@ -43,7 +43,7 @@ /** * */ -public abstract class TransportBroadcastOperationAction +public abstract class TransportBroadcastAction extends HandledTransportAction { protected final ThreadPool threadPool; @@ -52,8 +52,8 @@ public abstract class TransportBroadcastOperationAction request, Class shardRequest, String shardExecutor) { + protected TransportBroadcastAction(Settings settings, String actionName, ThreadPool threadPool, ClusterService clusterService, TransportService transportService, ActionFilters actionFilters, + Class request, Class shardRequest, String shardExecutor) { super(settings, actionName, threadPool, transportService, actionFilters, request); this.clusterService = clusterService; this.transportService = transportService; diff --git a/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java b/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java index ea3a1e43bff66..870b107745691 100644 --- a/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java +++ b/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java @@ -33,7 +33,7 @@ * Abstract class that allows to mark action requests that support acknowledgements. * Facilitates consistency across different api. */ -public abstract class AcknowledgedRequest extends MasterNodeOperationRequest implements AckedRequest { +public abstract class AcknowledgedRequest extends MasterNodeRequest implements AckedRequest { public static final TimeValue DEFAULT_ACK_TIMEOUT = timeValueSeconds(30); diff --git a/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java b/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java index 5d7af81927be3..0b3b5af36d26e 100644 --- a/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java @@ -22,15 +22,13 @@ import org.elasticsearch.action.Action; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionResponse; -import org.elasticsearch.client.ClusterAdminClient; import org.elasticsearch.client.ElasticsearchClient; -import org.elasticsearch.client.IndicesAdminClient; import org.elasticsearch.common.unit.TimeValue; /** * Base request builder for master node operations */ -public abstract class MasterNodeOperationRequestBuilder, Response extends ActionResponse, RequestBuilder extends MasterNodeOperationRequestBuilder> +public abstract class MasterNodeOperationRequestBuilder, Response extends ActionResponse, RequestBuilder extends MasterNodeOperationRequestBuilder> extends ActionRequestBuilder { protected MasterNodeOperationRequestBuilder(ElasticsearchClient client, Action action, Request request) { diff --git a/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java b/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java index 02c83298c2572..7955abfbe96c2 100644 --- a/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java @@ -21,14 +21,12 @@ import org.elasticsearch.action.Action; import org.elasticsearch.action.ActionResponse; -import org.elasticsearch.client.ClusterAdminClient; import org.elasticsearch.client.ElasticsearchClient; -import org.elasticsearch.client.IndicesAdminClient; /** * Base request builder for master node read operations that can be executed on the local node as well */ -public abstract class MasterNodeReadOperationRequestBuilder, Response extends ActionResponse, RequestBuilder extends MasterNodeReadOperationRequestBuilder> +public abstract class MasterNodeReadOperationRequestBuilder, Response extends ActionResponse, RequestBuilder extends MasterNodeReadOperationRequestBuilder> extends MasterNodeOperationRequestBuilder { protected MasterNodeReadOperationRequestBuilder(ElasticsearchClient client, Action action, Request request) { diff --git a/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequest.java b/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java similarity index 90% rename from src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java index df47cae3f1a1e..b190a6e93c4c7 100644 --- a/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequest.java +++ b/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.support.master; -import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -28,7 +27,7 @@ /** * Base request for master based read operations that allows to read the cluster state from the local node if needed */ -public abstract class MasterNodeReadOperationRequest extends MasterNodeOperationRequest { +public abstract class MasterNodeReadRequest extends MasterNodeRequest { protected boolean local = false; diff --git a/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequest.java b/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java similarity index 90% rename from src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java index e1e90e932ff19..d3621cac58ca5 100644 --- a/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequest.java +++ b/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java @@ -29,17 +29,17 @@ /** * A based request for master based operation. */ -public abstract class MasterNodeOperationRequest extends ActionRequest { +public abstract class MasterNodeRequest extends ActionRequest { public static final TimeValue DEFAULT_MASTER_NODE_TIMEOUT = TimeValue.timeValueSeconds(30); protected TimeValue masterNodeTimeout = DEFAULT_MASTER_NODE_TIMEOUT; - protected MasterNodeOperationRequest() { + protected MasterNodeRequest() { } - protected MasterNodeOperationRequest(ActionRequest request) { + protected MasterNodeRequest(ActionRequest request) { super(request); } diff --git a/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java b/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java similarity index 94% rename from src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java rename to src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java index 9e1c662cf6071..f8c0c07da58c4 100644 --- a/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java +++ b/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java @@ -36,20 +36,23 @@ import org.elasticsearch.discovery.MasterNotDiscoveredException; import org.elasticsearch.node.NodeClosedException; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.transport.*; +import org.elasticsearch.transport.BaseTransportResponseHandler; +import org.elasticsearch.transport.ConnectTransportException; +import org.elasticsearch.transport.TransportException; +import org.elasticsearch.transport.TransportService; /** * A base class for operations that needs to be performed on the master node. */ -public abstract class TransportMasterNodeOperationAction extends HandledTransportAction { +public abstract class TransportMasterNodeAction extends HandledTransportAction { protected final TransportService transportService; protected final ClusterService clusterService; final String executor; - protected TransportMasterNodeOperationAction(Settings settings, String actionName, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters, - Class request) { + protected TransportMasterNodeAction(Settings settings, String actionName, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters, + Class request) { super(settings, actionName, threadPool, transportService, actionFilters, request); this.transportService = transportService; this.clusterService = clusterService; diff --git a/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadOperationAction.java b/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java similarity index 80% rename from src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadOperationAction.java rename to src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java index 383de7ceb534b..c33b9fde774a8 100644 --- a/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadOperationAction.java +++ b/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java @@ -30,13 +30,13 @@ * A base class for read operations that needs to be performed on the master node. * Can also be executed on the local node if needed. */ -public abstract class TransportMasterNodeReadOperationAction extends TransportMasterNodeOperationAction { +public abstract class TransportMasterNodeReadAction extends TransportMasterNodeAction { public static final String FORCE_LOCAL_SETTING = "action.master.force_local"; private Boolean forceLocal; - protected TransportMasterNodeReadOperationAction(Settings settings, String actionName, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters, Class request) { + protected TransportMasterNodeReadAction(Settings settings, String actionName, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters, Class request) { super(settings, actionName, transportService, clusterService, threadPool, actionFilters,request); this.forceLocal = settings.getAsBoolean(FORCE_LOCAL_SETTING, null); } diff --git a/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java b/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java index 5f0d34675b404..fbd095bb8745e 100644 --- a/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java +++ b/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeReadRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -30,7 +30,7 @@ /** */ -public abstract class ClusterInfoRequest extends MasterNodeReadOperationRequest implements IndicesRequest.Replaceable { +public abstract class ClusterInfoRequest extends MasterNodeReadRequest implements IndicesRequest.Replaceable { private String[] indices = Strings.EMPTY_ARRAY; private String[] types = Strings.EMPTY_ARRAY; diff --git a/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java b/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java index fdf6352ef185c..d1bdb86e1bbb6 100644 --- a/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java +++ b/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java @@ -21,7 +21,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.common.settings.Settings; @@ -30,7 +30,7 @@ /** */ -public abstract class TransportClusterInfoAction extends TransportMasterNodeReadOperationAction { +public abstract class TransportClusterInfoAction extends TransportMasterNodeReadAction { public TransportClusterInfoAction(Settings settings, String actionName, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters, Class request) { super(settings, actionName, transportService, clusterService, threadPool, actionFilters, request); diff --git a/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationRequest.java b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java similarity index 88% rename from src/main/java/org/elasticsearch/action/support/nodes/NodeOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java index 4d8a42619ad2d..e25577e2f7019 100644 --- a/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationRequest.java +++ b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java @@ -28,15 +28,15 @@ /** * */ -public abstract class NodeOperationRequest extends TransportRequest { +public abstract class BaseNodeRequest extends TransportRequest { private String nodeId; - protected NodeOperationRequest() { + protected BaseNodeRequest() { } - protected NodeOperationRequest(NodesOperationRequest request, String nodeId) { + protected BaseNodeRequest(BaseNodesRequest request, String nodeId) { super(request); this.nodeId = nodeId; } diff --git a/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationResponse.java b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java similarity index 90% rename from src/main/java/org/elasticsearch/action/support/nodes/NodeOperationResponse.java rename to src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java index 3415a07c8a280..33e4596e9b242 100644 --- a/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationResponse.java +++ b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java @@ -29,14 +29,14 @@ /** * A base class for node level operations. */ -public abstract class NodeOperationResponse extends TransportResponse { +public abstract class BaseNodeResponse extends TransportResponse { private DiscoveryNode node; - protected NodeOperationResponse() { + protected BaseNodeResponse() { } - protected NodeOperationResponse(DiscoveryNode node) { + protected BaseNodeResponse(DiscoveryNode node) { assert node != null; this.node = node; } diff --git a/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequest.java b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java similarity index 90% rename from src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java index 113e03f1f3cac..462c873c63372 100644 --- a/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequest.java +++ b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java @@ -31,7 +31,7 @@ /** * */ -public abstract class NodesOperationRequest extends ActionRequest { +public abstract class BaseNodesRequest extends ActionRequest { public static String[] ALL_NODES = Strings.EMPTY_ARRAY; @@ -39,16 +39,16 @@ public abstract class NodesOperationRequest ext private TimeValue timeout; - protected NodesOperationRequest() { + protected BaseNodesRequest() { } - protected NodesOperationRequest(ActionRequest request, String... nodesIds) { + protected BaseNodesRequest(ActionRequest request, String... nodesIds) { super(request); this.nodesIds = nodesIds; } - protected NodesOperationRequest(String... nodesIds) { + protected BaseNodesRequest(String... nodesIds) { this.nodesIds = nodesIds; } diff --git a/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java similarity index 79% rename from src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java rename to src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java index b2a699529bbfb..db0a2a89aa7cc 100644 --- a/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java +++ b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java @@ -34,16 +34,16 @@ /** * */ -public abstract class NodesOperationResponse extends ActionResponse implements Iterable { +public abstract class BaseNodesResponse extends ActionResponse implements Iterable { private ClusterName clusterName; - protected NodeResponse[] nodes; - private Map nodesMap; + protected TNodeResponse[] nodes; + private Map nodesMap; - protected NodesOperationResponse() { + protected BaseNodesResponse() { } - protected NodesOperationResponse(ClusterName clusterName, NodeResponse[] nodes) { + protected BaseNodesResponse(ClusterName clusterName, TNodeResponse[] nodes) { this.clusterName = clusterName; this.nodes = nodes; } @@ -64,23 +64,23 @@ public String getClusterNameAsString() { return this.clusterName.value(); } - public NodeResponse[] getNodes() { + public TNodeResponse[] getNodes() { return nodes; } - public NodeResponse getAt(int position) { + public TNodeResponse getAt(int position) { return nodes[position]; } @Override - public Iterator iterator() { + public Iterator iterator() { return getNodesMap().values().iterator(); } - public Map getNodesMap() { + public Map getNodesMap() { if (nodesMap == null) { nodesMap = Maps.newHashMap(); - for (NodeResponse nodeResponse : nodes) { + for (TNodeResponse nodeResponse : nodes) { nodesMap.put(nodeResponse.getNode().id(), nodeResponse); } } diff --git a/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java b/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java index 303671db5959d..cf8190f2c32fc 100644 --- a/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java @@ -26,7 +26,7 @@ /** */ -public abstract class NodesOperationRequestBuilder, Response extends NodesOperationResponse, RequestBuilder extends NodesOperationRequestBuilder> +public abstract class NodesOperationRequestBuilder, Response extends BaseNodesResponse, RequestBuilder extends NodesOperationRequestBuilder> extends ActionRequestBuilder { protected NodesOperationRequestBuilder(ElasticsearchClient client, Action action, Request request) { diff --git a/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java b/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java similarity index 87% rename from src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java rename to src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java index 78503930357a7..065f4ad744a2f 100644 --- a/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java +++ b/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java @@ -39,7 +39,7 @@ /** * */ -public abstract class TransportNodesOperationAction extends HandledTransportAction { +public abstract class TransportNodesAction extends HandledTransportAction { protected final ClusterName clusterName; protected final ClusterService clusterService; @@ -47,9 +47,9 @@ public abstract class TransportNodesOperationAction request, Class nodeRequest, String nodeExecutor) { + protected TransportNodesAction(Settings settings, String actionName, ClusterName clusterName, ThreadPool threadPool, + ClusterService clusterService, TransportService transportService, ActionFilters actionFilters, + Class request, Class nodeRequest, String nodeExecutor) { super(settings, actionName, threadPool, transportService, actionFilters, request); this.clusterName = clusterName; this.clusterService = clusterService; @@ -61,7 +61,7 @@ protected TransportNodesOperationAction(Settings settings, String actionName, Cl } @Override - protected void doExecute(Request request, ActionListener listener) { + protected void doExecute(NodesRequest request, ActionListener listener) { new AsyncAction(request, listener).start(); } @@ -69,9 +69,9 @@ protected boolean transportCompress() { return false; } - protected abstract Response newResponse(Request request, AtomicReferenceArray nodesResponses); + protected abstract NodesResponse newResponse(NodesRequest request, AtomicReferenceArray nodesResponses); - protected abstract NodeRequest newNodeRequest(String nodeId, Request request); + protected abstract NodeRequest newNodeRequest(String nodeId, NodesRequest request); protected abstract NodeResponse newNodeResponse(); @@ -85,14 +85,14 @@ protected String[] filterNodeIds(DiscoveryNodes nodes, String[] nodesIds) { private class AsyncAction { - private final Request request; + private final NodesRequest request; private final String[] nodesIds; - private final ActionListener listener; + private final ActionListener listener; private final ClusterState clusterState; private final AtomicReferenceArray responses; private final AtomicInteger counter = new AtomicInteger(); - private AsyncAction(Request request, ActionListener listener) { + private AsyncAction(NodesRequest request, ActionListener listener) { this.request = request; this.listener = listener; clusterState = clusterService.state(); @@ -179,7 +179,7 @@ private void onFailure(int idx, String nodeId, Throwable t) { } private void finishHim() { - Response finalResponse; + NodesResponse finalResponse; try { finalResponse = newResponse(request, responses); } catch (Throwable t) { diff --git a/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java b/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java index e9ce5204aaf69..3e9897c7c8531 100644 --- a/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java +++ b/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java @@ -22,12 +22,11 @@ import org.elasticsearch.action.Action; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionResponse; -import org.elasticsearch.client.Client; import org.elasticsearch.client.ElasticsearchClient; /** */ -public abstract class SingleShardOperationRequestBuilder, Response extends ActionResponse, RequestBuilder extends SingleShardOperationRequestBuilder> +public abstract class SingleShardOperationRequestBuilder, Response extends ActionResponse, RequestBuilder extends SingleShardOperationRequestBuilder> extends ActionRequestBuilder { protected SingleShardOperationRequestBuilder(ElasticsearchClient client, Action action, Request request) { diff --git a/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequest.java b/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java similarity index 89% rename from src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequest.java rename to src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java index 74db043570928..180ea877618ae 100644 --- a/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequest.java +++ b/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java @@ -33,7 +33,7 @@ /** * */ -public abstract class SingleShardOperationRequest extends ActionRequest implements IndicesRequest { +public abstract class SingleShardRequest extends ActionRequest implements IndicesRequest { ShardId internalShardId; @@ -41,18 +41,18 @@ public abstract class SingleShardOperationRequest extends TransportAction { +public abstract class TransportSingleShardAction extends TransportAction { protected final ClusterService clusterService; @@ -53,8 +53,8 @@ public abstract class TransportShardSingleOperationAction request, String executor) { + protected TransportSingleShardAction(Settings settings, String actionName, ThreadPool threadPool, ClusterService clusterService, TransportService transportService, ActionFilters actionFilters, + Class request, String executor) { super(settings, actionName, threadPool, actionFilters); this.clusterService = clusterService; this.transportService = transportService; diff --git a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java b/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java index 96fdd91c84f13..c33e32eabb40f 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java +++ b/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.termvectors; import com.carrotsearch.hppc.IntArrayList; -import org.elasticsearch.action.support.single.shard.SingleShardOperationRequest; +import org.elasticsearch.action.support.single.shard.SingleShardRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; -public class MultiTermVectorsShardRequest extends SingleShardOperationRequest { +public class MultiTermVectorsShardRequest extends SingleShardRequest { private int shardId; private String preference; diff --git a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java b/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java index 9198013d3074b..bc1332e4da3a2 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java +++ b/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java @@ -27,7 +27,7 @@ import org.elasticsearch.action.DocumentRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.action.get.MultiGetRequest; -import org.elasticsearch.action.support.single.shard.SingleShardOperationRequest; +import org.elasticsearch.action.support.single.shard.SingleShardRequest; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -50,7 +50,7 @@ * Note, the {@link #index()}, {@link #type(String)} and {@link #id(String)} are * required. */ -public class TermVectorsRequest extends SingleShardOperationRequest implements DocumentRequest { +public class TermVectorsRequest extends SingleShardRequest implements DocumentRequest { private String type; diff --git a/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java b/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java index f2e9a16d98952..9aad9cb479b85 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java +++ b/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java @@ -23,7 +23,7 @@ import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.TransportActions; -import org.elasticsearch.action.support.single.shard.TransportShardSingleOperationAction; +import org.elasticsearch.action.support.single.shard.TransportSingleShardAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.ShardIterator; @@ -36,7 +36,7 @@ import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -public class TransportShardMultiTermsVectorAction extends TransportShardSingleOperationAction { +public class TransportShardMultiTermsVectorAction extends TransportSingleShardAction { private final IndicesService indicesService; diff --git a/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java b/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java index e03abfee230b6..623ced5d5ef1f 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java +++ b/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java @@ -22,15 +22,15 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.RoutingMissingException; import org.elasticsearch.action.support.ActionFilters; -import org.elasticsearch.action.support.single.shard.TransportShardSingleOperationAction; +import org.elasticsearch.action.support.single.shard.TransportSingleShardAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.IndexShard; +import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; @@ -38,7 +38,7 @@ /** * Performs the get operation. */ -public class TransportTermVectorsAction extends TransportShardSingleOperationAction { +public class TransportTermVectorsAction extends TransportSingleShardAction { private final IndicesService indicesService; diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java b/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java index db4624d7464e3..0171a90ec95d3 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java +++ b/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.TermsEnum; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentHelper; @@ -38,7 +38,7 @@ import static org.elasticsearch.index.query.QueryBuilders.boolQuery; -public class DfsOnlyRequest extends BroadcastOperationRequest { +public class DfsOnlyRequest extends BroadcastRequest { private SearchRequest searchRequest = new SearchRequest(); diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyResponse.java b/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyResponse.java index 150e7e2289b5c..db1cddff04668 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyResponse.java +++ b/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyResponse.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.termvectors.dfs; import org.elasticsearch.action.ShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.TimeValue; @@ -32,7 +32,7 @@ /** * A response of a dfs only request. */ -public class DfsOnlyResponse extends BroadcastOperationResponse { +public class DfsOnlyResponse extends BroadcastResponse { private AggregatedDfs dfs; private long tookInMillis; diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java b/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java index c18892aed67f4..687910c592250 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java +++ b/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.termvectors.dfs; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest; +import org.elasticsearch.action.support.broadcast.BroadcastShardRequest; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamInput; @@ -29,7 +29,7 @@ import java.io.IOException; -class ShardDfsOnlyRequest extends BroadcastShardOperationRequest { +class ShardDfsOnlyRequest extends BroadcastShardRequest { private ShardSearchTransportRequest shardSearchRequest = new ShardSearchTransportRequest(); diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyResponse.java b/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyResponse.java index 8f41446797249..688a475ea64c3 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyResponse.java +++ b/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyResponse.java @@ -19,7 +19,7 @@ package org.elasticsearch.action.termvectors.dfs; -import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastShardResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.index.shard.ShardId; @@ -30,7 +30,7 @@ /** * */ -class ShardDfsOnlyResponse extends BroadcastShardOperationResponse { +class ShardDfsOnlyResponse extends BroadcastShardResponse { private DfsSearchResult dfsSearchResult = new DfsSearchResult(); diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java b/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java index c1d698725e9d1..682ff47377cb8 100644 --- a/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java +++ b/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException; -import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction; +import org.elasticsearch.action.support.broadcast.TransportBroadcastAction; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; @@ -51,7 +51,7 @@ /** * Get the dfs only with no fetch phase. This is for internal use only. */ -public class TransportDfsOnlyAction extends TransportBroadcastOperationAction { +public class TransportDfsOnlyAction extends TransportBroadcastAction { public static final String NAME = "internal:index/termvectors/dfs"; diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java index 5b66fafec1242..3d5d938bde45f 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.metadata; -import org.elasticsearch.action.support.master.MasterNodeOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.TimeoutClusterStateUpdateTask; @@ -223,7 +223,7 @@ public static class Request { final String index; TimeValue timeout = TimeValue.timeValueSeconds(10); - TimeValue masterTimeout = MasterNodeOperationRequest.DEFAULT_MASTER_NODE_TIMEOUT; + TimeValue masterTimeout = MasterNodeRequest.DEFAULT_MASTER_NODE_TIMEOUT; public Request(String index) { this.index = index; diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java index 3e945b161eb44..840532e863768 100644 --- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java +++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java @@ -23,7 +23,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.elasticsearch.action.admin.indices.alias.Alias; -import org.elasticsearch.action.support.master.MasterNodeOperationRequest; +import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.TimeoutClusterStateUpdateTask; @@ -231,7 +231,7 @@ public static class PutRequest { List aliases = Lists.newArrayList(); Map customs = Maps.newHashMap(); - TimeValue masterTimeout = MasterNodeOperationRequest.DEFAULT_MASTER_NODE_TIMEOUT; + TimeValue masterTimeout = MasterNodeRequest.DEFAULT_MASTER_NODE_TIMEOUT; public PutRequest(String cause, String name) { this.cause = cause; @@ -304,7 +304,7 @@ public IndexTemplateMetaData template() { public static class RemoveRequest { final String name; - TimeValue masterTimeout = MasterNodeOperationRequest.DEFAULT_MASTER_NODE_TIMEOUT; + TimeValue masterTimeout = MasterNodeRequest.DEFAULT_MASTER_NODE_TIMEOUT; public RemoveRequest(String name) { this.name = name; diff --git a/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java b/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java index 3b7c765d7d136..4573e2dac127d 100644 --- a/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java +++ b/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java @@ -24,8 +24,8 @@ import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.FailedNodeException; -import org.elasticsearch.action.support.nodes.NodeOperationResponse; -import org.elasticsearch.action.support.nodes.NodesOperationResponse; +import org.elasticsearch.action.support.nodes.BaseNodeResponse; +import org.elasticsearch.action.support.nodes.BaseNodesResponse; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.node.DiscoveryNode; @@ -48,29 +48,29 @@ * and once the results are back, it makes sure to schedule a reroute to make sure those results will * be taken into account. */ -public abstract class AsyncShardFetch implements Releasable { +public abstract class AsyncShardFetch implements Releasable { /** * An action that lists the relevant shard data that needs to be fetched. */ - public interface List, NodeResponse extends NodeOperationResponse> { + public interface List, NodeResponse extends BaseNodeResponse> { void list(ShardId shardId, IndexMetaData indexMetaData, String[] nodesIds, ActionListener listener); } protected final ESLogger logger; protected final String type; private final ShardId shardId; - private final List, T> action; + private final List, T> action; private final Map> cache = new HashMap<>(); private final Set nodesToIgnore = new HashSet<>(); private boolean closed; @SuppressWarnings("unchecked") - protected AsyncShardFetch(ESLogger logger, String type, ShardId shardId, List, T> action) { + protected AsyncShardFetch(ESLogger logger, String type, ShardId shardId, List, T> action) { this.logger = logger; this.type = type; this.shardId = shardId; - this.action = (List, T>) action; + this.action = (List, T>) action; } public synchronized void close() { @@ -253,9 +253,9 @@ private boolean hasAnyNodeFetching(Map> shardCache) { // visible for testing void asyncFetch(final ShardId shardId, final String[] nodesIds, final MetaData metaData) { IndexMetaData indexMetaData = metaData.index(shardId.getIndex()); - action.list(shardId, indexMetaData, nodesIds, new ActionListener>() { + action.list(shardId, indexMetaData, nodesIds, new ActionListener>() { @Override - public void onResponse(NodesOperationResponse response) { + public void onResponse(BaseNodesResponse response) { processAsyncFetch(shardId, response.getNodes(), response.failures()); } @@ -274,7 +274,7 @@ public void onFailure(Throwable e) { * The result of a fetch operation. Make sure to first check {@link #hasData()} before * fetching the actual data. */ - public static class FetchResult { + public static class FetchResult { private final ShardId shardId; private final Map data; diff --git a/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java b/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java index a7647f73e50a6..f4385947dc873 100644 --- a/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java +++ b/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java @@ -25,8 +25,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.apache.lucene.util.CollectionUtil; -import org.elasticsearch.action.support.nodes.NodeOperationResponse; -import org.elasticsearch.action.support.nodes.NodesOperationResponse; +import org.elasticsearch.action.support.nodes.BaseNodeResponse; +import org.elasticsearch.action.support.nodes.BaseNodesResponse; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; @@ -513,12 +513,12 @@ public int compare(DiscoveryNode o1, DiscoveryNode o2) { return changed; } - static class InternalAsyncFetch extends AsyncShardFetch { + static class InternalAsyncFetch extends AsyncShardFetch { private final ClusterService clusterService; private final AllocationService allocationService; - public InternalAsyncFetch(ESLogger logger, String type, ShardId shardId, List, T> action, + public InternalAsyncFetch(ESLogger logger, String type, ShardId shardId, List, T> action, ClusterService clusterService, AllocationService allocationService) { super(logger, type, shardId, action); this.clusterService = clusterService; diff --git a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java b/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java index 900a2e7ffc7c6..6fa2043328382 100644 --- a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java +++ b/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java @@ -45,7 +45,7 @@ /** * */ -public class TransportNodesListGatewayMetaState extends TransportNodesOperationAction { +public class TransportNodesListGatewayMetaState extends TransportNodesAction { public static final String ACTION_NAME = "internal:gateway/local/meta_state"; @@ -113,7 +113,7 @@ protected boolean accumulateExceptions() { return true; } - static class Request extends NodesOperationRequest { + static class Request extends BaseNodesRequest { public Request() { } @@ -133,7 +133,7 @@ public void writeTo(StreamOutput out) throws IOException { } } - public static class NodesGatewayMetaState extends NodesOperationResponse { + public static class NodesGatewayMetaState extends BaseNodesResponse { private FailedNodeException[] failures; @@ -170,7 +170,7 @@ public void writeTo(StreamOutput out) throws IOException { } - static class NodeRequest extends NodeOperationRequest { + static class NodeRequest extends BaseNodeRequest { NodeRequest() { } @@ -190,7 +190,7 @@ public void writeTo(StreamOutput out) throws IOException { } } - public static class NodeGatewayMetaState extends NodeOperationResponse { + public static class NodeGatewayMetaState extends BaseNodeResponse { private MetaData metaData; diff --git a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java b/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java index 649e0a1c31ab1..d5692b3a5aa24 100644 --- a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java +++ b/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java @@ -50,7 +50,7 @@ * We use this to find out which node holds the latest shard version and which of them used to be a primary in order to allocate * shards after node or cluster restarts. */ -public class TransportNodesListGatewayStartedShards extends TransportNodesOperationAction +public class TransportNodesListGatewayStartedShards extends TransportNodesAction implements AsyncShardFetch.List { public static final String ACTION_NAME = "internal:gateway/local/started_shards"; @@ -148,7 +148,7 @@ protected boolean accumulateExceptions() { return true; } - static class Request extends NodesOperationRequest { + static class Request extends BaseNodesRequest { private ShardId shardId; private String indexUUID; @@ -186,7 +186,7 @@ public String getIndexUUID() { } } - public static class NodesGatewayStartedShards extends NodesOperationResponse { + public static class NodesGatewayStartedShards extends BaseNodesResponse { private FailedNodeException[] failures; @@ -221,7 +221,7 @@ public void writeTo(StreamOutput out) throws IOException { } - static class NodeRequest extends NodeOperationRequest { + static class NodeRequest extends BaseNodeRequest { private ShardId shardId; private String indexUUID; @@ -258,7 +258,7 @@ public String getIndexUUID() { } } - public static class NodeGatewayStartedShards extends NodeOperationResponse { + public static class NodeGatewayStartedShards extends BaseNodeResponse { private long version = -1; diff --git a/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java b/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java index 04cfa6bda3dfd..3490f6d2d8c6a 100644 --- a/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java +++ b/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java @@ -58,7 +58,7 @@ /** * */ -public class TransportNodesListShardStoreMetaData extends TransportNodesOperationAction +public class TransportNodesListShardStoreMetaData extends TransportNodesAction implements AsyncShardFetch.List { public static final String ACTION_NAME = "internal:cluster/nodes/indices/shard/store"; @@ -241,7 +241,7 @@ public String syncId() { } - static class Request extends NodesOperationRequest { + static class Request extends BaseNodesRequest { private ShardId shardId; @@ -277,7 +277,7 @@ public void writeTo(StreamOutput out) throws IOException { } } - public static class NodesStoreFilesMetaData extends NodesOperationResponse { + public static class NodesStoreFilesMetaData extends BaseNodesResponse { private FailedNodeException[] failures; @@ -314,7 +314,7 @@ public void writeTo(StreamOutput out) throws IOException { } - static class NodeRequest extends NodeOperationRequest { + static class NodeRequest extends BaseNodeRequest { private ShardId shardId; @@ -344,7 +344,7 @@ public void writeTo(StreamOutput out) throws IOException { } } - public static class NodeStoreFilesMetaData extends NodeOperationResponse { + public static class NodeStoreFilesMetaData extends BaseNodeResponse { private StoreFilesMetaData storeFilesMetaData; diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestActions.java b/src/main/java/org/elasticsearch/rest/action/support/RestActions.java index 67ceb83c33b3e..bd17c1d594497 100644 --- a/src/main/java/org/elasticsearch/rest/action/support/RestActions.java +++ b/src/main/java/org/elasticsearch/rest/action/support/RestActions.java @@ -22,7 +22,7 @@ import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.support.QuerySourceBuilder; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.lucene.uid.Versions; @@ -62,7 +62,7 @@ static final class Fields { static final XContentBuilderString FAILURES = new XContentBuilderString("failures"); } - public static void buildBroadcastShardsHeader(XContentBuilder builder, ToXContent.Params params, BroadcastOperationResponse response) throws IOException { + public static void buildBroadcastShardsHeader(XContentBuilder builder, ToXContent.Params params, BroadcastResponse response) throws IOException { buildBroadcastShardsHeader(builder, params, response.getTotalShards(), response.getSuccessfulShards(), response.getFailedShards(), response.getShardFailures()); } diff --git a/src/main/java/org/elasticsearch/tribe/TribeService.java b/src/main/java/org/elasticsearch/tribe/TribeService.java index 540d3254e5ca7..546977c3acad6 100644 --- a/src/main/java/org/elasticsearch/tribe/TribeService.java +++ b/src/main/java/org/elasticsearch/tribe/TribeService.java @@ -23,7 +23,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction; +import org.elasticsearch.action.support.master.TransportMasterNodeReadAction; import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.block.ClusterBlock; import org.elasticsearch.cluster.block.ClusterBlockLevel; @@ -99,7 +99,7 @@ public static Settings processSettings(Settings settings) { if (sb.get("cluster.name") == null) { sb.put("cluster.name", "tribe_" + Strings.randomBase64UUID()); // make sure it won't join other tribe nodes in the same JVM } - sb.put(TransportMasterNodeReadOperationAction.FORCE_LOCAL_SETTING, true); + sb.put(TransportMasterNodeReadAction.FORCE_LOCAL_SETTING, true); return sb.build(); } diff --git a/src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java b/src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java index 2c27101c5d2e1..4b3ad48749595 100644 --- a/src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java +++ b/src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java @@ -32,14 +32,9 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; -import static org.elasticsearch.index.query.QueryBuilders.andQuery; -import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.index.query.QueryBuilders.notQuery; -import static org.elasticsearch.index.query.QueryBuilders.termQuery; +import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.Matchers.lessThan; /** @@ -90,7 +85,7 @@ public void onResponse(NodesHotThreadsResponse nodeHotThreads) { boolean success = false; try { assertThat(nodeHotThreads, notNullValue()); - Map nodesMap = nodeHotThreads.getNodesMap(); + Map nodesMap = nodeHotThreads.getNodesMap(); assertThat(nodesMap.size(), equalTo(cluster().size())); for (NodeHotThreads ht : nodeHotThreads) { assertNotNull(ht.getHotThreads()); diff --git a/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java b/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java index b8e97efe31dac..ece5757355bfd 100644 --- a/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java +++ b/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java @@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableSet; import org.elasticsearch.Version; import org.elasticsearch.action.FailedNodeException; -import org.elasticsearch.action.support.nodes.NodeOperationResponse; +import org.elasticsearch.action.support.nodes.BaseNodeResponse; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.node.DiscoveryNodes; @@ -314,7 +314,7 @@ public boolean apply(Object input) { } - static class Response extends NodeOperationResponse { + static class Response extends BaseNodeResponse { public Response(DiscoveryNode node) { super(node); diff --git a/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java b/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java index 3cc4737811650..819c1d5ab1dca 100644 --- a/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java +++ b/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java @@ -50,7 +50,7 @@ import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.ShardSearchFailure; -import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse; +import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.cluster.block.ClusterBlock; @@ -152,7 +152,7 @@ public static void assertBlocked(ActionRequestBuilder builder, ClusterBlock expe } } - public static String formatShardStatus(BroadcastOperationResponse response) { + public static String formatShardStatus(BroadcastResponse response) { String msg = " Total shards: " + response.getTotalShards() + " Successful shards: " + response.getSuccessfulShards() + " & " + response.getFailedShards() + " shard failures:"; for (ShardOperationFailedException failure : response.getShardFailures()) { @@ -321,12 +321,12 @@ public static void assertFailures(PercolateResponse percolateResponse) { assertVersionSerializable(percolateResponse); } - public static void assertNoFailures(BroadcastOperationResponse response) { + public static void assertNoFailures(BroadcastResponse response) { assertThat("Unexpected ShardFailures: " + Arrays.toString(response.getShardFailures()), response.getFailedShards(), equalTo(0)); assertVersionSerializable(response); } - public static void assertAllSuccessful(BroadcastOperationResponse response) { + public static void assertAllSuccessful(BroadcastResponse response) { assertNoFailures(response); assertThat("Expected all shards successful but got successful [" + response.getSuccessfulShards() + "] total [" + response.getTotalShards() + "]", response.getTotalShards(), equalTo(response.getSuccessfulShards()));