Sharad Mishra has uploaded a new change for review. Change subject: core: Refactor getDiskDAO to getDiskDao ......................................................................
core: Refactor getDiskDAO to getDiskDao To fix FindBugs issue - http://jenkins.ovirt.org/job/ovirt_engine_find_bugs/2517/findbugsResult/NORMAL/file.220669805/ Change-Id: Icb04449ed3837d6d7b8deef4edd63c93c4e55848 Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java 5 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/8100/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index 1f7b6ca..c74f937 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -123,7 +123,7 @@ refreshBootParameters(runVmParameters); // set vm disks - VmHandler.updateDisksForVm(getVm(), getDiskDAO().getAllForVm(getVm().getId())); + VmHandler.updateDisksForVm(getVm(), getDiskDao().getAllForVm(getVm().getId())); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java index 98fc398..ace761a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java @@ -296,7 +296,7 @@ // get all vm disks in order to check post zero - if one of the // disks is marked with wipe_after_delete boolean postZero = - LinqUtils.filter(getDiskDAO().getAllForVm(getVm().getId()), + LinqUtils.filter(getDiskDao().getAllForVm(getVm().getId()), new Predicate<Disk>() { @Override public boolean eval(Disk disk) { @@ -489,7 +489,7 @@ return getDbFacade().getTagDAO(); } - protected DiskDao getDiskDAO() { + protected DiskDao getDiskDao() { return getDbFacade().getDiskDao(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java index 39279cb..d39a4e9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java @@ -242,7 +242,7 @@ * @return */ protected List<Disk> getPluggedDisks(VM vm) { - List<Disk> diskImages = getDiskDAO().getAllForVm(vm.getId()); + List<Disk> diskImages = getDiskDao().getAllForVm(vm.getId()); List<VmDevice> diskVmDevices = getVmDeviceDAO().getVmDeviceByVmIdTypeAndDevice(vm.getId(), VmDeviceType.DISK.getName(), VmDeviceType.DISK.getName()); @@ -351,7 +351,7 @@ return Backend.getInstance(); } - protected DiskDao getDiskDAO() { + protected DiskDao getDiskDao() { return DbFacade.getInstance().getDiskDao(); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java index 22e626b..bf045b5 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RestoreAllSnapshotCommandTest.java @@ -182,7 +182,7 @@ DiskImage diskImage = new DiskImage(); diskImage.setstorage_ids(new ArrayList<Guid>(Arrays.asList(Guid.NewGuid()))); diskImageList.add(diskImage); - doReturn(diskDao).when(spyCommand).getDiskDAO(); + doReturn(diskDao).when(spyCommand).getDiskDao(); when(diskDao.getAllForVm(vmId)).thenReturn(diskImageList); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java index 8858d48..4571227 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java @@ -463,8 +463,8 @@ protected void initDAOMocks(final List<Disk> disks, final List<VmDevice> vmDevices) { final DiskDao diskDao = mock(DiskDao.class); when(diskDao.getAllForVm(Guid.Empty)).thenReturn(disks); - doReturn(diskDao).when(command).getDiskDAO(); - doReturn(diskDao).when(vmRunHandler).getDiskDAO(); + doReturn(diskDao).when(command).getDiskDao(); + doReturn(diskDao).when(vmRunHandler).getDiskDao(); final StorageDomainDAO storageDomainDAO = mock(StorageDomainDAO.class); when(storageDomainDAO.getAllForStoragePool(Guid.Empty)) -- To view, visit http://gerrit.ovirt.org/8100 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb04449ed3837d6d7b8deef4edd63c93c4e55848 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sharad Mishra <snmis...@linux.vnet.ibm.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
