Merge branch 'main' into PR #3266 to update

Author: lqiu96

.github/workflows/hermetic_library_generation.yaml

@@ -36,7 +36,7 @@ jobs:
       if: env.SHOULD_RUN == 'true'
       with:
         fetch-depth: 0
-        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
     - name: is applicable
       env:
         # set our branch names to be the names in the "origin" remote since we aren't actually checking these branches out
@@ -77,9 +77,9 @@ jobs:
           echo "SHOULD_RUN=false" >> $GITHUB_ENV
         fi
 
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.65.1
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.66.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}
         head_ref: ${{ github.head_ref }}
-        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}

.github/workflows/unmanaged_dependency_check.yaml

@@ -17,6 +17,6 @@ jobs:
           # repository
           .kokoro/build.sh
       - name: Unmanaged dependency check
-        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.55.1
+        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.56.0
         with:
           bom-path: google-cloud-storage-bom/pom.xml

README.md

@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>26.73.0</version>
+      <version>26.74.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -46,12 +46,12 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-storage</artifactId>
-  <version>2.61.0</version>
+  <version>2.62.0</version>
 </dependency>
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-storage-control</artifactId>
-  <version>2.61.0</version>
+  <version>2.62.0</version>
 </dependency>
 
 ```
@@ -273,6 +273,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-storage/tree/
 | Get Uniform Bucket Level Access | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/bucket/GetUniformBucketLevelAccess.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/bucket/GetUniformBucketLevelAccess.java) |
 | List Bucket Iam Members | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/bucket/ListBucketIamMembers.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/bucket/ListBucketIamMembers.java) |
 | List Buckets | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/bucket/ListBuckets.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/bucket/ListBuckets.java) |
+| List Buckets With Partial Success | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/bucket/ListBucketsWithPartialSuccess.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/bucket/ListBucketsWithPartialSuccess.java) |
 | List Pub Sub Notifications | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/bucket/ListPubSubNotifications.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/bucket/ListPubSubNotifications.java) |
 | Lock Retention Policy | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/bucket/LockRetentionPolicy.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/bucket/LockRetentionPolicy.java) |
 | Make Bucket Public | [source code](https://github.com/googleapis/java-storage/blob/main/samples/snippets/src/main/java/com/example/storage/bucket/MakeBucketPublic.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-storage&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/storage/bucket/MakeBucketPublic.java) |

gapic-google-cloud-storage-v2/pom.xml

@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>gapic-google-cloud-storage-v2</artifactId>
-  <version>2.62.0</version><!-- {x-version-update:gapic-google-cloud-storage-v2:current} -->
+  <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:gapic-google-cloud-storage-v2:current} -->
   <name>gapic-google-cloud-storage-v2</name>
   <description>GRPC library for gapic-google-cloud-storage-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-storage-parent</artifactId>
-    <version>2.62.0</version><!-- {x-version-update:google-cloud-storage:current} -->
+    <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
   </parent>
   <dependencies>
     <dependency>

google-cloud-storage-bom/pom.xml

@@ -19,12 +19,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-storage-bom</artifactId>
-  <version>2.62.0</version><!-- {x-version-update:google-cloud-storage:current} -->
+  <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.55.1</version>
+    <version>3.56.0</version>
     <relativePath/>
   </parent>
 
@@ -69,37 +69,37 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-storage</artifactId>
-        <version>2.62.0</version><!-- {x-version-update:google-cloud-storage:current} -->
+        <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>gapic-google-cloud-storage-v2</artifactId>
-        <version>2.62.0</version><!-- {x-version-update:gapic-google-cloud-storage-v2:current} -->
+        <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:gapic-google-cloud-storage-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-storage-v2</artifactId>
-        <version>2.62.0</version><!-- {x-version-update:grpc-google-cloud-storage-v2:current} -->
+        <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-storage-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-storage-v2</artifactId>
-        <version>2.62.0</version><!-- {x-version-update:proto-google-cloud-storage-v2:current} -->
+        <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-storage-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-storage-control</artifactId>
-        <version>2.62.0</version><!-- {x-version-update:google-cloud-storage-control:current} -->
+        <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage-control:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-storage-control-v2</artifactId>
-        <version>2.62.0</version><!-- {x-version-update:grpc-google-cloud-storage-control-v2:current} -->
+        <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-storage-control-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-storage-control-v2</artifactId>
-        <version>2.62.0</version><!-- {x-version-update:proto-google-cloud-storage-control-v2:current} -->
+        <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-storage-control-v2:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>

google-cloud-storage-control/pom.xml

@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-storage-control</artifactId>
-    <version>2.62.0</version><!-- {x-version-update:google-cloud-storage-control:current} -->
+    <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage-control:current} -->
     <name>google-cloud-storage-control</name>
     <description>GRPC library for google-cloud-storage-control</description>
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-storage-parent</artifactId>
-        <version>2.62.0</version><!-- {x-version-update:google-cloud-storage:current} -->
+        <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
     </parent>
 
     <dependencies>

google-cloud-storage/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>google-cloud-storage</artifactId>
-  <version>2.62.0</version><!-- {x-version-update:google-cloud-storage:current} -->
+  <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Storage</name>
   <url>https://github.com/googleapis/java-storage</url>
@@ -12,7 +12,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-storage-parent</artifactId>
-    <version>2.62.0</version><!-- {x-version-update:google-cloud-storage:current} -->
+    <version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-storage</site.installationModule>
@@ -151,6 +151,14 @@
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-opentelemetry</artifactId>
+        <exclusions>
+            <exclusion>
+                <!-- grpc depends on opentelemetry 1.52.0 but the version in shared config
+                is 1.51.0 -->
+                <groupId>io.opentelemetry</groupId>
+                <artifactId>opentelemetry-api</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>

google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadClient.java

@@ -16,7 +16,6 @@
 
 package com.google.cloud.storage;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalExtensionOnly;
 import com.google.cloud.storage.multipartupload.model.AbortMultipartUploadRequest;
 import com.google.cloud.storage.multipartupload.model.AbortMultipartUploadResponse;
@@ -38,9 +37,8 @@
  * low-level interface for creating and managing multipart uploads.
  *
  * @see <a href="https://cloud.google.com/storage/docs/multipart-uploads">Multipart Uploads</a>
- * @since 2.60.0 This new api is in preview and is subject to breaking changes.
+ * @since 2.60.0
  */
-@BetaApi
 @InternalExtensionOnly
 public abstract class MultipartUploadClient {
 
@@ -51,9 +49,8 @@ public abstract class MultipartUploadClient {
    *
    * @param request The request object containing the details for creating the multipart upload.
    * @return A {@link CreateMultipartUploadResponse} object containing the upload ID.
-   * @since 2.60.0 This new api is in preview and is subject to breaking changes.
+   * @since 2.60.0
    */
-  @BetaApi
   public abstract CreateMultipartUploadResponse createMultipartUpload(
       CreateMultipartUploadRequest request);
 
@@ -62,19 +59,17 @@ public abstract CreateMultipartUploadResponse createMultipartUpload(
    *
    * @param listPartsRequest The request object containing the details for listing the parts.
    * @return A {@link ListPartsResponse} object containing the list of parts.
-   * @since 2.60.0 This new api is in preview and is subject to breaking changes.
+   * @since 2.60.0
    */
-  @BetaApi
   public abstract ListPartsResponse listParts(ListPartsRequest listPartsRequest);
 
   /**
    * Aborts a multipart upload.
    *
    * @param request The request object containing the details for aborting the multipart upload.
    * @return An {@link AbortMultipartUploadResponse} object.
-   * @since 2.60.0 This new api is in preview and is subject to breaking changes.
+   * @since 2.60.0
    */
-  @BetaApi
   public abstract AbortMultipartUploadResponse abortMultipartUpload(
       AbortMultipartUploadRequest request);
 
@@ -84,9 +79,8 @@ public abstract AbortMultipartUploadResponse abortMultipartUpload(
    * @param request The request object containing the details for completing the multipart upload.
    * @return A {@link CompleteMultipartUploadResponse} object containing information about the
    *     completed upload.
-   * @since 2.60.0 This new api is in preview and is subject to breaking changes.
+   * @since 2.60.0
    */
-  @BetaApi
   public abstract CompleteMultipartUploadResponse completeMultipartUpload(
       CompleteMultipartUploadRequest request);
 
@@ -96,19 +90,17 @@ public abstract CompleteMultipartUploadResponse completeMultipartUpload(
    * @param request The request object containing the details for uploading the part.
    * @param requestBody The content of the part to upload.
    * @return An {@link UploadPartResponse} object containing the ETag of the uploaded part.
-   * @since 2.60.0 This new api is in preview and is subject to breaking changes.
+   * @since 2.60.0
    */
-  @BetaApi
   public abstract UploadPartResponse uploadPart(UploadPartRequest request, RequestBody requestBody);
 
   /**
    * Lists all multipart uploads in a bucket.
    *
    * @param request The request object containing the details for listing the multipart uploads.
    * @return A {@link ListMultipartUploadsResponse} object containing the list of multipart uploads.
-   * @since 2.61.0 This new api is in preview and is subject to breaking changes.
+   * @since 2.61.0
    */
-  @BetaApi
   public abstract ListMultipartUploadsResponse listMultipartUploads(
       ListMultipartUploadsRequest request);
 
@@ -117,9 +109,8 @@ public abstract ListMultipartUploadsResponse listMultipartUploads(
    *
    * @param config The configuration for the client.
    * @return A new {@link MultipartUploadClient} instance.
-   * @since 2.60.0 This new api is in preview and is subject to breaking changes.
+   * @since 2.60.0
    */
-  @BetaApi
   public static MultipartUploadClient create(MultipartUploadSettings config) {
     HttpStorageOptions options = config.getOptions();
     return new MultipartUploadClientImpl(

google-cloud-storage/src/main/java/com/google/cloud/storage/MultipartUploadSettings.java

@@ -15,14 +15,11 @@
  */
 package com.google.cloud.storage;
 
-import com.google.api.core.BetaApi;
-
 /**
  * Settings for configuring the {@link MultipartUploadClient}.
  *
  * <p>This class is for internal use only and is not intended for public consumption.
  */
-@BetaApi
 public final class MultipartUploadSettings {
   private final HttpStorageOptions options;
 
@@ -35,7 +32,6 @@ private MultipartUploadSettings(HttpStorageOptions options) {
    *
    * @return The {@link HttpStorageOptions}.
    */
-  @BetaApi
   public HttpStorageOptions getOptions() {
     return options;
   }
@@ -47,7 +43,6 @@ public HttpStorageOptions getOptions() {
    * @param options The {@link HttpStorageOptions} to use.
    * @return A new {@code MultipartUploadSettings} instance.
    */
-  @BetaApi
   public static MultipartUploadSettings of(HttpStorageOptions options) {
     return new MultipartUploadSettings(options);
   }

google-cloud-storage/src/main/java/com/google/cloud/storage/RequestBody.java

@@ -16,7 +16,6 @@
 
 package com.google.cloud.storage;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalExtensionOnly;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -30,7 +29,6 @@
  * @see <a
  *     href="https://cloud.google.com/storage/docs/multipart-uploads#upload_parts">https://cloud.google.com/storage/docs/multipart-uploads#upload_parts</a>
  */
-@BetaApi
 @InternalExtensionOnly
 public final class RequestBody {
 
@@ -45,25 +43,21 @@ RewindableContent getContent() {
   }
 
   /** Create a new empty RequestBody. */
-  @BetaApi
   public static RequestBody empty() {
     return new RequestBody(RewindableContent.empty());
   }
 
   /** Create a new RequestBody from the given {@link ByteBuffer}s. */
-  @BetaApi
   public static RequestBody of(ByteBuffer... buffers) {
     return new RequestBody(RewindableContent.of(buffers));
   }
 
   /** Create a new RequestBody from the given {@link ByteBuffer}s. */
-  @BetaApi
   public static RequestBody of(ByteBuffer[] srcs, int srcsOffset, int srcsLength) {
     return new RequestBody(RewindableContent.of(srcs, srcsOffset, srcsLength));
   }
 
   /** Create a new RequestBody from the given {@link Path}. */
-  @BetaApi
   public static RequestBody of(Path path) throws IOException {
     return new RequestBody(RewindableContent.of(path));
   }