4.1.2/3

BUILDING.txt

@@ -46,6 +46,5 @@ mvn apache-rat:check
 
 Execute the following commands in order to generate Javadoc:
 
-mvn install
-mvn javadoc:aggregate
+mvn compile javadoc:aggregate
 

NOTICE.txt

@@ -1,5 +1,5 @@
 Apache HttpComponents AsyncClient
-Copyright 2010-2015 The Apache Software Foundation
+Copyright 2010-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

RELEASE_NOTES.txt

@@ -1,3 +1,87 @@
+Release 4.1.4
+-------------------
+
+This is a maintenance release that fixes a number of minor issues discovered since 4.1.2 and upgrades
+HttpCore and HttpClient dependencies.
+
+* [HTTPASYNC-135] HttpAsyncMethods.createHead() methods creates HttpGet objects.
+  Contributed by Mateusz Matela <mateusz dot matela at gmail dot>
+
+* HttpCore upgraded to version 4.4.9
+
+* HttpClient upgraded to version 4.5.5
+
+
+
+Release 4.1.3
+-------------------
+
+Changelog
+-------------------
+
+* HttpCore upgraded to version 4.4.6
+
+* HttpClient upgraded to version 4.5.3
+
+* [HTTPASYNC-110] Default exchange handler fails to correctly re-use fully established tunnelled connection
+  leased from the pool when CONNECT request results in 407 over connection that cannot be kept alive.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* [HTTPASYNC-116] Correct cancellation of client message exchange.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* Fix HttpAsyncMethods#createPost/createPut(URI,byte[],ContentType): set entity to request
+  Contributed by Dmitry Potapov <dpotapov at yandex-team.ru>
+
+
+
+Release 4.1.2
+-------------------
+
+This is a maintenance release that fixes a number of issues discovered since 4.1.1 and upgrades
+HttpCore and HttpClient dependencies.
+
+Changelog
+-------------------
+
+* HttpCore upgraded to version 4.4.5
+
+* HttpClient upgraded to version 4.5.2
+
+* [HTTPASYNC-105] socketTimeout is not reset back to default after a request that has specific 
+  timeout
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* [HTTPASYNC-101 CachingHttpAsyncClient to create default HttpContext if none specified
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+* [HTTPASYNC-97] Upgraded HttpClient OSGi dependency to 4.5
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+
+
+Release 4.1.1
+-------------------
+
+This is a maintenance release that fixes a number of issues discovered since 4.1 and upgrades
+HttpCore and HttpClient dependencies.
+
+Changelog
+-------------------
+
+* HttpCore upgraded to version 4.4.4
+
+* HttpClient upgraded to version 4.5.1
+
+* [HTTPASYNC-92] Fixed osgi bundle imports (added missing 'org.apache.http.ssl')
+  Contributed by Daniel Kulp <dkulp at apache.org>
+
+* HttpAsyncClientBuilder ignores UseSystemProperties setting when initializing SSL context
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
+
+
+
 Release 4.1
 -------------------
 

httpasyncclient-cache/pom.xml

@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-asyncclient</artifactId>
-    <version>4.1.1-SNAPSHOT</version>
+    <version>4.1.4-SNAPSHOT</version>
   </parent>
   <artifactId>httpasyncclient-cache</artifactId>
   <name>Apache HttpAsyncClient Cache</name>

httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousAsyncValidationRequest.java

@@ -94,9 +94,9 @@ public void failed(final Exception e) {
             future.get();
         } catch (final ProtocolException pe) {
             this.log.error("ProtocolException thrown during asynchronous revalidation", pe);
-        } catch (ExecutionException e) {
+        } catch (final ExecutionException e) {
             this.log.error("Exception thrown during asynchronous revalidation", e.getCause());
-        } catch (InterruptedException e) {
+        } catch (final InterruptedException e) {
             Thread.currentThread().interrupt();
         } finally {
             this.parent.markComplete(this.identifier);

httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java

@@ -48,7 +48,8 @@
 import org.apache.http.ProtocolException;
 import org.apache.http.ProtocolVersion;
 import org.apache.http.RequestLine;
-import org.apache.http.annotation.ThreadSafe;
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.cache.CacheResponseStatus;
 import org.apache.http.client.cache.HeaderConstants;
@@ -76,7 +77,7 @@
 import org.apache.http.util.EntityUtils;
 import org.apache.http.util.VersionInfo;
 
-@ThreadSafe // So long as the responseCache implementation is threadsafe
+@Contract(threading = ThreadingBehavior.SAFE) // So long as the responseCache implementation is threadsafe
 public class CachingHttpAsyncClient implements HttpAsyncClient {
 
     private final static boolean SUPPORTS_RANGE_AND_CONTENT_RANGE_HEADERS = false;
@@ -288,7 +289,7 @@ public Future<HttpResponse> execute(
             final FutureCallback<HttpResponse> futureCallback) {
         final BasicFuture<HttpResponse> future = new BasicFuture<HttpResponse>(futureCallback);
         final HttpRequestWrapper request = HttpRequestWrapper.wrap(originalRequest);
-        final HttpCacheContext clientContext = HttpCacheContext.adapt(context);
+        final HttpCacheContext clientContext = context != null ? HttpCacheContext.adapt(context) : HttpCacheContext.create();
         // default response context
         setResponseStatus(clientContext, CacheResponseStatus.CACHE_MISS);
 

httpasyncclient-cache/src/test/java/org/apache/http/impl/client/cache/CachingHttpAsyncClientExecChain.java

@@ -100,21 +100,21 @@ public CloseableHttpResponse execute(
         try {
             final Future<HttpResponse> future = client.execute(route.getTargetHost(), request, context, null);
             return Proxies.enhanceResponse(future.get());
-        } catch (InterruptedException e) {
+        } catch (final InterruptedException e) {
             Thread.currentThread().interrupt();
             return null;
-        } catch (ExecutionException e) {
+        } catch (final ExecutionException e) {
             try {
                 throw e.getCause();
-            } catch (IOException ex) {
+            } catch (final IOException ex) {
                 throw ex;
-            } catch (HttpException ex) {
+            } catch (final HttpException ex) {
                 throw ex;
-            } catch (RuntimeException ex) {
+            } catch (final RuntimeException ex) {
                 throw ex;
-            } catch (Error ex) {
+            } catch (final Error ex) {
                 throw ex;
-            } catch (Throwable ex) {
+            } catch (final Throwable ex) {
                 throw new UndeclaredThrowableException(ex);
             }
         }

httpasyncclient-cache/src/test/java/org/apache/http/impl/client/cache/ClientExecChainAsyncClient.java

@@ -111,9 +111,9 @@ public Future<HttpResponse> execute(
                     HttpRequestWrapper.wrap(request),
                     HttpClientContext.adapt(context), null);
             future.completed(result);
-        } catch (IOException e) {
+        } catch (final IOException e) {
             future.failed(e);
-        } catch (HttpException e) {
+        } catch (final HttpException e) {
             future.failed(e);
         }
         return future;

httpasyncclient-osgi/pom.xml

@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-asyncclient</artifactId>
-    <version>4.1.1-SNAPSHOT</version>
+    <version>4.1.4-SNAPSHOT</version>
   </parent>
   <artifactId>httpasyncclient-osgi</artifactId>
   <name>Apache HttpAsyncClient OSGi bundle</name>
@@ -40,8 +40,8 @@
 
   <properties>
     <httpcore.osgi.import.version>"[4.4.0, 4.5.0)"</httpcore.osgi.import.version>
-    <httpclient.osgi.import.version>"[4.4.0, 4.5.0)"</httpclient.osgi.import.version>
-    <commons-logging.osgi.import.version>"[1.1.0, 1.2.0)"</commons-logging.osgi.import.version>
+    <httpclient.osgi.import.version>"[4.5.0, 4.6.0)"</httpclient.osgi.import.version>
+    <commons-logging.osgi.import.version>"[1.1.0, 1.3.0)"</commons-logging.osgi.import.version>
   </properties>
 
   <dependencies>
@@ -107,7 +107,7 @@
             org.apache.http.conn.ssl;version=${httpclient.osgi.import.version},
             org.apache.http.conn.util;version=${httpclient.osgi.import.version},
             org.apache.http.client;version=${httpclient.osgi.import.version},
-            org.apache.http.client.config;version=${httpcore.osgi.import.version},
+            org.apache.http.client.config;version=${httpclient.osgi.import.version},
             org.apache.http.client.methods;version=${httpclient.osgi.import.version},
             org.apache.http.client.params;version=${httpclient.osgi.import.version},
             org.apache.http.client.protocol;version=${httpclient.osgi.import.version},
@@ -116,7 +116,9 @@
             org.apache.http.impl.cookie;version=${httpclient.osgi.import.version},
             org.apache.http.impl.conn;version=${httpclient.osgi.import.version},
             org.apache.http.impl.client;version=${httpclient.osgi.import.version},
-            org.apache.http.impl.execchain;version=${httpclient.osgi.import.version}
+            org.apache.http.impl.execchain;version=${httpclient.osgi.import.version},
+            org.apache.http.ssl;version=${httpcore.osgi.import.version},
+            *
             </Import-Package>
             <Include-Resource />
             <!-- Stop the JAVA_1_n_HOME variables from being treated as headers by Bnd -->

httpasyncclient/pom.xml

@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpcomponents-asyncclient</artifactId>
-    <version>4.1.1-SNAPSHOT</version>
+    <version>4.1.4-SNAPSHOT</version>
   </parent>
   <artifactId>httpasyncclient</artifactId>
   <name>Apache HttpAsyncClient</name>

httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientAuthentication.java

@@ -26,6 +26,8 @@
  */
 package org.apache.http.examples.nio.client;
 
+import java.util.concurrent.Future;
+
 import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
@@ -35,8 +37,6 @@
 import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
 import org.apache.http.impl.nio.client.HttpAsyncClients;
 
-import java.util.concurrent.Future;
-
 /**
  * A simple example that uses HttpClient to execute an HTTP request against
  * a target site that requires user authentication.
@@ -46,13 +46,14 @@ public class AsyncClientAuthentication {
     public static void main(String[] args) throws Exception {
         CredentialsProvider credsProvider = new BasicCredentialsProvider();
         credsProvider.setCredentials(
-                new AuthScope("localhost", 443),
-                new UsernamePasswordCredentials("username", "password"));
+                new AuthScope("httpbin.org", 80),
+                new UsernamePasswordCredentials("user", "passwd"));
         CloseableHttpAsyncClient httpclient = HttpAsyncClients.custom()
                 .setDefaultCredentialsProvider(credsProvider)
                 .build();
         try {
-            HttpGet httpget = new HttpGet("http://localhost/");
+            httpclient.start();
+            HttpGet httpget = new HttpGet("http://httpbin.org/basic-auth/user/passwd");
 
             System.out.println("Executing request " + httpget.getRequestLine());
             Future<HttpResponse> future = httpclient.execute(httpget, null);

httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientConfiguration.java

@@ -42,6 +42,8 @@
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.ParseException;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CookieStore;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.config.AuthSchemes;
@@ -201,6 +203,7 @@ public InetAddress[] resolve(final String host) throws UnknownHostException {
         CookieStore cookieStore = new BasicCookieStore();
         // Use custom credentials provider if necessary.
         CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(new AuthScope("localhost", 8889), new UsernamePasswordCredentials("squid", "nopassword"));
         // Create global request configuration
         RequestConfig defaultRequestConfig = RequestConfig.custom()
             .setCookieSpec(CookieSpecs.DEFAULT)
@@ -214,19 +217,19 @@ public InetAddress[] resolve(final String host) throws UnknownHostException {
             .setConnectionManager(connManager)
             .setDefaultCookieStore(cookieStore)
             .setDefaultCredentialsProvider(credentialsProvider)
-            .setProxy(new HttpHost("myproxy", 8080))
+            .setProxy(new HttpHost("localhost", 8889))
             .setDefaultRequestConfig(defaultRequestConfig)
             .build();
 
         try {
-            HttpGet httpget = new HttpGet("http://localhost/");
+            HttpGet httpget = new HttpGet("http://httpbin.org/get");
             // Request configuration can be overridden at the request level.
             // They will take precedence over the one set at the client level.
             RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig)
                 .setSocketTimeout(5000)
                 .setConnectTimeout(5000)
                 .setConnectionRequestTimeout(5000)
-                .setProxy(new HttpHost("myotherproxy", 8080))
+                .setProxy(new HttpHost("localhost", 8888))
                 .build();
             httpget.setConfig(requestConfig);
 

httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientCustomContext.java

@@ -27,18 +27,19 @@
 
 package org.apache.http.examples.nio.client;
 
+import java.util.List;
+import java.util.concurrent.Future;
+
 import org.apache.http.HttpResponse;
 import org.apache.http.client.CookieStore;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.cookie.BasicClientCookie;
 import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
 import org.apache.http.impl.nio.client.HttpAsyncClients;
 
-import java.util.List;
-import java.util.concurrent.Future;
-
 /**
  * This example demonstrates the use of a local HTTP context populated with
  * custom attributes.
@@ -48,6 +49,8 @@ public class AsyncClientCustomContext {
     public final static void main(String[] args) throws Exception {
         CloseableHttpAsyncClient httpclient = HttpAsyncClients.createDefault();
         try {
+            httpclient.start();
+
             // Create a local instance of cookie store
             CookieStore cookieStore = new BasicCookieStore();
 
@@ -56,10 +59,13 @@ public final static void main(String[] args) throws Exception {
             // Bind custom cookie store to the local context
             localContext.setCookieStore(cookieStore);
 
-            HttpGet httpget = new HttpGet("http://localhost/");
-            System.out.println("Executing request " + httpget.getRequestLine());
+            BasicClientCookie cookie = new BasicClientCookie("stuff", "important");
+            cookie.setDomain("httpbin.org");
+            cookie.setPath("/");
+            cookieStore.addCookie(cookie);
 
-            httpclient.start();
+            HttpGet httpget = new HttpGet("http://httpbin.org/cookies");
+            System.out.println("Executing request " + httpget.getRequestLine());
 
             // Pass local context as a parameter
             Future<HttpResponse> future = httpclient.execute(httpget, localContext, null);