From b33d553546b77243975ae06e218d4708260d57e1 Mon Sep 17 00:00:00 2001 From: Eric Gribkoff Date: Tue, 8 Aug 2017 12:19:53 -0700 Subject: [PATCH] okhttp,interop-testing: use forked OkHttp classes --- .../grpc/testing/integration/Http2OkHttpTest.java | 5 ++--- .../java/io/grpc/okhttp/OkHttpChannelBuilder.java | 6 +++--- .../io/grpc/okhttp/OkHttpProtocolNegotiator.java | 4 +--- .../main/java/io/grpc/okhttp/OkHttpTlsUpgrader.java | 5 +---- okhttp/src/main/java/io/grpc/okhttp/Utils.java | 13 ++++++------- .../io/grpc/okhttp/OkHttpChannelBuilderTest.java | 2 +- okhttp/src/test/java/io/grpc/okhttp/UtilsTest.java | 10 ++++++---- 7 files changed, 20 insertions(+), 25 deletions(-) diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java index a6c0c67fb54..da4ac48c451 100644 --- a/interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java +++ b/interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java @@ -22,15 +22,15 @@ import com.google.common.base.Throwables; import com.google.protobuf.EmptyProtos.Empty; -import com.squareup.okhttp.ConnectionSpec; -import com.squareup.okhttp.TlsVersion; import io.grpc.ManagedChannel; import io.grpc.internal.GrpcUtil; import io.grpc.internal.testing.TestUtils; import io.grpc.netty.GrpcSslContexts; import io.grpc.netty.NettyServerBuilder; import io.grpc.okhttp.OkHttpChannelBuilder; +import io.grpc.okhttp.internal.ConnectionSpec; import io.grpc.okhttp.internal.Platform; +import io.grpc.okhttp.internal.TlsVersion; import io.grpc.stub.StreamObserver; import io.grpc.testing.StreamRecorder; import io.netty.handler.ssl.OpenSsl; @@ -42,7 +42,6 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLPeerUnverifiedException; import javax.net.ssl.SSLSession; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java index 0f0ae2afdc7..55a389a12db 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java @@ -22,9 +22,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import com.squareup.okhttp.CipherSuite; -import com.squareup.okhttp.ConnectionSpec; -import com.squareup.okhttp.TlsVersion; import io.grpc.Attributes; import io.grpc.ExperimentalApi; import io.grpc.Internal; @@ -37,7 +34,10 @@ import io.grpc.internal.KeepAliveManager; import io.grpc.internal.SharedResourceHolder; import io.grpc.internal.SharedResourceHolder.Resource; +import io.grpc.okhttp.internal.CipherSuite; +import io.grpc.okhttp.internal.ConnectionSpec; import io.grpc.okhttp.internal.Platform; +import io.grpc.okhttp.internal.TlsVersion; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.security.GeneralSecurityException; diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpProtocolNegotiator.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpProtocolNegotiator.java index ebbf58526a1..30a686fe6c7 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpProtocolNegotiator.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpProtocolNegotiator.java @@ -31,9 +31,7 @@ import javax.annotation.Nullable; import javax.net.ssl.SSLSocket; -/** - * A helper class located in package com.squareup.okhttp.internal for TLS negotiation. - */ +/** A helper class for TLS negotiation. */ class OkHttpProtocolNegotiator { private static final Platform DEFAULT_PLATFORM = Platform.get(); private static OkHttpProtocolNegotiator NEGOTIATOR = diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpTlsUpgrader.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpTlsUpgrader.java index 4044ec26259..cc7260b85b3 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpTlsUpgrader.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpTlsUpgrader.java @@ -31,10 +31,7 @@ import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; -/** - * A helper class that located in package com.squareup.okhttp, so that we can use OkHttp internals - * to do TLS upgrading. - */ +/** A helper class so that we can use OkHttp internals to do TLS upgrading. */ final class OkHttpTlsUpgrader { /* diff --git a/okhttp/src/main/java/io/grpc/okhttp/Utils.java b/okhttp/src/main/java/io/grpc/okhttp/Utils.java index 6ab5d9a0161..b69d78e4f32 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/Utils.java +++ b/okhttp/src/main/java/io/grpc/okhttp/Utils.java @@ -51,22 +51,21 @@ private static byte[][] convertHeadersToArray(List
http2Headers) { } /** - * Converts an instance of {@link com.squareup.okhttp.ConnectionSpec} for a secure connection into - * that of {@link ConnectionSpec} in the current package. + * Converts an instance of {@link io.grpc.okhttp.internal.ConnectionSpec} for a secure connection + * into that of {@link ConnectionSpec} in the current package. * - * @throws IllegalArgumentException - * If {@code spec} is not with TLS + * @throws IllegalArgumentException If {@code spec} is not with TLS */ - static ConnectionSpec convertSpec(com.squareup.okhttp.ConnectionSpec spec) { + static ConnectionSpec convertSpec(io.grpc.okhttp.internal.ConnectionSpec spec) { Preconditions.checkArgument(spec.isTls(), "plaintext ConnectionSpec is not accepted"); - List tlsVersionList = spec.tlsVersions(); + List tlsVersionList = spec.tlsVersions(); String[] tlsVersions = new String[tlsVersionList.size()]; for (int i = 0; i < tlsVersions.length; i++) { tlsVersions[i] = tlsVersionList.get(i).javaName(); } - List cipherSuiteList = spec.cipherSuites(); + List cipherSuiteList = spec.cipherSuites(); CipherSuite[] cipherSuites = new CipherSuite[cipherSuiteList.size()]; for (int i = 0; i < cipherSuites.length; i++) { cipherSuites[i] = CipherSuite.valueOf(cipherSuiteList.get(i).name()); diff --git a/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java b/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java index d638042191a..081485fc1cb 100644 --- a/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java +++ b/okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java @@ -20,9 +20,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import com.squareup.okhttp.ConnectionSpec; import io.grpc.NameResolver; import io.grpc.internal.GrpcUtil; +import io.grpc.okhttp.internal.ConnectionSpec; import java.net.InetSocketAddress; import org.junit.Rule; import org.junit.Test; diff --git a/okhttp/src/test/java/io/grpc/okhttp/UtilsTest.java b/okhttp/src/test/java/io/grpc/okhttp/UtilsTest.java index 35ca1ae6893..f56075920f5 100644 --- a/okhttp/src/test/java/io/grpc/okhttp/UtilsTest.java +++ b/okhttp/src/test/java/io/grpc/okhttp/UtilsTest.java @@ -40,7 +40,8 @@ public class UtilsTest { @Test public void convertSpecRejectsPlaintext() { - com.squareup.okhttp.ConnectionSpec plaintext = com.squareup.okhttp.ConnectionSpec.CLEARTEXT; + io.grpc.okhttp.internal.ConnectionSpec plaintext = + io.grpc.okhttp.internal.ConnectionSpec.CLEARTEXT; thrown.expect(IllegalArgumentException.class); thrown.expectMessage("plaintext ConnectionSpec is not accepted"); Utils.convertSpec(plaintext); @@ -48,13 +49,14 @@ public void convertSpecRejectsPlaintext() { @Test public void convertSpecKeepsAllData() { - com.squareup.okhttp.ConnectionSpec squareSpec = com.squareup.okhttp.ConnectionSpec.MODERN_TLS; + io.grpc.okhttp.internal.ConnectionSpec squareSpec = + io.grpc.okhttp.internal.ConnectionSpec.MODERN_TLS; ConnectionSpec spec = Utils.convertSpec(squareSpec); - List squareTlsVersions = squareSpec.tlsVersions(); + List squareTlsVersions = squareSpec.tlsVersions(); List tlsVersions = spec.tlsVersions(); int versionsSize = squareTlsVersions.size(); - List squareCipherSuites = squareSpec.cipherSuites(); + List squareCipherSuites = squareSpec.cipherSuites(); List cipherSuites = spec.cipherSuites(); int cipherSuitesSize = squareCipherSuites.size();