From 8f03548249d3292ab95fc5cf016b51133705e771 Mon Sep 17 00:00:00 2001 From: jwilson Date: Tue, 3 Sep 2013 11:13:03 -0400 Subject: [PATCH] Fix checkstyle issues in new Cookie code. --- .../okhttp/internal/http/RequestHeaders.java | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/http/RequestHeaders.java b/okhttp/src/main/java/com/squareup/okhttp/internal/http/RequestHeaders.java index 58b81d1d6..71c3cd0f2 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/http/RequestHeaders.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/http/RequestHeaders.java @@ -294,27 +294,24 @@ public final class RequestHeaders { public void addCookies(Map> allCookieHeaders) { for (Map.Entry> entry : allCookieHeaders.entrySet()) { String key = entry.getKey(); - if ("Cookie".equalsIgnoreCase(key) || "Cookie2".equalsIgnoreCase(key)) { - if (!entry.getValue().isEmpty()) { - headers.add(key, buildCookieHeader(entry.getValue())); - } + if (("Cookie".equalsIgnoreCase(key) || "Cookie2".equalsIgnoreCase(key)) + && !entry.getValue().isEmpty()) { + headers.add(key, buildCookieHeader(entry.getValue())); } } } - // format has defined here: http://tools.ietf.org/html/rfc6265#section-4.2.1 + /** + * Send all cookies in one big header, as recommended by + * RFC 6265. + */ private String buildCookieHeader(List cookies) { - if(1 == cookies.size()) { - return cookies.get(0); - } + if (cookies.size() == 1) return cookies.get(0); StringBuilder sb = new StringBuilder(); - for(int i=0;i < cookies.size();i++) { - if(i>0) { - sb.append("; "); - } + for (int i = 0; i < cookies.size(); i++) { + if (i > 0) sb.append("; "); sb.append(cookies.get(i)); } return sb.toString(); - } - + } }