grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade OkHttp to 2.5

This commit is contained in:
Xudong Ma 2015-09-21 10:39:00 -07:00
parent b1430aeda8
commit 6d296e84b6
10 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -130,7 +130,7 @@ subprojects {
jsonp: 'org.glassfish:javax.json:1.0.4', jsonp: 'org.glassfish:javax.json:1.0.4',
jsr305: 'com.google.code.findbugs:jsr305:3.0.0', jsr305: 'com.google.code.findbugs:jsr305:3.0.0',
oauth_client: 'com.google.auth:google-auth-library-oauth2-http:0.3.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: "com.google.protobuf:protobuf-java:${protobufVersion}",
protobuf_nano: "com.google.protobuf.nano:protobuf-javanano:${protobufNanoVersion}", protobuf_nano: "com.google.protobuf.nano:protobuf-javanano:${protobufNanoVersion}",
protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.7.0', protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.7.0',

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,4 +1,4 @@
#Tue May 12 09:49:30 PDT 2015 #Mon Sep 21 10:27:21 PDT 2015
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

2
okhttp/src/main/java/com/squareup/okhttp/internal/spdy/OkHttpSettingsUtil.java → okhttp/src/main/java/com/squareup/okhttp/internal/framed/OkHttpSettingsUtil.java
View File

@ -29,7 +29,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 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. * A utility class help gRPC get/set the necessary fields of OkHttp's Settings.

8
okhttp/src/main/java/io/grpc/okhttp/AsyncFrameWriter.java
View File

@ -33,10 +33,10 @@ package io.grpc.okhttp;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.squareup.okhttp.internal.spdy.ErrorCode; import com.squareup.okhttp.internal.framed.ErrorCode;
import com.squareup.okhttp.internal.spdy.FrameWriter; import com.squareup.okhttp.internal.framed.FrameWriter;
import com.squareup.okhttp.internal.spdy.Header; import com.squareup.okhttp.internal.framed.Header;
import com.squareup.okhttp.internal.spdy.Settings; import com.squareup.okhttp.internal.framed.Settings;
import io.grpc.internal.SerializingExecutor; import io.grpc.internal.SerializingExecutor;

2
okhttp/src/main/java/io/grpc/okhttp/Headers.java
View File

@ -37,7 +37,7 @@ import static io.grpc.internal.GrpcUtil.USER_AGENT_KEY;
import com.google.common.base.Preconditions; 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.Metadata;
import io.grpc.internal.GrpcUtil; import io.grpc.internal.GrpcUtil;

4
okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java
View File

@ -34,8 +34,8 @@ package io.grpc.okhttp;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Preconditions.checkState;
import com.squareup.okhttp.internal.spdy.ErrorCode; import com.squareup.okhttp.internal.framed.ErrorCode;
import com.squareup.okhttp.internal.spdy.Header; import com.squareup.okhttp.internal.framed.Header;
import io.grpc.Metadata; import io.grpc.Metadata;
import io.grpc.MethodDescriptor.MethodType; import io.grpc.MethodDescriptor.MethodType;

18
okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
View File

@ -41,15 +41,15 @@ import com.google.common.util.concurrent.SettableFuture;
import com.squareup.okhttp.ConnectionSpec; import com.squareup.okhttp.ConnectionSpec;
import com.squareup.okhttp.OkHttpTlsUpgrader; import com.squareup.okhttp.OkHttpTlsUpgrader;
import com.squareup.okhttp.internal.spdy.ErrorCode; import com.squareup.okhttp.internal.framed.ErrorCode;
import com.squareup.okhttp.internal.spdy.FrameReader; import com.squareup.okhttp.internal.framed.FrameReader;
import com.squareup.okhttp.internal.spdy.FrameWriter; import com.squareup.okhttp.internal.framed.FrameWriter;
import com.squareup.okhttp.internal.spdy.Header; import com.squareup.okhttp.internal.framed.Header;
import com.squareup.okhttp.internal.spdy.HeadersMode; import com.squareup.okhttp.internal.framed.HeadersMode;
import com.squareup.okhttp.internal.spdy.Http2; import com.squareup.okhttp.internal.framed.Http2;
import com.squareup.okhttp.internal.spdy.OkHttpSettingsUtil; import com.squareup.okhttp.internal.framed.OkHttpSettingsUtil;
import com.squareup.okhttp.internal.spdy.Settings; import com.squareup.okhttp.internal.framed.Settings;
import com.squareup.okhttp.internal.spdy.Variant; import com.squareup.okhttp.internal.framed.Variant;
import io.grpc.Metadata; import io.grpc.Metadata;
import io.grpc.MethodDescriptor; import io.grpc.MethodDescriptor;

2
okhttp/src/main/java/io/grpc/okhttp/OutboundFlowController.java
View File

@ -39,7 +39,7 @@ import static java.lang.Math.min;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.squareup.okhttp.internal.spdy.FrameWriter; import com.squareup.okhttp.internal.framed.FrameWriter;
import okio.Buffer; import okio.Buffer;

2
okhttp/src/main/java/io/grpc/okhttp/Utils.java
View File

@ -31,7 +31,7 @@
package io.grpc.okhttp; 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.Metadata;
import io.grpc.internal.TransportFrameUtil; import io.grpc.internal.TransportFrameUtil;

15
okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java
View File

@ -63,14 +63,13 @@ import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.SettableFuture;
import com.squareup.okhttp.ConnectionSpec; import com.squareup.okhttp.internal.framed.ErrorCode;
import com.squareup.okhttp.internal.spdy.ErrorCode; import com.squareup.okhttp.internal.framed.FrameReader;
import com.squareup.okhttp.internal.spdy.FrameReader; import com.squareup.okhttp.internal.framed.FrameWriter;
import com.squareup.okhttp.internal.spdy.FrameWriter; import com.squareup.okhttp.internal.framed.Header;
import com.squareup.okhttp.internal.spdy.Header; import com.squareup.okhttp.internal.framed.HeadersMode;
import com.squareup.okhttp.internal.spdy.HeadersMode; import com.squareup.okhttp.internal.framed.OkHttpSettingsUtil;
import com.squareup.okhttp.internal.spdy.OkHttpSettingsUtil; import com.squareup.okhttp.internal.framed.Settings;
import com.squareup.okhttp.internal.spdy.Settings;
import io.grpc.Metadata; import io.grpc.Metadata;
import io.grpc.MethodDescriptor; import io.grpc.MethodDescriptor;