refactor(bigquery): Clean up sample test resources, fix comments (#3823)

whuffman36 · web-flow · commit 63b8bdb5f21a · 2025-06-04T10:30:43.000-07:00
* refactor(bigquery): Clean up sample test resources, fix comments

* fix style
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
@@ -441,9 +441,6 @@ public com.google.api.services.bigquery.model.Job call() throws IOException {
           && createException.getCause() != null
           && createException.getCause().getMessage() != null) {
 
-        /*GoogleJsonResponseException createExceptionCause =
-        (GoogleJsonResponseException) createException.getCause();*/
-
         Pattern pattern = Pattern.compile(".*Already.*Exists:.*Job.*", Pattern.CASE_INSENSITIVE);
         Matcher matcher = pattern.matcher(createException.getCause().getMessage());
 
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java
@@ -187,7 +187,7 @@ private Builder(com.google.api.services.bigquery.model.JobConfiguration configur
       this();
       JobConfigurationQuery queryConfigurationPb = configurationPb.getQuery();
       this.query = queryConfigurationPb.getQuery();
-      // Allows to get undeclaredqueryparameters in jobstatistics2
+      // Allows to get undeclared query parameters in jobstatistics
       if (queryConfigurationPb.getQueryParameters() == null
           && queryConfigurationPb.getParameterMode() != null) {
         parameterMode = queryConfigurationPb.getParameterMode();
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
@@ -208,10 +208,8 @@ public Dataset createSkipExceptionTranslation(Dataset dataset, Map<Option, ?> op
             .insert(dataset.getDatasetReference().getProjectId(), dataset)
             .setPrettyPrint(false)
             .setFields(Option.FIELDS.getString(options));
-    for (Map.Entry<Option, ?> entry : options.entrySet()) {
-      if (entry.getKey() == Option.ACCESS_POLICY_VERSION && entry.getValue() != null) {
-        bqCreateRequest.setAccessPolicyVersion((Integer) entry.getValue());
-      }
+    if (options.containsKey(Option.ACCESS_POLICY_VERSION)) {
+      bqCreateRequest.setAccessPolicyVersion((Integer) options.get(Option.ACCESS_POLICY_VERSION));
     }
     return bqCreateRequest.execute();
   }
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
@@ -1334,7 +1334,7 @@ public void testUpdateDatasetWithSelectedFields() {
   }
 
   @Test
-  public void testUpdateDatabaseWithAccessPolicyVersion() throws IOException {
+  public void testUpdateDatasetWithAccessPolicyVersion() throws IOException {
     String accessPolicyDataset = RemoteBigQueryHelper.generateDatasetName();
     ServiceAccountCredentials credentials =
         (ServiceAccountCredentials) GoogleCredentials.getApplicationDefault();
@@ -1827,7 +1827,7 @@ public void testCreateDatasetWithAccessPolicyVersion() throws IOException {
   }
 
   @Test(expected = BigQueryException.class)
-  public void testCreateDatabaseWithInvalidAccessPolicyVersion() throws IOException {
+  public void testCreateDatasetWithInvalidAccessPolicyVersion() throws IOException {
     String accessPolicyDataset = RemoteBigQueryHelper.generateDatasetName();
     ServiceAccountCredentials credentials =
         (ServiceAccountCredentials) GoogleCredentials.getApplicationDefault();
@@ -4040,8 +4040,7 @@ public void testBQResultSetPagination() throws SQLException {
     assertEquals(300000, cnt); // total 300000 rows should be read
   }
 
-  // @Test - Temporarily disabling till https://github.com/googleapis/gax-java/issues/1712 or
-  // b/235591056 are resolved
+  @Test
   public void testReadAPIIterationAndOrder()
       throws SQLException { // use read API to read 300K records and check the order
     String query =
@@ -4240,8 +4239,7 @@ public void testCreateDefaultConnection() throws BigQuerySQLException {
     assertTrue(connection.close());
   }
 
-  // @Test - Temporarily disabling till https://github.com/googleapis/gax-java/issues/1712 or
-  // b/235591056 are resolved
+  @Test
   public void testReadAPIConnectionMultiClose()
       throws
           SQLException { // use read API to read 300K records, then closes the connection. This test
diff --git a/samples/snippets/src/test/java/com/example/bigquery/GrantViewAccessIT.java b/samples/snippets/src/test/java/com/example/bigquery/GrantViewAccessIT.java
@@ -94,6 +94,7 @@ public void tearDown() {
     DeleteTable.deleteTable(viewDatasetName, viewName);
     DeleteTable.deleteTable(viewDatasetName, tableName);
     DeleteDataset.deleteDataset(PROJECT_ID, datasetName);
+    DeleteDataset.deleteDataset(PROJECT_ID, viewDatasetName);
     // restores print statements in the original method
     System.out.flush();
     System.setOut(originalPrintStream);

Original file line number	Diff line number	Diff line change
`@@ -208,10 +208,8 @@ public Dataset createSkipExceptionTranslation(Dataset dataset, Map<Option, ?> op`
`208`	`208`	`.insert(dataset.getDatasetReference().getProjectId(), dataset)`
`209`	`209`	`.setPrettyPrint(false)`
`210`	`210`	`.setFields(Option.FIELDS.getString(options));`
`211`		`- for (Map.Entry<Option, ?> entry : options.entrySet()) {`
`212`		`- if (entry.getKey() == Option.ACCESS_POLICY_VERSION && entry.getValue() != null) {`
`213`		`- bqCreateRequest.setAccessPolicyVersion((Integer) entry.getValue());`
`214`		`- }`
	`211`	`+ if (options.containsKey(Option.ACCESS_POLICY_VERSION)) {`
	`212`	`+ bqCreateRequest.setAccessPolicyVersion((Integer) options.get(Option.ACCESS_POLICY_VERSION));`
`215`	`213`	`}`
`216`	`214`	`return bqCreateRequest.execute();`
`217`	`215`	`}`