Skip to content

Commit 5ff03b3

Browse files
sydney-munrosydney-munro
authored
Merge branch 'main' into notifsamples
2 parents be1fac7 + c65b9d3 commit 5ff03b3

File tree

49 files changed

+3013
-2389
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+3013
-2389
lines changed

‎CHANGELOG.md‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
# Changelog
22

3+
## [2.6.0](https://github.com/googleapis/java-storage/compare/v2.5.1...v2.6.0) (2022-03-30)
4+
5+
6+
### Features
7+
8+
* replace enum with string representation for predefined ACLs and public_access_prevention ([#1323](https://github.com/googleapis/java-storage/issues/1323)) ([4dd1a88](https://github.com/googleapis/java-storage/commit/4dd1a8800317343bb0cd575864683e580f9ccd29))
9+
10+
11+
### Bug Fixes
12+
13+
* **java:** add configurations for Storage tests ([#1305](https://github.com/googleapis/java-storage/issues/1305)) ([2bacf92](https://github.com/googleapis/java-storage/commit/2bacf92799e8a0fbdc1b5cfcfc6ef8d806a53fa3))
14+
* update boundary checking of BlobReadChannel when limit() is used ([#1324](https://github.com/googleapis/java-storage/issues/1324)) ([f21f624](https://github.com/googleapis/java-storage/commit/f21f624f1645b5ada350c04c774f9f113e76e971))
15+
16+
17+
### Dependencies
18+
19+
* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.9.0 ([#1321](https://github.com/googleapis/java-storage/issues/1321)) ([f48d8dd](https://github.com/googleapis/java-storage/commit/f48d8dd09e918ba4a54fccaebf65feaba4f6e206))
20+
21+
22+
### Documentation
23+
24+
* adjust retry settings for hmac samples ([#1303](https://github.com/googleapis/java-storage/issues/1303)) ([d0c5361](https://github.com/googleapis/java-storage/commit/d0c5361e9e4996f8a99754381e5a28a843e6de2a))
25+
26+
### [2.5.1](https://github.com/googleapis/java-storage/compare/v2.5.0...v2.5.1) (2022-03-28)
27+
28+
29+
### Dependencies
30+
31+
* update dependency com.google.cloud:google-cloud-pubsub to v1.116.2 ([#1310](https://github.com/googleapis/java-storage/issues/1310)) ([fb64493](https://github.com/googleapis/java-storage/commit/fb644932d4350b4e33481abda8cc8f498f9da85e))
32+
333
## [2.5.0](https://github.com/googleapis/java-storage/compare/v2.4.5...v2.5.0) (2022-03-25)
434

535

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies:
4141
<dependency>
4242
<groupId>com.google.cloud</groupId>
4343
<artifactId>google-cloud-storage</artifactId>
44-
<version>2.5.0</version>
44+
<version>2.5.1</version>
4545
</dependency>
4646

4747
```

‎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.5.1-alpha-SNAPSHOT</version><!-- {x-version-update:gapic-google-cloud-storage-v2:current} -->
7+
<version>2.6.1-alpha-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.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
13+
<version>2.6.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

‎gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,8 @@ public final Bucket createBucket(String parent, Bucket bucket, String bucketId)
436436
* .setParent(ProjectName.of("[PROJECT]").toString())
437437
* .setBucket(Bucket.newBuilder().build())
438438
* .setBucketId("bucketId-1603305307")
439-
* .setPredefinedAcl(PredefinedBucketAcl.forNumber(0))
440-
* .setPredefinedDefaultObjectAcl(PredefinedObjectAcl.forNumber(0))
439+
* .setPredefinedAcl("predefinedAcl1207041188")
440+
* .setPredefinedDefaultObjectAcl("predefinedDefaultObjectAcl2109168048")
441441
* .build();
442442
* Bucket response = storageClient.createBucket(request);
443443
* }
@@ -463,8 +463,8 @@ public final Bucket createBucket(CreateBucketRequest request) {
463463
* .setParent(ProjectName.of("[PROJECT]").toString())
464464
* .setBucket(Bucket.newBuilder().build())
465465
* .setBucketId("bucketId-1603305307")
466-
* .setPredefinedAcl(PredefinedBucketAcl.forNumber(0))
467-
* .setPredefinedDefaultObjectAcl(PredefinedObjectAcl.forNumber(0))
466+
* .setPredefinedAcl("predefinedAcl1207041188")
467+
* .setPredefinedDefaultObjectAcl("predefinedDefaultObjectAcl2109168048")
468468
* .build();
469469
* ApiFuture<Bucket> future = storageClient.createBucketCallable().futureCall(request);
470470
* // Do something.
@@ -1089,8 +1089,8 @@ public final Bucket updateBucket(Bucket bucket, FieldMask updateMask) {
10891089
* .setBucket(Bucket.newBuilder().build())
10901090
* .setIfMetagenerationMatch(1043427781)
10911091
* .setIfMetagenerationNotMatch(1025430873)
1092-
* .setPredefinedAcl(PredefinedBucketAcl.forNumber(0))
1093-
* .setPredefinedDefaultObjectAcl(PredefinedObjectAcl.forNumber(0))
1092+
* .setPredefinedAcl("predefinedAcl1207041188")
1093+
* .setPredefinedDefaultObjectAcl("predefinedDefaultObjectAcl2109168048")
10941094
* .setUpdateMask(FieldMask.newBuilder().build())
10951095
* .setCommonRequestParams(CommonRequestParams.newBuilder().build())
10961096
* .build();
@@ -1118,8 +1118,8 @@ public final Bucket updateBucket(UpdateBucketRequest request) {
11181118
* .setBucket(Bucket.newBuilder().build())
11191119
* .setIfMetagenerationMatch(1043427781)
11201120
* .setIfMetagenerationNotMatch(1025430873)
1121-
* .setPredefinedAcl(PredefinedBucketAcl.forNumber(0))
1122-
* .setPredefinedDefaultObjectAcl(PredefinedObjectAcl.forNumber(0))
1121+
* .setPredefinedAcl("predefinedAcl1207041188")
1122+
* .setPredefinedDefaultObjectAcl("predefinedDefaultObjectAcl2109168048")
11231123
* .setUpdateMask(FieldMask.newBuilder().build())
11241124
* .setCommonRequestParams(CommonRequestParams.newBuilder().build())
11251125
* .build();
@@ -1576,7 +1576,7 @@ public final ListNotificationsPagedResponse listNotifications(ListNotificationsR
15761576
* ComposeObjectRequest.newBuilder()
15771577
* .setDestination(Object.newBuilder().build())
15781578
* .addAllSourceObjects(new ArrayList<ComposeObjectRequest.SourceObject>())
1579-
* .setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1579+
* .setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
15801580
* .setIfGenerationMatch(-1086241088)
15811581
* .setIfMetagenerationMatch(1043427781)
15821582
* .setKmsKey(
@@ -1608,7 +1608,7 @@ public final Object composeObject(ComposeObjectRequest request) {
16081608
* ComposeObjectRequest.newBuilder()
16091609
* .setDestination(Object.newBuilder().build())
16101610
* .addAllSourceObjects(new ArrayList<ComposeObjectRequest.SourceObject>())
1611-
* .setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1611+
* .setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
16121612
* .setIfGenerationMatch(-1086241088)
16131613
* .setIfMetagenerationMatch(1043427781)
16141614
* .setKmsKey(
@@ -1949,7 +1949,7 @@ public final Object updateObject(Object object, FieldMask updateMask) {
19491949
* .setIfGenerationNotMatch(1475720404)
19501950
* .setIfMetagenerationMatch(1043427781)
19511951
* .setIfMetagenerationNotMatch(1025430873)
1952-
* .setPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1952+
* .setPredefinedAcl("predefinedAcl1207041188")
19531953
* .setUpdateMask(FieldMask.newBuilder().build())
19541954
* .setCommonObjectRequestParams(CommonObjectRequestParams.newBuilder().build())
19551955
* .setCommonRequestParams(CommonRequestParams.newBuilder().build())
@@ -1980,7 +1980,7 @@ public final Object updateObject(UpdateObjectRequest request) {
19801980
* .setIfGenerationNotMatch(1475720404)
19811981
* .setIfMetagenerationMatch(1043427781)
19821982
* .setIfMetagenerationNotMatch(1025430873)
1983-
* .setPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1983+
* .setPredefinedAcl("predefinedAcl1207041188")
19841984
* .setUpdateMask(FieldMask.newBuilder().build())
19851985
* .setCommonObjectRequestParams(CommonObjectRequestParams.newBuilder().build())
19861986
* .setCommonRequestParams(CommonRequestParams.newBuilder().build())
@@ -2238,7 +2238,7 @@ public final UnaryCallable<ListObjectsRequest, ListObjectsResponse> listObjectsC
22382238
* .setSourceObject("sourceObject1196439354")
22392239
* .setSourceGeneration(1232209852)
22402240
* .setRewriteToken("rewriteToken80654285")
2241-
* .setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
2241+
* .setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
22422242
* .setIfGenerationMatch(-1086241088)
22432243
* .setIfGenerationNotMatch(1475720404)
22442244
* .setIfMetagenerationMatch(1043427781)
@@ -2285,7 +2285,7 @@ public final RewriteResponse rewriteObject(RewriteObjectRequest request) {
22852285
* .setSourceObject("sourceObject1196439354")
22862286
* .setSourceGeneration(1232209852)
22872287
* .setRewriteToken("rewriteToken80654285")
2288-
* .setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
2288+
* .setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
22892289
* .setIfGenerationMatch(-1086241088)
22902290
* .setIfGenerationNotMatch(1475720404)
22912291
* .setIfMetagenerationMatch(1043427781)

‎gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public void getBucketTest() throws Exception {
197197
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
198198
.setIamConfig(Bucket.IamConfig.newBuilder().build())
199199
.setSatisfiesPzs(true)
200-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
200+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
201201
.build();
202202
mockStorage.addResponse(expectedResponse);
203203

@@ -260,7 +260,7 @@ public void getBucketTest2() throws Exception {
260260
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
261261
.setIamConfig(Bucket.IamConfig.newBuilder().build())
262262
.setSatisfiesPzs(true)
263-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
263+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
264264
.build();
265265
mockStorage.addResponse(expectedResponse);
266266

@@ -323,7 +323,7 @@ public void createBucketTest() throws Exception {
323323
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
324324
.setIamConfig(Bucket.IamConfig.newBuilder().build())
325325
.setSatisfiesPzs(true)
326-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
326+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
327327
.build();
328328
mockStorage.addResponse(expectedResponse);
329329

@@ -392,7 +392,7 @@ public void createBucketTest2() throws Exception {
392392
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
393393
.setIamConfig(Bucket.IamConfig.newBuilder().build())
394394
.setSatisfiesPzs(true)
395-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
395+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
396396
.build();
397397
mockStorage.addResponse(expectedResponse);
398398

@@ -549,7 +549,7 @@ public void lockBucketRetentionPolicyTest() throws Exception {
549549
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
550550
.setIamConfig(Bucket.IamConfig.newBuilder().build())
551551
.setSatisfiesPzs(true)
552-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
552+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
553553
.build();
554554
mockStorage.addResponse(expectedResponse);
555555

@@ -613,7 +613,7 @@ public void lockBucketRetentionPolicyTest2() throws Exception {
613613
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
614614
.setIamConfig(Bucket.IamConfig.newBuilder().build())
615615
.setSatisfiesPzs(true)
616-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
616+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
617617
.build();
618618
mockStorage.addResponse(expectedResponse);
619619

@@ -927,7 +927,7 @@ public void updateBucketTest() throws Exception {
927927
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
928928
.setIamConfig(Bucket.IamConfig.newBuilder().build())
929929
.setSatisfiesPzs(true)
930-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
930+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
931931
.build();
932932
mockStorage.addResponse(expectedResponse);
933933

@@ -1337,7 +1337,7 @@ public void composeObjectTest() throws Exception {
13371337
ComposeObjectRequest.newBuilder()
13381338
.setDestination(Object.newBuilder().build())
13391339
.addAllSourceObjects(new ArrayList<ComposeObjectRequest.SourceObject>())
1340-
.setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1340+
.setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
13411341
.setIfGenerationMatch(-1086241088)
13421342
.setIfMetagenerationMatch(1043427781)
13431343
.setKmsKey(
@@ -1381,7 +1381,7 @@ public void composeObjectExceptionTest() throws Exception {
13811381
ComposeObjectRequest.newBuilder()
13821382
.setDestination(Object.newBuilder().build())
13831383
.addAllSourceObjects(new ArrayList<ComposeObjectRequest.SourceObject>())
1384-
.setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1384+
.setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
13851385
.setIfGenerationMatch(-1086241088)
13861386
.setIfMetagenerationMatch(1043427781)
13871387
.setKmsKey(
@@ -1926,7 +1926,7 @@ public void rewriteObjectTest() throws Exception {
19261926
.setSourceObject("sourceObject1196439354")
19271927
.setSourceGeneration(1232209852)
19281928
.setRewriteToken("rewriteToken80654285")
1929-
.setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1929+
.setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
19301930
.setIfGenerationMatch(-1086241088)
19311931
.setIfGenerationNotMatch(1475720404)
19321932
.setIfMetagenerationMatch(1043427781)
@@ -2012,7 +2012,7 @@ public void rewriteObjectExceptionTest() throws Exception {
20122012
.setSourceObject("sourceObject1196439354")
20132013
.setSourceGeneration(1232209852)
20142014
.setRewriteToken("rewriteToken80654285")
2015-
.setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
2015+
.setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
20162016
.setIfGenerationMatch(-1086241088)
20172017
.setIfGenerationNotMatch(1475720404)
20182018
.setIfMetagenerationMatch(1043427781)

‎google-cloud-storage/pom.xml‎

Lines changed: 2 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.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
5+
<version>2.6.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.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
15+
<version>2.6.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
1616
</parent>
1717
<properties>
1818
<site.installationModule>google-cloud-storage</site.installationModule>

‎google-cloud-storage/src/main/java/com/google/cloud/storage/BlobReadChannel.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@ public int read(ByteBuffer byteBuffer) throws IOException {
125125
}
126126
final int toRead =
127127
Math.toIntExact(Math.min(limit - position, Math.max(byteBuffer.remaining(), chunkSize)));
128+
if (toRead <= 0) {
129+
endOfStream = true;
130+
return -1;
131+
}
128132
try {
129133
ResultRetryAlgorithm<?> algorithm =
130134
retryAlgorithmManager.getForObjectsGet(storageObject, requestOptions);

‎google-cloud-storage/src/main/resources/META-INF/native-image/com/google/cloud/storage/proxy-config.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[
2+
{
3+
"interfaces":["com.google.cloud.storage.spi.v1.StorageRpc"]
4+
}
5+
]

‎google-cloud-storage/src/main/resources/META-INF/native-image/com/google/cloud/storage/reflect-config.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[{
2+
"name":"com.google.cloud.storage.BlobInfo$ImmutableEmptyMap",
3+
"methods":[{"name":"<init>","parameterTypes":[] }]}
4+
]

‎google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,13 @@ public static Collection<Object[]> testCases() throws IOException {
149149
.setMappings(new RpcMethodMappings())
150150
.setProjectId("conformance-tests")
151151
.setHost(TEST_BENCH.getBaseUri().replaceAll("https?://", ""))
152-
.setTestAllowFilter(RetryTestCaseResolver.includeAll())
152+
.setTestAllowFilter(
153+
RetryTestCaseResolver.includeAll()
154+
.and(
155+
(m, trc) ->
156+
trc.getScenarioId()
157+
< 7) // Temporarily exclude resumable media scenarios
158+
)
153159
.build();
154160

155161
List<RetryTestCase> retryTestCases = resolver.getRetryTestCases();

0 commit comments

Comments
 (0)