Fix for https://issues.sonatype.org/browse/AHC-83

("Remove type parameter from AsyncHttpProvider interface")

Author: jfarcand

src/main/java/com/ning/http/client/AsyncHttpClient.java

@@ -142,7 +142,7 @@
 public class AsyncHttpClient {
 
     private final static String DEFAULT_PROVIDER = "com.ning.http.client.providers.netty.NettyAsyncHttpProvider";
-    private final AsyncHttpProvider<?> httpProvider;
+    private final AsyncHttpProvider httpProvider;
     private final AsyncHttpClientConfig config;
     private final static Logger logger = LoggerFactory.getLogger(AsyncHttpClient.class);
     private final AtomicBoolean isClosed = new AtomicBoolean(false);
@@ -167,7 +167,7 @@ public AsyncHttpClient() {
      * the default {@link AsyncHttpClientConfig} configuration.
      * @param provider a {@link AsyncHttpProvider}
      */
-    public AsyncHttpClient(AsyncHttpProvider<?> provider) {
+    public AsyncHttpClient(AsyncHttpProvider provider) {
         this(provider,new AsyncHttpClientConfig.Builder().build());
     }
 
@@ -186,7 +186,7 @@ public AsyncHttpClient(AsyncHttpClientConfig config) {
      * @param config a {@link AsyncHttpClientConfig}
      * @param httpProvider a {@link AsyncHttpProvider}
      */
-    public AsyncHttpClient(AsyncHttpProvider<?> httpProvider, AsyncHttpClientConfig config) {
+    public AsyncHttpClient(AsyncHttpProvider httpProvider, AsyncHttpClientConfig config) {
         this.config = config;
         this.httpProvider = httpProvider;
     }
@@ -349,7 +349,7 @@ public BoundRequestBuilder setSignatureCalculator(SignatureCalculator signatureC
      * Return the asynchronous {@link com.ning.http.client.AsyncHttpProvider}
      * @return an {@link com.ning.http.client.AsyncHttpProvider}
      */
-    public AsyncHttpProvider<?> getProvider() {
+    public AsyncHttpProvider getProvider() {
         return httpProvider;
     }
 
@@ -531,17 +531,17 @@ private FilterContext preProcessRequest(FilterContext fc) throws IOException {
     }
 
     @SuppressWarnings("unchecked")
-    private final static AsyncHttpProvider<?> loadDefaultProvider(String className, AsyncHttpClientConfig config){
+    private final static AsyncHttpProvider loadDefaultProvider(String className, AsyncHttpClientConfig config){
         try {
-            Class<AsyncHttpProvider<?>> providerClass = (Class<AsyncHttpProvider<?>>) Thread.currentThread()
+            Class<AsyncHttpProvider> providerClass = (Class<AsyncHttpProvider>) Thread.currentThread()
                     .getContextClassLoader().loadClass(className);
             return providerClass.getDeclaredConstructor(
                     new Class[]{AsyncHttpClientConfig.class}).newInstance(new Object[]{config});
         } catch (Throwable t){
 
             // Let's try with another classloader
             try {
-                Class<AsyncHttpProvider<?>> providerClass = (Class<AsyncHttpProvider<?>>)
+                Class<AsyncHttpProvider> providerClass = (Class<AsyncHttpProvider>)
                         AsyncHttpClient.class.getClassLoader().loadClass(className);
                 return providerClass.getDeclaredConstructor(
                         new Class[]{AsyncHttpClientConfig.class}).newInstance(new Object[]{config});

src/main/java/com/ning/http/client/AsyncHttpProvider.java

@@ -17,13 +17,12 @@
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.concurrent.Future;
 
 /**
  * Interface to be used when implementing custom asynchronous I/O HTTP client.
  * By default, the {@link com.ning.http.client.providers.netty.NettyAsyncHttpProvider} is used.
  */
-public interface AsyncHttpProvider<A> {
+public interface AsyncHttpProvider {
 
     /**
      * Execute the request and invoke the {@link AsyncHandler} when the response arrive.

src/main/java/com/ning/http/client/HttpContent.java

@@ -21,15 +21,15 @@
  * Base class for callback class used by {@link com.ning.http.client.AsyncHandler}
  */
 public class HttpContent {
-    protected final AsyncHttpProvider<?> provider;
+    protected final AsyncHttpProvider provider;
     protected final URI uri;
 
-    protected HttpContent(URI url, AsyncHttpProvider<?> provider) {
+    protected HttpContent(URI url, AsyncHttpProvider provider) {
         this.provider = provider;
         this.uri= url;
     }
 
-    public final AsyncHttpProvider<?> provider() {
+    public final AsyncHttpProvider provider() {
         return provider;
     }
 

src/main/java/com/ning/http/client/HttpResponseBodyPart.java

@@ -25,7 +25,7 @@
  */
 public abstract class HttpResponseBodyPart extends HttpContent {
 
-    public HttpResponseBodyPart(URI uri, AsyncHttpProvider<?> provider) {
+    public HttpResponseBodyPart(URI uri, AsyncHttpProvider provider) {
         super(uri, provider);
     }
 

src/main/java/com/ning/http/client/HttpResponseHeaders.java

@@ -24,12 +24,12 @@ public abstract class HttpResponseHeaders extends HttpContent {
 
     private final boolean traillingHeaders;
 
-    public HttpResponseHeaders(URI uri, AsyncHttpProvider<?> provider) {
+    public HttpResponseHeaders(URI uri, AsyncHttpProvider provider) {
         super(uri, provider);
         this.traillingHeaders = false;
     }
 
-    public HttpResponseHeaders(URI uri, AsyncHttpProvider<?> provider, boolean traillingHeaders) {
+    public HttpResponseHeaders(URI uri, AsyncHttpProvider provider, boolean traillingHeaders) {
         super(uri, provider);
         this.traillingHeaders = traillingHeaders;
 

src/main/java/com/ning/http/client/HttpResponseStatus.java

@@ -23,7 +23,7 @@
  */
 public abstract class HttpResponseStatus extends HttpContent {
 
-    public HttpResponseStatus(URI uri, AsyncHttpProvider<?> provider) {
+    public HttpResponseStatus(URI uri, AsyncHttpProvider provider) {
         super(uri, provider);
     }
 

src/main/java/com/ning/http/client/providers/apache/ApacheAsyncHttpProvider.java

@@ -119,7 +119,7 @@
 /**
  * An {@link com.ning.http.client.AsyncHttpProvider} for Apache Http Client 3.1
  */
-public class ApacheAsyncHttpProvider implements AsyncHttpProvider<HttpClient> {
+public class ApacheAsyncHttpProvider implements AsyncHttpProvider {
     private final static Logger logger = LoggerFactory.getLogger(ApacheAsyncHttpProvider.class);
 
     private final AsyncHttpClientConfig config;

src/main/java/com/ning/http/client/providers/apache/ApacheResponseBodyPart.java

@@ -14,7 +14,6 @@
 
 import com.ning.http.client.AsyncHttpProvider;
 import com.ning.http.client.HttpResponseBodyPart;
-import org.apache.commons.httpclient.HttpClient;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -28,7 +27,7 @@ public class ApacheResponseBodyPart extends HttpResponseBodyPart {
 
     private final byte[] chunk;
 
-    public ApacheResponseBodyPart(URI uri, byte[] chunk, AsyncHttpProvider<HttpClient> provider) {
+    public ApacheResponseBodyPart(URI uri, byte[] chunk, AsyncHttpProvider provider) {
         super(uri, provider);
         this.chunk = chunk;
     }

src/main/java/com/ning/http/client/providers/apache/ApacheResponseHeaders.java

@@ -16,7 +16,6 @@
 import com.ning.http.client.FluentCaseInsensitiveStringsMap;
 import com.ning.http.client.HttpResponseHeaders;
 import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethodBase;
 
 import java.net.URI;
@@ -29,7 +28,7 @@ public class ApacheResponseHeaders extends HttpResponseHeaders {
     private final HttpMethodBase method;
     private final FluentCaseInsensitiveStringsMap headers;
 
-    public ApacheResponseHeaders(URI uri, HttpMethodBase method, AsyncHttpProvider<HttpClient> provider) {
+    public ApacheResponseHeaders(URI uri, HttpMethodBase method, AsyncHttpProvider provider) {
         super(uri, provider, false);
         this.method = method;
         headers = computerHeaders();

src/main/java/com/ning/http/client/providers/apache/ApacheResponseStatus.java

@@ -14,7 +14,6 @@
 
 import com.ning.http.client.AsyncHttpProvider;
 import com.ning.http.client.HttpResponseStatus;
-import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethodBase;
 
 import java.net.URI;
@@ -26,7 +25,7 @@ public class ApacheResponseStatus extends HttpResponseStatus {
 
     private final HttpMethodBase method;
 
-    public ApacheResponseStatus(URI uri, HttpMethodBase method, AsyncHttpProvider<HttpClient> provider) {
+    public ApacheResponseStatus(URI uri, HttpMethodBase method, AsyncHttpProvider provider) {
         super(uri, provider);
         this.method = method;
     }

src/main/java/com/ning/http/client/providers/jdk/JDKAsyncHttpProvider.java

@@ -81,7 +81,7 @@
 
 import static com.ning.http.util.AsyncHttpProviderUtils.DEFAULT_CHARSET;
 
-public class JDKAsyncHttpProvider implements AsyncHttpProvider<HttpURLConnection> {
+public class JDKAsyncHttpProvider implements AsyncHttpProvider {
     private final static Logger logger = LoggerFactory.getLogger(JDKAsyncHttpProvider.class);
 
     private final static String NTLM_DOMAIN = "http.auth.ntlm.domain";

src/main/java/com/ning/http/client/providers/jdk/ResponseBodyPart.java

@@ -17,7 +17,6 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.net.HttpURLConnection;
 import java.net.URI;
 import java.nio.ByteBuffer;
 
@@ -28,7 +27,7 @@ public class ResponseBodyPart extends HttpResponseBodyPart {
 
     private final byte[] chunk;
 
-    public ResponseBodyPart(URI uri, byte[] chunk, AsyncHttpProvider<HttpURLConnection> provider) {
+    public ResponseBodyPart(URI uri, byte[] chunk, AsyncHttpProvider provider) {
         super(uri, provider);
         this.chunk = chunk;
     }

src/main/java/com/ning/http/client/providers/jdk/ResponseHeaders.java

@@ -29,7 +29,7 @@ public class ResponseHeaders extends HttpResponseHeaders {
     private final HttpURLConnection urlConnection;
     private final FluentCaseInsensitiveStringsMap headers;
 
-    public ResponseHeaders(URI uri, HttpURLConnection urlConnection, AsyncHttpProvider<HttpURLConnection> provider) {
+    public ResponseHeaders(URI uri, HttpURLConnection urlConnection, AsyncHttpProvider provider) {
         super(uri, provider, false);
         this.urlConnection = urlConnection;
         headers = computerHeaders();

src/main/java/com/ning/http/client/providers/jdk/ResponseStatus.java

@@ -26,7 +26,7 @@ public class ResponseStatus extends HttpResponseStatus {
 
     private final HttpURLConnection urlConnection;
 
-    public ResponseStatus(URI uri, HttpURLConnection urlConnection, AsyncHttpProvider<HttpURLConnection> provider) {
+    public ResponseStatus(URI uri, HttpURLConnection urlConnection, AsyncHttpProvider provider) {
         super(uri, provider);
         this.urlConnection = urlConnection;
     }

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -124,7 +124,7 @@
 import static com.ning.http.util.AsyncHttpProviderUtils.DEFAULT_CHARSET;
 import static org.jboss.netty.channel.Channels.pipeline;
 
-public class NettyAsyncHttpProvider extends SimpleChannelUpstreamHandler implements AsyncHttpProvider<HttpResponse> {
+public class NettyAsyncHttpProvider extends SimpleChannelUpstreamHandler implements AsyncHttpProvider {
     private final static String HTTP_HANDLER = "httpHandler";
     final static String SSL_HANDLER = "sslHandler";
     private final static String HTTPS = "https";

src/main/java/com/ning/http/client/providers/netty/ResponseBodyPart.java

@@ -36,13 +36,13 @@ public class ResponseBodyPart extends HttpResponseBodyPart {
     private final HttpResponse response;
     private final AtomicReference<byte[]> bytes = new AtomicReference(null);
 
-    public ResponseBodyPart(URI uri, HttpResponse response, AsyncHttpProvider<HttpResponse> provider) {
+    public ResponseBodyPart(URI uri, HttpResponse response, AsyncHttpProvider provider) {
         super(uri, provider);
         this.chunk = null;
         this.response = response;
     }
 
-    public ResponseBodyPart(URI uri, HttpResponse response, AsyncHttpProvider<HttpResponse> provider, HttpChunk chunk) {
+    public ResponseBodyPart(URI uri, HttpResponse response, AsyncHttpProvider provider, HttpChunk chunk) {
         super(uri, provider);
         this.chunk = chunk;
         this.response = response;

src/main/java/com/ning/http/client/providers/netty/ResponseHeaders.java

@@ -32,14 +32,14 @@ public class ResponseHeaders extends HttpResponseHeaders {
     private final HttpResponse response;
     private final FluentCaseInsensitiveStringsMap headers;
 
-    public ResponseHeaders(URI uri, HttpResponse response, AsyncHttpProvider<HttpResponse> provider) {
+    public ResponseHeaders(URI uri, HttpResponse response, AsyncHttpProvider provider) {
         super(uri, provider, false);
         this.trailingHeaders = null;
         this.response = response;
         headers = computerHeaders();
     }
 
-    public ResponseHeaders(URI uri, HttpResponse response, AsyncHttpProvider<HttpResponse> provider, HttpChunkTrailer traillingHeaders) {
+    public ResponseHeaders(URI uri, HttpResponse response, AsyncHttpProvider provider, HttpChunkTrailer traillingHeaders) {
         super(uri, provider, true);
         this.trailingHeaders = traillingHeaders;
         this.response = response;

src/main/java/com/ning/http/client/providers/netty/ResponseStatus.java

@@ -29,7 +29,7 @@ public class ResponseStatus extends HttpResponseStatus {
 
     private final HttpResponse response;
 
-    public ResponseStatus(URI uri, HttpResponse response, AsyncHttpProvider<HttpResponse> provider) {
+    public ResponseStatus(URI uri, HttpResponse response, AsyncHttpProvider provider) {
         super(uri, provider);
         this.response = response;
     }