From 6d296e84b602fa0da4beed7af0eefef2d6bdd349 Mon Sep 17 00:00:00 2001 From: Xudong Ma Date: Mon, 21 Sep 2015 10:39:00 -0700 Subject: [PATCH] Upgrade OkHttp to 2.5 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../{spdy => framed}/OkHttpSettingsUtil.java | 2 +- .../java/io/grpc/okhttp/AsyncFrameWriter.java | 8 ++++---- .../src/main/java/io/grpc/okhttp/Headers.java | 2 +- .../io/grpc/okhttp/OkHttpClientStream.java | 4 ++-- .../io/grpc/okhttp/OkHttpClientTransport.java | 18 +++++++++--------- .../io/grpc/okhttp/OutboundFlowController.java | 2 +- okhttp/src/main/java/io/grpc/okhttp/Utils.java | 2 +- .../grpc/okhttp/OkHttpClientTransportTest.java | 15 +++++++-------- 10 files changed, 28 insertions(+), 29 deletions(-) rename okhttp/src/main/java/com/squareup/okhttp/internal/{spdy => framed}/OkHttpSettingsUtil.java (97%) diff --git a/build.gradle b/build.gradle index 297f443f8b..717ea3c9eb 100644 --- a/build.gradle +++ b/build.gradle @@ -130,7 +130,7 @@ subprojects { jsonp: 'org.glassfish:javax.json:1.0.4', jsr305: 'com.google.code.findbugs:jsr305:3.0.0', oauth_client: 'com.google.auth:google-auth-library-oauth2-http:0.3.0', - okhttp: 'com.squareup.okhttp:okhttp:2.4.0', + okhttp: 'com.squareup.okhttp:okhttp:2.5.0', protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}", protobuf_nano: "com.google.protobuf.nano:protobuf-javanano:${protobufNanoVersion}", protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.7.0', diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3279ebc895..4cbfb745de 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Tue May 12 09:49:30 PDT 2015 +#Mon Sep 21 10:27:21 PDT 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/OkHttpSettingsUtil.java b/okhttp/src/main/java/com/squareup/okhttp/internal/framed/OkHttpSettingsUtil.java similarity index 97% rename from okhttp/src/main/java/com/squareup/okhttp/internal/spdy/OkHttpSettingsUtil.java rename to okhttp/src/main/java/com/squareup/okhttp/internal/framed/OkHttpSettingsUtil.java index b8da93380a..264ca4cbac 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/OkHttpSettingsUtil.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/framed/OkHttpSettingsUtil.java @@ -29,7 +29,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package com.squareup.okhttp.internal.spdy; +package com.squareup.okhttp.internal.framed; /** * A utility class help gRPC get/set the necessary fields of OkHttp's Settings. diff --git a/okhttp/src/main/java/io/grpc/okhttp/AsyncFrameWriter.java b/okhttp/src/main/java/io/grpc/okhttp/AsyncFrameWriter.java index 1a139c7e72..c2be096d2b 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/AsyncFrameWriter.java +++ b/okhttp/src/main/java/io/grpc/okhttp/AsyncFrameWriter.java @@ -33,10 +33,10 @@ package io.grpc.okhttp; import com.google.common.base.Preconditions; -import com.squareup.okhttp.internal.spdy.ErrorCode; -import com.squareup.okhttp.internal.spdy.FrameWriter; -import com.squareup.okhttp.internal.spdy.Header; -import com.squareup.okhttp.internal.spdy.Settings; +import com.squareup.okhttp.internal.framed.ErrorCode; +import com.squareup.okhttp.internal.framed.FrameWriter; +import com.squareup.okhttp.internal.framed.Header; +import com.squareup.okhttp.internal.framed.Settings; import io.grpc.internal.SerializingExecutor; diff --git a/okhttp/src/main/java/io/grpc/okhttp/Headers.java b/okhttp/src/main/java/io/grpc/okhttp/Headers.java index 38e33bd5c3..b90954e685 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/Headers.java +++ b/okhttp/src/main/java/io/grpc/okhttp/Headers.java @@ -37,7 +37,7 @@ import static io.grpc.internal.GrpcUtil.USER_AGENT_KEY; import com.google.common.base.Preconditions; -import com.squareup.okhttp.internal.spdy.Header; +import com.squareup.okhttp.internal.framed.Header; import io.grpc.Metadata; import io.grpc.internal.GrpcUtil; diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java index 9a299b595e..3de99086c1 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java @@ -34,8 +34,8 @@ package io.grpc.okhttp; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import com.squareup.okhttp.internal.spdy.ErrorCode; -import com.squareup.okhttp.internal.spdy.Header; +import com.squareup.okhttp.internal.framed.ErrorCode; +import com.squareup.okhttp.internal.framed.Header; import io.grpc.Metadata; import io.grpc.MethodDescriptor.MethodType; diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java index 7779fb13b3..0f52c9b1bf 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java @@ -41,15 +41,15 @@ import com.google.common.util.concurrent.SettableFuture; import com.squareup.okhttp.ConnectionSpec; import com.squareup.okhttp.OkHttpTlsUpgrader; -import com.squareup.okhttp.internal.spdy.ErrorCode; -import com.squareup.okhttp.internal.spdy.FrameReader; -import com.squareup.okhttp.internal.spdy.FrameWriter; -import com.squareup.okhttp.internal.spdy.Header; -import com.squareup.okhttp.internal.spdy.HeadersMode; -import com.squareup.okhttp.internal.spdy.Http2; -import com.squareup.okhttp.internal.spdy.OkHttpSettingsUtil; -import com.squareup.okhttp.internal.spdy.Settings; -import com.squareup.okhttp.internal.spdy.Variant; +import com.squareup.okhttp.internal.framed.ErrorCode; +import com.squareup.okhttp.internal.framed.FrameReader; +import com.squareup.okhttp.internal.framed.FrameWriter; +import com.squareup.okhttp.internal.framed.Header; +import com.squareup.okhttp.internal.framed.HeadersMode; +import com.squareup.okhttp.internal.framed.Http2; +import com.squareup.okhttp.internal.framed.OkHttpSettingsUtil; +import com.squareup.okhttp.internal.framed.Settings; +import com.squareup.okhttp.internal.framed.Variant; import io.grpc.Metadata; import io.grpc.MethodDescriptor; diff --git a/okhttp/src/main/java/io/grpc/okhttp/OutboundFlowController.java b/okhttp/src/main/java/io/grpc/okhttp/OutboundFlowController.java index 259a5d75e7..3e68b61a16 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OutboundFlowController.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OutboundFlowController.java @@ -39,7 +39,7 @@ import static java.lang.Math.min; import com.google.common.base.Preconditions; -import com.squareup.okhttp.internal.spdy.FrameWriter; +import com.squareup.okhttp.internal.framed.FrameWriter; import okio.Buffer; diff --git a/okhttp/src/main/java/io/grpc/okhttp/Utils.java b/okhttp/src/main/java/io/grpc/okhttp/Utils.java index 2a64e21783..c7201aa273 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/Utils.java +++ b/okhttp/src/main/java/io/grpc/okhttp/Utils.java @@ -31,7 +31,7 @@ package io.grpc.okhttp; -import com.squareup.okhttp.internal.spdy.Header; +import com.squareup.okhttp.internal.framed.Header; import io.grpc.Metadata; import io.grpc.internal.TransportFrameUtil; diff --git a/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java b/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java index ada890f684..165d7d1765 100644 --- a/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java +++ b/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java @@ -63,14 +63,13 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; -import com.squareup.okhttp.ConnectionSpec; -import com.squareup.okhttp.internal.spdy.ErrorCode; -import com.squareup.okhttp.internal.spdy.FrameReader; -import com.squareup.okhttp.internal.spdy.FrameWriter; -import com.squareup.okhttp.internal.spdy.Header; -import com.squareup.okhttp.internal.spdy.HeadersMode; -import com.squareup.okhttp.internal.spdy.OkHttpSettingsUtil; -import com.squareup.okhttp.internal.spdy.Settings; +import com.squareup.okhttp.internal.framed.ErrorCode; +import com.squareup.okhttp.internal.framed.FrameReader; +import com.squareup.okhttp.internal.framed.FrameWriter; +import com.squareup.okhttp.internal.framed.Header; +import com.squareup.okhttp.internal.framed.HeadersMode; +import com.squareup.okhttp.internal.framed.OkHttpSettingsUtil; +import com.squareup.okhttp.internal.framed.Settings; import io.grpc.Metadata; import io.grpc.MethodDescriptor;