From 10cbecbad71725f933b0f5c1fc18bcb4e530c5cf Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Thu, 25 Nov 2010 14:27:25 +0000 Subject: [PATCH] Renamed classes git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpasyncclient/trunk@1039062 13f79535-47bb-0310-9956-ffa450edef68 --- .../http/examples/nio/client/AsyncClientRequest.java | 6 +++--- ...asicAsyncHttpClient.java => BasicHttpAsyncClient.java} | 8 ++++---- .../client/{AsyncHttpClient.java => HttpAsyncClient.java} | 2 +- .../org/apache/http/impl/nio/client/TestHttpAsync.java | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/org/apache/http/impl/nio/client/{BasicAsyncHttpClient.java => BasicHttpAsyncClient.java} (97%) rename src/main/java/org/apache/http/nio/client/{AsyncHttpClient.java => HttpAsyncClient.java} (98%) diff --git a/src/examples/org/apache/http/examples/nio/client/AsyncClientRequest.java b/src/examples/org/apache/http/examples/nio/client/AsyncClientRequest.java index 3c7661c9..82411dbf 100644 --- a/src/examples/org/apache/http/examples/nio/client/AsyncClientRequest.java +++ b/src/examples/org/apache/http/examples/nio/client/AsyncClientRequest.java @@ -32,11 +32,11 @@ import org.apache.http.HttpHost; import org.apache.http.HttpResponse; -import org.apache.http.impl.nio.client.BasicAsyncHttpClient; +import org.apache.http.impl.nio.client.BasicHttpAsyncClient; import org.apache.http.impl.nio.conn.BasicIOSessionManager; import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor; import org.apache.http.message.BasicHttpRequest; -import org.apache.http.nio.client.AsyncHttpClient; +import org.apache.http.nio.client.HttpAsyncClient; import org.apache.http.params.CoreConnectionPNames; import org.apache.http.params.CoreProtocolPNames; import org.apache.http.params.HttpParams; @@ -57,7 +57,7 @@ public static void main(String[] args) throws Exception { sessmrg.setTotalMax(5); sessmrg.setDefaultMaxPerHost(3); - AsyncHttpClient asynchttpclient = new BasicAsyncHttpClient( + HttpAsyncClient asynchttpclient = new BasicHttpAsyncClient( ioReactor, sessmrg, params); diff --git a/src/main/java/org/apache/http/impl/nio/client/BasicAsyncHttpClient.java b/src/main/java/org/apache/http/impl/nio/client/BasicHttpAsyncClient.java similarity index 97% rename from src/main/java/org/apache/http/impl/nio/client/BasicAsyncHttpClient.java rename to src/main/java/org/apache/http/impl/nio/client/BasicHttpAsyncClient.java index f1251b0b..5e8bf034 100644 --- a/src/main/java/org/apache/http/impl/nio/client/BasicAsyncHttpClient.java +++ b/src/main/java/org/apache/http/impl/nio/client/BasicHttpAsyncClient.java @@ -40,7 +40,7 @@ import org.apache.http.impl.DefaultConnectionReuseStrategy; import org.apache.http.impl.nio.conn.BasicIOSessionManager; import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor; -import org.apache.http.nio.client.AsyncHttpClient; +import org.apache.http.nio.client.HttpAsyncClient; import org.apache.http.nio.client.HttpAsyncExchangeHandler; import org.apache.http.nio.concurrent.FutureCallback; import org.apache.http.nio.conn.IOSessionManager; @@ -60,7 +60,7 @@ import org.apache.http.protocol.RequestTargetHost; import org.apache.http.protocol.RequestUserAgent; -public class BasicAsyncHttpClient implements AsyncHttpClient { +public class BasicHttpAsyncClient implements HttpAsyncClient { private final Log log; private final HttpParams params; @@ -69,7 +69,7 @@ public class BasicAsyncHttpClient implements AsyncHttpClient { private Thread reactorThread; - public BasicAsyncHttpClient( + public BasicHttpAsyncClient( final ConnectingIOReactor ioReactor, final IOSessionManager sessmrg, final HttpParams params) throws IOReactorException { @@ -84,7 +84,7 @@ public BasicAsyncHttpClient( this.sessmrg = sessmrg; } - public BasicAsyncHttpClient(final HttpParams params) throws IOReactorException { + public BasicHttpAsyncClient(final HttpParams params) throws IOReactorException { super(); this.log = LogFactory.getLog(getClass()); if (params != null) { diff --git a/src/main/java/org/apache/http/nio/client/AsyncHttpClient.java b/src/main/java/org/apache/http/nio/client/HttpAsyncClient.java similarity index 98% rename from src/main/java/org/apache/http/nio/client/AsyncHttpClient.java rename to src/main/java/org/apache/http/nio/client/HttpAsyncClient.java index 0d80fe52..5fd7225b 100644 --- a/src/main/java/org/apache/http/nio/client/AsyncHttpClient.java +++ b/src/main/java/org/apache/http/nio/client/HttpAsyncClient.java @@ -34,7 +34,7 @@ import org.apache.http.nio.concurrent.FutureCallback; import org.apache.http.nio.reactor.IOReactorStatus; -public interface AsyncHttpClient { +public interface HttpAsyncClient { void start(); diff --git a/src/test/java/org/apache/http/impl/nio/client/TestHttpAsync.java b/src/test/java/org/apache/http/impl/nio/client/TestHttpAsync.java index 1e4950c6..48e96a46 100644 --- a/src/test/java/org/apache/http/impl/nio/client/TestHttpAsync.java +++ b/src/test/java/org/apache/http/impl/nio/client/TestHttpAsync.java @@ -13,7 +13,7 @@ import org.apache.http.impl.nio.conn.BasicIOSessionManager; import org.apache.http.impl.nio.reactor.DefaultConnectingIOReactor; import org.apache.http.localserver.ServerTestBase; -import org.apache.http.nio.client.AsyncHttpClient; +import org.apache.http.nio.client.HttpAsyncClient; import org.apache.http.nio.entity.NByteArrayEntity; import org.apache.http.nio.reactor.ConnectingIOReactor; import org.apache.http.params.BasicHttpParams; @@ -27,7 +27,7 @@ public class TestHttpAsync extends ServerTestBase { private HttpHost target; private BasicIOSessionManager sessionManager; - private AsyncHttpClient httpclient; + private HttpAsyncClient httpclient; @Before public void setUp() throws Exception { @@ -37,7 +37,7 @@ public void setUp() throws Exception { this.target = new HttpHost("localhost", port); ConnectingIOReactor ioReactor = new DefaultConnectingIOReactor(2, new BasicHttpParams()); this.sessionManager = new BasicIOSessionManager(ioReactor); - this.httpclient = new BasicAsyncHttpClient(ioReactor, this.sessionManager, null); + this.httpclient = new BasicHttpAsyncClient(ioReactor, this.sessionManager, null); } @After