You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/03/17 18:59:45 UTC
[24/50] [abbrv] stratos git commit: Changed variable names,
method names according to standards. Used print usage method to print
the usage of a command. Removed unused constants in RestCommandLineService
class.
Changed variable names, method names according to standards.
Used print usage method to print the usage of a command.
Removed unused constants in RestCommandLineService class.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/11e1c8a6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/11e1c8a6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/11e1c8a6
Branch: refs/heads/master-deployment-policy-fix-merge
Commit: 11e1c8a66f6959cf467b5f0e63cfb9b6803fc675
Parents: 1334495
Author: Dinithi <di...@wso2.com>
Authored: Fri Mar 13 17:42:10 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Mar 14 11:11:29 2015 +0530
----------------------------------------------------------------------
.../java/org/apache/stratos/cli/Command.java | 4 +-
.../stratos/cli/RestCommandLineService.java | 239 ++++++++++++-------
.../apache/stratos/cli/StratosApplication.java | 2 +-
.../cli/commands/ActivateTenantCommand.java | 16 +-
.../commands/AddApplicationPolicyCommand.java | 48 ++--
.../commands/AddApplicationSignupCommand.java | 21 +-
.../commands/AddAutoscalingPolicyCommand.java | 55 ++---
.../cli/commands/AddCartridgeCommand.java | 53 ++--
.../cli/commands/AddCartridgeGroupCommand.java | 21 +-
.../commands/AddDeploymentPolicyCommand.java | 53 ++--
.../cli/commands/AddDomainMappingsCommand.java | 32 ++-
.../commands/AddKubernetesClusterCommand.java | 21 +-
.../cli/commands/AddKubernetesHostCommand.java | 17 +-
.../commands/AddNetworkPartitionCommand.java | 52 ++--
.../stratos/cli/commands/AddTenantCommand.java | 58 ++---
.../stratos/cli/commands/AddUserCommand.java | 62 +++--
.../cli/commands/CreateApplicationCommand.java | 53 ++--
.../cli/commands/DeactivateTenantCommand.java | 14 +-
.../cli/commands/DeleteApplicationCommand.java | 12 +-
.../DeleteApplicationSignupCommand.java | 18 +-
.../DeleteAutoScalingPolicyCommand.java | 18 +-
.../cli/commands/DeleteTenantCommand.java | 2 +-
.../stratos/cli/commands/DeleteUserCommand.java | 14 +-
.../cli/commands/DeployApplicationCommand.java | 33 +--
.../DescibeApplicationPolicyCommand.java | 72 ------
.../commands/DescribeApplicationCommand.java | 8 +-
.../DescribeApplicationPolicyCommand.java | 72 ++++++
.../DescribeApplicationRuntimeCommand.java | 8 +-
.../DescribeApplicationSignupCommand.java | 8 +-
.../DescribeAutoScalingPolicyCommand.java | 14 +-
.../cli/commands/DescribeCartridgeCommand.java | 14 +-
.../commands/DescribeCartridgeGroupCommand.java | 10 +-
.../DescribeDeploymentPolicyCommand.java | 12 +-
.../DescribeKubernetesClusterCommand.java | 12 +-
.../DescribeKubernetesMasterCommand.java | 16 +-
.../DescribeNetworkPartitionCommand.java | 12 +-
.../cli/commands/DescribeTenantCommand.java | 2 +-
.../stratos/cli/commands/ExitCommand.java | 2 +-
.../stratos/cli/commands/HelpCommand.java | 2 +-
.../stratos/cli/commands/InfoCommand.java | 2 +-
.../ListApplicationPoliciesCommand.java | 2 +-
.../cli/commands/ListApplicationsCommand.java | 2 +-
.../commands/ListAutoscalePolicyCommand.java | 2 +-
.../commands/ListCartridgeGroupsCommand.java | 2 +-
.../commands/ListCartridgesByFilterCommand.java | 51 ++--
.../cli/commands/ListCartridgesCommand.java | 8 +-
.../commands/ListDeploymentPoliciesCommand.java | 8 +-
.../cli/commands/ListDomainMappingsCommand.java | 8 +-
.../commands/ListKubernetesClustersCommand.java | 8 +-
.../commands/ListKubernetesHostsCommand.java | 22 +-
.../commands/ListNetworkPartitionCommand.java | 8 +-
.../ListPartialSearchTenantsCommand.java | 25 +-
.../stratos/cli/commands/ListTenants.java | 8 +-
.../apache/stratos/cli/commands/ListUsers.java | 8 +-
.../RemoveApplicationPolicyCommand.java | 18 +-
.../cli/commands/RemoveCartridgeCommand.java | 16 +-
.../commands/RemoveCartridgeGroupCommand.java | 12 +-
.../commands/RemoveDeploymentPolicyCommand.java | 18 +-
.../commands/RemoveDomainMappingsCommand.java | 8 +-
.../RemoveKubernetesClusterCommand.java | 8 +-
.../commands/RemoveKubernetesHostCommand.java | 8 +-
.../commands/RemoveNetworkPartitionCommand.java | 18 +-
.../commands/SynchronizeArtifactsCommand.java | 2 +-
.../commands/UndeployApplicationCommand.java | 8 +-
.../UpdateApplicationPolicyCommand.java | 28 +--
.../UpdateAutoscalingPolicyCommand.java | 35 ++-
.../cli/commands/UpdateCartridgeCommand.java | 53 ++--
.../commands/UpdateDeploymentPolicyCommand.java | 33 +--
.../commands/UpdateKubernetesHostCommand.java | 26 +-
.../commands/UpdateKubernetesMasterCommand.java | 22 +-
.../commands/UpdateNetworkPartitionCommand.java | 53 ++--
.../cli/commands/UpdateTenantCommand.java | 65 ++---
.../stratos/cli/commands/UpdateUserCommand.java | 63 ++---
.../org/apache/stratos/cli/utils/CliUtils.java | 7 +-
.../application-policy-2.json | 10 +
.../application-policy-3.json | 4 +-
76 files changed, 921 insertions(+), 940 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java
index c3cd04f..f84f452 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java
@@ -59,12 +59,12 @@ public interface Command<T extends CommandContext> {
* The context assoicated with the Command Line Application
* @param args
* The arguments for the command
- * @param already_parsed_opts
+ * @param alreadyParsedOpts
* Options parsed by any parent parsers.
* @return The status code
* @throws org.apache.stratos.cli.exception.CommandException
* if any errors occur when executing the command
*/
- int execute(T context, String[] args, Option[] already_parsed_opts) throws CommandException;
+ int execute(T context, String[] args, Option[] alreadyParsedOpts) throws CommandException;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/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 272b7a9..f2e3126 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
@@ -74,7 +74,6 @@ public class RestCommandLineService {
private static final String ENDPOINT_ADD_TENANT = API_CONTEXT + "/tenants";
private static final String ENDPOINT_ADD_USER = API_CONTEXT + "/users";
private static final String ENDPOINT_ADD_APPLICATION = API_CONTEXT + "/applications";
- private static final String ENDPOINT_ADD_NETWORK_PARTITION = API_CONTEXT + "/networkPartitions";
private static final String ENDPOINT_DEPLOY_CARTRIDGE = API_CONTEXT + "/cartridges";
private static final String ENDPOINT_DEPLOY_AUTOSCALING_POLICY = API_CONTEXT + "/autoscalingPolicies";
@@ -119,9 +118,6 @@ public class RestCommandLineService {
private static final String ENDPOINT_GET_AUTOSCALING_POLICY = API_CONTEXT + "/autoscalingPolicies/{id}";
private static final String ENDPOINT_GET_DEPLOYMENT_POLICY = API_CONTEXT + "/deploymentPolicies/{deploymentPolicyId}";
private static final String ENDPOINT_GET_APPLICATION_POLICY = API_CONTEXT + "/applicationPolicies/{applicationPolicyId}";
- private static final String ENDPOINT_GET_CARTRIDGE = API_CONTEXT + "/cartridges/{cartridgeType}";
- private static final String ENDPOINT_GET_CARTRIDGE_OF_TENANT = API_CONTEXT + "/subscriptions/{id}/cartridges";
- private static final String ENDPOINT_GET_KUBERNETES_GROUP = API_CONTEXT + "/kubernetesCluster/{kubernetesClusterId}";
private static final String ENDPOINT_GET_KUBERNETES_MASTER = API_CONTEXT + "/kubernetesClusters/{kubernetesClusterId}/master";
private static final String ENDPOINT_GET_KUBERNETES_HOST_CLUSTER = API_CONTEXT + "/kubernetesClusters/{kubernetesClusterId}";
private static final String ENDPOINT_GET_NETWORK_PARTITION = API_CONTEXT + "/networkPartitions/{networkPartitionId}";
@@ -156,11 +152,11 @@ public class RestCommandLineService {
/**
* Authenticate and login to stratos server.
- * @param serverURL
- * @param username
- * @param password
- * @param validateLogin
- * @return
+ * @param serverURL URL of the server
+ * @param username username
+ * @param password password
+ * @param validateLogin validate login
+ * @return boolean
* @throws Exception
*/
public boolean login(String serverURL, String username, String password, boolean validateLogin) throws Exception {
@@ -242,9 +238,9 @@ public class RestCommandLineService {
/**
* Initialize the rest client and set username and password of the user
- * @param serverURL
- * @param username
- * @param password
+ * @param serverURL server URL
+ * @param username username
+ * @param password password
* @throws AxisFault
*/
private void initializeRestClient(String serverURL, String username, String password) throws AxisFault {
@@ -253,7 +249,7 @@ public class RestCommandLineService {
authenticator.setPassword(password);
authenticator.setPreemptiveAuthentication(true);
- ConfigurationContext configurationContext = null;
+ ConfigurationContext configurationContext;
try {
configurationContext = ConfigurationContextFactory.createDefaultConfigurationContext();
} catch (Exception e) {
@@ -270,7 +266,7 @@ public class RestCommandLineService {
}
/**
- * List cartridges
+ * List available cartridges
* @throws CommandException
*/
public void listCartridges() throws CommandException {
@@ -312,6 +308,7 @@ public class RestCommandLineService {
/**
* List cartridges By Filter
+ * @param filter cartridge-type
* @throws CommandException
*/
public void listCartridgesByFilter(String filter) throws CommandException {
@@ -356,7 +353,6 @@ public class RestCommandLineService {
/**
* List cartridge groups
- *
* @throws CommandException
*/
public void listCartridgeGroups() throws CommandException {
@@ -385,7 +381,7 @@ public class RestCommandLineService {
cartridgeGroups = cartridgeGroupList.toArray(cartridgeGroups);
System.out.println("Cartridge Groups found:");
- CliUtils.printTable(cartridgeGroups, cartridgeGroupMapper, "Name", "No. of Cartridges", "No of Groups", "Dependency scaling");
+ CliUtils.printTable(cartridgeGroups, cartridgeGroupMapper, "Name", "No. of cartridges", "No of groups", "Dependency scaling");
} catch (Exception e) {
String message = "Error in listing cartridge groups";
printError(message, e);
@@ -393,7 +389,7 @@ public class RestCommandLineService {
}
/**
* Describe a cartridge
- * @param cartridgeType
+ * @param cartridgeType Type of the cartridge
* @throws CommandException
*/
public void describeCartridge(final String cartridgeType) throws CommandException {
@@ -468,6 +464,12 @@ public class RestCommandLineService {
/**
* Add new tenant
+ * @param admin username
+ * @param firstName first name
+ * @param lastName last name
+ * @param password password
+ * @param domain domain name
+ * @param email email
* @throws CommandException
*/
public void addTenant(String admin, String firstName, String lastName, String password, String domain, String email)
@@ -505,7 +507,7 @@ public class RestCommandLineService {
/**
* Describe a tenant
- * @param domainName
+ * @param domainName domain name
* @throws org.apache.stratos.cli.exception.CommandException
*/
public void describeTenant(final String domainName) throws CommandException {
@@ -544,7 +546,8 @@ public class RestCommandLineService {
}
/**
- * List tenants by a partial domain serach
+ * List tenants by a partial domain search
+ * @param partialDomain Part of the domain name
* @throws org.apache.stratos.cli.exception.CommandException
*/
public void listTenantsByPartialDomain(String partialDomain) throws CommandException {
@@ -584,6 +587,13 @@ public class RestCommandLineService {
/**
* Update an existing tenant
+ * @param id tenant id
+ * @param admin username
+ * @param firstName first name
+ * @param lastName last name
+ * @param password password
+ * @param domain domain name
+ * @param email email
* @throws CommandException
*/
public void updateTenant(int id,String admin, String firstName, String lastName, String password, String domain, String email)
@@ -623,6 +633,13 @@ public class RestCommandLineService {
/**
* Add user
+ * @param userName username
+ * @param credential password
+ * @param role user role
+ * @param firstName first name
+ * @param lastName last name
+ * @param email email
+ * @param profileName profile name
* @throws CommandException
*/
public void addUser(String userName, String credential, String role, String firstName, String lastName, String email, String profileName)
@@ -662,6 +679,13 @@ public class RestCommandLineService {
/**
* Update user
+ * @param userName username
+ * @param credential password
+ * @param role user role
+ * @param firstName first name
+ * @param lastName last name
+ * @param email email
+ * @param profileName profile name
* @throws CommandException
*/
public void updateUser(String userName, String credential, String role, String firstName, String lastName, String email, String profileName)
@@ -701,6 +725,7 @@ public class RestCommandLineService {
/**
* Delete tenant
+ * @param tenantDomain domain name of the tenant
* @throws CommandException
*/
public void deleteTenant(String tenantDomain) throws CommandException {
@@ -732,6 +757,7 @@ public class RestCommandLineService {
/**
* Delete user
+ * @param userName username
* @throws CommandException
*/
public void deleteUser(String userName) throws CommandException {
@@ -763,6 +789,7 @@ public class RestCommandLineService {
/**
* Deactivate tenant
+ * @param tenantDomain domain name of the tenant
* @throws CommandException
*/
public void deactivateTenant(String tenantDomain) throws CommandException {
@@ -795,6 +822,7 @@ public class RestCommandLineService {
/**
* Activate tenant
+ * @param tenantDomain domain name of the tenant
* @throws CommandException
*/
public void activateTenant(String tenantDomain) throws CommandException {
@@ -901,6 +929,7 @@ public class RestCommandLineService {
/**
* Add cartridge
+ * @param cartridgeDefinition cartridge definition
* @throws CommandException
*/
public void addCartridge(String cartridgeDefinition) throws CommandException {
@@ -909,6 +938,7 @@ public class RestCommandLineService {
/**
* Update cartridge
+ * @param cartridgeDefinition cartridge definition
* @throws CommandException
*/
public void updateCartridge(String cartridgeDefinition) throws CommandException {
@@ -917,14 +947,16 @@ public class RestCommandLineService {
/**
* Undeploy cartridge
+ * @param cartridgeId cartridge Id
* @throws CommandException
*/
- public void undeployCartrigdeDefinition(String id) throws CommandException {
- restClient.undeployEntity(ENDPOINT_UNDEPLOY_CARTRIDGE, "cartridge", id);
+ public void undeployCartrigdeDefinition(String cartridgeId) throws CommandException {
+ restClient.undeployEntity(ENDPOINT_UNDEPLOY_CARTRIDGE, "cartridge", cartridgeId);
}
/**
* Deploy autoscaling policy
+ * @param autoScalingPolicy autoscaling policy definition
* @throws CommandException
*/
public void addAutoscalingPolicy(String autoScalingPolicy) throws CommandException {
@@ -933,6 +965,7 @@ public class RestCommandLineService {
/**
* Update autoscaling policy
+ * @param autoScalingPolicy autoscaling policy definition
* @throws CommandException
*/
public void updateAutoscalingPolicy(String autoScalingPolicy) throws CommandException {
@@ -1015,6 +1048,7 @@ public class RestCommandLineService {
/**
* Describe deployment policy
+ * @param deploymentPolicyId deployment policy id
* @throws CommandException
*/
public void describeDeploymentPolicy(String deploymentPolicyId) throws CommandException {
@@ -1037,6 +1071,7 @@ public class RestCommandLineService {
/**
* Describe application policy
+ * @param applicationPolicyId application policy id
* @throws CommandException
*/
public void describeApplicationPolicy(String applicationPolicyId) throws CommandException {
@@ -1059,31 +1094,33 @@ public class RestCommandLineService {
/**
* Describe autoscaling policy
+ * @param autoscalingPolicyId application policy id
* @throws CommandException
*/
- public void describeAutoScalingPolicy(String id) throws CommandException {
+ public void describeAutoScalingPolicy(String autoscalingPolicyId) throws CommandException {
try {
AutoscalePolicyBean policy = (AutoscalePolicyBean) restClient.getEntity(ENDPOINT_GET_AUTOSCALING_POLICY,
- AutoscalePolicyBean.class, "{id}", id, "autoscaling policy");
+ AutoscalePolicyBean.class, "{id}", autoscalingPolicyId, "autoscaling policy");
if (policy == null) {
- System.out.println("Autoscaling policy not found: " + id);
+ System.out.println("Autoscaling policy not found: " + autoscalingPolicyId);
return;
}
- System.out.println("Autoscaling policy: " + id);
+ System.out.println("Autoscaling policy: " + autoscalingPolicyId);
System.out.println(getGson().toJson(policy));
} catch (Exception e) {
- String message = "Could not describe autoscaling policy: " + id;
+ String message = "Could not describe autoscaling policy: " + autoscalingPolicyId;
printError(message, e);
}
}
/**
* Add Kubernetes Cluster
+ * @param entityBody Kubernetes Cluster definition
* @throws CommandException
*/
- public void addKubernetesCluster(String entityBody) {
+ public void addKubernetesCluster(String entityBody) throws CommandException{
restClient.deployEntity(ENDPOINT_DEPLOY_KUBERNETES_CLUSTER, entityBody, "kubernetes cluster");
}
@@ -1091,7 +1128,7 @@ public class RestCommandLineService {
* List Kubernetes Clusters
* @throws CommandException
*/
- public void listKubernetesClusters() {
+ public void listKubernetesClusters() throws CommandException{
try {
Type listType = new TypeToken<ArrayList<KubernetesClusterBean>>() {
}.getType();
@@ -1122,14 +1159,17 @@ public class RestCommandLineService {
/**
* Undeploy Kubernetes Cluster
+ * @param clusterId cluster id
* @throws CommandException
*/
- public void undeployKubernetesCluster(String clusterId) {
+ public void undeployKubernetesCluster(String clusterId) throws CommandException{
restClient.undeployEntity(ENDPOINT_UNDEPLOY_KUBERNETES_CLUSTER, "kubernetes cluster", clusterId);
}
/**
* Add Kubernetes Host
+ * @param entityBody kubernetes host definition
+ * @param clusterId cluster id
* @throws CommandException
*/
public void addKubernetesHost(String entityBody, String clusterId) throws CommandException {
@@ -1145,7 +1185,6 @@ public class RestCommandLineService {
if (responseCode.equals(CliConstants.RESPONSE_OK) || responseCode.equals(CliConstants.RESPONSE_CREATED)) {
System.out.println("You have successfully deployed host to Kubernetes cluster: " + clusterId);
- return;
} else {
String resultString = CliUtils.getHttpResponseString(response);
ExceptionMapper exception = gson.fromJson(resultString, ExceptionMapper.class);
@@ -1162,9 +1201,10 @@ public class RestCommandLineService {
/**
* List Kubernetes Hosts
+ * @param clusterId cluster id
* @throws CommandException
*/
- public void listKubernetesHosts(String clusterId) {
+ public void listKubernetesHosts(String clusterId) throws CommandException{
try {
Type listType = new TypeToken<ArrayList<KubernetesHostBean>>() {
}.getType();
@@ -1189,7 +1229,6 @@ public class RestCommandLineService {
"Public IP Address");
} else {
System.out.println("No kubernetes hosts found");
- return;
}
} catch (Exception e) {
String message = "Could not list kubernetes hosts";
@@ -1203,7 +1242,7 @@ public class RestCommandLineService {
/**
* Get the master of a Kubernetes Cluster
- * @param clusterId
+ * @param clusterId cluster id
* @throws CommandException
*/
public void getKubernetesMaster(final String clusterId) throws CommandException {
@@ -1229,7 +1268,7 @@ public class RestCommandLineService {
/**
* Describe a Kubernetes cluster
- * @param clusterId
+ * @param clusterId cluster id
* @throws CommandException
*/
public void describeKubernetesCluster(final String clusterId) throws CommandException {
@@ -1255,25 +1294,28 @@ public class RestCommandLineService {
/**
* Add Domain mappings
+ * @param applicationId application id
+ * @param resourceFileContent domain mapping definition
* @throws CommandException
*/
- public void addDomainMappings(String applicationId, String resourceFileContent) {
+ public void addDomainMappings(String applicationId, String resourceFileContent) throws CommandException{
String endpoint = ENDPOINT_DOMAIN_MAPPINGS.replace("{applicationId}", applicationId);
restClient.deployEntity(endpoint, resourceFileContent, "domain mappings");
}
/**
* List domain mappings
+ * @param applicationId application id
* @throws CommandException
*/
- public void listDomainMappings(String applicationId) {
+ public void listDomainMappings(String applicationId) throws CommandException{
try {
Type listType = new TypeToken<ArrayList<DomainMappingBean>>() {
}.getType();
List<DomainMappingBean> list = (List<DomainMappingBean>) restClient.listEntity(
ENDPOINT_DOMAIN_MAPPINGS.replace("{applicationId}", applicationId),
listType, "domain mappings");
- if ((list == null) && (list.size() <= 0)) {
+ if (list == null) {
System.out.println("No domain mappings found in application: " + applicationId);
return;
}
@@ -1299,41 +1341,50 @@ public class RestCommandLineService {
/**
* Remove Domain Mappings
+ * @param applicationId application id
* @throws CommandException
*/
- public void removeDomainMappings(String applicationId) {
+ public void removeDomainMappings(String applicationId) throws CommandException{
String endpoint = ENDPOINT_DOMAIN_MAPPINGS.replace("{applicationId}", applicationId);
restClient.undeployEntity(endpoint, "domain mappings", applicationId);
}
/**
* Undeploy Kubernetes Host
+ * @param clusterId cluster id
+ * @param hostId host id
* @throws CommandException
*/
- public void undeployKubernetesHost(String clusterId, String hostId) {
+ public void undeployKubernetesHost(String clusterId, String hostId) throws CommandException{
restClient.undeployEntity(ENDPOINT_UNDEPLOY_KUBERNETES_HOST.replace("{kubernetesClusterId}", clusterId), "kubernetes host", hostId);
}
/**
* Update Kubernetes Master
+ * @param entityBody Kubernetes master definition
+ * @param clusterId cluster id
* @throws CommandException
*/
- public void updateKubernetesMaster(String entityBody, String clusterId) {
+ public void updateKubernetesMaster(String entityBody, String clusterId) throws CommandException{
System.out.println(ENDPOINT_UPDATE_KUBERNETES_MASTER.replace("{kubernetesClusterId}", clusterId));
restClient.updateEntity(ENDPOINT_UPDATE_KUBERNETES_MASTER.replace("{kubernetesClusterId}", clusterId), entityBody, "kubernetes master");
}
/**
* Update Kubernetes Host
+ * @param entityBody Kubernetes host definition
+ * @param clusterId cluster id
+ * @param hostId host id
* @throws CommandException
*/
- public void updateKubernetesHost(String entityBody, String clusterId, String hostId) {
+ public void updateKubernetesHost(String entityBody, String clusterId, String hostId) throws CommandException{
System.out.println((ENDPOINT_UPDATE_KUBERNETES_HOST.replace("{kubernetesClusterId}", clusterId)).replace("{minionId}", hostId));
restClient.updateEntity((ENDPOINT_UPDATE_KUBERNETES_HOST.replace("{kubernetesClusterId}", clusterId)).replace("{minionId}", hostId), entityBody, "kubernetes host");
}
/**
* Synchronize artifacts
+ * @param cartridgeAlias alias of the cartridge
* @throws CommandException
*/
public void synchronizeArtifacts(String cartridgeAlias) throws CommandException {
@@ -1362,14 +1413,16 @@ public class RestCommandLineService {
/**
* Add cartridge group
+ * @param entityBody cartridge group definition
* @throws CommandException
*/
- public void addCartridgeGroup(String entityBody) {
+ public void addCartridgeGroup(String entityBody) throws CommandException{
restClient.deployEntity(ENDPOINT_DEPLOY_SERVICE_GROUP, entityBody, "cartridge group");
}
/**
* Undeploy Cartridge group
+ * @param groupDefinitionName cartridge group name
* @throws CommandException
*/
public void undeployServiceGroup (String groupDefinitionName) throws CommandException {
@@ -1378,9 +1431,10 @@ public class RestCommandLineService {
/**
* Describe service group
+ * @param groupDefinitionName cartridge group name
* @throws CommandException
*/
- public void describeServiceGroup (String groupDefinitionName) {
+ public void describeServiceGroup (String groupDefinitionName) throws CommandException{
try {
GroupBean bean = (GroupBean) restClient.listEntity(ENDPOINT_LIST_SERVICE_GROUP.replace("{groupDefinitionName}", groupDefinitionName),
GroupBean.class, "serviceGroup");
@@ -1400,17 +1454,20 @@ public class RestCommandLineService {
/**
* Add application
+ * @param entityBody application definition
* @throws CommandException
*/
- public void addApplication (String entityBody) {
+ public void addApplication (String entityBody) throws CommandException{
restClient.deployEntity(ENDPOINT_ADD_APPLICATION, entityBody, "application");
}
/**
* Deploy application
+ * @param applicationId application id
+ * @param applicationPolicyId application policy id
* @throws CommandException
*/
- public void deployApplication (String applicationId,String applicationPolicyId) {
+ public void deployApplication (String applicationId,String applicationPolicyId) throws CommandException{
DefaultHttpClient httpClient = new DefaultHttpClient();
try {
String url=(ENDPOINT_DEPLOY_APPLICATION.replace("{applicationId}", applicationId)).replace("{applicationPolicyId}",applicationPolicyId);
@@ -1442,6 +1499,7 @@ public class RestCommandLineService {
/**
* Undeploy application
+ * @param applicationId application id
* @throws CommandException
*/
public void undeployApplication(String applicationId) throws CommandException {
@@ -1473,91 +1531,94 @@ public class RestCommandLineService {
/**
* Remove application
+ * @param applicationId application id
* @throws CommandException
*/// This method helps to remove applications
- public void deleteApplication (String applicationId) {
+ public void deleteApplication (String applicationId) throws CommandException{
restClient.deleteEntity(ENDPOINT_REMOVE_APPLICATION.replace("{appId}", applicationId), applicationId,
"application");
}
/**
* Delete autoscaling policy
+ * @param autoscalingPolicyId autoscaling policy id
* @throws CommandException
*/
- public void deleteAutoSclaingPolicy(String policyId) {
- restClient.deleteEntity(ENDPOINT_REMOVE_AUTOSCALINGPOLICY.replace("{policyId}", policyId), policyId,
+ public void deleteAutoSclaingPolicy(String autoscalingPolicyId) throws CommandException{
+ restClient.deleteEntity(ENDPOINT_REMOVE_AUTOSCALINGPOLICY.replace("{policyId}", autoscalingPolicyId), autoscalingPolicyId,
"Auto-scaling policy");
}
/**
* Describe application
+ * @param applicationId application id
* @throws CommandException
*/
- public void describeApplication (String applicationID) {
+ public void describeApplication (String applicationId) throws CommandException{
try {
- Type listType = new TypeToken<ApplicationBean>() {
- }.getType();
ApplicationBean application = (ApplicationBean) restClient
- .getEntity(ENDPOINT_GET_APPLICATION, ApplicationBean.class, "{appId}", applicationID,
+ .getEntity(ENDPOINT_GET_APPLICATION, ApplicationBean.class, "{appId}", applicationId,
"application");
if (application == null) {
- System.out.println("Application not found: " + applicationID);
+ System.out.println("Application not found: " + applicationId);
return;
}
- System.out.println("Application: " + applicationID);
+ System.out.println("Application: " + applicationId);
System.out.println(getGson().toJson(application));
} catch (Exception e) {
- String message = "Could not describe application: " + applicationID;
+ String message = "Could not describe application: " + applicationId;
printError(message, e);
}
}
/**
* Describe application runtime
+ * @param applicationId application id
* @throws CommandException
*/
- public void describeApplicationRuntime (String applicationID) {
+ public void describeApplicationRuntime (String applicationId) throws CommandException{
try {
- Type listType = new TypeToken<ApplicationBean>() {
- }.getType();
ApplicationBean application = (ApplicationBean) restClient
- .getEntity(ENDPOINT_GET_APPLICATION_RUNTIME, ApplicationBean.class, "{applicationId}", applicationID,
+ .getEntity(ENDPOINT_GET_APPLICATION_RUNTIME, ApplicationBean.class, "{applicationId}", applicationId,
"application");
if (application == null) {
- System.out.println("Application not found: " + applicationID);
+ System.out.println("Application not found: " + applicationId);
return;
}
- System.out.println("Application: " + applicationID);
+ System.out.println("Application: " + applicationId);
System.out.println(getGson().toJson(application));
} catch (Exception e) {
- String message = "Could not describe application runtime: " + applicationID;
+ String message = "Could not describe application runtime: " + applicationId;
printError(message, e);
}
}
/**
* Add application signup
+ * @param applicationId application id
+ * @param entityBody application signup definition
* @throws CommandException
*/
- public void addApplicationSignup (String entityBody, String applicationId) {
+ public void addApplicationSignup (String entityBody, String applicationId) throws CommandException{
restClient.deployEntity(ENDPOINT_APPLICATION_SIGNUP.replace("{applicationId}", applicationId), entityBody, "application signup");
}
/**
* Describe application signup
+ * @param applicationId application id
* @throws CommandException
*/
- public void describeApplicationSignup (String applicationId) {
+ public void describeApplicationSignup (String applicationId) throws CommandException{
try {
ApplicationSignUpBean bean = (ApplicationSignUpBean) restClient.listEntity(ENDPOINT_APPLICATION_SIGNUP.replace("{applicationId}", applicationId),
ApplicationSignUpBean.class, "applicationSignup");
if (bean == null) {
- System.out.println("Applicationsign up not found for application: " + applicationId);
+ System.out.println("Application sign up not found for application: " + applicationId);
return;
}
@@ -1571,9 +1632,10 @@ public class RestCommandLineService {
/**
* Delete application signup
+ * @param applicationId application id
* @throws CommandException
*/
- public void deleteApplicationSignup (String applicationId) {
+ public void deleteApplicationSignup (String applicationId) throws CommandException{
restClient.deleteEntity(ENDPOINT_APPLICATION_SIGNUP.replace("{applicationId}", applicationId), applicationId,
"application signup");
}
@@ -1599,8 +1661,8 @@ public class RestCommandLineService {
/**
* Print error on console and log
- * @param message
- * @param e
+ * @param message message
+ * @param e exception
*/
private void printError(String message, Throwable e) {
// CLI console only get system output
@@ -1609,14 +1671,22 @@ public class RestCommandLineService {
log.error(message, e);
}
- // This method helps to add network partition definitions
+ /**
+ * Add network partitions
+ * @param networkPartitionDefinition network partition definition
+ * @throws CommandException
+ */
public void addNetworkPartition(String networkPartitionDefinition) throws CommandException {
restClient.deployEntity(ENDPOINT_DEPLOY_NETWORK_PARTITION, networkPartitionDefinition, "network partition");
}
- // This method helps to remove network partitions
- public void removeNetworkPartition (String id) {
- restClient.deleteEntity(ENDPOINT_REMOVE_NETWORK_PARTITION.replace("{id}", id), id,
+ /**
+ * Remove network partition
+ * @param networkPartitionId application id
+ * @throws CommandException
+ */
+ public void removeNetworkPartition (String networkPartitionId) throws CommandException{
+ restClient.deleteEntity(ENDPOINT_REMOVE_NETWORK_PARTITION.replace("{id}", networkPartitionId), networkPartitionId,
"network-partition");
}
@@ -1658,6 +1728,7 @@ public class RestCommandLineService {
/**
* Update network partitions
+ * @param networkPartitionDefinition network partition definition
* @throws CommandException
*/
public void updateNetworkPartition(String networkPartitionDefinition) throws CommandException {
@@ -1666,13 +1737,11 @@ public class RestCommandLineService {
/**
* Describe a network partition
- * @param partitionId
+ * @param partitionId partition id
* @throws CommandException
*/
public void describeNetworkPartition(final String partitionId) throws CommandException {
try {
- Type listType = new TypeToken<NetworkPartitionBean>() {
- }.getType();
NetworkPartitionBean partition = (NetworkPartitionBean) restClient
.getEntity(ENDPOINT_GET_NETWORK_PARTITION, NetworkPartitionBean.class, "{networkPartitionId}", partitionId,
"network partition");
@@ -1692,6 +1761,7 @@ public class RestCommandLineService {
/**
* Deploy deployment policy
+ * @param deploymentPolicy deployment policy definition
* @throws CommandException
*/
public void addDeploymentPolicy(String deploymentPolicy) throws CommandException {
@@ -1700,6 +1770,7 @@ public class RestCommandLineService {
/**
* Deploy application policy
+ * @param applicationPolicy application policy definition
* @throws CommandException
*/
public void addApplicationPolicy(String applicationPolicy) throws CommandException {
@@ -1708,6 +1779,7 @@ public class RestCommandLineService {
/**
* Update deployment policy
+ * @param deploymentPolicy deployment policy definition
* @throws CommandException
*/
public void updateDeploymentPolicy(String deploymentPolicy) throws CommandException {
@@ -1716,10 +1788,11 @@ public class RestCommandLineService {
/**
* Delete deployment policy
+ * @param deploymentPolicyId deployment policy definition
* @throws CommandException
*/
- public void deleteDeploymentPolicy(String policyId) {
- restClient.deleteEntity(ENDPOINT_REMOVE_DEPLOYMENT_POLICY.replace("{policyId}", policyId), policyId,
+ public void deleteDeploymentPolicy(String deploymentPolicyId) throws CommandException{
+ restClient.deleteEntity(ENDPOINT_REMOVE_DEPLOYMENT_POLICY.replace("{policyId}", deploymentPolicyId), deploymentPolicyId,
"deployment policy");
}
@@ -1734,7 +1807,7 @@ public class RestCommandLineService {
List<DeploymentPolicyBean> list = (List<DeploymentPolicyBean>) restClient.listEntity(ENDPOINT_LIST_DEPLOYMENT_POLICIES,
listType, "deployment policies");
- if ((list == null) || (list == null) || (list.size() == 0)) {
+ if ((list == null) || (list.size() == 0)) {
System.out.println("No deployment policies found");
return;
}
@@ -1771,7 +1844,7 @@ public class RestCommandLineService {
List<ApplicationPolicyBean> list = (List<ApplicationPolicyBean>) restClient.listEntity(ENDPOINT_LIST_APPLICATION_POLICIES,
listType, "application policies");
- if ((list == null) || (list == null) || (list.size() == 0)) {
+ if ((list == null) || (list.size() == 0)) {
System.out.println("No application policies found");
return;
}
@@ -1791,7 +1864,7 @@ public class RestCommandLineService {
array = list.toArray(array);
System.out.println("Application policies found:");
- CliUtils.printTable(array, rowMapper, "ID", "No of Network partitions","algorithm");
+ CliUtils.printTable(array, rowMapper, "ID", "No of network partitions","algorithm");
} catch (Exception e) {
String message = "Could not list application policies";
printError(message, e);
@@ -1800,15 +1873,17 @@ public class RestCommandLineService {
/**
* Delete application policy
+ * param applicationPolicyId application policy id
* @throws CommandException
*/
- public void deleteApplicationPolicy(String policyId) {
- restClient.deleteEntity(ENDPOINT_REMOVE_APPLICATION_POLICY.replace("{policyId}", policyId), policyId,
+ public void deleteApplicationPolicy(String applicationPolicyId) throws CommandException{
+ restClient.deleteEntity(ENDPOINT_REMOVE_APPLICATION_POLICY.replace("{policyId}", applicationPolicyId), applicationPolicyId,
"application policy");
}
/**
* Update application policy
+ * @param applicationPolicy application policy definition
* @throws CommandException
*/
public void updateApplicationPolicy(String applicationPolicy) throws CommandException {
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/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 adf36e7..bf5ba45 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
@@ -285,7 +285,7 @@ public class StratosApplication extends CommandLineApplication<StratosCommandCon
command = new ListApplicationPoliciesCommand();
commands.put(command.getName(),command);
- command = new DescibeApplicationPolicyCommand();
+ command = new DescribeApplicationPolicyCommand();
commands.put(command.getName(),command);
command = new RemoveApplicationPolicyCommand();
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/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 7aa0b81..0c1650f 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
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ActivateTenantCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(ActivateTenantCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(ActivateTenantCommand.class);
@Override
public String getName() {
@@ -52,16 +52,16 @@ public class ActivateTenantCommand implements Command<StratosCommandContext> {
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length == 1) {
- String id = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Getting activate tenant info {}", id);
+ String tenantDomain = args[0];
+ if (log.isDebugEnabled()) {
+ log.debug("Getting activate tenant info {}", tenantDomain);
}
- RestCommandLineService.getInstance().activateTenant(id);
+ RestCommandLineService.getInstance().activateTenant(tenantDomain);
return CliConstants.COMMAND_SUCCESSFULL;
} else {
context.getStratosApplication().printUsage(getName());
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/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 c7c3989..cabbb9f 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
@@ -25,15 +25,14 @@ import org.apache.stratos.cli.RestCommandLineService;
import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
+import org.apache.stratos.cli.utils.CliUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.BufferedReader;
-import java.io.FileReader;
import java.io.IOException;
public class AddApplicationPolicyCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(AddApplicationPolicyCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(AddApplicationPolicyCommand.class);
private final Options options;
@@ -64,14 +63,14 @@ public class AddApplicationPolicyCommand implements Command<StratosCommandContex
return null;
}
- public int execute(StratosCommandContext context, String[] args,Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args,Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length > 0) {
String resourcePath = null;
- String applicationPolicyDeployment = null;
+ String resourceFileContent = null;
final CommandLineParser parser = new GnuParser();
CommandLine commandLine;
@@ -79,29 +78,29 @@ public class AddApplicationPolicyCommand implements Command<StratosCommandContex
try {
commandLine = parser.parse(options, args);
- if (logger.isDebugEnabled()) {
- logger.debug("Application policy deployment");
+ if (log.isDebugEnabled()) {
+ log.debug("Application policy deployment");
}
if (commandLine.hasOption(CliConstants.RESOURCE_PATH)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Resource path option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Resource path option is passed");
}
resourcePath = commandLine.getOptionValue(CliConstants.RESOURCE_PATH);
- applicationPolicyDeployment = readResource(resourcePath);
+ resourceFileContent = CliUtils.readResource(resourcePath);
}
if (resourcePath == null) {
- System.out.println("usage: " + getName() + " [-p <resource path>]");
+ System.out.println("usage: " + getName());
return CliConstants.COMMAND_FAILED;
}
- RestCommandLineService.getInstance().addApplicationPolicy(applicationPolicyDeployment);
+ RestCommandLineService.getInstance().addApplicationPolicy(resourceFileContent);
return CliConstants.COMMAND_SUCCESSFULL;
} catch (ParseException e) {
- if (logger.isErrorEnabled()) {
- logger.error("Error parsing arguments", e);
+ if (log.isErrorEnabled()) {
+ log.error("Error parsing arguments", e);
}
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
@@ -115,23 +114,6 @@ public class AddApplicationPolicyCommand implements Command<StratosCommandContex
}
}
- private String readResource(String fileName) throws IOException {
- BufferedReader br = new BufferedReader(new FileReader(fileName));
- try {
- StringBuilder sb = new StringBuilder();
- String line = br.readLine();
-
- while (line != null) {
- sb.append(line);
- sb.append("\n");
- line = br.readLine();
- }
- return sb.toString();
- } finally {
- br.close();
- }
- }
-
public Options getOptions() {
return options;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/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 8425fc7..7ea8a08 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
@@ -26,18 +26,19 @@ import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
import org.apache.stratos.cli.utils.CliUtils;
-import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+
/**
* Deploy application command.
*/
public class AddApplicationSignupCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(AddApplicationSignupCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(AddApplicationSignupCommand.class);
private Options options;
@@ -70,9 +71,9 @@ public class AddApplicationSignupCommand implements Command<StratosCommandContex
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing command: ", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing command: ", getName());
}
if ((args == null) || (args.length <= 0)) {
@@ -85,22 +86,22 @@ public class AddApplicationSignupCommand implements Command<StratosCommandContex
CommandLineParser parser = new GnuParser();
CommandLine commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
String resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
if (resourcePath == null) {
- System.out.println("usage: " + getName() + " [-" + CliConstants.RESOURCE_PATH + " " + CliConstants.RESOURCE_PATH_LONG_OPTION + "]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
String resourceFileContent = CliUtils.readResource(resourcePath);
RestCommandLineService.getInstance().addApplicationSignup(resourceFileContent, applicationId);
return CliConstants.COMMAND_SUCCESSFULL;
} else {
- System.out.println("usage: " + getName() + " [-" + CliConstants.RESOURCE_PATH + " " + CliConstants.RESOURCE_PATH_LONG_OPTION + "]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
} catch (ParseException e) {
- logger.error("Error parsing arguments", e);
+ log.error("Error parsing arguments", e);
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
} catch (IOException e) {
@@ -109,7 +110,7 @@ public class AddApplicationSignupCommand implements Command<StratosCommandContex
} catch (Exception e) {
String message = "Unknown error occurred: " + e.getMessage();
System.out.println(message);
- logger.error(message, e);
+ log.error(message, e);
return CliConstants.COMMAND_FAILED;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/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 f666bff..81631e5 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
@@ -24,17 +24,17 @@ import org.apache.stratos.cli.RestCommandLineService;
import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
-import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+import org.apache.stratos.cli.utils.CliUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.BufferedReader;
-import java.io.FileReader;
import java.io.IOException;
+import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+
public class AddAutoscalingPolicyCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(AddAutoscalingPolicyCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(AddAutoscalingPolicyCommand.class);
private final Options options;
@@ -58,21 +58,21 @@ public class AddAutoscalingPolicyCommand implements Command<StratosCommandContex
}
public String getDescription() {
- return "Add autoscaling policy deployment";
+ return "Add autoscaling policy";
}
public String getArgumentSyntax() {
return null;
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length > 0) {
String resourcePath = null;
- String autoscalingPolicyDeployment = null;
+ String resourceFileContent = null;
final CommandLineParser parser = new GnuParser();
CommandLine commandLine;
@@ -80,31 +80,31 @@ public class AddAutoscalingPolicyCommand implements Command<StratosCommandContex
try {
commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
- if (logger.isDebugEnabled()) {
- logger.debug("Autoscaling policy deployment");
+ if (log.isDebugEnabled()) {
+ log.debug("Autoscaling policy deployment");
}
if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Resource path option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Resource path option is passed");
}
resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
- autoscalingPolicyDeployment = readResource(resourcePath);
+ resourceFileContent = CliUtils.readResource(resourcePath);
}
if (resourcePath == null) {
- System.out.println("usage: " + getName() + " [-p <resource path>]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
- RestCommandLineService.getInstance().addAutoscalingPolicy(autoscalingPolicyDeployment);
+ RestCommandLineService.getInstance().addAutoscalingPolicy(resourceFileContent);
return CliConstants.COMMAND_SUCCESSFULL;
} catch (ParseException e) {
- if (logger.isErrorEnabled()) {
- logger.error("Error parsing arguments", e);
+ if (log.isErrorEnabled()) {
+ log.error("Error parsing arguments", e);
}
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
@@ -118,23 +118,6 @@ public class AddAutoscalingPolicyCommand implements Command<StratosCommandContex
}
}
- private String readResource(String fileName) throws IOException {
- BufferedReader br = new BufferedReader(new FileReader(fileName));
- try {
- StringBuilder sb = new StringBuilder();
- String line = br.readLine();
-
- while (line != null) {
- sb.append(line);
- sb.append("\n");
- line = br.readLine();
- }
- return sb.toString();
- } finally {
- br.close();
- }
- }
-
public Options getOptions() {
return options;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/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 b32c965..c8c5f1f 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
@@ -24,17 +24,17 @@ import org.apache.stratos.cli.RestCommandLineService;
import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
-import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+import org.apache.stratos.cli.utils.CliUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.BufferedReader;
-import java.io.FileReader;
import java.io.IOException;
+import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+
public class AddCartridgeCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(AddCartridgeCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(AddCartridgeCommand.class);
private final Options options;
@@ -65,14 +65,14 @@ public class AddCartridgeCommand implements Command<StratosCommandContext> {
return null;
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length > 0) {
String resourcePath = null;
- String cartridgeJson = null;
+ String resourceFileContent = null;
final CommandLineParser parser = new GnuParser();
CommandLine commandLine;
@@ -80,31 +80,31 @@ public class AddCartridgeCommand implements Command<StratosCommandContext> {
try {
commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
- if (logger.isDebugEnabled()) {
- logger.debug("Cartridge deployment");
+ if (log.isDebugEnabled()) {
+ log.debug("Cartridge deployment");
}
if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Resource path option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Resource path option is passed");
}
resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
- cartridgeJson = readResource(resourcePath);
+ resourceFileContent = CliUtils.readResource(resourcePath);
}
if (resourcePath == null) {
- System.out.println("usage: " + getName() + " [-p <resource path>]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
- RestCommandLineService.getInstance().addCartridge(cartridgeJson);
+ RestCommandLineService.getInstance().addCartridge(resourceFileContent);
return CliConstants.COMMAND_SUCCESSFULL;
} catch (ParseException e) {
- if (logger.isErrorEnabled()) {
- logger.error("Error parsing arguments", e);
+ if (log.isErrorEnabled()) {
+ log.error("Error parsing arguments", e);
}
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
@@ -120,23 +120,6 @@ public class AddCartridgeCommand implements Command<StratosCommandContext> {
}
}
- private String readResource(String fileName) throws IOException {
- BufferedReader br = new BufferedReader(new FileReader(fileName));
- try {
- StringBuilder sb = new StringBuilder();
- String line = br.readLine();
-
- while (line != null) {
- sb.append(line);
- sb.append("\n");
- line = br.readLine();
- }
- return sb.toString();
- } finally {
- br.close();
- }
- }
-
public Options getOptions() {
return options;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeGroupCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeGroupCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeGroupCommand.java
index ce26680..c7d5049 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeGroupCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddCartridgeGroupCommand.java
@@ -26,18 +26,19 @@ import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
import org.apache.stratos.cli.utils.CliUtils;
-import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+
/**
* Deploy cartridge group command.
*/
public class AddCartridgeGroupCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(AddCartridgeGroupCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(AddCartridgeGroupCommand.class);
private Options options;
@@ -70,9 +71,9 @@ public class AddCartridgeGroupCommand implements Command<StratosCommandContext>
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing command: ", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing command: ", getName());
}
if ((args == null) || (args.length <= 0)) {
@@ -84,22 +85,22 @@ public class AddCartridgeGroupCommand implements Command<StratosCommandContext>
CommandLineParser parser = new GnuParser();
CommandLine commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
String resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
if (resourcePath == null) {
- System.out.println("usage: " + getName() + " [-" + CliConstants.RESOURCE_PATH + " " + CliConstants.RESOURCE_PATH_LONG_OPTION + "]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
String resourceFileContent = CliUtils.readResource(resourcePath);
RestCommandLineService.getInstance().addCartridgeGroup(resourceFileContent);
return CliConstants.COMMAND_SUCCESSFULL;
} else {
- System.out.println("usage: " + getName() + " [-" + CliConstants.RESOURCE_PATH + " " + CliConstants.RESOURCE_PATH_LONG_OPTION + "]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
} catch (ParseException e) {
- logger.error("Error parsing arguments", e);
+ log.error("Error parsing arguments", e);
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
} catch (IOException e) {
@@ -108,7 +109,7 @@ public class AddCartridgeGroupCommand implements Command<StratosCommandContext>
} catch (Exception e) {
String message = "Unknown error occurred: " + e.getMessage();
System.out.println(message);
- logger.error(message, e);
+ log.error(message, e);
return CliConstants.COMMAND_FAILED;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/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 7070594..8e1f6cc 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
@@ -25,16 +25,16 @@ import org.apache.stratos.cli.RestCommandLineService;
import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
-import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+import org.apache.stratos.cli.utils.CliUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.BufferedReader;
-import java.io.FileReader;
import java.io.IOException;
+import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+
public class AddDeploymentPolicyCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(AddDeploymentPolicyCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(AddDeploymentPolicyCommand.class);
private final Options options;
@@ -65,14 +65,14 @@ public class AddDeploymentPolicyCommand implements Command<StratosCommandContext
return null;
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length > 0) {
String resourcePath = null;
- String deploymentPolicyDeployment = null;
+ String resourceFileContent = null;
final CommandLineParser parser = new GnuParser();
CommandLine commandLine;
@@ -80,31 +80,31 @@ public class AddDeploymentPolicyCommand implements Command<StratosCommandContext
try {
commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
- if (logger.isDebugEnabled()) {
- logger.debug("Deployment policy deployment");
+ if (log.isDebugEnabled()) {
+ log.debug("Deployment policy deployment");
}
if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Resource path option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Resource path option is passed");
}
resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
- deploymentPolicyDeployment = readResource(resourcePath);
+ resourceFileContent = CliUtils.readResource(resourcePath);
}
if (resourcePath == null) {
- System.out.println("usage: " + getName() + " [-p <resource path>]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
- RestCommandLineService.getInstance().addDeploymentPolicy(deploymentPolicyDeployment);
+ RestCommandLineService.getInstance().addDeploymentPolicy(resourceFileContent);
return CliConstants.COMMAND_SUCCESSFULL;
} catch (ParseException e) {
- if (logger.isErrorEnabled()) {
- logger.error("Error parsing arguments", e);
+ if (log.isErrorEnabled()) {
+ log.error("Error parsing arguments", e);
}
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
@@ -118,23 +118,6 @@ public class AddDeploymentPolicyCommand implements Command<StratosCommandContext
}
}
- private String readResource(String fileName) throws IOException {
- BufferedReader br = new BufferedReader(new FileReader(fileName));
- try {
- StringBuilder sb = new StringBuilder();
- String line = br.readLine();
-
- while (line != null) {
- sb.append(line);
- sb.append("\n");
- line = br.readLine();
- }
- return sb.toString();
- } finally {
- br.close();
- }
- }
-
public Options getOptions() {
return options;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingsCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingsCommand.java
index 35f1ec4..61b0c82 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingsCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingsCommand.java
@@ -26,18 +26,19 @@ import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
import org.apache.stratos.cli.utils.CliUtils;
-import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+
/**
* Add domain mappings command.
*/
public class AddDomainMappingsCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(AddDomainMappingsCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(AddDomainMappingsCommand.class);
private Options options;
@@ -70,9 +71,9 @@ public class AddDomainMappingsCommand implements Command<StratosCommandContext>
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing command: ", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing command: ", getName());
}
if ((args == null) || (args.length <= 0)) {
@@ -84,7 +85,7 @@ public class AddDomainMappingsCommand implements Command<StratosCommandContext>
CommandLineParser parser = new GnuParser();
CommandLine commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
String resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
if (resourcePath == null) {
@@ -94,16 +95,21 @@ public class AddDomainMappingsCommand implements Command<StratosCommandContext>
}
String applicationId = args[0];
- String resourceFileContent = CliUtils.readResource(resourcePath);
- RestCommandLineService.getInstance().addDomainMappings(applicationId, resourceFileContent);
- return CliConstants.COMMAND_SUCCESSFULL;
+ if(applicationId!=null) {
+ String resourceFileContent = CliUtils.readResource(resourcePath);
+ RestCommandLineService.getInstance().addDomainMappings(applicationId, resourceFileContent);
+ return CliConstants.COMMAND_SUCCESSFULL;
+ } else{
+ context.getStratosApplication().printUsage(getName());
+ return CliConstants.COMMAND_FAILED;
+ }
+
} else {
- System.out.println("usage: " + getName() + " [-" + CliConstants.RESOURCE_PATH + " "
- + CliConstants.RESOURCE_PATH_LONG_OPTION + "]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
} catch (ParseException e) {
- logger.error("Error parsing arguments", e);
+ log.error("Error parsing arguments", e);
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
} catch (IOException e) {
@@ -112,7 +118,7 @@ public class AddDomainMappingsCommand implements Command<StratosCommandContext>
} catch (Exception e) {
String message = "Unknown error occurred: " + e.getMessage();
System.out.println(message);
- logger.error(message, e);
+ log.error(message, e);
return CliConstants.COMMAND_FAILED;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/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 b785bb5..9c619f9 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
@@ -26,18 +26,19 @@ import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
import org.apache.stratos.cli.utils.CliUtils;
-import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+
/**
* Deploy kubernetes cluster command.
*/
public class AddKubernetesClusterCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(AddKubernetesClusterCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(AddKubernetesClusterCommand.class);
private Options options;
@@ -70,9 +71,9 @@ public class AddKubernetesClusterCommand implements Command<StratosCommandContex
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing command: ", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing command: ", getName());
}
if ((args == null) || (args.length <= 0)) {
@@ -84,22 +85,22 @@ public class AddKubernetesClusterCommand implements Command<StratosCommandContex
CommandLineParser parser = new GnuParser();
CommandLine commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
String resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
if (resourcePath == null) {
- System.out.println("usage: " + getName() + " [-" + CliConstants.RESOURCE_PATH + " " + CliConstants.RESOURCE_PATH_LONG_OPTION + "]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
String resourceFileContent = CliUtils.readResource(resourcePath);
RestCommandLineService.getInstance().addKubernetesCluster(resourceFileContent);
return CliConstants.COMMAND_SUCCESSFULL;
} else {
- System.out.println("usage: " + getName() + " [-" + CliConstants.RESOURCE_PATH + " " + CliConstants.RESOURCE_PATH_LONG_OPTION + "]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
} catch (ParseException e) {
- logger.error("Error parsing arguments", e);
+ log.error("Error parsing arguments", e);
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
} catch (IOException e) {
@@ -108,7 +109,7 @@ public class AddKubernetesClusterCommand implements Command<StratosCommandContex
} catch (Exception e) {
String message = "Unknown error occurred: " + e.getMessage();
System.out.println(message);
- logger.error(message, e);
+ log.error(message, e);
return CliConstants.COMMAND_FAILED;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/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 d0548fd..9fee493 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
@@ -26,18 +26,19 @@ import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
import org.apache.stratos.cli.utils.CliUtils;
-import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+
/**
* Deploy kubernetes host command.
*/
public class AddKubernetesHostCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(AddKubernetesHostCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(AddKubernetesHostCommand.class);
private Options options;
@@ -74,9 +75,9 @@ public class AddKubernetesHostCommand implements Command<StratosCommandContext>
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing command: ", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing command: ", getName());
}
if ((args == null) || (args.length <= 0)) {
@@ -88,7 +89,7 @@ public class AddKubernetesHostCommand implements Command<StratosCommandContext>
CommandLineParser parser = new GnuParser();
CommandLine commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
if((opts.hasOption(CliConstants.RESOURCE_PATH)) && (opts.hasOption(CliConstants.CLUSTER_ID_OPTION))) {
@@ -115,7 +116,7 @@ public class AddKubernetesHostCommand implements Command<StratosCommandContext>
}
} catch (ParseException e) {
- logger.error("Error parsing arguments", e);
+ log.error("Error parsing arguments", e);
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
} catch (IOException e) {
@@ -124,7 +125,7 @@ public class AddKubernetesHostCommand implements Command<StratosCommandContext>
} catch (Exception e) {
String message = "Unknown error occurred: " + e.getMessage();
System.out.println(message);
- logger.error(message, e);
+ log.error(message, e);
return CliConstants.COMMAND_FAILED;
}
}