Author: stevel Date: Mon May 19 16:32:14 2014 New Revision: 1595951 URL: http://svn.apache.org/r1595951 Log: move common/params classes to java 7 language features
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java?rev=1595951&r1=1595950&r2=1595951&view=diff ============================================================================== --- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java (original) +++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java Mon May 19 16:32:14 2014 @@ -58,7 +58,7 @@ public abstract class AbstractActionArgs * This is the default parameter */ @Parameter - public final List<String> parameters = new ArrayList<String>(); + public final List<String> parameters = new ArrayList<>(); /** @@ -80,7 +80,7 @@ public abstract class AbstractActionArgs */ @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 @@ -88,7 +88,7 @@ public abstract class AbstractActionArgs @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}, Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java?rev=1595951&r1=1595950&r2=1595951&view=diff ============================================================================== --- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java (original) +++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AbstractClusterBuildingActionArgs.java Mon May 19 16:32:14 2014 @@ -35,7 +35,8 @@ import java.util.Map; * Abstract Action to build things; shares args across build and * list */ -public abstract class AbstractClusterBuildingActionArgs extends AbstractActionArgs { +public abstract class AbstractClusterBuildingActionArgs extends + AbstractActionArgs { /** * Declare the image configuration directory to use when creating or @@ -44,16 +45,16 @@ public abstract class AbstractClusterBui * be specified. */ @Parameter(names = ARG_CONFDIR, - description = "Path to cluster configuration directory in HDFS", - converter = PathArgumentConverter.class) + description = "Path to cluster configuration directory in HDFS", + converter = PathArgumentConverter.class) public Path confdir; @Parameter(names = ARG_ZKPATH, - description = "Zookeeper path for the application") + description = "Zookeeper path for the application") public String appZKPath; @Parameter(names = ARG_ZKHOSTS, - description = "comma separated list of the Zookeeper hosts") + description = "comma separated list of the Zookeeper hosts") public String zkhosts; /** @@ -61,47 +62,48 @@ public abstract class AbstractClusterBui 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", - converter = PathArgumentConverter.class) + description = "The full path to a .tar or .tar.gz path containing the application", + converter = PathArgumentConverter.class) public Path image; @Parameter(names = ARG_APP_HOME, - description = "Home directory of a pre-installed application") + description = "Home directory of a pre-installed application") public String appHomeDir; @Parameter(names = ARG_PROVIDER, - description = "Provider of the specific cluster application") + description = "Provider of the specific cluster application") public String provider = SliderProviderFactory.DEFAULT_CLUSTER_TYPE; -/* - - @Parameter(names = {ARG_PACKAGE}, - description = "URI to a slider package", - converter = URIArgumentConverter.class ) - public URI packageURI; -*/ + /* + + @Parameter(names = {ARG_PACKAGE}, + description = "URI to a slider package", + converter = URIArgumentConverter.class ) + public URI packageURI; + */ @Parameter(names = {ARG_PACKAGE}, - description = "URI to a slider package") + description = "URI to a slider package") public String packageURI; @Parameter(names = {ARG_RESOURCES}, - description = "File defining the resources of this instance") + description = "File defining the resources of this instance") public File resources; @Parameter(names = {ARG_TEMPLATE}, - description = "Template application configuration") + description = "Template application configuration") public File template; @ParametersDelegate public ComponentArgsDelegate componentDelegate = new ComponentArgsDelegate(); - + @ParametersDelegate - public AppAndResouceOptionArgsDelegate optionsDelegate = new AppAndResouceOptionArgsDelegate(); + public AppAndResouceOptionArgsDelegate optionsDelegate = + new AppAndResouceOptionArgsDelegate(); public Map<String, String> getOptionsMap() throws - BadCommandArgumentsException { + BadCommandArgumentsException { return optionsDelegate.getOptionsMap(); } @@ -111,13 +113,13 @@ public abstract class AbstractClusterBui * @throws BadCommandArgumentsException parse problem */ public Map<String, Map<String, String>> getCompOptionMap() throws - BadCommandArgumentsException { + BadCommandArgumentsException { return optionsDelegate.getCompOptionMap(); } public Map<String, String> getResourceOptionsMap() throws - BadCommandArgumentsException { + BadCommandArgumentsException { return optionsDelegate.getResourceOptionsMap(); } @@ -127,7 +129,7 @@ public abstract class AbstractClusterBui * @throws BadCommandArgumentsException parse problem */ public Map<String, Map<String, String>> getResourceCompOptionMap() throws - BadCommandArgumentsException { + BadCommandArgumentsException { return optionsDelegate.getResourceCompOptionMap(); } @@ -141,7 +143,8 @@ public abstract class AbstractClusterBui * @return role mapping * @throws BadCommandArgumentsException parse problem */ - public Map<String, String> getComponentMap() throws BadCommandArgumentsException { + public Map<String, String> getComponentMap() throws + BadCommandArgumentsException { return componentDelegate.getComponentMap(); } @@ -168,17 +171,19 @@ public abstract class AbstractClusterBui public String getProvider() { return provider; } - - public ConfTree buildAppOptionsConfTree() throws BadCommandArgumentsException { + + public ConfTree buildAppOptionsConfTree() throws + BadCommandArgumentsException { return buildConfTree(getOptionsMap()); } - public ConfTree buildResourceOptionsConfTree() throws BadCommandArgumentsException { + public ConfTree buildResourceOptionsConfTree() throws + BadCommandArgumentsException { return buildConfTree(getResourceOptionsMap()); } protected ConfTree buildConfTree(Map<String, String> optionsMap) throws - BadCommandArgumentsException { + BadCommandArgumentsException { ConfTree confTree = new ConfTree(); ConfTreeOperations ops = new ConfTreeOperations(confTree); confTree.global.putAll(optionsMap); Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java?rev=1595951&r1=1595950&r2=1595951&view=diff ============================================================================== --- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java (original) +++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java Mon May 19 16:32:14 2014 @@ -37,7 +37,7 @@ public class AppAndResouceOptionArgsDele @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 AppAndResouceOptionArgsDele 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 AppAndResouceOptionArgsDele @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 AppAndResouceOptionArgsDele 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 Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java?rev=1595951&r1=1595950&r2=1595951&view=diff ============================================================================== --- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java (original) +++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java Mon May 19 16:32:14 2014 @@ -42,13 +42,9 @@ public class ArgOps { /** * create a 3-tuple - * @param msg - * @param min - * @param max - * @return */ 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); @@ -57,9 +53,6 @@ public class ArgOps { /** * Create a tuple - * @param msg - * @param min - * @return */ public static List<Object> tuple(String msg, int min) { return triple(msg, min, min); @@ -106,7 +99,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) { @@ -133,16 +126,14 @@ public class ArgOps { * ['worker','heapsize','5G','master','heapsize','2M'] into a map * ['worker':'2',"master":'1']; * Duplicate entries also trigger errors - * @param description - * @param list - * @return + * @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>>(); + new HashMap<>(); if (list != null && !list.isEmpty()) { int size = list.size(); if (size % 3 != 0) { @@ -157,7 +148,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) { Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java?rev=1595951&r1=1595950&r2=1595951&view=diff ============================================================================== --- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java (original) +++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java Mon May 19 16:32:14 2014 @@ -63,11 +63,11 @@ public abstract class CommonArgs extends */ - public Map<String, String> definitionMap = new HashMap<String, String>(); + public Map<String, String> definitionMap = new HashMap<>(); /** * System properties */ - public Map<String, String> syspropsMap = new HashMap<String, String>(); + public Map<String, String> syspropsMap = new HashMap<>(); /** Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java?rev=1595951&r1=1595950&r2=1595951&view=diff ============================================================================== --- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java (original) +++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java Mon May 19 16:32:14 2014 @@ -27,7 +27,7 @@ public class DontSplitArguments implemen @Override public List<String> split(String value) { - ArrayList<String> list = new ArrayList<String>(1); + List<String> list = new ArrayList<>(1); list.add(value); return list; }