Updated Branches: refs/heads/4.1 c551f854a -> ee2816a27
CLOUDSTACK-2154: create account command returns user response Fix the annotation so cloudmonkey, marvin and apidocs can process the response of createAccount as AccountResponse and not UserResponse as was previously mapped. Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ee2816a2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ee2816a2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ee2816a2 Branch: refs/heads/4.1 Commit: ee2816a27823c365f42dceb0b99a207a65a92ecd Parents: c551f85 Author: Prasanna Santhanam <[email protected]> Authored: Tue Apr 23 20:38:14 2013 +0530 Committer: Chip Childers <[email protected]> Committed: Tue Apr 23 19:52:55 2013 +0100 ---------------------------------------------------------------------- .../command/admin/account/CreateAccountCmd.java | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ee2816a2/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java index 89673ea..cf43694 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java @@ -16,9 +16,9 @@ // under the License. package org.apache.cloudstack.api.command.admin.account; -import java.util.Collection; -import java.util.Map; - +import com.cloud.user.Account; +import com.cloud.user.UserAccount; +import com.cloud.user.UserContext; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,14 +27,12 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AccountResponse; import org.apache.cloudstack.api.response.DomainResponse; -import org.apache.cloudstack.api.response.UserResponse; import org.apache.log4j.Logger; -import com.cloud.user.Account; -import com.cloud.user.UserAccount; -import com.cloud.user.UserContext; +import java.util.Collection; +import java.util.Map; -@APICommand(name = "createAccount", description="Creates an account", responseObject=UserResponse.class) +@APICommand(name = "createAccount", description="Creates an account", responseObject=AccountResponse.class) public class CreateAccountCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateAccountCmd.class.getName());
