Arik Hadas has uploaded a new change for review. Change subject: core: fix typo ......................................................................
core: fix typo s/separete/separate Change-Id: I92ddda877689209c2f4612de6a66f7177798efb7 Signed-off-by: Arik Hadas <[email protected]> --- 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/GetVmUpdatesOnNextRunExistsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmUpdatesOnNextRunExistsQueryTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/VmPropertiesUtils.java 5 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/27936/1 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 167323d..6be5480 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 @@ -891,7 +891,7 @@ vmStatic.setCreatedByUserId(getUserId()); // Parses the custom properties field that was filled by frontend to // predefined and user defined fields - VmPropertiesUtils.getInstance().separeteCustomPropertiesToUserAndPredefined( + VmPropertiesUtils.getInstance().separateCustomPropertiesToUserAndPredefined( ClusterUtils.getCompatibilityVersion(getParameters().getVm()), vmStatic); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmUpdatesOnNextRunExistsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmUpdatesOnNextRunExistsQuery.java index 867a5c0..9e7063e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmUpdatesOnNextRunExistsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmUpdatesOnNextRunExistsQuery.java @@ -29,9 +29,9 @@ VmPropertiesUtils vmPropertiesUtils = SimpleDependecyInjector.getInstance().get(VmPropertiesUtils.class); - vmPropertiesUtils.separeteCustomPropertiesToUserAndPredefined( + vmPropertiesUtils.separateCustomPropertiesToUserAndPredefined( srcVm.getVdsGroupCompatibilityVersion(), srcStatic); - vmPropertiesUtils.separeteCustomPropertiesToUserAndPredefined( + vmPropertiesUtils.separateCustomPropertiesToUserAndPredefined( dstVm.getVdsGroupCompatibilityVersion(), dstStatic); setReturnValue(!VmHandler.isUpdateValid(srcStatic, dstStatic, VMStatus.Up)); 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 9308fe9..397069a 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 @@ -82,8 +82,8 @@ if (isVmExist()) { Version clusterVersion = getVdsGroup().getcompatibility_version(); - getVmPropertiesUtils().separeteCustomPropertiesToUserAndPredefined(clusterVersion, parameters.getVmStaticData()); - getVmPropertiesUtils().separeteCustomPropertiesToUserAndPredefined(clusterVersion, getVm().getStaticData()); + getVmPropertiesUtils().separateCustomPropertiesToUserAndPredefined(clusterVersion, parameters.getVmStaticData()); + getVmPropertiesUtils().separateCustomPropertiesToUserAndPredefined(clusterVersion, getVm().getStaticData()); } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmUpdatesOnNextRunExistsQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmUpdatesOnNextRunExistsQueryTest.java index 0e34b48..5db0e3b 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmUpdatesOnNextRunExistsQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmUpdatesOnNextRunExistsQueryTest.java @@ -30,7 +30,7 @@ public void init() { VmHandler.init(); mockVmPropertiesUtils(); - doNothing().when(vmPropertiesUtils).separeteCustomPropertiesToUserAndPredefined(any(Version.class), any(VmStatic.class)); + doNothing().when(vmPropertiesUtils).separateCustomPropertiesToUserAndPredefined(any(Version.class), any(VmStatic.class)); } private void mockVmPropertiesUtils() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/VmPropertiesUtils.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/VmPropertiesUtils.java index 9320263..ab4e60a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/VmPropertiesUtils.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/customprop/VmPropertiesUtils.java @@ -116,7 +116,7 @@ * @return map containing the VM custom properties */ public Map<String, String> getVMProperties(Version version, VmStatic vmStatic) { - separeteCustomPropertiesToUserAndPredefined(version, vmStatic); + separateCustomPropertiesToUserAndPredefined(version, vmStatic); Map<String, String> map = new HashMap<String, String>(); getPredefinedProperties(version, vmStatic, map); getUserDefinedProperties(version, vmStatic, map); @@ -204,7 +204,7 @@ return result.toString(); } - public void separeteCustomPropertiesToUserAndPredefined(Version version, VmStatic vmStatic) { + public void separateCustomPropertiesToUserAndPredefined(Version version, VmStatic vmStatic) { String customProperties = vmStatic.getCustomProperties(); VMCustomProperties properties = parseProperties(version, customProperties); vmStatic.setPredefinedProperties(properties.getPredefinedProperties()); -- To view, visit http://gerrit.ovirt.org/27936 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92ddda877689209c2f4612de6a66f7177798efb7 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
