From 9e233ca544cf0475bfed689d25555331a8d1145c Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Wed, 21 May 2014 00:35:51 -0400 Subject: [PATCH] Drop getHeaders() which is redundant with headers(). --- okhttp/src/main/java/com/squareup/okhttp/Request.java | 4 ---- okhttp/src/main/java/com/squareup/okhttp/Route.java | 3 ++- .../java/com/squareup/okhttp/internal/http/HttpTransport.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/okhttp/src/main/java/com/squareup/okhttp/Request.java b/okhttp/src/main/java/com/squareup/okhttp/Request.java index 3465a870b..5d1ec8648 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/Request.java +++ b/okhttp/src/main/java/com/squareup/okhttp/Request.java @@ -90,10 +90,6 @@ public final class Request { return new Builder(this); } - public Headers getHeaders() { - return headers; - } - /** * Returns the cache control directives for this response. This is never null, * even if this response contains no {@code Cache-Control} header. diff --git a/okhttp/src/main/java/com/squareup/okhttp/Route.java b/okhttp/src/main/java/com/squareup/okhttp/Route.java index 197cf101f..b6c42f530 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/Route.java +++ b/okhttp/src/main/java/com/squareup/okhttp/Route.java @@ -60,7 +60,8 @@ public final class Route { * Returns the {@link Proxy} of this route. * * Warning: This may disagree with {@link Address#getProxy} - * is null. When the address's proxy is null, the proxy selector will be used. + * when it is null. When the address's proxy is null, the proxy selector is + * used. */ public Proxy getProxy() { return proxy; diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpTransport.java b/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpTransport.java index 0a1f8a7e3..e60cbcf71 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpTransport.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpTransport.java @@ -94,7 +94,7 @@ public final class HttpTransport implements Transport { String requestLine = RequestLine.get(request, httpEngine.getConnection().getRoute().getProxy().type(), httpEngine.getConnection().getProtocol()); - httpConnection.writeRequest(request.getHeaders(), requestLine); + httpConnection.writeRequest(request.headers(), requestLine); } @Override public Response.Builder readResponseHeaders() throws IOException {