diff --git a/mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/RecordedRequest.java b/mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/RecordedRequest.java index 2e67151a4..245c661cf 100644 --- a/mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/RecordedRequest.java +++ b/mockwebserver/src/main/java/com/squareup/okhttp/mockwebserver/RecordedRequest.java @@ -16,9 +16,8 @@ package com.squareup.okhttp.mockwebserver; -import com.squareup.okhttp.TlsVersion; -import com.squareup.okhttp.internal.Internal; import com.squareup.okhttp.Headers; +import com.squareup.okhttp.TlsVersion; import java.net.Socket; import java.util.ArrayList; import java.util.List; @@ -135,11 +134,6 @@ public final class RecordedRequest { return sequenceNumber; } - /** @deprecated Use {@link #getTlsVersion()}. */ - public String getSslProtocol() { - return tlsVersion != null ? Internal.instance.tlsVersionJavaName(tlsVersion) : null; - } - /** Returns the connection's TLS version or null if the connection doesn't use SSL. */ public TlsVersion getTlsVersion() { return tlsVersion; diff --git a/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java b/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java index af484fce5..56b55f9da 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java +++ b/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java @@ -120,10 +120,6 @@ public class OkHttpClient implements Cloneable { connection.connectAndSetOwner(client, owner, request); } - @Override public String tlsVersionJavaName(TlsVersion tlsVersion) { - return tlsVersion.javaName; - } - @Override public void callEnqueue(Call call, Callback responseCallback, boolean forWebSocket) { call.enqueue(responseCallback, forWebSocket); diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/Internal.java b/okhttp/src/main/java/com/squareup/okhttp/internal/Internal.java index 2d650b265..d806b483c 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/Internal.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/Internal.java @@ -23,7 +23,6 @@ import com.squareup.okhttp.Headers; import com.squareup.okhttp.OkHttpClient; import com.squareup.okhttp.Protocol; import com.squareup.okhttp.Request; -import com.squareup.okhttp.TlsVersion; import com.squareup.okhttp.internal.http.HttpEngine; import com.squareup.okhttp.internal.http.Transport; import java.io.IOException; @@ -70,8 +69,6 @@ public abstract class Internal { public abstract void connectAndSetOwner(OkHttpClient client, Connection connection, HttpEngine owner, Request request) throws IOException; - public abstract String tlsVersionJavaName(TlsVersion tlsVersion); - // TODO delete the following when web sockets move into the main package. public abstract void callEnqueue(Call call, Callback responseCallback, boolean forWebSocket); public abstract void callEngineReleaseConnection(Call call) throws IOException;