From c32d6e7524fcd583fcd079fac7afa49a749f5c3e Mon Sep 17 00:00:00 2001 From: Kris McQueen Date: Tue, 21 Sep 2010 17:00:50 -0700 Subject: [PATCH] Template id is not a required parameter when listing templates. The proper serialized name for the async job id is jobid, not id. Sadly, ctxAccoutId != ctxAccountId, ugh, no wonder the UserContext wasn't getting set up correctly. Clean up some miscellaneous unnecessary casts. --- server/src/com/cloud/api/BaseCmd.java | 2 +- .../cloud/api/commands/ListTemplatesCmd.java | 2 +- .../cloud/api/response/AsyncJobResponse.java | 2 +- .../com/cloud/async/AsyncJobManagerImpl.java | 2 +- .../security/NetworkGroupManagerImpl.java | 4 ++-- .../cloud/server/ManagementServerImpl.java | 19 ++++++++++--------- .../com/cloud/storage/StorageManagerImpl.java | 3 +-- .../storage/snapshot/SnapshotManagerImpl.java | 3 +-- .../cloud/template/TemplateManagerImpl.java | 10 ++++------ 9 files changed, 22 insertions(+), 25 deletions(-) diff --git a/server/src/com/cloud/api/BaseCmd.java b/server/src/com/cloud/api/BaseCmd.java index 8077ce3b13c..74a422e3f89 100644 --- a/server/src/com/cloud/api/BaseCmd.java +++ b/server/src/com/cloud/api/BaseCmd.java @@ -284,7 +284,7 @@ public abstract class BaseCmd { } // we are ready to store the value for a particular field into the map for this object - mapValue.put(fieldName, (String)params.get(key)); + mapValue.put(fieldName, params.get(key)); lowercaseParams.put(paramName, mapArray); } else { diff --git a/server/src/com/cloud/api/commands/ListTemplatesCmd.java b/server/src/com/cloud/api/commands/ListTemplatesCmd.java index 2acfb144a81..f46ec02ff6e 100644 --- a/server/src/com/cloud/api/commands/ListTemplatesCmd.java +++ b/server/src/com/cloud/api/commands/ListTemplatesCmd.java @@ -58,7 +58,7 @@ public class ListTemplatesCmd extends BaseListCmd { @Parameter(name="domainid", type=CommandType.LONG) private Long domainId; - @Parameter(name="id", type=CommandType.LONG, required=true) + @Parameter(name="id", type=CommandType.LONG) private Long id; @Parameter(name="name", type=CommandType.STRING) diff --git a/server/src/com/cloud/api/response/AsyncJobResponse.java b/server/src/com/cloud/api/response/AsyncJobResponse.java index b9645ad7881..9eecfd52836 100644 --- a/server/src/com/cloud/api/response/AsyncJobResponse.java +++ b/server/src/com/cloud/api/response/AsyncJobResponse.java @@ -22,7 +22,7 @@ import java.util.Date; import com.google.gson.annotations.SerializedName; public class AsyncJobResponse extends BaseResponse { - @SerializedName("id") + @SerializedName("jobid") private Long id; @SerializedName("accountid") diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java index 683a1641bc2..1163bf03143 100644 --- a/server/src/com/cloud/async/AsyncJobManagerImpl.java +++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java @@ -438,7 +438,7 @@ public class AsyncJobManagerImpl implements AsyncJobManager { // whenever we deserialize, the UserContext needs to be updated String userIdStr = params.get("ctxUserId"); - String acctIdStr = params.get("ctxAccoutId"); + String acctIdStr = params.get("ctxAccountId"); Long userId = null; Account accountObject = null; diff --git a/server/src/com/cloud/network/security/NetworkGroupManagerImpl.java b/server/src/com/cloud/network/security/NetworkGroupManagerImpl.java index 639fe9a279a..f37e3256625 100644 --- a/server/src/com/cloud/network/security/NetworkGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/NetworkGroupManagerImpl.java @@ -1271,10 +1271,10 @@ public class NetworkGroupManagerImpl implements NetworkGroupManager { sc.addAnd("name", SearchCriteria.Op.SC, ssc); } } else if (instanceId != null) { - return listNetworkGroupRulesByVM(((Long)instanceId).longValue()); + return listNetworkGroupRulesByVM(instanceId.longValue()); } else if (domainId != null) { if (Boolean.TRUE.equals(recursive)) { - DomainVO domain = _domainDao.findById((Long)domainId); + DomainVO domain = _domainDao.findById(domainId); sc.setJoinParameters("domainSearch", "path", domain.getPath() + "%"); } else { sc.setParameters("domainId", domainId); diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index d744439baa8..d514d3c2d15 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -1704,7 +1704,8 @@ public class ManagementServerImpl implements ManagementServer { String group = cmd.getGroup(); String userData = cmd.getUserData(); String[] networkGroups = null; - Long size = cmd.getSize(); + Long sizeObj = cmd.getSize(); + long size = (sizeObj == null) ? 0 : sizeObj; if ((ctxAccount == null) || isAdmin(ctxAccount.getType())) { if (domainId != null) { @@ -2700,7 +2701,7 @@ public class ManagementServerImpl implements ManagementServer { sc.setParameters("domainId", domainId); } } else if (domainId != null) { - DomainVO domainVO = _domainDao.findById((Long)domainId); + DomainVO domainVO = _domainDao.findById(domainId); sc.setJoinParameters("domainSearch", "path", domainVO.getPath() + "%"); } @@ -3281,7 +3282,7 @@ public class ManagementServerImpl implements ManagementServer { if (accountId != null) { sc.setParameters("id", accountId); } else if (domainId != null) { - DomainVO domain = _domainDao.findById((Long)domainId); + DomainVO domain = _domainDao.findById(domainId); // I want to join on user_vm.domain_id = domain.id where domain.path like 'foo%' sc.setJoinParameters("domainSearch", "path", domain.getPath() + "%"); @@ -3927,7 +3928,7 @@ public class ManagementServerImpl implements ManagementServer { sc.setParameters("accountName", "%" + accountName + "%"); sc.addAnd("removed", SearchCriteria.Op.NULL); } else if (isAdmin) { - DomainVO domain = _domainDao.findById((Long)domainId); + DomainVO domain = _domainDao.findById(domainId); sc.setJoinParameters("domainSearch", "path", domain.getPath() + "%"); } } @@ -4027,7 +4028,7 @@ public class ManagementServerImpl implements ManagementServer { if (accountId != null) { sc.setParameters("accountId", accountId); } else if (domainId != null) { - DomainVO domain = _domainDao.findById((Long)domainId); + DomainVO domain = _domainDao.findById(domainId); sc.setJoinParameters("domainSearch", "path", domain.getPath() + "%"); } @@ -4194,7 +4195,7 @@ public class ManagementServerImpl implements ManagementServer { if (accountId != null) { sc.setParameters("accountIdEQ", accountId); } else if (domainId != null) { - DomainVO domain = _domainDao.findById((Long)domainId); + DomainVO domain = _domainDao.findById(domainId); sc.setJoinParameters("domainSearch", "path", domain.getPath() + "%"); } if (type != null) { @@ -4292,7 +4293,7 @@ public class ManagementServerImpl implements ManagementServer { sb.join("vlanSearch", vlanSearch, sb.entity().getVlanDbId(), vlanSearch.entity().getId()); } - if ((isAllocated != null) && ((Boolean) isAllocated == true)) { + if ((isAllocated != null) && (isAllocated == true)) { sb.and("allocated", sb.entity().getAllocated(), SearchCriteria.Op.NNULL); } @@ -4300,7 +4301,7 @@ public class ManagementServerImpl implements ManagementServer { if (accountId != null) { sc.setParameters("accountIdEQ", accountId); } else if (domainId != null) { - DomainVO domain = _domainDao.findById((Long)domainId); + DomainVO domain = _domainDao.findById(domainId); sc.setJoinParameters("domainSearch", "path", domain.getPath() + "%"); } @@ -5135,7 +5136,7 @@ public class ManagementServerImpl implements ManagementServer { if(intervalType == null) { throw new InvalidParameterValueException("Unsupported interval type " + intervalType); } - SnapshotPolicyVO snapPolicy = _snapMgr.getPolicyForVolumeByInterval((Long)volumeId, (short)intervalType.ordinal()); + SnapshotPolicyVO snapPolicy = _snapMgr.getPolicyForVolumeByInterval(volumeId, (short)intervalType.ordinal()); if (snapPolicy == null) { s_logger.warn("Policy with interval "+ intervalType +" not assigned to volume: "+volumeId); return new ArrayList(); diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index e1400fb235e..1dba7a8e2b3 100644 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -2354,9 +2354,8 @@ public class StorageManagerImpl implements StorageManager { @Override public boolean deleteVolume(DeleteVolumeCmd cmd) throws InvalidParameterValueException { - Account account = (Account) UserContext.current().getAccountObject(); - Long volumeId = (Long) cmd.getId(); + Long volumeId = cmd.getId(); boolean isAdmin; if (account == null) { diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index 7fca3da800d..9644d8305bb 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -1520,8 +1520,7 @@ public class SnapshotManagerImpl implements SnapshotManager { @Override public boolean deleteSnapshotPolicies(DeleteSnapshotPoliciesCmd cmd) throws InvalidParameterValueException { - - Long policyId = (Long)cmd.getId(); + Long policyId = cmd.getId(); List policyIds = cmd.getIds(); Long userId = UserContext.current().getUserId(); diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index 292bc5cb35e..fabd218f603 100644 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -1106,12 +1106,11 @@ public class TemplateManagerImpl implements TemplateManager { } @Override - public boolean deleteTemplate(DeleteTemplateCmd cmd) throws InvalidParameterValueException, InternalErrorException, PermissionDeniedException{ - + public boolean deleteTemplate(DeleteTemplateCmd cmd) throws InvalidParameterValueException, InternalErrorException, PermissionDeniedException { Long templateId = cmd.getId(); Long userId = UserContext.current().getUserId(); Account account = (Account)UserContext.current().getAccountObject(); - Long zoneId = (Long)cmd.getZoneId(); + Long zoneId = cmd.getZoneId(); VMTemplateVO template = _tmpltDao.findById(templateId.longValue()); if (template == null) { @@ -1140,12 +1139,11 @@ public class TemplateManagerImpl implements TemplateManager { } @Override - public boolean deleteIso(DeleteIsoCmd cmd) throws InvalidParameterValueException, InternalErrorException, PermissionDeniedException{ - + public boolean deleteIso(DeleteIsoCmd cmd) throws InvalidParameterValueException, InternalErrorException, PermissionDeniedException { Long templateId = cmd.getId(); Long userId = UserContext.current().getUserId(); Account account = (Account)UserContext.current().getAccountObject(); - Long zoneId = (Long)cmd.getZoneId(); + Long zoneId = cmd.getZoneId(); VMTemplateVO template = _tmpltDao.findById(templateId.longValue()); if (template == null) {