Skip to content

Commit f23bbfa

Browse files
chore: merge main into generate-libraries-main
2 parents 76f23fd + b71cc13 commit f23bbfa

5 files changed

Lines changed: 20 additions & 8 deletions

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import java.time.Clock;
5757
import java.time.OffsetDateTime;
5858
import java.time.ZoneOffset;
59+
import java.time.temporal.ChronoUnit;
5960
import java.util.Arrays;
6061
import java.util.List;
6162
import java.util.stream.Collectors;
@@ -316,7 +317,9 @@ public void batch() throws Exception {
316317
batch.submit();
317318
assertAll(
318319
() -> assertThat(r1).isNotNull(),
319-
() -> assertThat(r2.get().getCustomTimeOffsetDateTime()).isEqualTo(now),
320+
() ->
321+
assertThat(r2.get().getCustomTimeOffsetDateTime().truncatedTo(ChronoUnit.MILLIS))
322+
.isEqualTo(now.truncatedTo(ChronoUnit.MILLIS)),
320323
() -> assertThat(r3.get()).isTrue(),
321324
() -> {
322325
IterableSubject subject = headers.assertRequestHeader(batchHeaderKey);

google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITBatchTest.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import java.time.Clock;
4949
import java.time.OffsetDateTime;
5050
import java.time.ZoneOffset;
51+
import java.time.temporal.ChronoUnit;
5152
import java.util.List;
5253
import java.util.stream.Collectors;
5354
import java.util.stream.IntStream;
@@ -238,15 +239,17 @@ public void batchSuccessiveUpdatesWork() {
238239
})
239240
.collect(Collectors.toList());
240241

241-
OffsetDateTime now1 = Clock.systemUTC().instant().atOffset(ZoneOffset.UTC);
242+
OffsetDateTime now1 =
243+
Clock.systemUTC().instant().atOffset(ZoneOffset.UTC).truncatedTo(ChronoUnit.MILLIS);
242244

243245
List<Blob> update1 =
244246
storage.update(
245247
blobs.stream()
246248
.map(id -> BlobInfo.newBuilder(id).setCustomTimeOffsetDateTime(now1).build())
247249
.collect(Collectors.toList()));
248250

249-
OffsetDateTime now2 = Clock.systemUTC().instant().atOffset(ZoneOffset.UTC);
251+
OffsetDateTime now2 =
252+
Clock.systemUTC().instant().atOffset(ZoneOffset.UTC).truncatedTo(ChronoUnit.MILLIS);
250253
List<Blob> update2 =
251254
storage.update(
252255
blobs.stream()
@@ -255,7 +258,10 @@ public void batchSuccessiveUpdatesWork() {
255258

256259
assertThat(
257260
update2.stream()
258-
.filter(b -> !now2.equals(b.getCustomTimeOffsetDateTime()))
261+
.filter(
262+
b ->
263+
!now2.equals(
264+
b.getCustomTimeOffsetDateTime().truncatedTo(ChronoUnit.MILLIS)))
259265
.map(BlobInfo::getBlobId)
260266
.map(BlobId::toGsUtilUriWithGeneration)
261267
.collect(Collectors.toList()))

google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITHttpIdempotencyTokenTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import java.time.Clock;
4848
import java.time.OffsetDateTime;
4949
import java.time.ZoneOffset;
50+
import java.time.temporal.ChronoUnit;
5051
import java.util.Arrays;
5152
import java.util.List;
5253
import java.util.stream.Collectors;
@@ -206,7 +207,9 @@ public void batch() throws Exception {
206207
batch.submit();
207208
assertAll(
208209
() -> assertThat(r1).isNotNull(),
209-
() -> assertThat(r2.get().getCustomTimeOffsetDateTime()).isEqualTo(now),
210+
() ->
211+
assertThat(r2.get().getCustomTimeOffsetDateTime().truncatedTo(ChronoUnit.MILLIS))
212+
.isEqualTo(now.truncatedTo(ChronoUnit.MILLIS)),
210213
() -> assertThat(r3.get()).isTrue(),
211214
() -> {
212215
IterableSubject subject =

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>org.junit</groupId>
7171
<artifactId>junit-bom</artifactId>
72-
<version>5.13.2</version>
72+
<version>5.13.3</version>
7373
<type>pom</type>
7474
<scope>import</scope>
7575
</dependency>
@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>com.google.apis</groupId>
8989
<artifactId>google-api-services-storage</artifactId>
90-
<version>v1-rev20250605-2.0.0</version>
90+
<version>v1-rev20250629-2.0.0</version>
9191
</dependency>
9292
<dependency>
9393
<groupId>com.google.cloud</groupId>

samples/snippets/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.google.cloud</groupId>
3333
<artifactId>libraries-bom</artifactId>
34-
<version>26.62.0</version>
34+
<version>26.63.0</version>
3535
<type>pom</type>
3636
<scope>import</scope>
3737
</dependency>

0 commit comments

Comments
 (0)