Alissa Bonas has uploaded a new change for review. Change subject: core: fix mispellings in several classes ......................................................................
core: fix mispellings in several classes Fix mispellings in several classes in comments, log statements, variable names, private method names. Change-Id: If3fcb109a9a4a01799205e0872d3e0289a9e0a17 Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListByStoragePoolIdQuery.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/ClearNonResponsiveVdsVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachUserFromVmFromPoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java 13 files changed, 33 insertions(+), 33 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/11689/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListByStoragePoolIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListByStoragePoolIdQuery.java index de83b42..10de1e1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListByStoragePoolIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractGetAllImagesListByStoragePoolIdQuery.java @@ -19,7 +19,7 @@ @Override protected Guid getStorageDomainId() { - if (doesUserHavePemissionsOnStoragePool()) { + if (doesUserHavePermissionsOnStoragePool()) { return getDbFacade().getStorageDomainDao().getIsoStorageDomainIdForPool(getStoragePoolId()); } return null; @@ -37,7 +37,7 @@ * Checks if the user have query permissions on the storage <b>pool</b>. * @return <code>true</code> if the user has permissions on the storage pool, <code>false</code> if not. */ - private boolean doesUserHavePemissionsOnStoragePool() { + private boolean doesUserHavePermissionsOnStoragePool() { storage_pool pool = getDbFacade().getStoragePoolDao().get(getStoragePoolId(), getUserID(), 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 f887439..f865422 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 @@ -195,7 +195,7 @@ return new SnapshotsValidator(); } - /** Checks if the iamge's configuration is legal */ + /** Checks if the image's configuration is legal */ protected boolean checkImageConfiguration() { return ImagesHandler.CheckImageConfiguration( getStorageDomain().getStorageStaticData(), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java index 83a5da6..50fd69f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java @@ -56,7 +56,7 @@ .getResourceManager() .RunVdsCommand(VDSCommandType.SetVmStatus, new SetVmStatusVDSCommandParameters(vm.getId(), VMStatus.Down)); - // Write that this VM was shut down by host rebbot or manual fence + // Write that this VM was shut down by host reboot or manual fence if (returnValue != null && returnValue.getSucceeded()) { LogSettingVmToDown(getVds().getId(), vm.getId()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java index 83cb3c3..26fc80f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java @@ -44,9 +44,9 @@ @Override protected void checkImageValidity() { - // dont do nothing, overriding base to avoid this check + // don't do nothing, overriding base to avoid this check // fails when creating vm from template on domain that the template - // doesnt exist on + // doesn't exist on } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java index 9032006..69c9e75 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java @@ -91,7 +91,7 @@ * list of changed users. */ private void updateDBUserFromADUser(DbUser dbUser, LdapUser ldapUser, HashSet<Guid> updatedUsers) { - boolean succeded = false; + boolean succeeded = false; if ((ldapUser == null) || (ldapUser.getUserId().equals(Guid.Empty)) || (!ldapUser.getUserId().equals(dbUser.getuser_id()))) { @@ -99,57 +99,57 @@ log.warnFormat("User {0} not found in directory server, its status switched to InActive", dbUser.getname()); dbUser.setstatus(0); - succeded = true; + succeeded = true; } } else { if (dbUser.getstatus() == 0) { log.warnFormat("Inactive User {0} found in directory server, its status switched to Active", dbUser.getname()); dbUser.setstatus(1); - succeded = true; + succeeded = true; } if (!StringUtils.equals(dbUser.getname(), ldapUser.getName())) { dbUser.setname(ldapUser.getName()); - succeded = true; + succeeded = true; } if (!StringUtils.equals(dbUser.getsurname(), ldapUser.getSurName())) { dbUser.setsurname(ldapUser.getSurName()); - succeded = true; + succeeded = true; } if (!StringUtils.equals(dbUser.getdomain(), ldapUser.getDomainControler())) { dbUser.setdomain(ldapUser.getDomainControler()); - succeded = true; + succeeded = true; } if (!StringUtils.equals(dbUser.getusername(), ldapUser.getUserName())) { dbUser.setusername(ldapUser.getUserName()); - succeded = true; + succeeded = true; } if (!StringUtils.equals(dbUser.getgroups(), ldapUser.getGroup())) { dbUser.setgroups(ldapUser.getGroup()); - succeded = true; + succeeded = true; updatedUsers.add(dbUser.getuser_id()); } if (!StringUtils.equals(dbUser.getdepartment(), ldapUser.getDepartment())) { dbUser.setdepartment(ldapUser.getDepartment()); - succeded = true; + succeeded = true; } if (!StringUtils.equals(dbUser.getrole(), ldapUser.getTitle())) { dbUser.setrole(ldapUser.getTitle()); - succeded = true; + succeeded = true; } if (!StringUtils.equals(dbUser.getemail(), ldapUser.getEmail())) { dbUser.setemail(ldapUser.getEmail()); - succeded = true; + succeeded = true; } if (!StringUtils.equals(dbUser.getGroupIds(), ldapUser.getGroupIds())) { dbUser.setGroupIds(ldapUser.getGroupIds()); - succeded = true; + succeeded = true; } - if (succeded) { + if (succeeded) { dbUser.setstatus(dbUser.getstatus() + 1); } } - if (succeded) { + if (succeeded) { DbFacade.getInstance().getDbUserDao().update(dbUser); } else { } @@ -206,7 +206,7 @@ } else { for (DbUser dbUser : usersForDomain) { if (dbUser.getstatus() != 0) { - log.warnFormat("User {0} not found in directory sevrer, its status switched to InActive", + log.warnFormat("User {0} not found in directory server, its status switched to InActive", dbUser.getname()); dbUser.setstatus(AsyncTaskStatusEnum.unknown.getValue()); DbFacade.getInstance().getDbUserDao().update(dbUser); @@ -247,7 +247,7 @@ StringBuilder logMsg = new StringBuilder(); logMsg.append("domain name for ad group ") .append(group.getname()) - .append(" is null. This should not occur, please check that domain name is passed corectly from client"); + .append(" is null. This should not occur, please check that domain name is passed correctly from client"); log.warn(logMsg.toString()); String partAfterAtSign = group.getname().split("[@]", -1)[1]; String newDomainName = partAfterAtSign; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachUserFromVmFromPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachUserFromVmFromPoolCommand.java index a0dcdcc..522b915 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachUserFromVmFromPoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachUserFromVmFromPoolCommand.java @@ -55,7 +55,7 @@ log.infoFormat("Deleting snapshots for stateless vm {0}", vm.getId()); VmOperationParameterBase restoreParams = new VmOperationParameterBase(vm.getId()); - // setting RestoreStatelessVm to run in new transaction so it could rollback internaly if needed, + // setting RestoreStatelessVm to run in new transaction so it could rollback internally if needed, // but still not affect this command, in order to keep permissions changes even on restore failure restoreParams.setTransactionScopeOption(TransactionScopeOption.RequiresNew); Backend.getInstance().runInternalAction(VdcActionType.RestoreStatelessVm, restoreParams, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 4068af4..66f91a9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -834,7 +834,7 @@ return -1; } - // function return the index of image that is it's chiled + // function return the index of image that is its child private static int getNextImage(List<DiskImage> images, DiskImage curr) { for (int i = 0; i < images.size(); i++) { if (images.get(i).getParentId().equals(curr.getImageId())) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java index 608cd67..e7a46b9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java @@ -226,7 +226,7 @@ * @param storageType * The domain type. * @param image - * The image to check and cheange if needed. + * The image to check and change if needed. */ private void changeRawToCowIfSparseOnBlockDevice(StorageType storageType, DiskImage image) { if ((storageType == StorageType.FCP diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java index 8e07c79..54a2e4f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java @@ -237,7 +237,7 @@ if (ret == null || !ret.getSucceeded()) { log.errorFormat("Approval of oVirt {0} failed. ", params.getVdsId()); } else if (ret.getSucceeded()) { - log.infoFormat("Approval of oVirt {0} ended successefully. ", params.getVdsId()); + log.infoFormat("Approval of oVirt {0} ended successfully. ", params.getVdsId()); } } catch (RuntimeException ex) { log.error("Failed to Approve host", ex); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java index 7d9ae47..baa68d8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java @@ -163,7 +163,7 @@ /** * this method returns the vm that a non shareable disk is attached to - * or null is the disk is unttached to any vm, + * or null is the disk is unattached to any vm, * @param disk * @return */ diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java index 25ba402..2dd3caa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java @@ -9,7 +9,7 @@ import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; /** - * This command is reponsible for removing a template image. + * This command is responsible for removing a template image. */ @InternalCommandAttribute public class RemoveTemplateSnapshotCommand<T extends ImagesContainterParametersBase> extends BaseImagesCommand<T> { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java index 0007f60..8eb5fc3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TagsDirector.java @@ -92,7 +92,7 @@ } /** - * Recurcive tree initialization call + * Recursive tree initialization call * * @param tag */ @@ -225,7 +225,7 @@ * * @param tagId * the tag ID. - * @return a comma seperated list of IDs. + * @return a comma separated list of IDs. */ public String GetTagIdAndParentsIds(Guid tagId) { tags tag = GetTagById(tagId); @@ -237,7 +237,7 @@ * * @param tagName * the tag name. - * @return a comma seperated list of IDs. + * @return a comma separated list of IDs. */ public String GetTagIdAndParentsIds(String tagName) { tags tag = GetTagByName(tagName); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java index 9e340b2..e672703 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java @@ -74,8 +74,8 @@ return mUpdateVdsStatic.IsUpdateValid(source, distination, status); } - public static boolean IsFieldsUpdated(VdsStatic source, VdsStatic distination, Iterable<String> list) { - return mUpdateVdsStatic.IsFieldsUpdated(source, distination, list); + public static boolean IsFieldsUpdated(VdsStatic source, VdsStatic destination, Iterable<String> list) { + return mUpdateVdsStatic.IsFieldsUpdated(source, destination, list); } public static void HandleVdsCpuFlagsOrClusterChanged(Guid vdsId) { -- To view, visit http://gerrit.ovirt.org/11689 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3fcb109a9a4a01799205e0872d3e0289a9e0a17 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
