Skip to content

Commit

Permalink
Merge pull request #53 from indigo-dc/fix-rest-params
Browse files Browse the repository at this point in the history
Fix error when adding query parameters
  • Loading branch information
Alfonso Pérez authored May 9, 2019
2 parents 6982ef9 + 4a2c383 commit e15cdc4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).

4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>es.upv.i3m.grycap</groupId>
<artifactId>im-java-api</artifactId>
<version>0.4.12</version>
<version>0.4.13</version>
<name>IM Java API</name>
<description>Java client for the REST API of the IM</description>

Expand All @@ -12,7 +12,7 @@
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
<maven-assembly-plugin.version>2.6</maven-assembly-plugin.version>
<jersey-client.version>2.22.2</jersey-client.version>
<jackson.version>2.7.3</jackson.version>
<jackson.version>[2.8.11.1,)</jackson.version>
<apache-commons.version>3.4</apache-commons.version>
<junit.version>4.12</junit.version>
<log4j.version>1.2.17</log4j.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down

0 comments on commit e15cdc4

Please sign in to comment.