Merge Job into Call. CallTest = AsyncApiTest + SyncApiTest.

dr460neye · Apr 25, 2014 · 63d4dfa · 63d4dfa
1 parent f4c83e8
commit 63d4dfa
Show file tree

Hide file tree

Showing 14 changed files with 728 additions and 689 deletions.
diff --git a/benchmarks/src/main/java/com/squareup/okhttp/benchmarks/OkHttpAsync.java b/benchmarks/src/main/java/com/squareup/okhttp/benchmarks/OkHttpAsync.java
@@ -84,7 +84,7 @@ class OkHttpAsync implements HttpClient {
 
   @Override public void enqueue(URL url) throws Exception {
     requestsInFlight.incrementAndGet();
-    client.call(new Request.Builder().tag(System.nanoTime()).url(url).build()).execute(callback);
+    client.newCall(new Request.Builder().tag(System.nanoTime()).url(url).build()).execute(callback);
   }
 
   @Override public synchronized boolean acceptingJobs() {

diff --git a/okcurl/src/main/java/com/squareup/okhttp/curl/Main.java b/okcurl/src/main/java/com/squareup/okhttp/curl/Main.java
@@ -126,7 +126,7 @@ private static String protocols() {
     client = createClient();
     Request request = createRequest();
     try {
-      Response response = client.execute(request);
+      Response response = client.newCall(request).execute();
       if (showHeaders) {
         System.out.println(StatusLine.get(response));
         Headers headers = response.headers();

diff --git a/okhttp-apache/src/main/java/com/squareup/okhttp/apache/OkApacheClient.java b/okhttp-apache/src/main/java/com/squareup/okhttp/apache/OkApacheClient.java
@@ -159,7 +159,7 @@ public OkApacheClient(OkHttpClient client) {
   @Override public HttpResponse execute(HttpHost host, HttpRequest request, HttpContext context)
       throws IOException {
     Request okRequest = transformRequest(request);
-    Response okResponse = client.execute(okRequest);
+    Response okResponse = client.newCall(okRequest).execute();
     return transformResponse(okResponse);
   }