Merge branch 'main' into PR #3030 to update

Author: lqiu96

.github/release-please.yml

@@ -2,44 +2,22 @@ bumpMinorPreMajor: true
 handleGHRelease: true
 releaseType: java-yoshi
 branches:
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-yoshi
-    branch: java7
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.4.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.12.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.25.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.38.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 2.47.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 3.5.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 3.11.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-backport
-    branch: 3.15.x
-  - bumpMinorPreMajor: true
-    handleGHRelease: true
-    releaseType: java-yoshi
-    branch: protobuf-4.x-rc
-    manifest: true
+    - branch: java7
+    - branch: 2.4.x
+      releaseType: java-backport
+    - branch: 2.12.x
+      releaseType: java-backport
+    - branch: 2.25.x
+      releaseType: java-backport
+    - branch: 2.38.x
+      releaseType: java-backport
+    - branch: 2.47.x
+      releaseType: java-backport
+    - branch: 3.5.x
+      releaseType: java-backport
+    - branch: 3.11.x
+      releaseType: java-backport
+    - branch: 3.15.x
+      releaseType: java-backport
+    - branch: protobuf-4.x-rc
+      manifest: true

google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/BigQueryReadClientTest.java

@@ -52,7 +52,10 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
+@Execution(ExecutionMode.SAME_THREAD)
 class BigQueryReadClientTest {
   private static MockBigQueryRead mockBigQueryRead;
   private static MockServiceHelper serviceHelper;

google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerPoolTest.java

@@ -47,7 +47,10 @@
 import java.util.function.Supplier;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
+@Execution(ExecutionMode.SAME_THREAD)
 class ConnectionWorkerPoolTest {
 
   private FakeBigQueryWrite testBigQueryWrite;

google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerTest.java

@@ -64,7 +64,10 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
+@Execution(ExecutionMode.SAME_THREAD)
 class ConnectionWorkerTest {
   private static final Logger log = Logger.getLogger(StreamWriter.class.getName());
   private static final String TEST_STREAM_1 = "projects/p1/datasets/d1/tables/t1/streams/s1";

google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriterTest.java

@@ -66,7 +66,10 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
+@Execution(ExecutionMode.SAME_THREAD)
 class JsonStreamWriterTest {
 
   private static final int NUMERIC_SCALE = 9;

google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/RequestProfilerTest.java

@@ -31,7 +31,10 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
+@Execution(ExecutionMode.SAME_THREAD)
 class RequestProfilerTest {
   private static final Logger log = Logger.getLogger(RequestProfiler.class.getName());
 
@@ -164,6 +167,9 @@ void concurrentProfilingTest_1000ReqsRunTogether() throws Exception {
     assertTrue(reportText.contains("Request uuid: request_30 with total time"));
     assertTrue(reportText.contains("Request uuid: request_25 with total time"));
     assertTrue(reportText.contains("Request uuid: request_20 with total time"));
+
+    threadPool.shutdown();
+    threadPool.awaitTermination(10, TimeUnit.SECONDS);
   }
 
   @Test
@@ -208,5 +214,8 @@ void concurrentProfilingTest_RunWhileFlushing() throws Exception {
     }
     String reportText = profilerHook.flushAndGenerateReportText();
     assertTrue(reportText.contains("0 requests finished during"));
+
+    threadPool.shutdown();
+    threadPool.awaitTermination(10, TimeUnit.SECONDS);
   }
 }

google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/StreamWriterTest.java

@@ -95,7 +95,10 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
+@Execution(ExecutionMode.SAME_THREAD)
 class StreamWriterTest {
 
   private static final Logger log = Logger.getLogger(StreamWriterTest.class.getName());

google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryStorageWriteClientTest.java

@@ -95,8 +95,11 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
 /** Integration tests for BigQuery Write API. */
+@Execution(ExecutionMode.SAME_THREAD)
 class ITBigQueryStorageWriteClientTest {
   private static final Logger LOG =
       Logger.getLogger(ITBigQueryStorageWriteClientTest.class.getName());

google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/stub/ResourceHeaderTest.java

@@ -43,7 +43,7 @@ public class ResourceHeaderTest {
 
   private static final String TEST_STREAM_NAME = "streamName";
 
-  private static final String NAME = "resource-header-test:123";
+  private static final String NAME = "resource-header-test:123-v1";
 
   private static final String HEADER_NAME = "x-goog-request-params";
 

google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta1/BigQueryStorageClientTest.java

@@ -63,7 +63,10 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
+@Execution(ExecutionMode.SAME_THREAD)
 class BigQueryStorageClientTest {
   private static MockBigQueryStorage mockBigQueryStorage;
   private static MockServiceHelper serviceHelper;