Alissa Bonas has uploaded a new change for review. Change subject: core: rename methods to lower case in vm commands and handler ......................................................................
core: rename methods to lower case in vm commands and handler Change-Id: I701170efd0081ea60c1e5da8fd4d124c1c326f04 Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PauseVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java 10 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/20923/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java index 40eb5be..27abecd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmToPoolCommand.java @@ -30,7 +30,7 @@ public static boolean canAddVmToPool(Guid vmId, java.util.ArrayList<String> messages, Guid poolId) { boolean returnValue = true; - boolean isRunning = RemoveVmCommand.IsVmRunning(vmId); + boolean isRunning = RemoveVmCommand.isVmRunning(vmId); if (isRunning) { returnValue = false; if (messages != null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java index 44f10c6..980f3d0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java @@ -107,7 +107,7 @@ private void initHandlers() { mTagsHandler = HandlersFactory.createTagsHandler(); BaseConditionFieldAutoCompleter.TagsHandler = mTagsHandler; - VmHandler.Init(); + VmHandler.init(); VdsHandler.Init(); VmTemplateHandler.Init(); log.info("Completed initializing handlers"); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PauseVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PauseVmCommand.java index ad5b1c2..58c66df 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PauseVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PauseVmCommand.java @@ -34,7 +34,7 @@ return getSucceeded() ? AuditLogType.USER_PAUSE_VM : AuditLogType.USER_FAILED_PAUSE_VM; } - public boolean CanPauseVm(Guid vmId, java.util.ArrayList<String> message) { + public boolean canPauseVm(Guid vmId, java.util.ArrayList<String> message) { boolean retValue = true; VM vm = DbFacade.getInstance().getVmDao().get(vmId); if (vm == null) { @@ -68,6 +68,6 @@ @Override protected boolean canDoAction() { - return CanPauseVm(getParameters().getVmId(), getReturnValue().getCanDoActionMessages()); + return canPauseVm(getParameters().getVmId(), getReturnValue().getCanDoActionMessages()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java index 8a7aef7..c0ccd32 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java @@ -157,7 +157,7 @@ addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM); } - public static boolean IsVmRunning(Guid vmId) { + public static boolean isVmRunning(Guid vmId) { VM vm = DbFacade.getInstance().getVmDao().get(vmId); if (vm != null) { return vm.isRunningOrPaused() || vm.getStatus() == VMStatus.Unknown; @@ -170,7 +170,7 @@ } private boolean canRemoveVm() { - if (IsVmRunning(getVmId()) || (getVm().getStatus() == VMStatus.NotResponding)) { + if (isVmRunning(getVmId()) || (getVm().getStatus() == VMStatus.NotResponding)) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_RUNNING); } if (getVm().getStatus() == VMStatus.Suspended) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java index 13398ec..b5c48fc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolCommand.java @@ -25,7 +25,7 @@ returnValue = false; } if (returnValue) { - if (RemoveVmCommand.IsVmRunning(vmId)) { + if (RemoveVmCommand.isVmRunning(vmId)) { messages.add(VdcBllMessages.VM_POOL_CANNOT_REMOVE_RUNNING_VM_FROM_POOL.toString()); returnValue = false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java index bf1dc76..214d45c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java @@ -75,7 +75,7 @@ * * @see Backend#InitHandlers */ - public static void Init() { + public static void init() { Class<?>[] inspectedClassNames = new Class<?>[] { VmBase.class, VM.class, @@ -367,9 +367,9 @@ * - Messages for CanDoAction(). * @return - True , if name is valid, false, if name already exist. */ - public static boolean IsNotDuplicateInterfaceName(List<VmNic> interfaces, - final String interfaceName, - List<String> messages) { + public static boolean isNotDuplicateInterfaceName(List<VmNic> interfaces, + final String interfaceName, + List<String> messages) { // Interface iface = interfaces.FirstOrDefault(i => i.name == // AddVmInterfaceParameters.Interface.name); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java index 0582dbc..12273e3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java @@ -37,7 +37,7 @@ } protected boolean interfaceNameUnique(List<VmNic> interfaces) { - return VmHandler.IsNotDuplicateInterfaceName(interfaces, + return VmHandler.isNotDuplicateInterfaceName(interfaces, getInterfaceName(), getReturnValue().getCanDoActionMessages()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java index 9bdd494..76fba47 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java @@ -76,7 +76,7 @@ } protected boolean uniqueInterfaceName(List<VmNic> interfaces) { - return VmHandler.IsNotDuplicateInterfaceName(interfaces, getInterfaceName(), + return VmHandler.isNotDuplicateInterfaceName(interfaces, getInterfaceName(), getReturnValue().getCanDoActionMessages()); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java index 94c4c11..64b8528 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java @@ -90,7 +90,7 @@ when(osRepository.getMaximumRam(0, null)).thenReturn(256); when(osRepository.isWindows(0)).thenReturn(false); - VmHandler.Init(); + VmHandler.init(); vm = new VM(); vmStatic = new VmStatic(); group = new VDSGroup(); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java index 7049f97..45ad727 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java @@ -82,7 +82,7 @@ @Before public void setUp() { - VmHandler.Init(); + VmHandler.init(); } @Test -- To view, visit http://gerrit.ovirt.org/20923 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I701170efd0081ea60c1e5da8fd4d124c1c326f04 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
