Allon Mureinik has uploaded a new change for review. Change subject: core: UpdateVmDiskCommand diamond generics ......................................................................
core: UpdateVmDiskCommand diamond generics Use Java 7 style diamond generics for better readability. Change-Id: I0a14bbece3f0b5487e06b5946493cbc819ea5b0c Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/25842/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java index 8758597..eb313db 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java @@ -52,7 +52,7 @@ implements QuotaStorageDependent { private List<PermissionSubject> listPermissionSubjects; - private Map<Guid, List<Disk>> otherVmDisks = new HashMap<Guid, List<Disk>>(); + private Map<Guid, List<Disk>> otherVmDisks = new HashMap<>(); private List<VM> vmsDiskSnapshotPluggedTo = new LinkedList<>(); private List<VM> vmsDiskPluggedTo = new LinkedList<>(); private List<VM> vmsDiskOrSnapshotPluggedTo = new LinkedList<>(); @@ -80,7 +80,7 @@ @Override protected Map<String, Pair<String, String>> getSharedLocks() { - Map<String, Pair<String, String>> sharedLock = new HashMap<String, Pair<String, String>>(); + Map<String, Pair<String, String>> sharedLock = new HashMap<>(); for (VM vm : vmsDiskOrSnapshotPluggedTo) { sharedLock.put(vm.getId().toString(), @@ -91,7 +91,7 @@ @Override protected Map<String, Pair<String, String>> getExclusiveLocks() { - Map<String, Pair<String, String>> exclusiveLock = new HashMap<String, Pair<String, String>>(); + Map<String, Pair<String, String>> exclusiveLock = new HashMap<>(); if (getNewDisk().isBoot()) { for (VM vm : vmsDiskPluggedTo) { @@ -172,7 +172,7 @@ protected boolean validatePciAndIdeLimit() { for (VM vm : vmsDiskPluggedTo) { List<VmNic> allVmInterfaces = getVmNicDao().getAllForVm(vm.getId()); - List<Disk> allVmDisks = new LinkedList<Disk>(getOtherVmDisks(vm.getId())); + List<Disk> allVmDisks = new LinkedList<>(getOtherVmDisks(vm.getId())); allVmDisks.add(getNewDisk()); if (!checkPciAndIdeLimit(vm.getOs(), @@ -310,7 +310,7 @@ @Override public List<PermissionSubject> getPermissionCheckSubjects() { if (listPermissionSubjects == null) { - listPermissionSubjects = new ArrayList<PermissionSubject>(); + listPermissionSubjects = new ArrayList<>(); Guid diskId = (getOldDisk() == null) ? null : getOldDisk().getId(); listPermissionSubjects.add(new PermissionSubject(diskId, @@ -432,7 +432,7 @@ } private ValidationResult noVmsContainBootableDisks(List<VM> vms) { - List<String> vmsWithBoot = new ArrayList<String>(vms.size()); + List<String> vmsWithBoot = new ArrayList<>(vms.size()); for (VM vm : vms) { Disk bootDisk = getDiskDao().getVmBootActiveDisk(vm.getId()); @@ -495,7 +495,7 @@ @Override public List<QuotaConsumptionParameter> getQuotaStorageConsumptionParameters() { - List<QuotaConsumptionParameter> list = new ArrayList<QuotaConsumptionParameter>(); + List<QuotaConsumptionParameter> list = new ArrayList<>(); if (isQuotaValidationNeeded()) { DiskImage oldDiskImage = (DiskImage) getOldDisk(); -- To view, visit http://gerrit.ovirt.org/25842 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a14bbece3f0b5487e06b5946493cbc819ea5b0c 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
