Skip to content

Commit e15cdc4

Browse files
authored
Merge pull request #53 from indigo-dc/fix-rest-params
Fix error when adding query parameters
2 parents 6982ef9 + 4a2c383 commit e15cdc4

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ InfrastructureManager im = new InfrastructureManager("IM_ENDPOINT", ah);
9797
2.2 From the Orchestrator
9898
--------------
9999
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).
100-
The Orchestrator is mainly developed in Java and the IM in Python, so this library acts as a mediator between this to systems.
100+
The Orchestrator is mainly developed in Java and the IM in Python, so this library acts as a mediator between these two systems.
101101
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.
102102

103-
This library library is automatically deployed with the Orchestrator (due to maven dependencies).
104-
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.
103+
This library is automatically deployed with the Orchestrator (due to maven dependencies).
104+
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.
105105
To use this library from the Orchestrator you only have to used the Orchestrator normally and create a deployment that uses the IM endpoint.
106106
More info about the Orchestrator can be found [here](http://indigo-dc.github.io/orchestrator/restdocs/).
107107

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>es.upv.i3m.grycap</groupId>
55
<artifactId>im-java-api</artifactId>
6-
<version>0.4.12</version>
6+
<version>0.4.13</version>
77
<name>IM Java API</name>
88
<description>Java client for the REST API of the IM</description>
99

@@ -12,7 +12,7 @@
1212
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
1313
<maven-assembly-plugin.version>2.6</maven-assembly-plugin.version>
1414
<jersey-client.version>2.22.2</jersey-client.version>
15-
<jackson.version>2.7.3</jackson.version>
15+
<jackson.version>[2.8.11.1,)</jackson.version>
1616
<apache-commons.version>3.4</apache-commons.version>
1717
<junit.version>4.12</junit.version>
1818
<log4j.version>1.2.17</log4j.version>

src/main/java/es/upv/i3m/grycap/im/rest/client/ImClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public Builder configureClient(final String path,
258258
if (parameters != null && parameters.length > 0
259259
&& parameters[0] != null) {
260260
for (RestParameter parameter : parameters) {
261-
webtarget.queryParam(parameter.getName(), parameter.getValues());
261+
webtarget = webtarget.queryParam(parameter.getName(), parameter.getValues());
262262
}
263263
}
264264

src/test/java/es/upv/i3m/grycap/im/InfrastructureManagerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class InfrastructureManagerTest extends ImTestWatcher {
4848
private static InfrastructureManager im;
4949
private String infrastructureId;
5050
private static final String IM_DUMMY_PROVIDER_URL =
51-
"https://servproject.i3m.upv.es:8811";
51+
"https://servproject.i3m.upv.es:8800";
5252

5353
private static final String AUTH_FILE_PATH = "./src/test/resources/auth.dat";
5454
private static final String RADL_ALTER_VM_FILE_PATH =

0 commit comments

Comments
 (0)