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 2021/09/09 11:50:09 UTC
[httpcomponents-client] branch master updated: Fixed deprecation
warnings that could be fixed and suppressed those that could not
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
The following commit(s) were added to refs/heads/master by this push:
new c56c00c Fixed deprecation warnings that could be fixed and suppressed those that could not
c56c00c is described below
commit c56c00c54935aca35ce3cf3e97fd6db3f6463509
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Thu Sep 9 13:42:12 2021 +0200
Fixed deprecation warnings that could be fixed and suppressed those that could not
---
.../src/main/java/org/apache/hc/client5/http/fluent/Request.java | 1 +
.../hc/client5/testing/async/TestHttp1RequestReExecution.java | 1 -
.../testing/external/HttpAsyncClientCompatibilityTest.java | 4 +---
.../hc/client5/testing/external/HttpClientCompatibilityTest.java | 5 ++---
.../hc/client5/http/impl/async/InternalH2AsyncExecRuntime.java | 3 +++
.../hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java | 1 +
.../apache/hc/client5/http/impl/async/MinimalH2AsyncClient.java | 1 +
.../hc/client5/http/impl/async/MinimalHttpAsyncClient.java | 2 ++
.../hc/client5/http/impl/classic/ClassicRequestCopier.java | 3 +--
.../apache/hc/client5/http/impl/classic/InternalExecRuntime.java | 1 +
.../apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java | 1 +
.../org/apache/hc/client5/http/config/TestRequestConfig.java | 1 -
.../org/apache/hc/client5/http/examples/ClientExecuteProxy.java | 9 +++++----
.../hc/client5/http/examples/ClientProxyAuthentication.java | 6 +++---
.../hc/client5/http/impl/classic/TestInternalExecRuntime.java | 2 ++
.../client5/http/impl/routing/TestDefaultProxyRoutePlanner.java | 4 +---
.../hc/client5/http/impl/routing/TestDefaultRoutePlanner.java | 1 +
17 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Request.java b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Request.java
index bc41434..52fa673 100644
--- a/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Request.java
+++ b/httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Request.java
@@ -163,6 +163,7 @@ public class Request {
this.request = request;
}
+ @SuppressWarnings("deprecation")
ClassicHttpResponse internalExecute(
final CloseableHttpClient client,
final HttpClientContext localContext) throws IOException {
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java
index fac64cf..4a7f002 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1RequestReExecution.java
@@ -105,7 +105,6 @@ public class TestHttp1RequestReExecution extends AbstractIntegrationTestBase<Clo
clientBuilder = HttpAsyncClientBuilder.create()
.setDefaultRequestConfig(RequestConfig.custom()
.setConnectionRequestTimeout(TIMEOUT)
- .setConnectTimeout(TIMEOUT)
.build())
.setConnectionManager(connManager)
.setVersionPolicy(version.greaterEquals(HttpVersion.HTTP_2) ? HttpVersionPolicy.FORCE_HTTP_2 : HttpVersionPolicy.FORCE_HTTP_1);
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpAsyncClientCompatibilityTest.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpAsyncClientCompatibilityTest.java
index e9eb959..7773bbe 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpAsyncClientCompatibilityTest.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpAsyncClientCompatibilityTest.java
@@ -117,9 +117,7 @@ public class HttpAsyncClientCompatibilityTest {
this.target = target;
this.proxy = proxy;
this.credentialsProvider = new BasicCredentialsProvider();
- final RequestConfig requestConfig = RequestConfig.custom()
- .setProxy(proxy)
- .build();
+ final RequestConfig requestConfig = RequestConfig.DEFAULT;
if (proxy != null && proxyCreds != null) {
this.credentialsProvider.setCredentials(new AuthScope(proxy), proxyCreds);
}
diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpClientCompatibilityTest.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpClientCompatibilityTest.java
index 5be2651..a44efed 100644
--- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpClientCompatibilityTest.java
+++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/external/HttpClientCompatibilityTest.java
@@ -95,9 +95,7 @@ public class HttpClientCompatibilityTest {
this.target = target;
this.proxy = proxy;
this.credentialsProvider = new BasicCredentialsProvider();
- final RequestConfig requestConfig = RequestConfig.custom()
- .setProxy(proxy)
- .build();
+ final RequestConfig requestConfig = RequestConfig.DEFAULT;
if (proxy != null && proxyCreds != null) {
this.credentialsProvider.setCredentials(new AuthScope(proxy), proxyCreds);
}
@@ -108,6 +106,7 @@ public class HttpClientCompatibilityTest {
.build();
this.client = HttpClients.custom()
.setConnectionManager(this.connManager)
+ .setProxy(this.proxy)
.setDefaultRequestConfig(requestConfig)
.build();
}
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2AsyncExecRuntime.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2AsyncExecRuntime.java
index 84411e2..724d1f6 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2AsyncExecRuntime.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2AsyncExecRuntime.java
@@ -86,6 +86,7 @@ class InternalH2AsyncExecRuntime implements AsyncExecRuntime {
if (sessionRef.get() == null) {
final HttpHost target = route.getTargetHost();
final RequestConfig requestConfig = context.getRequestConfig();
+ @SuppressWarnings("deprecation")
final Timeout connectTimeout = requestConfig.getConnectTimeout();
if (log.isDebugEnabled()) {
log.debug("{} acquiring endpoint ({})", id, connectTimeout);
@@ -181,6 +182,7 @@ class InternalH2AsyncExecRuntime implements AsyncExecRuntime {
}
final HttpHost target = endpoint.target;
final RequestConfig requestConfig = context.getRequestConfig();
+ @SuppressWarnings("deprecation")
final Timeout connectTimeout = requestConfig.getConnectTimeout();
if (log.isDebugEnabled()) {
log.debug("{} connecting endpoint ({})", ConnPoolSupport.getId(endpoint), connectTimeout);
@@ -234,6 +236,7 @@ class InternalH2AsyncExecRuntime implements AsyncExecRuntime {
} else {
final HttpHost target = endpoint.target;
final RequestConfig requestConfig = context.getRequestConfig();
+ @SuppressWarnings("deprecation")
final Timeout connectTimeout = requestConfig.getConnectTimeout();
connPool.getSession(target, connectTimeout, new FutureCallback<IOSession>() {
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 5d04b5e..6286e75 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
@@ -203,6 +203,7 @@ class InternalHttpAsyncExecRuntime implements AsyncExecRuntime {
return Operations.nonCancellable();
}
final RequestConfig requestConfig = context.getRequestConfig();
+ @SuppressWarnings("deprecation")
final Timeout connectTimeout = requestConfig.getConnectTimeout();
if (log.isDebugEnabled()) {
log.debug("{} connecting endpoint ({})", ConnPoolSupport.getId(endpoint), connectTimeout);
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalH2AsyncClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalH2AsyncClient.java
index fe0f7fd..a88b26e 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalH2AsyncClient.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalH2AsyncClient.java
@@ -137,6 +137,7 @@ public final class MinimalH2AsyncClient extends AbstractMinimalHttpAsyncClientBa
} else {
requestConfig = clientContext.getRequestConfig();
}
+ @SuppressWarnings("deprecation")
final Timeout connectTimeout = requestConfig.getConnectTimeout();
final HttpHost target = new HttpHost(request.getScheme(), request.getAuthority());
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 3e959df..0363c86 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
@@ -211,6 +211,7 @@ public final class MinimalHttpAsyncClient extends AbstractMinimalHttpAsyncClient
final HttpClientContext clientContext = HttpClientContext.adapt(context);
final RequestConfig requestConfig = clientContext.getRequestConfig();
final Timeout connectionRequestTimeout = requestConfig.getConnectionRequestTimeout();
+ @SuppressWarnings("deprecation")
final Timeout connectTimeout = requestConfig.getConnectTimeout();
leaseEndpoint(
host,
@@ -260,6 +261,7 @@ public final class MinimalHttpAsyncClient extends AbstractMinimalHttpAsyncClient
requestConfig = clientContext.getRequestConfig();
}
final Timeout connectionRequestTimeout = requestConfig.getConnectionRequestTimeout();
+ @SuppressWarnings("deprecation")
final Timeout connectTimeout = requestConfig.getConnectTimeout();
final Timeout responseTimeout = requestConfig.getResponseTimeout();
final HttpHost target = new HttpHost(request.getScheme(), request.getAuthority());
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ClassicRequestCopier.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ClassicRequestCopier.java
index 8c260b7..dfdfff0 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ClassicRequestCopier.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ClassicRequestCopier.java
@@ -28,7 +28,6 @@ package org.apache.hc.client5.http.impl.classic;
import java.util.Iterator;
-import org.apache.hc.client5.http.impl.MessageCopier;
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
@@ -41,7 +40,7 @@ import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
* @deprecated Use {@link org.apache.hc.core5.http.io.support.ClassicRequestBuilder}
*/
@Deprecated
-public final class ClassicRequestCopier implements MessageCopier<ClassicHttpRequest> {
+public final class ClassicRequestCopier implements org.apache.hc.client5.http.impl.MessageCopier<ClassicHttpRequest> {
public static final ClassicRequestCopier INSTANCE = new ClassicRequestCopier();
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 790f076..983318d 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
@@ -151,6 +151,7 @@ class InternalExecRuntime implements ExecRuntime, Cancellable {
throw new RequestFailedException("Request aborted");
}
final RequestConfig requestConfig = context.getRequestConfig();
+ @SuppressWarnings("deprecation")
final Timeout connectTimeout = requestConfig.getConnectTimeout();
if (log.isDebugEnabled()) {
log.debug("{} connecting endpoint ({})", ConnPoolSupport.getId(endpoint), connectTimeout);
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java
index 3ee5e07..f8b4621 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/routing/DefaultRoutePlanner.java
@@ -66,6 +66,7 @@ public class DefaultRoutePlanner implements HttpRoutePlanner {
}
final HttpClientContext clientContext = HttpClientContext.adapt(context);
final RequestConfig config = clientContext.getRequestConfig();
+ @SuppressWarnings("deprecation")
HttpHost proxy = config.getProxy();
if (proxy == null) {
proxy = determineProxy(host, context);
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java b/httpclient5/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java
index b3ae04d..2eb7ea4 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/config/TestRequestConfig.java
@@ -55,7 +55,6 @@ public class TestRequestConfig {
Assert.assertFalse(config.isCircularRedirectsAllowed());
Assert.assertEquals(50, config.getMaxRedirects());
Assert.assertNull(config.getCookieSpec());
- Assert.assertNull(config.getProxy());
Assert.assertNull(config.getTargetPreferredAuthSchemes());
Assert.assertNull(config.getProxyPreferredAuthSchemes());
Assert.assertTrue(config.isContentCompressionEnabled());
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientExecuteProxy.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientExecuteProxy.java
index 65536bb..9cf66ce 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientExecuteProxy.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientExecuteProxy.java
@@ -43,12 +43,13 @@ import org.apache.hc.core5.http.io.entity.EntityUtils;
public class ClientExecuteProxy {
public static void main(final String[] args)throws Exception {
- try (final CloseableHttpClient httpclient = HttpClients.createDefault()) {
- final HttpHost target = new HttpHost("https", "httpbin.org", 443);
- final HttpHost proxy = new HttpHost("http", "127.0.0.1", 8080);
+ final HttpHost target = new HttpHost("https", "httpbin.org", 443);
+ final HttpHost proxy = new HttpHost("http", "127.0.0.1", 8080);
+ try (final CloseableHttpClient httpclient = HttpClients.custom()
+ .setProxy(proxy)
+ .build()) {
final RequestConfig config = RequestConfig.custom()
- .setProxy(proxy)
.build();
final HttpGet request = new HttpGet("/get");
request.setConfig(config);
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java
index 54dc420..52bf5bf 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientProxyAuthentication.java
@@ -51,13 +51,13 @@ public class ClientProxyAuthentication {
credsProvider.setCredentials(
new AuthScope("httpbin.org", 80),
new UsernamePasswordCredentials("user", "passwd".toCharArray()));
+ final HttpHost target = new HttpHost("http", "httpbin.org", 80);
+ final HttpHost proxy = new HttpHost("localhost", 8888);
try (final CloseableHttpClient httpclient = HttpClients.custom()
+ .setProxy(proxy)
.setDefaultCredentialsProvider(credsProvider).build()) {
- final HttpHost target = new HttpHost("http", "httpbin.org", 80);
- final HttpHost proxy = new HttpHost("localhost", 8888);
final RequestConfig config = RequestConfig.custom()
- .setProxy(proxy)
.build();
final HttpGet httpget = new HttpGet("/basic-auth/user/passwd");
httpget.setConfig(config);
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 c57e378..ea0cbae 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
@@ -81,6 +81,7 @@ public class TestInternalExecRuntime {
@Test
public void testAcquireEndpoint() throws Exception {
final HttpClientContext context = HttpClientContext.create();
+ @SuppressWarnings("deprecation")
final RequestConfig config = RequestConfig.custom()
.setConnectionRequestTimeout(345, TimeUnit.MILLISECONDS)
.setConnectTimeout(123, TimeUnit.MILLISECONDS)
@@ -258,6 +259,7 @@ public class TestInternalExecRuntime {
@Test
public void testConnectEndpoint() throws Exception {
final HttpClientContext context = HttpClientContext.create();
+ @SuppressWarnings("deprecation")
final RequestConfig config = RequestConfig.custom()
.setConnectionRequestTimeout(345, TimeUnit.MILLISECONDS)
.setConnectTimeout(123, TimeUnit.MILLISECONDS)
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java
index 1340dc2..6f51936 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultProxyRoutePlanner.java
@@ -32,8 +32,6 @@ import org.apache.hc.client5.http.SchemePortResolver;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.protocol.HttpClientContext;
import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
-import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.junit.Assert;
@@ -72,10 +70,10 @@ public class TestDefaultProxyRoutePlanner {
}
@Test
+ @SuppressWarnings("deprecation")
public void testViaProxy() throws Exception {
final HttpHost target = new HttpHost("http", "somehost", 80);
final HttpHost proxy = new HttpHost("custom.proxy.host", 8080);
- final HttpRequest request = new BasicHttpRequest("GET", "/");
final HttpClientContext context = HttpClientContext.create();
context.setRequestConfig(RequestConfig.custom().setProxy(proxy).build());
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java
index c6274fe..243868c 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/routing/TestDefaultRoutePlanner.java
@@ -82,6 +82,7 @@ public class TestDefaultRoutePlanner {
}
@Test
+ @SuppressWarnings("deprecation")
public void testViaProxy() throws Exception {
final HttpHost target = new HttpHost("http", "somehost", 80);
final HttpHost proxy = new HttpHost("proxy", 8080);