Alissa Bonas has uploaded a new change for review. Change subject: engine: rename methods in vds commands to start with lowercase. ......................................................................
engine: rename methods in vds commands to start with lowercase. Eliminates several findbugs warnings. Change-Id: I0fcaef1b8da4b6b66008efd66009a1b128da5d6a Signed-off-by: Alissa Bonas <[email protected]> --- 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/MigrateBrokerVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java 5 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/20825/1 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 087bcc6..487370a 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,17 +19,17 @@ 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) { + protected java.util.ArrayList<AsyncTaskCreationInfo> parseTaskInfoList(Map<String, Map<String, String>> taskInfoList) { try { java.util.ArrayList<AsyncTaskCreationInfo> result = new java.util.ArrayList<AsyncTaskCreationInfo>( taskInfoList.size()); for (java.util.Map.Entry<String, java.util.Map<String, String>> entry : taskInfoList.entrySet()) { Guid taskID = new Guid(entry.getKey()); Map<String, String> taskInfo = entry.getValue(); - AsyncTaskCreationInfo task = ParseTaskInfo(taskInfo, taskID); + AsyncTaskCreationInfo task = parseTaskInfo(taskInfo, taskID); if (task != null) { result.add(task); } @@ -41,7 +41,7 @@ } } - protected AsyncTaskCreationInfo ParseTaskInfo(Map<String, String> taskInfo, Guid taskID) { + protected AsyncTaskCreationInfo parseTaskInfo(Map<String, String> taskInfo, Guid taskID) { try { String deTaskType = taskInfo.get(VERB_KEY); AsyncTaskType taskType; 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 76630cf..908c084 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,16 +24,16 @@ protected void executeVdsBrokerCommand() { _result = getBroker().getAllTasksStatuses(); proceedProxyReturnValue(); - setReturnValue(ParseTaskStatusList(_result.TaskStatusList)); + setReturnValue(parseTaskStatusList(_result.TaskStatusList)); } - protected AsyncTaskStatus ParseTaskStatus(TaskStatusForXmlRpc taskStatus) { + protected AsyncTaskStatus parseTaskStatus(TaskStatusForXmlRpc taskStatus) { AsyncTaskStatus task = new AsyncTaskStatus(); task.setStatus((taskStatus != null && taskStatus.mTaskState != null) ? (AsyncTaskStatusEnum .valueOf(taskStatus.mTaskState)) : AsyncTaskStatusEnum.unknown); if (task.getStatus() == AsyncTaskStatusEnum.finished) { - UpdateReturnStatus(taskStatus); + updateReturnStatus(taskStatus); try { proceedProxyReturnValue(); @@ -59,7 +59,7 @@ return task; } - protected HashMap<Guid, AsyncTaskStatus> ParseTaskStatusList(Map<String, ?> taskStatusList) { + protected HashMap<Guid, AsyncTaskStatus> parseTaskStatusList(Map<String, ?> taskStatusList) { HashMap<Guid, AsyncTaskStatus> result = new HashMap<Guid, AsyncTaskStatus>( taskStatusList.size()); for (Map.Entry<String, ?> entry : taskStatusList.entrySet()) { @@ -76,7 +76,7 @@ tempVar.mTaskResult = xrsTaskStatus.get("taskResult").toString(); tempVar.mTaskState = xrsTaskStatus.get("taskState").toString(); TaskStatusForXmlRpc taskStatus = tempVar; - AsyncTaskStatus task = ParseTaskStatus(taskStatus); + AsyncTaskStatus task = parseTaskStatus(taskStatus); result.put(taskGuid, task); } } catch (RuntimeException exp) { @@ -102,7 +102,7 @@ // the same VDSCommand on different status values, for example, a regular // verb // execution status and an asynchronous task status. - protected void UpdateReturnStatus(StatusForXmlRpc newReturnStatus) { + protected void updateReturnStatus(StatusForXmlRpc newReturnStatus) { _result.mStatus = newReturnStatus; } 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 2693d28..3b0ed01 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 @@ -42,7 +42,7 @@ } @Override - protected void UpdateReturnStatus(StatusForXmlRpc newReturnStatus) { + protected void updateReturnStatus(StatusForXmlRpc newReturnStatus) { _result.mStatus = newReturnStatus; } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java index 034a098..ecd74b0 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/MigrateBrokerVDSCommand.java @@ -13,7 +13,7 @@ public MigrateBrokerVDSCommand(P parameters) { super(parameters); - String migMethod = VdsProperties.MigrationMethostoString(parameters.getMigrationMethod()); + String migMethod = VdsProperties.migrationMethodtoString(parameters.getMigrationMethod()); log.infoFormat("VdsBroker::migrate::Entered (vm_guid='{0}', srcHost='{1}', dstHost='{2}', method='{3}'", parameters.getVmId().toString(), parameters.getSrcHost(), parameters.getDstHost(), migMethod); migrationInfo = new HashMap<String, String>(); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java index 354a2fc..a09da77 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java @@ -304,7 +304,7 @@ public static final String QOS_PEAK = "peak"; public static final String QOS_BURST = "burst"; - public static String MigrationMethostoString(MigrationMethod method) { + public static String migrationMethodtoString(MigrationMethod method) { if (method == MigrationMethod.OFFLINE) { return offline; } else if (method == MigrationMethod.ONLINE) { -- To view, visit http://gerrit.ovirt.org/20825 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0fcaef1b8da4b6b66008efd66009a1b128da5d6a 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
