Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed Http2 to H2 (no functional changes)

This commit is contained in:
Oleg Kalnichevski 2019-07-12 15:33:21 +02:00
parent 8e42474a6c
commit 669020ccac
16 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttp2AsyncClientBuilder.java → httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingH2AsyncClientBuilder.java vendored
View File

@ -39,7 +39,7 @@ import org.apache.hc.client5.http.cache.HttpAsyncCacheStorageAdaptor;
import org.apache.hc.client5.http.cache.HttpCacheStorage;
import org.apache.hc.client5.http.cache.ResourceFactory;
import org.apache.hc.client5.http.impl.ChainElements;
import org.apache.hc.client5.http.impl.async.Http2AsyncClientBuilder;
import org.apache.hc.client5.http.impl.async.H2AsyncClientBuilder;
import org.apache.hc.client5.http.impl.schedule.ImmediateSchedulingStrategy;
import org.apache.hc.client5.http.schedule.SchedulingStrategy;
import org.apache.hc.core5.http.config.NamedElementChain;
@ -50,7 +50,7 @@ import org.apache.hc.core5.http.config.NamedElementChain;
*
* @since 5.0
*/
public class CachingHttp2AsyncClientBuilder extends Http2AsyncClientBuilder {
public class CachingH2AsyncClientBuilder extends H2AsyncClientBuilder {
private ResourceFactory resourceFactory;
private HttpAsyncCacheStorage storage;
@ -60,51 +60,51 @@ public class CachingHttp2AsyncClientBuilder extends Http2AsyncClientBuilder {
private HttpAsyncCacheInvalidator httpCacheInvalidator;
private boolean deleteCache;
public static CachingHttp2AsyncClientBuilder create() {
return new CachingHttp2AsyncClientBuilder();
public static CachingH2AsyncClientBuilder create() {
return new CachingH2AsyncClientBuilder();
}
protected CachingHttp2AsyncClientBuilder() {
protected CachingH2AsyncClientBuilder() {
super();
this.deleteCache = true;
}
public final CachingHttp2AsyncClientBuilder setResourceFactory(final ResourceFactory resourceFactory) {
public final CachingH2AsyncClientBuilder setResourceFactory(final ResourceFactory resourceFactory) {
this.resourceFactory = resourceFactory;
return this;
}
public final CachingHttp2AsyncClientBuilder setHttpCacheStorage(final HttpCacheStorage storage) {
public final CachingH2AsyncClientBuilder setHttpCacheStorage(final HttpCacheStorage storage) {
this.storage = storage != null ? new HttpAsyncCacheStorageAdaptor(storage) : null;
return this;
}
public final CachingHttp2AsyncClientBuilder setHttpCacheStorage(final HttpAsyncCacheStorage storage) {
public final CachingH2AsyncClientBuilder setHttpCacheStorage(final HttpAsyncCacheStorage storage) {
this.storage = storage;
return this;
}
public final CachingHttp2AsyncClientBuilder setCacheDir(final File cacheDir) {
public final CachingH2AsyncClientBuilder setCacheDir(final File cacheDir) {
this.cacheDir = cacheDir;
return this;
}
public final CachingHttp2AsyncClientBuilder setSchedulingStrategy(final SchedulingStrategy schedulingStrategy) {
public final CachingH2AsyncClientBuilder setSchedulingStrategy(final SchedulingStrategy schedulingStrategy) {
this.schedulingStrategy = schedulingStrategy;
return this;
}
public final CachingHttp2AsyncClientBuilder setCacheConfig(final CacheConfig cacheConfig) {
public final CachingH2AsyncClientBuilder setCacheConfig(final CacheConfig cacheConfig) {
this.cacheConfig = cacheConfig;
return this;
}
public final CachingHttp2AsyncClientBuilder setHttpCacheInvalidator(final HttpAsyncCacheInvalidator cacheInvalidator) {
public final CachingH2AsyncClientBuilder setHttpCacheInvalidator(final HttpAsyncCacheInvalidator cacheInvalidator) {
this.httpCacheInvalidator = cacheInvalidator;
return this;
}
public CachingHttp2AsyncClientBuilder setDeleteCache(final boolean deleteCache) {
public CachingH2AsyncClientBuilder setDeleteCache(final boolean deleteCache) {
this.deleteCache = deleteCache;
return this;
}

8
httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpAsyncClients.java vendored
View File

@ -73,8 +73,8 @@ public final class CachingHttpAsyncClients {
* Creates builder object for construction of custom HTTP/2
* {@link CloseableHttpAsyncClient} instances.
*/
public static CachingHttp2AsyncClientBuilder customHttp2() {
return CachingHttp2AsyncClientBuilder.create();
public static CachingH2AsyncClientBuilder customHttp2() {
return CachingH2AsyncClientBuilder.create();
}
/**
@ -82,7 +82,7 @@ public final class CachingHttpAsyncClients {
* response cache.
*/
public static CloseableHttpAsyncClient createHttp2MemoryBound() {
return CachingHttp2AsyncClientBuilder.create().build();
return CachingH2AsyncClientBuilder.create().build();
}
/**
@ -92,7 +92,7 @@ public final class CachingHttpAsyncClients {
* @param cacheDir location of response cache.
*/
public static CloseableHttpAsyncClient createHttp2FileBound(final File cacheDir) {
return CachingHttp2AsyncClientBuilder.create().setCacheDir(cacheDir).build();
return CachingH2AsyncClientBuilder.create().setCacheDir(cacheDir).build();
}
}

10
httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp2Async.java → httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2Async.java
View File

@ -31,7 +31,7 @@ import java.util.Collection;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
import org.apache.hc.client5.http.impl.async.Http2AsyncClientBuilder;
import org.apache.hc.client5.http.impl.async.H2AsyncClientBuilder;
import org.apache.hc.client5.testing.SSLTestContexts;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.URIScheme;
@ -43,7 +43,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class TestHttp2Async extends AbstractHttpAsyncFundamentalsTest<CloseableHttpAsyncClient> {
public class TestH2Async extends AbstractHttpAsyncFundamentalsTest<CloseableHttpAsyncClient> {
@Parameterized.Parameters(name = "HTTP/2 {0}")
public static Collection<Object[]> protocols() {
@ -53,14 +53,14 @@ public class TestHttp2Async extends AbstractHttpAsyncFundamentalsTest<CloseableH
});
}
protected Http2AsyncClientBuilder clientBuilder;
protected H2AsyncClientBuilder clientBuilder;
@Rule
public ExternalResource clientResource = new ExternalResource() {
@Override
protected void before() throws Throwable {
clientBuilder = Http2AsyncClientBuilder.create()
clientBuilder = H2AsyncClientBuilder.create()
.setDefaultRequestConfig(RequestConfig.custom()
.setConnectionRequestTimeout(TIMEOUT)
.setConnectTimeout(TIMEOUT)
@ -70,7 +70,7 @@ public class TestHttp2Async extends AbstractHttpAsyncFundamentalsTest<CloseableH
};
public TestHttp2Async(final URIScheme scheme) {
public TestH2Async(final URIScheme scheme) {
super(scheme);
}

8
httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp2AsyncMinimal.java → httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncMinimal.java
View File

@ -30,7 +30,7 @@ import java.util.Arrays;
import java.util.Collection;
import org.apache.hc.client5.http.impl.async.HttpAsyncClients;
import org.apache.hc.client5.http.impl.async.MinimalHttp2AsyncClient;
import org.apache.hc.client5.http.impl.async.MinimalH2AsyncClient;
import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
import org.apache.hc.client5.testing.SSLTestContexts;
import org.apache.hc.core5.http.HttpHost;
@ -41,7 +41,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class TestHttp2AsyncMinimal extends AbstractHttpAsyncFundamentalsTest<MinimalHttp2AsyncClient> {
public class TestH2AsyncMinimal extends AbstractHttpAsyncFundamentalsTest<MinimalH2AsyncClient> {
@Parameterized.Parameters(name = "{0}")
public static Collection<Object[]> protocols() {
@ -51,12 +51,12 @@ public class TestHttp2AsyncMinimal extends AbstractHttpAsyncFundamentalsTest<Min
});
}
public TestHttp2AsyncMinimal(final URIScheme scheme) {
public TestH2AsyncMinimal(final URIScheme scheme) {
super(scheme);
}
@Override
protected MinimalHttp2AsyncClient createClient() throws Exception {
protected MinimalH2AsyncClient createClient() throws Exception {
final IOReactorConfig ioReactorConfig = IOReactorConfig.custom()
.setSoTimeout(TIMEOUT)
.build();

10
httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp2AsyncRedirect.java → httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2AsyncRedirect.java
View File

@ -31,7 +31,7 @@ import java.util.Collection;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
import org.apache.hc.client5.http.impl.async.Http2AsyncClientBuilder;
import org.apache.hc.client5.http.impl.async.H2AsyncClientBuilder;
import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
import org.apache.hc.client5.testing.SSLTestContexts;
import org.apache.hc.core5.http.HttpVersion;
@ -42,7 +42,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class TestHttp2AsyncRedirect extends AbstractHttpAsyncRedirectsTest<CloseableHttpAsyncClient> {
public class TestH2AsyncRedirect extends AbstractHttpAsyncRedirectsTest<CloseableHttpAsyncClient> {
@Parameterized.Parameters(name = "HTTP/2 {0}")
public static Collection<Object[]> protocols() {
@ -52,9 +52,9 @@ public class TestHttp2AsyncRedirect extends AbstractHttpAsyncRedirectsTest<Close
});
}
protected Http2AsyncClientBuilder clientBuilder;
protected H2AsyncClientBuilder clientBuilder;
public TestHttp2AsyncRedirect(final URIScheme scheme) {
public TestH2AsyncRedirect(final URIScheme scheme) {
super(HttpVersion.HTTP_2, scheme);
}
@ -63,7 +63,7 @@ public class TestHttp2AsyncRedirect extends AbstractHttpAsyncRedirectsTest<Close
@Override
protected void before() throws Throwable {
clientBuilder = Http2AsyncClientBuilder.create()
clientBuilder = H2AsyncClientBuilder.create()
.setDefaultRequestConfig(RequestConfig.custom()
.setConnectionRequestTimeout(TIMEOUT)
.setConnectTimeout(TIMEOUT)

10
httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp2ClientAuthentication.java → httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestH2ClientAuthentication.java
View File

@ -33,7 +33,7 @@ import org.apache.hc.client5.http.AuthenticationStrategy;
import org.apache.hc.client5.http.auth.AuthSchemeProvider;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
import org.apache.hc.client5.http.impl.async.Http2AsyncClientBuilder;
import org.apache.hc.client5.http.impl.async.H2AsyncClientBuilder;
import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
import org.apache.hc.client5.testing.SSLTestContexts;
@ -46,7 +46,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class TestHttp2ClientAuthentication extends AbstractHttpAsyncClientAuthentication<CloseableHttpAsyncClient> {
public class TestH2ClientAuthentication extends AbstractHttpAsyncClientAuthentication<CloseableHttpAsyncClient> {
@Parameterized.Parameters(name = "HTTP/2 {0}")
public static Collection<Object[]> protocols() {
@ -56,7 +56,7 @@ public class TestHttp2ClientAuthentication extends AbstractHttpAsyncClientAuthen
});
}
protected Http2AsyncClientBuilder clientBuilder;
protected H2AsyncClientBuilder clientBuilder;
protected PoolingAsyncClientConnectionManager connManager;
@Rule
@ -64,7 +64,7 @@ public class TestHttp2ClientAuthentication extends AbstractHttpAsyncClientAuthen
@Override
protected void before() throws Throwable {
clientBuilder = Http2AsyncClientBuilder.create()
clientBuilder = H2AsyncClientBuilder.create()
.setDefaultRequestConfig(RequestConfig.custom()
.setConnectionRequestTimeout(TIMEOUT)
.setConnectTimeout(TIMEOUT)
@ -74,7 +74,7 @@ public class TestHttp2ClientAuthentication extends AbstractHttpAsyncClientAuthen
};
public TestHttp2ClientAuthentication(final URIScheme scheme) {
public TestH2ClientAuthentication(final URIScheme scheme) {
super(scheme, HttpVersion.HTTP_2);
}

82
httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncClientBuilder.java → httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientBuilder.java
View File

@ -128,7 +128,7 @@ import org.apache.hc.core5.util.VersionInfo;
*
* @since 5.0
*/
public class Http2AsyncClientBuilder {
public class H2AsyncClientBuilder {
private static class RequestInterceptorEntry {
@ -217,18 +217,18 @@ public class Http2AsyncClientBuilder {
private List<Closeable> closeables;
public static Http2AsyncClientBuilder create() {
return new Http2AsyncClientBuilder();
public static H2AsyncClientBuilder create() {
return new H2AsyncClientBuilder();
}
protected Http2AsyncClientBuilder() {
protected H2AsyncClientBuilder() {
super();
}
/**
* Sets {@link H2Config} configuration.
*/
public final Http2AsyncClientBuilder setH2Config(final H2Config h2Config) {
public final H2AsyncClientBuilder setH2Config(final H2Config h2Config) {
this.h2Config = h2Config;
return this;
}
@ -236,7 +236,7 @@ public class Http2AsyncClientBuilder {
/**
* Sets {@link IOReactorConfig} configuration.
*/
public final Http2AsyncClientBuilder setIOReactorConfig(final IOReactorConfig ioReactorConfig) {
public final H2AsyncClientBuilder setIOReactorConfig(final IOReactorConfig ioReactorConfig) {
this.ioReactorConfig = ioReactorConfig;
return this;
}
@ -244,7 +244,7 @@ public class Http2AsyncClientBuilder {
/**
* Sets {@link CharCodingConfig} configuration.
*/
public final Http2AsyncClientBuilder setCharCodingConfig(final CharCodingConfig charCodingConfig) {
public final H2AsyncClientBuilder setCharCodingConfig(final CharCodingConfig charCodingConfig) {
this.charCodingConfig = charCodingConfig;
return this;
}
@ -253,7 +253,7 @@ public class Http2AsyncClientBuilder {
* Assigns {@link AuthenticationStrategy} instance for target
* host authentication.
*/
public final Http2AsyncClientBuilder setTargetAuthenticationStrategy(
public final H2AsyncClientBuilder setTargetAuthenticationStrategy(
final AuthenticationStrategy targetAuthStrategy) {
this.targetAuthStrategy = targetAuthStrategy;
return this;
@ -263,7 +263,7 @@ public class Http2AsyncClientBuilder {
* Assigns {@link AuthenticationStrategy} instance for proxy
* authentication.
*/
public final Http2AsyncClientBuilder setProxyAuthenticationStrategy(
public final H2AsyncClientBuilder setProxyAuthenticationStrategy(
final AuthenticationStrategy proxyAuthStrategy) {
this.proxyAuthStrategy = proxyAuthStrategy;
return this;
@ -272,7 +272,7 @@ public class Http2AsyncClientBuilder {
/**
* Adds this protocol interceptor to the head of the protocol processing list.
*/
public final Http2AsyncClientBuilder addResponseInterceptorFirst(final HttpResponseInterceptor interceptor) {
public final H2AsyncClientBuilder addResponseInterceptorFirst(final HttpResponseInterceptor interceptor) {
Args.notNull(interceptor, "Interceptor");
if (responseInterceptors == null) {
responseInterceptors = new LinkedList<>();
@ -284,7 +284,7 @@ public class Http2AsyncClientBuilder {
/**
* Adds this protocol interceptor to the tail of the protocol processing list.
*/
public final Http2AsyncClientBuilder addResponseInterceptorLast(final HttpResponseInterceptor interceptor) {
public final H2AsyncClientBuilder addResponseInterceptorLast(final HttpResponseInterceptor interceptor) {
Args.notNull(interceptor, "Interceptor");
if (responseInterceptors == null) {
responseInterceptors = new LinkedList<>();
@ -296,7 +296,7 @@ public class Http2AsyncClientBuilder {
/**
* Adds this execution interceptor before an existing interceptor.
*/
public final Http2AsyncClientBuilder addExecInterceptorBefore(final String existing, final String name, final AsyncExecChainHandler interceptor) {
public final H2AsyncClientBuilder addExecInterceptorBefore(final String existing, final String name, final AsyncExecChainHandler interceptor) {
Args.notBlank(existing, "Existing");
Args.notBlank(name, "Name");
Args.notNull(interceptor, "Interceptor");
@ -310,7 +310,7 @@ public class Http2AsyncClientBuilder {
/**
* Adds this execution interceptor after interceptor with the given name.
*/
public final Http2AsyncClientBuilder addExecInterceptorAfter(final String existing, final String name, final AsyncExecChainHandler interceptor) {
public final H2AsyncClientBuilder addExecInterceptorAfter(final String existing, final String name, final AsyncExecChainHandler interceptor) {
Args.notBlank(existing, "Existing");
Args.notBlank(name, "Name");
Args.notNull(interceptor, "Interceptor");
@ -324,7 +324,7 @@ public class Http2AsyncClientBuilder {
/**
* Replace an existing interceptor with the given name with new interceptor.
*/
public final Http2AsyncClientBuilder replaceExecInterceptor(final String existing, final AsyncExecChainHandler interceptor) {
public final H2AsyncClientBuilder replaceExecInterceptor(final String existing, final AsyncExecChainHandler interceptor) {
Args.notBlank(existing, "Existing");
Args.notNull(interceptor, "Interceptor");
if (execInterceptors == null) {
@ -337,7 +337,7 @@ public class Http2AsyncClientBuilder {
/**
* Add an interceptor to the head of the processing list.
*/
public final Http2AsyncClientBuilder addExecInterceptorFirst(final String name, final AsyncExecChainHandler interceptor) {
public final H2AsyncClientBuilder addExecInterceptorFirst(final String name, final AsyncExecChainHandler interceptor) {
Args.notNull(name, "Name");
Args.notNull(interceptor, "Interceptor");
execInterceptors.add(new ExecInterceptorEntry(ExecInterceptorEntry.Postion.FIRST, name, interceptor, null));
@ -347,7 +347,7 @@ public class Http2AsyncClientBuilder {
/**
* Add an interceptor to the tail of the processing list.
*/
public final Http2AsyncClientBuilder addExecInterceptorLast(final String name, final AsyncExecChainHandler interceptor) {
public final H2AsyncClientBuilder addExecInterceptorLast(final String name, final AsyncExecChainHandler interceptor) {
Args.notNull(name, "Name");
Args.notNull(interceptor, "Interceptor");
execInterceptors.add(new ExecInterceptorEntry(ExecInterceptorEntry.Postion.LAST, name, interceptor, null));
@ -357,7 +357,7 @@ public class Http2AsyncClientBuilder {
/**
* Adds this protocol interceptor to the head of the protocol processing list.
*/
public final Http2AsyncClientBuilder addRequestInterceptorFirst(final HttpRequestInterceptor interceptor) {
public final H2AsyncClientBuilder addRequestInterceptorFirst(final HttpRequestInterceptor interceptor) {
Args.notNull(interceptor, "Interceptor");
if (requestInterceptors == null) {
requestInterceptors = new LinkedList<>();
@ -369,7 +369,7 @@ public class Http2AsyncClientBuilder {
/**
* Adds this protocol interceptor to the tail of the protocol processing list.
*/
public final Http2AsyncClientBuilder addRequestInterceptorLast(final HttpRequestInterceptor interceptor) {
public final H2AsyncClientBuilder addRequestInterceptorLast(final HttpRequestInterceptor interceptor) {
Args.notNull(interceptor, "Interceptor");
if (requestInterceptors == null) {
requestInterceptors = new LinkedList<>();
@ -384,7 +384,7 @@ public class Http2AsyncClientBuilder {
* Please note this value can be overridden by the {@link #disableAutomaticRetries()}
* method.
*/
public final Http2AsyncClientBuilder setRetryHandler(final HttpRequestRetryHandler retryHandler) {
public final H2AsyncClientBuilder setRetryHandler(final HttpRequestRetryHandler retryHandler) {
this.retryHandler = retryHandler;
return this;
}
@ -396,7 +396,7 @@ public class Http2AsyncClientBuilder {
* method.
* </p>
*/
public Http2AsyncClientBuilder setRedirectStrategy(final RedirectStrategy redirectStrategy) {
public H2AsyncClientBuilder setRedirectStrategy(final RedirectStrategy redirectStrategy) {
this.redirectStrategy = redirectStrategy;
return this;
}
@ -404,7 +404,7 @@ public class Http2AsyncClientBuilder {
/**
* Assigns {@link SchemePortResolver} instance.
*/
public final Http2AsyncClientBuilder setSchemePortResolver(final SchemePortResolver schemePortResolver) {
public final H2AsyncClientBuilder setSchemePortResolver(final SchemePortResolver schemePortResolver) {
this.schemePortResolver = schemePortResolver;
return this;
}
@ -412,7 +412,7 @@ public class Http2AsyncClientBuilder {
/**
* Assigns {@link DnsResolver} instance.
*/
public final Http2AsyncClientBuilder setDnsResolver(final DnsResolver dnsResolver) {
public final H2AsyncClientBuilder setDnsResolver(final DnsResolver dnsResolver) {
this.dnsResolver = dnsResolver;
return this;
}
@ -420,7 +420,7 @@ public class Http2AsyncClientBuilder {
/**
* Assigns {@link TlsStrategy} instance.
*/
public final Http2AsyncClientBuilder setTlsStrategy(final TlsStrategy tlsStrategy) {
public final H2AsyncClientBuilder setTlsStrategy(final TlsStrategy tlsStrategy) {
this.tlsStrategy = tlsStrategy;
return this;
}
@ -428,7 +428,7 @@ public class Http2AsyncClientBuilder {
/**
* Assigns {@link ThreadFactory} instance.
*/
public final Http2AsyncClientBuilder setThreadFactory(final ThreadFactory threadFactory) {
public final H2AsyncClientBuilder setThreadFactory(final ThreadFactory threadFactory) {
this.threadFactory = threadFactory;
return this;
}
@ -436,7 +436,7 @@ public class Http2AsyncClientBuilder {
/**
* Assigns {@code User-Agent} value.
*/
public final Http2AsyncClientBuilder setUserAgent(final String userAgent) {
public final H2AsyncClientBuilder setUserAgent(final String userAgent) {
this.userAgent = userAgent;
return this;
}
@ -444,7 +444,7 @@ public class Http2AsyncClientBuilder {
/**
* Assigns default request header values.
*/
public final Http2AsyncClientBuilder setDefaultHeaders(final Collection<? extends Header> defaultHeaders) {
public final H2AsyncClientBuilder setDefaultHeaders(final Collection<? extends Header> defaultHeaders) {
this.defaultHeaders = defaultHeaders;
return this;
}
@ -452,7 +452,7 @@ public class Http2AsyncClientBuilder {
/**
* Assigns {@link HttpRoutePlanner} instance.
*/
public final Http2AsyncClientBuilder setRoutePlanner(final HttpRoutePlanner routePlanner) {
public final H2AsyncClientBuilder setRoutePlanner(final HttpRoutePlanner routePlanner) {
this.routePlanner = routePlanner;
return this;
}
@ -462,7 +462,7 @@ public class Http2AsyncClientBuilder {
* for request execution if not explicitly set in the client execution
* context.
*/
public final Http2AsyncClientBuilder setDefaultCredentialsProvider(final CredentialsProvider credentialsProvider) {
public final H2AsyncClientBuilder setDefaultCredentialsProvider(final CredentialsProvider credentialsProvider) {
this.credentialsProvider = credentialsProvider;
return this;
}
@ -472,7 +472,7 @@ public class Http2AsyncClientBuilder {
* be used for request execution if not explicitly set in the client execution
* context.
*/
public final Http2AsyncClientBuilder setDefaultAuthSchemeRegistry(final Lookup<AuthSchemeProvider> authSchemeRegistry) {
public final H2AsyncClientBuilder setDefaultAuthSchemeRegistry(final Lookup<AuthSchemeProvider> authSchemeRegistry) {
this.authSchemeRegistry = authSchemeRegistry;
return this;
}
@ -482,7 +482,7 @@ public class Http2AsyncClientBuilder {
* which will be used for request execution if not explicitly set in the client
* execution context.
*/
public final Http2AsyncClientBuilder setDefaultCookieSpecRegistry(final Lookup<CookieSpecProvider> cookieSpecRegistry) {
public final H2AsyncClientBuilder setDefaultCookieSpecRegistry(final Lookup<CookieSpecProvider> cookieSpecRegistry) {
this.cookieSpecRegistry = cookieSpecRegistry;
return this;
}
@ -491,7 +491,7 @@ public class Http2AsyncClientBuilder {
* Assigns default {@link CookieStore} instance which will be used for
* request execution if not explicitly set in the client execution context.
*/
public final Http2AsyncClientBuilder setDefaultCookieStore(final CookieStore cookieStore) {
public final H2AsyncClientBuilder setDefaultCookieStore(final CookieStore cookieStore) {
this.cookieStore = cookieStore;
return this;
}
@ -501,7 +501,7 @@ public class Http2AsyncClientBuilder {
* for request execution if not explicitly set in the client execution
* context.
*/
public final Http2AsyncClientBuilder setDefaultRequestConfig(final RequestConfig config) {
public final H2AsyncClientBuilder setDefaultRequestConfig(final RequestConfig config) {
this.defaultRequestConfig = config;
return this;
}
@ -510,7 +510,7 @@ public class Http2AsyncClientBuilder {
* Use system properties when creating and configuring default
* implementations.
*/
public final Http2AsyncClientBuilder useSystemProperties() {
public final H2AsyncClientBuilder useSystemProperties() {
this.systemProperties = true;
return this;
}
@ -518,7 +518,7 @@ public class Http2AsyncClientBuilder {
/**
* Disables automatic redirect handling.
*/
public final Http2AsyncClientBuilder disableRedirectHandling() {
public final H2AsyncClientBuilder disableRedirectHandling() {
redirectHandlingDisabled = true;
return this;
}
@ -526,7 +526,7 @@ public class Http2AsyncClientBuilder {
/**
* Disables automatic request recovery and re-execution.
*/
public final Http2AsyncClientBuilder disableAutomaticRetries() {
public final H2AsyncClientBuilder disableAutomaticRetries() {
automaticRetriesDisabled = true;
return this;
}
@ -534,7 +534,7 @@ public class Http2AsyncClientBuilder {
/**
* Disables state (cookie) management.
*/
public final Http2AsyncClientBuilder disableCookieManagement() {
public final H2AsyncClientBuilder disableCookieManagement() {
this.cookieManagementDisabled = true;
return this;
}
@ -542,7 +542,7 @@ public class Http2AsyncClientBuilder {
/**
* Disables authentication scheme caching.
*/
public final Http2AsyncClientBuilder disableAuthCaching() {
public final H2AsyncClientBuilder disableAuthCaching() {
this.authCachingDisabled = true;
return this;
}
@ -561,7 +561,7 @@ public class Http2AsyncClientBuilder {
* in the connection pool. Connections whose inactivity period exceeds this value will
* get closed and evicted from the pool.
*/
public final Http2AsyncClientBuilder evictIdleConnections(final TimeValue maxIdleTime) {
public final H2AsyncClientBuilder evictIdleConnections(final TimeValue maxIdleTime) {
this.evictIdleConnections = true;
this.maxIdleTime = maxIdleTime;
return this;
@ -595,7 +595,7 @@ public class Http2AsyncClientBuilder {
public CloseableHttpAsyncClient build() {
final NamedElementChain<AsyncExecChainHandler> execChainDefinition = new NamedElementChain<>();
execChainDefinition.addLast(
new Http2AsyncMainClientExec(),
new H2AsyncMainClientExec(),
ChainElements.MAIN_TRANSPORT.name());
AuthenticationStrategy targetAuthStrategyCopy = this.targetAuthStrategy;
@ -704,7 +704,7 @@ public class Http2AsyncClientBuilder {
}
final AsyncPushConsumerRegistry pushConsumerRegistry = new AsyncPushConsumerRegistry();
final IOEventHandlerFactory ioEventHandlerFactory = new Http2AsyncClientEventHandlerFactory(
final IOEventHandlerFactory ioEventHandlerFactory = new H2AsyncClientEventHandlerFactory(
new DefaultHttpProcessor(new H2RequestContent(), new H2RequestTargetHost(), new H2RequestConnControl()),
new HandlerFactory<AsyncPushConsumer>() {
@ -829,7 +829,7 @@ public class Http2AsyncClientBuilder {
}
closeablesCopy.add(connPool);
return new InternalHttp2AsyncClient(
return new InternalH2AsyncClient(
ioReactor,
execChain,
pushConsumerRegistry,

4
httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncClientEventHandlerFactory.java → httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncClientEventHandlerFactory.java
View File

@ -50,7 +50,7 @@ import org.apache.hc.core5.util.Args;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
class Http2AsyncClientEventHandlerFactory implements IOEventHandlerFactory {
class H2AsyncClientEventHandlerFactory implements IOEventHandlerFactory {
private final Logger wireLog = LoggerFactory.getLogger("org.apache.hc.client5.http.wire");
private final Logger headerLog = LoggerFactory.getLogger("org.apache.hc.client5.http.headers");
@ -63,7 +63,7 @@ class Http2AsyncClientEventHandlerFactory implements IOEventHandlerFactory {
private final H2Config h2Config;
private final CharCodingConfig charCodingConfig;
Http2AsyncClientEventHandlerFactory(
H2AsyncClientEventHandlerFactory(
final HttpProcessor httpProcessor,
final HandlerFactory<AsyncPushConsumer> exchangeHandlerFactory,
final H2Config h2Config,

2
httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncMainClientExec.java → httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/H2AsyncMainClientExec.java
View File

@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
*/
@Contract(threading = ThreadingBehavior.STATELESS)
@Internal
public class Http2AsyncMainClientExec implements AsyncExecChainHandler {
public class H2AsyncMainClientExec implements AsyncExecChainHandler {
private final Logger log = LoggerFactory.getLogger(getClass());

34
httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClients.java
View File

@ -95,8 +95,8 @@ public final class HttpAsyncClients {
* {@link CloseableHttpAsyncClient} instances optimized for HTTP/2 protocol
* and message multiplexing
*/
public static Http2AsyncClientBuilder customHttp2() {
return Http2AsyncClientBuilder.create();
public static H2AsyncClientBuilder customHttp2() {
return H2AsyncClientBuilder.create();
}
/**
@ -104,7 +104,7 @@ public final class HttpAsyncClients {
* optimized for HTTP/2 protocol and message multiplexing.
*/
public static CloseableHttpAsyncClient createHttp2Default() {
return Http2AsyncClientBuilder.create().build();
return H2AsyncClientBuilder.create().build();
}
/**
@ -112,7 +112,7 @@ public final class HttpAsyncClients {
* system properties optimized for HTTP/2 protocol and message multiplexing.
*/
public static CloseableHttpAsyncClient createHttp2System() {
return Http2AsyncClientBuilder.create().useSystemProperties().build();
return H2AsyncClientBuilder.create().useSystemProperties().build();
}
private static HttpProcessor createMinimalProtocolProcessor() {
@ -223,13 +223,13 @@ public final class HttpAsyncClients {
connManager);
}
private static MinimalHttp2AsyncClient createMinimalHttp2AsyncClientImpl(
private static MinimalH2AsyncClient createMinimalHttp2AsyncClientImpl(
final IOEventHandlerFactory eventHandlerFactory,
final AsyncPushConsumerRegistry pushConsumerRegistry,
final IOReactorConfig ioReactorConfig,
final DnsResolver dnsResolver,
final TlsStrategy tlsStrategy) {
return new MinimalHttp2AsyncClient(
return new MinimalH2AsyncClient(
eventHandlerFactory,
pushConsumerRegistry,
ioReactorConfig,
@ -240,17 +240,17 @@ public final class HttpAsyncClients {
}
/**
* Creates {@link MinimalHttp2AsyncClient} instance optimized for HTTP/2 multiplexing message
* Creates {@link MinimalH2AsyncClient} instance optimized for HTTP/2 multiplexing message
* transport without advanced HTTP protocol functionality.
*/
public static MinimalHttp2AsyncClient createHttp2Minimal(
public static MinimalH2AsyncClient createHttp2Minimal(
final H2Config h2Config,
final IOReactorConfig ioReactorConfig,
final DnsResolver dnsResolver,
final TlsStrategy tlsStrategy) {
final AsyncPushConsumerRegistry pushConsumerRegistry = new AsyncPushConsumerRegistry();
return createMinimalHttp2AsyncClientImpl(
new Http2AsyncClientEventHandlerFactory(
new H2AsyncClientEventHandlerFactory(
createMinimalProtocolProcessor(),
new HandlerFactory<AsyncPushConsumer>() {
@ -269,10 +269,10 @@ public final class HttpAsyncClients {
}
/**
* Creates {@link MinimalHttp2AsyncClient} instance optimized for HTTP/2 multiplexing message
* Creates {@link MinimalH2AsyncClient} instance optimized for HTTP/2 multiplexing message
* transport without advanced HTTP protocol functionality.
*/
public static MinimalHttp2AsyncClient createHttp2Minimal(
public static MinimalH2AsyncClient createHttp2Minimal(
final H2Config h2Config,
final IOReactorConfig ioReactorConfig,
final TlsStrategy tlsStrategy) {
@ -280,28 +280,28 @@ public final class HttpAsyncClients {
}
/**
* Creates {@link MinimalHttp2AsyncClient} instance optimized for HTTP/2 multiplexing message
* Creates {@link MinimalH2AsyncClient} instance optimized for HTTP/2 multiplexing message
* transport without advanced HTTP protocol functionality.
*/
public static MinimalHttp2AsyncClient createHttp2Minimal(
public static MinimalH2AsyncClient createHttp2Minimal(
final H2Config h2Config,
final IOReactorConfig ioReactorConfig) {
return createHttp2Minimal(h2Config, ioReactorConfig, DefaultClientTlsStrategy.getDefault());
}
/**
* Creates {@link MinimalHttp2AsyncClient} instance optimized for HTTP/2 multiplexing message
* Creates {@link MinimalH2AsyncClient} instance optimized for HTTP/2 multiplexing message
* transport without advanced HTTP protocol functionality.
*/
public static MinimalHttp2AsyncClient createHttp2Minimal(final H2Config h2Config) {
public static MinimalH2AsyncClient createHttp2Minimal(final H2Config h2Config) {
return createHttp2Minimal(h2Config, IOReactorConfig.DEFAULT);
}
/**
* Creates {@link MinimalHttp2AsyncClient} instance optimized for HTTP/2 multiplexing message
* Creates {@link MinimalH2AsyncClient} instance optimized for HTTP/2 multiplexing message
* transport without advanced HTTP protocol functionality.
*/
public static MinimalHttp2AsyncClient createHttp2Minimal() {
public static MinimalH2AsyncClient createHttp2Minimal() {
return createHttp2Minimal(H2Config.DEFAULT);
}

6
httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttp2AsyncClient.java → httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2AsyncClient.java
View File

@ -63,12 +63,12 @@ import org.apache.hc.core5.reactor.DefaultConnectingIOReactor;
*/
@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL)
@Internal
public final class InternalHttp2AsyncClient extends InternalAbstractHttpAsyncClient {
public final class InternalH2AsyncClient extends InternalAbstractHttpAsyncClient {
private final HttpRoutePlanner routePlanner;
private final H2ConnPool connPool;
InternalHttp2AsyncClient(
InternalH2AsyncClient(
final DefaultConnectingIOReactor ioReactor,
final AsyncExecChainElement execChain,
final AsyncPushConsumerRegistry pushConsumerRegistry,
@ -89,7 +89,7 @@ public final class InternalHttp2AsyncClient extends InternalAbstractHttpAsyncCli
@Override
AsyncExecRuntime crerateAsyncExecRuntime(final HandlerFactory<AsyncPushConsumer> pushHandlerFactory) {
return new InternalHttp2AsyncExecRuntime(log, connPool, pushHandlerFactory);
return new InternalH2AsyncExecRuntime(log, connPool, pushHandlerFactory);
}
@Override

10
httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttp2AsyncExecRuntime.java → httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalH2AsyncExecRuntime.java
View File

@ -53,7 +53,7 @@ import org.apache.hc.core5.util.TimeValue;
import org.apache.hc.core5.util.Timeout;
import org.slf4j.Logger;
class InternalHttp2AsyncExecRuntime implements AsyncExecRuntime {
class InternalH2AsyncExecRuntime implements AsyncExecRuntime {
private final Logger log;
private final H2ConnPool connPool;
@ -61,7 +61,7 @@ class InternalHttp2AsyncExecRuntime implements AsyncExecRuntime {
private final AtomicReference<Endpoint> sessionRef;
private volatile boolean reusable;
InternalHttp2AsyncExecRuntime(
InternalH2AsyncExecRuntime(
final Logger log,
final H2ConnPool connPool,
final HandlerFactory<AsyncPushConsumer> pushHandlerFactory) {
@ -103,7 +103,7 @@ class InternalHttp2AsyncExecRuntime implements AsyncExecRuntime {
if (log.isDebugEnabled()) {
log.debug(id + ": acquired endpoint");
}
callback.completed(InternalHttp2AsyncExecRuntime.this);
callback.completed(InternalH2AsyncExecRuntime.this);
}
@Override
@ -198,7 +198,7 @@ class InternalHttp2AsyncExecRuntime implements AsyncExecRuntime {
if (log.isDebugEnabled()) {
log.debug(ConnPoolSupport.getId(endpoint) + ": endpoint connected");
}
callback.completed(InternalHttp2AsyncExecRuntime.this);
callback.completed(InternalH2AsyncExecRuntime.this);
}
@Override
@ -296,7 +296,7 @@ class InternalHttp2AsyncExecRuntime implements AsyncExecRuntime {
@Override
public AsyncExecRuntime fork() {
return new InternalHttp2AsyncExecRuntime(log, connPool, pushHandlerFactory);
return new InternalH2AsyncExecRuntime(log, connPool, pushHandlerFactory);
}
}

4
httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalHttp2AsyncClient.java → httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/MinimalH2AsyncClient.java
View File

@ -88,12 +88,12 @@ import org.apache.hc.core5.util.Timeout;
* @since 5.0
*/
@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL)
public final class MinimalHttp2AsyncClient extends AbstractMinimalHttpAsyncClientBase {
public final class MinimalH2AsyncClient extends AbstractMinimalHttpAsyncClientBase {
private final H2ConnPool connPool;
private final ConnectionInitiator connectionInitiator;
MinimalHttp2AsyncClient(
MinimalH2AsyncClient(
final IOEventHandlerFactory eventHandlerFactory,
final AsyncPushConsumerRegistry pushConsumerRegistry,
final IOReactorConfig reactorConfig,

2
httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttp2FullDuplexExchange.java → httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientH2FullDuplexExchange.java
View File

@ -58,7 +58,7 @@ import org.apache.hc.core5.util.Timeout;
/**
* This example demonstrates a full-duplex, streaming HTTP/2 message exchange.
*/
public class AsyncClientHttp2FullDuplexExchange {
public class AsyncClientH2FullDuplexExchange {
public static void main(final String[] args) throws Exception {

2
httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttp2Multiplexing.java → httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientH2Multiplexing.java
View File

@ -50,7 +50,7 @@ import org.apache.hc.core5.util.Timeout;
* This example demonstrates concurrent (multiplexed) execution of multiple
* HTTP/2 message exchanges.
*/
public class AsyncClientHttp2Multiplexing {
public class AsyncClientH2Multiplexing {
public static void main(final String[] args) throws Exception {

2
httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttp2ServerPush.java → httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientH2ServerPush.java
View File

@ -54,7 +54,7 @@ import org.apache.hc.core5.util.Timeout;
/**
* This example demonstrates handling of HTTP/2 message exchanges pushed by the server.
*/
public class AsyncClientHttp2ServerPush {
public class AsyncClientH2ServerPush {
public static void main(final String[] args) throws Exception {