BigQuery.getQueryResults no longer returns null on a 404 (#2469)

andreamlin · web-flow · commit 6983aa26fa95 · 2017-09-29T10:34:40.000-07:00
BigQuery.getQueryResults() returns a GetQueryResultsResponse, which should not be null even if a 404 was thrown. Returning a null results in BigQueryImpl.getQueryResults() throwing a NPE, which is less informative than a wrapped "Not Found" BigQueryException. This is similar to the behavior of BigQuery.query(), which returns a QueryResponse, and just bubbles up any exceptions, translated, without filtering for any particular exception. Resolves issue #2428.
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
@@ -385,11 +385,7 @@ public GetQueryResultsResponse getQueryResults(String projectId, String jobId,
           .setTimeoutMs(Option.TIMEOUT.getLong(options))
           .execute();
     } catch (IOException ex) {
-      BigQueryException serviceException = translate(ex);
-      if (serviceException.getCode() == HTTP_NOT_FOUND) {
-        return null;
-      }
-      throw serviceException;
+      throw translate(ex);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -385,11 +385,7 @@ public GetQueryResultsResponse getQueryResults(String projectId, String jobId,`
`385`	`385`	`.setTimeoutMs(Option.TIMEOUT.getLong(options))`
`386`	`386`	`.execute();`
`387`	`387`	`} catch (IOException ex) {`
`388`		`- BigQueryException serviceException = translate(ex);`
`389`		`- if (serviceException.getCode() == HTTP_NOT_FOUND) {`
`390`		`- return null;`
`391`		`- }`
`392`		`- throw serviceException;`
	`388`	`+ throw translate(ex);`
`393`	`389`	`}`
`394`	`390`	`}`
`395`	`391`