Merge branch 'main' into PR #3867 to update

Author: lqiu96

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java

@@ -7181,8 +7181,12 @@ public void testStatelessQueries() throws InterruptedException {
     // Stateless query should have no job id.
     bigQuery.getOptions().setDefaultJobCreationMode(JobCreationMode.JOB_CREATION_OPTIONAL);
     TableResult tableResult = executeSimpleQuery(bigQuery);
-    assertNotNull(tableResult.getQueryId());
-    assertNull(tableResult.getJobId());
+    // Use XOR: We accept EITHER a QueryId (fast path) OR a JobId (slow fallback), but not both.
+    // Ideally Stateless query will return queryId but in some cases it would return jobId instead
+    // of queryId based on the query complexity or other factors (job timeout configs).
+    assertTrue(
+        "Exactly one of jobId or queryId should be non-null",
+        (tableResult.getJobId() != null) ^ (tableResult.getQueryId() != null));
 
     // Job creation takes over, no query id is created.
     bigQuery.getOptions().setDefaultJobCreationMode(JobCreationMode.JOB_CREATION_REQUIRED);
@@ -7220,8 +7224,14 @@ public void testTableResultJobIdAndQueryId() throws InterruptedException {
     String query = "SELECT 1 as one";
     QueryJobConfiguration configStateless = QueryJobConfiguration.newBuilder(query).build();
     TableResult result = bigQuery.query(configStateless);
-    assertNull(result.getJobId());
-    assertNotNull(result.getQueryId());
+    // A stateless query should result in either a queryId (stateless success) or a jobId (fallback
+    // to a job).
+    // Exactly one of them should be non-null.
+    // Ideally Stateless query will return queryId but in some cases it would return jobId instead
+    // of queryId based on the query complexity or other factors (job timeout configs).
+    assertTrue(
+        "Exactly one of jobId or queryId should be non-null",
+        (result.getJobId() != null) ^ (result.getQueryId() != null));
 
     // Test scenario 2 by failing stateless check by setting job timeout.
     QueryJobConfiguration configQueryWithJob =

pom.xml

@@ -172,6 +172,8 @@
             <ignoredUnusedDeclaredDependency>io.netty:netty-common</ignoredUnusedDeclaredDependency>
             <ignoredUnusedDeclaredDependency>org.apache.arrow:arrow-memory-netty</ignoredUnusedDeclaredDependency>
             <ignoredUnusedDeclaredDependency>com.google.api:gax</ignoredUnusedDeclaredDependency>
+            <!-- maven-dependency-plugin cannot detect the runtime usage of junit-jupiter-engine for executing JUnit 5+ tests. -->
+            <ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredUnusedDeclaredDependency>
           </ignoredUnusedDeclaredDependencies>
         </configuration>
       </plugin>