Arik Hadas has uploaded a new change for review. Change subject: core: fix unsafe cast ......................................................................
core: fix unsafe cast Using a similar change to the one presented in Ic66ba287b6048615b71cd0b2d876e7d75bcc4655, we fix findbugs warnings regarding unsafe cast from Object to Disk in two places. Change-Id: Idca4575500a36a329a23b09b16530053cdbbfd17 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/HibernationVolumesRemover.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemoverFromExportDomain.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemoverOnDataDomain.java 4 files changed, 27 insertions(+), 38 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/21456/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/HibernationVolumesRemover.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/HibernationVolumesRemover.java index 8ad6f56..a6435d0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/HibernationVolumesRemover.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/HibernationVolumesRemover.java @@ -3,11 +3,9 @@ import java.util.List; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; -import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.vdscommands.DeleteImageGroupVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; public class HibernationVolumesRemover extends MemoryImageRemover { @@ -53,15 +51,7 @@ protected boolean isPostZero() { if (cachedPostZero == null) { - // check if one of the disks is marked with wipe_after_delete - cachedPostZero = - DbFacade.getInstance().getDiskDao().getAllForVm(vmId).contains( - new Object() { - @Override - public boolean equals(Object obj) { - return obj != null && ((Disk) obj).isWipeAfterDelete(); - } - }); + cachedPostZero = isDiskWithWipeAfterDeleteExist(getDiskDao().getAllForVm(vmId)); } return cachedPostZero; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java index 46ce07f..3750a91 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java @@ -1,5 +1,6 @@ package org.ovirt.engine.core.bll.memory; +import java.util.Collection; import java.util.List; import java.util.Set; @@ -7,6 +8,7 @@ import org.ovirt.engine.core.bll.Backend; import org.ovirt.engine.core.bll.VmCommand; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; +import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.errors.VDSError; import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.errors.VdcBllErrors; @@ -14,6 +16,8 @@ import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; +import org.ovirt.engine.core.dao.DiskDao; import org.ovirt.engine.core.utils.GuidUtils; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; @@ -147,4 +151,20 @@ vdsRetValue.setVdsError(new VDSError(VdcBllErrors.ImageDoesNotExistInDomainError, "")); return vdsRetValue; } + + /** + * @return true IFF one of the given disks is marked with wipe_after_delete + */ + protected static boolean isDiskWithWipeAfterDeleteExist(Collection<Disk> disks) { + for (Disk disk : disks) { + if (disk.isWipeAfterDelete()) { + return true; + } + } + return false; + } + + protected DiskDao getDiskDao() { + return DbFacade.getInstance().getDiskDao(); + } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemoverFromExportDomain.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemoverFromExportDomain.java index d4b1599..9a60621 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemoverFromExportDomain.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemoverFromExportDomain.java @@ -3,7 +3,6 @@ import java.util.List; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; -import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.vdscommands.DeleteImageGroupVDSCommandParameters; import org.ovirt.engine.core.compat.Guid; @@ -55,20 +54,8 @@ */ protected boolean isPostZero() { if (cachedPostZero == null) { - cachedPostZero = isVmContainsWipeAfterDeleteDisk(); + cachedPostZero = isDiskWithWipeAfterDeleteExist(vm.getDiskMap().values()); } return cachedPostZero; - } - - /** - * @return true IFF one of the disks is marked with wipe_after_delete - */ - private boolean isVmContainsWipeAfterDeleteDisk() { - for (Disk disk : vm.getDiskMap().values()) { - if (disk.isWipeAfterDelete()) { - return true; - } - } - return false; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemoverOnDataDomain.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemoverOnDataDomain.java index f1af60d..ac48c3e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemoverOnDataDomain.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemoverOnDataDomain.java @@ -4,11 +4,11 @@ import java.util.Set; import org.ovirt.engine.core.bll.tasks.TaskHandlerCommand; -import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.vdscommands.DeleteImageGroupVDSCommandParameters; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; +import org.ovirt.engine.core.dao.SnapshotDao; public class MemoryImageRemoverOnDataDomain extends MemoryImageRemover { @@ -38,15 +38,7 @@ protected boolean isPostZero() { if (cachedPostZero == null) { - // check if one of the disks is marked with wipe_after_delete - cachedPostZero = - getDbFacade().getDiskDao().getAllForVm(vm.getId()).contains( - new Object() { - @Override - public boolean equals(Object obj) { - return obj != null && ((Disk) obj).isWipeAfterDelete(); - } - }); + cachedPostZero = isDiskWithWipeAfterDeleteExist(getDiskDao().getAllForVm(vm.getId())); } return cachedPostZero; } @@ -54,10 +46,10 @@ @Override protected boolean isMemoryStateRemovable(String memoryVolume) { return !memoryVolume.isEmpty() && - getDbFacade().getSnapshotDao().getNumOfSnapshotsByMemory(memoryVolume) == 0; + getSnapshotDao().getNumOfSnapshotsByMemory(memoryVolume) == 0; } - protected DbFacade getDbFacade() { - return DbFacade.getInstance(); + protected SnapshotDao getSnapshotDao() { + return DbFacade.getInstance().getSnapshotDao(); } } -- To view, visit http://gerrit.ovirt.org/21456 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idca4575500a36a329a23b09b16530053cdbbfd17 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
