Upgraded HttpCore to version 4.4; upgraded HttpClient to version 4.4
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpasyncclient/trunk@1657869 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java b/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
index 22e9d96..9f2e425 100644
--- a/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
+++ b/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
@@ -384,7 +384,7 @@
&& !staleResponseNotAllowed(request, entry, now)
&& this.validityPolicy.mayReturnStaleWhileRevalidating(entry, now)) {
this.log.debug("Serving stale with asynchronous revalidation");
- final HttpResponse resp = this.responseGenerator.generateResponse(entry);
+ final HttpResponse resp = this.responseGenerator.generateResponse(request, entry);
resp.addHeader(HeaderConstants.WARNING, "110 localhost \"Response is stale\"");
this.asynchAsyncRevalidator.revalidateCacheEntry(target, request, clientContext, entry);
@@ -502,7 +502,7 @@
}
private HttpResponse generateCachedResponse(
- final HttpRequest request,
+ final HttpRequestWrapper request,
final HttpCacheContext clientContext,
final HttpCacheEntry entry,
final Date now) {
@@ -511,7 +511,7 @@
|| request.containsHeader(HeaderConstants.IF_MODIFIED_SINCE)) {
cachedResponse = this.responseGenerator.generateNotModifiedResponse(entry);
} else {
- cachedResponse = this.responseGenerator.generateResponse(entry);
+ cachedResponse = this.responseGenerator.generateResponse(request, entry);
}
setResponseStatus(clientContext, CacheResponseStatus.CACHE_HIT);
if (this.validityPolicy.getStalenessSecs(entry, now) > 0L) {
@@ -521,14 +521,14 @@
}
private HttpResponse handleRevalidationFailure(
- final HttpRequest request,
+ final HttpRequestWrapper request,
final HttpCacheContext clientContext,
final HttpCacheEntry entry,
final Date now) {
if (staleResponseNotAllowed(request, entry, now)) {
return generateGatewayTimeout(clientContext);
}
- return unvalidatedCacheHit(clientContext, entry);
+ return unvalidatedCacheHit(clientContext, request, entry);
}
private HttpResponse generateGatewayTimeout(final HttpCacheContext clientContext) {
@@ -539,8 +539,9 @@
private HttpResponse unvalidatedCacheHit(
final HttpCacheContext clientContext,
+ final HttpRequestWrapper request,
final HttpCacheEntry entry) {
- final HttpResponse cachedResponse = this.responseGenerator.generateResponse(entry);
+ final HttpResponse cachedResponse = this.responseGenerator.generateResponse(request, entry);
setResponseStatus(clientContext, CacheResponseStatus.CACHE_HIT);
cachedResponse.addHeader(HeaderConstants.WARNING, "111 localhost \"Revalidation failed\"");
return cachedResponse;
@@ -762,7 +763,7 @@
conditionalRequest, requestDate, responseDate, httpResponse,
matchingVariant, matchedEntry);
- final HttpResponse resp = CachingHttpAsyncClient.this.responseGenerator.generateResponse(responseEntry);
+ final HttpResponse resp = CachingHttpAsyncClient.this.responseGenerator.generateResponse(request, responseEntry);
tryToUpdateVariantMap(target, request, matchingVariant);
if (shouldSendNotModifiedResponse(request, responseEntry)) {
@@ -904,14 +905,14 @@
future.completed(CachingHttpAsyncClient.this.responseGenerator.generateNotModifiedResponse(updatedEntry));
return;
}
- future.completed(CachingHttpAsyncClient.this.responseGenerator.generateResponse(updatedEntry));
+ future.completed(CachingHttpAsyncClient.this.responseGenerator.generateResponse(request, updatedEntry));
return;
}
if (staleIfErrorAppliesTo(statusCode)
&& !staleResponseNotAllowed(request, cacheEntry, getCurrentDate())
&& CachingHttpAsyncClient.this.validityPolicy.mayReturnStaleIfError(request, cacheEntry, responseDate)) {
- final HttpResponse cachedResponse = CachingHttpAsyncClient.this.responseGenerator.generateResponse(cacheEntry);
+ final HttpResponse cachedResponse = CachingHttpAsyncClient.this.responseGenerator.generateResponse(request, cacheEntry);
cachedResponse.addHeader(HeaderConstants.WARNING, "110 localhost \"Response is stale\"");
future.completed(cachedResponse);
return;
diff --git a/httpasyncclient/src/test/java/org/apache/http/impl/nio/conn/TestPoolingHttpClientAsyncConnectionManager.java b/httpasyncclient/src/test/java/org/apache/http/impl/nio/conn/TestPoolingHttpClientAsyncConnectionManager.java
index cf0d891..fba6a90 100644
--- a/httpasyncclient/src/test/java/org/apache/http/impl/nio/conn/TestPoolingHttpClientAsyncConnectionManager.java
+++ b/httpasyncclient/src/test/java/org/apache/http/impl/nio/conn/TestPoolingHttpClientAsyncConnectionManager.java
@@ -280,7 +280,7 @@
@Test
public void testConnectionInitializeHttps() throws Exception {
- final HttpHost target = new HttpHost("somehost", -1, "https");
+ final HttpHost target = new HttpHost("somehost", 443, "https");
final HttpRoute route = new HttpRoute(target, null, true);
final HttpContext context = new BasicHttpContext();
@@ -300,7 +300,7 @@
@Test
public void testConnectionInitializeContextSpecific() throws Exception {
- final HttpHost target = new HttpHost("somehost", -1, "http11");
+ final HttpHost target = new HttpHost("somehost", 80, "http11");
final HttpRoute route = new HttpRoute(target);
final HttpContext context = new BasicHttpContext();
@@ -343,7 +343,7 @@
@Test
public void testConnectionUpgrade() throws Exception {
- final HttpHost target = new HttpHost("somehost", -1, "https");
+ final HttpHost target = new HttpHost("somehost", 443, "https");
final HttpRoute route = new HttpRoute(target);
final HttpContext context = new BasicHttpContext();
@@ -380,7 +380,7 @@
@Test(expected=UnsupportedSchemeException.class)
public void testConnectionUpgradeIllegalScheme() throws Exception {
- final HttpHost target = new HttpHost("somehost", -1, "http");
+ final HttpHost target = new HttpHost("somehost", 80, "http");
final HttpRoute route = new HttpRoute(target);
final HttpContext context = new BasicHttpContext();
@@ -397,7 +397,7 @@
@Test
public void testConnectionRouteComplete() throws Exception {
- final HttpHost target = new HttpHost("somehost", -1, "http");
+ final HttpHost target = new HttpHost("somehost", 80, "http");
final HttpRoute route = new HttpRoute(target);
final HttpContext context = new BasicHttpContext();
@@ -429,7 +429,7 @@
connman.getDefaultMaxPerRoute();
Mockito.verify(pool).getDefaultMaxPerRoute();
- final HttpRoute route = new HttpRoute(new HttpHost("somehost"));
+ final HttpRoute route = new HttpRoute(new HttpHost("somehost", 80));
connman.getMaxPerRoute(route);
Mockito.verify(pool).getMaxPerRoute(route);
@@ -455,10 +455,10 @@
final InternalConnectionFactory internalConnFactory = new InternalConnectionFactory(
configData, connFactory);
- final HttpRoute route = new HttpRoute(new HttpHost("somehost"));
+ final HttpRoute route = new HttpRoute(new HttpHost("somehost", 80));
internalConnFactory.create(route, iosession);
- Mockito.verify(sslStrategy, Mockito.never()).upgrade(Mockito.eq(new HttpHost("somehost")),
+ Mockito.verify(sslStrategy, Mockito.never()).upgrade(Mockito.eq(new HttpHost("somehost", 80)),
Mockito.<IOSession>any());
Mockito.verify(connFactory).create(Mockito.same(iosession), Mockito.<ConnectionConfig>any());
}
@@ -469,7 +469,7 @@
final InternalConnectionFactory internalConnFactory = new InternalConnectionFactory(
configData, connFactory);
- final HttpHost target = new HttpHost("somehost");
+ final HttpHost target = new HttpHost("somehost", 80);
final HttpHost proxy = new HttpHost("someproxy", 8888);
final HttpRoute route = new HttpRoute(target, null, proxy, false);
@@ -487,7 +487,7 @@
final InternalConnectionFactory internalConnFactory = new InternalConnectionFactory(
configData, connFactory);
- final HttpHost target = new HttpHost("somehost");
+ final HttpHost target = new HttpHost("somehost", 80);
final HttpRoute route = new HttpRoute(target);
final ConnectionConfig config = ConnectionConfig.custom().build();
@@ -504,7 +504,7 @@
final InternalConnectionFactory internalConnFactory = new InternalConnectionFactory(
configData, connFactory);
- final HttpHost target = new HttpHost("somehost");
+ final HttpHost target = new HttpHost("somehost", 80);
final HttpRoute route = new HttpRoute(target);
final ConnectionConfig config = ConnectionConfig.custom().build();
@@ -521,7 +521,7 @@
final InternalConnectionFactory internalConnFactory = new InternalConnectionFactory(
configData, connFactory);
- final HttpHost target = new HttpHost("somehost");
+ final HttpHost target = new HttpHost("somehost", 80);
final HttpRoute route = new HttpRoute(target);
configData.setDefaultConnectionConfig(null);
@@ -563,7 +563,7 @@
final InternalAddressResolver addressResolver = new InternalAddressResolver(
schemePortResolver, dnsResolver);
- final HttpHost target = new HttpHost("somehost");
+ final HttpHost target = new HttpHost("somehost", 80);
final HttpRoute route = new HttpRoute(target);
Mockito.when(schemePortResolver.resolve(target)).thenReturn(123);
@@ -582,7 +582,7 @@
final InternalAddressResolver addressResolver = new InternalAddressResolver(
schemePortResolver, dnsResolver);
- final HttpHost target = new HttpHost("somehost");
+ final HttpHost target = new HttpHost("somehost", 80);
final HttpHost proxy = new HttpHost("someproxy");
final HttpRoute route = new HttpRoute(target, null, proxy, false);
diff --git a/pom.xml b/pom.xml
index 0cae3f3..5f057b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,8 +66,8 @@
<properties>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
- <httpcore.version>4.4-beta1</httpcore.version>
- <httpclient.version>4.4-beta1</httpclient.version>
+ <httpcore.version>4.4</httpcore.version>
+ <httpclient.version>4.4</httpclient.version>
<commons-logging.version>1.2</commons-logging.version>
<commons-io.version>2.4</commons-io.version>
<junit.version>4.11</junit.version>
