Issue googleapis#842 - Adjusted spacing, dropped ignoreCase on compar…

…ison
egsavage · Oct 20, 2019 · 2cc4fe7 · 2cc4fe7
1 parent af5b469
commit 2cc4fe7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java b/google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java
@@ -334,11 +334,11 @@ public InputStream getContent() throws IOException {
         try {
           // gzip encoding (wrap content with GZipInputStream)
           if (!returnRawInputStream
-                  && this.contentEncoding != null
-                  && (CONTENT_ENCODING_GZIP.equalsIgnoreCase(this.contentEncoding.trim())
-                      || CONTENT_ENCODING_XGZIP.equalsIgnoreCase(this.contentEncoding.trim()))) {
+              && this.contentEncoding != null
+              && (CONTENT_ENCODING_GZIP.equals(this.contentEncoding.trim())
+              || CONTENT_ENCODING_XGZIP.equals(this.contentEncoding.trim()))) {
             lowLevelResponseContent =
-                    new ConsumingInputStream(new GZIPInputStream(lowLevelResponseContent));
+                new ConsumingInputStream(new GZIPInputStream(lowLevelResponseContent));
           }
           // logging (wrap content with LoggingInputStream)
           Logger logger = HttpTransport.LOGGER;

diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpResponseTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpResponseTest.java
@@ -503,20 +503,19 @@ public void testGetContent_otherEncodingWithgzipInItsName_GzipIsNotUsed() throws
     mockResponse.setContentType("text/plain");
 
     HttpTransport transport =
-            new MockHttpTransport() {
+        new MockHttpTransport() {
+          @Override
+          public LowLevelHttpRequest buildRequest(String method, final String url)
+              throws IOException {
+            return new MockLowLevelHttpRequest() {
               @Override
-              public LowLevelHttpRequest buildRequest(String method, final String url)
-                      throws IOException {
-                return new MockLowLevelHttpRequest() {
-                  @Override
-                  public LowLevelHttpResponse execute() throws IOException {
-                    return mockResponse;
-                  }
-                };
+              public LowLevelHttpResponse execute() throws IOException {
+                return mockResponse;
               }
             };
-    HttpRequest request =
-            transport.createRequestFactory().buildHeadRequest(HttpTesting.SIMPLE_GENERIC_URL);
+          }
+        };
+    HttpRequest request = transport.createRequestFactory().buildHeadRequest(HttpTesting.SIMPLE_GENERIC_URL);
     // If gzip was used on this response, an exception would be thrown
     HttpResponse response = request.execute();
     assertEquals("abcd", response.parseAsString());