Arik Hadas has uploaded a new change for review. Change subject: core: organize RemoveDiskCommand#getSharedLocks() ......................................................................
core: organize RemoveDiskCommand#getSharedLocks() Extract some code to seperate methods in order to make the method more concise and readable Change-Id: If116452d24f838a9459ee97c88e7e49d13d0de3e Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java 1 file changed, 26 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/15878/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java index c023f09..48cbeed 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java @@ -357,24 +357,36 @@ return null; } - Map<String, Pair<String, String>> result = null; - if (getDisk().getVmEntityType() == VmEntityType.VM) { - List<VM> listVms = getVmsForDiskId(); - if (!listVms.isEmpty()) { - result = new HashMap<String, Pair<String, String>>(); - for (VM vm : listVms) { - result.put(vm.getId().toString(), - LockMessagesMatchUtil.makeLockingPair(LockingGroup.VM, getDiskIsBeingRemovedLockMessage())); - } - } - } else if (getDisk().getVmEntityType() == VmEntityType.TEMPLATE) { - setVmTemplateIdParameter(); - result = Collections.singletonMap(getVmTemplateId().toString(), - LockMessagesMatchUtil.makeLockingPair(LockingGroup.TEMPLATE, getDiskIsBeingRemovedLockMessage())); + switch (getDisk().getVmEntityType()) { + case VM: + return createSharedLocksForVmDisk(); + case TEMPLATE: + return createSharedLocksForTemplateDisk(); + default: + return null; + } + } + + private Map<String, Pair<String, String>> createSharedLocksForVmDisk() { + List<VM> listVms = getVmsForDiskId(); + if (listVms.isEmpty()) { + return null; + } + + Map<String, Pair<String, String>> result = new HashMap<String, Pair<String, String>>(); + for (VM vm : listVms) { + result.put(vm.getId().toString(), + LockMessagesMatchUtil.makeLockingPair(LockingGroup.VM, getDiskIsBeingRemovedLockMessage())); } return result; } + private Map<String, Pair<String, String>> createSharedLocksForTemplateDisk() { + setVmTemplateIdParameter(); + return Collections.singletonMap(getVmTemplateId().toString(), + LockMessagesMatchUtil.makeLockingPair(LockingGroup.TEMPLATE, getDiskIsBeingRemovedLockMessage())); + } + protected Disk getDisk() { if (disk == null) { disk = getDiskDao().get((Guid) getParameters().getEntityId()); -- To view, visit http://gerrit.ovirt.org/15878 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If116452d24f838a9459ee97c88e7e49d13d0de3e 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
