Skip to content

Commit 77ab6a0

Browse files
committed
Merge branch 'main' into PR #3266 to update
2 parents cda8e49 + e7605ba commit 77ab6a0

File tree

37 files changed

+302
-567
lines changed

37 files changed

+302
-567
lines changed

.github/workflows/hermetic_library_generation.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: env.SHOULD_RUN == 'true'
3737
with:
3838
fetch-depth: 0
39-
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
39+
token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
4040
- name: is applicable
4141
env:
4242
# 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:
7777
echo "SHOULD_RUN=false" >> $GITHUB_ENV
7878
fi
7979
80-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.65.1
80+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.66.0
8181
if: env.SHOULD_RUN == 'true'
8282
with:
8383
base_ref: ${{ github.base_ref }}
8484
head_ref: ${{ github.head_ref }}
85-
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
85+
token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
# repository
1818
.kokoro/build.sh
1919
- name: Unmanaged dependency check
20-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.55.1
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.56.0
2121
with:
2222
bom-path: google-cloud-storage-bom/pom.xml

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
1919
<dependency>
2020
<groupId>com.google.cloud</groupId>
2121
<artifactId>libraries-bom</artifactId>
22-
<version>26.73.0</version>
22+
<version>26.74.0</version>
2323
<type>pom</type>
2424
<scope>import</scope>
2525
</dependency>
@@ -46,12 +46,12 @@ If you are using Maven without the BOM, add this to your dependencies:
4646
<dependency>
4747
<groupId>com.google.cloud</groupId>
4848
<artifactId>google-cloud-storage</artifactId>
49-
<version>2.61.0</version>
49+
<version>2.62.0</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>com.google.cloud</groupId>
5353
<artifactId>google-cloud-storage-control</artifactId>
54-
<version>2.61.0</version>
54+
<version>2.62.0</version>
5555
</dependency>
5656

5757
```
@@ -273,6 +273,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-storage/tree/
273273
| 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) |
274274
| 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) |
275275
| 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) |
276+
| 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) |
276277
| 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) |
277278
| 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) |
278279
| 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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>gapic-google-cloud-storage-v2</artifactId>
7-
<version>2.62.0</version><!-- {x-version-update:gapic-google-cloud-storage-v2:current} -->
7+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:gapic-google-cloud-storage-v2:current} -->
88
<name>gapic-google-cloud-storage-v2</name>
99
<description>GRPC library for gapic-google-cloud-storage-v2</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-storage-parent</artifactId>
13-
<version>2.62.0</version><!-- {x-version-update:google-cloud-storage:current} -->
13+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

google-cloud-storage-bom/pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<modelVersion>4.0.0</modelVersion>
2020
<groupId>com.google.cloud</groupId>
2121
<artifactId>google-cloud-storage-bom</artifactId>
22-
<version>2.62.0</version><!-- {x-version-update:google-cloud-storage:current} -->
22+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
2323
<packaging>pom</packaging>
2424
<parent>
2525
<groupId>com.google.cloud</groupId>
2626
<artifactId>sdk-platform-java-config</artifactId>
27-
<version>3.55.1</version>
27+
<version>3.56.0</version>
2828
<relativePath/>
2929
</parent>
3030

@@ -69,37 +69,37 @@
6969
<dependency>
7070
<groupId>com.google.cloud</groupId>
7171
<artifactId>google-cloud-storage</artifactId>
72-
<version>2.62.0</version><!-- {x-version-update:google-cloud-storage:current} -->
72+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
7373
</dependency>
7474
<dependency>
7575
<groupId>com.google.api.grpc</groupId>
7676
<artifactId>gapic-google-cloud-storage-v2</artifactId>
77-
<version>2.62.0</version><!-- {x-version-update:gapic-google-cloud-storage-v2:current} -->
77+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:gapic-google-cloud-storage-v2:current} -->
7878
</dependency>
7979
<dependency>
8080
<groupId>com.google.api.grpc</groupId>
8181
<artifactId>grpc-google-cloud-storage-v2</artifactId>
82-
<version>2.62.0</version><!-- {x-version-update:grpc-google-cloud-storage-v2:current} -->
82+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-storage-v2:current} -->
8383
</dependency>
8484
<dependency>
8585
<groupId>com.google.api.grpc</groupId>
8686
<artifactId>proto-google-cloud-storage-v2</artifactId>
87-
<version>2.62.0</version><!-- {x-version-update:proto-google-cloud-storage-v2:current} -->
87+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-storage-v2:current} -->
8888
</dependency>
8989
<dependency>
9090
<groupId>com.google.cloud</groupId>
9191
<artifactId>google-cloud-storage-control</artifactId>
92-
<version>2.62.0</version><!-- {x-version-update:google-cloud-storage-control:current} -->
92+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage-control:current} -->
9393
</dependency>
9494
<dependency>
9595
<groupId>com.google.api.grpc</groupId>
9696
<artifactId>grpc-google-cloud-storage-control-v2</artifactId>
97-
<version>2.62.0</version><!-- {x-version-update:grpc-google-cloud-storage-control-v2:current} -->
97+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-storage-control-v2:current} -->
9898
</dependency>
9999
<dependency>
100100
<groupId>com.google.api.grpc</groupId>
101101
<artifactId>proto-google-cloud-storage-control-v2</artifactId>
102-
<version>2.62.0</version><!-- {x-version-update:proto-google-cloud-storage-control-v2:current} -->
102+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-storage-control-v2:current} -->
103103
</dependency>
104104
</dependencies>
105105
</dependencyManagement>

google-cloud-storage-control/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.google.cloud</groupId>
77
<artifactId>google-cloud-storage-control</artifactId>
8-
<version>2.62.0</version><!-- {x-version-update:google-cloud-storage-control:current} -->
8+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage-control:current} -->
99
<name>google-cloud-storage-control</name>
1010
<description>GRPC library for google-cloud-storage-control</description>
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-storage-parent</artifactId>
14-
<version>2.62.0</version><!-- {x-version-update:google-cloud-storage:current} -->
14+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
1515
</parent>
1616

1717
<dependencies>

google-cloud-storage/pom.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>google-cloud-storage</artifactId>
5-
<version>2.62.0</version><!-- {x-version-update:google-cloud-storage:current} -->
5+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
66
<packaging>jar</packaging>
77
<name>Google Cloud Storage</name>
88
<url>https://github.com/googleapis/java-storage</url>
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-storage-parent</artifactId>
15-
<version>2.62.0</version><!-- {x-version-update:google-cloud-storage:current} -->
15+
<version>2.62.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
1616
</parent>
1717
<properties>
1818
<site.installationModule>google-cloud-storage</site.installationModule>
@@ -151,6 +151,14 @@
151151
<dependency>
152152
<groupId>io.grpc</groupId>
153153
<artifactId>grpc-opentelemetry</artifactId>
154+
<exclusions>
155+
<exclusion>
156+
<!-- grpc depends on opentelemetry 1.52.0 but the version in shared config
157+
is 1.51.0 -->
158+
<groupId>io.opentelemetry</groupId>
159+
<artifactId>opentelemetry-api</artifactId>
160+
</exclusion>
161+
</exclusions>
154162
</dependency>
155163
<dependency>
156164
<groupId>io.opentelemetry</groupId>

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

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.cloud.storage;
1818

19-
import com.google.api.core.BetaApi;
2019
import com.google.api.core.InternalExtensionOnly;
2120
import com.google.cloud.storage.multipartupload.model.AbortMultipartUploadRequest;
2221
import com.google.cloud.storage.multipartupload.model.AbortMultipartUploadResponse;
@@ -38,9 +37,8 @@
3837
* low-level interface for creating and managing multipart uploads.
3938
*
4039
* @see <a href="https://cloud.google.com/storage/docs/multipart-uploads">Multipart Uploads</a>
41-
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
40+
* @since 2.60.0
4241
*/
43-
@BetaApi
4442
@InternalExtensionOnly
4543
public abstract class MultipartUploadClient {
4644

@@ -51,9 +49,8 @@ public abstract class MultipartUploadClient {
5149
*
5250
* @param request The request object containing the details for creating the multipart upload.
5351
* @return A {@link CreateMultipartUploadResponse} object containing the upload ID.
54-
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
52+
* @since 2.60.0
5553
*/
56-
@BetaApi
5754
public abstract CreateMultipartUploadResponse createMultipartUpload(
5855
CreateMultipartUploadRequest request);
5956

@@ -62,19 +59,17 @@ public abstract CreateMultipartUploadResponse createMultipartUpload(
6259
*
6360
* @param listPartsRequest The request object containing the details for listing the parts.
6461
* @return A {@link ListPartsResponse} object containing the list of parts.
65-
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
62+
* @since 2.60.0
6663
*/
67-
@BetaApi
6864
public abstract ListPartsResponse listParts(ListPartsRequest listPartsRequest);
6965

7066
/**
7167
* Aborts a multipart upload.
7268
*
7369
* @param request The request object containing the details for aborting the multipart upload.
7470
* @return An {@link AbortMultipartUploadResponse} object.
75-
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
71+
* @since 2.60.0
7672
*/
77-
@BetaApi
7873
public abstract AbortMultipartUploadResponse abortMultipartUpload(
7974
AbortMultipartUploadRequest request);
8075

@@ -84,9 +79,8 @@ public abstract AbortMultipartUploadResponse abortMultipartUpload(
8479
* @param request The request object containing the details for completing the multipart upload.
8580
* @return A {@link CompleteMultipartUploadResponse} object containing information about the
8681
* completed upload.
87-
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
82+
* @since 2.60.0
8883
*/
89-
@BetaApi
9084
public abstract CompleteMultipartUploadResponse completeMultipartUpload(
9185
CompleteMultipartUploadRequest request);
9286

@@ -96,19 +90,17 @@ public abstract CompleteMultipartUploadResponse completeMultipartUpload(
9690
* @param request The request object containing the details for uploading the part.
9791
* @param requestBody The content of the part to upload.
9892
* @return An {@link UploadPartResponse} object containing the ETag of the uploaded part.
99-
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
93+
* @since 2.60.0
10094
*/
101-
@BetaApi
10295
public abstract UploadPartResponse uploadPart(UploadPartRequest request, RequestBody requestBody);
10396

10497
/**
10598
* Lists all multipart uploads in a bucket.
10699
*
107100
* @param request The request object containing the details for listing the multipart uploads.
108101
* @return A {@link ListMultipartUploadsResponse} object containing the list of multipart uploads.
109-
* @since 2.61.0 This new api is in preview and is subject to breaking changes.
102+
* @since 2.61.0
110103
*/
111-
@BetaApi
112104
public abstract ListMultipartUploadsResponse listMultipartUploads(
113105
ListMultipartUploadsRequest request);
114106

@@ -117,9 +109,8 @@ public abstract ListMultipartUploadsResponse listMultipartUploads(
117109
*
118110
* @param config The configuration for the client.
119111
* @return A new {@link MultipartUploadClient} instance.
120-
* @since 2.60.0 This new api is in preview and is subject to breaking changes.
112+
* @since 2.60.0
121113
*/
122-
@BetaApi
123114
public static MultipartUploadClient create(MultipartUploadSettings config) {
124115
HttpStorageOptions options = config.getOptions();
125116
return new MultipartUploadClientImpl(

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
*/
1616
package com.google.cloud.storage;
1717

18-
import com.google.api.core.BetaApi;
19-
2018
/**
2119
* Settings for configuring the {@link MultipartUploadClient}.
2220
*
2321
* <p>This class is for internal use only and is not intended for public consumption.
2422
*/
25-
@BetaApi
2623
public final class MultipartUploadSettings {
2724
private final HttpStorageOptions options;
2825

@@ -35,7 +32,6 @@ private MultipartUploadSettings(HttpStorageOptions options) {
3532
*
3633
* @return The {@link HttpStorageOptions}.
3734
*/
38-
@BetaApi
3935
public HttpStorageOptions getOptions() {
4036
return options;
4137
}
@@ -47,7 +43,6 @@ public HttpStorageOptions getOptions() {
4743
* @param options The {@link HttpStorageOptions} to use.
4844
* @return A new {@code MultipartUploadSettings} instance.
4945
*/
50-
@BetaApi
5146
public static MultipartUploadSettings of(HttpStorageOptions options) {
5247
return new MultipartUploadSettings(options);
5348
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.cloud.storage;
1818

19-
import com.google.api.core.BetaApi;
2019
import com.google.api.core.InternalExtensionOnly;
2120
import java.io.IOException;
2221
import java.nio.ByteBuffer;
@@ -30,7 +29,6 @@
3029
* @see <a
3130
* href="https://cloud.google.com/storage/docs/multipart-uploads#upload_parts">https://cloud.google.com/storage/docs/multipart-uploads#upload_parts</a>
3231
*/
33-
@BetaApi
3432
@InternalExtensionOnly
3533
public final class RequestBody {
3634

@@ -45,25 +43,21 @@ RewindableContent getContent() {
4543
}
4644

4745
/** Create a new empty RequestBody. */
48-
@BetaApi
4946
public static RequestBody empty() {
5047
return new RequestBody(RewindableContent.empty());
5148
}
5249

5350
/** Create a new RequestBody from the given {@link ByteBuffer}s. */
54-
@BetaApi
5551
public static RequestBody of(ByteBuffer... buffers) {
5652
return new RequestBody(RewindableContent.of(buffers));
5753
}
5854

5955
/** Create a new RequestBody from the given {@link ByteBuffer}s. */
60-
@BetaApi
6156
public static RequestBody of(ByteBuffer[] srcs, int srcsOffset, int srcsLength) {
6257
return new RequestBody(RewindableContent.of(srcs, srcsOffset, srcsLength));
6358
}
6459

6560
/** Create a new RequestBody from the given {@link Path}. */
66-
@BetaApi
6761
public static RequestBody of(Path path) throws IOException {
6862
return new RequestBody(RewindableContent.of(path));
6963
}

0 commit comments

Comments
 (0)