You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2020/01/02 19:03:52 UTC

[juneau] branch master updated: JUNEAU-173 Undeprecate HttpClientBuilder convenience methods in RestClientBuilder.

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new 33ef19e  JUNEAU-173 Undeprecate HttpClientBuilder convenience methods in RestClientBuilder.
33ef19e is described below

commit 33ef19ee6fa514238f3556c772719b743ff00cd4
Author: JamesBognar <ja...@apache.org>
AuthorDate: Thu Jan 2 14:03:41 2020 -0500

    JUNEAU-173 Undeprecate HttpClientBuilder convenience methods in
    RestClientBuilder.
---
 .../juneau/rest/client/RestClientBuilder.java      | 92 ----------------------
 1 file changed, 92 deletions(-)

diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
index 0a0fce8..62fe86c 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
@@ -2880,9 +2880,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param redirectStrategy New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setRedirectStrategy(RedirectStrategy)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setRedirectStrategy(RedirectStrategy)}.
 	 */
-	@Deprecated
 	public RestClientBuilder redirectStrategy(RedirectStrategy redirectStrategy) {
 		httpClientBuilder.setRedirectStrategy(redirectStrategy);
 		return this;
@@ -2892,9 +2890,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param cookieSpecRegistry New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setDefaultCookieSpecRegistry(Lookup)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setDefaultCookieSpecRegistry(Lookup)}.
 	 */
-	@Deprecated
 	public RestClientBuilder defaultCookieSpecRegistry(Lookup<CookieSpecProvider> cookieSpecRegistry) {
 		httpClientBuilder.setDefaultCookieSpecRegistry(cookieSpecRegistry);
 		return this;
@@ -2904,9 +2900,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param requestExec New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setRequestExecutor(HttpRequestExecutor)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setRequestExecutor(HttpRequestExecutor)}.
 	 */
-	@Deprecated
 	public RestClientBuilder requestExecutor(HttpRequestExecutor requestExec) {
 		httpClientBuilder.setRequestExecutor(requestExec);
 		return this;
@@ -2916,9 +2910,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param hostnameVerifier New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setSSLHostnameVerifier(HostnameVerifier)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setSSLHostnameVerifier(HostnameVerifier)}.
 	 */
-	@Deprecated
 	public RestClientBuilder sslHostnameVerifier(HostnameVerifier hostnameVerifier) {
 		httpClientBuilder.setSSLHostnameVerifier(hostnameVerifier);
 		return this;
@@ -2928,9 +2920,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param publicSuffixMatcher New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setPublicSuffixMatcher(PublicSuffixMatcher)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setPublicSuffixMatcher(PublicSuffixMatcher)}.
 	 */
-	@Deprecated
 	public RestClientBuilder publicSuffixMatcher(PublicSuffixMatcher publicSuffixMatcher) {
 		httpClientBuilder.setPublicSuffixMatcher(publicSuffixMatcher);
 		return this;
@@ -2940,9 +2930,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param sslContext New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setSSLContext(SSLContext)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setSSLContext(SSLContext)}.
 	 */
-	@Deprecated
 	public RestClientBuilder sslContext(SSLContext sslContext) {
 		httpClientBuilder.setSSLContext(sslContext);
 		return this;
@@ -2952,9 +2940,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param sslSocketFactory New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setSSLSocketFactory(LayeredConnectionSocketFactory)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setSSLSocketFactory(LayeredConnectionSocketFactory)}.
 	 */
-	@Deprecated
 	public RestClientBuilder sslSocketFactory(LayeredConnectionSocketFactory sslSocketFactory) {
 		httpClientBuilder.setSSLSocketFactory(sslSocketFactory);
 		return this;
@@ -2964,9 +2950,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param maxConnTotal New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setMaxConnTotal(int)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setMaxConnTotal(int)}.
 	 */
-	@Deprecated
 	public RestClientBuilder maxConnTotal(int maxConnTotal) {
 		httpClientBuilder.setMaxConnTotal(maxConnTotal);
 		return this;
@@ -2976,9 +2960,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param maxConnPerRoute New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setMaxConnPerRoute(int)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setMaxConnPerRoute(int)}.
 	 */
-	@Deprecated
 	public RestClientBuilder maxConnPerRoute(int maxConnPerRoute) {
 		httpClientBuilder.setMaxConnPerRoute(maxConnPerRoute);
 		return this;
@@ -2988,9 +2970,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param config New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setDefaultSocketConfig(SocketConfig)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setDefaultSocketConfig(SocketConfig)}.
 	 */
-	@Deprecated
 	public RestClientBuilder defaultSocketConfig(SocketConfig config) {
 		httpClientBuilder.setDefaultSocketConfig(config);
 		return this;
@@ -3000,9 +2980,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param config New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setDefaultConnectionConfig(ConnectionConfig)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setDefaultConnectionConfig(ConnectionConfig)}.
 	 */
-	@Deprecated
 	public RestClientBuilder defaultConnectionConfig(ConnectionConfig config) {
 		httpClientBuilder.setDefaultConnectionConfig(config);
 		return this;
@@ -3013,9 +2991,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param connTimeToLiveTimeUnit New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setConnectionTimeToLive(long,TimeUnit)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setConnectionTimeToLive(long, TimeUnit)}.
 	 */
-	@Deprecated
 	public RestClientBuilder connectionTimeToLive(long connTimeToLive, TimeUnit connTimeToLiveTimeUnit) {
 		httpClientBuilder.setConnectionTimeToLive(connTimeToLive, connTimeToLiveTimeUnit);
 		return this;
@@ -3025,9 +3001,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param connManager New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setConnectionManager(HttpClientConnectionManager)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setConnectionManager(HttpClientConnectionManager)}.
 	 */
-	@Deprecated
 	public RestClientBuilder connectionManager(HttpClientConnectionManager connManager) {
 		this.httpClientConnectionManager = connManager;
 		httpClientBuilder.setConnectionManager(connManager);
@@ -3038,9 +3012,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param shared New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setConnectionManagerShared(boolean)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setConnectionManagerShared(boolean)}.
 	 */
-	@Deprecated
 	public RestClientBuilder connectionManagerShared(boolean shared) {
 		httpClientBuilder.setConnectionManagerShared(shared);
 		return this;
@@ -3050,9 +3022,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param reuseStrategy New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setConnectionReuseStrategy(ConnectionReuseStrategy)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setConnectionReuseStrategy(ConnectionReuseStrategy)}.
 	 */
-	@Deprecated
 	public RestClientBuilder connectionReuseStrategy(ConnectionReuseStrategy reuseStrategy) {
 		httpClientBuilder.setConnectionReuseStrategy(reuseStrategy);
 		return this;
@@ -3062,9 +3032,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param keepAliveStrategy New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setKeepAliveStrategy(ConnectionKeepAliveStrategy)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setKeepAliveStrategy(ConnectionKeepAliveStrategy)}.
 	 */
-	@Deprecated
 	public RestClientBuilder keepAliveStrategy(ConnectionKeepAliveStrategy keepAliveStrategy) {
 		httpClientBuilder.setKeepAliveStrategy(keepAliveStrategy);
 		return this;
@@ -3074,9 +3042,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param targetAuthStrategy New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setTargetAuthenticationStrategy(AuthenticationStrategy)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setTargetAuthenticationStrategy(AuthenticationStrategy)}.
 	 */
-	@Deprecated
 	public RestClientBuilder targetAuthenticationStrategy(AuthenticationStrategy targetAuthStrategy) {
 		httpClientBuilder.setTargetAuthenticationStrategy(targetAuthStrategy);
 		return this;
@@ -3086,9 +3052,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param proxyAuthStrategy New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setProxyAuthenticationStrategy(AuthenticationStrategy)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setProxyAuthenticationStrategy(AuthenticationStrategy)}.
 	 */
-	@Deprecated
 	public RestClientBuilder proxyAuthenticationStrategy(AuthenticationStrategy proxyAuthStrategy) {
 		httpClientBuilder.setProxyAuthenticationStrategy(proxyAuthStrategy);
 		return this;
@@ -3098,9 +3062,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param userTokenHandler New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setUserTokenHandler(UserTokenHandler)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setUserTokenHandler(UserTokenHandler)}.
 	 */
-	@Deprecated
 	public RestClientBuilder userTokenHandler(UserTokenHandler userTokenHandler) {
 		httpClientBuilder.setUserTokenHandler(userTokenHandler);
 		return this;
@@ -3109,9 +3071,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	/**
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#disableConnectionState()
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#disableConnectionState()}.
 	 */
-	@Deprecated
 	public RestClientBuilder disableConnectionState() {
 		httpClientBuilder.disableConnectionState();
 		return this;
@@ -3121,9 +3081,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param schemePortResolver New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setSchemePortResolver(SchemePortResolver)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setSchemePortResolver(SchemePortResolver)}.
 	 */
-	@Deprecated
 	public RestClientBuilder schemePortResolver(SchemePortResolver schemePortResolver) {
 		httpClientBuilder.setSchemePortResolver(schemePortResolver);
 		return this;
@@ -3133,9 +3091,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param userAgent New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setUserAgent(String)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setUserAgent(String)}.
 	 */
-	@Deprecated
 	public RestClientBuilder userAgent(String userAgent) {
 		httpClientBuilder.setUserAgent(userAgent);
 		return this;
@@ -3145,9 +3101,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param defaultHeaders New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setDefaultHeaders(Collection)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setDefaultHeaders(Collection)}.
 	 */
-	@Deprecated
 	public RestClientBuilder defaultHeaders(Collection<? extends Header> defaultHeaders) {
 		httpClientBuilder.setDefaultHeaders(defaultHeaders);
 		return this;
@@ -3157,9 +3111,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param itcp New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#addInterceptorFirst(HttpResponseInterceptor)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#addInterceptorFirst(HttpResponseInterceptor)}.
 	 */
-	@Deprecated
 	public RestClientBuilder addInterceptorFirst(HttpResponseInterceptor itcp) {
 		httpClientBuilder.addInterceptorFirst(itcp);
 		return this;
@@ -3169,9 +3121,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param itcp New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#addInterceptorLast(HttpResponseInterceptor)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#addInterceptorLast(HttpResponseInterceptor)}.
 	 */
-	@Deprecated
 	public RestClientBuilder addInterceptorLast(HttpResponseInterceptor itcp) {
 		httpClientBuilder.addInterceptorLast(itcp);
 		return this;
@@ -3181,9 +3131,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param itcp New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#addInterceptorFirst(HttpRequestInterceptor)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#addInterceptorFirst(HttpRequestInterceptor)}.
 	 */
-	@Deprecated
 	public RestClientBuilder addInterceptorFirst(HttpRequestInterceptor itcp) {
 		httpClientBuilder.addInterceptorFirst(itcp);
 		return this;
@@ -3193,9 +3141,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param itcp New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#addInterceptorLast(HttpRequestInterceptor)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#addInterceptorLast(HttpRequestInterceptor)}.
 	 */
-	@Deprecated
 	public RestClientBuilder addInterceptorLast(HttpRequestInterceptor itcp) {
 		httpClientBuilder.addInterceptorLast(itcp);
 		return this;
@@ -3204,9 +3150,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	/**
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#disableCookieManagement()
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#disableCookieManagement()}.
 	 */
-	@Deprecated
 	public RestClientBuilder disableCookieManagement() {
 		httpClientBuilder.disableCookieManagement();
 		return this;
@@ -3215,9 +3159,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	/**
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#disableContentCompression()
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#disableContentCompression()}.
 	 */
-	@Deprecated
 	public RestClientBuilder disableContentCompression() {
 		httpClientBuilder.disableContentCompression();
 		return this;
@@ -3226,9 +3168,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	/**
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#disableAuthCaching()
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#disableAuthCaching()}.
 	 */
-	@Deprecated
 	public RestClientBuilder disableAuthCaching() {
 		httpClientBuilder.disableAuthCaching();
 		return this;
@@ -3238,9 +3178,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param httpprocessor New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setHttpProcessor(HttpProcessor)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setHttpProcessor(HttpProcessor)}.
 	 */
-	@Deprecated
 	public RestClientBuilder httpProcessor(HttpProcessor httpprocessor) {
 		httpClientBuilder.setHttpProcessor(httpprocessor);
 		return this;
@@ -3250,9 +3188,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param retryHandler New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setRetryHandler(HttpRequestRetryHandler)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setRetryHandler(HttpRequestRetryHandler)}.
 	 */
-	@Deprecated
 	public RestClientBuilder retryHandler(HttpRequestRetryHandler retryHandler) {
 		httpClientBuilder.setRetryHandler(retryHandler);
 		return this;
@@ -3261,9 +3197,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	/**
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#disableAutomaticRetries()
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#disableAutomaticRetries()}.
 	 */
-	@Deprecated
 	public RestClientBuilder disableAutomaticRetries() {
 		httpClientBuilder.disableAutomaticRetries();
 		return this;
@@ -3273,9 +3207,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param proxy New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setProxy(HttpHost)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setProxy(HttpHost)}.
 	 */
-	@Deprecated
 	public RestClientBuilder proxy(HttpHost proxy) {
 		httpClientBuilder.setProxy(proxy);
 		return this;
@@ -3285,9 +3217,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param routePlanner New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setRoutePlanner(HttpRoutePlanner)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setRoutePlanner(HttpRoutePlanner)}.
 	 */
-	@Deprecated
 	public RestClientBuilder routePlanner(HttpRoutePlanner routePlanner) {
 		httpClientBuilder.setRoutePlanner(routePlanner);
 		return this;
@@ -3297,9 +3227,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param connectionBackoffStrategy New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setConnectionBackoffStrategy(ConnectionBackoffStrategy)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setConnectionBackoffStrategy(ConnectionBackoffStrategy)}.
 	 */
-	@Deprecated
 	public RestClientBuilder connectionBackoffStrategy(ConnectionBackoffStrategy connectionBackoffStrategy) {
 		httpClientBuilder.setConnectionBackoffStrategy(connectionBackoffStrategy);
 		return this;
@@ -3309,9 +3237,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param backoffManager New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setBackoffManager(BackoffManager)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setBackoffManager(BackoffManager)}.
 	 */
-	@Deprecated
 	public RestClientBuilder backoffManager(BackoffManager backoffManager) {
 		httpClientBuilder.setBackoffManager(backoffManager);
 		return this;
@@ -3321,9 +3247,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param serviceUnavailStrategy New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setServiceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy)}.
 	 */
-	@Deprecated
 	public RestClientBuilder serviceUnavailableRetryStrategy(ServiceUnavailableRetryStrategy serviceUnavailStrategy) {
 		httpClientBuilder.setServiceUnavailableRetryStrategy(serviceUnavailStrategy);
 		return this;
@@ -3333,9 +3257,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param cookieStore New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setDefaultCookieStore(CookieStore)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setDefaultCookieStore(CookieStore)}.
 	 */
-	@Deprecated
 	public RestClientBuilder defaultCookieStore(CookieStore cookieStore) {
 		httpClientBuilder.setDefaultCookieStore(cookieStore);
 		return this;
@@ -3345,9 +3267,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param credentialsProvider New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setDefaultCredentialsProvider(CredentialsProvider)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setDefaultCredentialsProvider(CredentialsProvider)}.
 	 */
-	@Deprecated
 	public RestClientBuilder defaultCredentialsProvider(CredentialsProvider credentialsProvider) {
 		httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
 		return this;
@@ -3357,9 +3277,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param authSchemeRegistry New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setDefaultAuthSchemeRegistry(Lookup)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setDefaultAuthSchemeRegistry(Lookup)}.
 	 */
-	@Deprecated
 	public RestClientBuilder defaultAuthSchemeRegistry(Lookup<AuthSchemeProvider> authSchemeRegistry) {
 		httpClientBuilder.setDefaultAuthSchemeRegistry(authSchemeRegistry);
 		return this;
@@ -3369,9 +3287,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param contentDecoderMap New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setContentDecoderRegistry(Map)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setContentDecoderRegistry(Map)}.
 	 */
-	@Deprecated
 	public RestClientBuilder contentDecoderRegistry(Map<String,InputStreamFactory> contentDecoderMap) {
 		httpClientBuilder.setContentDecoderRegistry(contentDecoderMap);
 		return this;
@@ -3381,9 +3297,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param config New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#setDefaultRequestConfig(RequestConfig)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#setDefaultRequestConfig(RequestConfig)}.
 	 */
-	@Deprecated
 	public RestClientBuilder defaultRequestConfig(RequestConfig config) {
 		httpClientBuilder.setDefaultRequestConfig(config);
 		return this;
@@ -3392,9 +3306,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	/**
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#useSystemProperties()
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#useSystemProperties()}.
 	 */
-	@Deprecated
 	public RestClientBuilder useSystemProperties() {
 		httpClientBuilder.useSystemProperties();
 		return this;
@@ -3403,9 +3315,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	/**
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#evictExpiredConnections()
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#evictExpiredConnections()}.
 	 */
-	@Deprecated
 	public RestClientBuilder evictExpiredConnections() {
 		httpClientBuilder.evictExpiredConnections();
 		return this;
@@ -3416,9 +3326,7 @@ public class RestClientBuilder extends BeanContextBuilder {
 	 * @param maxIdleTimeUnit New property value.
 	 * @return This object (for method chaining).
 	 * @see HttpClientBuilder#evictIdleConnections(long,TimeUnit)
-	 * @deprecated Use {@link #getHttpClientBuilder()} and {@link HttpClientBuilder#evictIdleConnections(long, TimeUnit)}.
 	 */
-	@Deprecated
 	public RestClientBuilder evictIdleConnections(long maxIdleTime, TimeUnit maxIdleTimeUnit) {
 		httpClientBuilder.evictIdleConnections(maxIdleTime, maxIdleTimeUnit);
 		return this;