Oved Ourfali has uploaded a new change for review. Change subject: core: make method and field names start with lowercase letter in vdsbroker ......................................................................
core: make method and field names start with lowercase letter in vdsbroker Change-Id: I9cd54e80f13525e0cd09f09ba05eb64e8681c32d Signed-off-by: Oved Ourfali <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVmFromSysPrepVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceStatusReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskStatusVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskInfoListReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskStatusListReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskStatusReturnForXmlRpc.java 10 files changed, 19 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/22033/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVmFromSysPrepVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVmFromSysPrepVDSCommand.java index 5933fb9..ce344dd 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVmFromSysPrepVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVmFromSysPrepVDSCommand.java @@ -6,7 +6,7 @@ public CreateVmFromSysPrepVDSCommand(P parameters) { super(parameters); String sysPrepContent = - SysprepHandler.GetSysPrep(parameters.getVm(), + SysprepHandler.getSysPrep(parameters.getVm(), parameters.getHostName(), parameters.getDomain(), parameters.getSysPrepParams()); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceStatusReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceStatusReturnForXmlRpc.java index 21e3003..a813a12 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceStatusReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceStatusReturnForXmlRpc.java @@ -7,10 +7,10 @@ public final class FenceStatusReturnForXmlRpc extends StatusReturnForXmlRpc { private static final String POWER = "power"; // [XmlRpcMissingMapping(MappingAction.Ignore), XmlRpcMember("power")] - public String Power; + public String power; public FenceStatusReturnForXmlRpc(Map<String, Object> innerMap) { super(innerMap); - Power = (String) innerMap.get(POWER); + power = (String) innerMap.get(POWER); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java index c54a2d0..e3f2786 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java @@ -59,8 +59,8 @@ proceedProxyReturnValue(); getVDSReturnValue().setSucceeded(false); - if (getParameters().getAction() == FenceActionType.Status && _result.Power != null) { - String stat = _result.Power.toLowerCase(); + if (getParameters().getAction() == FenceActionType.Status && _result.power != null) { + String stat = _result.power.toLowerCase(); String msg = _result.mStatus.mMessage; if ("on".equals(stat) || "off".equals(stat)) { getVDSReturnValue().setSucceeded(true); @@ -112,8 +112,8 @@ _result = getBroker().fenceNode(getParameters().getIp(), "", getParameters().getType(), getParameters().getUser(), getParameters().getPassword(), "status", "", options); - if (_result.Power != null) { - String powerStatus = _result.Power.toLowerCase(); + if (_result.power != null) { + String powerStatus = _result.power.toLowerCase(); if ((action == FenceActionType.Start && powerStatus.equals("on")) || action == FenceActionType.Stop && powerStatus.equals("off")) ret = true; diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java index 487370a..afb19d0 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java @@ -19,7 +19,7 @@ protected void executeVdsBrokerCommand() { _result = getBroker().getAllTasksInfo(); proceedProxyReturnValue(); - setReturnValue(parseTaskInfoList(_result.TaskInfoList)); + setReturnValue(parseTaskInfoList(_result.taskInfoList)); } protected java.util.ArrayList<AsyncTaskCreationInfo> parseTaskInfoList(Map<String, Map<String, String>> taskInfoList) { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java index 908c084..7eea07d 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java @@ -24,7 +24,7 @@ protected void executeVdsBrokerCommand() { _result = getBroker().getAllTasksStatuses(); proceedProxyReturnValue(); - setReturnValue(parseTaskStatusList(_result.TaskStatusList)); + setReturnValue(parseTaskStatusList(_result.taskStatusList)); } protected AsyncTaskStatus parseTaskStatus(TaskStatusForXmlRpc taskStatus) { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskStatusVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskStatusVDSCommand.java index eab7ac3..a6cdd7f 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskStatusVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskStatusVDSCommand.java @@ -18,7 +18,7 @@ protected void executeVdsBrokerCommand() { _result = getBroker().getTaskStatus(getParameters().getTaskId().toString()); proceedProxyReturnValue(); - setReturnValue(parseTaskStatus(_result.TaskStatus)); + setReturnValue(parseTaskStatus(_result.taskStatus)); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java index 803caca..cdfab4e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java @@ -60,7 +60,7 @@ passwordPerDomain = Config.<DomainsPasswordMap> GetValue(ConfigValues.AdUserPassword); } - public static String GetSysPrep(VM vm, String hostName, String domain, SysPrepParams sysPrepParams) { + public static String getSysPrep(VM vm, String hostName, String domain, SysPrepParams sysPrepParams) { String sysPrepContent = ""; sysPrepContent = LoadFile(osRepository.getSysprepPath(vm.getVmOsId(), null)); sysPrepContent = replace(sysPrepContent, "$ProductKey$", osRepository.getProductKey(vm.getVmOsId(), null)); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskInfoListReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskInfoListReturnForXmlRpc.java index 17014ad..02e2655 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskInfoListReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskInfoListReturnForXmlRpc.java @@ -11,7 +11,7 @@ // not sent. // [XmlRpcMissingMapping(MappingAction.Ignore), // XmlRpcMember("allTasksInfo")] - public Map<String, java.util.Map<String, String>> TaskInfoList; + public Map<String, java.util.Map<String, String>> taskInfoList; @Override public String toString() { @@ -19,7 +19,7 @@ builder.append("\n"); builder.append(super.toString()); builder.append("\n"); - XmlRpcObjectDescriptor.toStringBuilder(TaskInfoList, builder); + XmlRpcObjectDescriptor.toStringBuilder(taskInfoList, builder); return builder.toString(); } @@ -28,7 +28,7 @@ super(innerMap); Object temp = innerMap.get(ALL_TASKS_INFO); if (temp != null) { - TaskInfoList = (Map<String, java.util.Map<String, String>>) temp; + taskInfoList = (Map<String, java.util.Map<String, String>>) temp; } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskStatusListReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskStatusListReturnForXmlRpc.java index 4da71fe..4185e3d 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskStatusListReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskStatusListReturnForXmlRpc.java @@ -9,7 +9,7 @@ private static final String ALL_TASKS_STATUS = "allTasksStatus"; // We are ignoring missing fields after the status, because on failure it is // not sent. - public Map<String, Object> TaskStatusList; + public Map<String, Object> taskStatusList; @Override public String toString() { @@ -17,14 +17,14 @@ builder.append("\n"); builder.append(super.toString()); builder.append("\n"); - XmlRpcObjectDescriptor.toStringBuilder(TaskStatusList, builder); + XmlRpcObjectDescriptor.toStringBuilder(taskStatusList, builder); return builder.toString(); } @SuppressWarnings("unchecked") public TaskStatusListReturnForXmlRpc(Map<String, Object> innerMap) { super(innerMap); - TaskStatusList = (Map<String, Object>) innerMap.get(ALL_TASKS_STATUS); + taskStatusList = (Map<String, Object>) innerMap.get(ALL_TASKS_STATUS); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskStatusReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskStatusReturnForXmlRpc.java index 4268144..056d2c7 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskStatusReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskStatusReturnForXmlRpc.java @@ -9,14 +9,14 @@ // We are ignoring missing fields after the status, because on failure it is // not sent. // [XmlRpcMissingMapping(MappingAction.Ignore), XmlRpcMember("taskStatus")] - public TaskStatusForXmlRpc TaskStatus; + public TaskStatusForXmlRpc taskStatus; @SuppressWarnings("unchecked") public TaskStatusReturnForXmlRpc(Map<String, Object> innerMap) { super(innerMap); Object temp = innerMap.get(TASK_STATUS); if (temp != null) { - TaskStatus = new TaskStatusForXmlRpc((Map<String, Object>) temp); + taskStatus = new TaskStatusForXmlRpc((Map<String, Object>) temp); } } -- To view, visit http://gerrit.ovirt.org/22033 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9cd54e80f13525e0cd09f09ba05eb64e8681c32d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Oved Ourfali <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
