Juan Hernandez has uploaded a new change for review. Change subject: restapi: Remove leading / from RSDL action names ......................................................................
restapi: Remove leading / from RSDL action names The action names in the RSDL metadata files contain leading slashes. Durign generation of the RSDL document these are compared to the generated links, which are relative, they don't have slashes. As a result the generated RSDL document doesn't contain the information extracted from the metadata file. Change-Id: I37a39943f23406a3e6c077317c0b5159f85626f6 Bug-Url: https://bugzilla.redhat.com/1102772 Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com> --- M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java 1 file changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/30257/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java index 73c5289..806faa6 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java @@ -149,11 +149,19 @@ } private static MetaData loadMetaData() throws IOException { + // Load the metadata file: InputStream stream = RsdlManager.class.getResourceAsStream(METADATA_FILE_NAME); Constructor constructor = new CustomClassLoaderConstructor(Thread.currentThread().getContextClassLoader()); - Object result = new Yaml(constructor).load(stream); + MetaData metaData = (MetaData) new Yaml(constructor).load(stream); stream.close(); - MetaData metadata = (MetaData) result; - return metadata; + + // Remove leading slashes from all the action names: + for (Action action : metaData.getActions()) { + String name = action.getName(); + name = name.replaceAll("^/?", ""); + action.setName(name); + } + + return metaData; } } -- To view, visit http://gerrit.ovirt.org/30257 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37a39943f23406a3e6c077317c0b5159f85626f6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
