Storage: remove reflection to get raw input stream (googleapis#5515)

AI2Hub · Jun 19, 2019 · c3a7a3d · c3a7a3d
1 parent d630cf6
commit c3a7a3d
Showing 1 changed file with 2 additions and 22 deletions.
diff --git a/...ts/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/...ts/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
@@ -33,11 +33,9 @@
 import com.google.api.client.http.HttpResponseException;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.InputStreamContent;
-import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.http.json.JsonHttpContent;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.api.client.util.IOUtils;
 import com.google.api.services.storage.Storage;
 import com.google.api.services.storage.Storage.Objects.Get;
 import com.google.api.services.storage.Storage.Objects.Insert;
@@ -53,7 +51,6 @@
 import com.google.api.services.storage.model.ServiceAccount;
 import com.google.api.services.storage.model.StorageObject;
 import com.google.api.services.storage.model.TestIamPermissionsResponse;
-import com.google.cloud.BaseServiceException;
 import com.google.cloud.Tuple;
 import com.google.cloud.http.CensusHttpModule;
 import com.google.cloud.http.HttpTransportOptions;
@@ -75,7 +72,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Field;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -667,24 +663,8 @@ public Tuple<String, byte[]> read(
       requestHeaders.setRange(range.toString());
       setEncryptionHeaders(requestHeaders, ENCRYPTION_KEY_PREFIX, options);
       ByteArrayOutputStream output = new ByteArrayOutputStream(bytes);
-      HttpResponse httpResponse = req.executeMedia();
-      // todo(mziccard) remove when
-      // https://github.com/googleapis/google-cloud-java/issues/982 is fixed
-      String contentEncoding = httpResponse.getContentEncoding();
-      if (contentEncoding != null && contentEncoding.contains("gzip")) {
-        try {
-          Field responseField = httpResponse.getClass().getDeclaredField("response");
-          responseField.setAccessible(true);
-          LowLevelHttpResponse lowLevelHttpResponse =
-              (LowLevelHttpResponse) responseField.get(httpResponse);
-          IOUtils.copy(lowLevelHttpResponse.getContent(), output);
-        } catch (IllegalAccessException | NoSuchFieldException ex) {
-          throw new StorageException(
-              BaseServiceException.UNKNOWN_CODE, "Error parsing gzip response", ex);
-        }
-      } else {
-        httpResponse.download(output);
-      }
+      req.setReturnRawInputStream(true);
+      req.executeMedia().download(output);
       String etag = req.getLastResponseHeaders().getETag();
       return Tuple.of(etag, output.toByteArray());
     } catch (IOException ex) {