Skip to content

Commit 38b1a5f

Browse files
committed
Remove RestGetAllAliasesAction (#31308)
We currently have a specific REST action to retrieve all aliaes, which uses internally the get index API. This doesn't seem to be required anymore though as the existing RestGetAliaesAction could as well take the requests with no indices and aliases specified. This commit removes the RestGetAllAliasesAction in favour of using RestGetAliasesAction also for requests that don't specify indices nor aliases. Similar to #31129.
1 parent 4f3a311 commit 38b1a5f

File tree

4 files changed

+3
-106
lines changed

4 files changed

+3
-106
lines changed

server/src/main/java/org/elasticsearch/action/ActionModule.java

-3
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@
254254
import org.elasticsearch.rest.action.admin.indices.RestFlushAction;
255255
import org.elasticsearch.rest.action.admin.indices.RestForceMergeAction;
256256
import org.elasticsearch.rest.action.admin.indices.RestGetAliasesAction;
257-
import org.elasticsearch.rest.action.admin.indices.RestGetAllAliasesAction;
258257
import org.elasticsearch.rest.action.admin.indices.RestGetFieldMappingAction;
259258
import org.elasticsearch.rest.action.admin.indices.RestGetIndexTemplateAction;
260259
import org.elasticsearch.rest.action.admin.indices.RestGetIndicesAction;
@@ -553,8 +552,6 @@ public void initRestHandlers(Supplier<DiscoveryNodes> nodesInCluster) {
553552
registerHandler.accept(new RestRestoreSnapshotAction(settings, restController));
554553
registerHandler.accept(new RestDeleteSnapshotAction(settings, restController));
555554
registerHandler.accept(new RestSnapshotsStatusAction(settings, restController));
556-
557-
registerHandler.accept(new RestGetAllAliasesAction(settings, restController));
558555
registerHandler.accept(new RestGetIndicesAction(settings, restController, indexScopedSettings, settingsFilter));
559556
registerHandler.accept(new RestIndicesStatsAction(settings, restController));
560557
registerHandler.accept(new RestIndicesSegmentsAction(settings, restController));

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAliasesAction.java

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ public class RestGetAliasesAction extends BaseRestHandler {
6060

6161
public RestGetAliasesAction(final Settings settings, final RestController controller) {
6262
super(settings);
63+
controller.registerHandler(GET, "/_alias", this);
64+
controller.registerHandler(GET, "/_aliases", this);
6365
controller.registerHandler(GET, "/_alias/{name}", this);
6466
controller.registerHandler(HEAD, "/_alias/{name}", this);
6567
controller.registerHandler(GET, "/{index}/_alias", this);

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAllAliasesAction.java

-103
This file was deleted.

x-pack/qa/core-rest-tests-with-security/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ integTestRunner {
1515
['cat.aliases/10_basic/Empty cluster',
1616
'index/10_with_id/Index with ID',
1717
'indices.get_alias/10_basic/Get alias against closed indices',
18+
'indices.get_alias/20_empty/Check empty aliases when getting all aliases via /_alias',
1819
'cat.templates/10_basic/No templates',
1920
'cat.templates/10_basic/Sort templates',
2021
'cat.templates/10_basic/Multiple template',

0 commit comments

Comments
 (0)