diff --git a/README.md b/README.md index ea5254d..fdea0a2 100644 --- a/README.md +++ b/README.md @@ -97,11 +97,11 @@ InfrastructureManager im = new InfrastructureManager("IM_ENDPOINT", ah); 2.2 From the Orchestrator -------------- The im-java-api is used to facilitate the connection between the [Orchestrator](https://github.com/indigo-dc/orchestrator) and the [IM](https://github.com/indigo-dc/im). -The Orchestrator is mainly developed in Java and the IM in Python, so this library acts as a mediator between this to systems. +The Orchestrator is mainly developed in Java and the IM in Python, so this library acts as a mediator between these two systems. The IM offers a REST API that returns JSON messages and the im-java-api transforms this messages in Java classes that are used by the Orchestrator. -This library library is automatically deployed with the Orchestrator (due to maven dependencies). -Anyhow, if you want to substitute the library packaged with the war, the location inside the war is WEB-INF/lib/im-java-api-X.X.X.jar. +This library is automatically deployed with the Orchestrator (due to maven dependencies). +If you want to substitute the library packaged with the war, the location inside the war is WEB-INF/lib/im-java-api-X.X.X.jar. To use this library from the Orchestrator you only have to used the Orchestrator normally and create a deployment that uses the IM endpoint. More info about the Orchestrator can be found [here](http://indigo-dc.github.io/orchestrator/restdocs/). diff --git a/pom.xml b/pom.xml index 35cb2e8..c5bacfa 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 es.upv.i3m.grycap im-java-api - 0.4.12 + 0.4.13 IM Java API Java client for the REST API of the IM @@ -12,7 +12,7 @@ 3.5.1 2.6 2.22.2 - 2.7.3 + [2.8.11.1,) 3.4 4.12 1.2.17 diff --git a/src/main/java/es/upv/i3m/grycap/im/rest/client/ImClient.java b/src/main/java/es/upv/i3m/grycap/im/rest/client/ImClient.java index a315a65..6439c13 100644 --- a/src/main/java/es/upv/i3m/grycap/im/rest/client/ImClient.java +++ b/src/main/java/es/upv/i3m/grycap/im/rest/client/ImClient.java @@ -258,7 +258,7 @@ public Builder configureClient(final String path, if (parameters != null && parameters.length > 0 && parameters[0] != null) { for (RestParameter parameter : parameters) { - webtarget.queryParam(parameter.getName(), parameter.getValues()); + webtarget = webtarget.queryParam(parameter.getName(), parameter.getValues()); } } diff --git a/src/test/java/es/upv/i3m/grycap/im/InfrastructureManagerTest.java b/src/test/java/es/upv/i3m/grycap/im/InfrastructureManagerTest.java index a31de87..d024c6d 100644 --- a/src/test/java/es/upv/i3m/grycap/im/InfrastructureManagerTest.java +++ b/src/test/java/es/upv/i3m/grycap/im/InfrastructureManagerTest.java @@ -48,7 +48,7 @@ public class InfrastructureManagerTest extends ImTestWatcher { private static InfrastructureManager im; private String infrastructureId; private static final String IM_DUMMY_PROVIDER_URL = - "https://servproject.i3m.upv.es:8811"; + "https://servproject.i3m.upv.es:8800"; private static final String AUTH_FILE_PATH = "./src/test/resources/auth.dat"; private static final String RADL_ALTER_VM_FILE_PATH =