Skip to content

Commit d92da88

Browse files
author
Christoph Büscher
authored
Moving reload_analyzers endpoint to xpack (#43559)
1 parent cdb2d41 commit d92da88

File tree

23 files changed

+125
-300
lines changed

23 files changed

+125
-300
lines changed

docs/reference/indices/apis/reload-analyzers.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ with the `updateable` flag:
1313

1414
[source,js]
1515
--------------------------------------------------
16-
PUT /test_index
16+
PUT /my_index
1717
{
1818
"settings": {
1919
"index" : {

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@
121121
import org.elasticsearch.action.admin.indices.recovery.TransportRecoveryAction;
122122
import org.elasticsearch.action.admin.indices.refresh.RefreshAction;
123123
import org.elasticsearch.action.admin.indices.refresh.TransportRefreshAction;
124-
import org.elasticsearch.action.admin.indices.reloadanalyzer.ReloadAnalyzerAction;
125-
import org.elasticsearch.action.admin.indices.reloadanalyzer.TransportReloadAnalyzersAction;
126124
import org.elasticsearch.action.admin.indices.rollover.RolloverAction;
127125
import org.elasticsearch.action.admin.indices.rollover.TransportRolloverAction;
128126
import org.elasticsearch.action.admin.indices.segments.IndicesSegmentsAction;
@@ -277,7 +275,6 @@
277275
import org.elasticsearch.rest.action.admin.indices.RestPutMappingAction;
278276
import org.elasticsearch.rest.action.admin.indices.RestRecoveryAction;
279277
import org.elasticsearch.rest.action.admin.indices.RestRefreshAction;
280-
import org.elasticsearch.rest.action.admin.indices.RestReloadAnalyzersAction;
281278
import org.elasticsearch.rest.action.admin.indices.RestResizeHandler;
282279
import org.elasticsearch.rest.action.admin.indices.RestRolloverIndexAction;
283280
import org.elasticsearch.rest.action.admin.indices.RestSyncedFlushAction;
@@ -502,7 +499,6 @@ public <Request extends ActionRequest, Response extends ActionResponse> void reg
502499
actions.register(ClearScrollAction.INSTANCE, TransportClearScrollAction.class);
503500
actions.register(RecoveryAction.INSTANCE, TransportRecoveryAction.class);
504501
actions.register(NodesReloadSecureSettingsAction.INSTANCE, TransportNodesReloadSecureSettingsAction.class);
505-
actions.register(ReloadAnalyzerAction.INSTANCE, TransportReloadAnalyzersAction.class);
506502

507503
//Indexed scripts
508504
actions.register(PutStoredScriptAction.INSTANCE, TransportPutStoredScriptAction.class);
@@ -600,7 +596,6 @@ public void initRestHandlers(Supplier<DiscoveryNodes> nodesInCluster) {
600596
registerHandler.accept(new RestGetFieldMappingAction(settings, restController));
601597

602598
registerHandler.accept(new RestRefreshAction(settings, restController));
603-
registerHandler.accept(new RestReloadAnalyzersAction(settings, restController));
604599
registerHandler.accept(new RestFlushAction(settings, restController));
605600
registerHandler.accept(new RestSyncedFlushAction(settings, restController));
606601
registerHandler.accept(new RestForceMergeAction(settings, restController));

server/src/main/java/org/elasticsearch/action/admin/indices/reloadanalyzer/ReloadAnalyzerAction.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

server/src/main/java/org/elasticsearch/action/admin/indices/reloadanalyzer/ReloadAnalyzerRequestBuilder.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

server/src/main/java/org/elasticsearch/client/IndicesAdminClient.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@
6868
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
6969
import org.elasticsearch.action.admin.indices.refresh.RefreshRequestBuilder;
7070
import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
71-
import org.elasticsearch.action.admin.indices.reloadanalyzer.ReloadAnalyzerRequestBuilder;
72-
import org.elasticsearch.action.admin.indices.reloadanalyzer.ReloadAnalyzersRequest;
73-
import org.elasticsearch.action.admin.indices.reloadanalyzer.ReloadAnalyzersResponse;
7471
import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
7572
import org.elasticsearch.action.admin.indices.rollover.RolloverRequestBuilder;
7673
import org.elasticsearch.action.admin.indices.rollover.RolloverResponse;
@@ -742,18 +739,4 @@ public interface IndicesAdminClient extends ElasticsearchClient {
742739
*/
743740
void rolloverIndex(RolloverRequest request, ActionListener<RolloverResponse> listener);
744741

745-
/**
746-
* Reloads analyzers of one or more indices.
747-
*/
748-
ActionFuture<ReloadAnalyzersResponse> reloadAnalyzers(ReloadAnalyzersRequest request);
749-
750-
/**
751-
* Reloads analyzers of one or more indices.
752-
*/
753-
void reloadAnalyzers(ReloadAnalyzersRequest request, ActionListener<ReloadAnalyzersResponse> listener);
754-
755-
/**
756-
* Reloads analyzers of one or more indices.
757-
*/
758-
ReloadAnalyzerRequestBuilder prepareReloadAnalyzers(String... indices);
759742
}

server/src/main/java/org/elasticsearch/client/Requests.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
5252
import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
5353
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
54-
import org.elasticsearch.action.admin.indices.reloadanalyzer.ReloadAnalyzersRequest;
5554
import org.elasticsearch.action.admin.indices.segments.IndicesSegmentsRequest;
5655
import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest;
5756
import org.elasticsearch.action.admin.indices.shards.IndicesShardStoresRequest;
@@ -524,14 +523,4 @@ public static DeleteSnapshotRequest deleteSnapshotRequest(String repository, Str
524523
public static SnapshotsStatusRequest snapshotsStatusRequest(String repository) {
525524
return new SnapshotsStatusRequest(repository);
526525
}
527-
528-
/**
529-
* A request to reload search Analyzers indices settings.
530-
*
531-
* @param indices The indices to update the settings for. Use {@code null} or {@code _all} to executed against all indices.
532-
* @return The request
533-
*/
534-
public static ReloadAnalyzersRequest reloadAnalyzersRequest(String... indices) {
535-
return new ReloadAnalyzersRequest(indices);
536-
}
537526
}

server/src/main/java/org/elasticsearch/client/support/AbstractClient.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,6 @@
194194
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
195195
import org.elasticsearch.action.admin.indices.refresh.RefreshRequestBuilder;
196196
import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
197-
import org.elasticsearch.action.admin.indices.reloadanalyzer.ReloadAnalyzerAction;
198-
import org.elasticsearch.action.admin.indices.reloadanalyzer.ReloadAnalyzerRequestBuilder;
199-
import org.elasticsearch.action.admin.indices.reloadanalyzer.ReloadAnalyzersRequest;
200-
import org.elasticsearch.action.admin.indices.reloadanalyzer.ReloadAnalyzersResponse;
201197
import org.elasticsearch.action.admin.indices.rollover.RolloverAction;
202198
import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
203199
import org.elasticsearch.action.admin.indices.rollover.RolloverRequestBuilder;
@@ -1461,11 +1457,6 @@ public RefreshRequestBuilder prepareRefresh(String... indices) {
14611457
return new RefreshRequestBuilder(this, RefreshAction.INSTANCE).setIndices(indices);
14621458
}
14631459

1464-
@Override
1465-
public ReloadAnalyzerRequestBuilder prepareReloadAnalyzers(String... indices) {
1466-
return new ReloadAnalyzerRequestBuilder(this, ReloadAnalyzerAction.INSTANCE).setIndices(indices);
1467-
}
1468-
14691460
@Override
14701461
public ActionFuture<IndicesStatsResponse> stats(final IndicesStatsRequest request) {
14711462
return execute(IndicesStatsAction.INSTANCE, request);
@@ -1671,16 +1662,6 @@ public ActionFuture<GetSettingsResponse> getSettings(GetSettingsRequest request)
16711662
public void getSettings(GetSettingsRequest request, ActionListener<GetSettingsResponse> listener) {
16721663
execute(GetSettingsAction.INSTANCE, request, listener);
16731664
}
1674-
1675-
@Override
1676-
public ActionFuture<ReloadAnalyzersResponse> reloadAnalyzers(ReloadAnalyzersRequest request) {
1677-
return execute(ReloadAnalyzerAction.INSTANCE, request);
1678-
}
1679-
1680-
@Override
1681-
public void reloadAnalyzers(final ReloadAnalyzersRequest request, final ActionListener<ReloadAnalyzersResponse> listener) {
1682-
execute(ReloadAnalyzerAction.INSTANCE, request, listener);
1683-
}
16841665
}
16851666

16861667
@Override

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

Lines changed: 0 additions & 54 deletions
This file was deleted.

server/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponseTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
package org.elasticsearch.action.admin.indices.cache.clear;
2121

2222
import org.elasticsearch.action.support.DefaultShardOperationFailedException;
23-
import org.elasticsearch.action.support.broadcast.AbstractBroadcastResponseTestCase;
2423
import org.elasticsearch.common.xcontent.XContentParser;
24+
import org.elasticsearch.test.AbstractBroadcastResponseTestCase;
2525

2626
import java.util.List;
2727

server/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushResponseTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
package org.elasticsearch.action.admin.indices.flush;
2121

2222
import org.elasticsearch.action.support.DefaultShardOperationFailedException;
23-
import org.elasticsearch.action.support.broadcast.AbstractBroadcastResponseTestCase;
2423
import org.elasticsearch.common.xcontent.XContentParser;
24+
import org.elasticsearch.test.AbstractBroadcastResponseTestCase;
2525

2626
import java.util.List;
2727

0 commit comments

Comments
 (0)