Narrowing dependencies to avoid servlet-api (#1766)

garrettjonesgoogle · web-flow · commit 18d5d8fd6942 · 2017-03-17T11:28:27.000-07:00
diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml
@@ -52,7 +52,19 @@
     </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>
-      <artifactId>google-api-client-appengine</artifactId>
+      <artifactId>google-api-client</artifactId>
+      <version>1.21.0</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>guava-jdk5</artifactId>
+          <groupId>com.google.guava</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client-appengine</artifactId>
       <version>1.21.0</version>
       <scope>compile</scope>
       <exclusions>
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
@@ -19,7 +19,6 @@
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
-import static javax.servlet.http.HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE;
 
 import com.google.api.client.googleapis.batch.BatchRequest;
 import com.google.api.client.googleapis.batch.json.JsonBatchCallback;
@@ -70,6 +69,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import org.apache.http.HttpStatus;
 
 public class HttpStorageRpc implements StorageRpc {
 
@@ -510,7 +510,7 @@ public Tuple<String, byte[]> read(StorageObject from, Map<Option, ?> options, lo
       return Tuple.of(etag, output.toByteArray());
     } catch (IOException ex) {
       StorageException serviceException = translate(ex);
-      if (serviceException.getCode() == SC_REQUESTED_RANGE_NOT_SATISFIABLE) {
+      if (serviceException.getCode() == HttpStatus.SC_REQUESTED_RANGE_NOT_SATISFIABLE) {
         return Tuple.of(null, new byte[0]);
       }
       throw serviceException;
