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.
JnBrymn-EB · Jul 30, 2016 · 303c9fa · 303c9fa
1 parent 71166c0
commit 303c9fa
Show file tree

Hide file tree

Showing 48 changed files with 143 additions and 133 deletions.
diff --git a/buildSrc/src/main/resources/checkstyle_suppressions.xml b/buildSrc/src/main/resources/checkstyle_suppressions.xml
@@ -507,12 +507,6 @@
   <suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]repositories[/\\]uri[/\\]URLRepository.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]BytesRestResponse.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]RestController.java" checks="LineLength" />
-  <suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]admin[/\\]cluster[/\\]node[/\\]info[/\\]RestNodesInfoAction.java" checks="LineLength" />
-  <suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]admin[/\\]cluster[/\\]node[/\\]stats[/\\]RestNodesStatsAction.java" checks="LineLength" />
-  <suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]admin[/\\]cluster[/\\]settings[/\\]RestClusterGetSettingsAction.java" checks="LineLength" />
-  <suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]admin[/\\]cluster[/\\]settings[/\\]RestClusterUpdateSettingsAction.java" checks="LineLength" />
-  <suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]admin[/\\]cluster[/\\]state[/\\]RestClusterStateAction.java" checks="LineLength" />
-  <suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]admin[/\\]cluster[/\\]tasks[/\\]RestPendingClusterTasksAction.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]bulk[/\\]RestBulkAction.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]cat[/\\]RestCountAction.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]action[/\\]cat[/\\]RestIndicesAction.java" checks="LineLength" />
@@ -989,7 +983,6 @@
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]CorsRegexDefaultIT.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]CorsRegexIT.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]RestControllerTests.java" checks="LineLength" />
-  <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]rest[/\\]util[/\\]RestUtilsTests.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]routing[/\\]AliasResolveRoutingIT.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]routing[/\\]AliasRoutingIT.java" checks="LineLength" />
   <suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]routing[/\\]SimpleRoutingIT.java" checks="LineLength" />

diff --git a/core/src/main/java/org/elasticsearch/action/ActionModule.java b/core/src/main/java/org/elasticsearch/action/ActionModule.java
@@ -209,33 +209,33 @@
 import org.elasticsearch.plugins.ActionPlugin.ActionHandler;
 import org.elasticsearch.rest.RestController;
 import org.elasticsearch.rest.RestHandler;
-import org.elasticsearch.rest.action.admin.cluster.allocation.RestClusterAllocationExplainAction;
-import org.elasticsearch.rest.action.admin.cluster.health.RestClusterHealthAction;
-import org.elasticsearch.rest.action.admin.cluster.node.hotthreads.RestNodesHotThreadsAction;
-import org.elasticsearch.rest.action.admin.cluster.node.info.RestNodesInfoAction;
-import org.elasticsearch.rest.action.admin.cluster.node.stats.RestNodesStatsAction;
-import org.elasticsearch.rest.action.admin.cluster.node.tasks.RestCancelTasksAction;
-import org.elasticsearch.rest.action.admin.cluster.node.tasks.RestGetTaskAction;
-import org.elasticsearch.rest.action.admin.cluster.node.tasks.RestListTasksAction;
-import org.elasticsearch.rest.action.admin.cluster.repositories.delete.RestDeleteRepositoryAction;
-import org.elasticsearch.rest.action.admin.cluster.repositories.get.RestGetRepositoriesAction;
-import org.elasticsearch.rest.action.admin.cluster.repositories.put.RestPutRepositoryAction;
-import org.elasticsearch.rest.action.admin.cluster.repositories.verify.RestVerifyRepositoryAction;
-import org.elasticsearch.rest.action.admin.cluster.reroute.RestClusterRerouteAction;
-import org.elasticsearch.rest.action.admin.cluster.settings.RestClusterGetSettingsAction;
-import org.elasticsearch.rest.action.admin.cluster.settings.RestClusterUpdateSettingsAction;
-import org.elasticsearch.rest.action.admin.cluster.shards.RestClusterSearchShardsAction;
-import org.elasticsearch.rest.action.admin.cluster.snapshots.create.RestCreateSnapshotAction;
-import org.elasticsearch.rest.action.admin.cluster.snapshots.delete.RestDeleteSnapshotAction;
-import org.elasticsearch.rest.action.admin.cluster.snapshots.get.RestGetSnapshotsAction;
-import org.elasticsearch.rest.action.admin.cluster.snapshots.restore.RestRestoreSnapshotAction;
-import org.elasticsearch.rest.action.admin.cluster.snapshots.status.RestSnapshotsStatusAction;
-import org.elasticsearch.rest.action.admin.cluster.state.RestClusterStateAction;
-import org.elasticsearch.rest.action.admin.cluster.stats.RestClusterStatsAction;
-import org.elasticsearch.rest.action.admin.cluster.storedscripts.RestDeleteStoredScriptAction;
-import org.elasticsearch.rest.action.admin.cluster.storedscripts.RestGetStoredScriptAction;
-import org.elasticsearch.rest.action.admin.cluster.storedscripts.RestPutStoredScriptAction;
-import org.elasticsearch.rest.action.admin.cluster.tasks.RestPendingClusterTasksAction;
+import org.elasticsearch.rest.action.admin.cluster.RestCancelTasksAction;
+import org.elasticsearch.rest.action.admin.cluster.RestClusterAllocationExplainAction;
+import org.elasticsearch.rest.action.admin.cluster.RestClusterGetSettingsAction;
+import org.elasticsearch.rest.action.admin.cluster.RestClusterHealthAction;
+import org.elasticsearch.rest.action.admin.cluster.RestClusterRerouteAction;
+import org.elasticsearch.rest.action.admin.cluster.RestClusterSearchShardsAction;
+import org.elasticsearch.rest.action.admin.cluster.RestClusterStateAction;
+import org.elasticsearch.rest.action.admin.cluster.RestClusterStatsAction;
+import org.elasticsearch.rest.action.admin.cluster.RestClusterUpdateSettingsAction;
+import org.elasticsearch.rest.action.admin.cluster.RestCreateSnapshotAction;
+import org.elasticsearch.rest.action.admin.cluster.RestDeleteRepositoryAction;
+import org.elasticsearch.rest.action.admin.cluster.RestDeleteSnapshotAction;
+import org.elasticsearch.rest.action.admin.cluster.RestDeleteStoredScriptAction;
+import org.elasticsearch.rest.action.admin.cluster.RestGetRepositoriesAction;
+import org.elasticsearch.rest.action.admin.cluster.RestGetSnapshotsAction;
+import org.elasticsearch.rest.action.admin.cluster.RestGetStoredScriptAction;
+import org.elasticsearch.rest.action.admin.cluster.RestGetTaskAction;
+import org.elasticsearch.rest.action.admin.cluster.RestListTasksAction;
+import org.elasticsearch.rest.action.admin.cluster.RestNodesHotThreadsAction;
+import org.elasticsearch.rest.action.admin.cluster.RestNodesInfoAction;
+import org.elasticsearch.rest.action.admin.cluster.RestNodesStatsAction;
+import org.elasticsearch.rest.action.admin.cluster.RestPendingClusterTasksAction;
+import org.elasticsearch.rest.action.admin.cluster.RestPutRepositoryAction;
+import org.elasticsearch.rest.action.admin.cluster.RestPutStoredScriptAction;
+import org.elasticsearch.rest.action.admin.cluster.RestRestoreSnapshotAction;
+import org.elasticsearch.rest.action.admin.cluster.RestSnapshotsStatusAction;
+import org.elasticsearch.rest.action.admin.cluster.RestVerifyRepositoryAction;
 import org.elasticsearch.rest.action.admin.indices.RestAliasesExistAction;
 import org.elasticsearch.rest.action.admin.indices.RestAnalyzeAction;
 import org.elasticsearch.rest.action.admin.indices.RestClearIndicesCacheAction;

diff --git a/core/src/main/java/org/elasticsearch/rest/RestController.java b/core/src/main/java/org/elasticsearch/rest/RestController.java
@@ -29,7 +29,6 @@
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.plugins.ActionPlugin;
-import org.elasticsearch.rest.support.RestUtils;
 
 import java.io.IOException;
 import java.util.Arrays;

diff --git a/core/src/main/java/org/elasticsearch/rest/RestRequest.java b/core/src/main/java/org/elasticsearch/rest/RestRequest.java
@@ -26,7 +26,6 @@
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.ToXContent;
-import org.elasticsearch.rest.support.RestUtils;
 
 import java.net.SocketAddress;
 import java.util.Collections;

diff --git a/...elasticsearch/rest/support/RestUtils.java → ...ava/org/elasticsearch/rest/RestUtils.java b/...elasticsearch/rest/support/RestUtils.java → ...ava/org/elasticsearch/rest/RestUtils.java
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.support;
+package org.elasticsearch.rest;
 
-import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.path.PathTrie;
 
@@ -29,9 +28,6 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
-/**
- *
- */
 public class RestUtils {
 
     public static final PathTrie.Decoder REST_DECODER = new PathTrie.Decoder() {

diff --git a/...ter/node/tasks/RestCancelTasksAction.java → .../admin/cluster/RestCancelTasksAction.java b/...ter/node/tasks/RestCancelTasksAction.java → .../admin/cluster/RestCancelTasksAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.node.tasks;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
@@ -35,7 +35,7 @@
 import org.elasticsearch.tasks.TaskId;
 
 import static org.elasticsearch.rest.RestRequest.Method.POST;
-import static org.elasticsearch.rest.action.admin.cluster.node.tasks.RestListTasksAction.nodeSettingListener;
+import static org.elasticsearch.rest.action.admin.cluster.RestListTasksAction.nodeSettingListener;
 
 
 public class RestCancelTasksAction extends BaseRestHandler {

diff --git a/...n/RestClusterAllocationExplainAction.java → ...r/RestClusterAllocationExplainAction.java b/...n/RestClusterAllocationExplainAction.java → ...r/RestClusterAllocationExplainAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.allocation;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import java.io.IOException;
 

diff --git a/...ettings/RestClusterGetSettingsAction.java → ...cluster/RestClusterGetSettingsAction.java b/...ettings/RestClusterGetSettingsAction.java → ...cluster/RestClusterGetSettingsAction.java
@@ -17,15 +17,14 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.settings;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
 import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
-import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.client.Requests;
+import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.common.inject.Inject;
-import org.elasticsearch.common.settings.AbstractScopedSettings;
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsFilter;
@@ -42,15 +41,14 @@
 
 import java.io.IOException;
 
-/**
- */
 public class RestClusterGetSettingsAction extends BaseRestHandler {
 
     private final ClusterSettings clusterSettings;
     private final SettingsFilter settingsFilter;
 
     @Inject
-    public RestClusterGetSettingsAction(Settings settings, RestController controller, ClusterSettings clusterSettings, SettingsFilter settingsFilter) {
+    public RestClusterGetSettingsAction(Settings settings, RestController controller, ClusterSettings clusterSettings,
+            SettingsFilter settingsFilter) {
         super(settings);
         this.clusterSettings = clusterSettings;
         controller.registerHandler(RestRequest.Method.GET, "/_cluster/settings", this);
@@ -77,7 +75,8 @@ public boolean canTripCircuitBreaker() {
         return false;
     }
 
-    private XContentBuilder renderResponse(ClusterState state, boolean renderDefaults, XContentBuilder builder, ToXContent.Params params) throws IOException {
+    private XContentBuilder renderResponse(ClusterState state, boolean renderDefaults, XContentBuilder builder, ToXContent.Params params)
+            throws IOException {
         builder.startObject();
 
         builder.startObject("persistent");

diff --git a/...uster/health/RestClusterHealthAction.java → ...dmin/cluster/RestClusterHealthAction.java b/...uster/health/RestClusterHealthAction.java → ...dmin/cluster/RestClusterHealthAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.health;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;

diff --git a/...ter/reroute/RestClusterRerouteAction.java → ...min/cluster/RestClusterRerouteAction.java b/...ter/reroute/RestClusterRerouteAction.java → ...min/cluster/RestClusterRerouteAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.reroute;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteRequest;
 import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteResponse;

diff --git a/...shards/RestClusterSearchShardsAction.java → ...luster/RestClusterSearchShardsAction.java b/...shards/RestClusterSearchShardsAction.java → ...luster/RestClusterSearchShardsAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.shards;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.shards.ClusterSearchShardsRequest;
 import org.elasticsearch.action.admin.cluster.shards.ClusterSearchShardsResponse;

diff --git a/...cluster/state/RestClusterStateAction.java → ...admin/cluster/RestClusterStateAction.java b/...cluster/state/RestClusterStateAction.java → ...admin/cluster/RestClusterStateAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.state;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
 import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
@@ -41,10 +41,6 @@
 
 import java.util.EnumSet;
 
-
-/**
- *
- */
 public class RestClusterStateAction extends BaseRestHandler {
 
     private final SettingsFilter settingsFilter;
@@ -76,8 +72,12 @@ public void handleRequest(final RestRequest request, final RestChannel channel,
             EnumSet<ClusterState.Metric> metrics = ClusterState.Metric.parseString(request.param("metric"), true);
             // do not ask for what we do not need.
             clusterStateRequest.nodes(metrics.contains(ClusterState.Metric.NODES) || metrics.contains(ClusterState.Metric.MASTER_NODE));
-            //there is no distinction in Java api between routing_table and routing_nodes, it's the same info set over the wire, one single flag to ask for it
-            clusterStateRequest.routingTable(metrics.contains(ClusterState.Metric.ROUTING_TABLE) || metrics.contains(ClusterState.Metric.ROUTING_NODES));
+            /*
+             * there is no distinction in Java api between routing_table and routing_nodes, it's the same info set over the wire, one single
+             * flag to ask for it
+             */
+            clusterStateRequest.routingTable(
+                    metrics.contains(ClusterState.Metric.ROUTING_TABLE) || metrics.contains(ClusterState.Metric.ROUTING_NODES));
             clusterStateRequest.metaData(metrics.contains(ClusterState.Metric.METADATA));
             clusterStateRequest.blocks(metrics.contains(ClusterState.Metric.BLOCKS));
             clusterStateRequest.customs(metrics.contains(ClusterState.Metric.CUSTOMS));

diff --git a/...cluster/stats/RestClusterStatsAction.java → ...admin/cluster/RestClusterStatsAction.java b/...cluster/stats/RestClusterStatsAction.java → ...admin/cluster/RestClusterStatsAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.stats;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.stats.ClusterStatsRequest;
 import org.elasticsearch.client.node.NodeClient;

diff --git a/...ings/RestClusterUpdateSettingsAction.java → ...ster/RestClusterUpdateSettingsAction.java b/...ings/RestClusterUpdateSettingsAction.java → ...ster/RestClusterUpdateSettingsAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.settings;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
 import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse;
@@ -37,8 +37,6 @@
 import java.io.IOException;
 import java.util.Map;
 
-/**
- */
 public class RestClusterUpdateSettingsAction extends BaseRestHandler {
 
     @Inject
@@ -51,7 +49,8 @@ public RestClusterUpdateSettingsAction(Settings settings, RestController control
     public void handleRequest(final RestRequest request, final RestChannel channel, final NodeClient client) throws Exception {
         final ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = Requests.clusterUpdateSettingsRequest();
         clusterUpdateSettingsRequest.timeout(request.paramAsTime("timeout", clusterUpdateSettingsRequest.timeout()));
-        clusterUpdateSettingsRequest.masterNodeTimeout(request.paramAsTime("master_timeout", clusterUpdateSettingsRequest.masterNodeTimeout()));
+        clusterUpdateSettingsRequest.masterNodeTimeout(
+                request.paramAsTime("master_timeout", clusterUpdateSettingsRequest.masterNodeTimeout()));
         Map<String, Object> source;
         try (XContentParser parser = XContentFactory.xContent(request.content()).createParser(request.content())) {
             source = parser.map();
@@ -63,18 +62,19 @@ public void handleRequest(final RestRequest request, final RestChannel channel,
             clusterUpdateSettingsRequest.persistentSettings((Map) source.get("persistent"));
         }
 
-        client.admin().cluster().updateSettings(clusterUpdateSettingsRequest, new AcknowledgedRestListener<ClusterUpdateSettingsResponse>(channel) {
-            @Override
-            protected void addCustomFields(XContentBuilder builder, ClusterUpdateSettingsResponse response) throws IOException {
-                builder.startObject("persistent");
-                response.getPersistentSettings().toXContent(builder, request);
-                builder.endObject();
+        client.admin().cluster().updateSettings(clusterUpdateSettingsRequest,
+                new AcknowledgedRestListener<ClusterUpdateSettingsResponse>(channel) {
+                    @Override
+                    protected void addCustomFields(XContentBuilder builder, ClusterUpdateSettingsResponse response) throws IOException {
+                        builder.startObject("persistent");
+                        response.getPersistentSettings().toXContent(builder, request);
+                        builder.endObject();
 
-                builder.startObject("transient");
-                response.getTransientSettings().toXContent(builder, request);
-                builder.endObject();
-            }
-        });
+                        builder.startObject("transient");
+                        response.getTransientSettings().toXContent(builder, request);
+                        builder.endObject();
+                    }
+                });
     }
 
     @Override

diff --git a/...hots/create/RestCreateSnapshotAction.java → ...min/cluster/RestCreateSnapshotAction.java b/...hots/create/RestCreateSnapshotAction.java → ...min/cluster/RestCreateSnapshotAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.snapshots.create;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotRequest;
 import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse;

diff --git a/...es/delete/RestDeleteRepositoryAction.java → ...n/cluster/RestDeleteRepositoryAction.java b/...es/delete/RestDeleteRepositoryAction.java → ...n/cluster/RestDeleteRepositoryAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.repositories.delete;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.repositories.delete.DeleteRepositoryRequest;
 import org.elasticsearch.action.admin.cluster.repositories.delete.DeleteRepositoryResponse;

diff --git a/...hots/delete/RestDeleteSnapshotAction.java → ...min/cluster/RestDeleteSnapshotAction.java b/...hots/delete/RestDeleteSnapshotAction.java → ...min/cluster/RestDeleteSnapshotAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.snapshots.delete;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.snapshots.delete.DeleteSnapshotRequest;
 import org.elasticsearch.action.admin.cluster.snapshots.delete.DeleteSnapshotResponse;

diff --git a/...scripts/RestDeleteStoredScriptAction.java → ...cluster/RestDeleteStoredScriptAction.java b/...scripts/RestDeleteStoredScriptAction.java → ...cluster/RestDeleteStoredScriptAction.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.rest.action.admin.cluster.storedscripts;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.storedscripts.DeleteStoredScriptRequest;
 import org.elasticsearch.client.node.NodeClient;

diff --git a/...tories/get/RestGetRepositoriesAction.java → ...in/cluster/RestGetRepositoriesAction.java b/...tories/get/RestGetRepositoriesAction.java → ...in/cluster/RestGetRepositoriesAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.repositories.get;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.repositories.get.GetRepositoriesRequest;
 import org.elasticsearch.action.admin.cluster.repositories.get.GetRepositoriesResponse;

diff --git a/...snapshots/get/RestGetSnapshotsAction.java → ...admin/cluster/RestGetSnapshotsAction.java b/...snapshots/get/RestGetSnapshotsAction.java → ...admin/cluster/RestGetSnapshotsAction.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.cluster.snapshots.get;
+package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.snapshots.get.GetSnapshotsRequest;
 import org.elasticsearch.action.admin.cluster.snapshots.get.GetSnapshotsResponse;