Alissa Bonas has uploaded a new change for review. Change subject: core: rename methods to start with lowercase ......................................................................
core: rename methods to start with lowercase Findbugs cleanup. Renamed methods to start with lowercase and remove unused methods. Change-Id: Id3d77789be17e90f63c734dba3365c0178326029 Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddBookmarkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVMClusterCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveBookmarkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java 13 files changed, 30 insertions(+), 50 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/18546/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddBookmarkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddBookmarkCommand.java index c67ee21..277bc74 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddBookmarkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddBookmarkCommand.java @@ -14,7 +14,7 @@ protected boolean canDoAction() { if (DbFacade.getInstance().getBookmarkDao() .getByName(getBookmark().getbookmark_name()) != null) { - AddErrorMessages( + addErrorMessages( VdcBllMessages.VAR__ACTION__ADD, VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED); return false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java index 81eeb84..5ecefbb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java @@ -55,7 +55,6 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.DiskLunMapDao; import org.ovirt.engine.core.dao.SnapshotDao; -import org.ovirt.engine.core.dao.StorageDomainStaticDAO; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; @@ -249,13 +248,6 @@ } return false; - } - - /** - * @return The StorageDomainStaticDAO - */ - protected StorageDomainStaticDAO getStorageDomainStaticDao() { - return DbFacade.getInstance().getStorageDomainStaticDao(); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java index 5808d01..78b6233 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java @@ -281,8 +281,8 @@ return true; } - public static boolean CheckCpuSockets(int num_of_sockets, int cpu_per_socket, String compatibility_version, - List<String> CanDoActionMessages) { + public static boolean checkCpuSockets(int num_of_sockets, int cpu_per_socket, String compatibility_version, + List<String> CanDoActionMessages) { boolean retValue = true; if (retValue && (num_of_sockets * cpu_per_socket) > Config.<Integer> GetValue(ConfigValues.MaxNumOfVmCpus, @@ -412,7 +412,7 @@ } protected boolean checkCpuSockets() { - return AddVmCommand.CheckCpuSockets(getParameters().getVmStaticData().getNumOfSockets(), + return AddVmCommand.checkCpuSockets(getParameters().getVmStaticData().getNumOfSockets(), getParameters().getVmStaticData().getCpuPerSocket(), getVdsGroup().getcompatibility_version() .toString(), getReturnValue().getCanDoActionMessages()); } @@ -608,7 +608,7 @@ getParameters().isConsoleEnabled()); } - protected static boolean IsLegalClusterId(Guid clusterId, List<String> reasons) { + protected static boolean isLegalClusterId(Guid clusterId, List<String> reasons) { // check given cluster id VDSGroup vdsGroup = DbFacade.getInstance().getVdsGroupDao().get(clusterId); boolean legalClusterId = (vdsGroup != null); @@ -624,7 +624,7 @@ if (vmStaticData != null) { - returnValue = IsLegalClusterId(vmStaticData.getVdsGroupId(), reasons); + returnValue = isLegalClusterId(vmStaticData.getVdsGroupId(), reasons); if (!validatePinningAndMigration(reasons, vmStaticData, getParameters().getVm().getCpuPinning())) { returnValue = false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java index 85dcac8..33eb66e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java @@ -91,10 +91,10 @@ disk.setBoot(false); } } - return (!disks.isEmpty()) ? ConcreteAddVmImages(((DiskImage)disks.get(0)).getImageId()) : true; + return (!disks.isEmpty()) ? concreteAddVmImages(((DiskImage) disks.get(0)).getImageId()) : true; } - protected boolean ConcreteAddVmImages(Guid itGuid) { + protected boolean concreteAddVmImages(Guid itGuid) { boolean ret = true; if (getVmDisks().size() > 0) { @@ -112,7 +112,7 @@ tempVar, ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); if (!tmpRetValue.getSucceeded()) { - log.error("AddVmFromScratchCommand::ConcreteAddVmImages: AddImageFromScratch Command failed."); + log.error("concreteAddVmImages: AddImageFromScratch Command failed."); ret = false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java index dc7bc24..0c2504e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java @@ -197,7 +197,7 @@ @Override public Void runInTransaction() { - AddVmTemplateToDb(); + addVmTemplateToDb(); getCompensationContext().stateChanged(); return null; } @@ -207,7 +207,7 @@ @Override public Void runInTransaction() { addPermission(); - AddVmTemplateImages(srcDeviceIdToTargetDeviceIdMapping); + addVmTemplateImages(srcDeviceIdToTargetDeviceIdMapping); addVmInterfaces(srcDeviceIdToTargetDeviceIdMapping); if (isVmInDb) { VmDeviceUtils.copyVmDevices(getVmId(), @@ -283,9 +283,9 @@ return false; } - return imagesRelatedChecks() && AddVmCommand.CheckCpuSockets(getParameters().getMasterVm().getNumOfSockets(), + return imagesRelatedChecks() && AddVmCommand.checkCpuSockets(getParameters().getMasterVm().getNumOfSockets(), getParameters().getMasterVm().getCpuPerSocket(), getVdsGroup() - .getcompatibility_version().toString(), getReturnValue().getCanDoActionMessages()); + .getcompatibility_version().toString(), getReturnValue().getCanDoActionMessages()); } private boolean imagesRelatedChecks() { @@ -379,7 +379,7 @@ return destImageDomains; } - protected void AddVmTemplateToDb() { + protected void addVmTemplateToDb() { // TODO: add timezone handling setVmTemplate( new VmTemplate( @@ -443,7 +443,7 @@ } } - protected void AddVmTemplateImages(Map<Guid, Guid> srcDeviceIdToTargetDeviceIdMapping) { + protected void addVmTemplateImages(Map<Guid, Guid> srcDeviceIdToTargetDeviceIdMapping) { Guid vmSnapshotId = Guid.newGuid(); for (DiskImage diskImage : mImages) { // The return value of this action is the 'copyImage' task GUID: diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java index 2aa3670..624dcdc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java @@ -241,13 +241,6 @@ } } - protected static void CompleteAdvancedDiskData(DiskImage from, DiskImage to) { - to.setBoot(from.isBoot()); - to.setDiskInterface(from.getDiskInterface()); - to.setPropagateErrors(from.getPropagateErrors()); - to.setWipeAfterDelete(from.isWipeAfterDelete()); - } - protected void addDiskImageToDb(DiskImage image, CompensationContext compensationContext) { image.setActive(true); getImageDao().save(image.getImage()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java index 6bd684c..8b40c3d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BookmarkCommandBase.java @@ -44,13 +44,13 @@ return getParameters().getBookmarkId(); } - protected void AddErrorMessages(VdcBllMessages messageActionTypeParameter, VdcBllMessages messageReason) { + protected void addErrorMessages(VdcBllMessages messageActionTypeParameter, VdcBllMessages messageReason) { addCanDoActionMessage(VdcBllMessages.VAR__TYPE__BOOKMARK); addCanDoActionMessage(messageActionTypeParameter); addCanDoActionMessage(messageReason); } - protected void AddInvalidIdErrorMessages(VdcBllMessages messageActionTypeParameter) { - AddErrorMessages(messageActionTypeParameter, VdcBllMessages.ACTION_TYPE_FAILED_BOOKMARK_INVALID_ID); + protected void addInvalidIdErrorMessages(VdcBllMessages messageActionTypeParameter) { + addErrorMessages(messageActionTypeParameter, VdcBllMessages.ACTION_TYPE_FAILED_BOOKMARK_INVALID_ID); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVMClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVMClusterCommand.java index 0836618..e94088c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVMClusterCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVMClusterCommand.java @@ -69,11 +69,11 @@ } // Check if VM static parameters are compatible for new cluster. - boolean isCpuSocketsValid = AddVmCommand.CheckCpuSockets( - vm.getStaticData().getNumOfSockets(), - vm.getStaticData().getCpuPerSocket(), - clusterCompatibilityVersion.getValue(), - getReturnValue().getCanDoActionMessages()); + boolean isCpuSocketsValid = AddVmCommand.checkCpuSockets( + vm.getStaticData().getNumOfSockets(), + vm.getStaticData().getCpuPerSocket(), + clusterCompatibilityVersion.getValue(), + getReturnValue().getCanDoActionMessages()); if (!isCpuSocketsValid) { return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveBookmarkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveBookmarkCommand.java index bf35f79..2b56a35 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveBookmarkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveBookmarkCommand.java @@ -13,7 +13,7 @@ @Override protected boolean canDoAction() { if (getBookmark() == null) { - AddInvalidIdErrorMessages(VdcBllMessages.VAR__ACTION__UPDATE); + addInvalidIdErrorMessages(VdcBllMessages.VAR__ACTION__UPDATE); return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java index 8bec850..ccb3d3d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateBookmarkCommand.java @@ -19,14 +19,14 @@ Bookmark updated = getBookmark(); if (updated == null) { - AddInvalidIdErrorMessages(VdcBllMessages.VAR__ACTION__UPDATE); + addInvalidIdErrorMessages(VdcBllMessages.VAR__ACTION__UPDATE); } else { Bookmark current = DbFacade.getInstance().getBookmarkDao() .getByName(updated.getbookmark_name()); if (!(current == null || current.getbookmark_id().equals( updated.getbookmark_id()))) { - AddErrorMessages( + addErrorMessages( VdcBllMessages.VAR__ACTION__UPDATE, VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED); } else { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java index 013b72a..e85b8c8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java @@ -307,9 +307,9 @@ return false; } - if (!AddVmCommand.CheckCpuSockets(vmFromParams.getNumOfSockets(), + if (!AddVmCommand.checkCpuSockets(vmFromParams.getNumOfSockets(), vmFromParams.getCpuPerSocket(), getVdsGroup().getcompatibility_version() - .toString(), getReturnValue().getCanDoActionMessages())) { + .toString(), getReturnValue().getCanDoActionMessages())) { return false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java index 2deccbd..349ebb0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java @@ -91,9 +91,9 @@ } if (returnValue) { - returnValue = AddVmCommand.CheckCpuSockets(getParameters().getVmTemplateData().getNumOfSockets(), + returnValue = AddVmCommand.checkCpuSockets(getParameters().getVmTemplateData().getNumOfSockets(), getParameters().getVmTemplateData().getCpuPerSocket(), getVdsGroup().getcompatibility_version() - .toString(), getReturnValue().getCanDoActionMessages()); + .toString(), getReturnValue().getCanDoActionMessages()); } if (returnValue && getParameters().getVmTemplateData().getSingleQxlPci() && diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java index 0c6fdd1..49bc783 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java @@ -49,7 +49,6 @@ import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dao.DiskLunMapDao; import org.ovirt.engine.core.dao.StorageDomainDAO; -import org.ovirt.engine.core.dao.StorageDomainStaticDAO; import org.ovirt.engine.core.dao.StoragePoolDAO; import org.ovirt.engine.core.dao.StoragePoolIsoMapDAO; import org.ovirt.engine.core.dao.VmDAO; @@ -75,9 +74,6 @@ @Mock private StorageDomainDAO storageDomainDAO; - - @Mock - private StorageDomainStaticDAO storageDomainStaticDAO; @Mock private StoragePoolIsoMapDAO storagePoolIsoMapDAO; @@ -330,7 +326,6 @@ doReturn(true).when(command).acquireLockInternal(); doReturn(storageDomainDAO).when(command).getStorageDomainDAO(); doReturn(storagePoolIsoMapDAO).when(command).getStoragePoolIsoMapDao(); - doReturn(storageDomainStaticDAO).when(command).getStorageDomainStaticDao(); doReturn(storagePoolDAO).when(command).getStoragePoolDAO(); doReturn(vmNicDAO).when(command).getVmNicDao(); doReturn(diskLunMapDAO).when(command).getDiskLunMapDao(); -- To view, visit http://gerrit.ovirt.org/18546 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3d77789be17e90f63c734dba3365c0178326029 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
