Allon Mureinik has uploaded a new change for review. Change subject: core: Remove HSMGetTaskInfoVDSCommand ......................................................................
core: Remove HSMGetTaskInfoVDSCommand HSMGetTaskInfoCommand is not used anywhere in the codebase, and thus should be removed. Change-Id: I734a200fcf3f3ba9edd93e3194341bff77a9fb2a Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java D backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java D backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskInfoReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java 6 files changed, 0 insertions(+), 75 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/14798/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java index a441860..5d1770f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java @@ -46,7 +46,6 @@ HSMGetAllTasksStatuses("org.ovirt.engine.core.vdsbroker.vdsbroker"), HSMGetTaskStatus("org.ovirt.engine.core.vdsbroker.vdsbroker"), HSMGetAllTasksInfo("org.ovirt.engine.core.vdsbroker.vdsbroker"), - HSMGetTaskInfo("org.ovirt.engine.core.vdsbroker.vdsbroker"), HSMStopTask("org.ovirt.engine.core.vdsbroker.vdsbroker"), HSMClearTask("org.ovirt.engine.core.vdsbroker.vdsbroker"), HSMRevertTask("org.ovirt.engine.core.vdsbroker.vdsbroker"), diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskInfoVDSCommand.java deleted file mode 100644 index 0156d9f..0000000 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskInfoVDSCommand.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.ovirt.engine.core.vdsbroker.vdsbroker; - -import org.ovirt.engine.core.common.vdscommands.*; - -public class HSMGetTaskInfoVDSCommand<P extends HSMTaskGuidBaseVDSCommandParameters> - extends HSMGetAllTasksInfoVDSCommand<P> { - private TaskInfoReturnForXmlRpc _result; - - public HSMGetTaskInfoVDSCommand(P parameters) { - super(parameters); - } - - @Override - protected void ExecuteVdsBrokerCommand() { - _result = getBroker().getTaskInfo(getParameters().getTaskId().toString()); - ProceedProxyReturnValue(); - setReturnValue(ParseTaskInfo(_result.TaskInfo, getParameters().getTaskId())); - } - - @Override - protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; - } -} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java index 3a7a600..9baa9a8 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java @@ -157,8 +157,6 @@ TaskStatusListReturnForXmlRpc getAllTasksStatuses(); - TaskInfoReturnForXmlRpc getTaskInfo(String taskUUID); - TaskInfoListReturnForXmlRpc getAllTasksInfo(); StatusOnlyReturnForXmlRpc stopTask(String taskUUID); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskInfoReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskInfoReturnForXmlRpc.java deleted file mode 100644 index 53d2ec0..0000000 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/TaskInfoReturnForXmlRpc.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.ovirt.engine.core.vdsbroker.vdsbroker; - -import java.util.Map; - -import org.ovirt.engine.core.vdsbroker.irsbroker.*; -import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcObjectDescriptor; - -public final class TaskInfoReturnForXmlRpc extends StatusReturnForXmlRpc { - private static final String TASK_INFO = "TaskInfo"; - // We are ignoring missing fields after the status, because on failure it is - // not sent. - // [XmlRpcMissingMapping(MappingAction.Ignore), XmlRpcMember("TaskInfo")] - public Map<String, String> TaskInfo; - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("\n"); - builder.append(super.toString()); - builder.append("\n"); - XmlRpcObjectDescriptor.ToStringBuilder(TaskInfo, builder); - return builder.toString(); - } - - @SuppressWarnings("unchecked") - public TaskInfoReturnForXmlRpc(Map<String, Object> innerMap) { - super(innerMap); - Object temp = (Object) innerMap.get(TASK_INFO); - if (temp != null) { - TaskInfo = (Map<String, String>) temp; - } - } - -} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java index 30657a1..aea65e0 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java @@ -142,8 +142,6 @@ public Map<String, Object> getAllTasksStatuses(); - public Map<String, Object> getTaskInfo(String taskUUID); - public Map<String, Object> getAllTasksInfo(); public Map<String, Object> stopTask(String taskUUID); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java index f13fd64..dc94e77 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java @@ -764,18 +764,6 @@ } @Override - public TaskInfoReturnForXmlRpc getTaskInfo(String taskUUID) { - try { - Map<String, Object> xmlRpcReturnValue = vdsServer.getTaskInfo(taskUUID); - TaskInfoReturnForXmlRpc wrapper = new TaskInfoReturnForXmlRpc(xmlRpcReturnValue); - return wrapper; - } catch (UndeclaredThrowableException ute) { - throw new XmlRpcRunTimeException(ute); - } - - } - - @Override public TaskInfoListReturnForXmlRpc getAllTasksInfo() { try { Map<String, Object> xmlRpcReturnValue = vdsServer.getAllTasksInfo(); -- To view, visit http://gerrit.ovirt.org/14798 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I734a200fcf3f3ba9edd93e3194341bff77a9fb2a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
