Michael Pasternak has uploaded a new change for review. Change subject: restapi: rename RSDL metadata file ......................................................................
restapi: rename RSDL metadata file Change-Id: I29f1a2678856786cc202488a9cbda0a9be4aef94 Signed-off-by: Michael Pasternak <[email protected]> --- R backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/10602/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata_v-3.1.yaml b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml similarity index 100% rename from backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata_v-3.1.yaml rename to backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java index cfa99ac..5f87458 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlBuilder.java @@ -82,7 +82,7 @@ protected static final Log LOG = LogFactory.getLog(RsdlBuilder.class); private static final String RESOURCES_PACKAGE = "org.ovirt.engine.api.resource"; - private static final String PARAMS_METADATA = "rsdl_metadata_v-3.1.yaml"; + private static final String PARAMS_METADATA = "rsdl_metadata.yaml"; public RsdlBuilder(BackendApiResource apiResource) { this.apiResource = apiResource; @@ -117,6 +117,7 @@ uniteDuplicateLinks(rsdl); Collections.sort(rsdl.getLinks().getLinks(), new Comparator<DetailedLink>(){ + @Override public int compare(DetailedLink dl1, DetailedLink dl2) { int res = dl1.getHref().compareTo(dl2.getHref()); return res != 0 ? res : dl1.getRel().compareTo(dl2.getRel()); -- To view, visit http://gerrit.ovirt.org/10602 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29f1a2678856786cc202488a9cbda0a9be4aef94 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Pasternak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
