From 84d6632dbbdb9ccaf4afba545ec94a1156a989a2 Mon Sep 17 00:00:00 2001
From: Praful Makani <praful@qlogic.io>
Date: Wed, 23 Sep 2020 18:14:16 +0530
Subject: [PATCH] feat: use bigquery exception (#749)

---
 .../src/main/java/com/google/cloud/bigquery/Job.java |  4 +---
 .../test/java/com/google/cloud/bigquery/JobTest.java |  6 +++---
 .../com/google/cloud/bigquery/it/ITBigQueryTest.java | 12 +++++-------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java
index 1a8c27ccd..181370d74 100644
--- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java
+++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java
@@ -403,9 +403,7 @@ public Job reload(JobOption... options) {
     checkNotDryRun("reload");
     Job job = bigquery.getJob(getJobId(), options);
     if (job != null && job.getStatus().getError() != null) {
-      // TODO(pmakani): change to BigQueryException when fast query path change is merged
-      throw new JobException(
-          getJobId(),
+      throw new BigQueryException(
           job.getStatus().getExecutionErrors() == null
               ? ImmutableList.of(job.getStatus().getError())
               : ImmutableList.copyOf(job.getStatus().getExecutionErrors()));
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java
index 370b5d6d1..1f3cbe57e 100644
--- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java
+++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java
@@ -447,12 +447,12 @@ public void testReloadJobException() {
     expectedJob =
         expectedJob.toBuilder().setStatus(new JobStatus(State.DONE, bigQueryError, null)).build();
     ImmutableList<BigQueryError> bigQueryErrorList = ImmutableList.of(bigQueryError);
-    JobException jobException = new JobException(expectedJob.getJobId(), bigQueryErrorList);
-    when(bigquery.getJob(JOB_INFO.getJobId())).thenReturn(expectedJob).thenThrow(jobException);
+    BigQueryException bigQueryException = new BigQueryException(bigQueryErrorList);
+    when(bigquery.getJob(JOB_INFO.getJobId())).thenReturn(expectedJob).thenThrow(bigQueryException);
     try {
       job.reload();
       fail("JobException expected");
-    } catch (JobException e) {
+    } catch (BigQueryException e) {
       assertNotNull(e.getErrors());
     }
   }
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
index 795e70fca..a12bd59d2 100644
--- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
+++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
@@ -65,7 +65,6 @@
 import com.google.cloud.bigquery.InsertAllRequest;
 import com.google.cloud.bigquery.InsertAllResponse;
 import com.google.cloud.bigquery.Job;
-import com.google.cloud.bigquery.JobException;
 import com.google.cloud.bigquery.JobId;
 import com.google.cloud.bigquery.JobInfo;
 import com.google.cloud.bigquery.JobStatistics;
@@ -1493,12 +1492,11 @@ public void testMultipleStatementsQueryException() throws InterruptedException {
     try {
       bigquery.create(JobInfo.of(QueryJobConfiguration.of(invalidQuery))).waitFor();
       fail("JobException was expected");
-    } catch (JobException e) {
-      for (BigQueryError error : e.getErrors()) {
-        assertNotNull(error);
-        assertEquals("invalidQuery", error.getReason());
-        assertNotNull(error.getMessage());
-      }
+    } catch (BigQueryException e) {
+      BigQueryError error = e.getError();
+      assertNotNull(error);
+      assertEquals("invalidQuery", error.getReason());
+      assertNotNull(error.getMessage());
     }
   }