You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2018/10/21 11:42:30 UTC
[1/3] httpcomponents-client git commit: Upgraded HttpCore to version
5.0-beta5
Repository: httpcomponents-client
Updated Branches:
refs/heads/master 674df3aa9 -> 2b6f7e53d
Upgraded HttpCore to version 5.0-beta5
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/ab7be3fd
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/ab7be3fd
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/ab7be3fd
Branch: refs/heads/master
Commit: ab7be3fd537aa678a26ed24319e9c076269d03e5
Parents: 674df3a
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Thu Oct 18 11:27:21 2018 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sun Oct 21 13:24:49 2018 +0200
----------------------------------------------------------------------
.../hc/client5/http/cache/HttpCacheEntry.java | 35 +++++++++++++++++---
.../http/impl/cache/BasicHttpAsyncCache.java | 2 +-
.../client5/http/impl/cache/BasicHttpCache.java | 2 +-
.../http/impl/cache/CacheUpdateHandler.java | 10 +++---
.../http/impl/cache/CacheableRequestPolicy.java | 2 +-
.../impl/cache/CachedHttpResponseGenerator.java | 2 +-
.../impl/cache/ConditionalRequestBuilder.java | 4 +--
.../http/impl/cache/ResponseCachingPolicy.java | 8 ++---
.../client5/http/cache/TestHttpCacheEntry.java | 2 +-
.../http/impl/cache/HttpCacheEntryMatcher.java | 4 +--
.../client5/http/impl/cache/HttpTestUtils.java | 2 +-
.../http/impl/cache/TestCacheUpdateHandler.java | 2 +-
.../cache/TestConditionalRequestBuilder.java | 20 +++++------
.../sync/TestMinimalClientRequestExecution.java | 2 +-
.../examples/AsyncClientHttp2ServerPush.java | 14 ++++++--
.../AsyncClientHttpExchangeStreaming.java | 7 +++-
.../client5/http/examples/AsyncQuickStart.java | 7 +++-
.../http/async/methods/AsyncRequestBuilder.java | 2 +-
.../http/classic/methods/RequestBuilder.java | 4 +--
.../http/impl/async/AsyncRedirectExec.java | 2 +-
.../async/InternalHttpAsyncExecRuntime.java | 5 +--
.../http/impl/async/LoggingIOSession.java | 13 ++++----
.../http/impl/async/MinimalHttpAsyncClient.java | 5 +++
.../impl/classic/CloseableHttpResponse.java | 33 ++++++++++++++++--
.../http/impl/classic/InternalExecRuntime.java | 4 +--
.../client5/http/impl/classic/RedirectExec.java | 2 +-
.../io/BasicHttpClientConnectionManager.java | 4 +--
.../io/DefaultManagedHttpClientConnection.java | 19 ++++++-----
.../io/PoolingHttpClientConnectionManager.java | 4 +--
.../DefaultAsyncClientConnectionOperator.java | 4 +--
.../DefaultManagedAsyncClientConnection.java | 17 +++++-----
.../impl/nio/MultihomeIOSessionRequester.java | 6 ++--
.../impl/nio/MultuhomeConnectionInitiator.java | 6 ++--
.../PoolingAsyncClientConnectionManager.java | 6 ++--
.../hc/client5/http/io/ConnectionEndpoint.java | 3 +-
.../http/nio/AsyncClientConnectionManager.java | 4 +--
.../http/nio/AsyncClientConnectionOperator.java | 4 +--
.../http/nio/AsyncConnectionEndpoint.java | 3 +-
.../impl/classic/TestInternalExecRuntime.java | 4 +--
.../http/impl/classic/TestRetryExec.java | 2 +-
.../protocol/TestRequestExpectContinue.java | 2 +-
pom.xml | 7 +++-
42 files changed, 190 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java
index 1affd69..ae00f77 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheEntry.java
@@ -163,7 +163,7 @@ public class HttpCacheEntry implements MessageHeaders, Serializable {
* Returns all the headers that were on the origin response.
*/
@Override
- public Header[] getAllHeaders() {
+ public Header[] getHeaders() {
final HeaderGroup filteredHeaders = new HeaderGroup();
for (final Iterator<Header> iterator = responseHeaders.headerIterator(); iterator.hasNext();) {
final Header header = iterator.next();
@@ -171,7 +171,16 @@ public class HttpCacheEntry implements MessageHeaders, Serializable {
filteredHeaders.addHeader(header);
}
}
- return filteredHeaders.getAllHeaders();
+ return filteredHeaders.getHeaders();
+ }
+
+ /**
+ * @deprecated use {@link #getHeaders()}
+ */
+ @Override
+ @Deprecated
+ public Header[] getAllHeaders() {
+ return getHeaders();
}
/**
@@ -218,16 +227,34 @@ public class HttpCacheEntry implements MessageHeaders, Serializable {
* @since 5.0
*/
@Override
+ public int countHeaders(final String name) {
+ return responseHeaders.countHeaders(name);
+ }
+
+ /**
+ * @deprecated use {@link #countHeaders(String)}
+ */
+ @Override
+ @Deprecated
public int containsHeaders(final String name) {
- return responseHeaders.containsHeaders(name);
+ return countHeaders(name);
}
/**
* @since 5.0
*/
@Override
+ public Header getHeader(final String name) throws ProtocolException {
+ return responseHeaders.getHeader(name);
+ }
+
+ /**
+ * @deprecated use {@link #getHeader(String)}
+ */
+ @Override
+ @Deprecated
public Header getSingleHeader(final String name) throws ProtocolException {
- return responseHeaders.getSingleHeader(name);
+ return getHeader(name);
}
/**
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java
index 2620da2..f936bc1 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java
@@ -454,7 +454,7 @@ class BasicHttpAsyncCache implements HttpAsyncCache {
requestSent,
responseReceived,
originResponse.getCode(),
- originResponse.getAllHeaders(),
+ originResponse.getHeaders(),
content != null ? HeapResourceFactory.INSTANCE.generate(null, content.array(), 0, content.length()) : null));
return Operations.nonCancellable();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
index ba27808..8343e94 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
@@ -296,7 +296,7 @@ class BasicHttpCache implements HttpCache {
requestSent,
responseReceived,
originResponse.getCode(),
- originResponse.getAllHeaders(),
+ originResponse.getHeaders(),
content != null ? HeapResourceFactory.INSTANCE.generate(null, content.array(), 0, content.length()) : null);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheUpdateHandler.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheUpdateHandler.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheUpdateHandler.java
index 3ee2fe9..d0ea32c 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheUpdateHandler.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheUpdateHandler.java
@@ -76,7 +76,7 @@ class CacheUpdateHandler {
requestSent,
responseReceived,
originResponse.getCode(),
- originResponse.getAllHeaders(),
+ originResponse.getHeaders(),
content != null ? resourceFactory.generate(request.getRequestUri(), content.array(), 0, content.length()) : null);
}
@@ -126,17 +126,17 @@ class CacheUpdateHandler {
src.getRequestDate(),
src.getResponseDate(),
src.getStatus(),
- src.getAllHeaders(),
+ src.getHeaders(),
resource,
variantMap);
}
private Header[] mergeHeaders(final HttpCacheEntry entry, final HttpResponse response) {
if (DateUtils.isAfter(entry, response, HttpHeaders.DATE)) {
- return entry.getAllHeaders();
+ return entry.getHeaders();
}
final HeaderGroup headerGroup = new HeaderGroup();
- headerGroup.setHeaders(entry.getAllHeaders());
+ headerGroup.setHeaders(entry.getHeaders());
// Remove cache headers that match response
for (final Iterator<Header> it = response.headerIterator(); it.hasNext(); ) {
final Header responseHeader = it.next();
@@ -164,7 +164,7 @@ class CacheUpdateHandler {
}
headerGroup.addHeader(responseHeader);
}
- return headerGroup.getAllHeaders();
+ return headerGroup.getHeaders();
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java
index 45f8180..f075950 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java
@@ -67,7 +67,7 @@ class CacheableRequestPolicy {
return false;
}
- if (request.containsHeaders(HeaderConstants.PRAGMA) > 0) {
+ if (request.countHeaders(HeaderConstants.PRAGMA) > 0) {
log.debug("request with Pragma header is not serveable from cache");
return false;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedHttpResponseGenerator.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedHttpResponseGenerator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedHttpResponseGenerator.java
index f3a0002..24336b3 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedHttpResponseGenerator.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedHttpResponseGenerator.java
@@ -67,7 +67,7 @@ class CachedHttpResponseGenerator {
final SimpleHttpResponse response = new SimpleHttpResponse(entry.getStatus());
response.setVersion(HttpVersion.DEFAULT);
- response.setHeaders(entry.getAllHeaders());
+ response.setHeaders(entry.getHeaders());
if (responseShouldContainEntity(request, entry)) {
final Resource resource = entry.getResource();
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java
index b5cc5fe..c539375 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ConditionalRequestBuilder.java
@@ -57,7 +57,7 @@ class ConditionalRequestBuilder<T extends HttpRequest> {
*/
public T buildConditionalRequest(final T request, final HttpCacheEntry cacheEntry) {
final T newRequest = messageCopier.copy(request);
- newRequest.setHeaders(request.getAllHeaders());
+ newRequest.setHeaders(request.getHeaders());
final Header eTag = cacheEntry.getFirstHeader(HeaderConstants.ETAG);
if (eTag != null) {
newRequest.setHeader(HeaderConstants.IF_NONE_MATCH, eTag.getValue());
@@ -96,7 +96,7 @@ class ConditionalRequestBuilder<T extends HttpRequest> {
*/
public T buildConditionalRequestFromVariants(final T request, final Map<String, Variant> variants) {
final T newRequest = messageCopier.copy(request);
- newRequest.setHeaders(request.getAllHeaders());
+ newRequest.setHeaders(request.getHeaders());
// we do not support partial content so all etags are used
final StringBuilder etags = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java
index 9564645..57c43dd 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java
@@ -138,17 +138,17 @@ class ResponseCachingPolicy {
}
}
- if (response.containsHeaders(HeaderConstants.AGE) > 1) {
+ if (response.countHeaders(HeaderConstants.AGE) > 1) {
log.debug("Multiple Age headers");
return false;
}
- if (response.containsHeaders(HeaderConstants.EXPIRES) > 1) {
+ if (response.countHeaders(HeaderConstants.EXPIRES) > 1) {
log.debug("Multiple Expires headers");
return false;
}
- if (response.containsHeaders(HttpHeaders.DATE) > 1) {
+ if (response.countHeaders(HttpHeaders.DATE) > 1) {
log.debug("Multiple Date headers");
return false;
}
@@ -274,7 +274,7 @@ class ResponseCachingPolicy {
}
if (sharedCache) {
- if (request.containsHeaders(HeaderConstants.AUTHORIZATION) > 0
+ if (request.countHeaders(HeaderConstants.AUTHORIZATION) > 0
&& !hasCacheControlParameterFrom(response, AUTH_CACHEABLE_PARAMS)) {
log.debug("Request contains private credentials");
return false;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntry.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntry.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntry.java
index 14d7234..bfeca36 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntry.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/cache/TestHttpCacheEntry.java
@@ -199,7 +199,7 @@ public class TestHttpCacheEntry {
new BasicHeader("Date", DateUtils.formatDate(now))
};
entry = new HttpCacheEntry(new Date(), new Date(), HttpStatus.SC_OK, headers, mockResource);
- final Header[] result = entry.getAllHeaders();
+ final Header[] result = entry.getHeaders();
assertEquals(headers.length, result.length);
for(int i=0; i<headers.length; i++) {
assertEquals(headers[i], result[i]);
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpCacheEntryMatcher.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpCacheEntryMatcher.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpCacheEntryMatcher.java
index 04ac26f..9f1f06f 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpCacheEntryMatcher.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpCacheEntryMatcher.java
@@ -68,8 +68,8 @@ public class HttpCacheEntryMatcher extends BaseMatcher<HttpCacheEntry> {
if (!LangUtils.equals(expectedResponseDate, otherResponseDate)) {
return false;
}
- final Header[] expectedHeaders = expectedValue.getAllHeaders();
- final Header[] otherHeaders = otherValue.getAllHeaders();
+ final Header[] expectedHeaders = expectedValue.getHeaders();
+ final Header[] otherHeaders = otherValue.getHeaders();
if (expectedHeaders.length != otherHeaders.length) {
return false;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpTestUtils.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpTestUtils.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpTestUtils.java
index 1203f99..15634ab 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpTestUtils.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpTestUtils.java
@@ -160,7 +160,7 @@ public class HttpTestUtils {
* with the same canonical header values.
*/
public static boolean isEndToEndHeaderSubset(final HttpMessage r1, final HttpMessage r2) {
- for (final Header h : r1.getAllHeaders()) {
+ for (final Header h : r1.getHeaders()) {
if (!isHopByHopHeader(h.getName())) {
final String r1val = getCanonicalHeaderValue(r1, h.getName());
final String r2val = getCanonicalHeaderValue(r2, h.getName());
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheUpdateHandler.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheUpdateHandler.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheUpdateHandler.java
index 3a3a8d8..39816c0 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheUpdateHandler.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheUpdateHandler.java
@@ -261,7 +261,7 @@ public class TestCacheUpdateHandler {
final HttpCacheEntry updatedEntry = impl.updateCacheEntry(null, entry,
new Date(), new Date(), response);
- final Header[] updatedHeaders = updatedEntry.getAllHeaders();
+ final Header[] updatedHeaders = updatedEntry.getHeaders();
headersContain(updatedHeaders, "Content-Encoding", "identity");
headersNotContain(updatedHeaders, "Content-Encoding", "gzip");
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java
index 8fb62f7..8f65455 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestConditionalRequestBuilder.java
@@ -77,13 +77,13 @@ public class TestConditionalRequestBuilder {
Assert.assertEquals(theMethod, newRequest.getMethod());
Assert.assertEquals(theUri, newRequest.getRequestUri());
- Assert.assertEquals(2, newRequest.getAllHeaders().length);
+ Assert.assertEquals(2, newRequest.getHeaders().length);
- Assert.assertEquals("Accept-Encoding", newRequest.getAllHeaders()[0].getName());
- Assert.assertEquals("gzip", newRequest.getAllHeaders()[0].getValue());
+ Assert.assertEquals("Accept-Encoding", newRequest.getHeaders()[0].getName());
+ Assert.assertEquals("gzip", newRequest.getHeaders()[0].getValue());
- Assert.assertEquals("If-Modified-Since", newRequest.getAllHeaders()[1].getName());
- Assert.assertEquals(lastModified, newRequest.getAllHeaders()[1].getValue());
+ Assert.assertEquals("If-Modified-Since", newRequest.getHeaders()[1].getName());
+ Assert.assertEquals(lastModified, newRequest.getHeaders()[1].getValue());
}
@Test
@@ -133,13 +133,13 @@ public class TestConditionalRequestBuilder {
Assert.assertEquals(theMethod, newRequest.getMethod());
Assert.assertEquals(theUri, newRequest.getRequestUri());
- Assert.assertEquals(3, newRequest.getAllHeaders().length);
+ Assert.assertEquals(3, newRequest.getHeaders().length);
- Assert.assertEquals("Accept-Encoding", newRequest.getAllHeaders()[0].getName());
- Assert.assertEquals("gzip", newRequest.getAllHeaders()[0].getValue());
+ Assert.assertEquals("Accept-Encoding", newRequest.getHeaders()[0].getName());
+ Assert.assertEquals("gzip", newRequest.getHeaders()[0].getValue());
- Assert.assertEquals("If-None-Match", newRequest.getAllHeaders()[1].getName());
- Assert.assertEquals(theETag, newRequest.getAllHeaders()[1].getValue());
+ Assert.assertEquals("If-None-Match", newRequest.getHeaders()[1].getName());
+ Assert.assertEquals(theETag, newRequest.getHeaders()[1].getValue());
}
@Test
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java
----------------------------------------------------------------------
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java
index 0c9a56d..0092cf4 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java
@@ -86,7 +86,7 @@ public class TestMinimalClientRequestExecution extends LocalServerTestBase {
final HttpRequest reqWrapper = context.getRequest();
Assert.assertNotNull(reqWrapper);
- final Header[] headers = reqWrapper.getAllHeaders();
+ final Header[] headers = reqWrapper.getHeaders();
final Set<String> headerSet = new HashSet<>();
for (final Header header: headers) {
headerSet.add(header.getName().toLowerCase(Locale.ROOT));
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java
index cd1c7dd..2aea69f 100644
--- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java
+++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java
@@ -88,7 +88,12 @@ public class AsyncClientHttp2ServerPush {
}
@Override
- protected int capacity() {
+ protected int remainingCapacity() {
+ return Integer.MAX_VALUE;
+ }
+
+ @Override
+ protected int capacityIncrement() {
return Integer.MAX_VALUE;
}
@@ -128,7 +133,12 @@ public class AsyncClientHttp2ServerPush {
}
@Override
- protected int capacity() {
+ protected int remainingCapacity() {
+ return Integer.MAX_VALUE;
+ }
+
+ @Override
+ protected int capacityIncrement() {
return Integer.MAX_VALUE;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttpExchangeStreaming.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttpExchangeStreaming.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttpExchangeStreaming.java
index 52a5c17..03c349b 100644
--- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttpExchangeStreaming.java
+++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncClientHttpExchangeStreaming.java
@@ -76,7 +76,12 @@ public class AsyncClientHttpExchangeStreaming {
}
@Override
- protected int capacity() {
+ protected int remainingCapacity() {
+ return Integer.MAX_VALUE;
+ }
+
+ @Override
+ protected int capacityIncrement() {
return Integer.MAX_VALUE;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncQuickStart.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncQuickStart.java b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncQuickStart.java
index a393c37..a6d0551 100644
--- a/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncQuickStart.java
+++ b/httpclient5/src/examples/org/apache/hc/client5/http/examples/AsyncQuickStart.java
@@ -101,7 +101,12 @@ public class AsyncQuickStart {
}
@Override
- protected int capacity() {
+ protected int remainingCapacity() {
+ return Integer.MAX_VALUE;
+ }
+
+ @Override
+ protected int capacityIncrement() {
return Integer.MAX_VALUE;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AsyncRequestBuilder.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AsyncRequestBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AsyncRequestBuilder.java
index a0956b4..97c567b 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AsyncRequestBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/async/methods/AsyncRequestBuilder.java
@@ -434,7 +434,7 @@ public class AsyncRequestBuilder {
new ConfigurableHttpRequest(method, host, !TextUtils.isBlank(path) ? path : "/") :
new ConfigurableHttpRequest(method, uri != null ? uri : URI.create("/"));
if (this.headergroup != null) {
- request.setHeaders(this.headergroup.getAllHeaders());
+ request.setHeaders(this.headergroup.getHeaders());
}
if (version != null) {
request.setVersion(version);
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/RequestBuilder.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/RequestBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/RequestBuilder.java
index 1c330ea..7f79896 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/RequestBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/classic/methods/RequestBuilder.java
@@ -280,7 +280,7 @@ public class RequestBuilder {
headerGroup = new HeaderGroup();
}
headerGroup.clear();
- headerGroup.setHeaders(request.getAllHeaders());
+ headerGroup.setHeaders(request.getHeaders());
parameters = null;
entity = null;
@@ -483,7 +483,7 @@ public class RequestBuilder {
final HttpUriRequestBase result = new HttpUriRequestBase(method, uriNotNull);
result.setVersion(this.version != null ? this.version : HttpVersion.HTTP_1_1);
if (this.headerGroup != null) {
- result.setHeaders(this.headerGroup.getAllHeaders());
+ result.setHeaders(this.headerGroup.getHeaders());
}
result.setEntity(entityCopy);
result.setConfig(this.config);
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java
index 540c03f..225f362 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java
@@ -143,7 +143,7 @@ public final class AsyncRedirectExec implements AsyncExecChainHandler {
case HttpStatus.SC_SEE_OTHER:
if (!StandardMethods.isSafe(request.getMethod())) {
final HttpRequest httpGet = new BasicHttpRequest(StandardMethods.GET.name(), redirectUri);
- httpGet.setHeaders(scope.originalRequest.getAllHeaders());
+ httpGet.setHeaders(scope.originalRequest.getHeaders());
state.currentRequest = httpGet;
state.currentEntityProducer = null;
break;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java
index 0b53181..d4a5aae 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java
@@ -47,6 +47,7 @@ import org.apache.hc.core5.http2.HttpVersionPolicy;
import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.reactor.ConnectionInitiator;
import org.apache.hc.core5.util.TimeValue;
+import org.apache.hc.core5.util.Timeout;
import org.slf4j.Logger;
class InternalHttpAsyncExecRuntime implements AsyncExecRuntime {
@@ -190,7 +191,7 @@ class InternalHttpAsyncExecRuntime implements AsyncExecRuntime {
return Operations.nonCancellable();
}
final RequestConfig requestConfig = context.getRequestConfig();
- final TimeValue timeout = requestConfig.getConnectionTimeout();
+ final Timeout timeout = requestConfig.getConnectionTimeout();
return Operations.cancellable(manager.connect(
endpoint,
connectionInitiator,
@@ -202,7 +203,7 @@ class InternalHttpAsyncExecRuntime implements AsyncExecRuntime {
@Override
public void completed(final AsyncConnectionEndpoint endpoint) {
if (TimeValue.isPositive(timeout)) {
- endpoint.setSocketTimeout(timeout.toMillisIntBound());
+ endpoint.setSocketTimeout(timeout);
}
callback.completed(InternalHttpAsyncExecRuntime.this);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java
index 5004696..680f3fe 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java
@@ -46,6 +46,7 @@ import org.apache.hc.core5.reactor.ssl.SSLBufferMode;
import org.apache.hc.core5.reactor.ssl.SSLSessionInitializer;
import org.apache.hc.core5.reactor.ssl.SSLSessionVerifier;
import org.apache.hc.core5.reactor.ssl.TlsDetails;
+import org.apache.hc.core5.util.Timeout;
import org.slf4j.Logger;
class LoggingIOSession implements ProtocolIOSession {
@@ -184,21 +185,21 @@ class LoggingIOSession implements ProtocolIOSession {
}
@Override
- public int getSocketTimeoutMillis() {
- return this.session.getSocketTimeoutMillis();
+ public Timeout getSocketTimeout() {
+ return this.session.getSocketTimeout();
}
@Override
- public void setSocketTimeoutMillis(final int timeout) {
+ public void setSocketTimeout(final Timeout timeout) {
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + " " + this.session + ": Set timeout " + timeout);
}
- this.session.setSocketTimeoutMillis(timeout);
+ this.session.setSocketTimeout(timeout);
}
@Override
- public long getLastReadTimeMillis() {
- return this.session.getLastReadTimeMillis();
+ public long getLastReadTime() {
+ return this.session.getLastReadTime();
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java
index 27996db..fce1774 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttpAsyncClient.java
@@ -425,6 +425,11 @@ public final class MinimalHttpAsyncClient extends AbstractMinimalHttpAsyncClient
}
@Override
+ public boolean isConnected() {
+ return !isReleased() && connectionEndpoint.isConnected();
+ }
+
+ @Override
public void execute(
final AsyncClientExchangeHandler exchangeHandler,
final HandlerFactory<AsyncPushConsumer> pushHandlerFactory,
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpResponse.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpResponse.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpResponse.java
index a412e37..204a82a 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpResponse.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpResponse.java
@@ -93,9 +93,18 @@ public final class CloseableHttpResponse implements ClassicHttpResponse {
return response.getReasonPhrase();
}
+ /**
+ * @deprecated use {@link #countHeaders(String)}
+ */
@Override
+ @Deprecated
public int containsHeaders(final String name) {
- return response.containsHeaders(name);
+ return countHeaders(name);
+ }
+
+ @Override
+ public int countHeaders(final String name) {
+ return response.countHeaders(name);
}
@Override
@@ -138,9 +147,18 @@ public final class CloseableHttpResponse implements ClassicHttpResponse {
response.setLocale(loc);
}
+ /**
+ * @deprecated use {@link #getHeader(String)}
+ */
@Override
+ @Deprecated
public Header getSingleHeader(final String name) throws ProtocolException {
- return response.getSingleHeader(name);
+ return getHeader(name);
+ }
+
+ @Override
+ public Header getHeader(final String name) throws ProtocolException {
+ return response.getHeader(name);
}
@Override
@@ -178,9 +196,18 @@ public final class CloseableHttpResponse implements ClassicHttpResponse {
return response.getLastHeader(name);
}
+ /**
+ * @deprecated use {@link #getHeaders()}
+ */
@Override
+ @Deprecated
public Header[] getAllHeaders() {
- return response.getAllHeaders();
+ return getHeaders();
+ }
+
+ @Override
+ public Header[] getHeaders() {
+ return response.getHeaders();
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java
index 7c53570..3897d9b 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java
@@ -149,10 +149,10 @@ class InternalExecRuntime implements ExecRuntime, Cancellable {
}
}
final RequestConfig requestConfig = context.getRequestConfig();
- final TimeValue timeout = requestConfig.getConnectionTimeout();
+ final Timeout timeout = requestConfig.getConnectionTimeout();
manager.connect(endpoint, timeout, context);
if (TimeValue.isPositive(timeout)) {
- endpoint.setSocketTimeout(timeout.toMillisIntBound());
+ endpoint.setSocketTimeout(timeout);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java
index 7ada6b3..f6fa97f 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java
@@ -145,7 +145,7 @@ public final class RedirectExec implements ExecChainHandler {
case HttpStatus.SC_SEE_OTHER:
if (!StandardMethods.isSafe(request.getMethod())) {
final HttpGet httpGet = new HttpGet(redirectUri);
- httpGet.setHeaders(originalRequest.getAllHeaders());
+ httpGet.setHeaders(originalRequest.getHeaders());
redirect = httpGet;
} else {
redirect = null;
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java
index 77a3217..e704a75 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java
@@ -413,8 +413,8 @@ public class BasicHttpClientConnectionManager implements HttpClientConnectionMan
}
@Override
- public void setSocketTimeout(final int timeout) {
- getValidatedConnection().setSocketTimeoutMillis(timeout);
+ public void setSocketTimeout(final Timeout timeout) {
+ getValidatedConnection().setSocketTimeout(timeout);
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java
index b2290c4..6cb5dd6 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java
@@ -51,6 +51,7 @@ import org.apache.hc.core5.http.message.RequestLine;
import org.apache.hc.core5.http.message.StatusLine;
import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.util.Identifiable;
+import org.apache.hc.core5.util.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,7 +65,7 @@ final class DefaultManagedHttpClientConnection
private final String id;
private final AtomicBoolean closed;
- private int socketTimeout;
+ private Timeout socketTimeout;
public DefaultManagedHttpClientConnection(
final String id,
@@ -98,7 +99,7 @@ final class DefaultManagedHttpClientConnection
throw new InterruptedIOException("Connection already shutdown");
}
super.bind(socketHolder);
- socketTimeout = socketHolder.getSocket().getSoTimeout();
+ socketTimeout = Timeout.ofMillis(socketHolder.getSocket().getSoTimeout());
}
@Override
@@ -128,11 +129,11 @@ final class DefaultManagedHttpClientConnection
}
@Override
- public void setSocketTimeoutMillis(final int timeout) {
+ public void setSocketTimeout(final Timeout timeout) {
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + ": set socket timeout to " + timeout);
}
- super.setSocketTimeoutMillis(timeout);
+ super.setSocketTimeout(timeout);
}
@Override
@@ -148,14 +149,14 @@ final class DefaultManagedHttpClientConnection
@Override
public void bind(final Socket socket) throws IOException {
super.bind(this.wireLog.isDebugEnabled() ? new LoggingSocketHolder(socket, this.id, this.wireLog) : new SocketHolder(socket));
- socketTimeout = socket.getSoTimeout();
+ socketTimeout = Timeout.ofMillis(socket.getSoTimeout());
}
@Override
protected void onResponseReceived(final ClassicHttpResponse response) {
if (response != null && this.headerLog.isDebugEnabled()) {
this.headerLog.debug(this.id + " << " + new StatusLine(response));
- final Header[] headers = response.getAllHeaders();
+ final Header[] headers = response.getHeaders();
for (final Header header : headers) {
this.headerLog.debug(this.id + " << " + header.toString());
}
@@ -166,7 +167,7 @@ final class DefaultManagedHttpClientConnection
protected void onRequestSubmitted(final ClassicHttpRequest request) {
if (request != null && this.headerLog.isDebugEnabled()) {
this.headerLog.debug(this.id + " >> " + new RequestLine(request));
- final Header[] headers = request.getAllHeaders();
+ final Header[] headers = request.getHeaders();
for (final Header header : headers) {
this.headerLog.debug(this.id + " >> " + header.toString());
}
@@ -175,12 +176,12 @@ final class DefaultManagedHttpClientConnection
@Override
public void passivate() {
- super.setSocketTimeoutMillis(0);
+ super.setSocketTimeout(Timeout.ZERO_MILLISECONDS);
}
@Override
public void activate() {
- super.setSocketTimeoutMillis(socketTimeout);
+ super.setSocketTimeout(socketTimeout);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
index 8f67e1d..5b3b64b 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
@@ -547,8 +547,8 @@ public class PoolingHttpClientConnectionManager
}
@Override
- public void setSocketTimeout(final int timeout) {
- getValidatedPoolEntry().getConnection().setSocketTimeoutMillis(timeout);
+ public void setSocketTimeout(final Timeout timeout) {
+ getValidatedPoolEntry().getConnection().setSocketTimeout(timeout);
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultAsyncClientConnectionOperator.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultAsyncClientConnectionOperator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultAsyncClientConnectionOperator.java
index 12ce6c9..4fb6d6a 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultAsyncClientConnectionOperator.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultAsyncClientConnectionOperator.java
@@ -46,7 +46,7 @@ import org.apache.hc.core5.http.nio.ssl.TlsStrategy;
import org.apache.hc.core5.reactor.ConnectionInitiator;
import org.apache.hc.core5.reactor.IOSession;
import org.apache.hc.core5.util.Args;
-import org.apache.hc.core5.util.TimeValue;
+import org.apache.hc.core5.util.Timeout;
final class DefaultAsyncClientConnectionOperator implements AsyncClientConnectionOperator {
@@ -68,7 +68,7 @@ final class DefaultAsyncClientConnectionOperator implements AsyncClientConnectio
final ConnectionInitiator connectionInitiator,
final HttpHost host,
final SocketAddress localAddress,
- final TimeValue connectTimeout,
+ final Timeout connectTimeout,
final Object attachment,
final FutureCallback<ManagedAsyncClientConnection> callback) {
Args.notNull(connectionInitiator, "Connection initiator");
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java
index e2382c0..867b5e7 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java
@@ -53,6 +53,7 @@ import org.apache.hc.core5.reactor.ssl.SSLSessionVerifier;
import org.apache.hc.core5.reactor.ssl.TlsDetails;
import org.apache.hc.core5.reactor.ssl.TransportSecurityLayer;
import org.apache.hc.core5.util.Identifiable;
+import org.apache.hc.core5.util.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,12 +62,12 @@ final class DefaultManagedAsyncClientConnection implements ManagedAsyncClientCon
private final Logger log = LoggerFactory.getLogger(getClass());
private final IOSession ioSession;
- private final int socketTimeout;
+ private final Timeout socketTimeout;
private final AtomicBoolean closed;
public DefaultManagedAsyncClientConnection(final IOSession ioSession) {
this.ioSession = ioSession;
- this.socketTimeout = ioSession.getSocketTimeoutMillis();
+ this.socketTimeout = ioSession.getSocketTimeout();
this.closed = new AtomicBoolean();
}
@@ -101,13 +102,13 @@ final class DefaultManagedAsyncClientConnection implements ManagedAsyncClientCon
}
@Override
- public void setSocketTimeoutMillis(final int timeout) {
- ioSession.setSocketTimeoutMillis(timeout);
+ public void setSocketTimeout(final Timeout timeout) {
+ ioSession.setSocketTimeout(timeout);
}
@Override
- public int getSocketTimeoutMillis() {
- return ioSession.getSocketTimeoutMillis();
+ public Timeout getSocketTimeout() {
+ return ioSession.getSocketTimeout();
}
@Override
@@ -180,12 +181,12 @@ final class DefaultManagedAsyncClientConnection implements ManagedAsyncClientCon
@Override
public void passivate() {
- ioSession.setSocketTimeoutMillis(0);
+ ioSession.setSocketTimeout(Timeout.ZERO_MILLISECONDS);
}
@Override
public void activate() {
- ioSession.setSocketTimeoutMillis(socketTimeout);
+ ioSession.setSocketTimeout(socketTimeout);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/MultihomeIOSessionRequester.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/MultihomeIOSessionRequester.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/MultihomeIOSessionRequester.java
index b07e74b..ab0a7ba 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/MultihomeIOSessionRequester.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/MultihomeIOSessionRequester.java
@@ -43,7 +43,7 @@ import org.apache.hc.core5.concurrent.FutureCallback;
import org.apache.hc.core5.net.NamedEndpoint;
import org.apache.hc.core5.reactor.ConnectionInitiator;
import org.apache.hc.core5.reactor.IOSession;
-import org.apache.hc.core5.util.TimeValue;
+import org.apache.hc.core5.util.Timeout;
final class MultihomeIOSessionRequester {
@@ -58,7 +58,7 @@ final class MultihomeIOSessionRequester {
final NamedEndpoint remoteEndpoint,
final SocketAddress remoteAddress,
final SocketAddress localAddress,
- final TimeValue connectTimeout,
+ final Timeout connectTimeout,
final Object attachment,
final FutureCallback<IOSession> callback) {
if (remoteAddress != null) {
@@ -128,7 +128,7 @@ final class MultihomeIOSessionRequester {
final ConnectionInitiator connectionInitiator,
final NamedEndpoint remoteEndpoint,
final SocketAddress localAddress,
- final TimeValue connectTimeout,
+ final Timeout connectTimeout,
final Object attachment,
final FutureCallback<IOSession> callback) {
return connect(connectionInitiator, remoteEndpoint, null, localAddress, connectTimeout, attachment, callback);
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/MultuhomeConnectionInitiator.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/MultuhomeConnectionInitiator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/MultuhomeConnectionInitiator.java
index 066d17f..3ea9718 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/MultuhomeConnectionInitiator.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/MultuhomeConnectionInitiator.java
@@ -38,7 +38,7 @@ import org.apache.hc.core5.net.NamedEndpoint;
import org.apache.hc.core5.reactor.ConnectionInitiator;
import org.apache.hc.core5.reactor.IOSession;
import org.apache.hc.core5.util.Args;
-import org.apache.hc.core5.util.TimeValue;
+import org.apache.hc.core5.util.Timeout;
/**
* Multi-home DNS aware implementation of {@link ConnectionInitiator}.
@@ -63,7 +63,7 @@ public final class MultuhomeConnectionInitiator implements ConnectionInitiator {
final NamedEndpoint remoteEndpoint,
final SocketAddress remoteAddress,
final SocketAddress localAddress,
- final TimeValue connectTimeout,
+ final Timeout connectTimeout,
final Object attachment,
final FutureCallback<IOSession> callback) {
Args.notNull(remoteEndpoint, "Remote endpoint");
@@ -73,7 +73,7 @@ public final class MultuhomeConnectionInitiator implements ConnectionInitiator {
public Future<IOSession> connect(
final NamedEndpoint remoteEndpoint,
final SocketAddress localAddress,
- final TimeValue connectTimeout,
+ final Timeout connectTimeout,
final Object attachment,
final FutureCallback<IOSession> callback) {
Args.notNull(remoteEndpoint, "Remote endpoint");
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
index 49acdd1..65a6113 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java
@@ -335,7 +335,7 @@ public class PoolingAsyncClientConnectionManager implements AsyncClientConnectio
public Future<AsyncConnectionEndpoint> connect(
final AsyncConnectionEndpoint endpoint,
final ConnectionInitiator connectionInitiator,
- final TimeValue timeout,
+ final Timeout timeout,
final Object attachment,
final HttpContext context,
final FutureCallback<AsyncConnectionEndpoint> callback) {
@@ -539,8 +539,8 @@ public class PoolingAsyncClientConnectionManager implements AsyncClientConnectio
}
@Override
- public void setSocketTimeout(final int timeout) {
- getValidatedPoolEntry().getConnection().setSocketTimeoutMillis(timeout);
+ public void setSocketTimeout(final Timeout timeout) {
+ getValidatedPoolEntry().getConnection().setSocketTimeout(timeout);
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/io/ConnectionEndpoint.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/io/ConnectionEndpoint.java b/httpclient5/src/main/java/org/apache/hc/client5/http/io/ConnectionEndpoint.java
index 7ee8c7b..c54fe3d 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/io/ConnectionEndpoint.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/io/ConnectionEndpoint.java
@@ -37,6 +37,7 @@ import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.io.ModalCloseable;
+import org.apache.hc.core5.util.Timeout;
/**
* Client endpoint leased from a connection manager. Client points can be used
@@ -75,6 +76,6 @@ public abstract class ConnectionEndpoint implements ModalCloseable {
*
* @param timeout timeout value
*/
- public abstract void setSocketTimeout(int timeout);
+ public abstract void setSocketTimeout(Timeout timeout);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncClientConnectionManager.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncClientConnectionManager.java
index d989e15..6ffe231 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncClientConnectionManager.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncClientConnectionManager.java
@@ -66,7 +66,7 @@ public interface AsyncClientConnectionManager extends ModalCloseable {
* {@link AsyncConnectionEndpoint#isConnected() disconnected}. The consumer
* of the endpoint is responsible for fully establishing the route to
* the endpoint target by calling {@link #connect(AsyncConnectionEndpoint,
- * ConnectionInitiator, TimeValue, Object, HttpContext, FutureCallback)}
+ * ConnectionInitiator, Timeout, Object, HttpContext, FutureCallback)}
* in order to connect directly to the target or to the first proxy hop,
* and optionally calling {@link #upgrade(AsyncConnectionEndpoint, Object, HttpContext)}
* method to upgrade the underlying transport to Transport Layer Security
@@ -112,7 +112,7 @@ public interface AsyncClientConnectionManager extends ModalCloseable {
Future<AsyncConnectionEndpoint> connect(
AsyncConnectionEndpoint endpoint,
ConnectionInitiator connectionInitiator,
- TimeValue connectTimeout,
+ Timeout connectTimeout,
Object attachment,
HttpContext context,
FutureCallback<AsyncConnectionEndpoint> callback);
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncClientConnectionOperator.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncClientConnectionOperator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncClientConnectionOperator.java
index e9e62fc..a4a8bbf 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncClientConnectionOperator.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncClientConnectionOperator.java
@@ -36,7 +36,7 @@ import org.apache.hc.core5.annotation.ThreadingBehavior;
import org.apache.hc.core5.concurrent.FutureCallback;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.reactor.ConnectionInitiator;
-import org.apache.hc.core5.util.TimeValue;
+import org.apache.hc.core5.util.Timeout;
/**
* Connection operator that performs connection connect and upgrade operations.
@@ -63,7 +63,7 @@ public interface AsyncClientConnectionOperator {
ConnectionInitiator connectionInitiator,
HttpHost host,
SocketAddress localAddress,
- TimeValue connectTimeout,
+ Timeout connectTimeout,
Object attachment,
FutureCallback<ManagedAsyncClientConnection> callback);
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncConnectionEndpoint.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncConnectionEndpoint.java b/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncConnectionEndpoint.java
index 01ab603..8724da0 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncConnectionEndpoint.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/nio/AsyncConnectionEndpoint.java
@@ -44,6 +44,7 @@ import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.io.ModalCloseable;
+import org.apache.hc.core5.util.Timeout;
/**
* Client connection endpoint that can be used to execute message exchanges.
@@ -75,7 +76,7 @@ public abstract class AsyncConnectionEndpoint implements ModalCloseable {
*
* @param timeout the socket timeout.
*/
- public abstract void setSocketTimeout(int timeout);
+ public abstract void setSocketTimeout(Timeout timeout);
@Override
public final void close() throws IOException {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java
index 6ec3afb..63a7059 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java
@@ -273,8 +273,8 @@ public class TestInternalExecRuntime {
execRuntime.connectEndpoint(context);
- Mockito.verify(mgr).connect(connectionEndpoint, TimeValue.ofMillis(123), context);
- Mockito.verify(connectionEndpoint).setSocketTimeout(123);
+ Mockito.verify(mgr).connect(connectionEndpoint, Timeout.ofMillis(123), context);
+ Mockito.verify(connectionEndpoint).setSocketTimeout(Timeout.ofMillis(123));
}
@Test
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestRetryExec.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestRetryExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestRetryExec.java
index 61b1802..955753b 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestRetryExec.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestRetryExec.java
@@ -88,7 +88,7 @@ public class TestRetryExec {
public Object answer(final InvocationOnMock invocationOnMock) throws Throwable {
final Object[] args = invocationOnMock.getArguments();
final ClassicHttpRequest wrapper = (ClassicHttpRequest) args[0];
- final Header[] headers = wrapper.getAllHeaders();
+ final Header[] headers = wrapper.getHeaders();
Assert.assertEquals(2, headers.length);
Assert.assertEquals("this", headers[0].getValue());
Assert.assertEquals("that", headers[1].getValue());
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java b/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java
index a75e42a..deac305 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/protocol/TestRequestExpectContinue.java
@@ -123,7 +123,7 @@ public class TestRequestExpectContinue {
final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/");
final RequestExpectContinue interceptor = new RequestExpectContinue();
interceptor.process(request, null, context);
- Assert.assertEquals(0, request.getAllHeaders().length);
+ Assert.assertEquals(0, request.getHeaders().length);
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ab7be3fd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ca5531d..4595941 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
- <httpcore.version>5.0-beta3</httpcore.version>
+ <httpcore.version>5.0-beta5</httpcore.version>
<log4j.version>2.9.1</log4j.version>
<commons-codec.version>1.11</commons-codec.version>
<ehcache.version>3.4.0</ehcache.version>
@@ -99,6 +99,11 @@
<version>${httpcore.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents.core5</groupId>
+ <artifactId>httpcore5-reactive</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
[2/3] httpcomponents-client git commit: Javadoc cleanup
Posted by ol...@apache.org.
Javadoc cleanup
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/8ebb6295
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/8ebb6295
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/8ebb6295
Branch: refs/heads/master
Commit: 8ebb629563b82e468f7f745ce9f3e37807a3a5a1
Parents: ab7be3f
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Sun Oct 21 13:34:45 2018 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sun Oct 21 13:34:45 2018 +0200
----------------------------------------------------------------------
.../apache/hc/client5/http/impl/DefaultRedirectStrategy.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/8ebb6295/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java
index 54c9048..a86ab32 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java
@@ -48,11 +48,7 @@ import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.TextUtils;
/**
- * Default implementation of {@link RedirectStrategy}. This strategy honors the restrictions
- * on automatic redirection of unsafe methods such as POST, PUT and DELETE imposed by
- * the HTTP specification. Non safe methods will be redirected as GET in response to
- * status code {@link HttpStatus#SC_MOVED_PERMANENTLY}, {@link HttpStatus#SC_MOVED_TEMPORARILY}
- * and {@link HttpStatus#SC_SEE_OTHER}.
+ * Default implementation of {@link RedirectStrategy}.
*
* @since 4.1
*/
[3/3] httpcomponents-client git commit: HTTPCLIENT-1946: handling of
308 status as per RFC 7538
Posted by ol...@apache.org.
HTTPCLIENT-1946: handling of 308 status as per RFC 7538
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/2b6f7e53
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/2b6f7e53
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/2b6f7e53
Branch: refs/heads/master
Commit: 2b6f7e53d0cd63ab333466d79b0f618656daa940
Parents: 8ebb629
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Sun Oct 21 13:40:46 2018 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sun Oct 21 13:40:46 2018 +0200
----------------------------------------------------------------------
.../org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/2b6f7e53/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java
index a86ab32..ed82bfa 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultRedirectStrategy.java
@@ -74,6 +74,7 @@ public class DefaultRedirectStrategy implements RedirectStrategy {
case HttpStatus.SC_MOVED_TEMPORARILY:
case HttpStatus.SC_SEE_OTHER:
case HttpStatus.SC_TEMPORARY_REDIRECT:
+ case HttpStatus.SC_PERMANENT_REDIRECT:
return true;
default:
return false;