resteasy: remove the ClientRequestFactory

simon3z · simon3z · commit 83709af11d08 · 2013-06-06T20:02:00.000+02:00
In order to better support concurrent requests and unclosed or pending
byte streams, the ClientRequestFactory has been removed.

Signed-off-by: Federico Simoncelli &lt;fsimonce@redhat.com&gt;
diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java
@@ -4,6 +4,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.ext.ContextResolver;
 
 import org.apache.commons.httpclient.HttpStatus;
@@ -30,7 +31,7 @@ public class RESTEasyConnector implements OpenStackClientConnector {
 
 	public static ObjectMapper WRAPPED_MAPPER;
 
-	public static ClientRequestFactory CLIENT_FACTORY;
+	private static ResteasyProviderFactory providerFactory;
 
 	static {
 		DEFAULT_MAPPER = new ObjectMapper();
@@ -47,7 +48,7 @@ public class RESTEasyConnector implements OpenStackClientConnector {
 		WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
 		WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
-		ResteasyProviderFactory providerFactory = new ResteasyProviderFactory();
+		providerFactory = new ResteasyProviderFactory();
 		providerFactory.addContextResolver(new ContextResolver<ObjectMapper>() {
 			public ObjectMapper getContext(Class<?> type) {
 				return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER;
@@ -61,12 +62,11 @@ public ObjectMapper getContext(Class<?> type) {
 		InputStreamProvider streamProvider = new InputStreamProvider();
 		providerFactory.addMessageBodyReader(streamProvider);
 		providerFactory.addMessageBodyWriter(streamProvider);
-
-		CLIENT_FACTORY = new ClientRequestFactory(ClientRequest.getDefaultExecutor(), providerFactory);
 	}
 
 	public <T> OpenStackResponse request(OpenStackRequest<T> request) {
-		ClientRequest client = CLIENT_FACTORY.createRequest(request.endpoint() + "/" + request.path());
+		ClientRequest client = new ClientRequest(UriBuilder.fromUri(request.endpoint() + "/" + request.path()),
+				ClientRequest.getDefaultExecutor(), providerFactory);
 
 		for(Map.Entry<String, Object> entry : request.queryParams().entrySet()) {
 			client = client.queryParameter(entry.getKey(), String.valueOf(entry.getValue()));
