You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/04/20 20:13:04 UTC
[2/3] stratos git commit: Modified the code according to the code
review notes. Added pretty print to print json strings. Deleted
DeleteTenantCommand.java and ListCartridgesByFilterCommand.java.
http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/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 0f8f363..82ff596 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
@@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * List available deployment policies
+ */
public class ListDeploymentPoliciesCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(ListDeploymentPoliciesCommand.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/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 8726bc2..f9b334a 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
@@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * List domain mappings
+ */
public class ListDomainMappingsCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(ListDomainMappingsCommand.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/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 641a9f9..1c2774a 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
@@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * List List Kubernetes clusters
+ */
public class ListKubernetesClustersCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(ListKubernetesClustersCommand.class);
@@ -41,7 +44,7 @@ public class ListKubernetesClustersCommand implements Command<StratosCommandCont
}
public String getDescription() {
- return "List kubernetes clusters";
+ return "List Kubernetes clusters";
}
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/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 7a7c5a4..60556de 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
@@ -30,6 +30,9 @@ import org.slf4j.LoggerFactory;
import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+/**
+ * List Kubernetes hosts
+ */
public class ListKubernetesHostsCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(ListKubernetesHostsCommand.class);
@@ -56,7 +59,7 @@ public class ListKubernetesHostsCommand implements Command<StratosCommandContext
}
public String getDescription() {
- return "List kubernetes hosts";
+ return "List Kubernetes hosts";
}
public String getArgumentSyntax() {
@@ -80,7 +83,7 @@ public class ListKubernetesHostsCommand implements Command<StratosCommandContext
Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
if (log.isDebugEnabled()) {
- log.debug("List kubernetes hosts of a cluster");
+ log.debug("List Kubernetes hosts of a cluster");
}
if (opts.hasOption(CliConstants.CLUSTER_ID_OPTION)) {
@@ -99,9 +102,7 @@ public class ListKubernetesHostsCommand 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/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 c7dc6e4..06ac831 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
@@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * List available network partitions
+ */
public class ListNetworkPartitionCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(ListNetworkPartitionCommand.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/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 a519b4d..74f030d 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
@@ -30,6 +30,9 @@ import org.slf4j.LoggerFactory;
import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+/**
+ * List cartridges by partial domain search
+ */
public class ListPartialSearchTenantsCommand implements Command<StratosCommandContext>{
private static final Logger log = LoggerFactory.getLogger(ListPartialSearchTenantsCommand.class);
@@ -99,9 +102,7 @@ public class ListPartialSearchTenantsCommand implements Command<StratosCommandCo
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/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 512ee05..da9a50d 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
@@ -28,6 +28,9 @@ import org.apache.stratos.cli.utils.CliConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * List available tenants
+ */
public class ListTenants implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(ListTenants.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/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 99019ac..73fd1ec 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
@@ -28,6 +28,9 @@ import org.apache.stratos.cli.utils.CliConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * List available users
+ */
public class ListUsers implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(ListUsers.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/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 b1b32bd..3154946 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
@@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * Remove application policy
+ */
public class RemoveApplicationPolicyCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(RemoveApplicationPolicyCommand.class);
@@ -53,7 +56,8 @@ public class RemoveApplicationPolicyCommand implements Command<StratosCommandCon
}
@Override
- 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());
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/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 e6611e3..40de231 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
@@ -28,6 +28,9 @@ import org.apache.stratos.cli.utils.CliConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * Undeploy cartridge definition
+ */
public class RemoveCartridgeCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(RemoveCartridgeCommand.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/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 c1877c0..27a7064 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
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Un-deploy cartridge group command.
+ * Undeploy cartridge group command.
*/
public class RemoveCartridgeGroupCommand 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/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 5229a23..774ff2d 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
@@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * Remove deployment policy
+ */
public class RemoveDeploymentPolicyCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(RemoveDeploymentPolicyCommand.class);
@@ -39,7 +42,7 @@ public class RemoveDeploymentPolicyCommand implements Command<StratosCommandCont
@Override
public String getDescription() {
- return "Remove Deployment policy";
+ return "Remove 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/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 db99848..1c04feb 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
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Un-deploy kubernetes host command.
+ * Undeploy Kubernetes host
*/
public class RemoveKubernetesHostCommand implements Command<StratosCommandContext> {
@@ -46,7 +46,7 @@ public class RemoveKubernetesHostCommand implements Command<StratosCommandContex
@Override
public String getDescription() {
- return "Remove kubernetes host";
+ return "Remove 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/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 7a6636f..5181cce 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
@@ -29,6 +29,9 @@ import org.apache.stratos.cli.utils.CliConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * Remove network partition definition
+ */
public class RemoveNetworkPartitionCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(RemoveNetworkPartitionCommand.class);
@@ -60,7 +63,7 @@ public class RemoveNetworkPartitionCommand implements Command<StratosCommandCont
if (args != null && args.length == 1) {
String networkPartitionId = args[0];
if (log.isDebugEnabled()) {
- log.debug("Getting Remove network partition info {}", networkPartitionId);
+ log.debug("Getting remove network partition info {}", networkPartitionId);
}
RestCommandLineService.getInstance().removeNetworkPartition(networkPartitionId);
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/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 004f18e..6842d2c 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
@@ -28,9 +28,12 @@ import org.apache.stratos.cli.utils.CliConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * Synchronize artifacts with Git repository for cartridge subscriptions
+ */
public class SynchronizeArtifactsCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(SynchronizeArtifactsCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(SynchronizeArtifactsCommand.class);
public SynchronizeArtifactsCommand() {
}
@@ -52,13 +55,13 @@ public class SynchronizeArtifactsCommand implements Command<StratosCommandContex
@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 cartridgeSubscriptionAlias = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Synchronizing repository for cartridge subscription alias {}", cartridgeSubscriptionAlias);
+ if (log.isDebugEnabled()) {
+ log.debug("Synchronizing repository for cartridge subscription alias {}", cartridgeSubscriptionAlias);
}
RestCommandLineService.getInstance().synchronizeArtifacts(cartridgeSubscriptionAlias);
http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/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 af90d98..e2f3a8b 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
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Un-deploy application command.
+ * Undeploy application command.
*/
public class UndeployApplicationCommand 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/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 4b3d154..4cfe692 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
@@ -31,6 +31,9 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
+/**
+ * Update application policy
+ */
public class UpdateApplicationPolicyCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(UpdateApplicationPolicyCommand.class);
@@ -103,12 +106,10 @@ public class UpdateApplicationPolicyCommand implements Command<StratosCommandCon
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 ignore) {
+ } catch (IOException e) {
System.out.println("Invalid resource path");
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/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 ab2352b..65ce25c 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
@@ -32,6 +32,9 @@ import java.io.IOException;
import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+/**
+ * Update auto scaling policy
+ */
public class UpdateAutoscalingPolicyCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(UpdateAutoscalingPolicyCommand.class);
@@ -62,7 +65,7 @@ public class UpdateAutoscalingPolicyCommand implements Command<StratosCommandCon
}
public String getDescription() {
- return "Update autoscaling policy";
+ return "Update auto scaling policy";
}
public String getArgumentSyntax() {
@@ -87,7 +90,7 @@ public class UpdateAutoscalingPolicyCommand implements Command<StratosCommandCon
Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
if (log.isDebugEnabled()) {
- log.debug("Updating autoscaling policy");
+ log.debug("Updating auto scaling policy");
}
if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
@@ -107,9 +110,7 @@ public class UpdateAutoscalingPolicyCommand implements Command<StratosCommandCon
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 ignore) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/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 66fa503..23a7acd 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
@@ -32,6 +32,9 @@ import java.io.IOException;
import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+/**
+ * Update cartridge deployment
+ */
public class UpdateCartridgeCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(UpdateCartridgeCommand.class);
@@ -103,9 +106,7 @@ public class UpdateCartridgeCommand 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/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 ff10438..816ca71 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
@@ -107,9 +107,7 @@ public class UpdateDeploymentPolicyCommand implements Command<StratosCommandCont
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 ignore) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/2c21ec30/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 bc02176..200b825 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
@@ -33,7 +33,7 @@ import java.io.IOException;
import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
/**
- * Update kubernetes host command.
+ * Update Kubernetes host command.
*/
public class UpdateKubernetesHostCommand implements Command<StratosCommandContext> {
@@ -65,7 +65,7 @@ public class UpdateKubernetesHostCommand implements Command<StratosCommandContex
@Override
public String getDescription() {
- return "Update kubernetes host";
+ return "Update 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/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 00461bf..eecaa9e 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
@@ -33,7 +33,7 @@ import java.io.IOException;
import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
/**
- * Update kubernetes master command.
+ * Update Kubernetes master command.
*/
public class UpdateKubernetesMasterCommand implements Command<StratosCommandContext> {
@@ -60,7 +60,7 @@ public class UpdateKubernetesMasterCommand implements Command<StratosCommandCont
@Override
public String getDescription() {
- return "Update kubernetes master";
+ return "Update 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/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 ed7e0ab..e6d0d25 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
@@ -33,6 +33,9 @@ import java.io.IOException;
import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+/**
+ * Update network partition deployment
+ */
public class UpdateNetworkPartitionCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(UpdateNetworkPartitionCommand.class);
@@ -103,9 +106,7 @@ public class UpdateNetworkPartitionCommand implements Command<StratosCommandCont
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/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 e020cad..de49015 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
@@ -30,6 +30,9 @@ import org.slf4j.LoggerFactory;
import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+/**
+ * Update an existing tenant
+ */
public class UpdateTenantCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(UpdateTenantCommand.class);
@@ -42,20 +45,20 @@ public class UpdateTenantCommand implements Command<StratosCommandContext> {
private Options constructOptions() {
final Options options = new Options();
- Option usernameOption = new Option(CliConstants.USERNAME_OPTION, CliConstants.USERNAME_LONG_OPTION, true,
+ Option userNameOption = new Option(CliConstants.USERNAME_OPTION, CliConstants.USERNAME_LONG_OPTION, true,
"Tenant user name");
- usernameOption.setArgName("username");
- options.addOption(usernameOption);
+ userNameOption.setArgName("username");
+ options.addOption(userNameOption);
- Option firstnameOption = 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");
- firstnameOption.setArgName("firstname");
- options.addOption(firstnameOption);
+ firstNameOption.setArgName("firstname");
+ options.addOption(firstNameOption);
- Option lastnameOption = new Option(CliConstants.LAST_NAME_OPTION, CliConstants.LAST_NAME_LONG_OPTION, true,
+ Option lastNameOption = new Option(CliConstants.LAST_NAME_OPTION, CliConstants.LAST_NAME_LONG_OPTION, true,
"Tenant last name");
- lastnameOption.setArgName("lastname");
- options.addOption(lastnameOption);
+ lastNameOption.setArgName("lastname");
+ options.addOption(lastNameOption);
Option passwordOption = new Option(CliConstants.PASSWORD_OPTION, CliConstants.PASSWORD_LONG_OPTION, true,
"Tenant password");
@@ -173,9 +176,7 @@ public class UpdateTenantCommand 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/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 f390fb3..5701732 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
@@ -30,6 +30,9 @@ import org.slf4j.LoggerFactory;
import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+/**
+ * Update an existing user
+ */
public class UpdateUserCommand implements Command<StratosCommandContext> {
private static final Logger log = LoggerFactory.getLogger(UpdateUserCommand.class);
@@ -42,10 +45,10 @@ public class UpdateUserCommand implements Command<StratosCommandContext> {
private Options constructOptions() {
final Options options = new Options();
- Option usernameOption = new Option(CliConstants.USERNAME_OPTION, CliConstants.USERNAME_LONG_OPTION, true,
+ Option userNameOption = new Option(CliConstants.USERNAME_OPTION, CliConstants.USERNAME_LONG_OPTION, true,
"Username");
- usernameOption.setArgName("username");
- options.addOption(usernameOption);
+ userNameOption.setArgName("username");
+ options.addOption(userNameOption);
Option passwordOption = new Option(CliConstants.PASSWORD_OPTION, CliConstants.PASSWORD_LONG_OPTION, true,
"User credential");
@@ -57,15 +60,15 @@ public class UpdateUserCommand implements Command<StratosCommandContext> {
roleOption.setArgName("role");
options.addOption(roleOption);
- Option firstnameOption = 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");
- firstnameOption.setArgName("firstName");
- options.addOption(firstnameOption);
+ firstNameOption.setArgName("firstName");
+ options.addOption(firstNameOption);
- Option lastnameOption = new Option(CliConstants.LAST_NAME_OPTION, CliConstants.LAST_NAME_LONG_OPTION, true,
+ Option lastNameOption = new Option(CliConstants.LAST_NAME_OPTION, CliConstants.LAST_NAME_LONG_OPTION, true,
"User last name");
- lastnameOption.setArgName("lastName");
- options.addOption(lastnameOption);
+ lastNameOption.setArgName("lastName");
+ options.addOption(lastNameOption);
Option emailOption = new Option(CliConstants.EMAIL_OPTION, CliConstants.EMAIL_LONG_OPTION, true,
"User email");
@@ -171,9 +174,7 @@ public class UpdateUserCommand 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;
}