Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed classes for consistency 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@658785 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2008-05-21 17:47:40 +00:00
parent be2250f5b2
commit a9d307fa91
15 changed files with 109 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java
View File

@ -36,7 +36,7 @@ import org.apache.http.HttpVersion;
import org.apache.http.client.HttpClient; import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.conn.ClientConnectionManager; 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.PlainSocketFactory;
import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.scheme.SchemeRegistry;
@ -60,7 +60,7 @@ public class ClientMultiThreadedExecution {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// Create and initialize HTTP parameters // Create and initialize HTTP parameters
HttpParams params = new BasicHttpParams(); HttpParams params = new BasicHttpParams();
HttpConnectionManagerParams.setMaxTotalConnections(params, 100); ConnManagerParams.setMaxTotalConnections(params, 100);
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1); HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
// Create and initialize scheme registry // Create and initialize scheme registry

2
module-client/src/main/java/org/apache/http/conn/params/HttpConnectionManagerParams.java → module-client/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
View File

@ -47,7 +47,7 @@ import org.apache.http.params.HttpParams;
* *
* @see ConnManagerPNames * @see ConnManagerPNames
*/ */
public final class HttpConnectionManagerParams implements ConnManagerPNames { public final class ConnManagerParams implements ConnManagerPNames {
/** The default maximum number of connections allowed overall */ /** The default maximum number of connections allowed overall */
public static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 20; public static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 20;

17
module-client/src/main/java/org/apache/http/conn/params/HttpRouteParams.java → module-client/src/main/java/org/apache/http/conn/params/ConnRouteParams.java
View File

@ -50,7 +50,7 @@ import org.apache.http.conn.routing.HttpRoute;
* *
* @since 4.0 * @since 4.0
*/ */
public class HttpRouteParams { public class ConnRouteParams implements ConnRoutePNames {
/** /**
* A special value indicating "no host". * A special value indicating "no host".
@ -68,7 +68,7 @@ public class HttpRouteParams {
/** Disabled default constructor. */ /** Disabled default constructor. */
private HttpRouteParams() { private ConnRouteParams() {
// no body // no body
} }
@ -89,7 +89,7 @@ public class HttpRouteParams {
throw new IllegalArgumentException("Parameters must not be null."); throw new IllegalArgumentException("Parameters must not be null.");
} }
HttpHost proxy = (HttpHost) HttpHost proxy = (HttpHost)
params.getParameter(ConnRoutePNames.DEFAULT_PROXY); params.getParameter(DEFAULT_PROXY);
if ((proxy != null) && NO_HOST.equals(proxy)) { if ((proxy != null) && NO_HOST.equals(proxy)) {
// value is explicitly unset // value is explicitly unset
proxy = null; proxy = null;
@ -113,7 +113,7 @@ public class HttpRouteParams {
if (params == null) { if (params == null) {
throw new IllegalArgumentException("Parameters must not be 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 class HttpRouteParams {
throw new IllegalArgumentException("Parameters must not be null."); throw new IllegalArgumentException("Parameters must not be null.");
} }
HttpRoute route = (HttpRoute) HttpRoute route = (HttpRoute)
params.getParameter(ConnRoutePNames.FORCED_ROUTE); params.getParameter(FORCED_ROUTE);
if ((route != null) && NO_ROUTE.equals(route)) { if ((route != null) && NO_ROUTE.equals(route)) {
// value is explicitly unset // value is explicitly unset
route = null; route = null;
@ -157,7 +157,7 @@ public class HttpRouteParams {
if (params == null) { if (params == null) {
throw new IllegalArgumentException("Parameters must not be 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 class HttpRouteParams {
throw new IllegalArgumentException("Parameters must not be null."); throw new IllegalArgumentException("Parameters must not be null.");
} }
InetAddress local = (InetAddress) InetAddress local = (InetAddress)
params.getParameter(ConnRoutePNames.LOCAL_ADDRESS); params.getParameter(LOCAL_ADDRESS);
// no explicit unsetting // no explicit unsetting
return local; return local;
} }
@ -196,7 +196,8 @@ public class HttpRouteParams {
if (params == null) { if (params == null) {
throw new IllegalArgumentException("Parameters must not be null."); throw new IllegalArgumentException("Parameters must not be null.");
} }
params.setParameter(ConnRoutePNames.LOCAL_ADDRESS, local); params.setParameter(LOCAL_ADDRESS, local);
} }
} }

4
module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
View File

@ -74,7 +74,7 @@ import org.apache.http.conn.BasicManagedEntity;
import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.ClientConnectionRequest; import org.apache.http.conn.ClientConnectionRequest;
import org.apache.http.conn.ManagedClientConnection; 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.BasicRouteDirector;
import org.apache.http.conn.routing.HttpRoute; import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.conn.routing.HttpRouteDirector; import org.apache.http.conn.routing.HttpRouteDirector;
@ -278,7 +278,7 @@ public class DefaultClientRequestDirector
RoutedRequest roureq = new RoutedRequest(origWrapper, origRoute); RoutedRequest roureq = new RoutedRequest(origWrapper, origRoute);
long timeout = HttpConnectionManagerParams.getTimeout(params); long timeout = ConnManagerParams.getTimeout(params);
int execCount = 0; int execCount = 0;

8
module-client/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
View File

@ -44,7 +44,7 @@ import org.apache.http.conn.routing.HttpRoutePlanner;
import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.scheme.SchemeRegistry; 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 class DefaultHttpRoutePlanner implements HttpRoutePlanner {
// If we have a forced route, we can do without a target. // If we have a forced route, we can do without a target.
HttpRoute route = HttpRoute route =
HttpRouteParams.getForcedRoute(request.getParams()); ConnRouteParams.getForcedRoute(request.getParams());
if (route != null) if (route != null)
return route; return route;
@ -100,9 +100,9 @@ public class DefaultHttpRoutePlanner implements HttpRoutePlanner {
} }
final InetAddress local = final InetAddress local =
HttpRouteParams.getLocalAddress(request.getParams()); ConnRouteParams.getLocalAddress(request.getParams());
final HttpHost proxy = final HttpHost proxy =
HttpRouteParams.getDefaultProxy(request.getParams()); ConnRouteParams.getDefaultProxy(request.getParams());
final Scheme schm = schemeRegistry.getScheme(target.getSchemeName()); final Scheme schm = schemeRegistry.getScheme(target.getSchemeName());
// as it is typically used for TLS/SSL, we assume that // as it is typically used for TLS/SSL, we assume that

6
module-client/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
View File

@ -50,7 +50,7 @@ import org.apache.http.conn.routing.HttpRoutePlanner;
import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.scheme.SchemeRegistry; 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 class ProxySelectorRoutePlanner implements HttpRoutePlanner {
// If we have a forced route, we can do without a target. // If we have a forced route, we can do without a target.
HttpRoute route = HttpRoute route =
HttpRouteParams.getForcedRoute(request.getParams()); ConnRouteParams.getForcedRoute(request.getParams());
if (route != null) if (route != null)
return route; return route;
@ -139,7 +139,7 @@ public class ProxySelectorRoutePlanner implements HttpRoutePlanner {
} }
final InetAddress local = final InetAddress local =
HttpRouteParams.getLocalAddress(request.getParams()); ConnRouteParams.getLocalAddress(request.getParams());
final HttpHost proxy = determineProxy(target, request, context); final HttpHost proxy = determineProxy(target, request, context);
final Scheme schm = final Scheme schm =

6
module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
View File

@ -45,7 +45,7 @@ import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.conn.ClientConnectionOperator; import org.apache.http.conn.ClientConnectionOperator;
import org.apache.http.conn.ConnectionPoolTimeoutException; import org.apache.http.conn.ConnectionPoolTimeoutException;
import org.apache.http.conn.params.ConnPerRoute; 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; import org.apache.http.params.HttpParams;
@ -104,9 +104,9 @@ public class ConnPoolByRoute extends AbstractConnPool {
freeConnections = createFreeConnQueue(); freeConnections = createFreeConnQueue();
waitingThreads = createWaitingThreadQueue(); waitingThreads = createWaitingThreadQueue();
routeToPool = createRouteToPoolMap(); routeToPool = createRouteToPoolMap();
maxTotalConnections = HttpConnectionManagerParams maxTotalConnections = ConnManagerParams
.getMaxTotalConnections(params); .getMaxTotalConnections(params);
connPerRoute = HttpConnectionManagerParams connPerRoute = ConnManagerParams
.getMaxConnectionsPerRoute(params); .getMaxConnectionsPerRoute(params);
} }

18
module-client/src/test/java/org/apache/http/conn/TestConnectionAutoRelease.java
View File

@ -47,7 +47,7 @@ import org.apache.http.HttpResponse;
import org.apache.http.MalformedChunkCodingException; import org.apache.http.MalformedChunkCodingException;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.conn.params.ConnPerRouteBean; 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.routing.HttpRoute;
import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.scheme.SchemeRegistry;
import org.apache.http.entity.BasicHttpEntity; import org.apache.http.entity.BasicHttpEntity;
@ -87,9 +87,9 @@ public class TestConnectionAutoRelease extends ServerTestBase {
public void testReleaseOnEntityConsumeContent() throws Exception { public void testReleaseOnEntityConsumeContent() throws Exception {
HttpParams params = defaultParams.copy(); HttpParams params = defaultParams.copy();
HttpConnectionManagerParams.setMaxTotalConnections ConnManagerParams.setMaxTotalConnections
(params, 1); (params, 1);
HttpConnectionManagerParams.setMaxConnectionsPerRoute ConnManagerParams.setMaxConnectionsPerRoute
(params, new ConnPerRouteBean(1)); (params, new ConnPerRouteBean(1));
ThreadSafeClientConnManager mgr = createTSCCM(params, null); ThreadSafeClientConnManager mgr = createTSCCM(params, null);
@ -129,9 +129,9 @@ public class TestConnectionAutoRelease extends ServerTestBase {
public void testReleaseOnEntityWriteTo() throws Exception { public void testReleaseOnEntityWriteTo() throws Exception {
HttpParams params = defaultParams.copy(); HttpParams params = defaultParams.copy();
HttpConnectionManagerParams.setMaxTotalConnections ConnManagerParams.setMaxTotalConnections
(params, 1); (params, 1);
HttpConnectionManagerParams.setMaxConnectionsPerRoute ConnManagerParams.setMaxConnectionsPerRoute
(params, new ConnPerRouteBean(1)); (params, new ConnPerRouteBean(1));
ThreadSafeClientConnManager mgr = createTSCCM(params, null); ThreadSafeClientConnManager mgr = createTSCCM(params, null);
@ -172,9 +172,9 @@ public class TestConnectionAutoRelease extends ServerTestBase {
public void testReleaseOnAbort() throws Exception { public void testReleaseOnAbort() throws Exception {
HttpParams params = defaultParams.copy(); HttpParams params = defaultParams.copy();
HttpConnectionManagerParams.setMaxTotalConnections ConnManagerParams.setMaxTotalConnections
(params, 1); (params, 1);
HttpConnectionManagerParams.setMaxConnectionsPerRoute ConnManagerParams.setMaxConnectionsPerRoute
(params, new ConnPerRouteBean(1)); (params, new ConnPerRouteBean(1));
ThreadSafeClientConnManager mgr = createTSCCM(params, null); ThreadSafeClientConnManager mgr = createTSCCM(params, null);
@ -247,9 +247,9 @@ public class TestConnectionAutoRelease extends ServerTestBase {
}); });
HttpParams params = defaultParams.copy(); HttpParams params = defaultParams.copy();
HttpConnectionManagerParams.setMaxTotalConnections ConnManagerParams.setMaxTotalConnections
(params, 1); (params, 1);
HttpConnectionManagerParams.setMaxConnectionsPerRoute ConnManagerParams.setMaxConnectionsPerRoute
(params, new ConnPerRouteBean(1)); (params, new ConnPerRouteBean(1));
ThreadSafeClientConnManager mgr = createTSCCM(params, null); ThreadSafeClientConnManager mgr = createTSCCM(params, null);

20
module-client/src/test/java/org/apache/http/conn/TestConnectionReuse.java
View File

@ -1,7 +1,7 @@
/* /*
* $HeadURL:$ * $HeadURL$
* $Revision:$ * $Revision$
* $Date:$ * $Date$
* *
* ==================================================================== * ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -48,7 +48,7 @@ import org.apache.http.HttpVersion;
import org.apache.http.client.HttpClient; import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.conn.params.ConnPerRouteBean; 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.PlainSocketFactory;
import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.scheme.SchemeRegistry;
@ -113,8 +113,8 @@ public class TestConnectionReuse extends TestCase {
HttpProtocolParams.setUserAgent(params, "TestAgent/1.1"); HttpProtocolParams.setUserAgent(params, "TestAgent/1.1");
HttpProtocolParams.setUseExpectContinue(params, false); HttpProtocolParams.setUseExpectContinue(params, false);
HttpConnectionParams.setStaleCheckingEnabled(params, false); HttpConnectionParams.setStaleCheckingEnabled(params, false);
HttpConnectionManagerParams.setMaxTotalConnections(params, 5); ConnManagerParams.setMaxTotalConnections(params, 5);
HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, ConnManagerParams.setMaxConnectionsPerRoute(params,
new ConnPerRouteBean(5)); new ConnPerRouteBean(5));
SchemeRegistry supportedSchemes = new SchemeRegistry(); SchemeRegistry supportedSchemes = new SchemeRegistry();
@ -185,8 +185,8 @@ public class TestConnectionReuse extends TestCase {
HttpProtocolParams.setUserAgent(params, "TestAgent/1.1"); HttpProtocolParams.setUserAgent(params, "TestAgent/1.1");
HttpProtocolParams.setUseExpectContinue(params, false); HttpProtocolParams.setUseExpectContinue(params, false);
HttpConnectionParams.setStaleCheckingEnabled(params, false); HttpConnectionParams.setStaleCheckingEnabled(params, false);
HttpConnectionManagerParams.setMaxTotalConnections(params, 5); ConnManagerParams.setMaxTotalConnections(params, 5);
HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, ConnManagerParams.setMaxConnectionsPerRoute(params,
new ConnPerRouteBean(5)); new ConnPerRouteBean(5));
SchemeRegistry supportedSchemes = new SchemeRegistry(); SchemeRegistry supportedSchemes = new SchemeRegistry();
@ -247,8 +247,8 @@ public class TestConnectionReuse extends TestCase {
HttpProtocolParams.setUserAgent(params, "TestAgent/1.1"); HttpProtocolParams.setUserAgent(params, "TestAgent/1.1");
HttpProtocolParams.setUseExpectContinue(params, false); HttpProtocolParams.setUseExpectContinue(params, false);
HttpConnectionParams.setStaleCheckingEnabled(params, false); HttpConnectionParams.setStaleCheckingEnabled(params, false);
HttpConnectionManagerParams.setMaxTotalConnections(params, 5); ConnManagerParams.setMaxTotalConnections(params, 5);
HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, ConnManagerParams.setMaxConnectionsPerRoute(params,
new ConnPerRouteBean(5)); new ConnPerRouteBean(5));
SchemeRegistry supportedSchemes = new SchemeRegistry(); SchemeRegistry supportedSchemes = new SchemeRegistry();

66
module-client/src/test/java/org/apache/http/conn/params/TestRouteParams.java
View File

@ -87,45 +87,45 @@ public class TestRouteParams extends TestCase {
HttpParams params = new BasicHttpParams(); HttpParams params = new BasicHttpParams();
assertNull("phantom proxy", assertNull("phantom proxy",
HttpRouteParams.getDefaultProxy(params)); ConnRouteParams.getDefaultProxy(params));
assertNull("phantom route", assertNull("phantom route",
HttpRouteParams.getForcedRoute(params)); ConnRouteParams.getForcedRoute(params));
assertNull("phantom address", assertNull("phantom address",
HttpRouteParams.getLocalAddress(params)); ConnRouteParams.getLocalAddress(params));
HttpRouteParams.setDefaultProxy(params, TARGET1); ConnRouteParams.setDefaultProxy(params, TARGET1);
assertSame("wrong proxy", TARGET1, assertSame("wrong proxy", TARGET1,
HttpRouteParams.getDefaultProxy(params)); ConnRouteParams.getDefaultProxy(params));
HttpRouteParams.setForcedRoute(params, ROUTE1); ConnRouteParams.setForcedRoute(params, ROUTE1);
assertSame("wrong route", ROUTE1, assertSame("wrong route", ROUTE1,
HttpRouteParams.getForcedRoute(params)); ConnRouteParams.getForcedRoute(params));
HttpRouteParams.setLocalAddress(params, LOCAL1); ConnRouteParams.setLocalAddress(params, LOCAL1);
assertSame("wrong address", LOCAL1, assertSame("wrong address", LOCAL1,
HttpRouteParams.getLocalAddress(params)); ConnRouteParams.getLocalAddress(params));
} }
public void testSetNull() { public void testSetNull() {
HttpParams params = new BasicHttpParams(); HttpParams params = new BasicHttpParams();
HttpRouteParams.setDefaultProxy(params, null); ConnRouteParams.setDefaultProxy(params, null);
HttpRouteParams.setForcedRoute(params, null); ConnRouteParams.setForcedRoute(params, null);
HttpRouteParams.setLocalAddress(params, null); ConnRouteParams.setLocalAddress(params, null);
assertNull("phantom proxy", assertNull("phantom proxy",
HttpRouteParams.getDefaultProxy(params)); ConnRouteParams.getDefaultProxy(params));
assertNull("phantom route", assertNull("phantom route",
HttpRouteParams.getForcedRoute(params)); ConnRouteParams.getForcedRoute(params));
assertNull("phantom address", 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", 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", assertNull("null route not detected",
HttpRouteParams.getForcedRoute(params)); ConnRouteParams.getForcedRoute(params));
} }
@ -135,71 +135,71 @@ public class TestRouteParams extends TestCase {
HttpParams dummy = new BasicHttpParams(); HttpParams dummy = new BasicHttpParams();
HttpParams child = new BasicHttpParams(); HttpParams child = new BasicHttpParams();
HttpRouteParams.setDefaultProxy(daddy, TARGET1); ConnRouteParams.setDefaultProxy(daddy, TARGET1);
HttpRouteParams.setDefaultProxy(child, HttpRouteParams.NO_HOST); ConnRouteParams.setDefaultProxy(child, ConnRouteParams.NO_HOST);
HttpParams hierarchy = HttpParams hierarchy =
new ClientParamsStack(null, daddy, child, null); new ClientParamsStack(null, daddy, child, null);
assertNull("1", HttpRouteParams.getDefaultProxy(hierarchy)); assertNull("1", ConnRouteParams.getDefaultProxy(hierarchy));
hierarchy = new ClientParamsStack hierarchy = new ClientParamsStack
(null, (null,
daddy, daddy,
new ClientParamsStack(null, child, dummy, null), new ClientParamsStack(null, child, dummy, null),
null); null);
assertNull("2", HttpRouteParams.getDefaultProxy(hierarchy)); assertNull("2", ConnRouteParams.getDefaultProxy(hierarchy));
hierarchy = new ClientParamsStack hierarchy = new ClientParamsStack
(null, daddy, new DefaultedHttpParams(child, dummy), null); (null, daddy, new DefaultedHttpParams(child, dummy), null);
assertNull("3", HttpRouteParams.getDefaultProxy(hierarchy)); assertNull("3", ConnRouteParams.getDefaultProxy(hierarchy));
hierarchy = new DefaultedHttpParams(child, daddy); hierarchy = new DefaultedHttpParams(child, daddy);
assertNull("4", HttpRouteParams.getDefaultProxy(hierarchy)); assertNull("4", ConnRouteParams.getDefaultProxy(hierarchy));
hierarchy = new DefaultedHttpParams hierarchy = new DefaultedHttpParams
(new DefaultedHttpParams(child, dummy), daddy); (new DefaultedHttpParams(child, dummy), daddy);
assertNull("5", HttpRouteParams.getDefaultProxy(hierarchy)); assertNull("5", ConnRouteParams.getDefaultProxy(hierarchy));
hierarchy = new DefaultedHttpParams hierarchy = new DefaultedHttpParams
(child, new DefaultedHttpParams(dummy, daddy)); (child, new DefaultedHttpParams(dummy, daddy));
assertNull("6", HttpRouteParams.getDefaultProxy(hierarchy)); assertNull("6", ConnRouteParams.getDefaultProxy(hierarchy));
} }
public void testBadArgs() { public void testBadArgs() {
try { try {
HttpRouteParams.getDefaultProxy(null); ConnRouteParams.getDefaultProxy(null);
} catch (IllegalArgumentException iax) { } catch (IllegalArgumentException iax) {
// expected // expected
} }
try { try {
HttpRouteParams.getForcedRoute(null); ConnRouteParams.getForcedRoute(null);
} catch (IllegalArgumentException iax) { } catch (IllegalArgumentException iax) {
// expected // expected
} }
try { try {
HttpRouteParams.getLocalAddress(null); ConnRouteParams.getLocalAddress(null);
} catch (IllegalArgumentException iax) { } catch (IllegalArgumentException iax) {
// expected // expected
} }
try { try {
HttpRouteParams.setDefaultProxy(null, null); ConnRouteParams.setDefaultProxy(null, null);
} catch (IllegalArgumentException iax) { } catch (IllegalArgumentException iax) {
// expected // expected
} }
try { try {
HttpRouteParams.setForcedRoute(null, null); ConnRouteParams.setForcedRoute(null, null);
} catch (IllegalArgumentException iax) { } catch (IllegalArgumentException iax) {
// expected // expected
} }
try { try {
HttpRouteParams.setLocalAddress(null, null); ConnRouteParams.setLocalAddress(null, null);
} catch (IllegalArgumentException iax) { } catch (IllegalArgumentException iax) {
// expected // expected
} }

8
module-client/src/test/java/org/apache/http/impl/client/TestStatefulConnManagement.java
View File

@ -44,7 +44,7 @@ import org.apache.http.client.UserTokenHandler;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.conn.ManagedClientConnection; import org.apache.http.conn.ManagedClientConnection;
import org.apache.http.conn.params.ConnPerRouteBean; 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.entity.StringEntity;
import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
import org.apache.http.localserver.ServerTestBase; import org.apache.http.localserver.ServerTestBase;
@ -99,10 +99,10 @@ public class TestStatefulConnManagement extends ServerTestBase {
HttpHost target = new HttpHost("localhost", port); HttpHost target = new HttpHost("localhost", port);
HttpParams params = defaultParams.copy(); HttpParams params = defaultParams.copy();
HttpConnectionManagerParams.setMaxTotalConnections(params, workerCount); ConnManagerParams.setMaxTotalConnections(params, workerCount);
HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, ConnManagerParams.setMaxConnectionsPerRoute(params,
new ConnPerRouteBean(workerCount)); new ConnPerRouteBean(workerCount));
HttpConnectionManagerParams.setTimeout(params, 10L); ConnManagerParams.setTimeout(params, 10L);
ThreadSafeClientConnManager mgr = new ThreadSafeClientConnManager( ThreadSafeClientConnManager mgr = new ThreadSafeClientConnManager(
params, supportedSchemes); params, supportedSchemes);

26
module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMNoServer.java
View File

@ -43,7 +43,7 @@ import org.apache.http.conn.ClientConnectionRequest;
import org.apache.http.conn.ConnectionPoolTimeoutException; import org.apache.http.conn.ConnectionPoolTimeoutException;
import org.apache.http.conn.ManagedClientConnection; import org.apache.http.conn.ManagedClientConnection;
import org.apache.http.conn.params.ConnPerRouteBean; 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.routing.HttpRoute;
import org.apache.http.conn.scheme.PlainSocketFactory; import org.apache.http.conn.scheme.PlainSocketFactory;
import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.Scheme;
@ -202,8 +202,8 @@ public class TestTSCCMNoServer extends TestCase {
throws InterruptedException, ConnectionPoolTimeoutException { throws InterruptedException, ConnectionPoolTimeoutException {
HttpParams params = createDefaultParams(); HttpParams params = createDefaultParams();
HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1)); ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1));
HttpConnectionManagerParams.setMaxTotalConnections(params, 2); ConnManagerParams.setMaxTotalConnections(params, 2);
ThreadSafeClientConnManager mgr = createTSCCM(params, null); ThreadSafeClientConnManager mgr = createTSCCM(params, null);
@ -251,13 +251,13 @@ public class TestTSCCMNoServer extends TestCase {
HttpRoute route3 = new HttpRoute(target3, null, false); HttpRoute route3 = new HttpRoute(target3, null, false);
HttpParams params = createDefaultParams(); HttpParams params = createDefaultParams();
HttpConnectionManagerParams.setMaxTotalConnections(params, 100); ConnManagerParams.setMaxTotalConnections(params, 100);
ConnPerRouteBean connPerRoute = new ConnPerRouteBean(1); ConnPerRouteBean connPerRoute = new ConnPerRouteBean(1);
connPerRoute.setMaxForRoute(route2, 2); connPerRoute.setMaxForRoute(route2, 2);
connPerRoute.setMaxForRoute(route3, 3); connPerRoute.setMaxForRoute(route3, 3);
HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, connPerRoute); ConnManagerParams.setMaxConnectionsPerRoute(params, connPerRoute);
ThreadSafeClientConnManager mgr = createTSCCM(params, null); ThreadSafeClientConnManager mgr = createTSCCM(params, null);
@ -322,8 +322,8 @@ public class TestTSCCMNoServer extends TestCase {
public void testReleaseConnection() throws Exception { public void testReleaseConnection() throws Exception {
HttpParams params = createDefaultParams(); HttpParams params = createDefaultParams();
HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1)); ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1));
HttpConnectionManagerParams.setMaxTotalConnections(params, 3); ConnManagerParams.setMaxTotalConnections(params, 3);
ThreadSafeClientConnManager mgr = createTSCCM(params, null); ThreadSafeClientConnManager mgr = createTSCCM(params, null);
@ -426,8 +426,8 @@ public class TestTSCCMNoServer extends TestCase {
// 3.x: TestHttpConnectionManager.testShutdown // 3.x: TestHttpConnectionManager.testShutdown
HttpParams params = createDefaultParams(); HttpParams params = createDefaultParams();
HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1)); ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1));
HttpConnectionManagerParams.setMaxTotalConnections(params, 1); ConnManagerParams.setMaxTotalConnections(params, 1);
ThreadSafeClientConnManager mgr = createTSCCM(params, null); ThreadSafeClientConnManager mgr = createTSCCM(params, null);
@ -474,7 +474,7 @@ public class TestTSCCMNoServer extends TestCase {
// 3.x: TestHttpConnectionManager.testWaitingThreadInterrupted // 3.x: TestHttpConnectionManager.testWaitingThreadInterrupted
HttpParams params = createDefaultParams(); HttpParams params = createDefaultParams();
HttpConnectionManagerParams.setMaxTotalConnections(params, 1); ConnManagerParams.setMaxTotalConnections(params, 1);
ThreadSafeClientConnManager mgr = createTSCCM(params, null); ThreadSafeClientConnManager mgr = createTSCCM(params, null);
@ -522,7 +522,7 @@ public class TestTSCCMNoServer extends TestCase {
// 3.x: TestHttpConnectionManager.testHostReusePreference // 3.x: TestHttpConnectionManager.testHostReusePreference
HttpParams params = createDefaultParams(); HttpParams params = createDefaultParams();
HttpConnectionManagerParams.setMaxTotalConnections(params, 1); ConnManagerParams.setMaxTotalConnections(params, 1);
ThreadSafeClientConnManager mgr = createTSCCM(params, null); ThreadSafeClientConnManager mgr = createTSCCM(params, null);
@ -562,7 +562,7 @@ public class TestTSCCMNoServer extends TestCase {
public void testAbortAfterRequestStarts() throws Exception { public void testAbortAfterRequestStarts() throws Exception {
HttpParams params = createDefaultParams(); HttpParams params = createDefaultParams();
HttpConnectionManagerParams.setMaxTotalConnections(params, 1); ConnManagerParams.setMaxTotalConnections(params, 1);
ThreadSafeClientConnManager mgr = createTSCCM(params, null); ThreadSafeClientConnManager mgr = createTSCCM(params, null);
@ -603,7 +603,7 @@ public class TestTSCCMNoServer extends TestCase {
public void testAbortBeforeRequestStarts() throws Exception { public void testAbortBeforeRequestStarts() throws Exception {
HttpParams params = createDefaultParams(); HttpParams params = createDefaultParams();
HttpConnectionManagerParams.setMaxTotalConnections(params, 1); ConnManagerParams.setMaxTotalConnections(params, 1);
ThreadSafeClientConnManager mgr = createTSCCM(params, null); ThreadSafeClientConnManager mgr = createTSCCM(params, null);

20
module-client/src/test/java/org/apache/http/impl/conn/TestTSCCMWithServer.java
View File

@ -57,7 +57,7 @@ import org.apache.http.conn.ConnectionPoolTimeoutException;
import org.apache.http.conn.ManagedClientConnection; import org.apache.http.conn.ManagedClientConnection;
import org.apache.http.conn.OperatedClientConnection; import org.apache.http.conn.OperatedClientConnection;
import org.apache.http.conn.params.ConnPerRouteBean; 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.routing.HttpRoute;
import org.apache.http.conn.scheme.PlainSocketFactory; import org.apache.http.conn.scheme.PlainSocketFactory;
import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.Scheme;
@ -138,9 +138,9 @@ public class TestTSCCMWithServer extends ServerTestBase {
final int COUNT = 8; // adjust to execute more requests final int COUNT = 8; // adjust to execute more requests
HttpParams mgrpar = defaultParams.copy(); HttpParams mgrpar = defaultParams.copy();
HttpConnectionManagerParams.setMaxTotalConnections ConnManagerParams.setMaxTotalConnections
(mgrpar, COUNT/2); (mgrpar, COUNT/2);
HttpConnectionManagerParams.setMaxConnectionsPerRoute ConnManagerParams.setMaxConnectionsPerRoute
(mgrpar, new ConnPerRouteBean(COUNT/2)); (mgrpar, new ConnPerRouteBean(COUNT/2));
ThreadSafeClientConnManager mgr = createTSCCM(mgrpar, null); ThreadSafeClientConnManager mgr = createTSCCM(mgrpar, null);
@ -213,7 +213,7 @@ public class TestTSCCMWithServer extends ServerTestBase {
public void testReleaseConnection() throws Exception { public void testReleaseConnection() throws Exception {
HttpParams mgrpar = defaultParams.copy(); HttpParams mgrpar = defaultParams.copy();
HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); ConnManagerParams.setMaxTotalConnections(mgrpar, 1);
ThreadSafeClientConnManager mgr = createTSCCM(mgrpar, null); ThreadSafeClientConnManager mgr = createTSCCM(mgrpar, null);
@ -302,7 +302,7 @@ public class TestTSCCMWithServer extends ServerTestBase {
public void testReleaseConnectionOnAbort() throws Exception { public void testReleaseConnectionOnAbort() throws Exception {
HttpParams mgrpar = defaultParams.copy(); HttpParams mgrpar = defaultParams.copy();
HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); ConnManagerParams.setMaxTotalConnections(mgrpar, 1);
ThreadSafeClientConnManager mgr = createTSCCM(mgrpar, null); ThreadSafeClientConnManager mgr = createTSCCM(mgrpar, null);
@ -354,7 +354,7 @@ public class TestTSCCMWithServer extends ServerTestBase {
// 3.x: TestHttpConnectionManager.testReclaimUnusedConnection // 3.x: TestHttpConnectionManager.testReclaimUnusedConnection
HttpParams mgrpar = defaultParams.copy(); HttpParams mgrpar = defaultParams.copy();
HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); ConnManagerParams.setMaxTotalConnections(mgrpar, 1);
ThreadSafeClientConnManager mgr = createTSCCM(mgrpar, null); ThreadSafeClientConnManager mgr = createTSCCM(mgrpar, null);
@ -457,7 +457,7 @@ public class TestTSCCMWithServer extends ServerTestBase {
public void testAbortDuringConnecting() throws Exception { public void testAbortDuringConnecting() throws Exception {
HttpParams mgrpar = defaultParams.copy(); HttpParams mgrpar = defaultParams.copy();
HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); ConnManagerParams.setMaxTotalConnections(mgrpar, 1);
final CountDownLatch connectLatch = new CountDownLatch(1); final CountDownLatch connectLatch = new CountDownLatch(1);
final StallingSocketFactory stallingSocketFactory = new StallingSocketFactory(connectLatch, WaitPolicy.BEFORE_CONNECT, PlainSocketFactory.getSocketFactory()); final StallingSocketFactory stallingSocketFactory = new StallingSocketFactory(connectLatch, WaitPolicy.BEFORE_CONNECT, PlainSocketFactory.getSocketFactory());
@ -521,7 +521,7 @@ public class TestTSCCMWithServer extends ServerTestBase {
public void testAbortBeforeSocketCreate() throws Exception { public void testAbortBeforeSocketCreate() throws Exception {
HttpParams mgrpar = defaultParams.copy(); HttpParams mgrpar = defaultParams.copy();
HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); ConnManagerParams.setMaxTotalConnections(mgrpar, 1);
final CountDownLatch connectLatch = new CountDownLatch(1); final CountDownLatch connectLatch = new CountDownLatch(1);
final StallingSocketFactory stallingSocketFactory = new StallingSocketFactory(connectLatch, WaitPolicy.BEFORE_CREATE, PlainSocketFactory.getSocketFactory()); final StallingSocketFactory stallingSocketFactory = new StallingSocketFactory(connectLatch, WaitPolicy.BEFORE_CREATE, PlainSocketFactory.getSocketFactory());
@ -587,7 +587,7 @@ public class TestTSCCMWithServer extends ServerTestBase {
public void testAbortAfterSocketConnect() throws Exception { public void testAbortAfterSocketConnect() throws Exception {
HttpParams mgrpar = defaultParams.copy(); HttpParams mgrpar = defaultParams.copy();
HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); ConnManagerParams.setMaxTotalConnections(mgrpar, 1);
final CountDownLatch connectLatch = new CountDownLatch(1); final CountDownLatch connectLatch = new CountDownLatch(1);
final StallingSocketFactory stallingSocketFactory = new StallingSocketFactory(connectLatch, WaitPolicy.AFTER_CONNECT, PlainSocketFactory.getSocketFactory()); final StallingSocketFactory stallingSocketFactory = new StallingSocketFactory(connectLatch, WaitPolicy.AFTER_CONNECT, PlainSocketFactory.getSocketFactory());
@ -651,7 +651,7 @@ public class TestTSCCMWithServer extends ServerTestBase {
public void testAbortAfterOperatorOpen() throws Exception { public void testAbortAfterOperatorOpen() throws Exception {
HttpParams mgrpar = defaultParams.copy(); HttpParams mgrpar = defaultParams.copy();
HttpConnectionManagerParams.setMaxTotalConnections(mgrpar, 1); ConnManagerParams.setMaxTotalConnections(mgrpar, 1);
final CountDownLatch connectLatch = new CountDownLatch(1); final CountDownLatch connectLatch = new CountDownLatch(1);
final AtomicReference<StallingOperator> operatorRef = new AtomicReference<StallingOperator>(); final AtomicReference<StallingOperator> operatorRef = new AtomicReference<StallingOperator>();

6
module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestConnPoolByRoute.java
View File

@ -39,7 +39,7 @@ import org.apache.http.HttpHost;
import org.apache.http.conn.ClientConnectionOperator; import org.apache.http.conn.ClientConnectionOperator;
import org.apache.http.conn.ConnectionPoolTimeoutException; import org.apache.http.conn.ConnectionPoolTimeoutException;
import org.apache.http.conn.params.ConnPerRouteBean; 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.routing.HttpRoute;
import org.apache.http.impl.conn.DefaultClientConnectionOperator; import org.apache.http.impl.conn.DefaultClientConnectionOperator;
import org.apache.http.localserver.ServerTestBase; import org.apache.http.localserver.ServerTestBase;
@ -69,7 +69,7 @@ public class TestConnPoolByRoute extends ServerTestBase {
BasicHttpParams params = new BasicHttpParams(); BasicHttpParams params = new BasicHttpParams();
ConnPerRouteBean connPerRoute = new ConnPerRouteBean(3); ConnPerRouteBean connPerRoute = new ConnPerRouteBean(3);
HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, connPerRoute); ConnManagerParams.setMaxConnectionsPerRoute(params, connPerRoute);
ConnPoolByRoute connPool = new ConnPoolByRoute(operator, params); ConnPoolByRoute connPool = new ConnPoolByRoute(operator, params);
try { try {
@ -116,7 +116,7 @@ public class TestConnPoolByRoute extends ServerTestBase {
BasicHttpParams params = new BasicHttpParams(); BasicHttpParams params = new BasicHttpParams();
ConnPerRouteBean connPerRoute = new ConnPerRouteBean(3); ConnPerRouteBean connPerRoute = new ConnPerRouteBean(3);
HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, connPerRoute); ConnManagerParams.setMaxConnectionsPerRoute(params, connPerRoute);
ConnPoolByRoute connPool = new ConnPoolByRoute(operator, params); ConnPoolByRoute connPool = new ConnPoolByRoute(operator, params);
try { try {

6
module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java
View File

@ -48,7 +48,7 @@ import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.scheme.SchemeRegistry; import org.apache.http.conn.scheme.SchemeRegistry;
import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.conn.scheme.SocketFactory;
import org.apache.http.conn.params.ConnPerRouteBean; 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.BasicHttpParams;
import org.apache.http.params.HttpParams; import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams; import org.apache.http.params.HttpProtocolParams;
@ -143,8 +143,8 @@ public class TestSpuriousWakeup extends TestCase {
HttpParams params = new BasicHttpParams(); HttpParams params = new BasicHttpParams();
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1); HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
HttpProtocolParams.setUseExpectContinue(params, false); HttpProtocolParams.setUseExpectContinue(params, false);
HttpConnectionManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1)); ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(1));
HttpConnectionManagerParams.setMaxTotalConnections(params, 1); ConnManagerParams.setMaxTotalConnections(params, 1);
SchemeRegistry schreg = new SchemeRegistry(); SchemeRegistry schreg = new SchemeRegistry();
SocketFactory sf = PlainSocketFactory.getSocketFactory(); SocketFactory sf = PlainSocketFactory.getSocketFactory();