hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rola...@apache.org
Subject svn commit: r606186 - in /httpcomponents/httpclient/trunk/module-client/src: main/java/org/apache/http/conn/HttpRoute.java test/java/org/apache/http/conn/TestRouteDirector.java
Date Fri, 21 Dec 2007 13:02:38 GMT
Author: rolandw
Date: Fri Dec 21 05:02:37 2007
New Revision: 606186

URL: http://svn.apache.org/viewvc?rev=606186&view=rev
Log:
HTTPCLIENT-712: removed deprecated single proxy constructor

Modified:
    httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/HttpRoute.java
    httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/conn/TestRouteDirector.java

Modified: httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/HttpRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/HttpRoute.java?rev=606186&r1=606185&r2=606186&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/HttpRoute.java
(original)
+++ httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/conn/HttpRoute.java
Fri Dec 21 05:02:37 2007
@@ -191,29 +191,6 @@
 
 
     /**
-     * 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.
      *

Modified: httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/conn/TestRouteDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/conn/TestRouteDirector.java?rev=606186&r1=606185&r2=606186&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/conn/TestRouteDirector.java
(original)
+++ httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/conn/TestRouteDirector.java
Fri Dec 21 05:02:37 2007
@@ -359,18 +359,24 @@
     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
 



Mime
View raw message