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

HTTPCLIENT-712: removed deprecated single proxy constructor 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@606186 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Roland Weber 2007-12-21 13:02:37 +00:00
parent 789bc843c0
commit 2016962d6f
2 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
module-client/src/main/java/org/apache/http/conn/HttpRoute.java
View File

@ -190,29 +190,6 @@ public final class HttpRoute implements Cloneable {
}
/**
* Creates a new route with at most one proxy.
*
* @param target the host to which to route
* @param local the local address to route from, or
* <code>null</code> for the default
* @param proxy the proxy to use, or
* <code>null</code> for a direct route
* @param secure <code>true</code> if the route is (to be) secure,
* <code>false</code> otherwise
* @param tunnelled the tunnel type of this route
* @param layered the layering type of this route
*
* @deprecated use enums instead of boolean for 'tunnelled' and 'layered'
*/
public HttpRoute(HttpHost target, InetAddress local, HttpHost proxy,
boolean secure, boolean tunnelled, boolean layered) {
this(local, target, toChain(proxy), secure,
tunnelled ? TunnelType.TUNNELLED : TunnelType.PLAIN,
layered ? LayerType.LAYERED : LayerType.PLAIN);
}
/**
* Creates a new direct route.
* That is a route without a proxy.

30
module-client/src/test/java/org/apache/http/conn/TestRouteDirector.java
View File

@ -359,18 +359,24 @@ public class TestRouteDirector extends TestCase {
public void testProxyTLS() {
HttpRouteDirector rowdy = new BasicRouteDirector();
HttpRoute route1 = new HttpRoute(TARGET1, null, PROXY1,
false, false, false);
HttpRoute route1t = new HttpRoute(TARGET1, null, PROXY1,
false, true, false);
HttpRoute route1tl = new HttpRoute(TARGET1, null, PROXY1,
false, true, true);
HttpRoute route1s = new HttpRoute(TARGET1, null, PROXY1,
true, false, false);
HttpRoute route1ts = new HttpRoute(TARGET1, null, PROXY1,
true, true, false);
HttpRoute route1tls = new HttpRoute(TARGET1, null, PROXY1,
true, true, true);
HttpRoute route1 = new HttpRoute
(TARGET1, null, PROXY1, false,
TunnelType.PLAIN, LayerType.PLAIN);
HttpRoute route1t = new HttpRoute
(TARGET1, null, PROXY1, false,
TunnelType.TUNNELLED, LayerType.PLAIN);
HttpRoute route1tl = new HttpRoute
(TARGET1, null, PROXY1, false,
TunnelType.TUNNELLED, LayerType.LAYERED);
HttpRoute route1s = new HttpRoute
(TARGET1, null, PROXY1, true,
TunnelType.PLAIN, LayerType.PLAIN);
HttpRoute route1ts = new HttpRoute
(TARGET1, null, PROXY1, true,
TunnelType.TUNNELLED, LayerType.PLAIN);
HttpRoute route1tls = new HttpRoute
(TARGET1, null, PROXY1, true,
TunnelType.TUNNELLED, LayerType.LAYERED);
// we don't consider a route that is layered but not tunnelled