Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
import org.apache.hc.client5.http.protocol.RequestExpectContinue;
import org.apache.hc.client5.http.protocol.ResponseProcessCookies;
import org.apache.hc.client5.http.routing.HttpRoutePlanner;
import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
import org.apache.hc.core5.annotation.Experimental;
import org.apache.hc.core5.annotation.Internal;
import org.apache.hc.core5.concurrent.DefaultThreadFactory;
Expand Down Expand Up @@ -201,7 +200,7 @@ private ExecInterceptorEntry(
private boolean evictIdleConnections;
private TimeValue maxIdleTime;

private boolean systemProperties;
private boolean ignoreSystemProperties;
private boolean automaticRetriesDisabled;
private boolean redirectHandlingDisabled;
private boolean cookieManagementDisabled;
Expand Down Expand Up @@ -669,13 +668,24 @@ public final H2AsyncClientBuilder setDefaultConnectionConfig(final ConnectionCon
}

/**
* Use system properties when creating and configuring default
* implementations.
* Use system properties when creating new instances.
*
* @return this instance.
*/
public final H2AsyncClientBuilder useSystemProperties() {
this.systemProperties = true;
this.ignoreSystemProperties = false;
return this;
}

/**
* Ignore system properties when creating new instances.
*
* @return this instance.
*
* @since 5.7
*/
public final H2AsyncClientBuilder ignoreSystemProperties() {
this.ignoreSystemProperties = true;
return this;
}

Expand Down Expand Up @@ -964,24 +974,15 @@ public CloseableHttpAsyncClient build() {

CredentialsProvider credentialsProviderCopy = this.credentialsProvider;
if (credentialsProviderCopy == null) {
if (systemProperties) {
credentialsProviderCopy = new SystemDefaultCredentialsProvider();
} else {
if (ignoreSystemProperties) {
credentialsProviderCopy = new BasicCredentialsProvider();
}
}

TlsStrategy tlsStrategyCopy = this.tlsStrategy;
if (tlsStrategyCopy == null) {
if (systemProperties) {
tlsStrategyCopy = DefaultClientTlsStrategy.createSystemDefault();
} else {
tlsStrategyCopy = DefaultClientTlsStrategy.createDefault();
credentialsProviderCopy = new SystemDefaultCredentialsProvider();
}
}

final MultihomeConnectionInitiator connectionInitiator = new MultihomeConnectionInitiator(ioReactor, dnsResolver);
final InternalH2ConnPool connPool = new InternalH2ConnPool(connectionInitiator, host -> null, tlsStrategyCopy);
final InternalH2ConnPool connPool = new InternalH2ConnPool(connectionInitiator, host -> null, tlsStrategy);
connPool.setConnectionConfigResolver(connectionConfigResolver);

List<Closeable> closeablesCopy = closeables != null ? new ArrayList<>(closeables) : null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ private ExecInterceptorEntry(
private boolean evictIdleConnections;
private TimeValue maxIdleTime;

private boolean systemProperties;
private boolean ignoreSystemProperties;
private boolean automaticRetriesDisabled;
private boolean redirectHandlingDisabled;
private boolean cookieManagementDisabled;
Expand Down Expand Up @@ -776,13 +776,24 @@ public final HttpAsyncClientBuilder setDefaultRequestConfig(final RequestConfig
}

/**
* Use system properties when creating and configuring default
* implementations.
* Use system properties when creating new instances.
*
* @return this instance.
*/
public final HttpAsyncClientBuilder useSystemProperties() {
this.systemProperties = true;
this.ignoreSystemProperties = false;
return this;
}

/**
* Ignore system properties when creating new instances.
*
* @return this instance.
*
* @since 5.7
*/
public final HttpAsyncClientBuilder ignoreSystemProperties() {
this.ignoreSystemProperties = true;
return this;
}

Expand Down Expand Up @@ -1011,8 +1022,8 @@ public CloseableHttpAsyncClient build() {
AsyncClientConnectionManager connManagerCopy = this.connManager;
if (connManagerCopy == null) {
final PoolingAsyncClientConnectionManagerBuilder connectionManagerBuilder = PoolingAsyncClientConnectionManagerBuilder.create();
if (systemProperties) {
connectionManagerBuilder.useSystemProperties();
if (ignoreSystemProperties) {
connectionManagerBuilder.ignoreSystemProperties();
}
connManagerCopy = connectionManagerBuilder.build();
}
Expand Down Expand Up @@ -1166,11 +1177,11 @@ public CloseableHttpAsyncClient build() {
routePlannerCopy = new DefaultProxyRoutePlanner(proxy, schemePortResolverCopy);
} else if (this.proxySelector != null) {
routePlannerCopy = new SystemDefaultRoutePlanner(schemePortResolverCopy, this.proxySelector);
} else if (systemProperties) {
} else if (ignoreSystemProperties) {
routePlannerCopy = new DefaultRoutePlanner(schemePortResolverCopy);
} else {
final ProxySelector defaultProxySelector = ProxySelector.getDefault();
routePlannerCopy = new SystemDefaultRoutePlanner(schemePortResolverCopy, defaultProxySelector);
} else {
routePlannerCopy = new DefaultRoutePlanner(schemePortResolverCopy);
}
}

Expand Down Expand Up @@ -1276,10 +1287,10 @@ public CloseableHttpAsyncClient build() {

CredentialsProvider credentialsProviderCopy = this.credentialsProvider;
if (credentialsProviderCopy == null) {
if (systemProperties) {
credentialsProviderCopy = new SystemDefaultCredentialsProvider();
} else {
if (ignoreSystemProperties) {
credentialsProviderCopy = new BasicCredentialsProvider();
} else {
credentialsProviderCopy = new SystemDefaultCredentialsProvider();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,33 @@ public static HttpAsyncClientBuilder custom() {

/**
* Creates {@link CloseableHttpAsyncClient} instance with default configuration.
*
* @deprecated Use {@link #create()}
*/
@Deprecated
public static CloseableHttpAsyncClient createDefault() {
return HttpAsyncClientBuilder.create().build();
}

/**
* Creates {@link CloseableHttpAsyncClient} instance with default
* configuration and system properties.
*
* @deprecated Use {@link #create()}
*/
@Deprecated
public static CloseableHttpAsyncClient createSystem() {
return HttpAsyncClientBuilder.create().useSystemProperties().build();
return HttpAsyncClientBuilder.create().build();
}

/**
* Creates {@link CloseableHttpAsyncClient} instance with default
* configuration and system properties.
*
* @since 5.7
*/
public static CloseableHttpAsyncClient create() {
return HttpAsyncClientBuilder.create().build();
}

/**
Expand All @@ -116,7 +132,7 @@ public static CloseableHttpAsyncClient createHttp2Default() {
* system properties optimized for HTTP/2 protocol and message multiplexing.
*/
public static CloseableHttpAsyncClient createHttp2System() {
return H2AsyncClientBuilder.create().useSystemProperties().build();
return H2AsyncClientBuilder.create().build();
}

private static HttpProcessor createMinimalProtocolProcessor() {
Expand Down Expand Up @@ -325,7 +341,7 @@ public static MinimalH2AsyncClient createHttp2Minimal(
public static MinimalH2AsyncClient createHttp2Minimal(
final H2Config h2Config,
final IOReactorConfig ioReactorConfig) {
return createHttp2Minimal(h2Config, ioReactorConfig, DefaultClientTlsStrategy.createDefault());
return createHttp2Minimal(h2Config, ioReactorConfig, DefaultClientTlsStrategy.create());
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,13 @@ private ExecInterceptorEntry(
private boolean evictIdleConnections;
private TimeValue maxIdleTime;

private boolean systemProperties;
private boolean ignoreSystemProperties;
private boolean redirectHandlingDisabled;
private boolean automaticRetriesDisabled;
private boolean contentCompressionDisabled;
private boolean cookieManagementDisabled;
private boolean authCachingDisabled;
private boolean connectionStateDisabled;
private boolean defaultUserAgentDisabled;
private ProxySelector proxySelector;

private boolean tlsRequired;
Expand Down Expand Up @@ -732,13 +731,24 @@ public final HttpClientBuilder setDefaultRequestConfig(final RequestConfig confi
}

/**
* Use system properties when creating and configuring default
* implementations.
* Use system properties when creating new instances.
*
* @return this instance.
*/
public final HttpClientBuilder useSystemProperties() {
this.systemProperties = true;
this.ignoreSystemProperties = false;
return this;
}

/**
* Ignore system properties when creating new instances.
*
* @return this instance.
*
* @since 5.7
*/
public final HttpClientBuilder ignoreSystemProperties() {
this.ignoreSystemProperties = true;
return this;
}

Expand Down Expand Up @@ -798,9 +808,11 @@ public final HttpClientBuilder evictIdleConnections(final TimeValue maxIdleTime)
*
* @return this instance.
* @since 4.5.7
*
* @deprecated Do not use.
*/
@Deprecated
public final HttpClientBuilder disableDefaultUserAgent() {
this.defaultUserAgentDisabled = true;
return this;
}

Expand Down Expand Up @@ -883,8 +895,8 @@ public CloseableHttpClient build() {
HttpClientConnectionManager connManagerCopy = this.connManager;
if (connManagerCopy == null) {
final PoolingHttpClientConnectionManagerBuilder connectionManagerBuilder = PoolingHttpClientConnectionManagerBuilder.create();
if (systemProperties) {
connectionManagerBuilder.useSystemProperties();
if (ignoreSystemProperties) {
connectionManagerBuilder.ignoreSystemProperties();
}
connManagerCopy = connectionManagerBuilder.build();
}
Expand Down Expand Up @@ -1039,11 +1051,11 @@ public CloseableHttpClient build() {
routePlannerCopy = new DefaultProxyRoutePlanner(proxy, schemePortResolverCopy);
} else if (this.proxySelector != null) {
routePlannerCopy = new SystemDefaultRoutePlanner(schemePortResolverCopy, this.proxySelector);
} else if (systemProperties) {
} else if (ignoreSystemProperties) {
routePlannerCopy = new DefaultRoutePlanner(schemePortResolverCopy);
} else {
final ProxySelector defaultProxySelector = ProxySelector.getDefault();
routePlannerCopy = new SystemDefaultRoutePlanner(schemePortResolverCopy, defaultProxySelector);
} else {
routePlannerCopy = new DefaultRoutePlanner(schemePortResolverCopy);
}
}

Expand Down Expand Up @@ -1118,10 +1130,10 @@ public CloseableHttpClient build() {

CredentialsProvider defaultCredentialsProvider = this.credentialsProvider;
if (defaultCredentialsProvider == null) {
if (systemProperties) {
defaultCredentialsProvider = new SystemDefaultCredentialsProvider();
} else {
if (ignoreSystemProperties) {
defaultCredentialsProvider = new BasicCredentialsProvider();
} else {
defaultCredentialsProvider = new SystemDefaultCredentialsProvider();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,33 @@ public static HttpClientBuilder custom() {
/**
* Creates {@link CloseableHttpClient} instance with default
* configuration.
*
* @deprecated Use {@link #create()}
*/
@Deprecated
public static CloseableHttpClient createDefault() {
return HttpClientBuilder.create().build();
}

/**
* Creates {@link CloseableHttpClient} instance with default
* configuration based on system properties.
*
* @deprecated Use {@link #create()}
*/
@Deprecated
public static CloseableHttpClient createSystem() {
return HttpClientBuilder.create().useSystemProperties().build();
return HttpClientBuilder.create().build();
}

/**
* Creates {@link CloseableHttpClient} instance with default
* configuration based on system properties.
*
* @since 5.7
*/
public static CloseableHttpClient create() {
return HttpClientBuilder.create().build();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public BasicHttpClientConnectionManager(
public BasicHttpClientConnectionManager() {
this(new DefaultHttpClientConnectionOperator(null, null,
RegistryBuilder.<TlsSocketStrategy>create()
.register(URIScheme.HTTPS.id, DefaultClientTlsStrategy.createDefault())
.register(URIScheme.HTTPS.id, DefaultClientTlsStrategy.create())
.build()),
null);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public class PoolingHttpClientConnectionManager
public PoolingHttpClientConnectionManager() {
this(new DefaultHttpClientConnectionOperator(null, null,
RegistryBuilder.<TlsSocketStrategy>create()
.register(URIScheme.HTTPS.id, DefaultClientTlsStrategy.createDefault())
.register(URIScheme.HTTPS.id, DefaultClientTlsStrategy.create())
.build()),
PoolConcurrencyPolicy.STRICT,
PoolReusePolicy.LIFO,
Expand Down
Loading