From a9d307fa91a7642f4c4924d5e3a912d336575eb9 Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Wed, 21 May 2008 17:47:40 +0000 Subject: [PATCH] Renamed classes for consistency git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@658785 13f79535-47bb-0310-9956-ffa450edef68 --- .../client/ClientMultiThreadedExecution.java | 4 +- ...agerParams.java => ConnManagerParams.java} | 2 +- ...pRouteParams.java => ConnRouteParams.java} | 17 ++--- .../client/DefaultClientRequestDirector.java | 4 +- .../impl/conn/DefaultHttpRoutePlanner.java | 8 +-- .../impl/conn/ProxySelectorRoutePlanner.java | 6 +- .../http/impl/conn/tsccm/ConnPoolByRoute.java | 6 +- .../http/conn/TestConnectionAutoRelease.java | 18 ++--- .../apache/http/conn/TestConnectionReuse.java | 20 +++--- .../http/conn/params/TestRouteParams.java | 66 +++++++++---------- .../client/TestStatefulConnManagement.java | 8 +-- .../http/impl/conn/TestTSCCMNoServer.java | 26 ++++---- .../http/impl/conn/TestTSCCMWithServer.java | 20 +++--- .../impl/conn/tsccm/TestConnPoolByRoute.java | 6 +- .../impl/conn/tsccm/TestSpuriousWakeup.java | 6 +- 15 files changed, 109 insertions(+), 108 deletions(-) rename module-client/src/main/java/org/apache/http/conn/params/{HttpConnectionManagerParams.java => ConnManagerParams.java} (98%) rename module-client/src/main/java/org/apache/http/conn/params/{HttpRouteParams.java => ConnRouteParams.java} (93%) diff --git a/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java b/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java index 64a547d72..bb40e86c3 100644 --- a/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java +++ b/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java @@ -36,7 +36,7 @@ import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.conn.params.HttpConnectionManagerParams; +import org.apache.http.conn.params.ConnManagerParams; import org.apache.http.conn.scheme.PlainSocketFactory; import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.SchemeRegistry; @@ -60,7 +60,7 @@ public class ClientMultiThreadedExecution { public static void main(String[] args) throws Exception { // Create and initialize HTTP parameters HttpParams params = new BasicHttpParams(); - HttpConnectionManagerParams.setMaxTotalConnections(params, 100); + ConnManagerParams.setMaxTotalConnections(params, 100); HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1); // Create and initialize scheme registry diff --git a/module-client/src/main/java/org/apache/http/conn/params/HttpConnectionManagerParams.java b/module-client/src/main/java/org/apache/http/conn/params/ConnManagerParams.java similarity index 98% rename from module-client/src/main/java/org/apache/http/conn/params/HttpConnectionManagerParams.java rename to module-client/src/main/java/org/apache/http/conn/params/ConnManagerParams.java index 027d92ded..7d09665d7 100644 --- a/module-client/src/main/java/org/apache/http/conn/params/HttpConnectionManagerParams.java +++ b/module-client/src/main/java/org/apache/http/conn/params/ConnManagerParams.java @@ -47,7 +47,7 @@ * * @see ConnManagerPNames */ -public final class HttpConnectionManagerParams implements ConnManagerPNames { +public final class ConnManagerParams implements ConnManagerPNames { /** The default maximum number of connections allowed overall */ public static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 20; diff --git a/module-client/src/main/java/org/apache/http/conn/params/HttpRouteParams.java b/module-client/src/main/java/org/apache/http/conn/params/ConnRouteParams.java similarity index 93% rename from module-client/src/main/java/org/apache/http/conn/params/HttpRouteParams.java rename to module-client/src/main/java/org/apache/http/conn/params/ConnRouteParams.java index f2b16e570..6b2f57625 100644 --- a/module-client/src/main/java/org/apache/http/conn/params/HttpRouteParams.java +++ b/module-client/src/main/java/org/apache/http/conn/params/ConnRouteParams.java @@ -50,7 +50,7 @@ * * @since 4.0 */ -public class HttpRouteParams { +public class ConnRouteParams implements ConnRoutePNames { /** * A special value indicating "no host". @@ -68,7 +68,7 @@ public class HttpRouteParams { /** Disabled default constructor. */ - private HttpRouteParams() { + private ConnRouteParams() { // no body } @@ -89,7 +89,7 @@ public static HttpHost getDefaultProxy(HttpParams params) { throw new IllegalArgumentException("Parameters must not be null."); } HttpHost proxy = (HttpHost) - params.getParameter(ConnRoutePNames.DEFAULT_PROXY); + params.getParameter(DEFAULT_PROXY); if ((proxy != null) && NO_HOST.equals(proxy)) { // value is explicitly unset proxy = null; @@ -113,7 +113,7 @@ public static void setDefaultProxy(HttpParams params, if (params == null) { throw new IllegalArgumentException("Parameters must not be null."); } - params.setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy); + params.setParameter(DEFAULT_PROXY, proxy); } @@ -133,7 +133,7 @@ public static HttpRoute getForcedRoute(HttpParams params) { throw new IllegalArgumentException("Parameters must not be null."); } HttpRoute route = (HttpRoute) - params.getParameter(ConnRoutePNames.FORCED_ROUTE); + params.getParameter(FORCED_ROUTE); if ((route != null) && NO_ROUTE.equals(route)) { // value is explicitly unset route = null; @@ -157,7 +157,7 @@ public static void setForcedRoute(HttpParams params, if (params == null) { throw new IllegalArgumentException("Parameters must not be null."); } - params.setParameter(ConnRoutePNames.FORCED_ROUTE, route); + params.setParameter(FORCED_ROUTE, route); } @@ -178,7 +178,7 @@ public static InetAddress getLocalAddress(HttpParams params) { throw new IllegalArgumentException("Parameters must not be null."); } InetAddress local = (InetAddress) - params.getParameter(ConnRoutePNames.LOCAL_ADDRESS); + params.getParameter(LOCAL_ADDRESS); // no explicit unsetting return local; } @@ -196,7 +196,8 @@ public static void setLocalAddress(HttpParams params, if (params == null) { throw new IllegalArgumentException("Parameters must not be null."); } - params.setParameter(ConnRoutePNames.LOCAL_ADDRESS, local); + params.setParameter(LOCAL_ADDRESS, local); } + } 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 c6376b3bb..2b9bf7c2c 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 @@ -74,7 +74,7 @@ import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.ClientConnectionRequest; import org.apache.http.conn.ManagedClientConnection; -import org.apache.http.conn.params.HttpConnectionManagerParams; +import org.apache.http.conn.params.ConnManagerParams; import org.apache.http.conn.routing.BasicRouteDirector; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.conn.routing.HttpRouteDirector; @@ -278,7 +278,7 @@ public HttpResponse execute(HttpHost target, HttpRequest request, RoutedRequest roureq = new RoutedRequest(origWrapper, origRoute); - long timeout = HttpConnectionManagerParams.getTimeout(params); + long timeout = ConnManagerParams.getTimeout(params); int execCount = 0; diff --git a/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java b/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java index 23bc45ce6..48307bb31 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java @@ -44,7 +44,7 @@ import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.SchemeRegistry; -import org.apache.http.conn.params.HttpRouteParams; +import org.apache.http.conn.params.ConnRouteParams; /** @@ -87,7 +87,7 @@ public HttpRoute determineRoute(HttpHost target, // If we have a forced route, we can do without a target. HttpRoute route = - HttpRouteParams.getForcedRoute(request.getParams()); + ConnRouteParams.getForcedRoute(request.getParams()); if (route != null) return route; @@ -100,9 +100,9 @@ public HttpRoute determineRoute(HttpHost target, } final InetAddress local = - HttpRouteParams.getLocalAddress(request.getParams()); + ConnRouteParams.getLocalAddress(request.getParams()); final HttpHost proxy = - HttpRouteParams.getDefaultProxy(request.getParams()); + ConnRouteParams.getDefaultProxy(request.getParams()); final Scheme schm = schemeRegistry.getScheme(target.getSchemeName()); // as it is typically used for TLS/SSL, we assume that diff --git a/module-client/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java b/module-client/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java index 71eb0cc6f..933f0fcdf 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java @@ -50,7 +50,7 @@ import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.SchemeRegistry; -import org.apache.http.conn.params.HttpRouteParams; +import org.apache.http.conn.params.ConnRouteParams; /** @@ -126,7 +126,7 @@ public HttpRoute determineRoute(HttpHost target, // If we have a forced route, we can do without a target. HttpRoute route = - HttpRouteParams.getForcedRoute(request.getParams()); + ConnRouteParams.getForcedRoute(request.getParams()); if (route != null) return route; @@ -139,7 +139,7 @@ public HttpRoute determineRoute(HttpHost target, } final InetAddress local = - HttpRouteParams.getLocalAddress(request.getParams()); + ConnRouteParams.getLocalAddress(request.getParams()); final HttpHost proxy = determineProxy(target, request, context); final Scheme schm = diff --git a/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java b/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java index 925215452..f68254bd9 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java @@ -45,7 +45,7 @@ import org.apache.http.conn.ClientConnectionOperator; import org.apache.http.conn.ConnectionPoolTimeoutException; import org.apache.http.conn.params.ConnPerRoute; -import org.apache.http.conn.params.HttpConnectionManagerParams; +import org.apache.http.conn.params.ConnManagerParams; import org.apache.http.params.HttpParams; @@ -104,9 +104,9 @@ public ConnPoolByRoute(final ClientConnectionOperator operator, final HttpParams freeConnections = createFreeConnQueue(); waitingThreads = createWaitingThreadQueue(); routeToPool = createRouteToPoolMap(); - maxTotalConnections = HttpConnectionManagerParams + maxTotalConnections = ConnManagerParams .getMaxTotalConnections(params); - connPerRoute = HttpConnectionManagerParams + connPerRoute = ConnManagerParams .getMaxConnectionsPerRoute(params); } diff --git a/module-client/src/test/java/org/apache/http/conn/TestConnectionAutoRelease.java b/module-client/src/test/java/org/apache/http/conn/TestConnectionAutoRelease.java index 03b66534f..102d77463 100644 --- a/module-client/src/test/java/org/apache/http/conn/TestConnectionAutoRelease.java +++ b/module-client/src/test/java/org/apache/http/conn/TestConnectionAutoRelease.java @@ -47,7 +47,7 @@ import org.apache.http.MalformedChunkCodingException; import org.apache.http.client.methods.HttpGet; import org.apache.http.conn.params.ConnPerRouteBean; -import org.apache.http.conn.params.HttpConnectionManagerParams; +import org.apache.http.conn.params.ConnManagerParams; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.entity.BasicHttpEntity; @@ -87,9 +87,9 @@ public ThreadSafeClientConnManager createTSCCM(HttpParams params, public void testReleaseOnEntityConsumeContent() throws Exception { HttpParams params = defaultParams.copy(); - HttpConnectionManagerParams.setMaxTotalConnections + ConnManagerParams.setMaxTotalConnections (params, 1); - HttpConnectionManagerParams.setMaxConnectionsPerRoute + ConnManagerParams.setMaxConnectionsPerRoute (params, new ConnPerRouteBean(1)); ThreadSafeClientConnManager mgr = createTSCCM(params, null); @@ -129,9 +129,9 @@ public void testReleaseOnEntityConsumeContent() throws Exception { public void testReleaseOnEntityWriteTo() throws Exception { HttpParams params = defaultParams.copy(); - HttpConnectionManagerParams.setMaxTotalConnections + ConnManagerParams.setMaxTotalConnections (params, 1); - HttpConnectionManagerParams.setMaxConnectionsPerRoute + ConnManagerParams.setMaxConnectionsPerRoute (params, new ConnPerRouteBean(1)); ThreadSafeClientConnManager mgr = createTSCCM(params, null); @@ -172,9 +172,9 @@ public void testReleaseOnEntityWriteTo() throws Exception { public void testReleaseOnAbort() throws Exception { HttpParams params = defaultParams.copy(); - HttpConnectionManagerParams.setMaxTotalConnections + ConnManagerParams.setMaxTotalConnections (params, 1); - HttpConnectionManagerParams.setMaxConnectionsPerRoute + ConnManagerParams.setMaxConnectionsPerRoute (params, new ConnPerRouteBean(1)); ThreadSafeClientConnManager mgr = createTSCCM(params, null); @@ -247,9 +247,9 @@ public void writeTo( }); HttpParams params = defaultParams.copy(); - HttpConnectionManagerParams.setMaxTotalConnections + ConnManagerParams.setMaxTotalConnections (params, 1); - HttpConnectionManagerParams.setMaxConnectionsPerRoute + ConnManagerParams.setMaxConnectionsPerRoute (params, new ConnPerRouteBean(1)); ThreadSafeClientConnManager mgr = createTSCCM(params, null); diff --git a/module-client/src/test/java/org/apache/http/conn/TestConnectionReuse.java b/module-client/src/test/java/org/apache/http/conn/TestConnectionReuse.java index 73c1f2e5e..62d67d9ec 100644 --- a/module-client/src/test/java/org/apache/http/conn/TestConnectionReuse.java +++ b/module-client/src/test/java/org/apache/http/conn/TestConnectionReuse.java @@ -1,7 +1,7 @@ /* - * $HeadURL:$ - * $Revision:$ - * $Date:$ + * $HeadURL$ + * $Revision$ + * $Date$ * * ==================================================================== * Licensed to the Apache Software Foundation (ASF) under one @@ -48,7 +48,7 @@ import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.conn.params.ConnPerRouteBean; -import org.apache.http.conn.params.HttpConnectionManagerParams; +import org.apache.http.conn.params.ConnManagerParams; import org.apache.http.conn.scheme.PlainSocketFactory; import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.SchemeRegistry; @@ -113,8 +113,8 @@ public void testReuseOfPersistentConnections() throws Exception { HttpProtocolParams.setUserAgent(params, "TestAgent/1.1"); HttpProtocolParams.setUseExpectContinue(params, false); HttpConnectionParams.setStaleCheckingEnabled(params, false); - HttpConnectionManagerParams.setMaxTotalConnections(params, 5); - HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, + ConnManagerParams.setMaxTotalConnections(params, 5); + ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(5)); SchemeRegistry supportedSchemes = new SchemeRegistry(); @@ -185,8 +185,8 @@ public void testReuseOfClosedConnections() throws Exception { HttpProtocolParams.setUserAgent(params, "TestAgent/1.1"); HttpProtocolParams.setUseExpectContinue(params, false); HttpConnectionParams.setStaleCheckingEnabled(params, false); - HttpConnectionManagerParams.setMaxTotalConnections(params, 5); - HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, + ConnManagerParams.setMaxTotalConnections(params, 5); + ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(5)); SchemeRegistry supportedSchemes = new SchemeRegistry(); @@ -247,8 +247,8 @@ public void testReuseOfAbortedConnections() throws Exception { HttpProtocolParams.setUserAgent(params, "TestAgent/1.1"); HttpProtocolParams.setUseExpectContinue(params, false); HttpConnectionParams.setStaleCheckingEnabled(params, false); - HttpConnectionManagerParams.setMaxTotalConnections(params, 5); - HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, + ConnManagerParams.setMaxTotalConnections(params, 5); + ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(5)); SchemeRegistry supportedSchemes = new SchemeRegistry(); diff --git a/module-client/src/test/java/org/apache/http/conn/params/TestRouteParams.java b/module-client/src/test/java/org/apache/http/conn/params/TestRouteParams.java index dd81f62a7..8705a6ca5 100644 --- a/module-client/src/test/java/org/apache/http/conn/params/TestRouteParams.java +++ b/module-client/src/test/java/org/apache/http/conn/params/TestRouteParams.java @@ -87,45 +87,45 @@ public void testSetGet() { HttpParams params = new BasicHttpParams(); assertNull("phantom proxy", - HttpRouteParams.getDefaultProxy(params)); + ConnRouteParams.getDefaultProxy(params)); assertNull("phantom route", - HttpRouteParams.getForcedRoute(params)); + ConnRouteParams.getForcedRoute(params)); assertNull("phantom address", - HttpRouteParams.getLocalAddress(params)); + ConnRouteParams.getLocalAddress(params)); - HttpRouteParams.setDefaultProxy(params, TARGET1); + ConnRouteParams.setDefaultProxy(params, TARGET1); assertSame("wrong proxy", TARGET1, - HttpRouteParams.getDefaultProxy(params)); - HttpRouteParams.setForcedRoute(params, ROUTE1); + ConnRouteParams.getDefaultProxy(params)); + ConnRouteParams.setForcedRoute(params, ROUTE1); assertSame("wrong route", ROUTE1, - HttpRouteParams.getForcedRoute(params)); - HttpRouteParams.setLocalAddress(params, LOCAL1); + ConnRouteParams.getForcedRoute(params)); + ConnRouteParams.setLocalAddress(params, LOCAL1); assertSame("wrong address", LOCAL1, - HttpRouteParams.getLocalAddress(params)); + ConnRouteParams.getLocalAddress(params)); } public void testSetNull() { HttpParams params = new BasicHttpParams(); - HttpRouteParams.setDefaultProxy(params, null); - HttpRouteParams.setForcedRoute(params, null); - HttpRouteParams.setLocalAddress(params, null); + ConnRouteParams.setDefaultProxy(params, null); + ConnRouteParams.setForcedRoute(params, null); + ConnRouteParams.setLocalAddress(params, null); assertNull("phantom proxy", - HttpRouteParams.getDefaultProxy(params)); + ConnRouteParams.getDefaultProxy(params)); assertNull("phantom route", - HttpRouteParams.getForcedRoute(params)); + ConnRouteParams.getForcedRoute(params)); assertNull("phantom address", - HttpRouteParams.getLocalAddress(params)); + ConnRouteParams.getLocalAddress(params)); - HttpRouteParams.setDefaultProxy(params, HttpRouteParams.NO_HOST); + ConnRouteParams.setDefaultProxy(params, ConnRouteParams.NO_HOST); assertNull("null proxy not detected", - HttpRouteParams.getDefaultProxy(params)); + ConnRouteParams.getDefaultProxy(params)); - HttpRouteParams.setForcedRoute(params, HttpRouteParams.NO_ROUTE); + ConnRouteParams.setForcedRoute(params, ConnRouteParams.NO_ROUTE); assertNull("null route not detected", - HttpRouteParams.getForcedRoute(params)); + ConnRouteParams.getForcedRoute(params)); } @@ -135,71 +135,71 @@ public void testUnsetHierarchy() { HttpParams dummy = new BasicHttpParams(); HttpParams child = new BasicHttpParams(); - HttpRouteParams.setDefaultProxy(daddy, TARGET1); - HttpRouteParams.setDefaultProxy(child, HttpRouteParams.NO_HOST); + ConnRouteParams.setDefaultProxy(daddy, TARGET1); + ConnRouteParams.setDefaultProxy(child, ConnRouteParams.NO_HOST); HttpParams hierarchy = new ClientParamsStack(null, daddy, child, null); - assertNull("1", HttpRouteParams.getDefaultProxy(hierarchy)); + assertNull("1", ConnRouteParams.getDefaultProxy(hierarchy)); hierarchy = new ClientParamsStack (null, daddy, new ClientParamsStack(null, child, dummy, null), null); - assertNull("2", HttpRouteParams.getDefaultProxy(hierarchy)); + assertNull("2", ConnRouteParams.getDefaultProxy(hierarchy)); hierarchy = new ClientParamsStack (null, daddy, new DefaultedHttpParams(child, dummy), null); - assertNull("3", HttpRouteParams.getDefaultProxy(hierarchy)); + assertNull("3", ConnRouteParams.getDefaultProxy(hierarchy)); hierarchy = new DefaultedHttpParams(child, daddy); - assertNull("4", HttpRouteParams.getDefaultProxy(hierarchy)); + assertNull("4", ConnRouteParams.getDefaultProxy(hierarchy)); hierarchy = new DefaultedHttpParams (new DefaultedHttpParams(child, dummy), daddy); - assertNull("5", HttpRouteParams.getDefaultProxy(hierarchy)); + assertNull("5", ConnRouteParams.getDefaultProxy(hierarchy)); hierarchy = new DefaultedHttpParams (child, new DefaultedHttpParams(dummy, daddy)); - assertNull("6", HttpRouteParams.getDefaultProxy(hierarchy)); + assertNull("6", ConnRouteParams.getDefaultProxy(hierarchy)); } public void testBadArgs() { try { - HttpRouteParams.getDefaultProxy(null); + ConnRouteParams.getDefaultProxy(null); } catch (IllegalArgumentException iax) { // expected } try { - HttpRouteParams.getForcedRoute(null); + ConnRouteParams.getForcedRoute(null); } catch (IllegalArgumentException iax) { // expected } try { - HttpRouteParams.getLocalAddress(null); + ConnRouteParams.getLocalAddress(null); } catch (IllegalArgumentException iax) { // expected } try { - HttpRouteParams.setDefaultProxy(null, null); + ConnRouteParams.setDefaultProxy(null, null); } catch (IllegalArgumentException iax) { // expected } try { - HttpRouteParams.setForcedRoute(null, null); + ConnRouteParams.setForcedRoute(null, null); } catch (IllegalArgumentException iax) { // expected } try { - HttpRouteParams.setLocalAddress(null, null); + ConnRouteParams.setLocalAddress(null, null); } catch (IllegalArgumentException iax) { // expected } diff --git a/module-client/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java b/module-client/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java index 59264bc29..e72b3e97f 100644 --- a/module-client/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java +++ b/module-client/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java @@ -44,7 +44,7 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.conn.ManagedClientConnection; import org.apache.http.conn.params.ConnPerRouteBean; -import org.apache.http.conn.params.HttpConnectionManagerParams; +import org.apache.http.conn.params.ConnManagerParams; import org.apache.http.entity.StringEntity; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.localserver.ServerTestBase; @@ -99,10 +99,10 @@ public void testStatefulConnections() throws Exception { HttpHost target = new HttpHost("localhost", port); HttpParams params = defaultParams.copy(); - HttpConnectionManagerParams.setMaxTotalConnections(params, workerCount); - HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, + ConnManagerParams.setMaxTotalConnections(params, workerCount); + ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(workerCount)); - HttpConnectionManagerParams.setTimeout(params, 10L); + ConnManagerParams.setTimeout(params, 10L); ThreadSafeClientConnManager mgr = new ThreadSafeClientConnManager( params, supportedSchemes); diff --git a/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMNoServer.java b/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMNoServer.java index d8f7c5bdd..d29dc44c7 100644 --- a/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMNoServer.java +++ b/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMNoServer.java @@ -43,7 +43,7 @@ import org.apache.http.conn.ConnectionPoolTimeoutException; import org.apache.http.conn.ManagedClientConnection; import org.apache.http.conn.params.ConnPerRouteBean; -import org.apache.http.conn.params.HttpConnectionManagerParams; +import org.apache.http.conn.params.ConnManagerParams; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.conn.scheme.PlainSocketFactory; import org.apache.http.conn.scheme.Scheme; @@ -202,8 +202,8 @@ public void testMaxConnTotal() throws InterruptedException, ConnectionPoolTimeoutException { HttpParams params = createDefaultParams(); - HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1)); - HttpConnectionManagerParams.setMaxTotalConnections(params, 2); + ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1)); + ConnManagerParams.setMaxTotalConnections(params, 2); ThreadSafeClientConnManager mgr = createTSCCM(params, null); @@ -251,13 +251,13 @@ public void testMaxConnPerHost() throws Exception { HttpRoute route3 = new HttpRoute(target3, null, false); HttpParams params = createDefaultParams(); - HttpConnectionManagerParams.setMaxTotalConnections(params, 100); + ConnManagerParams.setMaxTotalConnections(params, 100); ConnPerRouteBean connPerRoute = new ConnPerRouteBean(1); connPerRoute.setMaxForRoute(route2, 2); connPerRoute.setMaxForRoute(route3, 3); - HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, connPerRoute); + ConnManagerParams.setMaxConnectionsPerRoute(params, connPerRoute); ThreadSafeClientConnManager mgr = createTSCCM(params, null); @@ -322,8 +322,8 @@ public void testMaxConnPerHost() throws Exception { public void testReleaseConnection() throws Exception { HttpParams params = createDefaultParams(); - HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1)); - HttpConnectionManagerParams.setMaxTotalConnections(params, 3); + ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1)); + ConnManagerParams.setMaxTotalConnections(params, 3); ThreadSafeClientConnManager mgr = createTSCCM(params, null); @@ -426,8 +426,8 @@ public void testShutdown() throws Exception { // 3.x: TestHttpConnectionManager.testShutdown HttpParams params = createDefaultParams(); - HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1)); - HttpConnectionManagerParams.setMaxTotalConnections(params, 1); + ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1)); + ConnManagerParams.setMaxTotalConnections(params, 1); ThreadSafeClientConnManager mgr = createTSCCM(params, null); @@ -474,7 +474,7 @@ public void testInterruptThread() throws Exception { // 3.x: TestHttpConnectionManager.testWaitingThreadInterrupted HttpParams params = createDefaultParams(); - HttpConnectionManagerParams.setMaxTotalConnections(params, 1); + ConnManagerParams.setMaxTotalConnections(params, 1); ThreadSafeClientConnManager mgr = createTSCCM(params, null); @@ -522,7 +522,7 @@ public void testReusePreference() throws Exception { // 3.x: TestHttpConnectionManager.testHostReusePreference HttpParams params = createDefaultParams(); - HttpConnectionManagerParams.setMaxTotalConnections(params, 1); + ConnManagerParams.setMaxTotalConnections(params, 1); ThreadSafeClientConnManager mgr = createTSCCM(params, null); @@ -562,7 +562,7 @@ public void testReusePreference() throws Exception { public void testAbortAfterRequestStarts() throws Exception { HttpParams params = createDefaultParams(); - HttpConnectionManagerParams.setMaxTotalConnections(params, 1); + ConnManagerParams.setMaxTotalConnections(params, 1); ThreadSafeClientConnManager mgr = createTSCCM(params, null); @@ -603,7 +603,7 @@ public void testAbortAfterRequestStarts() throws Exception { public void testAbortBeforeRequestStarts() throws Exception { HttpParams params = createDefaultParams(); - HttpConnectionManagerParams.setMaxTotalConnections(params, 1); + ConnManagerParams.setMaxTotalConnections(params, 1); ThreadSafeClientConnManager mgr = createTSCCM(params, null); diff --git a/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java b/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java index 8e86a7369..8163e6f56 100644 --- a/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java +++ b/module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java @@ -57,7 +57,7 @@ import org.apache.http.conn.ManagedClientConnection; import org.apache.http.conn.OperatedClientConnection; import org.apache.http.conn.params.ConnPerRouteBean; -import org.apache.http.conn.params.HttpConnectionManagerParams; +import org.apache.http.conn.params.ConnManagerParams; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.conn.scheme.PlainSocketFactory; import org.apache.http.conn.scheme.Scheme; @@ -138,9 +138,9 @@ public void testParallelRequests() throws Exception { final int COUNT = 8; // adjust to execute more requests HttpParams mgrpar = defaultParams.copy(); - HttpConnectionManagerParams.setMaxTotalConnections + ConnManagerParams.setMaxTotalConnections (mgrpar, COUNT/2); - HttpConnectionManagerParams.setMaxConnectionsPerRoute + ConnManagerParams.setMaxConnectionsPerRoute (mgrpar, new ConnPerRouteBean(COUNT/2)); ThreadSafeClientConnManager mgr = createTSCCM(mgrpar, null); @@ -213,7 +213,7 @@ private static ManagedClientConnection getConnection( public void testReleaseConnection() throws Exception { HttpParams mgrpar = defaultParams.copy(); - HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); + ConnManagerParams.setMaxTotalConnections(mgrpar, 1); ThreadSafeClientConnManager mgr = createTSCCM(mgrpar, null); @@ -302,7 +302,7 @@ public void testReleaseConnection() throws Exception { public void testReleaseConnectionOnAbort() throws Exception { HttpParams mgrpar = defaultParams.copy(); - HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); + ConnManagerParams.setMaxTotalConnections(mgrpar, 1); ThreadSafeClientConnManager mgr = createTSCCM(mgrpar, null); @@ -354,7 +354,7 @@ public void testConnectionGC() throws Exception { // 3.x: TestHttpConnectionManager.testReclaimUnusedConnection HttpParams mgrpar = defaultParams.copy(); - HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); + ConnManagerParams.setMaxTotalConnections(mgrpar, 1); ThreadSafeClientConnManager mgr = createTSCCM(mgrpar, null); @@ -457,7 +457,7 @@ public void testConnectionManagerGC() throws Exception { public void testAbortDuringConnecting() throws Exception { HttpParams mgrpar = defaultParams.copy(); - HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); + ConnManagerParams.setMaxTotalConnections(mgrpar, 1); final CountDownLatch connectLatch = new CountDownLatch(1); final StallingSocketFactory stallingSocketFactory = new StallingSocketFactory(connectLatch, WaitPolicy.BEFORE_CONNECT, PlainSocketFactory.getSocketFactory()); @@ -521,7 +521,7 @@ public void run() { public void testAbortBeforeSocketCreate() throws Exception { HttpParams mgrpar = defaultParams.copy(); - HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); + ConnManagerParams.setMaxTotalConnections(mgrpar, 1); final CountDownLatch connectLatch = new CountDownLatch(1); final StallingSocketFactory stallingSocketFactory = new StallingSocketFactory(connectLatch, WaitPolicy.BEFORE_CREATE, PlainSocketFactory.getSocketFactory()); @@ -587,7 +587,7 @@ public void run() { public void testAbortAfterSocketConnect() throws Exception { HttpParams mgrpar = defaultParams.copy(); - HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); + ConnManagerParams.setMaxTotalConnections(mgrpar, 1); final CountDownLatch connectLatch = new CountDownLatch(1); final StallingSocketFactory stallingSocketFactory = new StallingSocketFactory(connectLatch, WaitPolicy.AFTER_CONNECT, PlainSocketFactory.getSocketFactory()); @@ -651,7 +651,7 @@ public void run() { public void testAbortAfterOperatorOpen() throws Exception { HttpParams mgrpar = defaultParams.copy(); - HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); + ConnManagerParams.setMaxTotalConnections(mgrpar, 1); final CountDownLatch connectLatch = new CountDownLatch(1); final AtomicReference operatorRef = new AtomicReference(); diff --git a/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestConnPoolByRoute.java b/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestConnPoolByRoute.java index 95a0bf0e7..eca767b41 100644 --- a/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestConnPoolByRoute.java +++ b/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestConnPoolByRoute.java @@ -39,7 +39,7 @@ import org.apache.http.conn.ClientConnectionOperator; import org.apache.http.conn.ConnectionPoolTimeoutException; import org.apache.http.conn.params.ConnPerRouteBean; -import org.apache.http.conn.params.HttpConnectionManagerParams; +import org.apache.http.conn.params.ConnManagerParams; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.impl.conn.DefaultClientConnectionOperator; import org.apache.http.localserver.ServerTestBase; @@ -69,7 +69,7 @@ public void testStatelessConnections() throws Exception { BasicHttpParams params = new BasicHttpParams(); ConnPerRouteBean connPerRoute = new ConnPerRouteBean(3); - HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, connPerRoute); + ConnManagerParams.setMaxConnectionsPerRoute(params, connPerRoute); ConnPoolByRoute connPool = new ConnPoolByRoute(operator, params); try { @@ -116,7 +116,7 @@ public void testStatefullConnections() throws Exception { BasicHttpParams params = new BasicHttpParams(); ConnPerRouteBean connPerRoute = new ConnPerRouteBean(3); - HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, connPerRoute); + ConnManagerParams.setMaxConnectionsPerRoute(params, connPerRoute); ConnPoolByRoute connPool = new ConnPoolByRoute(operator, params); try { diff --git a/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java b/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java index 53b392cd4..df3a0c3f0 100644 --- a/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java +++ b/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java @@ -48,7 +48,7 @@ import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.conn.params.ConnPerRouteBean; -import org.apache.http.conn.params.HttpConnectionManagerParams; +import org.apache.http.conn.params.ConnManagerParams; import org.apache.http.params.BasicHttpParams; import org.apache.http.params.HttpParams; import org.apache.http.params.HttpProtocolParams; @@ -143,8 +143,8 @@ public void testSpuriousWakeup() throws Exception { HttpParams params = new BasicHttpParams(); HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1); HttpProtocolParams.setUseExpectContinue(params, false); - HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1)); - HttpConnectionManagerParams.setMaxTotalConnections(params, 1); + ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1)); + ConnManagerParams.setMaxTotalConnections(params, 1); SchemeRegistry schreg = new SchemeRegistry(); SocketFactory sf = PlainSocketFactory.getSocketFactory();