Allon Mureinik has uploaded a new change for review. Change subject: core: VmTemplateHandler constants ......................................................................
core: VmTemplateHandler constants Fixed modifiers and naming conventions for the class' constants. Change-Id: Ifb1868d3444ec5ff43681a1c45e95b71ab00171a Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmPoolWithVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByStoragePoolIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java 13 files changed, 26 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/22142/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java index 892b220..ae9dc04 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java @@ -27,7 +27,7 @@ VmStatic vmStatic = getParameters().getVmStaticData(); VdcReturnValueBase returnValueFromAddVm; - if (VmTemplateHandler.BlankVmTemplateId.equals(vmStatic.getVmtGuid())) { + if (VmTemplateHandler.BLANK_VM_TEMPLATE_ID.equals(vmStatic.getVmtGuid())) { returnValueFromAddVm = addVmFromScratch(vmStatic); } else { returnValueFromAddVm = addVm(vmStatic); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java index fe0cd9f..a337d7c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java @@ -257,7 +257,7 @@ protected void executeVmCommand() { super.executeVmCommand(); setVm(null); - getVm().setVmtGuid(VmTemplateHandler.BlankVmTemplateId); + getVm().setVmtGuid(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); getVmStaticDao().update(getVm().getStaticData()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java index 7fb5c67..eb37fda 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java @@ -264,7 +264,7 @@ protected boolean shouldCheckSpaceInStorageDomains() { return !getImagesToCheckDestinationStorageDomains().isEmpty() && !LinqUtils.firstOrNull(getImagesToCheckDestinationStorageDomains(), new All<DiskImage>()) - .getImageId().equals(VmTemplateHandler.BlankVmTemplateId); + .getImageId().equals(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); } protected Guid getStoragePoolIdFromSourceImageContainer() { @@ -912,7 +912,7 @@ getVmId(), VdcObjectType.VM); } - if (getParameters().isCopyTemplatePermissions() && !getVmTemplateId().equals(VmTemplateHandler.BlankVmTemplateId)) { + if (getParameters().isCopyTemplatePermissions() && !getVmTemplateId().equals(VmTemplateHandler.BLANK_VM_TEMPLATE_ID)) { copyTemplatePermissions(permissionsToAdd); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java index 371ba15..d8b8a7e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java @@ -38,7 +38,7 @@ protected void executeVmCommand() { super.executeVmCommand(); getParameters().OriginalTemplate = getVm().getVmtGuid(); - getVm().setVmtGuid(VmTemplateHandler.BlankVmTemplateId); + getVm().setVmtGuid(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); getVm().getStaticData().setQuotaId(getParameters().getVmStaticData().getQuotaId()); DbFacade.getInstance().getVmStaticDao().update(getVm().getStaticData()); // if there are no tasks, we can end the command right away. diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmPoolWithVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmPoolWithVmsCommand.java index 5465e34..d68de07 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmPoolWithVmsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmPoolWithVmsCommand.java @@ -40,7 +40,7 @@ protected boolean canDoAction() { boolean returnValue = super.canDoAction(); - if (returnValue && VmTemplateHandler.BlankVmTemplateId.equals(getParameters().getVmStaticData().getVmtGuid())) { + if (returnValue && VmTemplateHandler.BLANK_VM_TEMPLATE_ID.equals(getParameters().getVmStaticData().getVmtGuid())) { returnValue = false; addCanDoActionMessage(VdcBllMessages.VM_POOL_CANNOT_CREATE_FROM_BLANK_TEMPLATE); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java index 8ee8da3..453aca2 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java @@ -33,8 +33,8 @@ returnValue.setStorageIds(new ArrayList<Guid>(Arrays.asList(getDestinationStorageDomainId()))); returnValue.setQuotaId(getParameters().getQuotaId()); // override to have no template - returnValue.setParentId(VmTemplateHandler.BlankVmTemplateId); - returnValue.setImageTemplateId(VmTemplateHandler.BlankVmTemplateId); + returnValue.setParentId(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); + returnValue.setImageTemplateId(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); if (getParameters().getDiskImageBase() != null) { returnValue.setVolumeType(getParameters().getDiskImageBase().getVolumeType()); returnValue.setvolumeFormat(getParameters().getDiskImageBase().getVolumeFormat()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java index b9d3b22..8303a32 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java @@ -249,8 +249,8 @@ List<Guid> imageGroupIds = new ArrayList<>(); for (Disk disk : getDisksBasedOnImage()) { DiskImage diskImage = (DiskImage) disk; - diskImage.setParentId(VmTemplateHandler.BlankVmTemplateId); - diskImage.setImageTemplateId(VmTemplateHandler.BlankVmTemplateId); + diskImage.setParentId(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); + diskImage.setImageTemplateId(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); diskImage.setStorageIds(new ArrayList<Guid>(Arrays.asList(storageDomainId))); DiskImage diskForVolumeInfo = getDiskForVolumeInfo(diskImage); diskImage.setvolumeFormat(diskForVolumeInfo.getVolumeFormat()); @@ -274,7 +274,7 @@ VmTemplate t = getDbFacade().getVmTemplateDao().get(vm.getVmtGuid()); vm.setVmtName(t.getName()); } - getVm().setVmtGuid(VmTemplateHandler.BlankVmTemplateId); + getVm().setVmtGuid(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); String vmMeta = ovfManager.ExportVm(vm, AllVmImages, ClusterUtils.getCompatibilityVersion(vm)); vmsAndMetaDictionary @@ -457,7 +457,7 @@ tempVar); if (qretVal.getSucceeded()) { - if (!VmTemplateHandler.BlankVmTemplateId.equals(tmplId)) { + if (!VmTemplateHandler.BLANK_VM_TEMPLATE_ID.equals(tmplId)) { Map<VmTemplate, List<DiskImage>> templates = qretVal.getReturnValue(); VmTemplate tmpl = LinqUtils.firstOrNull(templates.keySet(), new Predicate<VmTemplate>() { @Override @@ -519,7 +519,7 @@ } private void endCopyCollapseOperations(VM vm) { - vm.setVmtGuid(VmTemplateHandler.BlankVmTemplateId); + vm.setVmtGuid(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); vm.setVmtName(null); Snapshot activeSnapshot = getDbFacade().getSnapshotDao().get( getDbFacade().getSnapshotDao().getId(vm.getId(), SnapshotType.ACTIVE)); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByStoragePoolIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByStoragePoolIdQuery.java index f35cf85..cdabb76 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByStoragePoolIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplatesByStoragePoolIdQuery.java @@ -28,7 +28,7 @@ if (returnValue != null && returnValue.getSucceeded()) { List<VmTemplate> templateList = returnValue.getReturnValue(); VmTemplate blank = DbFacade.getInstance().getVmTemplateDao() - .get(VmTemplateHandler.BlankVmTemplateId); + .get(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); if (!templateList.contains(blank)) { templateList.add(0, blank); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 56f9150..7a44156 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -357,7 +357,7 @@ return false; } - if (!VmTemplateHandler.BlankVmTemplateId.equals(getVm().getVmtGuid()) + if (!VmTemplateHandler.BLANK_VM_TEMPLATE_ID.equals(getVm().getVmtGuid()) && getVmTemplate() != null && getVmTemplate().getStatus() == VmTemplateStatus.Locked) { return failCanDoAction(VdcBllMessages.VM_TEMPLATE_IMAGE_IS_LOCKED); @@ -524,7 +524,7 @@ } private boolean isTemplateExistsOnExportDomain() { - if (VmTemplateHandler.BlankVmTemplateId.equals(getParameters().getVm().getVmtGuid())) { + if (VmTemplateHandler.BLANK_VM_TEMPLATE_ID.equals(getParameters().getVm().getVmtGuid())) { return true; } @@ -547,7 +547,7 @@ protected boolean checkTemplateInStorageDomain() { boolean retValue = getParameters().isImportAsNewEntity() || checkIfDisksExist(imageList); - if (retValue && !VmTemplateHandler.BlankVmTemplateId.equals(getVm().getVmtGuid()) + if (retValue && !VmTemplateHandler.BLANK_VM_TEMPLATE_ID.equals(getVm().getVmtGuid()) && !getParameters().getCopyCollapse()) { List<StorageDomain> domains = Backend.getInstance() .runInternalQuery(VdcQueryType.GetStorageDomainsByVmTemplateId, @@ -786,8 +786,8 @@ int aliasCounter = 0; for (List<DiskImage> diskList : images.values()) { DiskImage disk = getActiveVolumeDisk(diskList); - disk.setParentId(VmTemplateHandler.BlankVmTemplateId); - disk.setImageTemplateId(VmTemplateHandler.BlankVmTemplateId); + disk.setParentId(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); + disk.setImageTemplateId(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); disk.setVmSnapshotId(snapshotId); disk.setActive(true); @@ -964,7 +964,7 @@ getVm().getStaticData().setMinAllocatedMem(computeMinAllocatedMem()); getVm().getStaticData().setQuotaId(getParameters().getQuotaId()); if (getParameters().getCopyCollapse()) { - getVm().setVmtGuid(VmTemplateHandler.BlankVmTemplateId); + getVm().setVmtGuid(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); } getVmStaticDAO().save(getVm().getStaticData()); getCompensationContext().snapshotNewEntity(getVm().getStaticData()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java index 05e2a0f..0b852fd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveVmCommand.java @@ -116,7 +116,7 @@ protected boolean checkTemplateInStorageDomain(List<DiskImage> diskImages) { boolean retValue = checkStorageDomain() && checkStorageDomainStatus(StorageDomainStatus.Active) && checkIfDisksExist(diskImages); - if (retValue && !VmTemplateHandler.BlankVmTemplateId.equals(getVm().getVmtGuid())) { + if (retValue && !VmTemplateHandler.BLANK_VM_TEMPLATE_ID.equals(getVm().getVmtGuid())) { List<DiskImage> imageList = ImagesHandler.filterImageDisks(DbFacade.getInstance().getDiskDao().getAllForVm(getVm().getVmtGuid()), false, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java index 23c4cc8..805ffeb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java @@ -71,7 +71,7 @@ return false; } // check not blank template - if (VmTemplateHandler.BlankVmTemplateId.equals(vmTemplateId)) { + if (VmTemplateHandler.BLANK_VM_TEMPLATE_ID.equals(vmTemplateId)) { return failCanDoAction(VdcBllMessages.VMT_CANNOT_REMOVE_BLANK_TEMPLATE); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java index 66aeb58..3bcb53b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java @@ -49,7 +49,7 @@ @Override protected boolean canDoAction() { - if (VmTemplateHandler.BlankVmTemplateId.equals(getVmTemplate().getId())) { + if (VmTemplateHandler.BLANK_VM_TEMPLATE_ID.equals(getVmTemplate().getId())) { return failCanDoAction(VdcBllMessages.VMT_CANNOT_EDIT_BLANK_TEMPLATE); } boolean returnValue = false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java index 6d2e795..5c4f531 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java @@ -21,8 +21,8 @@ import org.ovirt.engine.core.utils.transaction.TransactionSupport; public class VmTemplateHandler { - protected static final Guid BlankVmTemplateId = Guid.Empty; - protected final static String BLANK_VM_TEMPLATE_NAME = "Blank"; + protected static final Guid BLANK_VM_TEMPLATE_ID = Guid.Empty; + protected static final String BLANK_VM_TEMPLATE_NAME = "Blank"; private static ObjectIdentityChecker mUpdateVmTemplate; /** @@ -116,5 +116,5 @@ } } - private static Log log = LogFactory.getLog(VmTemplateHandler.class); + private static final Log log = LogFactory.getLog(VmTemplateHandler.class); } -- To view, visit http://gerrit.ovirt.org/22142 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb1868d3444ec5ff43681a1c45e95b71ab00171a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
