review

stankiewicz · stankiewicz · commit 591f216317d9 · 2026-03-09T16:27:06.000+01:00
diff --git a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/artifacts/utils/ArtifactUtils.java b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/artifacts/utils/ArtifactUtils.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.it.gcp.artifacts.utils;
 
+import java.time.ZoneOffset;
 import static java.util.Arrays.stream;
 import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkArgument;
 
@@ -37,7 +38,7 @@ private ArtifactUtils() {}
   public static String createRunId() {
     return String.format(
         "%s-%s",
-        DateTimeFormatter.ofPattern("yyyyMMdd").withZone(ZoneId.of("UTC")).format(Instant.now()),
+        DateTimeFormatter.ofPattern("yyyyMMdd").withZone(ZoneOffset.UTC).format(Instant.now()),
         // by default some templates replace "dd" in the output paths with a day of the month, since
         // this id is used as a part of output paths replace "dd" with an arbitrary number to avoid
         // confusion and potential flaky tests
diff --git a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datastore/DatastoreUtils.java b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/datastore/DatastoreUtils.java
@@ -19,6 +19,7 @@
 
 import java.time.Instant;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.CaseFormat;
 
@@ -44,7 +45,7 @@ static String createTestId(String prefix) {
         CaseFormat.UPPER_CAMEL.converterTo(CaseFormat.LOWER_HYPHEN).convert(prefix);
     String formattedTimestamp =
         DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")
-            .withZone(ZoneId.of("UTC"))
+            .withZone(ZoneOffset.UTC)
             .format(Instant.now());
     return String.format("%s-%s", convertedPrefix, formattedTimestamp);
   }
diff --git a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/pubsub/PubsubUtils.java b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/pubsub/PubsubUtils.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.it.gcp.pubsub;
 
+import java.time.ZoneOffset;
 import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkArgument;
 
 import com.google.pubsub.v1.Subscription;
@@ -108,7 +109,7 @@ static String createTestId(String prefix) {
         CaseFormat.UPPER_CAMEL.converterTo(CaseFormat.LOWER_HYPHEN).convert(prefix);
     String formattedTimestamp =
         DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")
-            .withZone(ZoneId.of("UTC"))
+            .withZone(ZoneOffset.UTC)
             .format(Instant.now());
     return String.format("%s-%s", convertedPrefix, formattedTimestamp);
   }
diff --git a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOLT.java b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOLT.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.it.gcp.bigquery;
 
+import java.time.ZoneOffset;
 import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatResult;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -126,7 +127,7 @@ public void setup() {
     String tableName =
         "io-bq-table-"
             + DateTimeFormatter.ofPattern("MMddHHmmssSSS")
-                .withZone(ZoneId.of("UTC"))
+                .withZone(ZoneOffset.UTC)
                 .format(java.time.Instant.now())
             + UUID.randomUUID().toString().substring(0, 10);
     tableQualifier = String.format("%s:%s.%s", project, resourceManager.getDatasetId(), tableName);
diff --git a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOST.java b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryIOST.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.it.gcp.bigquery;
 
+import java.time.ZoneOffset;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -112,7 +113,7 @@ public void setup() {
     tableName =
         "io-bq-source-table-"
             + DateTimeFormatter.ofPattern("MMddHHmmssSSS")
-                .withZone(ZoneId.of("UTC"))
+                .withZone(ZoneOffset.UTC)
                 .format(java.time.Instant.now())
             + UUID.randomUUID().toString().substring(0, 10);
     tableQualifier = String.format("%s:%s.%s", project, resourceManager.getDatasetId(), tableName);
diff --git a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/spanner/SpannerIOLT.java b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/spanner/SpannerIOLT.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.it.gcp.spanner;
 
+import java.time.ZoneOffset;
 import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkArgument;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -76,7 +77,7 @@ public void setup() throws IOException {
     tableName =
         "io_spanner_"
             + DateTimeFormatter.ofPattern("MMddHHmmssSSS")
-                .withZone(ZoneId.of("UTC"))
+                .withZone(ZoneOffset.UTC)
                 .format(java.time.Instant.now())
             + UUID.randomUUID().toString().replace("-", "").substring(0, 10);
 
diff --git a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/spanner/SpannerIOST.java b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/spanner/SpannerIOST.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.it.gcp.spanner;
 
+import java.time.ZoneOffset;
 import static org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkArgument;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
@@ -89,7 +90,7 @@ public void setup() throws IOException {
     tableName =
         "io_spanner_"
             + DateTimeFormatter.ofPattern("MMddHHmmssSSS")
-                .withZone(ZoneId.of("UTC"))
+                .withZone(ZoneOffset.UTC)
                 .format(java.time.Instant.now())
             + UUID.randomUUID().toString().replace("-", "").substring(0, 10);
 
diff --git a/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/FileBasedIOLT.java b/it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/storage/FileBasedIOLT.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.it.gcp.storage;
 
+import java.time.ZoneOffset;
 import static org.apache.beam.it.truthmatchers.PipelineAsserts.assertThatResult;
 import static org.junit.Assert.assertEquals;
 
@@ -151,7 +152,7 @@ public void setup() {
     String tempDirName =
         "textiolt-"
             + DateTimeFormatter.ofPattern("MMddHHmmssSSS")
-                .withZone(ZoneId.of("UTC"))
+                .withZone(ZoneOffset.UTC)
                 .format(java.time.Instant.now())
             + UUID.randomUUID().toString().substring(0, 10);
     resourceManager.registerTempDir(tempDirName);
diff --git a/it/kafka/src/test/java/org/apache/beam/it/kafka/KafkaIOLT.java b/it/kafka/src/test/java/org/apache/beam/it/kafka/KafkaIOLT.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.it.kafka;
 
+import java.time.ZoneOffset;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
@@ -78,7 +79,7 @@ public void setup() throws IOException {
     kafkaTopic =
         "io-kafka-"
             + DateTimeFormatter.ofPattern("MMddHHmmssSSS")
-                .withZone(ZoneId.of("UTC"))
+                .withZone(ZoneOffset.UTC)
                 .format(java.time.Instant.now())
             + UUID.randomUUID().toString().substring(0, 10);
 
diff --git a/it/kafka/src/test/java/org/apache/beam/it/kafka/KafkaIOST.java b/it/kafka/src/test/java/org/apache/beam/it/kafka/KafkaIOST.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.it.kafka;
 
+import java.time.ZoneOffset;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -116,7 +117,7 @@ public void setup() {
     kafkaTopic =
         "io-kafka-"
             + DateTimeFormatter.ofPattern("MMddHHmmssSSS")
-                .withZone(ZoneId.of("UTC"))
+                .withZone(ZoneOffset.UTC)
                 .format(java.time.Instant.now())
             + UUID.randomUUID().toString().substring(0, 10);
     adminClient.createTopics(Collections.singletonList(new NewTopic(kafkaTopic, 1, (short) 3)));
diff --git a/sdks/java/extensions/sbe/src/test/java/org/apache/beam/sdk/extensions/sbe/SbeLogicalTypesTest.java b/sdks/java/extensions/sbe/src/test/java/org/apache/beam/sdk/extensions/sbe/SbeLogicalTypesTest.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.sdk.extensions.sbe;
 
+import java.time.ZoneOffset;
 import static org.junit.Assert.assertEquals;
 
 import java.time.Instant;
@@ -59,7 +60,7 @@ public void testTzTimestamp() {
 
   @Test
   public void testUtcTimeOnly() {
-    LocalTime time = LocalTime.now(ZoneId.of("UTC"));
+    LocalTime time = LocalTime.now(ZoneOffset.UTC);
     UTCTimeOnly timeOnly = new UTCTimeOnly();
 
     LocalTime afterConversions = timeOnly.toInputType(timeOnly.toBaseType(time));
@@ -79,7 +80,7 @@ public void testTzTimeOnly() {
 
   @Test
   public void testUtcDateOnly() {
-    LocalDate date = LocalDate.now(ZoneId.of("UTC"));
+    LocalDate date = LocalDate.now(ZoneOffset.UTC);
     UTCDateOnly dateOnly = new UTCDateOnly();
 
     LocalDate afterConversions = dateOnly.toInputType(dateOnly.toBaseType(date));
@@ -89,7 +90,7 @@ public void testUtcDateOnly() {
 
   @Test
   public void testLocalMktDate() {
-    LocalDate date = LocalDate.now(ZoneId.of("UTC"));
+    LocalDate date = LocalDate.now(ZoneOffset.UTC);
     LocalMktDate localMktDate = new LocalMktDate();
 
     LocalDate afterConversions = localMktDate.toInputType(localMktDate.toBaseType(date));
diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/schema/BeamSqlRowCoderTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/impl/schema/BeamSqlRowCoderTest.java
@@ -22,6 +22,7 @@
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import org.apache.beam.sdk.coders.Coder;
 import org.apache.beam.sdk.extensions.sql.impl.utils.CalciteUtils;
 import org.apache.beam.sdk.schemas.Schema;
@@ -71,9 +72,9 @@ public void encodeAndDecode() throws Exception {
                 1.1,
                 BigDecimal.ZERO,
                 "hello",
-                LocalTime.now(ZoneId.of("UTC")),
-                LocalDate.now(ZoneId.of("UTC")),
-                LocalDateTime.now(ZoneId.of("UTC")),
+                LocalTime.now(ZoneOffset.UTC),
+                LocalDate.now(ZoneOffset.UTC),
+                LocalDateTime.now(ZoneOffset.UTC),
                 DateTime.now().toInstant(),
                 true)
             .build();
diff --git a/sdks/java/io/azure/src/test/java/org/apache/beam/sdk/io/azure/blobstore/AzureBlobStoreFileSystemTest.java b/sdks/java/io/azure/src/test/java/org/apache/beam/sdk/io/azure/blobstore/AzureBlobStoreFileSystemTest.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.sdk.io.azure.blobstore;
 
+import java.time.ZoneOffset;
 import static java.util.UUID.randomUUID;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
@@ -112,7 +113,7 @@ public void beforeClass() {
     when(mockedBlobClient.getProperties()).thenReturn(mockedProperties);
     when(mockedProperties.getBlobSize()).thenReturn(Long.valueOf(1));
     when(mockedProperties.getLastModified())
-        .thenReturn(OffsetDateTime.now(java.time.ZoneOffset.UTC));
+        .thenReturn(OffsetDateTime.now(ZoneOffset.UTC));
     when(mockedContainerClient.listBlobs(any(ListBlobsOptions.class), any(Duration.class)))
         .thenReturn(mockedPagedIterable);
     when(mockedContainerClient.listBlobsByHierarchy(any(String.class)))
diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTestUtils.java b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/src/main/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTestUtils.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.sdk.io.elasticsearch;
 
+import java.time.ZoneOffset;
 import static org.apache.beam.sdk.io.elasticsearch.ElasticsearchIO.ConnectionConfiguration;
 import static org.apache.beam.sdk.io.elasticsearch.ElasticsearchIO.getBackendVersion;
 import static org.apache.beam.sdk.io.elasticsearch.ElasticsearchIO.parseResponse;
@@ -343,7 +344,7 @@ static long refreshIndexAndGetCurrentNumDocs(
   static List<String> createDocuments(long numDocs, InjectionMode injectionMode) {
 
     ArrayList<String> data = new ArrayList<>();
-    LocalDateTime baseDateTime = LocalDateTime.now(java.time.ZoneOffset.UTC);
+    LocalDateTime baseDateTime = LocalDateTime.now(ZoneOffset.UTC);
     for (int i = 0; i < numDocs; i++) {
       int index = i % FAMOUS_SCIENTISTS.length;
       // insert 2 malformed documents
diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtils.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryUtils.java
@@ -290,7 +290,7 @@ public abstract static class Builder {
             .appendFraction(java.time.temporal.ChronoField.NANO_OF_SECOND, 0, 9, true)
             .appendLiteral(" UTC")
             .toFormatter()
-            .withZone(java.time.ZoneId.of("UTC"));
+            .withZone(ZoneOffset.UTC);
   }
 
   private static final Map<TypeName, StandardSQLTypeName> BEAM_TO_BIGQUERY_TYPE_MAPPING =
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BeamRowToStorageApiProtoTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BeamRowToStorageApiProtoTest.java
@@ -17,6 +17,7 @@
  */
 package org.apache.beam.sdk.io.gcp.bigquery;
 
+import java.time.ZoneOffset;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -254,9 +255,9 @@ public class BeamRowToStorageApiProtoTest {
           .withFieldValue("arrayValue", ImmutableList.of("one", "two", "red", "blue"))
           .withFieldValue("arrayNullValue", null)
           .withFieldValue("iterableValue", ImmutableList.of("blue", "red", "two", "one"))
-          .withFieldValue("sqlDateValue", LocalDate.now(ZoneId.of("UTC")))
-          .withFieldValue("sqlTimeValue", LocalTime.now(ZoneId.of("UTC")))
-          .withFieldValue("sqlDatetimeValue", LocalDateTime.now(ZoneId.of("UTC")))
+          .withFieldValue("sqlDateValue", LocalDate.now(ZoneOffset.UTC))
+          .withFieldValue("sqlTimeValue", LocalTime.now(ZoneOffset.UTC))
+          .withFieldValue("sqlDatetimeValue", LocalDateTime.now(ZoneOffset.UTC))
           .withFieldValue("sqlTimestampValue", java.time.Instant.now().plus(123, ChronoUnit.MICROS))
           .withFieldValue("enumValue", TEST_ENUM.valueOf("RED"))
           .build();
diff --git a/sdks/java/io/influxdb/src/test/java/org/apache/beam/sdk/io/influxdb/GenerateData.java b/sdks/java/io/influxdb/src/test/java/org/apache/beam/sdk/io/influxdb/GenerateData.java
@@ -21,6 +21,7 @@
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -46,7 +47,7 @@ static List<String> getMetric(String metric, int number) {
                   random.nextInt(60),
                   random.nextInt(60),
                   random.nextInt(999999999 + 1)));
-      ZonedDateTime zdt = time.atZone(ZoneId.of("America/Los_Angeles"));
+      ZonedDateTime zdt = time.atZone(ZoneOffset.UTC);
       m.setTime(zdt.toInstant().toEpochMilli());
       m.setTimeUnit(TimeUnit.MILLISECONDS);
       element.add(m.getLineProtocol());
@@ -64,13 +65,13 @@ static List<String> getMultipleMetric(List<String> metrics, int number) {
         m.addField("field2", random.nextInt(100));
         LocalDateTime time =
             LocalDateTime.of(
-                LocalDate.now(ZoneId.of("America/Los_Angeles")),
+                LocalDate.now(ZoneOffset.UTC),
                 LocalTime.of(
                     random.nextInt(24),
                     random.nextInt(60),
                     random.nextInt(60),
                     random.nextInt(999999999 + 1)));
-        ZonedDateTime zdt = time.atZone(ZoneId.of("America/Los_Angeles"));
+        ZonedDateTime zdt = time.atZone(ZoneOffset.UTC);
         m.setTime(zdt.toInstant().toEpochMilli());
         m.setTimeUnit(TimeUnit.MILLISECONDS);
         element.add(m.getLineProtocol());
