[http] update mocks IOException -> Exception

https://codereview.appspot.com/6500124/

Author: Yaniv Inbar

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

@@ -50,15 +50,15 @@ public interface HttpContent {
    * Writes the content to the given output stream.
    *
    * <p>
-   * Upgrade warning: this method now throws an {@link Exception}. In prior version 1.11 it threw an
-   * {@link java.io.IOException}.
-   * </p>
-   *
-   * <p>
    * The recommendation for implementations is that they should not close the output stream. Callers
    * 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.11 it threw an
+   * {@link java.io.IOException}.
+   * </p>
    */
   void writeTo(OutputStream out) throws Exception;
 

google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpContent.java

@@ -17,7 +17,6 @@
 import com.google.api.client.http.HttpContent;
 import com.google.common.base.Preconditions;
 
-import java.io.IOException;
 import java.io.OutputStream;
 
 /**
@@ -48,15 +47,27 @@ public String getEncoding() {
     return encoding;
   }
 
-  public long getLength() throws IOException {
+  /**
+   * <p>
+   * Upgrade warning: this method now throws an {@link Exception}. In prior version 1.11 it threw an
+   * {@link java.io.IOException}.
+   * </p>
+   */
+  public long getLength() throws Exception {
     return length;
   }
 
   public String getType() {
     return type;
   }
 
-  public void writeTo(OutputStream out) throws IOException {
+  /**
+   * <p>
+   * Upgrade warning: this method now throws an {@link Exception}. In prior version 1.11 it threw an
+   * {@link java.io.IOException}.
+   * </p>
+   */
+  public void writeTo(OutputStream out) throws Exception {
     out.write(content);
     out.flush();
   }

google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpUnsuccessfulResponseHandler.java

@@ -18,8 +18,6 @@
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpUnsuccessfulResponseHandler;
 
-import java.io.IOException;
-
 /**
  * Mock for {@link HttpUnsuccessfulResponseHandler}.
  *
@@ -51,8 +49,14 @@ public boolean isCalled() {
     return isCalled;
   }
 
+  /**
+   * <p>
+   * Upgrade warning: this method now throws an {@link Exception}. In prior version 1.11 it threw an
+   * {@link java.io.IOException}.
+   * </p>
+   */
   public boolean handleResponse(HttpRequest request, HttpResponse response, boolean supportsRetry)
-      throws IOException {
+      throws Exception {
     isCalled = true;
     return successfullyHandleResponse;
   }

google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java

@@ -18,7 +18,6 @@
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -65,8 +64,14 @@ public MockLowLevelHttpRequest(String url) {
     this.url = url;
   }
 
+  /**
+   * <p>
+   * Upgrade warning: this method now throws an {@link Exception}. In prior version 1.11 it did not
+   * throw an exception.
+   * </p>
+   */
   @Override
-  public void addHeader(String name, String value) {
+  public void addHeader(String name, String value) throws Exception {
     List<String> values = headersMap.get(name);
     if (values == null) {
       values = new ArrayList<String>();
@@ -75,13 +80,25 @@ public void addHeader(String name, String value) {
     values.add(value);
   }
 
+  /**
+   * <p>
+   * Upgrade warning: this method now throws an {@link Exception}. In prior version 1.11 it threw an
+   * {@link java.io.IOException}.
+   * </p>
+   */
   @Override
-  public LowLevelHttpResponse execute() throws IOException {
+  public LowLevelHttpResponse execute() throws Exception {
     return response;
   }
 
+  /**
+   * <p>
+   * Upgrade warning: this method now throws an {@link Exception}. In prior version 1.11 it threw an
+   * {@link java.io.IOException}.
+   * </p>
+   */
   @Override
-  public void setContent(HttpContent content) throws IOException {
+  public void setContent(HttpContent content) throws Exception {
     this.content = content;
   }
 

google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java

@@ -697,7 +697,7 @@ public LowLevelHttpRequest buildRequest(String method, String url) throws IOExce
         return new MockLowLevelHttpRequest() {
 
           @Override
-          public void setContent(HttpContent content) throws IOException {
+          public void setContent(HttpContent content) throws Exception {
             if (expectGZip) {
               assertEquals(GZipContent.class, content.getClass());
               assertEquals("gzip", content.getEncoding());
@@ -734,7 +734,7 @@ class MyTransport extends MockHttpTransport {
       public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
         return new MockLowLevelHttpRequest() {
           @Override
-          public void setContent(HttpContent content) throws IOException {
+          public void setContent(HttpContent content) throws Exception {
             if (expectLogContent) {
               assertEquals(LogContent.class, content.getClass());
             } else {
@@ -809,7 +809,7 @@ class MyTransport extends MockHttpTransport {
       public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
         return new MockLowLevelHttpRequest() {
             @Override
-          public LowLevelHttpResponse execute() throws IOException {
+          public LowLevelHttpResponse execute() throws Exception {
             List<String> userAgents = getHeaders().get("User-Agent");
             String actualUserAgent = userAgents == null ? null : userAgents.get(0);
             assertEquals(expectedUserAgent, actualUserAgent);