Arik Hadas has uploaded a new change for review. Change subject: core: cleanup RemoveVmTemplateCommand#canDoAction ......................................................................
core: cleanup RemoveVmTemplateCommand#canDoAction 1. Replace consecutive lines of call to addCanDoActionMessage and then 'return false' with 'return failCanDoAction(..)' 2. Replace calls to DbFacade.getInstance() with call to getDbFacade() 3. Replace if-else statement with ternary-if Change-Id: If669283fc057cff4eee46dfb15e004672d05fac1 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java 1 file changed, 7 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/77/15877/1 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 a29d860..f4a3533 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 @@ -70,20 +70,17 @@ } // check not blank template if (VmTemplateHandler.BlankVmTemplateId.equals(vmTemplateId)) { - addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_REMOVE_BLANK_TEMPLATE); - return false; + return failCanDoAction(VdcBllMessages.VMT_CANNOT_REMOVE_BLANK_TEMPLATE); } // check storage pool valid if (getStoragePool() == null || getStoragePool().getstatus() != StoragePoolStatus.Up) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_IMAGE_REPOSITORY_NOT_FOUND); - return false; + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_IMAGE_REPOSITORY_NOT_FOUND); } // check if delete protected if (template.isDeleteProtected()) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DELETE_PROTECTION_ENABLED); - return false; + return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_DELETE_PROTECTION_ENABLED); } fetchImageTemplates(); @@ -100,12 +97,8 @@ List<String> problematicDomains = new ArrayList<String>(); for (Guid domainId : storageDomainsList) { if (!allDomainsList.contains(domainId)) { - StorageDomainStatic domain = DbFacade.getInstance().getStorageDomainStaticDao().get(domainId); - if (domain == null) { - problematicDomains.add(domainId.toString()); - } else { - problematicDomains.add(domain.getStorageName()); - } + StorageDomainStatic domain = getDbFacade().getStorageDomainStaticDao().get(domainId); + problematicDomains.add(domain == null ? domainId.toString() : domain.getStorageName()); } } if (!problematicDomains.isEmpty()) { @@ -132,14 +125,14 @@ } // check no vms from this template on selected domains - List<VM> vms = DbFacade.getInstance().getVmDao().getAllWithTemplate(vmTemplateId); + List<VM> vms = getDbFacade().getVmDao().getAllWithTemplate(vmTemplateId); List<String> problematicVmNames = new ArrayList<String>(); for (VM vm : vms) { if (getParameters().isRemoveTemplateFromDb()) { problematicVmNames.add(vm.getName()); } else { List<DiskImage> vmDIsks = - ImagesHandler.filterImageDisks(DbFacade.getInstance().getDiskDao().getAllForVm(vm.getId()), + ImagesHandler.filterImageDisks(getDbFacade().getDiskDao().getAllForVm(vm.getId()), false, false); Set<Guid> domainsIds = getStorageDoaminsByDisks(vmDIsks, false); -- To view, visit http://gerrit.ovirt.org/15877 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If669283fc057cff4eee46dfb15e004672d05fac1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
