Reverting Exception instead of IOException in HttpRequest and HttpResponseException.

Author: rmistry

google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchRequest.java

@@ -57,7 +57,7 @@ public void setTimeout(int connectTimeout, int readTimeout) {
   }
 
   @Override
-  public LowLevelHttpResponse execute() throws Exception {
+  public LowLevelHttpResponse execute() throws IOException {
     // write content
     if (content != null) {
       String contentType = content.getType();

google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/urlfetch/UrlFetchRequest.java

@@ -58,7 +58,7 @@ public void setTimeout(int connectTimeout, int readTimeout) {
   }
 
   @Override
-  public LowLevelHttpResponse execute() throws Exception {
+  public LowLevelHttpResponse execute() throws IOException {
     // write content
     if (content != null) {
       String contentType = content.getType();

google-http-client/src/main/java/com/google/api/client/http/AbstractHttpContent.java

@@ -16,6 +16,7 @@
 
 import com.google.common.base.Charsets;
 
+import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.Charset;
 
@@ -62,13 +63,8 @@ public String getEncoding() {
   /**
    * Default implementation calls {@link #computeLength()} once and caches it for future
    * invocations, but subclasses may override.
-   *
-   * <p>
-   * Upgrade warning: this method now throws an {@link Exception}.  In prior version 1.10 it threw
-   * an {@link java.io.IOException}.
-   * </p>
    */
-  public long getLength() throws Exception {
+  public long getLength() throws IOException {
     if (computedLength == -1) {
       computedLength = computeLength();
     }
@@ -122,13 +118,8 @@ public String getType() {
    * but only retains the count of bytes. If {@link #retrySupported()} is {@code false}, it will
    * instead return {@code -1}.
    * </p>
-   *
-   * <p>
-   * Upgrade warning: this method now throws an {@link Exception}.  In prior version 1.10 it threw
-   * an {@link java.io.IOException}.
-   * </p>
    */
-  protected long computeLength() throws Exception {
+  protected long computeLength() throws IOException {
     if (!retrySupported()) {
       return -1;
     }

google-http-client/src/main/java/com/google/api/client/http/BackOffPolicy.java

@@ -14,6 +14,7 @@
 
 package com.google.api.client.http;
 
+import java.io.IOException;
 
 /**
  * Strategy interface to control back off between retry attempts.
@@ -60,12 +61,12 @@ public interface BackOffPolicy {
    * </pre>
    *
    * <p>
-   * Upgrade warning: this method now throws an {@link Exception}.  In prior version 1.10 it threw
-   * an {@link java.io.IOException}.
+   * Upgrade warning: {@link #getNextBackOffMillis} now throws an {@link IOException}, it was not
+   * thrown prior to 1.9.
    * </p>
    *
    * @return the number of milliseconds to wait when backing off requests, or {@link #STOP} if no
    *         more retries should be made
    */
-  public long getNextBackOffMillis() throws Exception;
+  public long getNextBackOffMillis() throws IOException;
 }

google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java

@@ -16,6 +16,8 @@
 
 import com.google.common.base.Preconditions;
 
+import java.io.IOException;
+
 /**
  * Implementation of {@link BackOffPolicy} that increases the back off period for each retry attempt
  * using a randomization function that grows exponentially.
@@ -232,14 +234,14 @@ public final void reset() {
    * </p>
    *
    * <p>
-   * Upgrade warning: this method now throws an {@link Exception}.  In prior version 1.10 it threw
-   * an {@link java.io.IOException}.
+   * Upgrade warning: {@link #getNextBackOffMillis} now throws an {@link IOException}, it was not
+   * thrown prior to 1.9.
    * </p>
    *
    * @return the number of milliseconds to wait when backing off requests, or {@link #STOP} if no
    *         more retries should be made
    */
-  public long getNextBackOffMillis() throws Exception {
+  public long getNextBackOffMillis() throws IOException {
     // Make sure we have not gone over the maximum elapsed time.
     if (getElapsedTimeMillis() > maxElapsedTimeMillis) {
       return STOP;

google-http-client/src/main/java/com/google/api/client/http/GZipContent.java

@@ -14,6 +14,7 @@
 
 package com.google.api.client.http;
 
+import java.io.IOException;
 import java.io.OutputStream;
 import java.util.zip.GZIPOutputStream;
 
@@ -47,13 +48,8 @@ final class GZipContent extends AbstractHttpContent {
    * href='http://code.google.com/p/google-http-java-client/issues/detail?id=61'>61</a> for more
    * information.
    * </p>
-   *
-   * <p>
-   * Upgrade warning: this method now throws an {@link Exception}.  In prior version 1.10 it threw
-   * an {@link java.io.IOException}.
-   * </p>
    */
-  public void writeTo(OutputStream out) throws Exception {
+  public void writeTo(OutputStream out) throws IOException {
     GZIPOutputStream zipper = new GZIPOutputStream(out);
     httpContent.writeTo(zipper);
     zipper.close();

google-http-client/src/main/java/com/google/api/client/http/HttpContent.java

@@ -14,6 +14,7 @@
 
 package com.google.api.client.http;
 
+import java.io.IOException;
 import java.io.OutputStream;
 
 /**
@@ -28,15 +29,8 @@
  */
 public interface HttpContent {
 
-  /**
-   * Returns the content length or less than zero if not known.
-   *
-   * <p>
-   * Upgrade warning: this method now throws an {@link Exception}.  In prior version 1.10 it threw
-   * an {@link java.io.IOException}.
-   * </p>
-   */
-  long getLength() throws Exception;
+  /** Returns the content length or less than zero if not known. */
+  long getLength() throws IOException;
 
   /**
    * Returns the content encoding (for example {@code "gzip"}) or {@code null} for none.
@@ -54,13 +48,8 @@ public interface HttpContent {
    * should not assume whether or not the output stream has been closed. Implementations that do not
    * close the output stream should flush it at the end of the method.
    * </p>
-   *
-   * <p>
-   * Upgrade warning: this method now throws an {@link Exception}.  In prior version 1.10 it threw
-   * an {@link java.io.IOException}.
-   * </p>
    */
-  void writeTo(OutputStream out) throws Exception;
+  void writeTo(OutputStream out) throws IOException;
 
   /**
    * Returns whether or not retry is supported on this content type.

google-http-client/src/main/java/com/google/api/client/http/HttpExecuteInterceptor.java

@@ -14,6 +14,7 @@
 
 package com.google.api.client.http;
 
+import java.io.IOException;
 
 /**
  * HTTP request execute interceptor to intercept the start of {@link HttpRequest#execute()} before
@@ -25,7 +26,7 @@
  *
  * <pre>
   public class OAuthSigner implements HttpExecuteInterceptor {
-    public void intercept(HttpRequest request) throws Exception {
+    public void intercept(HttpRequest request) throws IOException {
       // sign request...
     }
   }
@@ -56,7 +57,7 @@ public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
     return transport.createRequestFactory(new HttpRequestInitializer() {
       public void initialize(HttpRequest request) {
         request.interceptor = new HttpExecuteInterceptor() {
-          public void intercept(HttpRequest request) throws Exception {
+          public void intercept(HttpRequest request) throws IOException {
             signer.intercept(request);
           }
         };
@@ -74,13 +75,6 @@ public void intercept(HttpRequest request) throws Exception {
  */
 public interface HttpExecuteInterceptor {
 
-  /**
-   * Invoked at the start of {@link HttpRequest#execute()} before executing the HTTP request.
-   *
-   * <p>
-   * Upgrade warning: this method now throws an {@link Exception}.  In prior version 1.10 it threw
-   * an {@link java.io.IOException}.
-   * </p>
-   */
-  void intercept(HttpRequest request) throws Exception;
+  /** Invoked at the start of {@link HttpRequest#execute()} before executing the HTTP request. */
+  void intercept(HttpRequest request) throws IOException;
 }

google-http-client/src/main/java/com/google/api/client/http/HttpHeaders.java

@@ -624,7 +624,7 @@ private static void addHeader(Logger logger,
       LowLevelHttpRequest lowLevelHttpRequest,
       String name,
       Object value,
-      Writer writer) throws Exception {
+      Writer writer) throws IOException {
     // ignore nulls
     if (value == null || Data.isNull(value)) {
       return;
@@ -658,11 +658,6 @@ private static void addHeader(Logger logger,
   /**
    * Serializes headers to an @{link LowLevelHttpRequest}.
    *
-   * <p>
-   * Upgrade warning: this method now throws an {@link Exception}.  In prior version 1.10 it threw
-   * an {@link IOException}.
-   * </p>
-   *
    * @param headers HTTP headers
    * @param logbuf log buffer or {@code null} for none
    * @param logger logger or {@code null} for none. Logger must be specified if log buffer is
@@ -673,18 +668,13 @@ private static void addHeader(Logger logger,
    * @since 1.9
    */
   public static void serializeHeaders(HttpHeaders headers, StringBuilder logbuf, Logger logger,
-      LowLevelHttpRequest lowLevelHttpRequest) throws Exception {
+      LowLevelHttpRequest lowLevelHttpRequest) throws IOException {
     serializeHeaders(headers, logbuf, logger, lowLevelHttpRequest, null);
   }
 
   /**
    * Serializes headers to an {@link Writer} for Multi-part requests.
    *
-   * <p>
-   * Upgrade warning: this method now throws an {@link Exception}.  In prior version 1.10 it threw
-   * an {@link IOException}.
-   * </p>
-   *
    * @param headers HTTP headers
    * @param logbuf log buffer or {@code null} for none
    * @param logger logger or {@code null} for none. Logger must be specified if log buffer is
@@ -694,12 +684,12 @@ public static void serializeHeaders(HttpHeaders headers, StringBuilder logbuf, L
    * @since 1.9
    */
   public static void serializeHeadersForMultipartRequests(
-      HttpHeaders headers, StringBuilder logbuf, Logger logger, Writer writer) throws Exception {
+      HttpHeaders headers, StringBuilder logbuf, Logger logger, Writer writer) throws IOException {
     serializeHeaders(headers, logbuf, logger, null, writer);
   }
 
   private static void serializeHeaders(HttpHeaders headers, StringBuilder logbuf, Logger logger,
-      LowLevelHttpRequest lowLevelHttpRequest, Writer writer) throws Exception {
+      LowLevelHttpRequest lowLevelHttpRequest, Writer writer) throws IOException {
     HashSet<String> headerNames = new HashSet<String>();
     for (Map.Entry<String, Object> headerEntry : headers.entrySet()) {
       String name = headerEntry.getKey();
@@ -775,11 +765,6 @@ public LowLevelHttpResponse execute() throws IOException {
   /**
    * Puts all headers of the {@link HttpHeaders} object into this {@link HttpHeaders} object.
    *
-   * <p>
-   * Upgrade warning: this method now throws an {@link Exception}.  In prior version 1.10 it threw
-   * an {@link IOException}.
-   * </p>
-   *
    * @param headers {@link HttpHeaders} from where the headers are taken
    * @since 1.10
    */
@@ -788,7 +773,7 @@ public final void fromHttpHeaders(HttpHeaders headers) {
       ParseHeaderState state = new ParseHeaderState(this, null);
       serializeHeaders(headers, null, null, new HeaderParsingFakeLevelHttpRequest(this, state));
       state.finish();
-    } catch (Exception ex) {
+    } catch (IOException ex) {
       // Should never occur as we are dealing with a FakeLowLevelHttpRequest
       throw new IllegalStateException(ex);
     }

google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java

@@ -763,18 +763,13 @@ public HttpRequest setRetryOnExecuteIOException(boolean retryOnExecuteIOExceptio
      }
    * </pre>
    *
-   * <p>
-   * Upgrade warning: this method now throws an {@link Exception}.  In prior version 1.10 it threw
-   * an {@link IOException}.
-   * </p>
-   *
    * @return HTTP response for an HTTP success response (or HTTP error response if
    *         {@link #getThrowExceptionOnExecuteError()} is {@code false})
    * @throws HttpResponseException for an HTTP error response (only if
    *         {@link #getThrowExceptionOnExecuteError()} is {@code true})
    * @see HttpResponse#isSuccessStatusCode()
    */
-  public HttpResponse execute() throws Exception {
+  public HttpResponse execute() throws IOException {
     boolean retrySupported = false;
     Preconditions.checkArgument(numRetries >= 0);
     int retriesRemaining = numRetries;