You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/05/21 17:49:45 UTC

[05/10] git commit: updated refs/heads/master to 84266b1

api: account: fix and reformat descriptions

Signed-off-by: Daan Hoogland <da...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/68e867f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/68e867f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/68e867f0

Branch: refs/heads/master
Commit: 68e867f0c6565755f55dea086d21163048d11a9d
Parents: 5cd35a2
Author: Rene Moser <re...@apache.org>
Authored: Thu May 21 09:36:27 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu May 21 17:49:18 2015 +0200

----------------------------------------------------------------------
 .../api/command/user/account/AddAccountToProjectCmd.java     | 8 ++++----
 .../command/user/account/DeleteAccountFromProjectCmd.java    | 6 +++---
 .../cloudstack/api/command/user/account/ListAccountsCmd.java | 2 +-
 .../api/command/user/account/ListProjectAccountsCmd.java     | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68e867f0/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
index ef36038..22deb03 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
@@ -32,7 +32,7 @@ import com.cloud.event.EventTypes;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.projects.Project;
 
-@APICommand(name = "addAccountToProject", description = "Adds acoount to a project", responseObject = SuccessResponse.class, since = "3.0.0",
+@APICommand(name = "addAccountToProject", description = "Adds account to a project", responseObject = SuccessResponse.class, since = "3.0.0",
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class AddAccountToProjectCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(AddAccountToProjectCmd.class.getName());
@@ -47,7 +47,7 @@ public class AddAccountToProjectCmd extends BaseAsyncCmd {
                type = CommandType.UUID,
                entityType = ProjectResponse.class,
                required = true,
-               description = "id of the project to add the account to")
+               description = "ID of the project to add the account to")
     private Long projectId;
 
     @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "name of the account to be added to the project")
@@ -87,7 +87,7 @@ public class AddAccountToProjectCmd extends BaseAsyncCmd {
             throw new InvalidParameterValueException("Either accountName or email is required");
         }
 
-        CallContext.current().setEventDetails("Project id: " + projectId + "; accountName " + accountName);
+        CallContext.current().setEventDetails("Project ID: " + projectId + "; accountName " + accountName);
         boolean result = _projectService.addAccountToProject(getProjectId(), getAccountName(), getEmail());
         if (result) {
             SuccessResponse response = new SuccessResponse(getCommandName());
@@ -102,7 +102,7 @@ public class AddAccountToProjectCmd extends BaseAsyncCmd {
         Project project = _projectService.getProject(getProjectId());
         //verify input parameters
         if (project == null) {
-            InvalidParameterValueException ex = new InvalidParameterValueException("Unable to find project with specified id");
+            InvalidParameterValueException ex = new InvalidParameterValueException("Unable to find project with specified ID");
             ex.addProxyObject(getProjectId().toString(), "projectId");
             throw ex;
         }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68e867f0/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
index 5c89173..60003b7 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
@@ -47,7 +47,7 @@ public class DeleteAccountFromProjectCmd extends BaseAsyncCmd {
                type = CommandType.UUID,
                entityType = ProjectResponse.class,
                required = true,
-               description = "id of the project to remove the account from")
+               description = "ID of the project to remove the account from")
     private Long projectId;
 
     @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, required = true, description = "name of the account to be removed from the project")
@@ -76,7 +76,7 @@ public class DeleteAccountFromProjectCmd extends BaseAsyncCmd {
 
     @Override
     public void execute() {
-        CallContext.current().setEventDetails("Project id: " + projectId + "; accountName " + accountName);
+        CallContext.current().setEventDetails("Project ID: " + projectId + "; accountName " + accountName);
         boolean result = _projectService.deleteAccountFromProject(projectId, accountName);
         if (result) {
             SuccessResponse response = new SuccessResponse(getCommandName());
@@ -91,7 +91,7 @@ public class DeleteAccountFromProjectCmd extends BaseAsyncCmd {
         Project project = _projectService.getProject(projectId);
         //verify input parameters
         if (project == null) {
-            throw new InvalidParameterValueException("Unable to find project by id " + projectId);
+            throw new InvalidParameterValueException("Unable to find project by ID " + projectId);
         }
 
         return _projectService.getProjectOwner(projectId).getId();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68e867f0/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
index 0b5ae7c..167f233 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/ListAccountsCmd.java
@@ -46,7 +46,7 @@ public class ListAccountsCmd extends BaseListDomainResourcesCmd {
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = AccountResponse.class, description = "list account by account ID")
     private Long id;
 
-    @Parameter(name = ApiConstants.IS_CLEANUP_REQUIRED, type = CommandType.BOOLEAN, description = "list accounts by cleanuprequred attribute (values are true or false)")
+    @Parameter(name = ApiConstants.IS_CLEANUP_REQUIRED, type = CommandType.BOOLEAN, description = "list accounts by cleanuprequired attribute (values are true or false)")
     private Boolean cleanupRequired;
 
     @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "list account by account name")

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68e867f0/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
index a70024e..3fcb198 100644
--- a/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
@@ -39,7 +39,7 @@ public class ListProjectAccountsCmd extends BaseListCmd {
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
-    @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, required = true, description = "id of the project")
+    @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, required = true, description = "ID of the project")
     private Long projectId;
 
     @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "list accounts of the project by account name")