Decompose admin command into separate commands

assemble/bin/accumulo-cluster

@@ -308,7 +308,7 @@ function parse_config() {
 
   RG_FILE="$AC_TMP_DIR/ZooInfoViewer.out"
   debug "Printing resource groups to $RG_FILE"
-  "$accumulo_cmd" zoo-info-viewer --print-resource-groups >"$RG_FILE" || (echo "Error getting resource groups. Did you init?" && exit 1)
+  "$accumulo_cmd" other zoo-info-viewer --print-resource-groups >"$RG_FILE" || (echo "Error getting resource groups. Did you init?" && exit 1)
   read -r -a all_resource_groups <<<"$(grep -F 'Resource Groups: ' "$RG_FILE" | cut -c18-)"
   debug "All resource groups: ${all_resource_groups[*]}"
 
@@ -466,7 +466,7 @@ function control_services() {
         fi
       done
       # Try to cleanly stop the TabletServers and Manager
-      if ! "$accumulo_cmd" admin stopAll; then
+      if ! "$accumulo_cmd" admin stop-all; then
         echo "Invalid password or unable to connect to the manager"
         echo "Initiating forced shutdown in 15 seconds (Ctrl-C to abort)"
         sleep 10
@@ -720,7 +720,7 @@ function prune() {
     exit 1
   fi
   local service_json="$AC_TMP_DIR/accumulo-service.json"
-  "$accumulo_cmd" admin serviceStatus --json >"$service_json" 2>/dev/null || (echo "Error calling 'admin serviceStatus'" && exit 1)
+  "$accumulo_cmd" admin service-status --json >"$service_json" 2>/dev/null || (echo "Error calling 'admin serviceStatus'" && exit 1)
 
   local var_name
   local hosts

minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneClusterControl.java

@@ -36,7 +36,7 @@
 import org.apache.accumulo.core.manager.thrift.ManagerGoalState;
 import org.apache.accumulo.manager.state.SetGoalState;
 import org.apache.accumulo.minicluster.ServerType;
-import org.apache.accumulo.server.util.Admin;
+import org.apache.accumulo.server.util.adminCommand.StopAll;
 import org.apache.hadoop.util.Shell.ExitCodeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -133,7 +133,7 @@ private String sanitize(String msg) {
   @Override
   public void adminStopAll() throws IOException {
     String manager = getHosts(MANAGER_HOSTS_FILE).get(0);
-    String[] cmd = {serverCmdPrefix, accumuloPath, Admin.class.getName(), "stopAll"};
+    String[] cmd = {serverCmdPrefix, accumuloPath, StopAll.class.getName()};
     // Directly invoke the RemoteShell
     Entry<Integer,String> pair = exec(manager, cmd);
     if (pair.getKey() != 0) {

minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java

@@ -41,8 +41,8 @@
 import org.apache.accumulo.minicluster.ServerType;
 import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl.ProcessInfo;
 import org.apache.accumulo.server.conf.store.ResourceGroupPropKey;
-import org.apache.accumulo.server.util.Admin;
 import org.apache.accumulo.server.util.ZooZap;
+import org.apache.accumulo.server.util.adminCommand.StopAll;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.zookeeper.KeeperException;
 import org.slf4j.Logger;
@@ -107,7 +107,7 @@ public Entry<Integer,String> execWithStdout(Class<?> clz, String[] args) throws
 
   @Override
   public void adminStopAll() throws IOException {
-    Process p = cluster.exec(Admin.class, "stopAll").getProcess();
+    Process p = cluster.exec(StopAll.class).getProcess();
     try {
       p.waitFor();
     } catch (InterruptedException e) {

server/base/src/main/java/org/apache/accumulo/server/conf/CheckAccumuloProperties.java

@@ -24,7 +24,7 @@
 import org.apache.accumulo.core.conf.SiteConfiguration;
 import org.apache.accumulo.server.ServerDirs;
 import org.apache.accumulo.server.fs.VolumeManagerImpl;
-import org.apache.accumulo.server.util.Admin;
+import org.apache.accumulo.server.util.adminCommand.SystemCheck.Check;
 import org.apache.accumulo.start.spi.KeywordExecutable;
 import org.apache.hadoop.conf.Configuration;
 
@@ -46,7 +46,7 @@ public String description() {
     return "Checks the provided Accumulo configuration file for errors. "
         + "This only checks the contents of the file and not any running Accumulo system, "
         + "so it can be used prior to init, but only performs a subset of the checks done by "
-        + "'admin check run " + Admin.CheckCommand.Check.SERVER_CONFIG + "'";
+        + "'admin check run " + Check.SERVER_CONFIG + "'";
   }
 
   @SuppressFBWarnings(value = "PATH_TRAVERSAL_IN", justification = "intentional user-provided path")