Skip to content

Commit 438f522

Browse files
author
kagrawal
committed
Issue : #1070
Description: Fixed Test cases.
1 parent e57a978 commit 438f522

File tree

1 file changed

+14
-14
lines changed
  • connectors/resteasy/src/main/java/org/openstack4j/connectors/resteasy

1 file changed

+14
-14
lines changed

connectors/resteasy/src/main/java/org/openstack4j/connectors/resteasy/HttpCommand.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package org.openstack4j.connectors.resteasy;
22

3-
import java.util.List;
4-
import java.util.Map;
5-
6-
import javax.ws.rs.client.Entity;
7-
import javax.ws.rs.client.Invocation;
8-
import javax.ws.rs.core.Response;
9-
import javax.ws.rs.core.UriBuilder;
10-
113
import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
124
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
135
import org.openstack4j.connectors.resteasy.executors.ApacheHttpClientEngine;
146
import org.openstack4j.core.transport.ClientConstants;
157
import org.openstack4j.core.transport.HttpRequest;
168
import org.openstack4j.core.transport.functions.EndpointURIFromRequestFunction;
179

10+
import javax.ws.rs.client.Entity;
11+
import javax.ws.rs.client.Invocation;
12+
import javax.ws.rs.core.Response;
13+
import javax.ws.rs.core.UriBuilder;
14+
import java.util.List;
15+
import java.util.Map;
16+
1817
/**
1918
* HttpCommand is responsible for executing the actual request driven by the HttpExecutor.
2019
*
@@ -25,6 +24,7 @@ public final class HttpCommand<R> {
2524
private HttpRequest<R> request;
2625
private ResteasyWebTarget resteasyWebTarget;
2726
private int retries;
27+
private Invocation.Builder resteasyRequest ;
2828

2929
private HttpCommand(HttpRequest<R> request) {
3030
this.request = request;
@@ -48,24 +48,24 @@ private void initialize() {
4848
.target(UriBuilder.fromUri(new EndpointURIFromRequestFunction().apply(request)));
4949

5050
populateQueryParams(request);
51+
resteasyRequest = resteasyWebTarget.request();
5152
populateHeaders(request);
5253
}
5354

5455
/**
5556
* Executes the command and returns the Response
5657
*
5758
* @return the response
58-
* @throws Exception
5959
*/
6060
public Response execute(){
6161

6262
Invocation webRequest;
6363
if (request.getEntity() != null) {
64-
webRequest = resteasyWebTarget.request().build(request.getMethod().name(), Entity.entity(request.getEntity(), request.getContentType()));
64+
webRequest = resteasyRequest.build(request.getMethod().name(), Entity.entity(request.getEntity(), request.getContentType()));
6565
} else if (request.hasJson()) {
66-
webRequest= resteasyWebTarget.request().build(request.getMethod().name() , Entity.entity(request.getJson(),ClientConstants.CONTENT_TYPE_JSON));
66+
webRequest= resteasyRequest.build(request.getMethod().name() , Entity.entity(request.getJson(),ClientConstants.CONTENT_TYPE_JSON));
6767
}else{
68-
webRequest = resteasyWebTarget.request().build(request.getMethod().name());
68+
webRequest = resteasyRequest.build(request.getMethod().name());
6969
}
7070

7171
return webRequest.invoke();
@@ -104,7 +104,7 @@ private void populateQueryParams(HttpRequest<R> request) {
104104

105105
for (Map.Entry<String, List<Object>> entry : request.getQueryParams().entrySet()) {
106106
for (Object o : entry.getValue()) {
107-
resteasyWebTarget.queryParam(entry.getKey(), o);
107+
resteasyWebTarget = resteasyWebTarget.queryParam(entry.getKey(), o);
108108
}
109109
}
110110
}
@@ -114,7 +114,7 @@ private void populateHeaders(HttpRequest<R> request) {
114114
if (!request.hasHeaders()) return;
115115

116116
for (Map.Entry<String, Object> h : request.getHeaders().entrySet()) {
117-
resteasyWebTarget.request().header(h.getKey(), h.getValue());
117+
resteasyRequest.header(h.getKey(), h.getValue());
118118
}
119119
}
120120
}

0 commit comments

Comments
 (0)