Skip to content

Commit

Permalink
Rename IndicesAdminClient#existsAliases to IndicesAdminClient#aliases…
Browse files Browse the repository at this point in the history 
…Exist.

Closes elastic#3330
  • Loading branch information
@martijnvg
martijnvg committed Jul 15, 2013
1 parent 647bf2f commit ac1df3a
Show file tree
Hide file tree
Showing 10 changed files with 56 additions and 63 deletions.
6 changes: 3 additions & 3 deletions src/main/java/org/elasticsearch/action/ActionModule.java
View file
Expand Up @@ -42,8 +42,8 @@
import org.elasticsearch.action.admin.cluster.state.TransportClusterStateAction;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesAction;
import org.elasticsearch.action.admin.indices.alias.TransportIndicesAliasesAction;
import org.elasticsearch.action.admin.indices.alias.exists.IndicesExistsAliasesAction;
import org.elasticsearch.action.admin.indices.alias.exists.TransportIndicesExistsAliasesAction;
import org.elasticsearch.action.admin.indices.alias.exists.AliasesExistAction;
import org.elasticsearch.action.admin.indices.alias.exists.TransportAliasesExistAction;
import org.elasticsearch.action.admin.indices.alias.get.IndicesGetAliasesAction;
import org.elasticsearch.action.admin.indices.alias.get.TransportIndicesGetAliasesAction;
import org.elasticsearch.action.admin.indices.analyze.AnalyzeAction;
Expand Down Expand Up @@ -206,7 +206,7 @@ protected void configure() {
registerAction(PutWarmerAction.INSTANCE, TransportPutWarmerAction.class);
registerAction(DeleteWarmerAction.INSTANCE, TransportDeleteWarmerAction.class);
registerAction(IndicesGetAliasesAction.INSTANCE, TransportIndicesGetAliasesAction.class);
registerAction(IndicesExistsAliasesAction.INSTANCE, TransportIndicesExistsAliasesAction.class);
registerAction(AliasesExistAction.INSTANCE, TransportAliasesExistAction.class);

registerAction(IndexAction.INSTANCE, TransportIndexAction.class);
registerAction(GetAction.INSTANCE, TransportGetAction.class);
Expand Down
14 changes: 7 additions & 7 deletions ...as/exists/IndicesExistsAliasesAction.java → ...ices/alias/exists/AliasesExistAction.java
View file
Expand Up @@ -25,22 +25,22 @@

/**
*/
public class IndicesExistsAliasesAction extends IndicesAction<IndicesGetAliasesRequest, IndicesExistsAliasesResponse, IndicesExistsAliasesRequestBuilder> {
public class AliasesExistAction extends IndicesAction<IndicesGetAliasesRequest, AliasesExistResponse, AliasesExistRequestBuilder> {

public static final IndicesExistsAliasesAction INSTANCE = new IndicesExistsAliasesAction();
public static final AliasesExistAction INSTANCE = new AliasesExistAction();
public static final String NAME = "indices/exists/aliases";

private IndicesExistsAliasesAction() {
private AliasesExistAction() {
super(NAME);
}

@Override
public IndicesExistsAliasesRequestBuilder newRequestBuilder(IndicesAdminClient client) {
return new IndicesExistsAliasesRequestBuilder(client);
public AliasesExistRequestBuilder newRequestBuilder(IndicesAdminClient client) {
return new AliasesExistRequestBuilder(client);
}

@Override
public IndicesExistsAliasesResponse newResponse() {
return new IndicesExistsAliasesResponse();
public AliasesExistResponse newResponse() {
return new AliasesExistResponse();
}
}
8 changes: 4 additions & 4 deletions ...s/IndicesExistsAliasesRequestBuilder.java → ...as/exists/AliasesExistRequestBuilder.java
View file
Expand Up @@ -25,15 +25,15 @@

/**
*/
public class IndicesExistsAliasesRequestBuilder extends BaseIndicesAliasesRequestBuilder<IndicesExistsAliasesResponse, IndicesExistsAliasesRequestBuilder> {
public class AliasesExistRequestBuilder extends BaseIndicesAliasesRequestBuilder<AliasesExistResponse, AliasesExistRequestBuilder> {

public IndicesExistsAliasesRequestBuilder(IndicesAdminClient client, String... aliases) {
public AliasesExistRequestBuilder(IndicesAdminClient client, String... aliases) {
super(client, aliases);
}

@Override
protected void doExecute(ActionListener<IndicesExistsAliasesResponse> listener) {
((IndicesAdminClient) client).existsAliases(request, listener);
protected void doExecute(ActionListener<AliasesExistResponse> listener) {
((IndicesAdminClient) client).aliasesExist(request, listener);
}

}
6 changes: 3 additions & 3 deletions .../exists/IndicesExistsAliasesResponse.java → ...es/alias/exists/AliasesExistResponse.java
View file
Expand Up @@ -27,15 +27,15 @@

/**
*/
public class IndicesExistsAliasesResponse extends ActionResponse {
public class AliasesExistResponse extends ActionResponse {

private boolean exists;

public IndicesExistsAliasesResponse(boolean exists) {
public AliasesExistResponse(boolean exists) {
this.exists = exists;
}

IndicesExistsAliasesResponse() {
AliasesExistResponse() {
}

public boolean exists() {
Expand Down
14 changes: 7 additions & 7 deletions .../TransportIndicesExistsAliasesAction.java → ...s/exists/TransportAliasesExistAction.java
View file
Expand Up @@ -30,16 +30,16 @@

/**
*/
public class TransportIndicesExistsAliasesAction extends TransportMasterNodeOperationAction<IndicesGetAliasesRequest, IndicesExistsAliasesResponse> {
public class TransportAliasesExistAction extends TransportMasterNodeOperationAction<IndicesGetAliasesRequest, AliasesExistResponse> {

@Inject
public TransportIndicesExistsAliasesAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool) {
public TransportAliasesExistAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool) {
super(settings, transportService, clusterService, threadPool);
}

@Override
protected String transportAction() {
return IndicesExistsAliasesAction.NAME;
return AliasesExistAction.NAME;
}

@Override
Expand All @@ -53,17 +53,17 @@ protected IndicesGetAliasesRequest newRequest() {
}

@Override
protected IndicesExistsAliasesResponse newResponse() {
return new IndicesExistsAliasesResponse();
protected AliasesExistResponse newResponse() {
return new AliasesExistResponse();
}

@Override
protected IndicesExistsAliasesResponse masterOperation(IndicesGetAliasesRequest request, ClusterState state) throws ElasticSearchException {
protected AliasesExistResponse masterOperation(IndicesGetAliasesRequest request, ClusterState state) throws ElasticSearchException {
String[] concreteIndices = state.metaData().concreteIndices(request.indices(), request.ignoreIndices(), true);
request.indices(concreteIndices);

boolean result = state.metaData().hasAliases(request.aliases(), request.indices());
return new IndicesExistsAliasesResponse(result);
return new AliasesExistResponse(result);
}

}
10 changes: 5 additions & 5 deletions src/main/java/org/elasticsearch/client/IndicesAdminClient.java
View file
Expand Up @@ -24,8 +24,8 @@
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
import org.elasticsearch.action.admin.indices.alias.exists.IndicesExistsAliasesRequestBuilder;
import org.elasticsearch.action.admin.indices.alias.exists.IndicesExistsAliasesResponse;
import org.elasticsearch.action.admin.indices.alias.exists.AliasesExistRequestBuilder;
import org.elasticsearch.action.admin.indices.alias.exists.AliasesExistResponse;
import org.elasticsearch.action.admin.indices.alias.get.IndicesGetAliasesRequest;
import org.elasticsearch.action.admin.indices.alias.get.IndicesGetAliasesRequestBuilder;
import org.elasticsearch.action.admin.indices.alias.get.IndicesGetAliasesResponse;
Expand Down Expand Up @@ -504,22 +504,22 @@ public interface IndicesAdminClient {
/**
* Allows to check to existence of aliases from indices.
*/
IndicesExistsAliasesRequestBuilder prepareExistsAliases(String... aliases);
AliasesExistRequestBuilder prepareAliasesExist(String... aliases);

/**
* Check to existence of index aliases.
*
* @param request The result future
*/
ActionFuture<IndicesExistsAliasesResponse> existsAliases(IndicesGetAliasesRequest request);
ActionFuture<AliasesExistResponse> aliasesExist(IndicesGetAliasesRequest request);

/**
* Check the existence of specified index aliases.
*
* @param request The index aliases request
* @param listener A listener to be notified with a result
*/
void existsAliases(IndicesGetAliasesRequest request, ActionListener<IndicesExistsAliasesResponse> listener);
void aliasesExist(IndicesGetAliasesRequest request, ActionListener<AliasesExistResponse> listener);

/**
* Clear indices cache.
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/org/elasticsearch/client/support/AbstractIndicesAdminClient.java
View file
Expand Up @@ -25,9 +25,9 @@
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
import org.elasticsearch.action.admin.indices.alias.exists.IndicesExistsAliasesAction;
import org.elasticsearch.action.admin.indices.alias.exists.IndicesExistsAliasesRequestBuilder;
import org.elasticsearch.action.admin.indices.alias.exists.IndicesExistsAliasesResponse;
import org.elasticsearch.action.admin.indices.alias.exists.AliasesExistAction;
import org.elasticsearch.action.admin.indices.alias.exists.AliasesExistRequestBuilder;
import org.elasticsearch.action.admin.indices.alias.exists.AliasesExistResponse;
import org.elasticsearch.action.admin.indices.alias.get.IndicesGetAliasesAction;
import org.elasticsearch.action.admin.indices.alias.get.IndicesGetAliasesRequest;
import org.elasticsearch.action.admin.indices.alias.get.IndicesGetAliasesRequestBuilder;
Expand Down Expand Up @@ -203,18 +203,18 @@ public ActionFuture<ClearIndicesCacheResponse> clearCache(final ClearIndicesCach
}

@Override
public void existsAliases(IndicesGetAliasesRequest request, ActionListener<IndicesExistsAliasesResponse> listener) {
execute(IndicesExistsAliasesAction.INSTANCE, request, listener);
public void aliasesExist(IndicesGetAliasesRequest request, ActionListener<AliasesExistResponse> listener) {
execute(AliasesExistAction.INSTANCE, request, listener);
}

@Override
public ActionFuture<IndicesExistsAliasesResponse> existsAliases(IndicesGetAliasesRequest request) {
return execute(IndicesExistsAliasesAction.INSTANCE, request);
public ActionFuture<AliasesExistResponse> aliasesExist(IndicesGetAliasesRequest request) {
return execute(AliasesExistAction.INSTANCE, request);
}

@Override
public IndicesExistsAliasesRequestBuilder prepareExistsAliases(String... aliases) {
return new IndicesExistsAliasesRequestBuilder(this, aliases);
public AliasesExistRequestBuilder prepareAliasesExist(String... aliases) {
return new AliasesExistRequestBuilder(this, aliases);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/elasticsearch/rest/action/RestActionModule.java
View file
Expand Up @@ -37,7 +37,7 @@
import org.elasticsearch.rest.action.admin.indices.alias.RestIndicesAliasesAction;
import org.elasticsearch.rest.action.admin.indices.alias.delete.RestIndexDeleteAliasesAction;
import org.elasticsearch.rest.action.admin.indices.alias.get.RestIndicesGetAliasesAction;
import org.elasticsearch.rest.action.admin.indices.alias.head.RestIndicesHeadAliasesAction;
import org.elasticsearch.rest.action.admin.indices.alias.head.RestAliasesExistAction;
import org.elasticsearch.rest.action.admin.indices.alias.put.RestIndexPutAliasAction;
import org.elasticsearch.rest.action.admin.indices.analyze.RestAnalyzeAction;
import org.elasticsearch.rest.action.admin.indices.cache.clear.RestClearIndicesCacheAction;
Expand Down Expand Up @@ -124,7 +124,7 @@ protected void configure() {
bind(RestIndicesSegmentsAction.class).asEagerSingleton();
bind(RestGetIndicesAliasesAction.class).asEagerSingleton();
bind(RestIndicesGetAliasesAction.class).asEagerSingleton();
bind(RestIndicesHeadAliasesAction.class).asEagerSingleton();
bind(RestAliasesExistAction.class).asEagerSingleton();
bind(RestIndexDeleteAliasesAction.class).asEagerSingleton();
bind(RestIndexPutAliasAction.class).asEagerSingleton();
bind(RestIndicesAliasesAction.class).asEagerSingleton();
Expand Down
10 changes: 5 additions & 5 deletions ...as/head/RestIndicesHeadAliasesAction.java → ...es/alias/head/RestAliasesExistAction.java
View file
Expand Up @@ -21,7 +21,7 @@

import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.indices.alias.exists.IndicesExistsAliasesResponse;
import org.elasticsearch.action.admin.indices.alias.exists.AliasesExistResponse;
import org.elasticsearch.action.admin.indices.alias.get.IndicesGetAliasesRequest;
import org.elasticsearch.action.support.IgnoreIndices;
import org.elasticsearch.client.Client;
Expand All @@ -37,10 +37,10 @@

/**
*/
public class RestIndicesHeadAliasesAction extends BaseRestHandler {
public class RestAliasesExistAction extends BaseRestHandler {

@Inject
public RestIndicesHeadAliasesAction(Settings settings, Client client, RestController controller) {
public RestAliasesExistAction(Settings settings, Client client, RestController controller) {
super(settings, client);
controller.registerHandler(HEAD, "/_alias/{name}", this);
controller.registerHandler(HEAD, "/{index}/_alias/{name}", this);
Expand All @@ -57,10 +57,10 @@ public void handleRequest(final RestRequest request, final RestChannel channel)
getAliasesRequest.ignoreIndices(IgnoreIndices.fromString(request.param("ignore_indices")));
}

client.admin().indices().existsAliases(getAliasesRequest, new ActionListener<IndicesExistsAliasesResponse>() {
client.admin().indices().aliasesExist(getAliasesRequest, new ActionListener<AliasesExistResponse>() {

@Override
public void onResponse(IndicesExistsAliasesResponse response) {
public void onResponse(AliasesExistResponse response) {
try {
if (response.isExists()) {
channel.sendResponse(new StringRestResponse(OK));
Expand Down

0 comments on commit ac1df3a

Please sign in to comment.