chore: merge main into generate-libraries-main

Author: cloud-java-bot

.github/workflows/sdk-platform-java-downstream.yaml

@@ -23,6 +23,7 @@ jobs:
         filters: |
           library:
             - 'sdk-platform-java/**'
+            - .kokoro/downstream-compatibility.sh
   downstream-compatibility:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}

.kokoro/downstream-compatibility.sh

@@ -27,8 +27,6 @@ scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 cd "${scriptDir}/.." # cd to the root of this repo
 source "$scriptDir/common.sh"
 
-setup_maven_mirror
-
 install_modules "sdk-platform-java"
 cd sdk-platform-java
 
@@ -42,6 +40,9 @@ for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma
   git clone "https://github.com/googleapis/$repo.git" --depth=1 --branch "v$last_release"
   update_all_poms_dependency "$repo" google-cloud-shared-dependencies "$SHARED_DEPS_VERSION"
   pushd "$repo"
+  echo "Diff to run the test with modified dependencies:"
+  git --no-pager diff
+  echo "---------------"
   JOB_TYPE="test" ./.kokoro/build.sh
   popd
 done

generation_config.yaml

@@ -772,7 +772,7 @@ libraries:
   api_description: Database Center provides an organization-wide, cross-product fleet
     health platform to eliminate the overhead, complexity, and risk associated with
     aggregating and summarizing health signals through custom dashboards. Through
-    Database Center’s fleet health dashboard and API, database platform teams that
+    Database Center's fleet health dashboard and API, database platform teams that
     are responsible for reliability, compliance, security, cost, and administration
     of database fleets will now have a single pane of glass that pinpoints issues
     relevant to each team.
@@ -2924,7 +2924,7 @@ libraries:
   product_documentation: https://cloud.google.com/web-risk/docs/
   api_description: is a Google Cloud service that lets client applications check URLs
     against Google's constantly updated lists of unsafe web resources. Unsafe web
-    resources include social engineering sites—such as phishing and deceptive sites—and
+    resources include social engineering sites - such as phishing and deceptive sites - and
     sites that host malware or unwanted software. With the Web Risk API, you can quickly
     identify known bad sites, warn users before they click infected links, and prevent
     users from posting links to known infected pages from your site. The Web Risk

java-databasecenter/.repo-metadata.json

@@ -2,7 +2,7 @@
   "api_shortname": "databasecenter",
   "name_pretty": "Database Center API",
   "product_documentation": "https://cloud.google.com/database-center/docs/overview",
-  "api_description": "Database Center provides an organization-wide, cross-product fleet health platform to eliminate the overhead, complexity, and risk associated with aggregating and summarizing health signals through custom dashboards. Through Database Center\u2019s fleet health dashboard and API, database platform teams that are responsible for reliability, compliance, security, cost, and administration of database fleets will now have a single pane of glass that pinpoints issues relevant to each team.",
+  "api_description": "Database Center provides an organization-wide, cross-product fleet health platform to eliminate the overhead, complexity, and risk associated with aggregating and summarizing health signals through custom dashboards. Through Database Center's fleet health dashboard and API, database platform teams that are responsible for reliability, compliance, security, cost, and administration of database fleets will now have a single pane of glass that pinpoints issues relevant to each team.",
   "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-databasecenter/latest/overview",
   "release_level": "preview",
   "transport": "both",

java-databasecenter/README.md

@@ -87,7 +87,7 @@ to add `google-cloud-databasecenter` as a dependency in your code.
 ## About Database Center API
 
 
-[Database Center API][product-docs] Database Center provides an organization-wide, cross-product fleet health platform to eliminate the overhead, complexity, and risk associated with aggregating and summarizing health signals through custom dashboards. Through Database Center’s fleet health dashboard and API, database platform teams that are responsible for reliability, compliance, security, cost, and administration of database fleets will now have a single pane of glass that pinpoints issues relevant to each team.
+[Database Center API][product-docs] Database Center provides an organization-wide, cross-product fleet health platform to eliminate the overhead, complexity, and risk associated with aggregating and summarizing health signals through custom dashboards. Through Database Center's fleet health dashboard and API, database platform teams that are responsible for reliability, compliance, security, cost, and administration of database fleets will now have a single pane of glass that pinpoints issues relevant to each team.
 
 See the [Database Center API client library docs][javadocs] to learn how to
 use this Database Center API Client Library.

java-spanner/google-cloud-spanner/src/main/java/com/google/cloud/spanner/XGoogSpannerRequestId.java

@@ -42,16 +42,20 @@ public class XGoogSpannerRequestId {
   @VisibleForTesting
   static final long VERSION = 1; // The version of the specification being implemented.
 
+  private static final String STATIC_PREFIX = VERSION + "." + RAND_PROCESS_ID + ".";
+
   private final long nthClientId;
   private final long nthRequest;
   private long nthChannelId;
   private long attempt;
+  private final String instancePrefix;
 
   XGoogSpannerRequestId(long nthClientId, long nthChannelId, long nthRequest, long attempt) {
     this.nthClientId = nthClientId;
     this.nthChannelId = nthChannelId;
     this.nthRequest = nthRequest;
     this.attempt = attempt;
+    this.instancePrefix = STATIC_PREFIX + nthClientId + ".";
   }
 
   public static XGoogSpannerRequestId of(
@@ -122,26 +126,27 @@ private static String generateRandProcessId() {
 
   /** Returns the string representation of this RequestId as it should be sent to Spanner. */
   public String getHeaderValue() {
-    return String.format(
-        "%d.%s.%d.%d.%d.%d",
-        XGoogSpannerRequestId.VERSION,
-        XGoogSpannerRequestId.RAND_PROCESS_ID,
-        this.nthClientId,
-        this.nthChannelId,
-        this.nthRequest,
-        this.attempt);
+    return new StringBuilder(this.instancePrefix.length() + 48)
+        .append(this.instancePrefix)
+        .append(this.nthChannelId)
+        .append('.')
+        .append(this.nthRequest)
+        .append('.')
+        .append(this.attempt)
+        .toString();
   }
 
   @Override
   public String toString() {
-    return String.format(
-        "%d.%s.%d.%s.%d.%d",
-        XGoogSpannerRequestId.VERSION,
-        XGoogSpannerRequestId.RAND_PROCESS_ID,
-        this.nthClientId,
-        this.nthChannelId < 0 ? "x" : String.valueOf(this.nthChannelId),
-        this.nthRequest,
-        this.attempt);
+    StringBuilder sb = new StringBuilder(this.instancePrefix.length() + 48);
+    sb.append(this.instancePrefix);
+    if (this.nthChannelId < 0) {
+      sb.append('x');
+    } else {
+      sb.append(this.nthChannelId);
+    }
+    sb.append('.').append(this.nthRequest).append('.').append(this.attempt);
+    return sb.toString();
   }
 
   public String debugToString() {

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java

@@ -219,6 +219,9 @@ public PartialResultSet next() {
       PartialResultSet.Builder builder = PartialResultSet.newBuilder();
       if (first) {
         builder.setMetadata(resultSet.getMetadata());
+        if (resultSet.hasCacheUpdate()) {
+          builder.setCacheUpdate(resultSet.getCacheUpdate());
+        }
         first = false;
       }
       int recordCount = 0;
@@ -380,9 +383,6 @@ private static boolean isValidKeySet(KeySet keySet) {
       int keys = 0;
       for (Key key : keySet.getKeys()) {
         keys++;
-        if (key.size() != 0) {
-          return false;
-        }
       }
       return keys == 1;
     }