http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDeploymentPoliciesCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDeploymentPoliciesCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDeploymentPoliciesCommand.java index 3f37b06..0f8f363 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDeploymentPoliciesCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDeploymentPoliciesCommand.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class ListDeploymentPoliciesCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(ListDeploymentPoliciesCommand.class); + private static final Logger log = LoggerFactory.getLogger(ListDeploymentPoliciesCommand.class); public ListDeploymentPoliciesCommand() { } @@ -47,9 +47,9 @@ public class ListDeploymentPoliciesCommand implements Command<StratosCommandCont return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args == null || args.length == 0) { RestCommandLineService.getInstance().listDeploymentPolicies();
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDomainMappingsCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDomainMappingsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDomainMappingsCommand.java index 11702d1..8726bc2 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDomainMappingsCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListDomainMappingsCommand.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class ListDomainMappingsCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(ListDomainMappingsCommand.class); + private static final Logger log = LoggerFactory.getLogger(ListDomainMappingsCommand.class); public ListDomainMappingsCommand() { } @@ -48,9 +48,9 @@ public class ListDomainMappingsCommand implements Command<StratosCommandContext> return "[application-id]"; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing command: ", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing command: ", getName()); } if ((args == null) || (args.length == 0)) { context.getStratosApplication().printUsage(getName()); http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListKubernetesClustersCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListKubernetesClustersCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListKubernetesClustersCommand.java index dec547b..641a9f9 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListKubernetesClustersCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListKubernetesClustersCommand.java @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; public class ListKubernetesClustersCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(ListKubernetesClustersCommand.class); + private static final Logger log = LoggerFactory.getLogger(ListKubernetesClustersCommand.class); public ListKubernetesClustersCommand() { } @@ -48,9 +48,9 @@ public class ListKubernetesClustersCommand implements Command<StratosCommandCont return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing command: ", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing command: ", getName()); } if ((args == null) || (args.length == 0)) { RestCommandLineService.getInstance().listKubernetesClusters(); http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListKubernetesHostsCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListKubernetesHostsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListKubernetesHostsCommand.java index b240cfa..86d430c 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListKubernetesHostsCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListKubernetesHostsCommand.java @@ -32,7 +32,7 @@ import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; public class ListKubernetesHostsCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(ListKubernetesHostsCommand.class); + private static final Logger log = LoggerFactory.getLogger(ListKubernetesHostsCommand.class); private final Options options; @@ -63,9 +63,9 @@ public class ListKubernetesHostsCommand implements Command<StratosCommandContext return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length > 0) { @@ -77,15 +77,15 @@ public class ListKubernetesHostsCommand implements Command<StratosCommandContext try { commandLine = parser.parse(options, args); //merge newly discovered options with previously discovered ones. - Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions()); + Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); - if (logger.isDebugEnabled()) { - logger.debug("List kubernetes hosts of a cluster"); + if (log.isDebugEnabled()) { + log.debug("List kubernetes hosts of a cluster"); } if (opts.hasOption(CliConstants.CLUSTER_ID_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Cluster id option is passed"); + if (log.isTraceEnabled()) { + log.trace("Cluster id option is passed"); } clusterId = opts.getOption(CliConstants.CLUSTER_ID_OPTION).getValue(); } @@ -99,8 +99,8 @@ public class ListKubernetesHostsCommand implements Command<StratosCommandContext return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (logger.isErrorEnabled()) { - logger.error("Error parsing arguments", e); + if (log.isErrorEnabled()) { + log.error("Error parsing arguments", e); } System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListNetworkPartitionCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListNetworkPartitionCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListNetworkPartitionCommand.java index 6a05675..c7dc6e4 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListNetworkPartitionCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListNetworkPartitionCommand.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class ListNetworkPartitionCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(ListNetworkPartitionCommand.class); + private static final Logger log = LoggerFactory.getLogger(ListNetworkPartitionCommand.class); public ListNetworkPartitionCommand() { } @@ -47,9 +47,9 @@ public class ListNetworkPartitionCommand implements Command<StratosCommandContex return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args == null || args.length == 0) { RestCommandLineService.getInstance().listNetworkPartitions(); http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java index e6a3f8a..56f8a05 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListPartialSearchTenantsCommand.java @@ -25,13 +25,14 @@ import org.apache.stratos.cli.RestCommandLineService; import org.apache.stratos.cli.StratosCommandContext; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; -import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; + public class ListPartialSearchTenantsCommand implements Command<StratosCommandContext>{ - private static final Logger logger = LoggerFactory.getLogger(ListCartridgesByFilterCommand.class); + private static final Logger log = LoggerFactory.getLogger(ListPartialSearchTenantsCommand.class); private final Options options; @@ -62,9 +63,9 @@ public class ListPartialSearchTenantsCommand implements Command<StratosCommandCo return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length > 0) { @@ -76,15 +77,15 @@ public class ListPartialSearchTenantsCommand implements Command<StratosCommandCo try { commandLine = parser.parse(options, args); //merge newly discovered options with previously discovered ones. - Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions()); + Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); - if (logger.isDebugEnabled()) { - logger.debug("List cartridges by partial domain search"); + if (log.isDebugEnabled()) { + log.debug("List cartridges by partial domain search"); } if (opts.hasOption(CliConstants.TENANT_PARTIAL_SEARCH_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Partial domain option is passed"); + if (log.isTraceEnabled()) { + log.trace("Partial domain option is passed"); } partialDomain = opts.getOption(CliConstants.TENANT_PARTIAL_SEARCH_OPTION).getValue(); } @@ -98,8 +99,8 @@ public class ListPartialSearchTenantsCommand implements Command<StratosCommandCo return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (logger.isErrorEnabled()) { - logger.error("Error parsing arguments", e); + if (log.isErrorEnabled()) { + log.error("Error parsing arguments", e); } System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java index 03740cc..512ee05 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListTenants.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; public class ListTenants implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(ListTenants.class); + private static final Logger log = LoggerFactory.getLogger(ListTenants.class); public ListTenants(){ } @@ -47,9 +47,9 @@ public class ListTenants implements Command<StratosCommandContext> { return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args == null || args.length == 0) { RestCommandLineService.getInstance().listTenants(); http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListUsers.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListUsers.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListUsers.java index e6cb0d6..99019ac 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListUsers.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListUsers.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; public class ListUsers implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(ListUsers.class); + private static final Logger log = LoggerFactory.getLogger(ListUsers.class); public ListUsers(){ } @@ -47,9 +47,9 @@ public class ListUsers implements Command<StratosCommandContext> { return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args == null || args.length == 0) { RestCommandLineService.getInstance().listAllUsers(); http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveApplicationPolicyCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveApplicationPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveApplicationPolicyCommand.java index db6d297..b1b32bd 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveApplicationPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveApplicationPolicyCommand.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class RemoveApplicationPolicyCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(RemoveApplicationPolicyCommand.class); + private static final Logger log = LoggerFactory.getLogger(RemoveApplicationPolicyCommand.class); @Override public String getName() { @@ -44,7 +44,7 @@ public class RemoveApplicationPolicyCommand implements Command<StratosCommandCon @Override public String getArgumentSyntax() { - return "[Application-policy Id]"; + return "[application-policy-id]"; } @Override @@ -53,16 +53,16 @@ public class RemoveApplicationPolicyCommand implements Command<StratosCommandCon } @Override - public int execute(StratosCommandContext context, String[] args,Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args,Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length == 1) { - String id = args[0]; - if (logger.isDebugEnabled()) { - logger.debug("Getting application-policy Id {}", id); + String applicationPolicyId = args[0]; + if (log.isDebugEnabled()) { + log.debug("Getting application policy id {}", applicationPolicyId); } - RestCommandLineService.getInstance().deleteApplicationPolicy(id); + RestCommandLineService.getInstance().deleteApplicationPolicy(applicationPolicyId); return CliConstants.COMMAND_SUCCESSFULL; } else { context.getStratosApplication().printUsage(getName()); http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveCartridgeCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveCartridgeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveCartridgeCommand.java index 7bc997b..e6611e3 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveCartridgeCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveCartridgeCommand.java @@ -29,7 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class RemoveCartridgeCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(RemoveCartridgeCommand.class); + private static final Logger log = LoggerFactory.getLogger(RemoveCartridgeCommand.class); @Override public String getName() { @@ -52,16 +52,16 @@ public class RemoveCartridgeCommand implements Command<StratosCommandContext> { } @Override - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length == 1) { - String id = args[0]; - if (logger.isDebugEnabled()) { - logger.debug("Getting Remove cartridge definition info {}", id); + String cartridgeType = args[0]; + if (log.isDebugEnabled()) { + log.debug("Getting Remove cartridge definition info {}", cartridgeType); } - RestCommandLineService.getInstance().undeployCartrigdeDefinition(id); + RestCommandLineService.getInstance().undeployCartrigdeDefinition(cartridgeType); return CliConstants.COMMAND_SUCCESSFULL; } else { context.getStratosApplication().printUsage(getName()); http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveCartridgeGroupCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveCartridgeGroupCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveCartridgeGroupCommand.java index 66c7845..c1877c0 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveCartridgeGroupCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveCartridgeGroupCommand.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; */ public class RemoveCartridgeGroupCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(RemoveCartridgeGroupCommand.class); + private static final Logger log = LoggerFactory.getLogger(RemoveCartridgeGroupCommand.class); public RemoveCartridgeGroupCommand() { } @@ -60,9 +60,9 @@ public class RemoveCartridgeGroupCommand implements Command<StratosCommandContex } @Override - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing command: ", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing command: ", getName()); } if ((args == null) || (args.length <= 0)) { @@ -70,8 +70,8 @@ public class RemoveCartridgeGroupCommand implements Command<StratosCommandContex return CliConstants.COMMAND_FAILED; } - String serviceGroupName = args[0]; - RestCommandLineService.getInstance().undeployServiceGroup(serviceGroupName); + String cartridgeGroupName = args[0]; + RestCommandLineService.getInstance().undeployServiceGroup(cartridgeGroupName); return CliConstants.COMMAND_SUCCESSFULL; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDeploymentPolicyCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDeploymentPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDeploymentPolicyCommand.java index b9823cd..5229a23 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDeploymentPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDeploymentPolicyCommand.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class RemoveDeploymentPolicyCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(RemoveDeploymentPolicyCommand.class); + private static final Logger log = LoggerFactory.getLogger(RemoveDeploymentPolicyCommand.class); @Override public String getName() { @@ -44,7 +44,7 @@ public class RemoveDeploymentPolicyCommand implements Command<StratosCommandCont @Override public String getArgumentSyntax() { - return "[Deployment-policy Id]"; + return "[deployment-policy-id]"; } @Override @@ -53,16 +53,16 @@ public class RemoveDeploymentPolicyCommand implements Command<StratosCommandCont } @Override - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length == 1) { - String id = args[0]; - if (logger.isDebugEnabled()) { - logger.debug("Getting Deployment-policy Id {}", id); + String deploymentPolicyId = args[0]; + if (log.isDebugEnabled()) { + log.debug("Getting deployment policy id {}", deploymentPolicyId); } - RestCommandLineService.getInstance().deleteDeploymentPolicy(id); + RestCommandLineService.getInstance().deleteDeploymentPolicy(deploymentPolicyId); return CliConstants.COMMAND_SUCCESSFULL; } else { context.getStratosApplication().printUsage(getName()); http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingsCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingsCommand.java index 6d7a641..9a9c66a 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingsCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingsCommand.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; */ public class RemoveDomainMappingsCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(RemoveDomainMappingsCommand.class); + private static final Logger log = LoggerFactory.getLogger(RemoveDomainMappingsCommand.class); public RemoveDomainMappingsCommand() { } @@ -60,9 +60,9 @@ public class RemoveDomainMappingsCommand implements Command<StratosCommandContex } @Override - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing command: ", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing command: ", getName()); } if ((args == null) || (args.length <= 0)) { http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveKubernetesClusterCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveKubernetesClusterCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveKubernetesClusterCommand.java index b6e117c..a7f3a34 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveKubernetesClusterCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveKubernetesClusterCommand.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; */ public class RemoveKubernetesClusterCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(RemoveKubernetesClusterCommand.class); + private static final Logger log = LoggerFactory.getLogger(RemoveKubernetesClusterCommand.class); public RemoveKubernetesClusterCommand() { } @@ -59,9 +59,9 @@ public class RemoveKubernetesClusterCommand implements Command<StratosCommandCon } @Override - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing command: ", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing command: ", getName()); } if ((args == null) || (args.length <= 0)) { http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveKubernetesHostCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveKubernetesHostCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveKubernetesHostCommand.java index de81f53..db99848 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveKubernetesHostCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveKubernetesHostCommand.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; */ public class RemoveKubernetesHostCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(RemoveKubernetesHostCommand.class); + private static final Logger log = LoggerFactory.getLogger(RemoveKubernetesHostCommand.class); public RemoveKubernetesHostCommand() { } @@ -60,9 +60,9 @@ public class RemoveKubernetesHostCommand implements Command<StratosCommandContex } @Override - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing command: ", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing command: ", getName()); } if ((args == null) || (args.length <= 0)) { http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveNetworkPartitionCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveNetworkPartitionCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveNetworkPartitionCommand.java index a882521..7a6636f 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveNetworkPartitionCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveNetworkPartitionCommand.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class RemoveNetworkPartitionCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(RemoveNetworkPartitionCommand.class); + private static final Logger log = LoggerFactory.getLogger(RemoveNetworkPartitionCommand.class); @Override public String getName() { @@ -44,7 +44,7 @@ public class RemoveNetworkPartitionCommand implements Command<StratosCommandCont @Override public String getArgumentSyntax() { - return "[id]"; + return "[network-partition-id]"; } @Override @@ -53,16 +53,16 @@ public class RemoveNetworkPartitionCommand implements Command<StratosCommandCont } @Override - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length == 1) { - String id = args[0]; - if (logger.isDebugEnabled()) { - logger.debug("Getting Remove network partition info {}", id); + String networkPartitionId = args[0]; + if (log.isDebugEnabled()) { + log.debug("Getting Remove network partition info {}", networkPartitionId); } - RestCommandLineService.getInstance().removeNetworkPartition(id); + RestCommandLineService.getInstance().removeNetworkPartition(networkPartitionId); return CliConstants.COMMAND_SUCCESSFULL; } else { context.getStratosApplication().printUsage(getName()); http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SynchronizeArtifactsCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SynchronizeArtifactsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SynchronizeArtifactsCommand.java index 433402a..004f18e 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SynchronizeArtifactsCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SynchronizeArtifactsCommand.java @@ -51,7 +51,7 @@ public class SynchronizeArtifactsCommand implements Command<StratosCommandContex } @Override - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { if (logger.isDebugEnabled()) { logger.debug("Executing {} command...", getName()); } http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployApplicationCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployApplicationCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployApplicationCommand.java index dbec04c..af90d98 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployApplicationCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UndeployApplicationCommand.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; */ public class UndeployApplicationCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(UndeployApplicationCommand.class); + private static final Logger log = LoggerFactory.getLogger(UndeployApplicationCommand.class); public UndeployApplicationCommand() { } @@ -60,9 +60,9 @@ public class UndeployApplicationCommand implements Command<StratosCommandContext } @Override - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing command: ", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing command: ", getName()); } if ((args == null) || (args.length <= 0)) { http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateApplicationPolicyCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateApplicationPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateApplicationPolicyCommand.java index 88d13b5..4b3d154 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateApplicationPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateApplicationPolicyCommand.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; public class UpdateApplicationPolicyCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(UpdateApplicationPolicyCommand.class); + private static final Logger log = LoggerFactory.getLogger(UpdateApplicationPolicyCommand.class); private final Options options; @@ -67,14 +67,14 @@ public class UpdateApplicationPolicyCommand implements Command<StratosCommandCon return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length > 0) { String resourcePath = null; - String applicationPolicyDeployment = null; + String resourceFileContent = null; final CommandLineParser parser = new GnuParser(); CommandLine commandLine; @@ -82,29 +82,29 @@ public class UpdateApplicationPolicyCommand implements Command<StratosCommandCon try { commandLine = parser.parse(options, args); - if (logger.isDebugEnabled()) { - logger.debug("Updating application policy"); + if (log.isDebugEnabled()) { + log.debug("Updating application policy"); } if (commandLine.hasOption(CliConstants.RESOURCE_PATH)) { - if (logger.isTraceEnabled()) { - logger.trace("Resource path option is passed"); + if (log.isTraceEnabled()) { + log.trace("Resource path option is passed"); } resourcePath = commandLine.getOptionValue(CliConstants.RESOURCE_PATH); - applicationPolicyDeployment = CliUtils.readResource(resourcePath); + resourceFileContent = CliUtils.readResource(resourcePath); } if (resourcePath == null) { - System.out.println("usage: " + getName() + " [-p <resource path>]"); + context.getStratosApplication().printUsage(getName()); return CliConstants.COMMAND_FAILED; } - RestCommandLineService.getInstance().updateApplicationPolicy(applicationPolicyDeployment); + RestCommandLineService.getInstance().updateApplicationPolicy(resourceFileContent); return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (logger.isErrorEnabled()) { - logger.error("Error parsing arguments", e); + if (log.isErrorEnabled()) { + log.error("Error parsing arguments", e); } System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateAutoscalingPolicyCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateAutoscalingPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateAutoscalingPolicyCommand.java index 7c8a05e..ab2352b 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateAutoscalingPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateAutoscalingPolicyCommand.java @@ -25,17 +25,16 @@ import org.apache.stratos.cli.StratosCommandContext; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; import org.apache.stratos.cli.utils.CliUtils; -import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.BufferedReader; -import java.io.FileReader; import java.io.IOException; +import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; + public class UpdateAutoscalingPolicyCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(UpdateAutoscalingPolicyCommand.class); + private static final Logger log = LoggerFactory.getLogger(UpdateAutoscalingPolicyCommand.class); private final Options options; @@ -70,14 +69,14 @@ public class UpdateAutoscalingPolicyCommand implements Command<StratosCommandCon return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length > 0) { String resourcePath = null; - String autoscalingPolicyDeployment = null; + String resourceFileContent = null; final CommandLineParser parser = new GnuParser(); CommandLine commandLine; @@ -85,31 +84,31 @@ public class UpdateAutoscalingPolicyCommand implements Command<StratosCommandCon try { commandLine = parser.parse(options, args); //merge newly discovered options with previously discovered ones. - Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions()); + Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); - if (logger.isDebugEnabled()) { - logger.debug("Updating autoscaling policy"); + if (log.isDebugEnabled()) { + log.debug("Updating autoscaling policy"); } if (opts.hasOption(CliConstants.RESOURCE_PATH)) { - if (logger.isTraceEnabled()) { - logger.trace("Resource path option is passed"); + if (log.isTraceEnabled()) { + log.trace("Resource path option is passed"); } resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue(); - autoscalingPolicyDeployment = CliUtils.readResource(resourcePath); + resourceFileContent = CliUtils.readResource(resourcePath); } if (resourcePath == null) { - System.out.println("usage: " + getName() + " [-p <resource path>]"); + context.getStratosApplication().printUsage(getName()); return CliConstants.COMMAND_FAILED; } - RestCommandLineService.getInstance().updateAutoscalingPolicy(autoscalingPolicyDeployment); + RestCommandLineService.getInstance().updateAutoscalingPolicy(resourceFileContent); return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (logger.isErrorEnabled()) { - logger.error("Error parsing arguments", e); + if (log.isErrorEnabled()) { + log.error("Error parsing arguments", e); } System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateCartridgeCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateCartridgeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateCartridgeCommand.java index ae1ec4e..66fa503 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateCartridgeCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateCartridgeCommand.java @@ -24,17 +24,17 @@ import org.apache.stratos.cli.RestCommandLineService; import org.apache.stratos.cli.StratosCommandContext; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; -import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; +import org.apache.stratos.cli.utils.CliUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.BufferedReader; -import java.io.FileReader; import java.io.IOException; +import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; + public class UpdateCartridgeCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(UpdateCartridgeCommand.class); + private static final Logger log = LoggerFactory.getLogger(UpdateCartridgeCommand.class); private final Options options; @@ -65,14 +65,14 @@ public class UpdateCartridgeCommand implements Command<StratosCommandContext> { return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length > 0) { String resourcePath = null; - String cartridgeJson = null; + String resourceFileContent = null; final CommandLineParser parser = new GnuParser(); CommandLine commandLine; @@ -80,31 +80,31 @@ public class UpdateCartridgeCommand implements Command<StratosCommandContext> { try { commandLine = parser.parse(options, args); //merge newly discovered options with previously discovered ones. - Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions()); + Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); - if (logger.isDebugEnabled()) { - logger.debug("Cartridge deployment"); + if (log.isDebugEnabled()) { + log.debug("Cartridge deployment"); } if (opts.hasOption(CliConstants.RESOURCE_PATH)) { - if (logger.isTraceEnabled()) { - logger.trace("Resource path option is passed"); + if (log.isTraceEnabled()) { + log.trace("Resource path option is passed"); } resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue(); - cartridgeJson = readResource(resourcePath); + resourceFileContent = CliUtils.readResource(resourcePath); } if (resourcePath == null) { - System.out.println("usage: " + getName() + " [-p <resource path>]"); + context.getStratosApplication().printUsage(getName()); return CliConstants.COMMAND_FAILED; } - RestCommandLineService.getInstance().updateCartridge(cartridgeJson); + RestCommandLineService.getInstance().updateCartridge(resourceFileContent); return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (logger.isErrorEnabled()) { - logger.error("Error parsing arguments", e); + if (log.isErrorEnabled()) { + log.error("Error parsing arguments", e); } System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; @@ -120,23 +120,6 @@ public class UpdateCartridgeCommand implements Command<StratosCommandContext> { } } - private String readResource(String fileName) throws IOException { - BufferedReader br = new BufferedReader(new FileReader(fileName)); - try { - StringBuilder sb = new StringBuilder(); - String line = br.readLine(); - - while (line != null) { - sb.append(line); - sb.append("\n"); - line = br.readLine(); - } - return sb.toString(); - } finally { - br.close(); - } - } - public Options getOptions() { return options; } http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateDeploymentPolicyCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateDeploymentPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateDeploymentPolicyCommand.java index b415b24..ff10438 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateDeploymentPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateDeploymentPolicyCommand.java @@ -26,14 +26,15 @@ import org.apache.stratos.cli.StratosCommandContext; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; import org.apache.stratos.cli.utils.CliUtils; -import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; +import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; + public class UpdateDeploymentPolicyCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(UpdateDeploymentPolicyCommand.class); + private static final Logger log = LoggerFactory.getLogger(UpdateDeploymentPolicyCommand.class); private final Options options; @@ -68,14 +69,14 @@ public class UpdateDeploymentPolicyCommand implements Command<StratosCommandCont return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length > 0) { String resourcePath = null; - String deploymentPolicyDeployment = null; + String resourceFileContent = null; final CommandLineParser parser = new GnuParser(); CommandLine commandLine; @@ -83,31 +84,31 @@ public class UpdateDeploymentPolicyCommand implements Command<StratosCommandCont try { commandLine = parser.parse(options, args); //merge newly discovered options with previously discovered ones. - Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions()); + Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); - if (logger.isDebugEnabled()) { - logger.debug("Updating deployment policy"); + if (log.isDebugEnabled()) { + log.debug("Updating deployment policy"); } if (opts.hasOption(CliConstants.RESOURCE_PATH)) { - if (logger.isTraceEnabled()) { - logger.trace("Resource path option is passed"); + if (log.isTraceEnabled()) { + log.trace("Resource path option is passed"); } resourcePath = commandLine.getOptionValue(CliConstants.RESOURCE_PATH); - deploymentPolicyDeployment = CliUtils.readResource(resourcePath); + resourceFileContent = CliUtils.readResource(resourcePath); } if (resourcePath == null) { - System.out.println("usage: " + getName() + " [-p <resource path>]"); + context.getStratosApplication().printUsage(getName()); return CliConstants.COMMAND_FAILED; } - RestCommandLineService.getInstance().updateDeploymentPolicy(deploymentPolicyDeployment); + RestCommandLineService.getInstance().updateDeploymentPolicy(resourceFileContent); return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (logger.isErrorEnabled()) { - logger.error("Error parsing arguments", e); + if (log.isErrorEnabled()) { + log.error("Error parsing arguments", e); } System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java index f80cd9e..bc02176 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesHostCommand.java @@ -25,18 +25,19 @@ import org.apache.stratos.cli.StratosCommandContext; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; import org.apache.stratos.cli.utils.CliUtils; -import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; +import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; + /** * Update kubernetes host command. */ public class UpdateKubernetesHostCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(UpdateKubernetesHostCommand.class); + private static final Logger log = LoggerFactory.getLogger(UpdateKubernetesHostCommand.class); private Options options; @@ -44,12 +45,17 @@ public class UpdateKubernetesHostCommand implements Command<StratosCommandContex options = new Options(); Option clusterIdOption = new Option(CliConstants.CLUSTER_ID_OPTION, CliConstants.CLUSTER_ID_LONG_OPTION, true, "Kubernetes cluster id"); + clusterIdOption.setArgName("cluster id"); + options.addOption(clusterIdOption); + Option hostIdOption = new Option(CliConstants.HOST_ID_OPTION, CliConstants.HOST_ID_LONG_OPTION, true, "Kubernetes host id"); + hostIdOption.setArgName("host id"); + options.addOption(hostIdOption); + Option resourcePathOption = new Option(CliConstants.RESOURCE_PATH, CliConstants.RESOURCE_PATH_LONG_OPTION, true, "Kubernetes host resource path"); - options.addOption(clusterIdOption); - options.addOption(hostIdOption); + resourcePathOption.setArgName("resource path"); options.addOption(resourcePathOption); } @Override @@ -73,9 +79,9 @@ public class UpdateKubernetesHostCommand implements Command<StratosCommandContex } @Override - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing command: ", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing command: ", getName()); } if ((args == null) || (args.length <= 0)) { @@ -87,7 +93,7 @@ public class UpdateKubernetesHostCommand implements Command<StratosCommandContex CommandLineParser parser = new GnuParser(); CommandLine commandLine = parser.parse(options, args); //merge newly discovered options with previously discovered ones. - Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions()); + Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); if((opts.hasOption(CliConstants.RESOURCE_PATH)) && (opts.hasOption(CliConstants.HOST_ID_OPTION)) && (opts.hasOption(CliConstants.CLUSTER_ID_OPTION))) { @@ -121,7 +127,7 @@ public class UpdateKubernetesHostCommand implements Command<StratosCommandContex return CliConstants.COMMAND_FAILED; } } catch (ParseException e) { - logger.error("Error parsing arguments", e); + log.error("Error parsing arguments", e); System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; } catch (IOException e) { @@ -130,7 +136,7 @@ public class UpdateKubernetesHostCommand implements Command<StratosCommandContex } catch (Exception e) { String message = "Unknown error occurred: " + e.getMessage(); System.out.println(message); - logger.error(message, e); + log.error(message, e); return CliConstants.COMMAND_FAILED; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesMasterCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesMasterCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesMasterCommand.java index d741a0e..00461bf 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesMasterCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateKubernetesMasterCommand.java @@ -25,18 +25,19 @@ import org.apache.stratos.cli.StratosCommandContext; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; import org.apache.stratos.cli.utils.CliUtils; -import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; +import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; + /** * Update kubernetes master command. */ public class UpdateKubernetesMasterCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(UpdateKubernetesMasterCommand.class); + private static final Logger log = LoggerFactory.getLogger(UpdateKubernetesMasterCommand.class); private Options options; @@ -44,10 +45,13 @@ public class UpdateKubernetesMasterCommand implements Command<StratosCommandCont options = new Options(); Option resourcePathOption = new Option(CliConstants.RESOURCE_PATH, CliConstants.RESOURCE_PATH_LONG_OPTION, true, "Kubernetes master resource path"); + resourcePathOption.setArgName("resource path"); + options.addOption(resourcePathOption); + Option clusterIdOption = new Option(CliConstants.CLUSTER_ID_OPTION, CliConstants.CLUSTER_ID_LONG_OPTION, true, "Kubernetes cluster id"); + clusterIdOption.setArgName("cluster id"); options.addOption(clusterIdOption); - options.addOption(resourcePathOption); } @Override public String getName() { @@ -70,9 +74,9 @@ public class UpdateKubernetesMasterCommand implements Command<StratosCommandCont } @Override - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing command: ", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing command: ", getName()); } if ((args == null) || (args.length <= 0)) { @@ -84,7 +88,7 @@ public class UpdateKubernetesMasterCommand implements Command<StratosCommandCont CommandLineParser parser = new GnuParser(); CommandLine commandLine = parser.parse(options, args); //merge newly discovered options with previously discovered ones. - Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions()); + Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); if((opts.hasOption(CliConstants.RESOURCE_PATH)) && (opts.hasOption(CliConstants.CLUSTER_ID_OPTION))) { // get cluster id arg value @@ -110,7 +114,7 @@ public class UpdateKubernetesMasterCommand implements Command<StratosCommandCont } } catch (ParseException e) { - logger.error("Error parsing arguments", e); + log.error("Error parsing arguments", e); System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; } catch (IOException e) { @@ -119,7 +123,7 @@ public class UpdateKubernetesMasterCommand implements Command<StratosCommandCont } catch (Exception e) { String message = "Unknown error occurred: " + e.getMessage(); System.out.println(message); - logger.error(message, e); + log.error(message, e); return CliConstants.COMMAND_FAILED; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateNetworkPartitionCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateNetworkPartitionCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateNetworkPartitionCommand.java index fedec13..ed7e0ab 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateNetworkPartitionCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateNetworkPartitionCommand.java @@ -25,16 +25,16 @@ import org.apache.stratos.cli.RestCommandLineService; import org.apache.stratos.cli.StratosCommandContext; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; -import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; +import org.apache.stratos.cli.utils.CliUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.BufferedReader; -import java.io.FileReader; import java.io.IOException; +import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; + public class UpdateNetworkPartitionCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(UpdateNetworkPartitionCommand.class); + private static final Logger log = LoggerFactory.getLogger(UpdateNetworkPartitionCommand.class); private final Options options; @@ -65,14 +65,14 @@ public class UpdateNetworkPartitionCommand implements Command<StratosCommandCont return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length > 0) { String resourcePath = null; - String partitionJson = null; + String resourceFileContent = null; final CommandLineParser parser = new GnuParser(); CommandLine commandLine; @@ -80,31 +80,31 @@ public class UpdateNetworkPartitionCommand implements Command<StratosCommandCont try { commandLine = parser.parse(options, args); //merge newly discovered options with previously discovered ones. - Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions()); + Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); - if (logger.isDebugEnabled()) { - logger.debug("Network partition deployment"); + if (log.isDebugEnabled()) { + log.debug("Network partition deployment"); } if (opts.hasOption(CliConstants.RESOURCE_PATH)) { - if (logger.isTraceEnabled()) { - logger.trace("Resource path option is passed"); + if (log.isTraceEnabled()) { + log.trace("Resource path option is passed"); } resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue(); - partitionJson = readResource(resourcePath); + resourceFileContent = CliUtils.readResource(resourcePath); } if (resourcePath == null) { - System.out.println("usage: " + getName() + " [-p <resource path>]"); + context.getStratosApplication().printUsage(getName()); return CliConstants.COMMAND_FAILED; } - RestCommandLineService.getInstance().updateNetworkPartition(partitionJson); + RestCommandLineService.getInstance().updateNetworkPartition(resourceFileContent); return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (logger.isErrorEnabled()) { - logger.error("Error parsing arguments", e); + if (log.isErrorEnabled()) { + log.error("Error parsing arguments", e); } System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; @@ -120,23 +120,6 @@ public class UpdateNetworkPartitionCommand implements Command<StratosCommandCont } } - private String readResource(String fileName) throws IOException { - BufferedReader br = new BufferedReader(new FileReader(fileName)); - try { - StringBuilder sb = new StringBuilder(); - String line = br.readLine(); - - while (line != null) { - sb.append(line); - sb.append("\n"); - line = br.readLine(); - } - return sb.toString(); - } finally { - br.close(); - } - } - public Options getOptions() { return options; } http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateTenantCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateTenantCommand.java index 1d9c776..e020cad 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateTenantCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateTenantCommand.java @@ -25,12 +25,13 @@ import org.apache.stratos.cli.RestCommandLineService; import org.apache.stratos.cli.StratosCommandContext; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; -import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; + public class UpdateTenantCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(UpdateTenantCommand.class); + private static final Logger log = LoggerFactory.getLogger(UpdateTenantCommand.class); private final Options options; @@ -46,10 +47,10 @@ public class UpdateTenantCommand implements Command<StratosCommandContext> { usernameOption.setArgName("username"); options.addOption(usernameOption); - Option fistnameOption = new Option(CliConstants.FIRST_NAME_OPTION, CliConstants.FIRST_NAME_LONG_OPTION, true, + Option firstnameOption = new Option(CliConstants.FIRST_NAME_OPTION, CliConstants.FIRST_NAME_LONG_OPTION, true, "Tenant first name"); - fistnameOption.setArgName("firstname"); - options.addOption(fistnameOption); + firstnameOption.setArgName("firstname"); + options.addOption(firstnameOption); Option lastnameOption = new Option(CliConstants.LAST_NAME_OPTION, CliConstants.LAST_NAME_LONG_OPTION, true, "Tenant last name"); @@ -91,15 +92,15 @@ public class UpdateTenantCommand implements Command<StratosCommandContext> { return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length > 0) { String admin = null; String firstName = null; - String lastaName = null; + String lastName = null; String password = null; String domain = null; String email = null; @@ -111,69 +112,69 @@ public class UpdateTenantCommand implements Command<StratosCommandContext> { try { commandLine = parser.parse(options, args); //merge newly discovered options with previously discovered ones. - Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions()); + Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); - if (logger.isDebugEnabled()) { - logger.debug("Update tenant"); + if (log.isDebugEnabled()) { + log.debug("Update tenant"); } if (opts.hasOption(CliConstants.USERNAME_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Username option is passed"); + if (log.isTraceEnabled()) { + log.trace("Username option is passed"); } admin = opts.getOption(CliConstants.USERNAME_OPTION).getValue(); } if (opts.hasOption(CliConstants.FIRST_NAME_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("First name option is passed"); + if (log.isTraceEnabled()) { + log.trace("First name option is passed"); } firstName = opts.getOption(CliConstants.FIRST_NAME_OPTION).getValue(); } if (opts.hasOption(CliConstants.LAST_NAME_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Last name option is passed"); + if (log.isTraceEnabled()) { + log.trace("Last name option is passed"); } - lastaName = opts.getOption(CliConstants.LAST_NAME_OPTION).getValue(); + lastName = opts.getOption(CliConstants.LAST_NAME_OPTION).getValue(); } if (opts.hasOption(CliConstants.PASSWORD_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Password option is passed"); + if (log.isTraceEnabled()) { + log.trace("Password option is passed"); } password = opts.getOption(CliConstants.PASSWORD_OPTION).getValue(); } if (opts.hasOption(CliConstants.DOMAIN_NAME_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Domain name option is passed"); + if (log.isTraceEnabled()) { + log.trace("Domain name option is passed"); } domain = opts.getOption(CliConstants.DOMAIN_NAME_OPTION).getValue(); } if (opts.hasOption(CliConstants.EMAIL_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Email option is passed"); + if (log.isTraceEnabled()) { + log.trace("Email option is passed"); } email = opts.getOption(CliConstants.EMAIL_OPTION).getValue(); } if (opts.hasOption(CliConstants.ID_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Id option is passed"); + if (log.isTraceEnabled()) { + log.trace("Id option is passed"); } id = Integer.parseInt(opts.getOption(CliConstants.ID_OPTION).getValue()); } - if (id == 0 ||admin == null || firstName == null || lastaName == null || password == null || domain == null || email == null) { - System.out.println("usage: " + getName() + " [-u <user name>] [-f <first name>] [-l <last name>] [-p <password>] [-d <domain name>] [-e <email>] [-i <tenant-id>]"); + if (id == 0 ||admin == null || firstName == null || lastName == null || password == null || domain == null || email == null) { + context.getStratosApplication().printUsage(getName()); return CliConstants.COMMAND_FAILED; } - RestCommandLineService.getInstance().updateTenant(id,admin, firstName, lastaName, password, domain, email); + RestCommandLineService.getInstance().updateTenant(id,admin, firstName, lastName, password, domain, email); return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (logger.isErrorEnabled()) { - logger.error("Error parsing arguments", e); + if (log.isErrorEnabled()) { + log.error("Error parsing arguments", e); } System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateUserCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateUserCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateUserCommand.java index c33bce7..f390fb3 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateUserCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UpdateUserCommand.java @@ -25,12 +25,13 @@ import org.apache.stratos.cli.RestCommandLineService; import org.apache.stratos.cli.StratosCommandContext; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; -import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; + public class UpdateUserCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(UpdateUserCommand.class); + private static final Logger log = LoggerFactory.getLogger(UpdateUserCommand.class); private final Options options; @@ -42,8 +43,8 @@ public class UpdateUserCommand implements Command<StratosCommandContext> { final Options options = new Options(); Option usernameOption = new Option(CliConstants.USERNAME_OPTION, CliConstants.USERNAME_LONG_OPTION, true, - "User name"); - usernameOption.setArgName("userName"); + "Username"); + usernameOption.setArgName("username"); options.addOption(usernameOption); Option passwordOption = new Option(CliConstants.PASSWORD_OPTION, CliConstants.PASSWORD_LONG_OPTION, true, @@ -52,14 +53,14 @@ public class UpdateUserCommand implements Command<StratosCommandContext> { options.addOption(passwordOption); Option roleOption = new Option(CliConstants.ROLE_NAME_OPTION, CliConstants.ROLE_NAME_LONG_OPTION, true, - "User Role"); + "User role"); roleOption.setArgName("role"); options.addOption(roleOption); - Option fistnameOption = new Option(CliConstants.FIRST_NAME_OPTION, CliConstants.FIRST_NAME_LONG_OPTION, true, + Option firstnameOption = new Option(CliConstants.FIRST_NAME_OPTION, CliConstants.FIRST_NAME_LONG_OPTION, true, "User first name"); - fistnameOption.setArgName("firstName"); - options.addOption(fistnameOption); + firstnameOption.setArgName("firstName"); + options.addOption(firstnameOption); Option lastnameOption = new Option(CliConstants.LAST_NAME_OPTION, CliConstants.LAST_NAME_LONG_OPTION, true, "User last name"); @@ -91,9 +92,9 @@ public class UpdateUserCommand implements Command<StratosCommandContext> { return null; } - public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length > 0) { @@ -111,58 +112,58 @@ public class UpdateUserCommand implements Command<StratosCommandContext> { try { commandLine = parser.parse(options, args); //merge newly discovered options with previously discovered ones. - Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions()); + Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); - if (logger.isDebugEnabled()) { - logger.debug("Update user"); + if (log.isDebugEnabled()) { + log.debug("Update user"); } if (opts.hasOption(CliConstants.USERNAME_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Username option is passed"); + if (log.isTraceEnabled()) { + log.trace("Username option is passed"); } userName = opts.getOption(CliConstants.USERNAME_OPTION).getValue(); } if (opts.hasOption(CliConstants.PASSWORD_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Credential option is passed"); + if (log.isTraceEnabled()) { + log.trace("Credential option is passed"); } credential = opts.getOption(CliConstants.PASSWORD_OPTION).getValue(); } if (opts.hasOption(CliConstants.ROLE_NAME_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Role option is passed"); + if (log.isTraceEnabled()) { + log.trace("Role option is passed"); } role = opts.getOption(CliConstants.ROLE_NAME_OPTION).getValue(); } if (opts.hasOption(CliConstants.FIRST_NAME_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("First name option is passed"); + if (log.isTraceEnabled()) { + log.trace("First name option is passed"); } firstName = opts.getOption(CliConstants.FIRST_NAME_OPTION).getValue(); } if (opts.hasOption(CliConstants.LAST_NAME_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Last name option is passed"); + if (log.isTraceEnabled()) { + log.trace("Last name option is passed"); } lastName = opts.getOption(CliConstants.LAST_NAME_OPTION).getValue(); } if (opts.hasOption(CliConstants.EMAIL_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Email option is passed"); + if (log.isTraceEnabled()) { + log.trace("Email option is passed"); } email = opts.getOption(CliConstants.EMAIL_OPTION).getValue(); } if (opts.hasOption(CliConstants.PROFILE_NAME_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Profile name option is passed"); + if (log.isTraceEnabled()) { + log.trace("Profile name option is passed"); } profileName = opts.getOption(CliConstants.PROFILE_NAME_OPTION).getValue(); } if (userName == null || credential == null || role == null || firstName == null || lastName == null || email == null) { - System.out.println("usage: " + getName() + " [-u <user name>] [-p <credential>] [-r <role>] [-f <first name>] [-l <last name>] [-e <email>] [-pr <profile name>]"); + context.getStratosApplication().printUsage(getName()); return CliConstants.COMMAND_FAILED; } @@ -170,8 +171,8 @@ public class UpdateUserCommand implements Command<StratosCommandContext> { return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (logger.isErrorEnabled()) { - logger.error("Error parsing arguments", e); + if (log.isErrorEnabled()) { + log.error("Error parsing arguments", e); } System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED;
