[http issue 131] Removed deprecated classes/methods/fields from version 1.9 and 1.10

http://codereview.appspot.com/6454174/

Author: Yaniv Inbar

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

@@ -36,9 +36,8 @@
  * </p>
  *
  * <p>
- * Warning: in prior version 1.9 the maximum amount of content read from the input stream was
- * limited by the {@link #getLength()}, but now instead all content is read. You may use
- * {@link LimitInputStream} if that functionality is needed.
+ * By default, all content is read from the input stream. If instead you want to limit the maximum
+ * amount of content read from the input stream, you may use {@link LimitInputStream}.
  * </p>
  *
  * @since 1.4
@@ -72,10 +71,6 @@ public AbstractInputStreamContent(String type) {
    * {@link #retrySupported()} this should be a factory function which will create a new
    * {@link InputStream} from the source data whenever invoked.
    *
-   * <p>
-   * Upgrade warning: in prior version 1.6 {@link #getInputStream} was protected, it is now public.
-   * </p>
-   *
    * @since 1.7
    */
   public abstract InputStream getInputStream() throws IOException;
@@ -191,8 +186,9 @@ static void downloadMedia(HttpResponse response, File file)
    * @param closeInputStream whether the input stream should be closed at the end of this method
    * @since 1.7
    */
-  public static void copy(InputStream inputStream, OutputStream outputStream,
-      boolean closeInputStream) throws IOException {
+  public static void copy(
+      InputStream inputStream, OutputStream outputStream, boolean closeInputStream)
+      throws IOException {
     try {
       ByteStreams.copy(inputStream, outputStream);
     } finally {

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

@@ -60,11 +60,6 @@ public interface BackOffPolicy {
    *   }
    * </pre>
    *
-   * <p>
-   * 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
    */

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

@@ -29,11 +29,6 @@
  * implemented using {@link HttpHeaders#setBasicAuthentication(String, String)}.
  * </p>
  *
- * <p>
- * Warning: for backwards-compatibility {@link #initialize} also calls
- * {@link #intercept(HttpRequest)}, but this call will be removed in version 1.8.
- * </p>
- *
  * @since 1.7
  * @author Yaniv Inbar
  */
@@ -50,7 +45,6 @@ public BasicAuthentication(String username, String password) {
 
   public void initialize(HttpRequest request) throws IOException {
     request.setInterceptor(this);
-    intercept(request);
   }
 
   public void intercept(HttpRequest request) throws IOException {

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

@@ -233,11 +233,6 @@ public final void reset() {
    * Subclasses may override if a different algorithm is required.
    * </p>
    *
-   * <p>
-   * 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
    */

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

@@ -257,11 +257,6 @@ public final void setContentEncoding(String contentEncoding) {
   /**
    * Returns the {@code "Content-Length"} header or {@code null} for none.
    *
-   * <p>
-   * Upgrade warning: in prior version content length was represented as a String, but now it is
-   * represented as a Long.
-   * </p>
-   *
    * @since 1.5
    */
   public final Long getContentLength() {
@@ -271,11 +266,6 @@ public final Long getContentLength() {
   /**
    * Sets the {@code "Content-Length"} header or {@code null} for none.
    *
-   * <p>
-   * Upgrade warning: in prior version content length was represented as a String, but now it is
-   * represented as a Long.
-   * </p>
-   *
    * @since 1.5
    */
   public final void setContentLength(Long contentLength) {

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

@@ -27,7 +27,7 @@
  *
  * @since 1.0
  * @author Yaniv Inbar
- * @deprecated (scheduled to be removed in 1.11) Use {@link ObjectParser} instead.
+ * @deprecated (scheduled to be removed in 1.12) Use {@link ObjectParser} instead.
  */
 @Deprecated
 public interface HttpParser {

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

@@ -117,11 +117,6 @@ static String executeAndGetValueOfSomeCustomHeader(HttpRequest request) {
    * <p>
    * Defaults to 16KB.
    * </p>
-   *
-   * <p>
-   * Upgrade warning: prior to version 1.9, the default was {@code 100,000} bytes, but now it is
-   * 16KB.
-   * </p>
    */
   private int contentLoggingLimit = 0x4000;
 
@@ -341,11 +336,6 @@ public HttpRequest setBackOffPolicy(BackOffPolicy backOffPolicy) {
    * Defaults to 16KB.
    * </p>
    *
-   * <p>
-   * Upgrade warning: prior to version 1.9, the default was {@code 100,000} bytes, but now it is
-   * 16KB.
-   * </p>
-   *
    * @since 1.7
    */
   public int getContentLoggingLimit() {
@@ -372,11 +362,6 @@ public int getContentLoggingLimit() {
    * Defaults to 16KB.
    * </p>
    *
-   * <p>
-   * Upgrade warning: prior to version 1.9, the default was {@code 100,000} bytes, but now it is
-   * 16KB.
-   * </p>
-   *
    * @since 1.7
    */
   public HttpRequest setContentLoggingLimit(int contentLoggingLimit) {
@@ -659,7 +644,7 @@ public HttpRequest setNumberOfRetries(int numRetries) {
    * </p>
    *
    * @since 1.4
-   * @deprecated (scheduled to be removed in 1.11) Use {@link #setParser(ObjectParser)} instead.
+   * @deprecated (scheduled to be removed in 1.12) Use {@link #setParser(ObjectParser)} instead.
    */
   @Deprecated
   public void addParser(HttpParser parser) {
@@ -689,7 +674,7 @@ public HttpRequest setParser(ObjectParser parser) {
    * @param contentType content type or {@code null} for {@code null} result
    * @return HTTP response content parser or {@code null} for {@code null} input
    * @since 1.4
-   * @deprecated (scheduled to be removed in 1.11) Use {@link #getParser()} instead.
+   * @deprecated (scheduled to be removed in 1.12) Use {@link #getParser()} instead.
    */
   @Deprecated
   public final HttpParser getParser(String contentType) {
@@ -1129,7 +1114,7 @@ private void sleep(long millis) {
    *        {@code null} result
    * @return normalized media type without parameters or {@code null} for {@code null} input
    * @since 1.4
-   * @deprecated (scheduled to be removed in 1.11) Use
+   * @deprecated (scheduled to be removed in 1.12) Use
    *             {@link HttpMediaType#equalsIgnoreParameters(HttpMediaType)} instead
    */
   @Deprecated

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

@@ -189,11 +189,6 @@ public final class HttpResponse {
    * Defaults to {@link HttpRequest#getContentLoggingLimit()}.
    * </p>
    *
-   * <p>
-   * Upgrade warning: prior to version 1.9, the default was {@code 100,000} bytes, but now it is
-   * {@link HttpRequest#getContentLoggingLimit()}.
-   * </p>
-   *
    * @since 1.7
    */
   public int getContentLoggingLimit() {
@@ -220,11 +215,6 @@ public int getContentLoggingLimit() {
    * Defaults to {@link HttpRequest#getContentLoggingLimit()}.
    * </p>
    *
-   * <p>
-   * Upgrade warning: prior to version 1.9, the default was {@code 100,000} bytes, but now it is
-   * {@link HttpRequest#getContentLoggingLimit()}.
-   * </p>
-   *
    * @since 1.7
    */
   public HttpResponse setContentLoggingLimit(int contentLoggingLimit) {
@@ -446,12 +436,8 @@ public void ignore() throws IOException {
   }
 
   /**
-   * Close the HTTP response content and disconnect using {@link LowLevelHttpResponse#disconnect()}.
-   *
-   * <p>
-   * Upgrade warning: since version 1.10 {@link #disconnect} now closes the HTTP response content
-   * input stream. This was not done by this method prior to version 1.10.
-   * </p>
+   * Close the HTTP response content using {@link #ignore}, and disconnect using
+   * {@link LowLevelHttpResponse#disconnect()}.
    *
    * @since 1.4
    */
@@ -464,7 +450,7 @@ public void disconnect() throws IOException {
    * Returns the HTTP response content parser to use for the content type of this HTTP response or
    * {@code null} for none.
    *
-   * @deprecated (scheduled to be removed in 1.11) Use {@link #getRequest()}.
+   * @deprecated (scheduled to be removed in 1.12) Use {@link #getRequest()}.
    *             {@link HttpRequest#getParser()} instead
    */
   @Deprecated
@@ -479,9 +465,9 @@ public HttpParser getParser() {
    * <p>
    * <b>Upgrade Warning:</b> Prior to version 1.11 this method would throw an
    * {@link IllegalArgumentException} when no Content-Type is present in the response and the
-   * deprecated HttpParsers were used. Since 1.11 this method will return {@code null} as
-   * documented when the server responds with a status code indicating that there is no content,
-   * or when a HEAD request was made to the server.
+   * deprecated HttpParsers were used. Since 1.11 this method will return {@code null} as documented
+   * when the server responds with a status code indicating that there is no content, or when a HEAD
+   * request was made to the server.
    * </p>
    *
    * <p>
@@ -516,8 +502,8 @@ public <T> T parseAs(Class<T> dataClass) throws IOException {
   }
 
   /**
-   * Returns {@code true} if this response contains a message body. Implemented according to
-   * {@href http://tools.ietf.org/html/rfc2616#section-4.3}.
+   * Returns {@code true} if this response contains a message body. Implemented according to {@href
+   *  http://tools.ietf.org/html/rfc2616#section-4.3}.
    */
   private boolean hasMessageBody() {
     if (getRequest().getMethod() == HttpMethod.HEAD) {
@@ -528,8 +514,8 @@ private boolean hasMessageBody() {
     if (statusCode / 100 == 1) { // 1xx
       return false;
     }
-    if (statusCode == HttpStatusCodes.STATUS_CODE_NO_CONTENT ||
-        statusCode == HttpStatusCodes.STATUS_CODE_NOT_MODIFIED) {
+    if (statusCode == HttpStatusCodes.STATUS_CODE_NO_CONTENT
+        || statusCode == HttpStatusCodes.STATUS_CODE_NOT_MODIFIED) {
       return false;
     }
 
@@ -561,10 +547,10 @@ public Object parseAs(Type dataType) throws IOException {
    * </p>
    *
    * <p>
-   * Warning: in prior version 1.9 the maximum amount of content parsed for un-GZipped content was
-   * set by the Content-Length header, but now instead all content is read. Also, prior version
-   * assumed the charset was {@code "UTF-8"}, but now it follows the specification by parsing the
-   * "charset" parameter of the Content-Type header or {@code "ISO-8859-1"} if missing.
+   * All content is read from the input content stream rather than being limited by the
+   * Content-Length. For the character set, it follows the specification by parsing the "charset"
+   * parameter of the Content-Type header or by default {@code "ISO-8859-1"} if the parameter is
+   * missing.
    * </p>
    *
    * @return parsed string or {@code ""} for no content

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

@@ -91,29 +91,18 @@ public HttpResponseException(HttpResponse response, String message) {
    * Returns whether received a successful HTTP status code {@code >= 200 && < 300} (see
    * {@link #getStatusCode()}).
    *
-   * <p>
-   * Upgrade warning: Overriding this method is no longer supported, and will be made final in
-   * 1.10.
-   * </p>
-   *
-   *
    * @since 1.7
    */
-  public boolean isSuccessStatusCode() {
+  public final boolean isSuccessStatusCode() {
     return HttpStatusCodes.isSuccess(statusCode);
   }
 
   /**
    * Returns the HTTP status code or {@code 0} for none.
    *
-   * <p>
-   * Upgrade warning: Overriding this method is no longer supported, and will be made final in
-   * 1.10.
-   * </p>
-   *
    * @since 1.7
    */
-  public int getStatusCode() {
+  public final int getStatusCode() {
     return statusCode;
   }
 

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

@@ -42,21 +42,12 @@ public abstract class LowLevelHttpRequest {
    * {@link #addHeader} will be called for each instance of the header.
    * </p>
    *
-   * <p>
-   * Warning: in prior version 1.9 there was no IOException declared as thrown, but
-   * in version 1.10 an IOException may be thrown.
-   * </p>
-   *
    * @param name header name
    * @param value header value
    */
   public abstract void addHeader(String name, String value) throws IOException;
 
-  /**
-   * Sets the HTTP request content.
-   *
-   * @throws IOException I/O exception
-   */
+  /** Sets the HTTP request content. */
   public abstract void setContent(HttpContent content) throws IOException;
 
   /**