Ori Liel has uploaded a new change for review. Change subject: restapi: Add Href To Host Hooks ......................................................................
restapi: Add Href To Host Hooks Change-Id: Ibe20b343de451069683d5a208dc7241a55f161ed Signed-off-by: Ori Liel <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java 3 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/11246/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd index 75f0e48..23737de 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd @@ -1609,6 +1609,7 @@ <xs:sequence> <xs:element name="event_name" type="xs:string" minOccurs="0"/> <xs:element name="md5" type="xs:string" minOccurs="0"/> + <xs:element ref="host" minOccurs="0"/> </xs:sequence> </xs:extension> </xs:complexContent> diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResource.java index a735c3b..b955585 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHookResource.java @@ -26,7 +26,7 @@ public Hook getHook(Hooks hooks) { for (Hook hook : hooks.getHooks()) { if (HostMapper.generateHookId(hook.getEventName(), hook.getName(), hook.getMd5()).equals(guid)) { - return addHref(hook); + return hook; } } return notFound(); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java index c4b8e99..1708f05 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostHooksResource.java @@ -9,6 +9,7 @@ import org.ovirt.engine.api.model.Hook; import org.ovirt.engine.api.model.Hooks; +import org.ovirt.engine.api.model.Host; import org.ovirt.engine.api.resource.HostHookResource; import org.ovirt.engine.api.resource.HostHooksResource; import org.ovirt.engine.core.common.queries.GetVdsHooksByIdParameters; @@ -34,16 +35,14 @@ } private Hooks mapCollection(HashMap<String, HashMap<String, HashMap<String, String>>> hooksMap) { - Hooks hooks = mappingLocator.getMapper(HashMap.class, Hooks.class).map(hooksMap, null); + Hooks hooks = getMapper(HashMap.class, Hooks.class).map(hooksMap, null); + Host host = new Host(); + host.setId(hostId); for (Hook hook : hooks.getHooks()) { - addHref(hook); + hook.setHost(host); + addLinks(hook); } return hooks; - } - - private Hook addHref(Hook hook) { - hook.setHref(getPathBase() + uriInfo.getPath() + hook.getId()); - return hook; } String getPathBase() { -- To view, visit http://gerrit.ovirt.org/11246 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe20b343de451069683d5a208dc7241a55f161ed Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ori Liel <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
