Modified the code according to the code review notes. Added pretty print to print json strings. Deleted DeleteTenantCommand.java and ListCartridgesByFilterCommand.java.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2c21ec30 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2c21ec30 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2c21ec30 Branch: refs/heads/master Commit: 2c21ec30720bdae53a857f34952d6d3d23c51ffd Parents: c1f796f Author: Dinithi <[email protected]> Authored: Fri Apr 10 13:36:19 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Apr 20 23:42:56 2015 +0530 ---------------------------------------------------------------------- .../stratos/cli/CommandLineApplication.java | 33 +++--- .../apache/stratos/cli/CommandLineService.java | 22 ++-- .../java/org/apache/stratos/cli/RestClient.java | 18 +-- .../stratos/cli/RestCommandLineService.java | 21 ++-- .../apache/stratos/cli/StratosApplication.java | 3 - .../cli/commands/ActivateTenantCommand.java | 3 + .../commands/AddApplicationPolicyCommand.java | 9 +- .../commands/AddApplicationSignupCommand.java | 2 +- .../commands/AddAutoscalingPolicyCommand.java | 7 +- .../cli/commands/AddCartridgeCommand.java | 7 +- .../commands/AddDeploymentPolicyCommand.java | 7 +- .../commands/AddKubernetesClusterCommand.java | 4 +- .../cli/commands/AddKubernetesHostCommand.java | 4 +- .../commands/AddNetworkPartitionCommand.java | 7 +- .../stratos/cli/commands/AddTenantCommand.java | 7 +- .../stratos/cli/commands/AddUserCommand.java | 18 +-- .../cli/commands/CreateApplicationCommand.java | 7 +- .../cli/commands/DeactivateTenantCommand.java | 3 + .../cli/commands/DeleteApplicationCommand.java | 3 + .../DeleteApplicationSignupCommand.java | 3 + .../DeleteAutoScalingPolicyCommand.java | 5 +- .../cli/commands/DeleteTenantCommand.java | 71 ----------- .../stratos/cli/commands/DeleteUserCommand.java | 11 +- .../cli/commands/DeployApplicationCommand.java | 10 +- .../commands/DescribeApplicationCommand.java | 3 + .../DescribeApplicationPolicyCommand.java | 5 +- .../DescribeApplicationRuntimeCommand.java | 3 + .../DescribeApplicationSignupCommand.java | 3 + .../DescribeAutoScalingPolicyCommand.java | 5 +- .../cli/commands/DescribeCartridgeCommand.java | 11 +- .../commands/DescribeCartridgeGroupCommand.java | 5 +- .../DescribeDeploymentPolicyCommand.java | 5 +- .../DescribeKubernetesClusterCommand.java | 11 +- .../DescribeKubernetesMasterCommand.java | 6 +- .../DescribeNetworkPartitionCommand.java | 11 +- .../cli/commands/DescribeTenantCommand.java | 16 ++- .../stratos/cli/commands/ExitCommand.java | 9 +- .../stratos/cli/commands/HelpCommand.java | 11 +- .../stratos/cli/commands/InfoCommand.java | 11 +- .../ListApplicationPoliciesCommand.java | 6 +- .../cli/commands/ListApplicationsCommand.java | 9 +- .../commands/ListAutoscalePolicyCommand.java | 6 +- .../commands/ListCartridgeGroupsCommand.java | 9 +- .../commands/ListCartridgesByFilterCommand.java | 118 ------------------- .../cli/commands/ListCartridgesCommand.java | 3 + .../commands/ListDeploymentPoliciesCommand.java | 3 + .../cli/commands/ListDomainMappingsCommand.java | 3 + .../commands/ListKubernetesClustersCommand.java | 5 +- .../commands/ListKubernetesHostsCommand.java | 11 +- .../commands/ListNetworkPartitionCommand.java | 3 + .../ListPartialSearchTenantsCommand.java | 7 +- .../stratos/cli/commands/ListTenants.java | 3 + .../apache/stratos/cli/commands/ListUsers.java | 3 + .../RemoveApplicationPolicyCommand.java | 6 +- .../cli/commands/RemoveCartridgeCommand.java | 3 + .../commands/RemoveCartridgeGroupCommand.java | 2 +- .../commands/RemoveDeploymentPolicyCommand.java | 5 +- .../commands/RemoveKubernetesHostCommand.java | 4 +- .../commands/RemoveNetworkPartitionCommand.java | 5 +- .../commands/SynchronizeArtifactsCommand.java | 13 +- .../commands/UndeployApplicationCommand.java | 2 +- .../UpdateApplicationPolicyCommand.java | 9 +- .../UpdateAutoscalingPolicyCommand.java | 11 +- .../cli/commands/UpdateCartridgeCommand.java | 7 +- .../commands/UpdateDeploymentPolicyCommand.java | 4 +- .../commands/UpdateKubernetesHostCommand.java | 4 +- .../commands/UpdateKubernetesMasterCommand.java | 4 +- .../commands/UpdateNetworkPartitionCommand.java | 7 +- .../cli/commands/UpdateTenantCommand.java | 25 ++-- .../stratos/cli/commands/UpdateUserCommand.java | 25 ++-- 70 files changed, 320 insertions(+), 405 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineApplication.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineApplication.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineApplication.java index 6b80c57..44abad7 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineApplication.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineApplication.java @@ -18,20 +18,19 @@ */ package org.apache.stratos.cli; -import java.io.File; -import java.io.IOException; - import jline.console.ConsoleReader; import jline.console.history.FileHistory; - import org.apache.commons.lang3.StringUtils; import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.IOException; + public abstract class CommandLineApplication<T extends CommandContext> { - private static final Logger logger = LoggerFactory.getLogger(CommandLineApplication.class); + private static final Logger log = LoggerFactory.getLogger(CommandLineApplication.class); protected ConsoleReader reader; protected FileHistory history; @@ -98,8 +97,8 @@ public abstract class CommandLineApplication<T extends CommandContext> { }; Runtime.getRuntime().addShutdownHook(shutdownHookThread); int returnCode = run(args); - if (logger.isDebugEnabled()) { - logger.debug("Exiting with error code {}", returnCode); + if (log.isDebugEnabled()) { + log.debug("Exiting with error code {}", returnCode); } System.exit(returnCode); } @@ -127,17 +126,17 @@ public abstract class CommandLineApplication<T extends CommandContext> { private int execute(String line) { try { - if (logger.isDebugEnabled()) { - logger.debug("Executing command line: \"{}\"", line); + if (log.isDebugEnabled()) { + log.debug("Executing command line: \"{}\"", line); } int returnCode = executeCommand(line); - if (logger.isDebugEnabled()) { - logger.debug("Command line executed \"{}\". Return code: {}", line, returnCode); + if (log.isDebugEnabled()) { + log.debug("Command line executed \"{}\". Return code: {}", line, returnCode); } return returnCode; } catch (RuntimeException e) { - if (logger.isErrorEnabled()) { - logger.error("Error executing command line: " + line, e); + if (log.isErrorEnabled()) { + log.error("Error executing command line: " + line, e); } return 1; } @@ -146,15 +145,15 @@ public abstract class CommandLineApplication<T extends CommandContext> { protected abstract int executeCommand(String line); private void performDestroy() { - if (logger.isDebugEnabled()) { - logger.debug("Shutting down application... Invoking destroy methods"); + if (log.isDebugEnabled()) { + log.debug("Shutting down application... Invoking destroy methods"); } if (history != null) { try { history.flush(); } catch (IOException e) { - if (logger.isErrorEnabled()) { - logger.error("Error flushing history.", e); + if (log.isErrorEnabled()) { + log.error("Error flushing history.", e); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java index f74389a..fcdaf79 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java @@ -40,7 +40,7 @@ import java.util.HashMap; public class CommandLineService { - private static final Logger logger = LoggerFactory.getLogger(CommandLineService.class); + private static final Logger log = LoggerFactory.getLogger(CommandLineService.class); private ApplicationManagementServiceStub stub; @@ -126,8 +126,8 @@ public class CommandLineService { try { if (validateLogin) { String tenantDomain = stub.getTenantDomain(); - if (logger.isDebugEnabled()) { - logger.debug("Tenant Domain {}", tenantDomain); + if (log.isDebugEnabled()) { + log.debug("Tenant Domain {}", tenantDomain); } return (tenantDomain != null); } else { @@ -496,8 +496,8 @@ public class CommandLineService { // } private void handleException(Exception e) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Displaying message from Exception {}\n{}", e.getClass(), e.getMessage()); + if (log.isDebugEnabled()) { + log.debug("Displaying message from Exception {}\n{}", e.getClass(), e.getMessage()); } // TODO: Fix handling error message. // Sometimes the Axis2 stub throws only the RemoteException (an @@ -507,21 +507,17 @@ public class CommandLineService { if (message == null || (message != null && message.contains("Exception"))) { message = "Error executing command!"; } - if (logger.isErrorEnabled()) { - logger.error(message); - } + log.error(message); System.out.println(message); throw new CommandException(message, e); } private void handleException(String key, Exception e, Object... args) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Displaying message for {}. Exception thrown is {}", key, e.getClass()); + if (log.isDebugEnabled()) { + log.debug("Displaying message for {}. Exception thrown is {}", key, e.getClass()); } String message = CliUtils.getMessage(key, args); - if (logger.isErrorEnabled()) { - logger.error(message); - } + log.error(message); System.out.println(message); throw new CommandException(message, e); } http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java index f035072..2aba654 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java @@ -39,7 +39,7 @@ import java.lang.reflect.Type; public class RestClient implements GenericRestClient { - private static final Logger logger = LoggerFactory.getLogger(RestClient.class); + private static final Logger log = LoggerFactory.getLogger(RestClient.class); private String baseURL; private String username; @@ -163,7 +163,7 @@ public class RestClient implements GenericRestClient { } catch (Exception e) { String message = String.format("Error in adding %s", entityName); System.out.println(message); - logger.error(message, e); + log.error(message, e); } } @@ -178,7 +178,7 @@ public class RestClient implements GenericRestClient { } catch (Exception e) { String message = String.format("Error in un-deploying %s : %s", entityName,entityId); System.out.println(message); - logger.error(message, e); + log.error(message, e); } } @@ -193,7 +193,7 @@ public class RestClient implements GenericRestClient { } catch (Exception e) { String message = String.format("Error in updating %s", entityName); System.out.println(message); - logger.error(message, e); + log.error(message, e); } } @@ -208,7 +208,7 @@ public class RestClient implements GenericRestClient { } catch (Exception e) { String message = String.format("Error in deleting %s", entityName); System.out.println(message); - logger.error(message, e); + log.error(message, e); } } @@ -219,7 +219,7 @@ public class RestClient implements GenericRestClient { } catch (Exception e) { String message = String.format("Error in getting %s : %s", entityName,identifier); System.out.println(message); - logger.error(message, e); + log.error(message, e); return null; } } @@ -230,7 +230,7 @@ public class RestClient implements GenericRestClient { } catch (Exception e) { String message = String.format("Error in getting %s : %s", entityName,identifier); System.out.println(message); - logger.error(message, e); + log.error(message, e); return null; } } @@ -241,7 +241,7 @@ public class RestClient implements GenericRestClient { } catch (Exception e) { String message = String.format("Error in listing %s", entityName); System.out.println(message); - logger.error(message, e); + log.error(message, e); return null; } } @@ -252,7 +252,7 @@ public class RestClient implements GenericRestClient { } catch (Exception e) { String message = String.format("Error in listing %s", entityName); System.out.println(message); - logger.error(message, e); + log.error(message, e); return null; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java index f2e3126..8ca3a2a 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java @@ -147,7 +147,7 @@ public class RestCommandLineService { public Gson getGson() { GsonBuilder gsonBuilder = new GsonBuilder(); - return gsonBuilder.create(); + return gsonBuilder.setPrettyPrinting().create(); } /** @@ -1149,10 +1149,10 @@ public class RestCommandLineService { System.out.println("Kubernetes clusters found:"); CliUtils.printTable(array, partitionMapper, "Group ID", "Description"); } else { - System.out.println("No kubernetes clusters found"); + System.out.println("No Kubernetes clusters found"); } } catch (Exception e) { - String message = "Could not list kubernetes clusters"; + String message = "Could not list Kubernetes clusters"; printError(message, e); } } @@ -1245,7 +1245,7 @@ public class RestCommandLineService { * @param clusterId cluster id * @throws CommandException */ - public void getKubernetesMaster(final String clusterId) throws CommandException { + public void getKubernetesMaster(String clusterId) throws CommandException { try { Type listType = new TypeToken<KubernetesMasterBean>() { }.getType(); @@ -1271,7 +1271,7 @@ public class RestCommandLineService { * @param clusterId cluster id * @throws CommandException */ - public void describeKubernetesCluster(final String clusterId) throws CommandException { + public void describeKubernetesCluster(String clusterId) throws CommandException { try { Type listType = new TypeToken<KubernetesClusterBean>() { }.getType(); @@ -1287,7 +1287,7 @@ public class RestCommandLineService { System.out.println("Kubernetes cluster: " + clusterId); System.out.println(getGson().toJson(cluster)); } catch (Exception e) { - String message = "Could not describe kubernetes cluster: " + clusterId; + String message = "Could not describe Kubernetes cluster: " + clusterId; printError(message, e); } } @@ -1533,7 +1533,8 @@ public class RestCommandLineService { * Remove application * @param applicationId application id * @throws CommandException - */// This method helps to remove applications + * This method helps to remove applications + */ public void deleteApplication (String applicationId) throws CommandException{ restClient.deleteEntity(ENDPOINT_REMOVE_APPLICATION.replace("{appId}", applicationId), applicationId, "application"); @@ -1650,11 +1651,7 @@ public class RestCommandLineService { } String message = CliUtils.getMessage(key, args); - - if (log.isErrorEnabled()) { - log.error(message); - } - + log.error(message); System.out.println(message); throw new CommandException(message, e); } http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java index bf5ba45..188b5bd 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java @@ -222,9 +222,6 @@ public class StratosApplication extends CommandLineApplication<StratosCommandCon command = new AddApplicationSignupCommand(); commands.put(command.getName(), command); - command = new ListCartridgesByFilterCommand(); - commands.put(command.getName(), command); - command = new DescribeTenantCommand(); commands.put(command.getName(),command); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java index 0c1650f..30b07c4 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ActivateTenantCommand.java @@ -28,6 +28,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Activate tenant command. + */ public class ActivateTenantCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(ActivateTenantCommand.class); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationPolicyCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationPolicyCommand.java index 9493a44..0b580a3 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationPolicyCommand.java @@ -31,6 +31,9 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +/** + * Add application policy command. + */ public class AddApplicationPolicyCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(AddApplicationPolicyCommand.class); @@ -63,7 +66,7 @@ public class AddApplicationPolicyCommand implements Command<StratosCommandContex return null; } - public int execute(StratosCommandContext context, String[] args,Option[] alreadyParsedOpts) throws CommandException { + public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { if (log.isDebugEnabled()) { log.debug("Executing {} command...", getName()); } @@ -99,9 +102,7 @@ public class AddApplicationPolicyCommand implements Command<StratosCommandContex return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Error parsing arguments", e); - } + log.error("Error parsing arguments", e); System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationSignupCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationSignupCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationSignupCommand.java index 7ea8a08..5cdf0e7 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationSignupCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddApplicationSignupCommand.java @@ -34,7 +34,7 @@ import java.io.IOException; import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; /** - * Deploy application command. + * Add application signup command. */ public class AddApplicationSignupCommand implements Command<StratosCommandContext> { http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddAutoscalingPolicyCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddAutoscalingPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddAutoscalingPolicyCommand.java index 81631e5..2927fb0 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddAutoscalingPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddAutoscalingPolicyCommand.java @@ -32,6 +32,9 @@ import java.io.IOException; import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; +/** + * Add autoscaling policy command. + */ public class AddAutoscalingPolicyCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(AddAutoscalingPolicyCommand.class); @@ -103,9 +106,7 @@ public class AddAutoscalingPolicyCommand implements Command<StratosCommandContex return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Error parsing arguments", e); - } + log.error("Error parsing arguments", e); System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeCommand.java index c8c5f1f..dd0dfd9 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeCommand.java @@ -32,6 +32,9 @@ import java.io.IOException; import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; +/** + * Add cartridge command. + */ public class AddCartridgeCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(AddCartridgeCommand.class); @@ -103,9 +106,7 @@ public class AddCartridgeCommand implements Command<StratosCommandContext> { return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Error parsing arguments", e); - } + log.error("Error parsing arguments", e); System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDeploymentPolicyCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDeploymentPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDeploymentPolicyCommand.java index 8e1f6cc..9b11adc 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDeploymentPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDeploymentPolicyCommand.java @@ -33,6 +33,9 @@ import java.io.IOException; import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; +/** + * Add deployment policy command. + */ public class AddDeploymentPolicyCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(AddDeploymentPolicyCommand.class); @@ -103,9 +106,7 @@ public class AddDeploymentPolicyCommand implements Command<StratosCommandContext return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Error parsing arguments", e); - } + log.error("Error parsing arguments", e); System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddKubernetesClusterCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddKubernetesClusterCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddKubernetesClusterCommand.java index 9c619f9..37aad3d 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddKubernetesClusterCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddKubernetesClusterCommand.java @@ -34,7 +34,7 @@ import java.io.IOException; import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; /** - * Deploy kubernetes cluster command. + * Deploy Kubernetes cluster command. */ public class AddKubernetesClusterCommand implements Command<StratosCommandContext> { @@ -57,7 +57,7 @@ public class AddKubernetesClusterCommand implements Command<StratosCommandContex @Override public String getDescription() { - return "Add kubernetes cluster"; + return "Add Kubernetes cluster"; } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddKubernetesHostCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddKubernetesHostCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddKubernetesHostCommand.java index 9fee493..212f5dc 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddKubernetesHostCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddKubernetesHostCommand.java @@ -34,7 +34,7 @@ import java.io.IOException; import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; /** - * Deploy kubernetes host command. + * Deploy Kubernetes host command. */ public class AddKubernetesHostCommand implements Command<StratosCommandContext> { @@ -61,7 +61,7 @@ public class AddKubernetesHostCommand implements Command<StratosCommandContext> @Override public String getDescription() { - return "Add kubernetes host"; + return "Add Kubernetes host"; } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddNetworkPartitionCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddNetworkPartitionCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddNetworkPartitionCommand.java index 233d668..538bfcc 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddNetworkPartitionCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddNetworkPartitionCommand.java @@ -33,6 +33,9 @@ import java.io.IOException; import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; +/** + * Add network partition command. + */ public class AddNetworkPartitionCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(AddNetworkPartitionCommand.class); @@ -142,9 +145,7 @@ public class AddNetworkPartitionCommand implements Command<StratosCommandContext return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Error parsing arguments", e); - } + log.error("Error parsing arguments", e); System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java index 9831569..48a126f 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java @@ -30,6 +30,9 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.Option; import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; +/** + * Add tenant command. + */ public class AddTenantCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(AddTenantCommand.class); @@ -160,9 +163,7 @@ public class AddTenantCommand implements Command<StratosCommandContext> { return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Error parsing arguments", e); - } + 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/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddUserCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddUserCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddUserCommand.java index 808a2a0..e8a79d3 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddUserCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddUserCommand.java @@ -29,6 +29,9 @@ import org.slf4j.LoggerFactory; import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; +/** + * Add user command. + */ public class AddUserCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(AddUserCommand.class); @@ -48,12 +51,12 @@ public class AddUserCommand implements Command<StratosCommandContext> { options.addOption(usernameOption); Option passwordOption = new Option(CliConstants.PASSWORD_OPTION, CliConstants.PASSWORD_LONG_OPTION, true, - "User credential"); + "User credential"); passwordOption.setArgName("credential"); 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); @@ -67,13 +70,12 @@ public class AddUserCommand implements Command<StratosCommandContext> { lastnameOption.setArgName("lastname"); options.addOption(lastnameOption); - Option emailOption = new Option(CliConstants.EMAIL_OPTION, CliConstants.EMAIL_LONG_OPTION, true, - "User email"); + Option emailOption = new Option(CliConstants.EMAIL_OPTION, CliConstants.EMAIL_LONG_OPTION, true, "User email"); emailOption.setArgName("email"); options.addOption(emailOption); - Option profileNameOption = new Option(CliConstants.PROFILE_NAME_OPTION, CliConstants.PROFILE_NAME_LONG_OPTION, true, - "Profile name"); + Option profileNameOption = new Option(CliConstants.PROFILE_NAME_OPTION, CliConstants.PROFILE_NAME_LONG_OPTION, + true, "Profile name"); profileNameOption.setArgName("profileName"); options.addOption(profileNameOption); @@ -171,9 +173,7 @@ public class AddUserCommand implements Command<StratosCommandContext> { return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Error parsing arguments", e); - } + 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/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CreateApplicationCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CreateApplicationCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CreateApplicationCommand.java index 9fb8970..fde51c5 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CreateApplicationCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CreateApplicationCommand.java @@ -32,6 +32,9 @@ import java.io.IOException; import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; +/** + * Create application command. + */ public class CreateApplicationCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(CreateApplicationCommand.class); @@ -103,9 +106,7 @@ public class CreateApplicationCommand implements Command<StratosCommandContext> return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Error parsing arguments", e); - } + log.error("Error parsing arguments", e); System.out.println(e.getMessage()); return CliConstants.COMMAND_FAILED; } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java index c3ada94..f1a06b1 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java @@ -28,6 +28,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Deactivate tenant command. + */ public class DeactivateTenantCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DeactivateTenantCommand.class); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java index 2919ed7..fd283a1 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java @@ -28,6 +28,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Delete application command. + */ public class DeleteApplicationCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DeleteApplicationCommand.class); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java index 369c6a0..89fb834 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java @@ -28,6 +28,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Remove application sign up command. + */ public class DeleteApplicationSignupCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DeleteApplicationSignupCommand.class); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java index 62a53db..a74354d 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java @@ -28,6 +28,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Remove autoscaling policy command. + */ public class DeleteAutoScalingPolicyCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DeleteAutoScalingPolicyCommand.class); @@ -38,7 +41,7 @@ public class DeleteAutoScalingPolicyCommand implements Command<StratosCommandCon @Override public String getDescription() { - return "Remove Auto-Scaling policy"; + return "Remove auto scaling policy"; } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java deleted file mode 100644 index fcbac0f..0000000 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * 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.stratos.cli.commands; - -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.stratos.cli.Command; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class DeleteTenantCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(DeleteTenantCommand.class); - - @Override - public String getName() { - return "remove-tenant"; - } - - @Override - public String getDescription() { - return "Remove Tenant"; - } - - @Override - public String getArgumentSyntax() { - return "[Tenant Domain]"; - } - - @Override - public Options getOptions() { - return null; - } - - @Override - public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); - } - if (args != null && args.length == 1) { - String id = args[0]; - if (logger.isDebugEnabled()) { - logger.debug("Getting delete tenant info {}", id); - } - RestCommandLineService.getInstance().deleteTenant(id); - return CliConstants.COMMAND_SUCCESSFULL; - } else { - context.getStratosApplication().printUsage(getName()); - return CliConstants.COMMAND_FAILED; - } - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java index ecdc3a6..7c80f87 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java @@ -28,6 +28,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Remove user command. + */ public class DeleteUserCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DeleteUserCommand.class); @@ -38,7 +41,7 @@ public class DeleteUserCommand implements Command<StratosCommandContext> { @Override public String getDescription() { - return "Remove User"; + return "Remove user"; } @Override @@ -57,11 +60,11 @@ public class DeleteUserCommand implements Command<StratosCommandContext> { log.debug("Executing {} command...", getName()); } if (args != null && args.length == 1) { - String username = args[0]; + String userName = args[0]; if (log.isDebugEnabled()) { - log.debug("Getting delete user info {}", username); + log.debug("Getting delete user info {}", userName); } - RestCommandLineService.getInstance().deleteUser(username); + RestCommandLineService.getInstance().deleteUser(userName); return CliConstants.COMMAND_SUCCESSFULL; } else { context.getStratosApplication().printUsage(getName()); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployApplicationCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployApplicationCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployApplicationCommand.java index 6ab71d9..c83dc8c 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployApplicationCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployApplicationCommand.java @@ -66,7 +66,7 @@ public class DeployApplicationCommand implements Command<StratosCommandContext> @Override public String getDescription() { - return "deploy application"; + return "Deploy application"; } @Override @@ -104,13 +104,13 @@ public class DeployApplicationCommand implements Command<StratosCommandContext> if (opts.hasOption(CliConstants.APPLICATION_ID_OPTION)) { if (log.isTraceEnabled()) { - log.trace("Application Id option is passed"); + log.trace("Application id option is passed"); } applicationId = opts.getOption(CliConstants.APPLICATION_ID_OPTION).getValue(); } if (opts.hasOption(CliConstants.APPLICATION_POLICY_ID_OPTION)) { if (log.isTraceEnabled()) { - log.trace("Application policy Id option is passed"); + log.trace("Application policy id option is passed"); } applicationPolicyId = opts.getOption(CliConstants.APPLICATION_POLICY_ID_OPTION).getValue(); } @@ -124,9 +124,7 @@ public class DeployApplicationCommand implements Command<StratosCommandContext> return CliConstants.COMMAND_SUCCESSFULL; } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Error parsing arguments", e); - } + 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/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java index 1b3c082..4b7649c 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java @@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Describe application command. + */ public class DescribeApplicationCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DescribeApplicationCommand.class); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationPolicyCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationPolicyCommand.java index d71fb51..4e65cdd 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationPolicyCommand.java @@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Describe application policy command. + */ public class DescribeApplicationPolicyCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DescribeApplicationPolicyCommand.class); @@ -39,7 +42,7 @@ public class DescribeApplicationPolicyCommand implements Command<StratosCommandC @Override public String getDescription() { - return "Describing the application Policy"; + return "Describe application policy"; } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationRuntimeCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationRuntimeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationRuntimeCommand.java index c86581c..c11086b 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationRuntimeCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationRuntimeCommand.java @@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Describe application runtime command. + */ public class DescribeApplicationRuntimeCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DescribeApplicationRuntimeCommand.class); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java index 259d2cf..84a4e1f 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java @@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Describe application sign up command. + */ public class DescribeApplicationSignupCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DescribeApplicationSignupCommand.class); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java index ba650e3..0f0c126 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java @@ -27,6 +27,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Describe auto scaling policy command. + */ public class DescribeAutoScalingPolicyCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DescribeAutoScalingPolicyCommand.class); @@ -37,7 +40,7 @@ public class DescribeAutoScalingPolicyCommand implements Command<StratosCommandC @Override public String getDescription() { - return "Describing the autoscaling policy"; + return "Describe autoscaling policy"; } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java index 891261c..4516a31 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java @@ -27,6 +27,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Describe cartridge command. + */ public class DescribeCartridgeCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DescribeCartridgeCommand.class); @@ -37,7 +40,7 @@ public class DescribeCartridgeCommand implements Command<StratosCommandContext> @Override public String getDescription() { - return "Describing the cartridge"; + return "Describe cartridge"; } @Override @@ -56,11 +59,11 @@ public class DescribeCartridgeCommand implements Command<StratosCommandContext> log.debug("Executing {} command...", getName()); } if (args != null && args.length == 1) { - String id = args[0]; + String cartridgeType = args[0]; if (log.isDebugEnabled()) { - log.debug("Getting cartridge info {}", id); + log.debug("Getting cartridge info {}", cartridgeType); } - RestCommandLineService.getInstance().describeCartridge(id); + RestCommandLineService.getInstance().describeCartridge(cartridgeType); return CliConstants.COMMAND_SUCCESSFULL; } else { context.getStratosApplication().printUsage(getName()); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeGroupCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeGroupCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeGroupCommand.java index 4f0d98d..d74c8ab 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeGroupCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeGroupCommand.java @@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Describe cartridge group command. + */ public class DescribeCartridgeGroupCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DescribeCartridgeGroupCommand.class); @@ -41,7 +44,7 @@ public class DescribeCartridgeGroupCommand implements Command<StratosCommandCont } public String getDescription() { - return "Describe cartridge groups"; + return "Describe cartridge group"; } public String getArgumentSyntax() { http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java index ff90fb5..0f77fbd 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java @@ -27,6 +27,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Describe deployment policy command. + */ public class DescribeDeploymentPolicyCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DescribeDeploymentPolicyCommand.class); @@ -37,7 +40,7 @@ public class DescribeDeploymentPolicyCommand implements Command<StratosCommandCo @Override public String getDescription() { - return "Describing the deployment Policy"; + return "Describe deployment Policy"; } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesClusterCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesClusterCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesClusterCommand.java index 9b3f4b0..ac1ffa8 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesClusterCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesClusterCommand.java @@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Describe Kubernetes cluster command. + */ public class DescribeKubernetesClusterCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DescribeKubernetesClusterCommand.class); @@ -39,7 +42,7 @@ public class DescribeKubernetesClusterCommand implements Command<StratosCommandC @Override public String getDescription() { - return "Describing a kubernetes cluster"; + return "Describe Kubernetes cluster"; } @Override @@ -58,11 +61,11 @@ public class DescribeKubernetesClusterCommand implements Command<StratosCommandC log.debug("Executing {} command...", getName()); } if (args != null && args.length == 1) { - String id = args[0]; + String clusterId = args[0]; if (log.isDebugEnabled()) { - log.debug("Getting Kubernetes cluster info {}", id); + log.debug("Getting Kubernetes cluster info {}", clusterId); } - RestCommandLineService.getInstance().describeKubernetesCluster(id); + RestCommandLineService.getInstance().describeKubernetesCluster(clusterId); return CliConstants.COMMAND_SUCCESSFULL; } else { context.getStratosApplication().printUsage(getName()); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesMasterCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesMasterCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesMasterCommand.java index b03bae7..4693566 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesMasterCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesMasterCommand.java @@ -29,6 +29,10 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +/** + * Describe Kubernetes master command. + */ public class DescribeKubernetesMasterCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DescribeKubernetesMasterCommand.class); @@ -40,7 +44,7 @@ public class DescribeKubernetesMasterCommand implements Command<StratosCommandCo @Override public String getDescription() { - return "Describing the Kubernetes master"; + return "Describe Kubernetes master"; } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeNetworkPartitionCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeNetworkPartitionCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeNetworkPartitionCommand.java index dd11226..6534780 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeNetworkPartitionCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeNetworkPartitionCommand.java @@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Describe network partition command. + */ public class DescribeNetworkPartitionCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(DescribeNetworkPartitionCommand.class); @@ -39,7 +42,7 @@ public class DescribeNetworkPartitionCommand implements Command<StratosCommandCo @Override public String getDescription() { - return "Describing the network partition"; + return "Describe network partition"; } @Override @@ -58,11 +61,11 @@ public class DescribeNetworkPartitionCommand implements Command<StratosCommandCo log.debug("Executing {} command...", getName()); } if (args != null && args.length == 1) { - String id = args[0]; + String networkPartitionId = args[0]; if (log.isDebugEnabled()) { - log.debug("Getting cartridge info {}", id); + log.debug("Getting cartridge info {}", networkPartitionId); } - RestCommandLineService.getInstance().describeNetworkPartition(id); + RestCommandLineService.getInstance().describeNetworkPartition(networkPartitionId); return CliConstants.COMMAND_SUCCESSFULL; } else { context.getStratosApplication().printUsage(getName()); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeTenantCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeTenantCommand.java index 25feb37..2a64127 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeTenantCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeTenantCommand.java @@ -26,11 +26,15 @@ 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 org.slf4j.Logger; import org.slf4j.LoggerFactory; +/**nant + * Describe te command. + */ public class DescribeTenantCommand implements Command<StratosCommandContext> { - private static final org.slf4j.Logger logger = LoggerFactory.getLogger(DescribeAutoScalingPolicyCommand.class); + private static final Logger log = LoggerFactory.getLogger(DescribeAutoScalingPolicyCommand.class); /** * @return The name of the command */ @@ -46,7 +50,7 @@ public class DescribeTenantCommand implements Command<StratosCommandContext> { */ @Override public String getDescription() { - return "Describing the tenant"; + return "Describe tenant"; } /** @@ -81,13 +85,13 @@ public class DescribeTenantCommand implements Command<StratosCommandContext> { */ @Override public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args != null && args.length == 1) { String domainName = args[0]; - if (logger.isDebugEnabled()) { - logger.debug("Getting tenant info {}", domainName); + if (log.isDebugEnabled()) { + log.debug("Getting tenant info {}", domainName); } RestCommandLineService.getInstance().describeTenant(domainName); return CliConstants.COMMAND_SUCCESSFULL; http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java index a4b3147..7443cef 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java @@ -27,9 +27,12 @@ import org.apache.stratos.cli.StratosCommandContext; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; +/** + * Exit from stratos client tool + */ public class ExitCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(ExitCommand.class); + private static final Logger log = LoggerFactory.getLogger(ExitCommand.class); public ExitCommand() { } @@ -52,8 +55,8 @@ public class ExitCommand implements Command<StratosCommandContext> { @Override public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { // Nothing to execute here. This is a special command. - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args == null || args.length == 0) { return CliConstants.COMMAND_SUCCESSFULL; http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java index 629a0a3..0dddcaa 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java @@ -27,9 +27,12 @@ import org.apache.stratos.cli.StratosCommandContext; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; +/** + * Help for commands + */ public class HelpCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(HelpCommand.class); + private static final Logger log = LoggerFactory.getLogger(HelpCommand.class); public HelpCommand() { } @@ -51,13 +54,13 @@ public class HelpCommand implements Command<StratosCommandContext> { @Override public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args == null || args.length == 0) { context.getStratosApplication().printHelp(); return CliConstants.COMMAND_SUCCESSFULL; - } else if (args != null && args.length == 1) { + } else if (args.length == 1) { context.getStratosApplication().printHelp(args[0]); return CliConstants.COMMAND_SUCCESSFULL; } else { http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java index 5aafb27..5086395 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java @@ -20,17 +20,16 @@ package org.apache.stratos.cli.commands; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.stratos.cli.Command; -import org.apache.stratos.cli.CommandLineService; import org.apache.stratos.cli.StratosCommandContext; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class InfoCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(InfoCommand.class); + private static final Logger log = LoggerFactory.getLogger(InfoCommand.class); public InfoCommand() { } @@ -52,8 +51,8 @@ public class InfoCommand implements Command<StratosCommandContext> { @Override public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } throw new RuntimeException("Not implemented"); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationPoliciesCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationPoliciesCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationPoliciesCommand.java index a1f6e5e..44c1485 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationPoliciesCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationPoliciesCommand.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class ListApplicationPoliciesCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(ListApplicationPoliciesCommand.class); + private static final Logger log = LoggerFactory.getLogger(ListApplicationPoliciesCommand.class); public ListApplicationPoliciesCommand() { } @@ -48,8 +48,8 @@ public class ListApplicationPoliciesCommand implements Command<StratosCommandCon } public int execute(StratosCommandContext context, String[] args,Option[] alreadyParsedOpts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args == null || args.length == 0) { RestCommandLineService.getInstance().listApplicationPolicies(); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationsCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationsCommand.java index 38ccc5f..0ae4caa 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationsCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationsCommand.java @@ -28,9 +28,12 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * List available applications + */ public class ListApplicationsCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(ListApplicationsCommand.class); + private static final Logger log = LoggerFactory.getLogger(ListApplicationsCommand.class); public ListApplicationsCommand() { } @@ -48,8 +51,8 @@ public class ListApplicationsCommand implements Command<StratosCommandContext> { } public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args == null || args.length == 0) { RestCommandLineService.getInstance().listApplications(); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAutoscalePolicyCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAutoscalePolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAutoscalePolicyCommand.java index e56afff..4d9573d 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAutoscalePolicyCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAutoscalePolicyCommand.java @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; public class ListAutoscalePolicyCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(ListAutoscalePolicyCommand.class); + private static final Logger log = LoggerFactory.getLogger(ListAutoscalePolicyCommand.class); public ListAutoscalePolicyCommand() { } @@ -48,8 +48,8 @@ public class ListAutoscalePolicyCommand implements Command<StratosCommandContext } public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args == null || args.length == 0) { RestCommandLineService.getInstance().listAutoscalingPolicies(); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgeGroupsCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgeGroupsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgeGroupsCommand.java index bdfb782..eadb1a0 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgeGroupsCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgeGroupsCommand.java @@ -28,9 +28,12 @@ import org.apache.stratos.cli.utils.CliConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * List available cartridge groups + */ public class ListCartridgeGroupsCommand implements Command<StratosCommandContext> { - private static final Logger logger = LoggerFactory.getLogger(ListCartridgeGroupsCommand.class); + private static final Logger log = LoggerFactory.getLogger(ListCartridgeGroupsCommand.class); public ListCartridgeGroupsCommand() { } @@ -48,8 +51,8 @@ public class ListCartridgeGroupsCommand implements Command<StratosCommandContext } public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException { - if (logger.isDebugEnabled()) { - logger.debug("Executing {} command...", getName()); + if (log.isDebugEnabled()) { + log.debug("Executing {} command...", getName()); } if (args == null || args.length == 0) { RestCommandLineService.getInstance().listCartridgeGroups(); http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesByFilterCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesByFilterCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesByFilterCommand.java deleted file mode 100644 index bc75379..0000000 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesByFilterCommand.java +++ /dev/null @@ -1,118 +0,0 @@ -/** - * 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.stratos.cli.commands; - -import org.apache.commons.cli.*; -import org.apache.stratos.cli.Command; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays; - -public class ListCartridgesByFilterCommand implements Command<StratosCommandContext>{ - - private static final Logger log = LoggerFactory.getLogger(ListCartridgesByFilterCommand.class); - - private final Options options; - - public ListCartridgesByFilterCommand(){ - options = constructOptions(); - } - - private Options constructOptions() { - final Options options = new Options(); - - Option filterOption = new Option(CliConstants.CARTRIDGE_FILTER_OPTION, CliConstants.CARTRIDGE_FILTER_LONG_OPTION, true, - "Filter - type of the cartridge"); - filterOption.setArgName("filter"); - options.addOption(filterOption); - - return options; - } - - public String getName() { - return "list-cartridges-by-filter"; - } - - public String getDescription() { - return "List cartridges by a filter"; - } - - public String getArgumentSyntax() { - return null; - } - - 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 filter= null; - - final CommandLineParser parser = new GnuParser(); - CommandLine commandLine; - - try { - commandLine = parser.parse(options, args); - //merge newly discovered options with previously discovered ones. - Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions()); - - if (log.isDebugEnabled()) { - log.debug("List cartridges by a filter"); - } - - if (opts.hasOption(CliConstants.CARTRIDGE_FILTER_OPTION)) { - if (log.isTraceEnabled()) { - log.trace("Filter option is passed"); - } - filter = opts.getOption(CliConstants.CARTRIDGE_FILTER_OPTION).getValue(); - } - - if (filter == null) { - context.getStratosApplication().printUsage(getName()); - return CliConstants.COMMAND_FAILED; - } - - RestCommandLineService.getInstance().listCartridgesByFilter(filter); - return CliConstants.COMMAND_SUCCESSFULL; - - } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Error parsing arguments", e); - } - System.out.println(e.getMessage()); - return CliConstants.COMMAND_FAILED; - } - - } else { - context.getStratosApplication().printUsage(getName()); - return CliConstants.COMMAND_FAILED; - } - } - - public Options getOptions() { - return options; - } -} http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java index 8272fec..824a586 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java @@ -28,6 +28,9 @@ import org.apache.stratos.cli.StratosCommandContext; import org.apache.stratos.cli.exception.CommandException; import org.apache.stratos.cli.utils.CliConstants; +/** + * List available cartridges + */ public class ListCartridgesCommand implements Command<StratosCommandContext> { private static final Logger log = LoggerFactory.getLogger(ListCartridgesCommand.class);
