Merge branch 'main' into PR #2663 to update

Author: lqiu96

.github/release-please.yml

@@ -1,6 +1,8 @@
 bumpMinorPreMajor: true
 handleGHRelease: true
 releaseType: java-yoshi
+extraFiles:
+  - google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
 branches:
   - bumpMinorPreMajor: true
     handleGHRelease: true
@@ -86,5 +88,11 @@ branches:
       - >-
         google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
     branch: 2.60.x
-extraFiles:
-  - google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-yoshi
+    extraFiles:
+      - >-
+        google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
+    branch: protobuf-4.x-rc
+    manifest: true

.kokoro/presubmit/graalvm-native-a.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {

.kokoro/presubmit/graalvm-native-b.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {

.kokoro/presubmit/graalvm-native-c.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/changestream/ReadChangeStreamMergingAcceptanceTest.java

@@ -285,20 +285,20 @@ public void test() throws Exception {
 
   private static boolean expectsError(ReadChangeStreamTest testCase) {
     List<ReadChangeStreamTest.Result> results = testCase.getResultsList();
-    return results != null && !results.isEmpty() && results.get(results.size() - 1).getError();
+    return !results.isEmpty() && results.get(results.size() - 1).getError();
   }
 
   private static List<ReadChangeStreamTest.Result> getNonExceptionResults(
       ReadChangeStreamTest testCase) {
     List<ReadChangeStreamTest.Result> results = testCase.getResultsList();
     List<ReadChangeStreamTest.Result> response = new ArrayList<>();
-    if (results != null) {
-      for (ReadChangeStreamTest.Result result : results) {
-        if (!result.getError()) {
-          response.add(result);
-        }
+
+    for (ReadChangeStreamTest.Result result : results) {
+      if (!result.getError()) {
+        response.add(result);
       }
     }
+
     return response;
   }
 }

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/readrows/ReadRowsMergingAcceptanceTest.java

@@ -142,20 +142,20 @@ public void test() throws Exception {
 
   private static boolean expectsError(ReadRowsTest rrt) {
     List<ReadRowsTest.Result> results = rrt.getResultsList();
-    return results != null && !results.isEmpty() && results.get(results.size() - 1).getError();
+    return !results.isEmpty() && results.get(results.size() - 1).getError();
   }
 
   private static List<ReadRowsTest.Result> getNonExceptionResults(ReadRowsTest rrt) {
     List<ReadRowsTest.Result> results = rrt.getResultsList();
 
     List<ReadRowsTest.Result> response = new ArrayList<>();
-    if (results != null) {
-      for (ReadRowsTest.Result result : results) {
-        if (!result.getError()) {
-          response.add(result);
-        }
+
+    for (ReadRowsTest.Result result : results) {
+      if (!result.getError()) {
+        response.add(result);
       }
     }
+
     return response;
   }
 }