Support batchPath in Apiary/java library.

ethanbao · neozwu · commit 22e76833e8e0 · 2017-06-30T15:36:53.000-07:00
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=156272924
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClient.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClient.java
@@ -31,7 +31,7 @@
  */
 public abstract class AbstractGoogleClient {
 
-  static final Logger LOGGER = Logger.getLogger(AbstractGoogleClient.class.getName());
+  static final Logger logger = Logger.getLogger(AbstractGoogleClient.class.getName());
 
   /** The request factory for connections to the server. */
   private final HttpRequestFactory requestFactory;
@@ -53,6 +53,11 @@ public abstract class AbstractGoogleClient {
    */
   private final String servicePath;
 
+  /**
+   * Batch path, for example {@code "batch/tasks"}.  Must be URL-encoded.
+   */
+  private final String batchPath;
+
   /**
    * Application name to be sent in the User-Agent header of each request or {@code null} for none.
    */
@@ -76,8 +81,9 @@ protected AbstractGoogleClient(Builder builder) {
     googleClientRequestInitializer = builder.googleClientRequestInitializer;
     rootUrl = normalizeRootUrl(builder.rootUrl);
     servicePath = normalizeServicePath(builder.servicePath);
+    batchPath = builder.batchPath;
     if (Strings.isNullOrEmpty(builder.applicationName)) {
-      LOGGER.warning("Application name is not set. Call Builder#setApplicationName.");
+      logger.warning("Application name is not set. Call Builder#setApplicationName.");
     }
     applicationName = builder.applicationName;
     requestFactory = builder.httpRequestInitializer == null
@@ -228,7 +234,7 @@ public final BatchRequest batch() {
   public final BatchRequest batch(HttpRequestInitializer httpRequestInitializer) {
     BatchRequest batch =
         new BatchRequest(getRequestFactory().getTransport(), httpRequestInitializer);
-    batch.setBatchUrl(new GenericUrl(getRootUrl() + "batch"));
+    batch.setBatchUrl(new GenericUrl(getRootUrl() + batchPath));
     return batch;
   }
 
@@ -306,6 +312,9 @@ public abstract static class Builder {
     /** The service path of the service, for example {@code "tasks/v1/"}. */
     String servicePath;
 
+    /** The batch path of the service, for example {@code "batch/tasks"}. */
+    String batchPath;
+
     /**
      * Application name to be sent in the User-Agent header of each request or {@code null} for
      * none.
@@ -421,6 +430,14 @@ public Builder setServicePath(String servicePath) {
       return this;
     }
 
+    /**
+     * Sets the URL-encoded batch path of the service, for example {@code "batch/tasks"}.
+     */
+    public Builder setBatchPath(String batchPath) {
+      this.batchPath = batchPath;
+      return this;
+    }
+
     /** Returns the Google client request initializer or {@code null} for none. */
     public final GoogleClientRequestInitializer getGoogleClientRequestInitializer() {
       return googleClientRequestInitializer;
