SLIDER-1000 clean org.apache.slider.common.params package
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e9c5ebc7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e9c5ebc7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e9c5ebc7 Branch: refs/heads/develop Commit: e9c5ebc7838a3c2785ab13752bf495a27a965fd1 Parents: 3418d72 Author: Steve Loughran <[email protected]> Authored: Fri Nov 20 16:51:27 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Fri Nov 20 16:51:27 2015 +0000 ---------------------------------------------------------------------- .../common/params/AbstractActionArgs.java | 6 +-- .../AbstractClusterBuildingActionArgs.java | 2 +- .../common/params/ActionAMSuicideArgs.java | 1 - .../slider/common/params/ActionEchoArgs.java | 7 +-- .../slider/common/params/ActionListArgs.java | 2 +- .../slider/common/params/ActionLookupArgs.java | 2 +- .../slider/common/params/ActionNodesArgs.java | 46 ++++++++++++++++++++ .../slider/common/params/ActionStatusArgs.java | 3 +- .../slider/common/params/ActionUpgradeArgs.java | 4 +- .../slider/common/params/AddonArgsDelegate.java | 2 +- .../params/AppAndResouceOptionArgsDelegate.java | 8 ++-- .../org/apache/slider/common/params/ArgOps.java | 20 +++------ .../apache/slider/common/params/Arguments.java | 8 +++- .../apache/slider/common/params/ClientArgs.java | 45 +++++++++++-------- .../apache/slider/common/params/CommonArgs.java | 16 +++---- .../common/params/ComponentArgsDelegate.java | 2 +- .../common/params/DontSplitArguments.java | 2 +- .../slider/common/params/SliderActions.java | 2 + 18 files changed, 111 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java index 17c235f..d0b1693 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java @@ -56,7 +56,7 @@ public abstract class AbstractActionArgs extends ArgOps implements Arguments { * This is the default parameter */ @Parameter - public final List<String> parameters = new ArrayList<String>(); + public final List<String> parameters = new ArrayList<>(); /** * get the name: relies on arg 1 being the cluster name in all operations @@ -77,7 +77,7 @@ public abstract class AbstractActionArgs extends ArgOps implements Arguments { */ @Parameter(names = ARG_DEFINE, arity = 1, description = "Definitions") - public final List<String> definitions = new ArrayList<String>(); + public final List<String> definitions = new ArrayList<>(); /** * System properties @@ -85,7 +85,7 @@ public abstract class AbstractActionArgs extends ArgOps implements Arguments { @Parameter(names = {ARG_SYSPROP}, arity = 1, description = "system properties in the form name value" + " These are set after the JVM is started.") - public final List<String> sysprops = new ArrayList<String>(0); + public final List<String> sysprops = new ArrayList<>(0); @Parameter(names = {ARG_MANAGER_SHORT, ARG_MANAGER}, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java index f2e3c61..1c694bd 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java @@ -59,7 +59,7 @@ public abstract class AbstractClusterBuildingActionArgs extends /** * --image path - the full path to a .tar or .tar.gz path containing an HBase image. + * the full path to a .tar or .tar.gz path containing an HBase image. */ @Parameter(names = ARG_IMAGE, description = "The full path to a .tar or .tar.gz path containing the application", http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java index d6cabf5..5b4cfdc 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java @@ -21,7 +21,6 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; - @Parameters(commandNames = {SliderActions.ACTION_AM_SUICIDE}, commandDescription = SliderActions.DESCRIBE_ACTION_AM_SUICIDE) public class ActionAMSuicideArgs extends AbstractActionArgs { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/ActionEchoArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionEchoArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionEchoArgs.java index b0f53f8..d05f10b 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ActionEchoArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionEchoArgs.java @@ -20,15 +20,10 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; -/* - -@Parameters(commandNames = {SliderActions.ACTION_KILL_CONTAINER}, - commandDescription = SliderActions.DESCRIBE_ACTION_KILL_CONTAINER) -*/ public class ActionEchoArgs extends AbstractActionArgs { @Override public String getActionName() { - return SliderActions.ACTION_DESTROY; + return SliderActions.ACTION_ECHO; } @Parameter(names = {ARG_MESSAGE}, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/ActionListArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionListArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionListArgs.java index 0bc5792..739b5fc 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ActionListArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionListArgs.java @@ -57,7 +57,7 @@ public class ActionListArgs extends AbstractActionArgs { @Parameter(names = {ARG_COMPONENTS}, variableArity = true, description = "Filter containers by component names (used with " + ARG_CONTAINERS + ")") - public Set<String> components = new HashSet<>(0);; + public Set<String> components = new HashSet<>(0); /** * Get the min #of params expected http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/ActionLookupArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionLookupArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionLookupArgs.java index 3b69e74..1b73522 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ActionLookupArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionLookupArgs.java @@ -43,7 +43,7 @@ public class ActionLookupArgs extends AbstractActionArgs { } @Parameter(names = {ARG_ID}, - description = "ID of the container") + description = "ID of the application") public String id; @Parameter(names = {ARG_OUTPUT, ARG_OUTPUT_SHORT}, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/ActionNodesArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionNodesArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionNodesArgs.java new file mode 100644 index 0000000..bb214e1 --- /dev/null +++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionNodesArgs.java @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.slider.common.params; + +import com.beust.jcommander.Parameter; +import com.beust.jcommander.Parameters; + +import java.io.File; + +@Parameters(commandNames = {SliderActions.ACTION_NODES}, + commandDescription = SliderActions.DESCRIBE_ACTION_NODES) +public class ActionNodesArgs extends AbstractActionArgs { + + @Override + public String getActionName() { + return SliderActions.ACTION_NODES; + } + + @Parameter(names = {ARG_OUTPUT, ARG_OUTPUT_SHORT}, + description = "Output file for the information") + public File outputFile; + + @Parameter(names = {ARG_LABEL}) + public String label = ""; + + @Parameter(names = {ARG_HEALTHY} ) + public boolean healthy; + + +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/ActionStatusArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionStatusArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionStatusArgs.java index a7edb65..00178df 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ActionStatusArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionStatusArgs.java @@ -25,13 +25,14 @@ import com.beust.jcommander.Parameters; commandDescription = SliderActions.DESCRIBE_ACTION_STATUS) public class ActionStatusArgs extends AbstractActionArgs { + @Override public String getActionName() { return SliderActions.ACTION_STATUS; } @Parameter(names = {ARG_OUTPUT, ARG_OUTPUT_SHORT}, - description = "Output file for the configuration data") + description = "Output file for the status information") public String output; public String getOutput() { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/ActionUpgradeArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionUpgradeArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionUpgradeArgs.java index 832e1cc..6ef51b2 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ActionUpgradeArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionUpgradeArgs.java @@ -61,11 +61,11 @@ public class ActionUpgradeArgs extends AbstractClusterBuildingActionArgs @Parameter(names={ARG_CONTAINERS}, variableArity = true, description = "stop specific containers") - public List<String> containers = new ArrayList<String>(0); + public List<String> containers = new ArrayList<>(0); @Parameter(names={ARG_COMPONENTS}, variableArity = true, description = "stop all containers of specific components") - public List<String> components = new ArrayList<String>(0); + public List<String> components = new ArrayList<>(0); @Parameter(names = {ARG_FORCE}, description = "force spec upgrade operation") http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/AddonArgsDelegate.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/AddonArgsDelegate.java b/slider-core/src/main/java/org/apache/slider/common/params/AddonArgsDelegate.java index 65ebc4b..3ef8e19 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/AddonArgsDelegate.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/AddonArgsDelegate.java @@ -34,7 +34,7 @@ public class AddonArgsDelegate extends AbstractArgsDelegate { arity = 2, description = "--addon <name> <folder or package>", splitter = DontSplitArguments.class) - public List<String> addonTuples = new ArrayList<String>(0); + public List<String> addonTuples = new ArrayList<>(0); /** http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java b/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java index 1f07de3..248e4c2 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java @@ -37,7 +37,7 @@ public class AppAndResouceOptionArgsDelegate extends AbstractArgsDelegate { @Parameter(names = {ARG_OPTION, ARG_OPTION_SHORT}, arity = 2, description = ARG_OPTION + "<name> <value>", splitter = DontSplitArguments.class) - public List<String> optionTuples = new ArrayList<String>(0); + public List<String> optionTuples = new ArrayList<>(0); /** @@ -47,7 +47,7 @@ public class AppAndResouceOptionArgsDelegate extends AbstractArgsDelegate { description = "Component option " + ARG_COMP_OPT + " <component> <name> <option>", splitter = DontSplitArguments.class) - public List<String> compOptTriples = new ArrayList<String>(0); + public List<String> compOptTriples = new ArrayList<>(0); /** * Resource Options @@ -55,7 +55,7 @@ public class AppAndResouceOptionArgsDelegate extends AbstractArgsDelegate { @Parameter(names = {ARG_RESOURCE_OPT, ARG_RESOURCE_OPT_SHORT}, arity = 2, description = "Resource option "+ ARG_RESOURCE_OPT + "<name> <value>", splitter = DontSplitArguments.class) - public List<String> resOptionTuples = new ArrayList<String>(0); + public List<String> resOptionTuples = new ArrayList<>(0); /** @@ -65,7 +65,7 @@ public class AppAndResouceOptionArgsDelegate extends AbstractArgsDelegate { description = "Component resource option " + ARG_RES_COMP_OPT + " <component> <name> <option>", splitter = DontSplitArguments.class) - public List<String> resCompOptTriples = new ArrayList<String>(0); + public List<String> resCompOptTriples = new ArrayList<>(0); public Map<String, String> getOptionsMap() throws http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java b/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java index aeb2979..12a2032 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java @@ -44,20 +44,13 @@ public class ArgOps { * create a 3-tuple */ public static List<Object> triple(String msg, int min, int max) { - List<Object> l = new ArrayList<Object>(3); + List<Object> l = new ArrayList<>(3); l.add(msg); l.add(min); l.add(max); return l; } - /** - * Create a tuple - */ - public static List<Object> tuple(String msg, int min) { - return triple(msg, min, min); - } - public static void applyFileSystemBinding(String filesystemBinding, Configuration conf) { if (filesystemBinding != null) { @@ -100,7 +93,7 @@ public class ArgOps { public static Map<String, String> convertTupleListToMap(String description, List<String> list) throws BadCommandArgumentsException { - Map<String, String> results = new HashMap<String, String>(); + Map<String, String> results = new HashMap<>(); if (list != null && !list.isEmpty()) { int size = list.size(); if (size % 2 != 0) { @@ -131,10 +124,9 @@ public class ArgOps { * @throws BadCommandArgumentsException odd #of arguments received */ public static Map<String, Map<String, String>> convertTripleListToMaps(String description, - List<String> list) throws - BadCommandArgumentsException { - Map<String, Map<String, String>> results = - new HashMap<String, Map<String, String>>(); + List<String> list) throws BadCommandArgumentsException { + + Map<String, Map<String, String>> results = new HashMap<>(); if (list != null && !list.isEmpty()) { int size = list.size(); if (size % 3 != 0) { @@ -149,7 +141,7 @@ public class ArgOps { Map<String, String> roleMap = results.get(role); if (roleMap == null) { //demand create new role map - roleMap = new HashMap<String, String>(); + roleMap = new HashMap<>(); results.put(role, roleMap); } if (roleMap.get(key) != null) { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java b/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java index c2fa09c..ca22c24 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java @@ -60,6 +60,7 @@ public interface Arguments { String ARG_GETCONF = "--getconf"; String ARG_GETEXP = "--getexp"; String ARG_GETFILES = "--getfiles"; + String ARG_HEALTHY= "--healthy"; String ARG_HELP = "--help"; String ARG_HOSTNAME = "--hostname"; String ARG_ID = "--id"; @@ -70,6 +71,7 @@ public interface Arguments { String ARG_KEYTABINSTALL = "--install"; String ARG_KEYTABDELETE = "--delete"; String ARG_KEYTABLIST = "--list"; + String ARG_LABEL = "--label"; String ARG_LEVEL = "--level"; String ARG_LIST = "--list"; String ARG_LISTCONF = "--listconf"; @@ -125,10 +127,14 @@ public interface Arguments { /** - * Deprecated + * Deprecated: use ARG_COMPONENT */ @Deprecated String ARG_ROLE = "--role"; + + /** + * Deprecated: use ARG_COMP_OPT + */ @Deprecated String ARG_ROLEOPT = "--roleopt"; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java index 3c430f3..ea1448b 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ClientArgs.java @@ -66,6 +66,7 @@ public class ClientArgs extends CommonArgs { new ActionKillContainerArgs(); private final ActionListArgs actionListArgs = new ActionListArgs(); private final ActionLookupArgs actionLookupArgs = new ActionLookupArgs(); + private final ActionNodesArgs actionNodesArgs = new ActionNodesArgs(); private final ActionRegistryArgs actionRegistryArgs = new ActionRegistryArgs(); private final ActionResolveArgs actionResolveArgs = new ActionResolveArgs(); private final ActionStatusArgs actionStatusArgs = new ActionStatusArgs(); @@ -86,31 +87,32 @@ public class ClientArgs extends CommonArgs { protected void addActionArguments() { addActions( - actionPackageArgs, - actionKeytabArgs, + actionAMSuicideArgs, actionBuildArgs, - actionDependencyArgs, - actionCreateArgs, - actionListArgs, - actionStatusArgs, - actionRegistryArgs, actionClientArgs, - actionFlexArgs, + actionCreateArgs, + actionDependencyArgs, + actionDestroyArgs, actionDiagnosticArgs, + actionExistsArgs, + actionFlexArgs, actionFreezeArgs, + actionHelpArgs, + actionInstallKeytabArgs, + actionInstallPackageArgs, + actionKeytabArgs, + actionKillContainerArgs, + actionListArgs, + actionLookupArgs, + actionNodesArgs, + actionPackageArgs, + actionRegistryArgs, + actionResolveArgs, + actionStatusArgs, actionThawArgs, actionUpdateArgs, actionUpgradeArgs, - actionDestroyArgs, - actionExistsArgs, - actionLookupArgs, - actionResolveArgs, - actionKillContainerArgs, - actionAMSuicideArgs, - actionInstallPackageArgs, - actionInstallKeytabArgs, - actionVersionArgs, - actionHelpArgs + actionVersionArgs ); } @@ -196,6 +198,10 @@ public class ClientArgs extends CommonArgs { return actionListArgs; } + public ActionNodesArgs getActionNodesArgs() { + return actionNodesArgs; + } + public ActionLookupArgs getActionLookupArgs() { return actionLookupArgs; } @@ -286,6 +292,9 @@ public class ClientArgs extends CommonArgs { } else if (SliderActions.ACTION_LOOKUP.equals(action)) { bindCoreAction(actionLookupArgs); + } else if (SliderActions.ACTION_NODES.equals(action)) { + bindCoreAction(actionNodesArgs); + } else if (SliderActions.ACTION_REGISTRY.equals(action)) { bindCoreAction(actionRegistryArgs); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java index 7e02eec..162a87d 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java @@ -91,12 +91,12 @@ public abstract class CommonArgs extends ArgOps implements SliderActions, return coreAction.getClusterName(); } - public CommonArgs(String[] args) { + protected CommonArgs(String[] args) { this.args = args; commander = new JCommander(this); } - public CommonArgs(Collection args) { + protected CommonArgs(Collection args) { List<String> argsAsStrings = SliderUtils.collectionToStringList(args); this.args = argsAsStrings.toArray(new String[argsAsStrings.size()]); commander = new JCommander(this); @@ -123,7 +123,7 @@ public abstract class CommonArgs extends ArgOps implements SliderActions, .append("Most commands print help when invoked without parameters or with --help"); result = helperMessage.toString(); } else { - helperMessage.append("\nUsage: slider " + commandOfInterest); + helperMessage.append("\nUsage: slider ").append(commandOfInterest); helperMessage.append(serviceArgs.coreAction.getMinParams() > 0 ? " <application>" : ""); helperMessage.append("\n"); for (ParameterDescription paramDesc : serviceArgs.commander.getCommands() @@ -171,7 +171,7 @@ public abstract class CommonArgs extends ArgOps implements SliderActions, /** * Add a command * @param name action - * @param arg + * @param arg value */ protected void addAction(String name, Object arg) { commander.addCommand(name, arg); @@ -249,7 +249,7 @@ public abstract class CommonArgs extends ArgOps implements SliderActions, throw new BadCommandArgumentsException(badArgMsgBuilder.toString()); } catch (UsageException e) { StringBuilder badArgMsgBuilder = new StringBuilder(); - badArgMsgBuilder.append(e.toString() + "\n"); + badArgMsgBuilder.append(e.toString()).append("\n"); badArgMsgBuilder.append(usage(this, coreAction.getActionName())); throw new UsageException(badArgMsgBuilder.toString()); } @@ -289,12 +289,6 @@ public abstract class CommonArgs extends ArgOps implements SliderActions, return coreAction.manager; } - -// public String getRmAddress() { -// return rmAddress; -// } - - public String getAction() { return commander.getParsedCommand(); } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/ComponentArgsDelegate.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ComponentArgsDelegate.java b/slider-core/src/main/java/org/apache/slider/common/params/ComponentArgsDelegate.java index 494258e..abda53f 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ComponentArgsDelegate.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ComponentArgsDelegate.java @@ -34,7 +34,7 @@ public class ComponentArgsDelegate extends AbstractArgsDelegate { arity = 2, description = "--component <name> <count>", splitter = DontSplitArguments.class) - public List<String> componentTuples = new ArrayList<String>(0); + public List<String> componentTuples = new ArrayList<>(0); /** http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java b/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java index 3225133..0344305 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java @@ -27,7 +27,7 @@ public class DontSplitArguments implements IParameterSplitter { @Override public List<String> split(String value) { - List<String> list = new ArrayList<String>(1); + List<String> list = new ArrayList<>(1); list.add(value); return list; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e9c5ebc7/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java b/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java index 54d2746..1d4e0ea 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java @@ -39,6 +39,7 @@ public interface SliderActions { String ACTION_KILL_CONTAINER = "kill-container"; String ACTION_LIST = "list"; String ACTION_LOOKUP = "lookup"; + String ACTION_NODES = "nodes"; String ACTION_PREFLIGHT = "preflight"; String ACTION_RECONFIGURE = "reconfigure"; String ACTION_REGISTRY = "registry"; @@ -80,6 +81,7 @@ public interface SliderActions { "List running Slider applications"; String DESCRIBE_ACTION_LOOKUP = "look up a YARN application"; + String DESCRIBE_ACTION_NODES = "List the node information for the YARN cluster or a running application"; String DESCRIBE_ACTION_MONITOR = "Monitor a running application"; String DESCRIBE_ACTION_REGISTRY =
