Remove Request#urlString(), just use url().toString().

okcurl/src/test/java/com/squareup/okhttp/curl/MainTest.java

@@ -29,14 +29,14 @@ public class MainTest {
   @Test public void simple() {
     Request request = fromArgs("http://example.com").createRequest();
     assertEquals("GET", request.method());
-    assertEquals("http://example.com/", request.urlString());
+    assertEquals("http://example.com/", request.url().toString());
     assertNull(request.body());
   }
 
   @Test public void put() throws IOException {
     Request request = fromArgs("-X", "PUT", "-d", "foo", "http://example.com").createRequest();
     assertEquals("PUT", request.method());
-    assertEquals("http://example.com/", request.urlString());
+    assertEquals("http://example.com/", request.url().toString());
     assertEquals(3, request.body().contentLength());
   }
 
@@ -44,7 +44,7 @@ public class MainTest {
     Request request = fromArgs("-d", "foo", "http://example.com").createRequest();
     RequestBody body = request.body();
     assertEquals("POST", request.method());
-    assertEquals("http://example.com/", request.urlString());
+    assertEquals("http://example.com/", request.url().toString());
     assertEquals("application/x-www-form-urlencoded; charset=utf-8", body.contentType().toString());
     assertEquals("foo", bodyAsString(body));
   }
@@ -53,7 +53,7 @@ public class MainTest {
     Request request = fromArgs("-d", "foo", "-X", "PUT", "http://example.com").createRequest();
     RequestBody body = request.body();
     assertEquals("PUT", request.method());
-    assertEquals("http://example.com/", request.urlString());
+    assertEquals("http://example.com/", request.url().toString());
     assertEquals("application/x-www-form-urlencoded; charset=utf-8", body.contentType().toString());
     assertEquals("foo", bodyAsString(body));
   }
@@ -63,7 +63,7 @@ public class MainTest {
         "http://example.com").createRequest();
     RequestBody body = request.body();
     assertEquals("POST", request.method());
-    assertEquals("http://example.com/", request.urlString());
+    assertEquals("http://example.com/", request.url().toString());
     assertEquals("application/json; charset=utf-8", body.contentType().toString());
     assertEquals("foo", bodyAsString(body));
   }
@@ -71,7 +71,7 @@ public class MainTest {
   @Test public void referer() {
     Request request = fromArgs("-e", "foo", "http://example.com").createRequest();
     assertEquals("GET", request.method());
-    assertEquals("http://example.com/", request.urlString());
+    assertEquals("http://example.com/", request.url().toString());
     assertEquals("foo", request.header("Referer"));
     assertNull(request.body());
   }
@@ -79,7 +79,7 @@ public class MainTest {
   @Test public void userAgent() {
     Request request = fromArgs("-A", "foo", "http://example.com").createRequest();
     assertEquals("GET", request.method());
-    assertEquals("http://example.com/", request.urlString());
+    assertEquals("http://example.com/", request.url().toString());
     assertEquals("foo", request.header("User-Agent"));
     assertNull(request.body());
   }

okhttp-logging-interceptor/src/main/java/com/squareup/okhttp/logging/HttpLoggingInterceptor.java

@@ -206,7 +206,7 @@ public final class HttpLoggingInterceptor implements Interceptor {
 
     ResponseBody responseBody = response.body();
     logger.log("<-- " + response.code() + ' ' + response.message() + ' '
-        + response.request().urlString() + " (" + tookMs + "ms" + (!logHeaders ? ", "
+        + response.request().url() + " (" + tookMs + "ms" + (!logHeaders ? ", "
         + responseBody.contentLength() + "-byte body" : "") + ')');
 
     if (logHeaders) {

okhttp-tests/src/test/java/com/squareup/okhttp/DispatcherTest.java

@@ -132,7 +132,7 @@ public final class DispatcherTest {
     public void assertJobs(String... expectedUrls) {
       List<String> actualUrls = new ArrayList<>();
       for (AsyncCall call : calls) {
-        actualUrls.add(call.request().urlString());
+        actualUrls.add(call.request().url().toString());
       }
       assertEquals(Arrays.asList(expectedUrls), actualUrls);
     }
@@ -140,7 +140,7 @@ public final class DispatcherTest {
     public void finishJob(String url) {
       for (Iterator<AsyncCall> i = calls.iterator(); i.hasNext(); ) {
         AsyncCall call = i.next();
-        if (call.request().urlString().equals(url)) {
+        if (call.request().url().toString().equals(url)) {
           i.remove();
           dispatcher.finished(call);
           return;

okhttp-ws/src/main/java/com/squareup/okhttp/ws/WebSocketCall.java

@@ -158,7 +158,7 @@ public final class WebSocketCall {
   private static class StreamWebSocket extends RealWebSocket {
     static RealWebSocket create(StreamAllocation streamAllocation, Response response,
         Random random, WebSocketListener listener) {
-      String url = response.request().urlString();
+      String url = response.request().url().toString();
       ThreadPoolExecutor replyExecutor =
           new ThreadPoolExecutor(1, 1, 1, SECONDS, new LinkedBlockingDeque<Runnable>(),
               Util.threadFactory(String.format("OkHttp %s WebSocket", url), true));

okhttp/src/main/java/com/squareup/okhttp/Cache.java

@@ -173,7 +173,7 @@ public final class Cache {
   }
 
   private static String urlToKey(Request request) {
-    return Util.md5Hex(request.urlString());
+    return Util.md5Hex(request.url().toString());
   }
 
   Response get(Request request) {
@@ -565,7 +565,7 @@ public final class Cache {
     }
 
     public Entry(Response response) {
-      this.url = response.request().urlString();
+      this.url = response.request().url().toString();
       this.varyHeaders = OkHeaders.varyHeaders(response);
       this.requestMethod = response.request().method();
       this.protocol = response.protocol();
@@ -652,7 +652,7 @@ public final class Cache {
     }
 
     public boolean matches(Request request, Response response) {
-      return url.equals(request.urlString())
+      return url.equals(request.url().toString())
           && requestMethod.equals(request.method())
           && OkHeaders.varyMatches(response, varyHeaders, request);
     }

okhttp/src/main/java/com/squareup/okhttp/Call.java

@@ -140,7 +140,7 @@ public class Call {
     private final boolean forWebSocket;
 
     private AsyncCall(Callback responseCallback, boolean forWebSocket) {
-      super("OkHttp %s", originalRequest.urlString());
+      super("OkHttp %s", originalRequest.url().toString());
       this.responseCallback = responseCallback;
       this.forWebSocket = forWebSocket;
     }

okhttp/src/main/java/com/squareup/okhttp/Request.java

@@ -56,10 +56,6 @@ public final class Request {
     }
   }
 
-  public String urlString() {
-    return url.toString();
-  }
-
   public String method() {
     return method;
   }

okhttp/src/main/java/com/squareup/okhttp/Response.java

@@ -214,7 +214,7 @@ public final class Response {
         + ", message="
         + message
         + ", url="
-        + request.urlString()
+        + request.url()
         + '}';
   }
 

samples/guide/src/main/java/com/squareup/okhttp/recipes/LoggingInterceptors.java

@@ -32,12 +32,12 @@ public final class LoggingInterceptors {
         long t1 = System.nanoTime();
         Request request = chain.request();
         logger.info(String.format("Sending request %s on %s%n%s",
-            request.uri(), chain.connection(), request.headers()));
+            request.url(), chain.connection(), request.headers()));
         Response response = chain.proceed(request);
 
         long t2 = System.nanoTime();
         logger.info(String.format("Received response for %s in %.1fms%n%s",
-            request.uri(), (t2 - t1) / 1e6d, response.headers()));
+            request.url(), (t2 - t1) / 1e6d, response.headers()));
         return response;
       }
     });