[api] add legacyDataWrapper param to AbstractGoogleJsonClient constructor

Yaniv Inbar · Yaniv Inbar · commit a99df6d2d77b · 2012-10-05T14:21:51.000-04:00
https://codereview.appspot.com/6625052/
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClient.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClient.java
@@ -35,11 +35,13 @@ public abstract class AbstractGoogleJsonClient extends AbstractGoogleClient {
    * @param rootUrl root URL of the service
    * @param servicePath service path
    * @param httpRequestInitializer HTTP request initializer or {@code null} for none
+   * @param legacyDataWrapper whether using the legacy data wrapper in responses
    */
   protected AbstractGoogleJsonClient(HttpTransport transport, JsonFactory jsonFactory,
-      String rootUrl, String servicePath, HttpRequestInitializer httpRequestInitializer) {
-    super(transport, httpRequestInitializer, rootUrl, servicePath, new JsonObjectParser(
-        jsonFactory));
+      String rootUrl, String servicePath, HttpRequestInitializer httpRequestInitializer,
+      boolean legacyDataWrapper) {
+    super(transport, httpRequestInitializer, rootUrl, servicePath, newObjectParser(
+        jsonFactory, legacyDataWrapper));
   }
 
   /**
@@ -51,7 +53,7 @@ protected AbstractGoogleJsonClient(HttpTransport transport, JsonFactory jsonFact
    * @param googleClientRequestInitializer Google request initializer or {@code null} for none
    * @param applicationName application name to be sent in the User-Agent header of requests or
    *        {@code null} for none
-   * @param subscriptionStore subscription store
+   * @param subscriptionStore subscription store or {@code null} for none
    * @param suppressPatternChecks whether discovery pattern checks should be suppressed on required
    *        parameters
    */
@@ -74,6 +76,14 @@ public final JsonFactory getJsonFactory() {
     return getObjectParser().getJsonFactory();
   }
 
+  /**
+   * @param jsonFactory JSON factory
+   * @param legacyDataWrapper whether using the legacy data wrapper in responses
+   */
+  static JsonObjectParser newObjectParser(JsonFactory jsonFactory, boolean legacyDataWrapper) {
+    return legacyDataWrapper ? new JsonCParser(jsonFactory) : new JsonObjectParser(jsonFactory);
+  }
+
   /**
    * Builder for {@link AbstractGoogleJsonClient}.
    *
@@ -94,13 +104,12 @@ public abstract static class Builder extends AbstractGoogleClient.Builder {
     protected Builder(HttpTransport transport, JsonFactory jsonFactory, String rootUrl,
         String servicePath, HttpRequestInitializer httpRequestInitializer,
         boolean legacyDataWrapper) {
-      super(transport, rootUrl, servicePath, legacyDataWrapper
-          ? new JsonCParser(jsonFactory) : new JsonObjectParser(jsonFactory),
+      super(transport, rootUrl, servicePath, newObjectParser(jsonFactory, legacyDataWrapper),
           httpRequestInitializer);
     }
 
     @Override
-    public JsonObjectParser getObjectParser() {
+    public final JsonObjectParser getObjectParser() {
       return (JsonObjectParser) super.getObjectParser();
     }
 
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientRequest.java
@@ -19,6 +19,7 @@
 import com.google.api.client.googleapis.json.JsonCContent;
 import com.google.api.client.googleapis.json.JsonCParser;
 import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
+import com.google.api.client.googleapis.subscriptions.Subscription;
 import com.google.api.client.googleapis.subscriptions.SubscriptionUtils;
 import com.google.api.client.googleapis.subscriptions.json.JsonNotificationCallback;
 import com.google.api.client.http.HttpHeaders;
@@ -84,6 +85,11 @@ public AbstractGoogleJsonClientRequest<T> setNotificationClientToken(
         notificationClientToken);
   }
 
+  @Override
+  protected AbstractGoogleJsonClientRequest<T> setLastSubscription(Subscription lastSubscription) {
+    return (AbstractGoogleJsonClientRequest<T>) super.setLastSubscription(lastSubscription);
+  }
+
   /**
    * Queues the request into the specified batch request container.
    *
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/MockGoogleJsonClient.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/MockGoogleJsonClient.java
@@ -34,10 +34,12 @@ public class MockGoogleJsonClient extends AbstractGoogleJsonClient {
    * @param rootUrl root URL of the service
    * @param servicePath service path
    * @param httpRequestInitializer HTTP request initializer or {@code null} for none
+   * @param legacyDataWrapper whether using the legacy data wrapper in responses
    */
   public MockGoogleJsonClient(HttpTransport transport, JsonFactory jsonFactory, String rootUrl,
-      String servicePath, HttpRequestInitializer httpRequestInitializer) {
-    super(transport, jsonFactory, rootUrl, servicePath, httpRequestInitializer);
+      String servicePath, HttpRequestInitializer httpRequestInitializer,
+      boolean legacyDataWrapper) {
+    super(transport, jsonFactory, rootUrl, servicePath, httpRequestInitializer, legacyDataWrapper);
   }
 
   /**
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientTest.java
@@ -57,7 +57,7 @@ public LowLevelHttpResponse execute() {
     };
     JsonFactory jsonFactory = new JacksonFactory();
     MockGoogleJsonClient client =
-        new MockGoogleJsonClient(transport, jsonFactory, HttpTesting.SIMPLE_URL, "", null);
+        new MockGoogleJsonClient(transport, jsonFactory, HttpTesting.SIMPLE_URL, "", null, false);
     MockGoogleJsonClientRequest<String> request =
         new MockGoogleJsonClientRequest<String>(client, "GET", "foo", null, String.class);
     try {
