android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-18 20:40:58 +03:00
Code Releases Activity

Merge pull request #794 from square/jwilson_0503_routedb

Browse Source 
Hide route database.
This commit is contained in:
Jesse Wilson
2014-05-04 09:35:08 -04:00
parent cf17703158 0466edb4ad
commit cd7cd8ffed
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/RouteSelectorTest.java
View File

@@ -20,7 +20,7 @@ import com.squareup.okhttp.Connection;
import com.squareup.okhttp.ConnectionPool;
import com.squareup.okhttp.OkAuthenticator;
import com.squareup.okhttp.Protocol;
import com.squareup.okhttp.RouteDatabase;
import com.squareup.okhttp.internal.RouteDatabase;
import com.squareup.okhttp.internal.Dns;
import com.squareup.okhttp.internal.SslContextBuilder;
import com.squareup.okhttp.internal.huc.AuthenticatorAdapter;

7
okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
View File

@@ -17,6 +17,7 @@ package com.squareup.okhttp;
import com.squareup.okhttp.internal.Internal;
import com.squareup.okhttp.internal.InternalCache;
import com.squareup.okhttp.internal.RouteDatabase;
import com.squareup.okhttp.internal.Util;
import com.squareup.okhttp.internal.http.HttpEngine;
import com.squareup.okhttp.internal.http.Transport;
@@ -127,6 +128,10 @@ public final class OkHttpClient implements URLStreamHandlerFactory, Cloneable {
@Override public void share(ConnectionPool connectionPool, Connection connection) {
connectionPool.share(connection);
}
@Override public RouteDatabase routeDatabase(OkHttpClient client) {
return client.routeDatabase;
}
};
}
@@ -381,7 +386,7 @@ public final class OkHttpClient implements URLStreamHandlerFactory, Cloneable {
return followSslRedirects;
}
public RouteDatabase getRoutesDatabase() {
RouteDatabase getRoutesDatabase() {
return routeDatabase;
}

2
okhttp/src/main/java/com/squareup/okhttp/internal/Internal.java
View File

@@ -70,4 +70,6 @@ public abstract class Internal {
public abstract void recycle(ConnectionPool pool, Connection connection);
public abstract void share(ConnectionPool connectionPool, Connection connection);
public abstract RouteDatabase routeDatabase(OkHttpClient client);
}

3
okhttp/src/main/java/com/squareup/okhttp/RouteDatabase.java → okhttp/src/main/java/com/squareup/okhttp/internal/RouteDatabase.java
View File

@@ -13,8 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.squareup.okhttp;
package com.squareup.okhttp.internal;
import com.squareup.okhttp.Route;
import java.util.LinkedHashSet;
import java.util.Set;

4
okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
View File

@@ -260,7 +260,7 @@ public final class HttpEngine {
client.getSocketFactory(), sslSocketFactory, hostnameVerifier, client.getAuthenticator(),
client.getProxy(), client.getProtocols());
routeSelector = new RouteSelector(address, request.uri(), client.getProxySelector(),
client.getConnectionPool(), Dns.DEFAULT, client.getRoutesDatabase());
client.getConnectionPool(), Dns.DEFAULT, Internal.instance.routeDatabase(client));
}
connection = routeSelector.next(request.method());
@@ -272,7 +272,7 @@ public final class HttpEngine {
if (Internal.instance.isSpdy(connection)) {
Internal.instance.share(client.getConnectionPool(), connection);
}
client.getRoutesDatabase().connected(connection.getRoute());
Internal.instance.routeDatabase(client).connected(connection.getRoute());
}
Internal.instance.setTimeouts(connection, client.getReadTimeout(), client.getWriteTimeout());
route = connection.getRoute();

2
okhttp/src/main/java/com/squareup/okhttp/internal/http/RouteSelector.java
View File

@@ -19,7 +19,7 @@ import com.squareup.okhttp.Address;
import com.squareup.okhttp.Connection;
import com.squareup.okhttp.ConnectionPool;
import com.squareup.okhttp.Route;
import com.squareup.okhttp.RouteDatabase;
import com.squareup.okhttp.internal.RouteDatabase;
import com.squareup.okhttp.internal.Dns;
import com.squareup.okhttp.internal.Internal;
import java.io.IOException;