- * When a particular component is not explicitly set this class will - * use its default implementation. System properties will be taken - * into account when configuring the default implementations when - * {@link #useSystemProperties()} method is called prior to calling - * {@link #build()}. - *
- ** Please note that some settings used by this class can be mutually * exclusive and may not apply when building {@link CloseableHttpAsyncClient} * instances. @@ -252,7 +236,6 @@ private ExecInterceptorEntry( private boolean evictIdleConnections; private TimeValue maxIdleTime; - private boolean systemProperties; private boolean automaticRetriesDisabled; private boolean redirectHandlingDisabled; private boolean cookieManagementDisabled; @@ -776,13 +759,13 @@ public final HttpAsyncClientBuilder setDefaultRequestConfig(final RequestConfig } /** - * Use system properties when creating and configuring default - * implementations. + * Ignored. * + * @deprecated This method is now redundant and calls to it can be removed. * @return this instance. */ + @Deprecated public final HttpAsyncClientBuilder useSystemProperties() { - this.systemProperties = true; return this; } @@ -1010,11 +993,7 @@ public AsyncClientConnectionManager getConnManager() { public CloseableHttpAsyncClient build() { AsyncClientConnectionManager connManagerCopy = this.connManager; if (connManagerCopy == null) { - final PoolingAsyncClientConnectionManagerBuilder connectionManagerBuilder = PoolingAsyncClientConnectionManagerBuilder.create(); - if (systemProperties) { - connectionManagerBuilder.useSystemProperties(); - } - connManagerCopy = connectionManagerBuilder.build(); + connManagerCopy = PoolingAsyncClientConnectionManagerBuilder.create().build(); } ConnectionKeepAliveStrategy keepAliveStrategyCopy = this.keepAliveStrategy; @@ -1166,11 +1145,9 @@ public CloseableHttpAsyncClient build() { routePlannerCopy = new DefaultProxyRoutePlanner(proxy, schemePortResolverCopy); } else if (this.proxySelector != null) { routePlannerCopy = new SystemDefaultRoutePlanner(schemePortResolverCopy, this.proxySelector); - } else if (systemProperties) { + } else { final ProxySelector defaultProxySelector = ProxySelector.getDefault(); routePlannerCopy = new SystemDefaultRoutePlanner(schemePortResolverCopy, defaultProxySelector); - } else { - routePlannerCopy = new DefaultRoutePlanner(schemePortResolverCopy); } } @@ -1276,11 +1253,7 @@ public CloseableHttpAsyncClient build() { CredentialsProvider credentialsProviderCopy = this.credentialsProvider; if (credentialsProviderCopy == null) { - if (systemProperties) { - credentialsProviderCopy = new SystemDefaultCredentialsProvider(); - } else { - credentialsProviderCopy = new BasicCredentialsProvider(); - } + credentialsProviderCopy = new SystemDefaultCredentialsProvider(); } return new InternalHttpAsyncClient( diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java index 3ef487a8e6..7afd03ccf0 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java @@ -89,9 +89,12 @@ public static CloseableHttpAsyncClient createDefault() { /** * Creates {@link CloseableHttpAsyncClient} instance with default * configuration and system properties. + * + * @deprecated This is now a synonym for {@link #createDefault}; call that instead. */ + @Deprecated public static CloseableHttpAsyncClient createSystem() { - return HttpAsyncClientBuilder.create().useSystemProperties().build(); + return createDefault(); } /** @@ -112,11 +115,13 @@ public static CloseableHttpAsyncClient createHttp2Default() { } /** - * Creates HTTP/2 {@link CloseableHttpAsyncClient} instance with default configuration and - * system properties optimized for HTTP/2 protocol and message multiplexing. + * Creates HTTP/2 {@link CloseableHttpAsyncClient} instance with default configuration. + * + * @deprecated This is now a synonym for {@link #createHttp2Default}; call that instead. */ + @Deprecated public static CloseableHttpAsyncClient createHttp2System() { - return H2AsyncClientBuilder.create().useSystemProperties().build(); + return createHttp2Default(); } private static HttpProcessor createMinimalProtocolProcessor() { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java index d7c4a53ac3..6639349323 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java @@ -67,7 +67,6 @@ import org.apache.hc.client5.http.impl.DefaultUserTokenHandler; import org.apache.hc.client5.http.impl.IdleConnectionEvictor; import org.apache.hc.client5.http.impl.NoopUserTokenHandler; -import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider; import org.apache.hc.client5.http.impl.auth.BasicSchemeFactory; import org.apache.hc.client5.http.impl.auth.BearerSchemeFactory; import org.apache.hc.client5.http.impl.auth.DigestSchemeFactory; @@ -75,7 +74,6 @@ import org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; import org.apache.hc.client5.http.impl.routing.DefaultProxyRoutePlanner; -import org.apache.hc.client5.http.impl.routing.DefaultRoutePlanner; import org.apache.hc.client5.http.impl.routing.SystemDefaultRoutePlanner; import org.apache.hc.client5.http.io.HttpClientConnectionManager; import org.apache.hc.client5.http.protocol.HttpClientContext; @@ -117,24 +115,6 @@ /** * Builder for {@link CloseableHttpClient} instances. *
- * When a particular component is not explicitly set this class will - * use its default implementation. System properties will be taken - * into account when configuring the default implementations when - * {@link #useSystemProperties()} method is called prior to calling - * {@link #build()}. - *
- *
* Please note that some settings used by this class can be mutually
* exclusive and may not apply when building {@link CloseableHttpClient}
* instances.
@@ -225,7 +205,6 @@ private ExecInterceptorEntry(
private boolean evictIdleConnections;
private TimeValue maxIdleTime;
- private boolean systemProperties;
private boolean redirectHandlingDisabled;
private boolean automaticRetriesDisabled;
private boolean contentCompressionDisabled;
@@ -732,13 +711,13 @@ public final HttpClientBuilder setDefaultRequestConfig(final RequestConfig confi
}
/**
- * Use system properties when creating and configuring default
- * implementations.
+ * Ignored.
*
+ * @deprecated This method is now redundant and calls to it can be removed.
* @return this instance.
*/
+ @Deprecated
public final HttpClientBuilder useSystemProperties() {
- this.systemProperties = true;
return this;
}
@@ -882,11 +861,7 @@ public CloseableHttpClient build() {
}
HttpClientConnectionManager connManagerCopy = this.connManager;
if (connManagerCopy == null) {
- final PoolingHttpClientConnectionManagerBuilder connectionManagerBuilder = PoolingHttpClientConnectionManagerBuilder.create();
- if (systemProperties) {
- connectionManagerBuilder.useSystemProperties();
- }
- connManagerCopy = connectionManagerBuilder.build();
+ connManagerCopy = PoolingHttpClientConnectionManagerBuilder.create().build();
}
ConnectionReuseStrategy reuseStrategyCopy = this.reuseStrategy;
if (reuseStrategyCopy == null) {
@@ -1039,11 +1014,9 @@ public CloseableHttpClient build() {
routePlannerCopy = new DefaultProxyRoutePlanner(proxy, schemePortResolverCopy);
} else if (this.proxySelector != null) {
routePlannerCopy = new SystemDefaultRoutePlanner(schemePortResolverCopy, this.proxySelector);
- } else if (systemProperties) {
+ } else {
final ProxySelector defaultProxySelector = ProxySelector.getDefault();
routePlannerCopy = new SystemDefaultRoutePlanner(schemePortResolverCopy, defaultProxySelector);
- } else {
- routePlannerCopy = new DefaultRoutePlanner(schemePortResolverCopy);
}
}
@@ -1118,11 +1091,7 @@ public CloseableHttpClient build() {
CredentialsProvider defaultCredentialsProvider = this.credentialsProvider;
if (defaultCredentialsProvider == null) {
- if (systemProperties) {
- defaultCredentialsProvider = new SystemDefaultCredentialsProvider();
- } else {
- defaultCredentialsProvider = new BasicCredentialsProvider();
- }
+ defaultCredentialsProvider = new SystemDefaultCredentialsProvider();
}
List
- * When a particular component is not explicitly set this class will
- * use its default implementation. System properties will be taken
- * into account when configuring the default implementations when
- * {@link #useSystemProperties()} method is called prior to calling
- * {@link #build()}.
- *
- * When a particular component is not explicitly set this class will
- * use its default implementation. System properties will be taken
- * into account when configuring the default implementations when
- * {@link #useSystemProperties()} method is called prior to calling
- * {@link #build()}.
- *
- * When a particular component is not explicitly set this class will
- * use its default implementation. System properties will be taken
- * into account when configuring the default implementations when
- * {@link #useSystemProperties()} method is called prior to calling
- * {@link #buildAsync()} or {@link #buildClassic()}.
- *
- * When a particular component is not explicitly set this class will
- * use its default implementation. System properties will be taken
- * into account when configuring the default implementations when
- * {@link #useSystemProperties()} method is called prior to calling
- * {@link #build()}.
- *
- *
*
* @since 5.0
*/
@@ -88,8 +69,6 @@ public class PoolingHttpClientConnectionManagerBuilder {
private Resolver
- *
*
* @since 5.0
*/
@@ -80,8 +61,6 @@ public class PoolingAsyncClientConnectionManagerBuilder {
private PoolConcurrencyPolicy poolConcurrencyPolicy;
private PoolReusePolicy poolReusePolicy;
- private boolean systemProperties;
-
private int maxConnTotal;
private int maxConnPerRoute;
@@ -259,13 +238,13 @@ public final PoolingAsyncClientConnectionManagerBuilder setValidateAfterInactivi
}
/**
- * Use system properties when creating and configuring default
- * implementations.
+ * Ignored.
*
+ * @deprecated This method is now redundant and calls to it can be removed.
* @return this instance.
*/
+ @Deprecated
public final PoolingAsyncClientConnectionManagerBuilder useSystemProperties() {
- this.systemProperties = true;
return this;
}
@@ -306,17 +285,9 @@ public PoolingAsyncClientConnectionManager build() {
tlsStrategyCopy = tlsStrategy;
} else {
if (ReflectionUtils.determineJRELevel() <= 8 && ConscryptClientTlsStrategy.isSupported()) {
- if (systemProperties) {
- tlsStrategyCopy = ConscryptClientTlsStrategy.getSystemDefault();
- } else {
- tlsStrategyCopy = ConscryptClientTlsStrategy.getDefault();
- }
+ tlsStrategyCopy = ConscryptClientTlsStrategy.getDefault();
} else {
- if (systemProperties) {
- tlsStrategyCopy = DefaultClientTlsStrategy.createSystemDefault();
- } else {
- tlsStrategyCopy = DefaultClientTlsStrategy.createDefault();
- }
+ tlsStrategyCopy = DefaultClientTlsStrategy.createDefault();
}
}
final PoolingAsyncClientConnectionManager poolingmgr = new PoolingAsyncClientConnectionManager(
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ClientTlsStrategyBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ClientTlsStrategyBuilder.java
index 12e254a929..7be7dd6938 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ClientTlsStrategyBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ClientTlsStrategyBuilder.java
@@ -40,25 +40,6 @@
/**
* Builder for client TLS strategy instances.
- *
- *
*
* @since 5.0
*/
@@ -74,7 +55,6 @@ public static ClientTlsStrategyBuilder create() {
private SSLBufferMode sslBufferMode;
private HostnameVerificationPolicy hostnameVerificationPolicy;
private HostnameVerifier hostnameVerifier;
- private boolean systemProperties;
/**
* Sets {@link SSLContext} instance.
@@ -171,13 +151,12 @@ public ClientTlsStrategyBuilder setTlsDetailsFactory(final Factory
- *
*
* @deprecated Use {@link DefaultClientTlsStrategy}
*/
@@ -70,7 +49,6 @@ public static SSLConnectionSocketFactoryBuilder create() {
private String[] tlsVersions;
private String[] ciphers;
private HostnameVerifier hostnameVerifier;
- private boolean systemProperties;
/**
* Sets {@link SSLContext} instance.
@@ -127,13 +105,9 @@ public SSLConnectionSocketFactoryBuilder setHostnameVerifier(final HostnameVerif
}
/**
- * Use system properties when creating and configuring default
- * implementations.
- *
- * @return this instance.
+ * Ignored.
*/
public final SSLConnectionSocketFactoryBuilder useSystemProperties() {
- this.systemProperties = true;
return this;
}
@@ -142,28 +116,12 @@ public SSLConnectionSocketFactory build() {
if (sslContext != null) {
socketFactory = sslContext.getSocketFactory();
} else {
- if (systemProperties) {
- socketFactory = (javax.net.ssl.SSLSocketFactory) javax.net.ssl.SSLSocketFactory.getDefault();
- } else {
- socketFactory = SSLContexts.createDefault().getSocketFactory();
- }
- }
- final String[] tlsVersionsCopy;
- if (tlsVersions != null) {
- tlsVersionsCopy = tlsVersions;
- } else {
- tlsVersionsCopy = systemProperties ? HttpsSupport.getSystemProtocols() : null;
- }
- final String[] ciphersCopy;
- if (ciphers != null) {
- ciphersCopy = ciphers;
- } else {
- ciphersCopy = systemProperties ? HttpsSupport.getSystemCipherSuits() : null;
+ socketFactory = SSLContexts.createDefault().getSocketFactory();
}
return new SSLConnectionSocketFactory(
socketFactory,
- tlsVersionsCopy,
- ciphersCopy,
+ tlsVersions,
+ ciphers,
hostnameVerifier != null ? hostnameVerifier : HttpsSupport.getDefaultHostnameVerifier());
}
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientSNI.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientSNI.java
index 9b38baa82c..1176047b79 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientSNI.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientSNI.java
@@ -51,7 +51,7 @@
public class AsyncClientSNI {
public static void main(final String[] args) throws Exception {
- try (final CloseableHttpAsyncClient client = HttpAsyncClients.createSystem()) {
+ try (final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault()) {
client.start();
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConfiguration.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConfiguration.java
index a9acf0098d..80275b66eb 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConfiguration.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientConfiguration.java
@@ -147,7 +147,7 @@ public Header parseHeader(final CharArrayBuffer buffer) {
// SSL context for secure connections can be created either based on
// system or application specific properties.
- final SSLContext sslContext = SSLContexts.createSystemDefault();
+ final SSLContext sslContext = SSLContexts.createDefault();
// Create a registry of custom connection socket factories for supported
// protocol schemes.
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientSNI.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientSNI.java
index 17736e884e..3fecb58b59 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientSNI.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientSNI.java
@@ -44,7 +44,7 @@
public class ClientSNI {
public final static void main(final String[] args) throws Exception {
- try (CloseableHttpClient httpclient = HttpClients.createSystem()) {
+ try (CloseableHttpClient httpclient = HttpClients.createDefault()) {
final HttpHost target = new HttpHost("https", "www.google.com");
final HttpGet httpget = new HttpGet("https://www.google.ch/");
diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientSpkiPinningExample.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientSpkiPinningExample.java
index a05c4b2367..59a33de341 100644
--- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientSpkiPinningExample.java
+++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientSpkiPinningExample.java
@@ -48,7 +48,7 @@
public class ClientSpkiPinningExample {
public static void main(final String[] args) throws Exception {
- final SSLContext sslContext = SSLContexts.createSystemDefault();
+ final SSLContext sslContext = SSLContexts.createDefault();
final SpkiPinningClientTlsStrategy pinning = SpkiPinningClientTlsStrategy
.newBuilder(sslContext)