Vered Volansky has uploaded a new change for review. Change subject: core: Use Collections instead of Lists ......................................................................
core: Use Collections instead of Lists In storage allocation-related methods, use Collections instead if lists when possible. Further validations will be on top of this, specifically storage allocation validation in ImportVmTemplateCommand, hence the bz url bellow. Change-Id: Ic89752086a68ca2f87bc58cefc33d5373c7f8eef Related-To: https://bugzilla.redhat.com/1136721 Signed-off-by: Vered Volansky <vvola...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/MultipleStorageDomainsValidator.java 2 files changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/33043/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java index 4af12a9..b5a7a6d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java @@ -363,23 +363,23 @@ return dummies; } - protected boolean validateSpaceRequirements(List<DiskImage> disksList) { - MultipleStorageDomainsValidator sdValidator = createMultipleStorageDomainsValidator(disksList); + protected boolean validateSpaceRequirements(Collection<DiskImage> diskImages) { + MultipleStorageDomainsValidator sdValidator = createMultipleStorageDomainsValidator(diskImages); if (!validate(sdValidator.allDomainsExistAndActive()) || !validate(sdValidator.allDomainsWithinThresholds())) { return false; } if (getParameters().getCopyCollapse()) { - return validate(sdValidator.allDomainsHaveSpaceForClonedDisks(disksList)); + return validate(sdValidator.allDomainsHaveSpaceForClonedDisks(diskImages)); } - return validate(sdValidator.allDomainsHaveSpaceForDisksWithSnapshots(disksList)); + return validate(sdValidator.allDomainsHaveSpaceForDisksWithSnapshots(diskImages)); } - protected MultipleStorageDomainsValidator createMultipleStorageDomainsValidator( List<DiskImage> disksList) { + protected MultipleStorageDomainsValidator createMultipleStorageDomainsValidator(Collection<DiskImage> diskImages) { return new MultipleStorageDomainsValidator(getStoragePoolId(), - ImagesHandler.getAllStorageIdsForImageIds(disksList)); + ImagesHandler.getAllStorageIdsForImageIds(diskImages)); } protected void ensureDomainMap(Collection<DiskImage> images, Guid defaultDomainId) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/MultipleStorageDomainsValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/MultipleStorageDomainsValidator.java index cb72ce2..d00cc88 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/MultipleStorageDomainsValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/MultipleStorageDomainsValidator.java @@ -42,9 +42,9 @@ } } - private Map<Guid, List<DiskImage>> getDomainsDisksMap(List<DiskImage> disksList) { + private Map<Guid, List<DiskImage>> getDomainsDisksMap(Collection<DiskImage> diskImages) { Map<Guid, List<DiskImage>> domainsDisksMap = new HashMap<>(); - for (DiskImage disk : disksList) { + for (DiskImage disk : diskImages) { List<Guid> domainIds = disk.getStorageIds(); for (Guid domainId : domainIds) { MultiValueMapUtils.addToMap(domainId, disk, domainsDisksMap); @@ -100,8 +100,8 @@ * Validates that all the domains have enough space for the request * @return {@link ValidationResult#VALID} if all the domains have enough free space, or a {@link ValidationResult} with the first low-on-space domain encountered. */ - public ValidationResult allDomainsHaveSpaceForClonedDisks(List<DiskImage> disksList) { - final Map<Guid, List<DiskImage>> disksMap = getDomainsDisksMap(disksList); + public ValidationResult allDomainsHaveSpaceForClonedDisks(Collection<DiskImage> diskImages) { + final Map<Guid, List<DiskImage>> disksMap = getDomainsDisksMap(diskImages); return validOrFirstFailure(new ValidatorPredicate() { @Override @@ -117,9 +117,9 @@ * Validates that all the domains have enough space for the request * @return {@link ValidationResult#VALID} if all the domains have enough free space, or a {@link ValidationResult} with the first low-on-space domain encountered. */ - public ValidationResult allDomainsHaveSpaceForAllDisks(List<DiskImage> newDisksList, List<DiskImage> clonedDisksList) { - final Map<Guid, List<DiskImage>> domainsNewDisksMap = getDomainsDisksMap(newDisksList); - final Map<Guid, List<DiskImage>> domainsClonedDisksMap = getDomainsDisksMap(clonedDisksList); + public ValidationResult allDomainsHaveSpaceForAllDisks(List<DiskImage> newDiskImages, List<DiskImage> clonedDiskImages) { + final Map<Guid, List<DiskImage>> domainsNewDisksMap = getDomainsDisksMap(newDiskImages); + final Map<Guid, List<DiskImage>> domainsClonedDisksMap = getDomainsDisksMap(clonedDiskImages); return validOrFirstFailure(new ValidatorPredicate() { @Override @@ -136,15 +136,15 @@ * Validates that all the domains have enough space for the request * @return {@link ValidationResult#VALID} if all the domains have enough free space, or a {@link ValidationResult} with the first low-on-space domain encountered. */ - public ValidationResult allDomainsHaveSpaceForDisksWithSnapshots(List<DiskImage> disksList) { - final Map<Guid, List<DiskImage>> disksMap = getDomainsDisksMap(disksList); + public ValidationResult allDomainsHaveSpaceForDisksWithSnapshots(Collection<DiskImage> diskImages) { + final Map<Guid, List<DiskImage>> disksMap = getDomainsDisksMap(diskImages); return validOrFirstFailure(new ValidatorPredicate() { @Override public ValidationResult evaluate(Map.Entry<Guid, StorageDomainValidator> entry) { Guid sdId = entry.getKey(); - List<DiskImage> disksList = disksMap.get(sdId); - return getStorageDomainValidator(entry).hasSpaceForDisksWithSnapshots(disksList); + List<DiskImage> diskImages = disksMap.get(sdId); + return getStorageDomainValidator(entry).hasSpaceForDisksWithSnapshots(diskImages); } }); } -- To view, visit http://gerrit.ovirt.org/33043 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic89752086a68ca2f87bc58cefc33d5373c7f8eef Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvola...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
