From a773b121d9de1976c19b08910e97622982cf530c Mon Sep 17 00:00:00 2001
From: Igor Dvorzhak <idv@google.com>
Date: Tue, 23 Jan 2018 13:42:18 -0800
Subject: [PATCH] Use new API-specific GCS batch endpoint

---
 .../java/com/google/cloud/hadoop/io/bigquery/CHANGES.txt     | 5 +++++
 gcs/CHANGES.txt                                              | 5 +++++
 .../main/java/com/google/cloud/hadoop/gcsio/BatchHelper.java | 4 ++++
 3 files changed, 14 insertions(+)

diff --git a/bigquery/src/main/java/com/google/cloud/hadoop/io/bigquery/CHANGES.txt b/bigquery/src/main/java/com/google/cloud/hadoop/io/bigquery/CHANGES.txt
index b25bfe0f13..f533008659 100644
--- a/bigquery/src/main/java/com/google/cloud/hadoop/io/bigquery/CHANGES.txt
+++ b/bigquery/src/main/java/com/google/cloud/hadoop/io/bigquery/CHANGES.txt
@@ -1,3 +1,8 @@
+0.10.4 - 2018-xx-xx
+
+  1. POM updates for GCS connector 1.6.3.
+
+
 0.10.3 - 2017-11-21
 
   1. POM updates for GCS connector 1.6.2.
diff --git a/gcs/CHANGES.txt b/gcs/CHANGES.txt
index 9d75edb942..fbafcd0d8c 100644
--- a/gcs/CHANGES.txt
+++ b/gcs/CHANGES.txt
@@ -1,3 +1,8 @@
+1.6.3 - 2018-xx-xx
+
+  1. Use new GCS batch requests endpoint.
+
+
 1.6.2 - 2017-11-21
 
   1. Wire HTTP transport settings into Credential logic.
diff --git a/gcsio/src/main/java/com/google/cloud/hadoop/gcsio/BatchHelper.java b/gcsio/src/main/java/com/google/cloud/hadoop/gcsio/BatchHelper.java
index 96e979afcc..adbc50d31b 100644
--- a/gcsio/src/main/java/com/google/cloud/hadoop/gcsio/BatchHelper.java
+++ b/gcsio/src/main/java/com/google/cloud/hadoop/gcsio/BatchHelper.java
@@ -70,6 +70,10 @@ private BatchHelper(HttpRequestInitializer requestInitializer, Storage gcs,
       long maxRequestsPerBatch) {
     this.pendingBatchEntries = new LinkedList<>();
     this.batch = gcs.batch(requestInitializer);
+    // If generic batch endpoint is used, force use of API-specific batch endpoint
+    if (this.batch.getBatchUrl().getRawPath().endsWith("batch")) {
+      this.batch.getBatchUrl().appendRawPath("/" + Storage.DEFAULT_SERVICE_PATH);
+    }
     this.maxRequestsPerBatch = maxRequestsPerBatch;
   }