Maor Lipchuk has uploaded a new change for review. Change subject: core: Extract method to be with meaningful name. ......................................................................
core: Extract method to be with meaningful name. Use meaningful method name to increase readability of the code in importVmCommand. Change-Id: I6ef0ba9352c089221502ce242ffcb477cae06353 Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/17162/1 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 109a89c..c3f8508 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 @@ -292,7 +292,7 @@ for (Map.Entry<Guid, List<DiskImage>> entry : images.entrySet()) { Guid id = entry.getKey(); List<DiskImage> diskList = entry.getValue(); - getVm().getDiskMap().put(id, diskList.get(diskList.size() - 1)); + getVm().getDiskMap().put(id, getActiveVolumeDisk(diskList)); } } @@ -770,8 +770,7 @@ Guid snapshotId = Guid.newGuid(); int aliasCounter = 0; for (List<DiskImage> diskList : images.values()) { - DiskImage disk = diskList.get(diskList.size() - 1); - + DiskImage disk = getActiveVolumeDisk(diskList); disk.setParentId(VmTemplateHandler.BlankVmTemplateId); disk.setImageTemplateId(VmTemplateHandler.BlankVmTemplateId); disk.setVmSnapshotId(snapshotId); @@ -818,7 +817,7 @@ int aliasCounter = 0; for (List<DiskImage> diskList : images.values()) { - DiskImage disk = diskList.get(diskList.size() - 1); + DiskImage disk = getActiveVolumeDisk(diskList); diskGuidList.add(disk.getId()); imageGuidList.add(disk.getImageId()); snapshotId = disk.getVmSnapshotId(); @@ -833,6 +832,10 @@ } } + private static DiskImage getActiveVolumeDisk(List<DiskImage> diskList) { + return diskList.get(diskList.size() - 1); + } + private void setDiskStorageDomainInfo(DiskImage disk) { ArrayList<Guid> storageDomain = new ArrayList<Guid>(); storageDomain.add(imageToDestinationDomainMap.get(disk.getId())); -- To view, visit http://gerrit.ovirt.org/17162 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ef0ba9352c089221502ce242ffcb477cae06353 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
