Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1542,7 +1542,6 @@ class BeamModulePlugin implements Plugin<Project> {
"ExtendsAutoValue",
"InlineMeSuggester",
"InvalidBlockTag",
"JavaTimeDefaultTimeZone",
"JodaConstructors",
"MixedMutabilityReturnType",
"PreferJavaTimeOverload",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import com.google.cloud.storage.Storage;
import com.google.cloud.storage.StorageOptions;
import java.time.Instant;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.UUID;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Strings;
Expand All @@ -37,7 +37,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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.beam.it.gcp.datastore;

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;

Expand All @@ -44,7 +44,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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import com.google.pubsub.v1.Topic;
import com.google.pubsub.v1.TopicName;
import java.time.Instant;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down Expand Up @@ -108,7 +108,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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.nio.ByteBuffer;
import java.text.ParseException;
import java.time.Duration;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -126,7 +126,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.io.IOException;
import java.nio.ByteBuffer;
import java.time.Duration;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -112,7 +112,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import java.io.Serializable;
import java.text.ParseException;
import java.time.Duration;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -76,7 +76,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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import java.io.Serializable;
import java.text.ParseException;
import java.time.Duration;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -89,7 +89,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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.io.IOException;
import java.text.ParseException;
import java.time.Duration;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.Base64;
import java.util.Map;
Expand Down Expand Up @@ -151,7 +151,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.google.auto.value.AutoValue;
import java.io.IOException;
import java.time.Duration;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.Map;
import java.util.UUID;
Expand Down Expand Up @@ -78,7 +78,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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.io.IOException;
import java.text.ParseException;
import java.time.Duration;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.Collections;
import java.util.List;
Expand Down Expand Up @@ -116,7 +116,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)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.time.OffsetDateTime;
import java.time.OffsetTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import org.apache.beam.sdk.extensions.sbe.SbeLogicalTypes.LocalMktDate;
import org.apache.beam.sdk.extensions.sbe.SbeLogicalTypes.TZTimeOnly;
import org.apache.beam.sdk.extensions.sbe.SbeLogicalTypes.TZTimestamp;
Expand Down Expand Up @@ -59,7 +60,7 @@ public void testTzTimestamp() {

@Test
public void testUtcTimeOnly() {
LocalTime time = LocalTime.now();
LocalTime time = LocalTime.now(ZoneOffset.UTC);
UTCTimeOnly timeOnly = new UTCTimeOnly();

LocalTime afterConversions = timeOnly.toInputType(timeOnly.toBaseType(time));
Expand All @@ -79,7 +80,7 @@ public void testTzTimeOnly() {

@Test
public void testUtcDateOnly() {
LocalDate date = LocalDate.now();
LocalDate date = LocalDate.now(ZoneOffset.UTC);
UTCDateOnly dateOnly = new UTCDateOnly();

LocalDate afterConversions = dateOnly.toInputType(dateOnly.toBaseType(date));
Expand All @@ -89,7 +90,7 @@ public void testUtcDateOnly() {

@Test
public void testLocalMktDate() {
LocalDate date = LocalDate.now();
LocalDate date = LocalDate.now(ZoneOffset.UTC);
LocalMktDate localMktDate = new LocalMktDate();

LocalDate afterConversions = localMktDate.toInputType(localMktDate.toBaseType(date));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
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;
Expand Down Expand Up @@ -70,9 +71,9 @@ public void encodeAndDecode() throws Exception {
1.1,
BigDecimal.ZERO,
"hello",
LocalTime.now(),
LocalDate.now(),
LocalDateTime.now(),
LocalTime.now(ZoneOffset.UTC),
LocalDate.now(ZoneOffset.UTC),
LocalDateTime.now(ZoneOffset.UTC),
DateTime.now().toInstant(),
true)
.build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import java.nio.channels.WritableByteChannel;
import java.time.Duration;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -111,7 +112,7 @@ public void beforeClass() {
when(mockedBlobClient.getBlockBlobClient()).thenReturn(mockedBlockBlob);
when(mockedBlobClient.getProperties()).thenReturn(mockedProperties);
when(mockedProperties.getBlobSize()).thenReturn(Long.valueOf(1));
when(mockedProperties.getLastModified()).thenReturn(OffsetDateTime.now());
when(mockedProperties.getLastModified()).thenReturn(OffsetDateTime.now(ZoneOffset.UTC));
when(mockedContainerClient.listBlobs(any(ListBlobsOptions.class), any(Duration.class)))
.thenReturn(mockedPagedIterable);
when(mockedContainerClient.listBlobsByHierarchy(any(String.class)))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Expand Down Expand Up @@ -343,7 +344,7 @@ static long refreshIndexAndGetCurrentNumDocs(
static List<String> createDocuments(long numDocs, InjectionMode injectionMode) {

ArrayList<String> data = new ArrayList<>();
LocalDateTime baseDateTime = LocalDateTime.now();
LocalDateTime baseDateTime = LocalDateTime.now(ZoneOffset.UTC);
for (int i = 0; i < numDocs; i++) {
int index = i % FAMOUS_SCIENTISTS.length;
// insert 2 malformed documents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneOffset;
import java.time.temporal.ChronoUnit;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -252,9 +253,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())
.withFieldValue("sqlTimeValue", LocalTime.now())
.withFieldValue("sqlDatetimeValue", LocalDateTime.now())
.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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.time.LocalDate;
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;
Expand All @@ -40,13 +40,13 @@ static List<String> getMetric(String metric, int number) {
m.addField("field2", random.nextInt(100));
LocalDateTime time =
LocalDateTime.of(
LocalDate.now(),
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);
Comment thread
stankiewicz marked this conversation as resolved.
m.setTime(zdt.toInstant().toEpochMilli());
m.setTimeUnit(TimeUnit.MILLISECONDS);
element.add(m.getLineProtocol());
Expand All @@ -64,13 +64,13 @@ static List<String> getMultipleMetric(List<String> metrics, int number) {
m.addField("field2", random.nextInt(100));
LocalDateTime time =
LocalDateTime.of(
LocalDate.now(),
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());
Expand Down
Loading