[Issue 242] Remove deprecated classes/methods/fields from version 1.5 [BACKWARDS INCOMPATIBLE]

Yaniv Inbar · Yaniv Inbar · commit 2ccbdbc85845 · 2011-06-30T08:15:15.000-04:00
http://codereview.appspot.com/4629083/
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/storage/GoogleStorageAuthentication.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/storage/GoogleStorageAuthentication.java
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/storage/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/storage/package-info.java
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/json/JsonCContent.java b/google-api-client/src/main/java/com/google/api/client/googleapis/json/JsonCContent.java
@@ -52,13 +52,6 @@ static void setContent(HttpRequest request, Object data) {
  */
 public final class JsonCContent extends JsonHttpContent {
 
-  /**
-   * @deprecated (scheduled to be removed in 1.6) Use {@link #JsonCContent(JsonFactory, Object)}
-   */
-  @Deprecated
-  public JsonCContent() {
-  }
-
   /**
    * @param jsonFactory JSON factory to use
    * @param data JSON key name/value data
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/json/JsonCParser.java b/google-api-client/src/main/java/com/google/api/client/googleapis/json/JsonCParser.java
@@ -52,13 +52,6 @@ static void setParser(HttpTransport transport) {
  */
 public final class JsonCParser extends JsonHttpParser {
 
-  /**
-   * @deprecated (scheduled to be removed in 1.6) Use {@link #JsonCParser(JsonFactory)}
-   */
-  @Deprecated
-  public JsonCParser() {
-  }
-
   /**
    * @param jsonFactory JSON factory
    * @since 1.5
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchContent.java b/google-api-client/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchContent.java
@@ -48,15 +48,6 @@ static void setContent(
  */
 public final class AtomPatchContent extends AtomContent {
 
-  /**
-   * @deprecated (scheduled to be removed in 1.6) Use
-   *             {@link #AtomPatchContent(XmlNamespaceDictionary, Object)}
-   */
-  @Deprecated
-  public AtomPatchContent() {
-    contentType = XmlHttpParser.CONTENT_TYPE;
-  }
-
   /**
    * @param namespaceDictionary XML namespace dictionary
    * @param patchEntry key/value pair data for the Atom PATCH entry
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchRelativeToOriginalContent.java b/google-api-client/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchRelativeToOriginalContent.java
@@ -47,29 +47,11 @@ static void setContent(HttpRequest request, XmlNamespaceDictionary namespaceDict
  */
 public final class AtomPatchRelativeToOriginalContent extends AbstractXmlHttpContent {
 
-  /**
-   * Key/value pair data for the updated/patched Atom entry.
-   *
-   * @deprecated (scheduled to be made private final in 1.6) Use {@link #getPatchedEntry}
-   */
-  @Deprecated
-  public Object patchedEntry;
-
-  /**
-   * Key/value pair data for the original unmodified Atom entry.
-   *
-   * @deprecated (scheduled to be made private final in 1.6) Use {@link #getOriginalEntry}
-   */
-  @Deprecated
-  public Object originalEntry;
+  /** Key/value pair data for the updated/patched Atom entry. */
+  private final Object patchedEntry;
 
-  /**
-   * @deprecated (scheduled to be removed in 1.6) Use {@link
-   *             #AtomPatchRelativeToOriginalContent(XmlNamespaceDictionary, Object, Object)}
-   */
-  @Deprecated
-  public AtomPatchRelativeToOriginalContent() {
-  }
+  /** Key/value pair data for the original unmodified Atom entry. */
+  private final Object originalEntry;
 
   /**
    * @param namespaceDictionary XML namespace dictionary
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/xml/atom/GoogleAtom.java b/google-api-client/src/main/java/com/google/api/client/googleapis/xml/atom/GoogleAtom.java
@@ -151,11 +151,6 @@ private static void updateFieldsBasedOnNumFields(
    * Compute the patch object of key/value pairs from the given original and patched objects, adding
    * a {@code @gd:fields} key for the fields mask.
    *
-   * <p>
-   * Upgrade warning: in prior version 1.4 the return type was {@link ArrayMap}, but now it is
-   * {@link Map} to allow flexibility in the implementation.
-   * </p>
-   *
    * @param patched patched object
    * @param original original object
    * @return patch object of key/value pairs
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/xml/atom/MultiKindFeedParser.java b/google-api-client/src/main/java/com/google/api/client/googleapis/xml/atom/MultiKindFeedParser.java
@@ -43,14 +43,6 @@ public final class MultiKindFeedParser<T> extends AbstractAtomFeedParser<T> {
 
   private final HashMap<String, Class<?>> kindToEntryClassMap = new HashMap<String, Class<?>>();
 
-  /**
-   * @deprecated (scheduled to be removed in 1.6) Use
-   *             {@link #create(HttpResponse, XmlNamespaceDictionary, Class, Class...)}
-   */
-  @Deprecated
-  public MultiKindFeedParser() {
-  }
-
   /**
    * @param namespaceDictionary XML namespace dictionary
    * @param parser XML pull parser to use
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/storage/GoogleStorageAuthenticationTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/storage/GoogleStorageAuthenticationTest.java
