hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1488984 - in /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http: client/protocol/HttpClientContext.java conn/HttpClientConnectionManager.java impl/conn/HttpClientConnectionOperator.java
Date Mon, 03 Jun 2013 13:16:35 GMT
Author: olegk
Date: Mon Jun  3 13:16:35 2013
New Revision: 1488984

URL: http://svn.apache.org/r1488984
Log:
Removed 'http.socket-factory-registry' context attribute from public APIs

Modified:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/HttpClientContext.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpClientConnectionManager.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/HttpClientConnectionOperator.java

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/HttpClientContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/HttpClientContext.java?rev=1488984&r1=1488983&r2=1488984&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/HttpClientContext.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/HttpClientContext.java
Mon Jun  3 13:16:35 2013
@@ -38,7 +38,6 @@ import org.apache.http.client.config.Req
 import org.apache.http.config.Lookup;
 import org.apache.http.conn.routing.HttpRoute;
 import org.apache.http.conn.routing.RouteInfo;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.cookie.CookieOrigin;
 import org.apache.http.cookie.CookieSpec;
 import org.apache.http.cookie.CookieSpecProvider;
@@ -129,12 +128,6 @@ public class HttpClientContext extends H
     public static final String AUTHSCHEME_REGISTRY   = "http.authscheme-registry";
 
     /**
-     * Attribute name of a {@link org.apache.http.config.Lookup} object that represents
-     * the actual {@link ConnectionSocketFactory} registry.
-     */
-    public static final String SOCKET_FACTORY_REGISTRY = "http.socket-factory-registry";
-
-    /**
      * Attribute name of a {@link org.apache.http.client.config.RequestConfig} object that
      * represents the actual request configuration.
      */
@@ -205,14 +198,6 @@ public class HttpClientContext extends H
         setAttribute(AUTHSCHEME_REGISTRY, lookup);
     }
 
-    public Lookup<ConnectionSocketFactory> getSocketFactoryRegistry() {
-        return getLookup(SOCKET_FACTORY_REGISTRY, ConnectionSocketFactory.class);
-    }
-
-    public void setSocketFactoryRegistry(final Lookup<ConnectionSocketFactory> lookup)
{
-        setAttribute(SOCKET_FACTORY_REGISTRY, lookup);
-    }
-
     public CredentialsProvider getCredentialsProvider() {
         return getAttribute(CREDS_PROVIDER, CredentialsProvider.class);
     }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpClientConnectionManager.java?rev=1488984&r1=1488983&r2=1488984&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpClientConnectionManager.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpClientConnectionManager.java
Mon Jun  3 13:16:35 2013
@@ -49,6 +49,7 @@ import org.apache.http.protocol.HttpCont
  */
 public interface HttpClientConnectionManager {
 
+
     /**
      * Returns a new {@link ClientConnectionRequest}, from which a
      * {@link HttpClientConnection} can be obtained or the request can be

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/HttpClientConnectionOperator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/HttpClientConnectionOperator.java?rev=1488984&r1=1488983&r2=1488984&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/HttpClientConnectionOperator.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/HttpClientConnectionOperator.java
Mon Jun  3 13:16:35 2013
@@ -42,7 +42,6 @@ import org.apache.http.config.SocketConf
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.conn.DnsResolver;
 import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.conn.HttpHostConnectException;
 import org.apache.http.conn.ManagedHttpClientConnection;
 import org.apache.http.conn.SchemePortResolver;
 import org.apache.http.conn.UnsupportedSchemeException;
@@ -54,6 +53,8 @@ import org.apache.http.util.Args;
 @Immutable
 class HttpClientConnectionOperator {
 
+    static final String SOCKET_FACTORY_REGISTRY = "http.socket-factory-registry";
+
     private final Log log = LogFactory.getLog(HttpClientConnectionManager.class);
 
     private final Lookup<ConnectionSocketFactory> socketFactoryRegistry;
@@ -75,8 +76,8 @@ class HttpClientConnectionOperator {
 
     @SuppressWarnings("unchecked")
     private Lookup<ConnectionSocketFactory> getSocketFactoryRegistry(final HttpContext
context) {
-        Lookup<ConnectionSocketFactory> reg = (Lookup<ConnectionSocketFactory>)
-            context.getAttribute(HttpClientContext.SOCKET_FACTORY_REGISTRY);
+        Lookup<ConnectionSocketFactory> reg = (Lookup<ConnectionSocketFactory>)
context.getAttribute(
+                SOCKET_FACTORY_REGISTRY);
         if (reg == null) {
             reg = this.socketFactoryRegistry;
         }



Mime
View raw message