Skip to content

Commit

Permalink
Simplify Transport*OperationAction names
Browse files Browse the repository at this point in the history
As a follow up to elastic#11332, this commit simplifies more class names by remove the superfluous Operation:

TransportBroadcastOperationAction -> TransportBroadcastAction
TransportMasterNodeOperationAction -> TransportMasterNodeAction
TransportMasterNodeReadOperationAction -> TransportMasterNodeReadAction
TransportShardSingleOperationAction -> TransportSingleShardAction
  • Loading branch information
bleskes committed May 26, 2015
1 parent f0c18eb commit 23d12d9
Show file tree
Hide file tree
Showing 183 changed files with 463 additions and 508 deletions.
Expand Up @@ -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;
Expand All @@ -37,7 +37,7 @@
/**
*
*/
public class ClusterHealthRequest extends MasterNodeReadOperationRequest<ClusterHealthRequest> implements IndicesRequest.Replaceable {
public class ClusterHealthRequest extends MasterNodeReadRequest<ClusterHealthRequest> implements IndicesRequest.Replaceable {

private String[] indices;
private TimeValue timeout = new TimeValue(30, TimeUnit.SECONDS);
Expand Down
Expand Up @@ -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;
Expand All @@ -37,7 +37,7 @@
/**
*
*/
public class TransportClusterHealthAction extends TransportMasterNodeReadOperationAction<ClusterHealthRequest, ClusterHealthResponse> {
public class TransportClusterHealthAction extends TransportMasterNodeReadAction<ClusterHealthRequest, ClusterHealthResponse> {

private final ClusterName clusterName;
private final GatewayAllocator gatewayAllocator;
Expand Down
Expand Up @@ -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;
Expand All @@ -28,7 +28,7 @@

/**
*/
public class NodeHotThreads extends NodeOperationResponse {
public class NodeHotThreads extends BaseNodeResponse {

private String hotThreads;

Expand Down
Expand Up @@ -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;
Expand All @@ -30,7 +30,7 @@

/**
*/
public class NodesHotThreadsRequest extends NodesOperationRequest<NodesHotThreadsRequest> {
public class NodesHotThreadsRequest extends BaseNodesRequest<NodesHotThreadsRequest> {

int threads = 3;
String type = "cpu";
Expand Down
Expand Up @@ -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;
Expand All @@ -28,7 +28,7 @@

/**
*/
public class NodesHotThreadsResponse extends NodesOperationResponse<NodeHotThreads> {
public class NodesHotThreadsResponse extends BaseNodesResponse<NodeHotThreads> {

NodesHotThreadsResponse() {
}
Expand Down
Expand Up @@ -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;
Expand All @@ -41,7 +41,7 @@
/**
*
*/
public class TransportNodesHotThreadsAction extends TransportNodesOperationAction<NodesHotThreadsRequest, NodesHotThreadsResponse, TransportNodesHotThreadsAction.NodeRequest, NodeHotThreads> {
public class TransportNodesHotThreadsAction extends TransportNodesAction<NodesHotThreadsRequest, NodesHotThreadsResponse, TransportNodesHotThreadsAction.NodeRequest, NodeHotThreads> {

@Inject
public TransportNodesHotThreadsAction(Settings settings, ClusterName clusterName, ThreadPool threadPool,
Expand Down Expand Up @@ -92,7 +92,7 @@ protected boolean accumulateExceptions() {
return false;
}

static class NodeRequest extends NodeOperationRequest {
static class NodeRequest extends BaseNodeRequest {

NodesHotThreadsRequest request;

Expand Down
Expand Up @@ -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;
Expand All @@ -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<String, String> serviceAttributes;
Expand Down
Expand Up @@ -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;

Expand All @@ -28,7 +28,7 @@
/**
* A request to get node (cluster) level information.
*/
public class NodesInfoRequest extends NodesOperationRequest<NodesInfoRequest> {
public class NodesInfoRequest extends BaseNodesRequest<NodesInfoRequest> {

private boolean settings = true;
private boolean os = true;
Expand Down
Expand Up @@ -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;
Expand All @@ -34,7 +34,7 @@
/**
*
*/
public class NodesInfoResponse extends NodesOperationResponse<NodeInfo> implements ToXContent {
public class NodesInfoResponse extends BaseNodesResponse<NodeInfo> implements ToXContent {

public NodesInfoResponse() {
}
Expand Down
Expand Up @@ -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;
Expand All @@ -40,7 +40,7 @@
/**
*
*/
public class TransportNodesInfoAction extends TransportNodesOperationAction<NodesInfoRequest, NodesInfoResponse, TransportNodesInfoAction.NodeInfoRequest, NodeInfo> {
public class TransportNodesInfoAction extends TransportNodesAction<NodesInfoRequest, NodesInfoResponse, TransportNodesInfoAction.NodeInfoRequest, NodeInfo> {

private final NodeService nodeService;

Expand Down Expand Up @@ -87,7 +87,7 @@ protected boolean accumulateExceptions() {
return false;
}

static class NodeInfoRequest extends NodeOperationRequest {
static class NodeInfoRequest extends BaseNodeRequest {

NodesInfoRequest request;

Expand Down
Expand Up @@ -19,19 +19,16 @@

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;
import org.elasticsearch.common.xcontent.XContentBuilder;
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;
Expand All @@ -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;

Expand Down
Expand Up @@ -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;

Expand All @@ -29,7 +29,7 @@
/**
* A request to get node (cluster) level stats.
*/
public class NodesStatsRequest extends NodesOperationRequest<NodesStatsRequest> {
public class NodesStatsRequest extends BaseNodesRequest<NodesStatsRequest> {

private CommonStatsFlags indices = new CommonStatsFlags();
private boolean os;
Expand Down
Expand Up @@ -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;
Expand All @@ -32,7 +32,7 @@
/**
*
*/
public class NodesStatsResponse extends NodesOperationResponse<NodeStats> implements ToXContent {
public class NodesStatsResponse extends BaseNodesResponse<NodeStats> implements ToXContent {

NodesStatsResponse() {
}
Expand Down
Expand Up @@ -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;
Expand All @@ -40,7 +40,7 @@
/**
*
*/
public class TransportNodesStatsAction extends TransportNodesOperationAction<NodesStatsRequest, NodesStatsResponse, TransportNodesStatsAction.NodeStatsRequest, NodeStats> {
public class TransportNodesStatsAction extends TransportNodesAction<NodesStatsRequest, NodesStatsResponse, TransportNodesStatsAction.NodeStatsRequest, NodeStats> {

private final NodeService nodeService;

Expand Down Expand Up @@ -87,7 +87,7 @@ protected boolean accumulateExceptions() {
return false;
}

static class NodeStatsRequest extends NodeOperationRequest {
static class NodeStatsRequest extends BaseNodeRequest {

NodesStatsRequest request;

Expand Down
Expand Up @@ -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;
Expand All @@ -36,7 +36,7 @@
/**
* Transport action for unregister repository operation
*/
public class TransportDeleteRepositoryAction extends TransportMasterNodeOperationAction<DeleteRepositoryRequest, DeleteRepositoryResponse> {
public class TransportDeleteRepositoryAction extends TransportMasterNodeAction<DeleteRepositoryRequest, DeleteRepositoryResponse> {

private final RepositoriesService repositoriesService;

Expand Down
Expand Up @@ -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;
Expand All @@ -33,7 +32,7 @@
/**
* Get repository request
*/
public class GetRepositoriesRequest extends MasterNodeReadOperationRequest<GetRepositoriesRequest> {
public class GetRepositoriesRequest extends MasterNodeReadRequest<GetRepositoriesRequest> {

private String[] repositories = Strings.EMPTY_ARRAY;

Expand Down
Expand Up @@ -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;
Expand All @@ -39,7 +39,7 @@
/**
* Transport action for get repositories operation
*/
public class TransportGetRepositoriesAction extends TransportMasterNodeReadOperationAction<GetRepositoriesRequest, GetRepositoriesResponse> {
public class TransportGetRepositoriesAction extends TransportMasterNodeReadAction<GetRepositoriesRequest, GetRepositoriesResponse> {

@Inject
public TransportGetRepositoriesAction(Settings settings, TransportService transportService, ClusterService clusterService,
Expand Down
Expand Up @@ -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;
Expand All @@ -36,7 +36,7 @@
/**
* Transport action for register repository operation
*/
public class TransportPutRepositoryAction extends TransportMasterNodeOperationAction<PutRepositoryRequest, PutRepositoryResponse> {
public class TransportPutRepositoryAction extends TransportMasterNodeAction<PutRepositoryRequest, PutRepositoryResponse> {

private final RepositoriesService repositoriesService;

Expand Down
Expand Up @@ -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;
Expand All @@ -37,7 +37,7 @@
/**
* Transport action for verifying repository operation
*/
public class TransportVerifyRepositoryAction extends TransportMasterNodeOperationAction<VerifyRepositoryRequest, VerifyRepositoryResponse> {
public class TransportVerifyRepositoryAction extends TransportMasterNodeAction<VerifyRepositoryRequest, VerifyRepositoryResponse> {

private final RepositoriesService repositoriesService;

Expand Down

0 comments on commit 23d12d9

Please sign in to comment.