From 17d75864d96e25941f67e73d94ec550e97fe5e82 Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Fri, 11 Jul 2008 16:38:49 +0000 Subject: [PATCH] Renamed ClientRequestDirector to RequestDirector, ClientResponseHandler to ResponseHandler. Client prefix is superfluous due to the package name git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@676020 13f79535-47bb-0310-9956-ffa450edef68 --- .../client/ClientWithResponseHandler.java | 6 +++--- .../java/org/apache/http/client/HttpClient.java | 8 ++++---- ...RequestDirector.java => RequestDirector.java} | 2 +- ...ResponseHandler.java => ResponseHandler.java} | 2 +- .../http/impl/client/AbstractHttpClient.java | 16 ++++++++-------- .../http/impl/client/BasicResponseHandler.java | 6 +++--- .../client/DefaultClientRequestDirector.java | 6 +++--- 7 files changed, 23 insertions(+), 23 deletions(-) rename module-client/src/main/java/org/apache/http/client/{ClientRequestDirector.java => RequestDirector.java} (98%) rename module-client/src/main/java/org/apache/http/client/{ClientResponseHandler.java => ResponseHandler.java} (98%) diff --git a/module-client/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java b/module-client/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java index f9bdbc43c..861d3711c 100644 --- a/module-client/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java +++ b/module-client/src/examples/org/apache/http/examples/client/ClientWithResponseHandler.java @@ -31,14 +31,14 @@ package org.apache.http.examples.client; -import org.apache.http.client.ClientResponseHandler; +import org.apache.http.client.ResponseHandler; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.BasicResponseHandler; import org.apache.http.impl.client.DefaultHttpClient; /** - * This example demonstrates the use of the {@link ClientResponseHandler} to simply + * This example demonstrates the use of the {@link ResponseHandler} to simply * the process of processing the HTTP response and releasing associated resources. */ public class ClientWithResponseHandler { @@ -52,7 +52,7 @@ public final static void main(String[] args) throws Exception { System.out.println("executing request " + httpget.getURI()); // Create a response handler - ClientResponseHandler responseHandler = new BasicResponseHandler(); + ResponseHandler responseHandler = new BasicResponseHandler(); String responseBody = httpclient.execute(httpget, responseHandler); System.out.println(responseBody); diff --git a/module-client/src/main/java/org/apache/http/client/HttpClient.java b/module-client/src/main/java/org/apache/http/client/HttpClient.java index 18949b82d..e7929e4f4 100644 --- a/module-client/src/main/java/org/apache/http/client/HttpClient.java +++ b/module-client/src/main/java/org/apache/http/client/HttpClient.java @@ -177,7 +177,7 @@ HttpResponse execute(HttpHost target, HttpRequest request, */ T execute( HttpUriRequest request, - ClientResponseHandler responseHandler) + ResponseHandler responseHandler) throws IOException, ClientProtocolException ; @@ -194,7 +194,7 @@ T execute( */ T execute( HttpUriRequest request, - ClientResponseHandler responseHandler, + ResponseHandler responseHandler, HttpContext context) throws IOException, ClientProtocolException ; @@ -217,7 +217,7 @@ T execute( T execute( HttpHost target, HttpRequest request, - ClientResponseHandler responseHandler) + ResponseHandler responseHandler) throws IOException, ClientProtocolException ; @@ -241,7 +241,7 @@ T execute( T execute( HttpHost target, HttpRequest request, - ClientResponseHandler responseHandler, + ResponseHandler responseHandler, HttpContext context) throws IOException, ClientProtocolException ; diff --git a/module-client/src/main/java/org/apache/http/client/ClientRequestDirector.java b/module-client/src/main/java/org/apache/http/client/RequestDirector.java similarity index 98% rename from module-client/src/main/java/org/apache/http/client/ClientRequestDirector.java rename to module-client/src/main/java/org/apache/http/client/RequestDirector.java index c4726d0c4..b885fa7e3 100644 --- a/module-client/src/main/java/org/apache/http/client/ClientRequestDirector.java +++ b/module-client/src/main/java/org/apache/http/client/RequestDirector.java @@ -60,7 +60,7 @@ * * @since 4.0 */ -public interface ClientRequestDirector { +public interface RequestDirector { /** diff --git a/module-client/src/main/java/org/apache/http/client/ClientResponseHandler.java b/module-client/src/main/java/org/apache/http/client/ResponseHandler.java similarity index 98% rename from module-client/src/main/java/org/apache/http/client/ClientResponseHandler.java rename to module-client/src/main/java/org/apache/http/client/ResponseHandler.java index 37acf04df..d788f6094 100644 --- a/module-client/src/main/java/org/apache/http/client/ClientResponseHandler.java +++ b/module-client/src/main/java/org/apache/http/client/ResponseHandler.java @@ -43,7 +43,7 @@ * * @since 4.0 */ -public interface ClientResponseHandler { +public interface ResponseHandler { /** * Processes an {@link HttpResponse} and returns some value diff --git a/module-client/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java b/module-client/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java index 09fca5e59..8771b1eec 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java +++ b/module-client/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java @@ -44,8 +44,8 @@ import org.apache.http.auth.AuthSchemeRegistry; import org.apache.http.client.AuthenticationHandler; import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.ClientRequestDirector; -import org.apache.http.client.ClientResponseHandler; +import org.apache.http.client.RequestDirector; +import org.apache.http.client.ResponseHandler; import org.apache.http.client.CookieStore; import org.apache.http.client.CredentialsProvider; import org.apache.http.client.HttpClient; @@ -516,7 +516,7 @@ public final HttpResponse execute(HttpHost target, HttpRequest request, // a null context is acceptable, default context created below HttpContext execContext = null; - ClientRequestDirector director = null; + RequestDirector director = null; // Initialize the request execution context making copies of // all shared objects that are potentially threading unsafe. @@ -565,7 +565,7 @@ public final HttpResponse execute(HttpHost target, HttpRequest request, } // execute - protected ClientRequestDirector createClientRequestDirector( + protected RequestDirector createClientRequestDirector( final HttpRequestExecutor requestExec, final ClientConnectionManager conman, final ConnectionReuseStrategy reustrat, @@ -617,7 +617,7 @@ protected HttpParams determineParams(HttpRequest req) { // non-javadoc, see interface HttpClient public T execute( final HttpUriRequest request, - final ClientResponseHandler responseHandler) + final ResponseHandler responseHandler) throws IOException, ClientProtocolException { if (responseHandler == null) { throw new IllegalArgumentException @@ -631,7 +631,7 @@ public T execute( // non-javadoc, see interface HttpClient public T execute( final HttpUriRequest request, - final ClientResponseHandler responseHandler, + final ResponseHandler responseHandler, final HttpContext context) throws IOException, ClientProtocolException { if (responseHandler == null) { @@ -647,7 +647,7 @@ public T execute( public T execute( final HttpHost target, final HttpRequest request, - final ClientResponseHandler responseHandler) + final ResponseHandler responseHandler) throws IOException, ClientProtocolException { if (responseHandler == null) { throw new IllegalArgumentException @@ -662,7 +662,7 @@ public T execute( public T execute( final HttpHost target, final HttpRequest request, - final ClientResponseHandler responseHandler, + final ResponseHandler responseHandler, final HttpContext context) throws IOException, ClientProtocolException { if (responseHandler == null) { diff --git a/module-client/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java b/module-client/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java index 2e9cbcce7..ec1674d02 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java +++ b/module-client/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java @@ -37,12 +37,12 @@ import org.apache.http.HttpResponse; import org.apache.http.StatusLine; import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.ClientResponseHandler; +import org.apache.http.client.ResponseHandler; import org.apache.http.client.HttpResponseException; import org.apache.http.util.EntityUtils; /** - * A {@link ClientResponseHandler} that returns the response body as a String + * A {@link ResponseHandler} that returns the response body as a String * for successful (2xx) responses. If the response code was >= 300, the response * body is consumed and an {@link HttpResponseException} is thrown. * @@ -56,7 +56,7 @@ * * @since 4.0 */ -public class BasicResponseHandler implements ClientResponseHandler { +public class BasicResponseHandler implements ResponseHandler { /** * Returns the response body as a String if the response was successful (a diff --git a/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java b/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java index 7e4ec9f9a..523138fda 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java +++ b/module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java @@ -58,7 +58,7 @@ import org.apache.http.auth.Credentials; import org.apache.http.auth.MalformedChallengeException; import org.apache.http.client.AuthenticationHandler; -import org.apache.http.client.ClientRequestDirector; +import org.apache.http.client.RequestDirector; import org.apache.http.client.CredentialsProvider; import org.apache.http.client.HttpRequestRetryHandler; import org.apache.http.client.NonRepeatableRequestException; @@ -94,7 +94,7 @@ import org.apache.http.protocol.HttpRequestExecutor; /** - * Default implementation of {@link ClientRequestDirector}. + * Default implementation of {@link RequestDirector}. *
* This class replaces the HttpMethodDirector in HttpClient 3. * @@ -106,7 +106,7 @@ * * @since 4.0 */ -public class DefaultClientRequestDirector implements ClientRequestDirector { +public class DefaultClientRequestDirector implements RequestDirector { private final Log log = LogFactory.getLog(getClass());