diff --git a/httpclient/src/main/java/org/apache/http/client/HttpClient.java b/httpclient/src/main/java/org/apache/http/client/HttpClient.java index 0cac54c90..8cc2e622d 100644 --- a/httpclient/src/main/java/org/apache/http/client/HttpClient.java +++ b/httpclient/src/main/java/org/apache/http/client/HttpClient.java @@ -75,7 +75,7 @@ public interface HttpClient { ClientConnectionManager getConnectionManager(); /** - * Executes a request using the default context. + * Executes HTTP request using the default context. * * @param request the request to execute * @@ -91,8 +91,7 @@ public interface HttpClient { throws IOException, ClientProtocolException; /** - * Executes a request using the given context. - * The route to the target will be determined by the HTTP client. + * Executes HTTP request using the given context. * * @param request the request to execute * @param context the context to use for the execution, or @@ -110,7 +109,7 @@ public interface HttpClient { throws IOException, ClientProtocolException; /** - * Executes a request to the target using the default context. + * Executes HTTP request using the default context. * * @param target the target host for the request. * Implementations may accept null @@ -130,7 +129,7 @@ public interface HttpClient { throws IOException, ClientProtocolException; /** - * Executes a request to the target using the given context. + * Executes HTTP request using the given context. * * @param target the target host for the request. * Implementations may accept null @@ -153,7 +152,7 @@ public interface HttpClient { throws IOException, ClientProtocolException; /** - * Executes a request using the default context and processes the + * Executes HTTP request using the default context and processes the * response using the given response handler. *

* Implementing classes are required to ensure that the content entity @@ -175,7 +174,7 @@ public interface HttpClient { throws IOException, ClientProtocolException; /** - * Executes a request using the given context and processes the + * Executes HTTP request using the given context and processes the * response using the given response handler. *

* Implementing classes are required to ensure that the content entity @@ -200,7 +199,7 @@ public interface HttpClient { throws IOException, ClientProtocolException; /** - * Executes a request to the target using the default context and + * Executes HTTP request to the target using the default context and * processes the response using the given response handler. *

* Implementing classes are required to ensure that the content entity @@ -227,7 +226,7 @@ public interface HttpClient { throws IOException, ClientProtocolException; /** - * Executes a request to the target using the given context and + * Executes HTTP request to the target using the given context and * processes the response using the given response handler. *

* Implementing classes are required to ensure that the content entity diff --git a/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java b/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java index c9eeed0f8..cee22db15 100644 --- a/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java +++ b/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java @@ -534,8 +534,7 @@ public class HttpClientBuilder { * Assigns default proxy value. *

* Please note this value can be overridden by the {@link #setRoutePlanner( - * org.apache.http.conn.routing.HttpRoutePlanner)} and - * {@link #disableRedirectHandling()} methods. + * org.apache.http.conn.routing.HttpRoutePlanner)} method. */ public final HttpClientBuilder setProxy(final HttpHost proxy) { this.proxy = proxy; @@ -544,9 +543,6 @@ public class HttpClientBuilder { /** * Assigns {@link HttpRoutePlanner} instance. - *

- * Please note this value can be overridden by the {@link #disableRedirectHandling()} - * method. */ public final HttpClientBuilder setRoutePlanner(final HttpRoutePlanner routePlanner) { this.routePlanner = routePlanner; @@ -555,7 +551,10 @@ public class HttpClientBuilder { /** * Assigns {@link RedirectStrategy} instance. - */ + *

+ * Please note this value can be overridden by the {@link #disableRedirectHandling()} + * method. +` */ public final HttpClientBuilder setRedirectStrategy(final RedirectStrategy redirectStrategy) { this.redirectStrategy = redirectStrategy; return this;