Juan Hernandez has uploaded a new change for review.
Change subject: codegen: Remove the hardcoded root URL
......................................................................
codegen: Remove the hardcoded root URL
This is required in order to run the generator using a server that has
been configured to use an URL different to the default.
Change-Id: I77a63f8d3ad4d5fa759703be0857fac8e9b50da2
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M
ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/rsdl/RsdlCodegen.java
1 file changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk-java
refs/changes/52/22552/1
diff --git
a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/rsdl/RsdlCodegen.java
b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/rsdl/RsdlCodegen.java
index 145c76e..5a06902 100644
---
a/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/rsdl/RsdlCodegen.java
+++
b/ovirt-engine-sdk-java-codegen/src/main/java/org/ovirt/engine/sdk/codegen/rsdl/RsdlCodegen.java
@@ -95,7 +95,6 @@
private static final String WINDOWS_DECORATORS_PATH =
"..\\ovirt-engine-sdk-java\\src\\main\\java\\org\\ovirt\\engine\\sdk\\decorators\\";
private static final String SLASH = "/";
- private static final String ROOT_URL = "/ovirt-engine/api/";
private static final String ENTITIES_PACKAGE =
"org.ovirt.engine.sdk.entities";
private static final String DELETE_REL = "delete";
private static final String UPDATE_REL = "update";
@@ -200,6 +199,9 @@
String url, rel, requestBodyType, responseBodyType, parent,
collectionName, actualReturnType;
HttpMethod requestMethod;
+ // #0 - get the root URL
+ String rootUrl = httpProxy.getRoot();
+
// #1 - fetch RSDL
RSDL rsdl = fetchRsdl();
@@ -207,7 +209,13 @@
if (rsdl != null) {
for (DetailedLink dl : rsdl.getLinks().getLinks()) {
- url = dl.getHref().replace(ROOT_URL, "");
+ // Get the URL of the resource and make it relative, removing
the root URL of the application and any
+ // additional leading slash:
+ url = dl.getHref().replace(rootUrl, "");
+ while (url.startsWith(SLASH)) {
+ url = url.substring(SLASH.length());
+ }
+
rel = dl.getRel();
requestBodyType = dl.getRequest().getBody().getType();
requestMethod = dl.getRequest().getHttpMethod();
--
To view, visit http://gerrit.ovirt.org/22552
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I77a63f8d3ad4d5fa759703be0857fac8e9b50da2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine-sdk-java
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
