Skip to content

Commit a1fdb0c

Browse files
author
Kishan Kavala
committed
CLOUDSTACK-241: Remove API sync. Merge changes from 4.1 branch. Converted tabs to spaces.
1 parent 8b5c1b2 commit a1fdb0c

28 files changed

Lines changed: 1083 additions & 340 deletions

‎api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public class CreateAccountCmd extends BaseCmd {
7878
@Parameter(name = ApiConstants.ACCOUNT_DETAILS, type = CommandType.MAP, description = "details for account used to store specific parameters")
7979
private Map<String, String> details;
8080

81+
8182
/////////////////////////////////////////////////////
8283
/////////////////// Accessors ///////////////////////
8384
/////////////////////////////////////////////////////
@@ -149,7 +150,8 @@ public long getEntityOwnerId() {
149150
@Override
150151
public void execute(){
151152
UserContext.current().setEventDetails("Account Name: "+getAccountName()+", Domain Id:"+getDomainId());
152-
UserAccount userAccount = _accountService.createUserAccount(getUsername(), getPassword(), getFirstName(), getLastName(), getEmail(), getTimeZone(), getAccountName(), getAccountType(), getDomainId(), getNetworkDomain(), getDetails());
153+
UserAccount userAccount = _accountService.createUserAccount(getUsername(), getPassword(), getFirstName(), getLastName(), getEmail(), getTimeZone(), getAccountName(), getAccountType(),
154+
getDomainId(), getNetworkDomain(), getDetails());
153155
if (userAccount != null) {
154156
AccountResponse response = _responseGenerator.createUserAccountResponse(userAccount);
155157
response.setResponseName(getCommandName());

‎api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class DeleteAccountCmd extends BaseAsyncCmd {
4949
private Long id;
5050

5151
@Inject RegionService _regionService;
52-
52+
5353
/////////////////////////////////////////////////////
5454
/////////////////// Accessors ///////////////////////
5555
/////////////////////////////////////////////////////
@@ -96,7 +96,7 @@ public String getEventDescription() {
9696
@Override
9797
public void execute(){
9898
UserContext.current().setEventDetails("Account Id: "+getId());
99-
99+
100100
boolean result = _regionService.deleteUserAccount(this);
101101
if (result) {
102102
SuccessResponse response = new SuccessResponse(getCommandName());

‎api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class DisableAccountCmd extends BaseAsyncCmd {
5959
private Boolean lockRequested;
6060

6161
@Inject RegionService _regionService;
62-
62+
6363
/////////////////////////////////////////////////////
6464
/////////////////// Accessors ///////////////////////
6565
/////////////////////////////////////////////////////

‎api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class EnableAccountCmd extends BaseCmd {
5151
private Long domainId;
5252

5353
@Inject RegionService _regionService;
54-
54+
5555
/////////////////////////////////////////////////////
5656
/////////////////// Accessors ///////////////////////
5757
/////////////////////////////////////////////////////
@@ -68,7 +68,6 @@ public Long getDomainId() {
6868
return domainId;
6969
}
7070

71-
7271
/////////////////////////////////////////////////////
7372
/////////////// API Implementation///////////////////
7473
/////////////////////////////////////////////////////

‎api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class UpdateAccountCmd extends BaseCmd{
6464
private Map details;
6565

6666
@Inject RegionService _regionService;
67-
67+
6868
/////////////////////////////////////////////////////
6969
/////////////////// Accessors ///////////////////////
7070
/////////////////////////////////////////////////////
@@ -99,7 +99,6 @@ public Map getDetails() {
9999
return params;
100100
}
101101

102-
103102
/////////////////////////////////////////////////////
104103
/////////////// API Implementation///////////////////
105104
/////////////////////////////////////////////////////

‎api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class DeleteDomainCmd extends BaseAsyncCmd {
5151
private Boolean cleanup;
5252

5353
@Inject RegionService _regionService;
54-
54+
5555
/////////////////////////////////////////////////////
5656
/////////////////// Accessors ///////////////////////
5757
/////////////////////////////////////////////////////

‎api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class UpdateDomainCmd extends BaseCmd {
5353
private String networkDomain;
5454

5555
@Inject RegionService _regionService;
56-
56+
5757
/////////////////////////////////////////////////////
5858
/////////////////// Accessors ///////////////////////
5959
/////////////////////////////////////////////////////
@@ -88,7 +88,7 @@ public long getEntityOwnerId() {
8888
public void execute(){
8989
UserContext.current().setEventDetails("Domain Id: "+getId());
9090
Domain domain = _regionService.updateDomain(this);
91-
91+
9292
if (domain != null) {
9393
DomainResponse response = _responseGenerator.createDomainResponse(domain);
9494
response.setResponseName(getCommandName());

‎api/src/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class DeleteUserCmd extends BaseCmd {
4646
private Long id;
4747

4848
@Inject RegionService _regionService;
49-
49+
5050
/////////////////////////////////////////////////////
5151
/////////////////// Accessors ///////////////////////
5252
/////////////////////////////////////////////////////

‎api/src/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class DisableUserCmd extends BaseAsyncCmd {
5050
private Long id;
5151

5252
@Inject RegionService _regionService;
53-
53+
5454
/////////////////////////////////////////////////////
5555
/////////////////// Accessors ///////////////////////
5656
/////////////////////////////////////////////////////
@@ -93,7 +93,7 @@ public String getEventDescription() {
9393
public void execute(){
9494
UserContext.current().setEventDetails("UserId: "+getId());
9595
UserAccount user = _regionService.disableUser(this);
96-
96+
9797
if (user != null){
9898
UserResponse response = _responseGenerator.createUserResponse(user);
9999
response.setResponseName(getCommandName());

‎api/src/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class EnableUserCmd extends BaseCmd {
4747
private Long id;
4848

4949
@Inject RegionService _regionService;
50-
50+
5151
/////////////////////////////////////////////////////
5252
/////////////////// Accessors ///////////////////////
5353
/////////////////////////////////////////////////////
@@ -79,7 +79,7 @@ public long getEntityOwnerId() {
7979
public void execute(){
8080
UserContext.current().setEventDetails("UserId: "+getId());
8181
UserAccount user = _regionService.enableUser(this);
82-
82+
8383
if (user != null){
8484
UserResponse response = _responseGenerator.createUserResponse(user);
8585
response.setResponseName(getCommandName());

0 commit comments

Comments
 (0)