Skip to content

Commit 861f958

Browse files
renovate-botrenovate-bot
authored
deps: update sdk-platform-java dependencies (#3046)
* deps: update sdk-platform-java dependencies * chore(fmt): rerun formatter due to update of formatter plugin * `com.spotify.fmt:fmt-maven-plugin:2.25` * `com.google.googlejavaformat:google-java-format:1.25.2`
1 parent 36ba110 commit 861f958

Some content is hidden

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

44 files changed

+118
-261
lines changed

‎.github/workflows/hermetic_library_generation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
fetch-depth: 0
4545
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
46-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.55.1
46+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.56.0
4747
if: env.SHOULD_RUN == 'true'
4848
with:
4949
base_ref: ${{ github.base_ref }}

‎.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.45.1
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.0
2121
with:
2222
bom-path: google-cloud-storage-bom/pom.xml

‎.kokoro/presubmit/graalvm-native-17.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.0"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.45.1"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.0"
77
}
88

99
env_vars: {

‎google-cloud-storage-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>com.google.cloud</groupId>
2626
<artifactId>sdk-platform-java-config</artifactId>
27-
<version>3.45.1</version>
27+
<version>3.46.0</version>
2828
<relativePath/>
2929
</parent>
3030

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public String toString() {
8080
interface BidiWriteObjectRequestBuilderFactory {
8181
BidiWriteObjectRequest.Builder newBuilder();
8282

83-
@Nullable
84-
String bucketName();
83+
@Nullable String bucketName();
8584
}
8685
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,7 @@ private void processRetryingMessages() {
360360
continue;
361361
}
362362
message =
363-
message
364-
.toBuilder()
363+
message.toBuilder()
365364
.setChecksummedData(ChecksummedData.newBuilder().setContent(after).build())
366365
.setWriteOffset(confirmed)
367366
.build();

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,8 +1723,7 @@ ReadObjectRequest getReadObjectRequest(BlobId blob, Opts<ObjectSourceOpt> opts)
17231723
WriteObjectRequest getWriteObjectRequest(BlobInfo info, Opts<ObjectTargetOpt> opts) {
17241724
Object object = codecs.blobInfo().encode(info);
17251725
Object.Builder objectBuilder =
1726-
object
1727-
.toBuilder()
1726+
object.toBuilder()
17281727
// required if the data is changing
17291728
.clearChecksums()
17301729
// trimmed to shave payload size
@@ -1744,8 +1743,7 @@ WriteObjectRequest getWriteObjectRequest(BlobInfo info, Opts<ObjectTargetOpt> op
17441743
BidiWriteObjectRequest getBidiWriteObjectRequest(BlobInfo info, Opts<ObjectTargetOpt> opts) {
17451744
Object object = codecs.blobInfo().encode(info);
17461745
Object.Builder objectBuilder =
1747-
object
1748-
.toBuilder()
1746+
object.toBuilder()
17491747
// required if the data is changing
17501748
.clearChecksums()
17511749
// trimmed to shave payload size

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,7 @@ private Tuple<StorageSettings, Opts<UserProject>> resolveSettingsAndOpts() throw
341341
builder.setTransportChannelProvider(channelProviderBuilder.build());
342342
RetrySettings baseRetrySettings = getRetrySettings();
343343
RetrySettings readRetrySettings =
344-
baseRetrySettings
345-
.toBuilder()
344+
baseRetrySettings.toBuilder()
346345
// when performing a read via ReadObject, the ServerStream will have a default relative
347346
// deadline set of `requestStartTime() + totalTimeout`, meaning if the specified
348347
// RetrySettings have a totalTimeout of 10 seconds -- which should be plenty for

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,9 @@ default Crc32cLengthKnown hash(Supplier<ByteBuffer> b) {
3838
return hash(b.get());
3939
}
4040

41-
@Nullable
42-
Crc32cLengthKnown hash(ByteBuffer b);
41+
@Nullable Crc32cLengthKnown hash(ByteBuffer b);
4342

44-
@Nullable
45-
Crc32cLengthKnown hash(ByteString byteString);
43+
@Nullable Crc32cLengthKnown hash(ByteString byteString);
4644

4745
void validate(Crc32cValue<?> expected, Supplier<ByteBuffer> b) throws ChecksumMismatchException;
4846

@@ -51,8 +49,7 @@ default Crc32cLengthKnown hash(Supplier<ByteBuffer> b) {
5149
void validateUnchecked(Crc32cValue<?> expected, ByteString byteString)
5250
throws UncheckedChecksumMismatchException;
5351

54-
@Nullable
55-
Crc32cLengthKnown nullSafeConcat(Crc32cLengthKnown r1, Crc32cLengthKnown r2);
52+
@Nullable Crc32cLengthKnown nullSafeConcat(Crc32cLengthKnown r1, Crc32cLengthKnown r2);
5653

5754
static Hasher noop() {
5855
return NoOpHasher.INSTANCE;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ void appendTo(@NonNull T t, ImmutableMap.Builder<String, String> b) {
5454
b.put(key, codec.encode(t));
5555
}
5656

57-
@Nullable
58-
T readFrom(BlobInfo info) {
57+
@Nullable T readFrom(BlobInfo info) {
5958
Map<String, String> map = info.getMetadata();
6059
if (map != null) {
6160
return readFrom(map);
@@ -64,8 +63,7 @@ T readFrom(BlobInfo info) {
6463
}
6564

6665
@VisibleForTesting
67-
@Nullable
68-
T readFrom(Map<String, String> m) {
66+
@Nullable T readFrom(Map<String, String> m) {
6967
return codec.decode(m.get(key));
7068
}
7169

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,7 @@ long newReadId() {
166166
return readIdSeq.getAndIncrement();
167167
}
168168

169-
@Nullable
170-
ObjectReadSessionStreamRead<?> getOutstandingRead(long key) {
169+
@Nullable ObjectReadSessionStreamRead<?> getOutstandingRead(long key) {
171170
lock.lock();
172171
try {
173172
return outstandingReads.get(key);

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ public Bucket create(BucketInfo bucketInfo, BucketTargetOption... options) {
153153
@Override
154154
public Blob create(BlobInfo blobInfo, BlobTargetOption... options) {
155155
BlobInfo updatedInfo =
156-
blobInfo
157-
.toBuilder()
156+
blobInfo.toBuilder()
158157
.setMd5(EMPTY_BYTE_ARRAY_MD5)
159158
.setCrc32c(EMPTY_BYTE_ARRAY_CRC32C)
160159
.build();
@@ -166,8 +165,7 @@ public Blob create(BlobInfo blobInfo, BlobTargetOption... options) {
166165
public Blob create(BlobInfo blobInfo, byte[] content, BlobTargetOption... options) {
167166
content = firstNonNull(content, EMPTY_BYTE_ARRAY);
168167
BlobInfo updatedInfo =
169-
blobInfo
170-
.toBuilder()
168+
blobInfo.toBuilder()
171169
.setMd5(BaseEncoding.base64().encode(Hashing.md5().hashBytes(content).asBytes()))
172170
.setCrc32c(
173171
BaseEncoding.base64()
@@ -182,8 +180,7 @@ public Blob create(
182180
BlobInfo blobInfo, byte[] content, int offset, int length, BlobTargetOption... options) {
183181
content = firstNonNull(content, EMPTY_BYTE_ARRAY);
184182
BlobInfo updatedInfo =
185-
blobInfo
186-
.toBuilder()
183+
blobInfo.toBuilder()
187184
.setMd5(
188185
BaseEncoding.base64()
189186
.encode(Hashing.md5().hashBytes(content, offset, length).asBytes()))

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ public String toString() {
8282
interface WriteObjectRequestBuilderFactory {
8383
WriteObjectRequest.Builder newBuilder();
8484

85-
@Nullable
86-
String bucketName();
85+
@Nullable String bucketName();
8786

8887
static SimpleWriteObjectRequestBuilderFactory simple(WriteObjectRequest req) {
8988
return new SimpleWriteObjectRequestBuilderFactory(req);

‎google-cloud-storage/src/main/java/com/google/cloud/storage/transfermanager/TransferManagerImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ final class TransferManagerImpl implements TransferManager {
7171
String userAgent = storageOptions.getUserAgent();
7272
if (userAgent == null || !userAgent.contains(USER_AGENT_ENTRY)) {
7373
storageOptions =
74-
storageOptions
75-
.toBuilder()
74+
storageOptions.toBuilder()
7675
.setHeaderProvider(
7776
FixedHeaderProvider.create(
7877
ImmutableMap.of("User-Agent", USER_AGENT_ENTRY + LIBRARY_VERSION)))

‎google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -735,8 +735,7 @@ public void testListDefaultAcls() throws Exception {
735735
public void testLockRetention() throws Exception {
736736
initializeExpectedBucket();
737737
Bucket expectedRetentionLockedBucket =
738-
expectedBucket
739-
.toBuilder()
738+
expectedBucket.toBuilder()
740739
.setRetentionPeriod(RETENTION_PERIOD)
741740
.setRetentionPolicyIsLocked(true)
742741
.build();

‎google-cloud-storage/src/test/java/com/google/cloud/storage/GenerateGrpcProtobufReflectConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ public static void main(String[] args) throws IOException {
5858
Stream.of(
5959
scanResult.getSubclasses(Message.class).stream(),
6060
scanResult.getSubclasses(AbstractMessage.Builder.class).stream(),
61-
scanResult.getAllEnums()
61+
scanResult
62+
.getAllEnums()
6263
.filter(ci -> ci.implementsInterface(ProtocolMessageEnum.class))
6364
.stream())
6465
.flatMap(s -> s)

‎google-cloud-storage/src/test/java/com/google/cloud/storage/ITAppendableUploadFakeTest.java

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -271,14 +271,9 @@ public void bidiWriteObjectRedirectedError_maxAttempts() throws Exception {
271271

272272
try (FakeServer fakeServer = FakeServer.of(fake);
273273
Storage storage =
274-
fakeServer
275-
.getGrpcStorageOptions()
276-
.toBuilder()
274+
fakeServer.getGrpcStorageOptions().toBuilder()
277275
.setRetrySettings(
278-
fakeServer
279-
.getGrpcStorageOptions()
280-
.getRetrySettings()
281-
.toBuilder()
276+
fakeServer.getGrpcStorageOptions().getRetrySettings().toBuilder()
282277
.setRetryDelayMultiplier(1.0)
283278
.setInitialRetryDelayDuration(Duration.ofMillis(10))
284279
.build())
@@ -546,8 +541,7 @@ public void testFlushMultipleSegments() throws Exception {
546541
new ChunkSegmenter(Hasher.noop(), ByteStringStrategy.copy(), 3, 3);
547542

548543
BidiWriteObjectRequest req1 =
549-
REQ_OPEN
550-
.toBuilder()
544+
REQ_OPEN.toBuilder()
551545
.setChecksummedData(
552546
ChecksummedData.newBuilder().setContent(ByteString.copyFromUtf8("ABC")))
553547
.build();
@@ -648,8 +642,7 @@ public void testFlushMultipleSegments_failsHalfway() throws Exception {
648642
new ChunkSegmenter(Hasher.noop(), ByteStringStrategy.copy(), 3, 3);
649643

650644
BidiWriteObjectRequest req1 =
651-
REQ_OPEN
652-
.toBuilder()
645+
REQ_OPEN.toBuilder()
653646
.setChecksummedData(
654647
ChecksummedData.newBuilder().setContent(ByteString.copyFromUtf8("ABC")))
655648
.build();
@@ -786,8 +779,7 @@ public void testFlushMultipleSegments_failsHalfway_partialFlush() throws Excepti
786779
new ChunkSegmenter(Hasher.noop(), ByteStringStrategy.copy(), 3, 3);
787780

788781
BidiWriteObjectRequest req1 =
789-
REQ_OPEN
790-
.toBuilder()
782+
REQ_OPEN.toBuilder()
791783
.setChecksummedData(
792784
ChecksummedData.newBuilder().setContent(ByteString.copyFromUtf8("ABC")))
793785
.build();
@@ -931,8 +923,7 @@ public void testFlushMultipleSegmentsTwice_firstSucceeds_secondFailsHalfway_part
931923
new ChunkSegmenter(Hasher.noop(), ByteStringStrategy.copy(), 3, 3);
932924

933925
BidiWriteObjectRequest req1 =
934-
REQ_OPEN
935-
.toBuilder()
926+
REQ_OPEN.toBuilder()
936927
.setChecksummedData(
937928
ChecksummedData.newBuilder().setContent(ByteString.copyFromUtf8("ABC")))
938929
.build();
@@ -1081,8 +1072,7 @@ public void testFlushMultipleSegments_200ResponsePartialFlushHalfway() throws Ex
10811072
new ChunkSegmenter(Hasher.noop(), ByteStringStrategy.copy(), 3, 3);
10821073

10831074
BidiWriteObjectRequest req1 =
1084-
REQ_OPEN
1085-
.toBuilder()
1075+
REQ_OPEN.toBuilder()
10861076
.setChecksummedData(
10871077
ChecksummedData.newBuilder().setContent(ByteString.copyFromUtf8("ABC")))
10881078
.build();
@@ -1227,8 +1217,7 @@ public void testFlushMultipleSegments_200ResponsePartialFlushOnLastMessage() thr
12271217
new ChunkSegmenter(Hasher.noop(), ByteStringStrategy.copy(), 3, 3);
12281218

12291219
BidiWriteObjectRequest req1 =
1230-
REQ_OPEN
1231-
.toBuilder()
1220+
REQ_OPEN.toBuilder()
12321221
.setChecksummedData(
12331222
ChecksummedData.newBuilder().setContent(ByteString.copyFromUtf8("ABC")))
12341223
.build();

‎google-cloud-storage/src/test/java/com/google/cloud/storage/ITExtraHeadersOptionTest.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ public void setUp() throws Exception {
9191
storage =
9292
((HttpStorageOptions) baseStorage.getOptions())
9393
.toBuilder()
94-
.setTransportOptions(requestAuditing)
95-
// we're counting requests, disable retries so that if a request fails it won't
96-
// show up as a bad assertion of the test itself
97-
.setRetrySettings(ServiceOptions.getNoRetrySettings())
98-
.build()
99-
.getService();
94+
.setTransportOptions(requestAuditing)
95+
// we're counting requests, disable retries so that if a request fails it won't
96+
// show up as a bad assertion of the test itself
97+
.setRetrySettings(ServiceOptions.getNoRetrySettings())
98+
.build()
99+
.getService();
100100
break;
101101
case GRPC:
102102
GrpcRequestAuditing grpcRequestAuditing = new GrpcRequestAuditing();
@@ -105,8 +105,7 @@ public void setUp() throws Exception {
105105
GrpcInterceptorProvider grpcInterceptorProvider =
106106
grpcStorageOptions.getGrpcInterceptorProvider();
107107
storage =
108-
grpcStorageOptions
109-
.toBuilder()
108+
grpcStorageOptions.toBuilder()
110109
// we're counting requests, disable retries so that if a request fails it won't
111110
// show up as a bad assertion of the test itself
112111
.setRetrySettings(ServiceOptions.getNoRetrySettings())

‎google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicReadTimeoutTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@ public void readObject(
111111

112112
try (FakeServer server = FakeServer.of(fakeStorage)) {
113113
StorageSettings settings =
114-
server
115-
.getGrpcStorageOptions()
116-
.toBuilder()
114+
server.getGrpcStorageOptions().toBuilder()
117115
.setRetrySettings(
118116
RetrySettings.newBuilder()
119117
.setMaxAttempts(3)
@@ -190,9 +188,7 @@ public void readObject(
190188

191189
try (FakeServer server = FakeServer.of(fakeStorage)) {
192190
StorageSettings settings =
193-
server
194-
.getGrpcStorageOptions()
195-
.toBuilder()
191+
server.getGrpcStorageOptions().toBuilder()
196192
.setRetrySettings(
197193
RetrySettings.newBuilder()
198194
.setMaxAttempts(3)

‎google-cloud-storage/src/test/java/com/google/cloud/storage/ITGapicUnbufferedWritableByteChannelTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ public void directUpload() throws IOException, InterruptedException, ExecutionEx
128128

129129
byte[] bytes = DataGenerator.base64Characters().genBytes(40);
130130
WriteObjectRequest req1 =
131-
ITGapicUnbufferedWritableByteChannelTest.req1
132-
.toBuilder()
131+
ITGapicUnbufferedWritableByteChannelTest.req1.toBuilder()
133132
.clearUploadId()
134133
.setWriteObjectSpec(spec)
135134
.build();

0 commit comments

Comments
 (0)