Skip to content

Commit 303c9fa

Browse files
nik9000nik9000
committed
Squash o.e.rest.action.admin.cluster
In an effort to reduce the number of tiny packages we have in the code base this moves all the files that were in subdirectories of `org.elasticsearch.rest.action.admin.cluster` into `org.elasticsearch.rest.action.admin.cluster`. Also fixes line length in these packages.
1 parent 71166c0 commit 303c9fa

File tree

48 files changed

+143
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+143
-133
lines changed

‎buildSrc/src/main/resources/checkstyle_suppressions.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -507,12 +507,6 @@
507507
<suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]repositories[/\\]uri[/\\]URLRepository.java" checks="LineLength" />
508508
<suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]BytesRestResponse.java" checks="LineLength" />
509509
<suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]RestController.java" checks="LineLength" />
510-
<suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]admin[/\\]cluster[/\\]node[/\\]info[/\\]RestNodesInfoAction.java" checks="LineLength" />
511-
<suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]admin[/\\]cluster[/\\]node[/\\]stats[/\\]RestNodesStatsAction.java" checks="LineLength" />
512-
<suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]admin[/\\]cluster[/\\]settings[/\\]RestClusterGetSettingsAction.java" checks="LineLength" />
513-
<suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]admin[/\\]cluster[/\\]settings[/\\]RestClusterUpdateSettingsAction.java" checks="LineLength" />
514-
<suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]admin[/\\]cluster[/\\]state[/\\]RestClusterStateAction.java" checks="LineLength" />
515-
<suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]admin[/\\]cluster[/\\]tasks[/\\]RestPendingClusterTasksAction.java" checks="LineLength" />
516510
<suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]bulk[/\\]RestBulkAction.java" checks="LineLength" />
517511
<suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]cat[/\\]RestCountAction.java" checks="LineLength" />
518512
<suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]cat[/\\]RestIndicesAction.java" checks="LineLength" />
@@ -989,7 +983,6 @@
989983
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]CorsRegexDefaultIT.java" checks="LineLength" />
990984
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]CorsRegexIT.java" checks="LineLength" />
991985
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]RestControllerTests.java" checks="LineLength" />
992-
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]util[/\\]RestUtilsTests.java" checks="LineLength" />
993986
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]routing[/\\]AliasResolveRoutingIT.java" checks="LineLength" />
994987
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]routing[/\\]AliasRoutingIT.java" checks="LineLength" />
995988
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]routing[/\\]SimpleRoutingIT.java" checks="LineLength" />

‎core/src/main/java/org/elasticsearch/action/ActionModule.java‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -209,33 +209,33 @@
209209
import org.elasticsearch.plugins.ActionPlugin.ActionHandler;
210210
import org.elasticsearch.rest.RestController;
211211
import org.elasticsearch.rest.RestHandler;
212-
import org.elasticsearch.rest.action.admin.cluster.allocation.RestClusterAllocationExplainAction;
213-
import org.elasticsearch.rest.action.admin.cluster.health.RestClusterHealthAction;
214-
import org.elasticsearch.rest.action.admin.cluster.node.hotthreads.RestNodesHotThreadsAction;
215-
import org.elasticsearch.rest.action.admin.cluster.node.info.RestNodesInfoAction;
216-
import org.elasticsearch.rest.action.admin.cluster.node.stats.RestNodesStatsAction;
217-
import org.elasticsearch.rest.action.admin.cluster.node.tasks.RestCancelTasksAction;
218-
import org.elasticsearch.rest.action.admin.cluster.node.tasks.RestGetTaskAction;
219-
import org.elasticsearch.rest.action.admin.cluster.node.tasks.RestListTasksAction;
220-
import org.elasticsearch.rest.action.admin.cluster.repositories.delete.RestDeleteRepositoryAction;
221-
import org.elasticsearch.rest.action.admin.cluster.repositories.get.RestGetRepositoriesAction;
222-
import org.elasticsearch.rest.action.admin.cluster.repositories.put.RestPutRepositoryAction;
223-
import org.elasticsearch.rest.action.admin.cluster.repositories.verify.RestVerifyRepositoryAction;
224-
import org.elasticsearch.rest.action.admin.cluster.reroute.RestClusterRerouteAction;
225-
import org.elasticsearch.rest.action.admin.cluster.settings.RestClusterGetSettingsAction;
226-
import org.elasticsearch.rest.action.admin.cluster.settings.RestClusterUpdateSettingsAction;
227-
import org.elasticsearch.rest.action.admin.cluster.shards.RestClusterSearchShardsAction;
228-
import org.elasticsearch.rest.action.admin.cluster.snapshots.create.RestCreateSnapshotAction;
229-
import org.elasticsearch.rest.action.admin.cluster.snapshots.delete.RestDeleteSnapshotAction;
230-
import org.elasticsearch.rest.action.admin.cluster.snapshots.get.RestGetSnapshotsAction;
231-
import org.elasticsearch.rest.action.admin.cluster.snapshots.restore.RestRestoreSnapshotAction;
232-
import org.elasticsearch.rest.action.admin.cluster.snapshots.status.RestSnapshotsStatusAction;
233-
import org.elasticsearch.rest.action.admin.cluster.state.RestClusterStateAction;
234-
import org.elasticsearch.rest.action.admin.cluster.stats.RestClusterStatsAction;
235-
import org.elasticsearch.rest.action.admin.cluster.storedscripts.RestDeleteStoredScriptAction;
236-
import org.elasticsearch.rest.action.admin.cluster.storedscripts.RestGetStoredScriptAction;
237-
import org.elasticsearch.rest.action.admin.cluster.storedscripts.RestPutStoredScriptAction;
238-
import org.elasticsearch.rest.action.admin.cluster.tasks.RestPendingClusterTasksAction;
212+
import org.elasticsearch.rest.action.admin.cluster.RestCancelTasksAction;
213+
import org.elasticsearch.rest.action.admin.cluster.RestClusterAllocationExplainAction;
214+
import org.elasticsearch.rest.action.admin.cluster.RestClusterGetSettingsAction;
215+
import org.elasticsearch.rest.action.admin.cluster.RestClusterHealthAction;
216+
import org.elasticsearch.rest.action.admin.cluster.RestClusterRerouteAction;
217+
import org.elasticsearch.rest.action.admin.cluster.RestClusterSearchShardsAction;
218+
import org.elasticsearch.rest.action.admin.cluster.RestClusterStateAction;
219+
import org.elasticsearch.rest.action.admin.cluster.RestClusterStatsAction;
220+
import org.elasticsearch.rest.action.admin.cluster.RestClusterUpdateSettingsAction;
221+
import org.elasticsearch.rest.action.admin.cluster.RestCreateSnapshotAction;
222+
import org.elasticsearch.rest.action.admin.cluster.RestDeleteRepositoryAction;
223+
import org.elasticsearch.rest.action.admin.cluster.RestDeleteSnapshotAction;
224+
import org.elasticsearch.rest.action.admin.cluster.RestDeleteStoredScriptAction;
225+
import org.elasticsearch.rest.action.admin.cluster.RestGetRepositoriesAction;
226+
import org.elasticsearch.rest.action.admin.cluster.RestGetSnapshotsAction;
227+
import org.elasticsearch.rest.action.admin.cluster.RestGetStoredScriptAction;
228+
import org.elasticsearch.rest.action.admin.cluster.RestGetTaskAction;
229+
import org.elasticsearch.rest.action.admin.cluster.RestListTasksAction;
230+
import org.elasticsearch.rest.action.admin.cluster.RestNodesHotThreadsAction;
231+
import org.elasticsearch.rest.action.admin.cluster.RestNodesInfoAction;
232+
import org.elasticsearch.rest.action.admin.cluster.RestNodesStatsAction;
233+
import org.elasticsearch.rest.action.admin.cluster.RestPendingClusterTasksAction;
234+
import org.elasticsearch.rest.action.admin.cluster.RestPutRepositoryAction;
235+
import org.elasticsearch.rest.action.admin.cluster.RestPutStoredScriptAction;
236+
import org.elasticsearch.rest.action.admin.cluster.RestRestoreSnapshotAction;
237+
import org.elasticsearch.rest.action.admin.cluster.RestSnapshotsStatusAction;
238+
import org.elasticsearch.rest.action.admin.cluster.RestVerifyRepositoryAction;
239239
import org.elasticsearch.rest.action.admin.indices.RestAliasesExistAction;
240240
import org.elasticsearch.rest.action.admin.indices.RestAnalyzeAction;
241241
import org.elasticsearch.rest.action.admin.indices.RestClearIndicesCacheAction;

‎core/src/main/java/org/elasticsearch/rest/RestController.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.elasticsearch.common.util.concurrent.ThreadContext;
3030
import org.elasticsearch.common.xcontent.XContentBuilder;
3131
import org.elasticsearch.plugins.ActionPlugin;
32-
import org.elasticsearch.rest.support.RestUtils;
3332

3433
import java.io.IOException;
3534
import java.util.Arrays;

‎core/src/main/java/org/elasticsearch/rest/RestRequest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.elasticsearch.common.unit.ByteSizeValue;
2727
import org.elasticsearch.common.unit.TimeValue;
2828
import org.elasticsearch.common.xcontent.ToXContent;
29-
import org.elasticsearch.rest.support.RestUtils;
3029

3130
import java.net.SocketAddress;
3231
import java.util.Collections;

core/src/main/java/org/elasticsearch/rest/support/RestUtils.java renamed to core/src/main/java/org/elasticsearch/rest/RestUtils.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.rest.support;
20+
package org.elasticsearch.rest;
2121

22-
import org.elasticsearch.common.Nullable;
2322
import org.elasticsearch.common.Strings;
2423
import org.elasticsearch.common.path.PathTrie;
2524

@@ -29,9 +28,6 @@
2928
import java.util.Map;
3029
import java.util.regex.Pattern;
3130

32-
/**
33-
*
34-
*/
3531
public class RestUtils {
3632

3733
public static final PathTrie.Decoder REST_DECODER = new PathTrie.Decoder() {

core/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/tasks/RestCancelTasksAction.java renamed to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestCancelTasksAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.rest.action.admin.cluster.node.tasks;
20+
package org.elasticsearch.rest.action.admin.cluster;
2121

2222
import org.elasticsearch.action.ActionListener;
2323
import org.elasticsearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
@@ -35,7 +35,7 @@
3535
import org.elasticsearch.tasks.TaskId;
3636

3737
import static org.elasticsearch.rest.RestRequest.Method.POST;
38-
import static org.elasticsearch.rest.action.admin.cluster.node.tasks.RestListTasksAction.nodeSettingListener;
38+
import static org.elasticsearch.rest.action.admin.cluster.RestListTasksAction.nodeSettingListener;
3939

4040

4141
public class RestCancelTasksAction extends BaseRestHandler {

core/src/main/java/org/elasticsearch/rest/action/admin/cluster/allocation/RestClusterAllocationExplainAction.java renamed to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterAllocationExplainAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.rest.action.admin.cluster.allocation;
20+
package org.elasticsearch.rest.action.admin.cluster;
2121

2222
import java.io.IOException;
2323

core/src/main/java/org/elasticsearch/rest/action/admin/cluster/settings/RestClusterGetSettingsAction.java renamed to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.rest.action.admin.cluster.settings;
20+
package org.elasticsearch.rest.action.admin.cluster;
2121

2222
import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
2323
import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
24-
import org.elasticsearch.client.node.NodeClient;
2524
import org.elasticsearch.client.Requests;
25+
import org.elasticsearch.client.node.NodeClient;
2626
import org.elasticsearch.cluster.ClusterState;
2727
import org.elasticsearch.common.inject.Inject;
28-
import org.elasticsearch.common.settings.AbstractScopedSettings;
2928
import org.elasticsearch.common.settings.ClusterSettings;
3029
import org.elasticsearch.common.settings.Settings;
3130
import org.elasticsearch.common.settings.SettingsFilter;
@@ -42,15 +41,14 @@
4241

4342
import java.io.IOException;
4443

45-
/**
46-
*/
4744
public class RestClusterGetSettingsAction extends BaseRestHandler {
4845

4946
private final ClusterSettings clusterSettings;
5047
private final SettingsFilter settingsFilter;
5148

5249
@Inject
53-
public RestClusterGetSettingsAction(Settings settings, RestController controller, ClusterSettings clusterSettings, SettingsFilter settingsFilter) {
50+
public RestClusterGetSettingsAction(Settings settings, RestController controller, ClusterSettings clusterSettings,
51+
SettingsFilter settingsFilter) {
5452
super(settings);
5553
this.clusterSettings = clusterSettings;
5654
controller.registerHandler(RestRequest.Method.GET, "/_cluster/settings", this);
@@ -77,7 +75,8 @@ public boolean canTripCircuitBreaker() {
7775
return false;
7876
}
7977

80-
private XContentBuilder renderResponse(ClusterState state, boolean renderDefaults, XContentBuilder builder, ToXContent.Params params) throws IOException {
78+
private XContentBuilder renderResponse(ClusterState state, boolean renderDefaults, XContentBuilder builder, ToXContent.Params params)
79+
throws IOException {
8180
builder.startObject();
8281

8382
builder.startObject("persistent");

core/src/main/java/org/elasticsearch/rest/action/admin/cluster/health/RestClusterHealthAction.java renamed to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.rest.action.admin.cluster.health;
20+
package org.elasticsearch.rest.action.admin.cluster;
2121

2222
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
2323
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;

core/src/main/java/org/elasticsearch/rest/action/admin/cluster/reroute/RestClusterRerouteAction.java renamed to core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterRerouteAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.rest.action.admin.cluster.reroute;
20+
package org.elasticsearch.rest.action.admin.cluster;
2121

2222
import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteRequest;
2323
import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteResponse;

0 commit comments

Comments
 (0)