android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-12-03 18:31:17 +03:00
Code Releases Activity

Cleanup HttpLoggingInterceptor (#4346)

Browse Source 
* Use try-with-resources

* Make bodyHasUnknownEncoding() static

* Fix nits in HttpLoggingInterceptorTest

* Revert "Use try-with-resources"

This reverts commit 57dcd61a9e.
This commit is contained in:
Amir Livneh
2018-11-14 23:29:45 -05:00
committed by Jesse Wilson
parent ef34a41d09
commit 1f7e796e6e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
okhttp-logging-interceptor/src/main/java/okhttp3/logging/HttpLoggingInterceptor.java
View File

@@ -326,7 +326,7 @@ public final class HttpLoggingInterceptor implements Interceptor {
} }
} }
private boolean bodyHasUnknownEncoding(Headers headers) { private static boolean bodyHasUnknownEncoding(Headers headers) {
String contentEncoding = headers.get("Content-Encoding"); String contentEncoding = headers.get("Content-Encoding");
return contentEncoding != null return contentEncoding != null
&& !contentEncoding.equalsIgnoreCase("identity") && !contentEncoding.equalsIgnoreCase("identity")

6
okhttp-logging-interceptor/src/test/java/okhttp3/logging/HttpLoggingInterceptorTest.java
View File

@@ -59,8 +59,8 @@ public final class HttpLoggingInterceptorTest {
@Rule public final MockWebServer server = new MockWebServer(); @Rule public final MockWebServer server = new MockWebServer();
private HandshakeCertificates handshakeCertificates = localhost(); private final HandshakeCertificates handshakeCertificates = localhost();
private HostnameVerifier hostnameVerifier = new RecordingHostnameVerifier(); private final HostnameVerifier hostnameVerifier = new RecordingHostnameVerifier();
private OkHttpClient client; private OkHttpClient client;
private String host; private String host;
private HttpUrl url; private HttpUrl url;
@@ -650,7 +650,7 @@ public final class HttpLoggingInterceptorTest {
.assertNoMoreLogs(); .assertNoMoreLogs();
} }
@Test public void isPlaintext() throws IOException { @Test public void isPlaintext() {
assertTrue(HttpLoggingInterceptor.isPlaintext(new Buffer())); assertTrue(HttpLoggingInterceptor.isPlaintext(new Buffer()));
assertTrue(HttpLoggingInterceptor.isPlaintext(new Buffer().writeUtf8("abc"))); assertTrue(HttpLoggingInterceptor.isPlaintext(new Buffer().writeUtf8("abc")));
assertTrue(HttpLoggingInterceptor.isPlaintext(new Buffer().writeUtf8("new\r\nlines"))); assertTrue(HttpLoggingInterceptor.isPlaintext(new Buffer().writeUtf8("new\r\nlines")));