commit 56f5ec305ee9c0983466c525c9ded22382f70305
author brettmorgan <brettmorgan@google.com> Fri Jul 18 16:54:50 2014 -0700
committer Eric Anderson <ejona@google.com> Thu Jan 08 14:42:30 2015 -0800
tree 356810dcc3034ed536fbff7b5073033b66361f61
parent 77d9706bd389e7709d736cc7b5877695c03af25d

Upgrading OKHTTP to v2.0

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=71465711

core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java b/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java
index b60897b..fc974e0 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java
+++ b/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java
@@ -20,7 +20,7 @@
 import com.squareup.okhttp.internal.spdy.FrameReader;
 import com.squareup.okhttp.internal.spdy.Header;
 import com.squareup.okhttp.internal.spdy.HeadersMode;
-import com.squareup.okhttp.internal.spdy.Http20Draft10;
+import com.squareup.okhttp.internal.spdy.Http20Draft12;
 import com.squareup.okhttp.internal.spdy.Settings;
 import com.squareup.okhttp.internal.spdy.Variant;
 
@@ -107,7 +107,7 @@
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
-    Variant variant = new Http20Draft10();
+    Variant variant = new Http20Draft12();
     frameReader = variant.newReader(source, true);
     frameWriter = new AsyncFrameWriter(variant.newWriter(sink, true), this, executor);
 
@@ -222,8 +222,7 @@
         boolean inFinished,
         int streamId,
         int associatedStreamId,
-        int priority,
-        List<Header> headers,
+        List<Header> headerBlock,
         HeadersMode headersMode) {
       // TODO(user): handle received headers.
     }
@@ -273,10 +272,16 @@
     }
 
     @Override
-    public void priority(int streamId, int priority) {
+    public void priority(int streamId, int streamDependency, int weight, boolean exclusive) {
       // Ignore priority change.
       // TODO(user): log
     }
+
+    @Override
+    public void alternateService(int streamId, String origin, ByteString protocol, String host,
+        int port, long maxAge) {
+      // TODO(user): Deal with alternateService propagation
+    }
   }
 
   /**
@@ -294,7 +299,7 @@
         streamId = nextStreamId;
         nextStreamId += 2;
         streams.put(streamId, this);
-        frameWriter.synStream(false, false, streamId, 0, 0, 0,
+        frameWriter.synStream(false, false, streamId, 0,
             Headers.createRequestHeaders(method.getName()));
       }
       deframer = new InputStreamDeframer(inboundMessageHandler());