---

Praful Makani · sduskis · commit 9ef60e6e6a81 · 2019-03-10T11:03:15.000-04:00
yaml --- r: 22005 b: refs/heads/autosynth-video-intelligence c: a671baf h: refs/heads/master i: 22003: 9c0d332
diff --git a/[refs] b/[refs]
@@ -115,7 +115,7 @@ refs/heads/autosynth-compute: 026cea73fde22ec0b40866ac5a7dc144dc465b9b
 refs/heads/autosynth-container: d17e1a76a903f9e05eba56a9bf5d12c1b15b67d7
 refs/heads/autosynth-monitoring: e66569bd7358a90d17097f90cf8c70dbeeb048cf
 refs/heads/autosynth-pubsub: 39d0c11469a8084ece7c1ff58809f24da0316ae6
-refs/heads/autosynth-video-intelligence: 04206ac472d8d68dd30c9dd7bbabcc89453b2d72
+refs/heads/autosynth-video-intelligence: a671baf76464f1e50e15f193e4c4e8a30309c8ee
 refs/heads/autosynth-vision: 7d58f59617722175b83a4583efdb6eb9b5b8e8dd
 refs/heads/spanner: b01127f885b4611bf1852abb0ce481eeb7fcc131
 refs/tags/v0.68.0: 9cc799fcf68c82ab431d425fefa58ef615ce8e5b
diff --git a/branches/autosynth-video-intelligence/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java b/branches/autosynth-video-intelligence/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java
@@ -27,6 +27,8 @@
 import org.threeten.bp.LocalDateTime;
 import org.threeten.bp.ZoneOffset;
 import org.threeten.bp.format.DateTimeFormatter;
+import org.threeten.bp.format.DateTimeFormatterBuilder;
+import org.threeten.bp.temporal.TemporalAccessor;
 
 /**
  * Represents a timestamp with nanosecond precision. Timestamps cover the range [0001-01-01,
@@ -47,6 +49,15 @@ public final class Timestamp implements Comparable<Timestamp>, Serializable {
 
   private static final DateTimeFormatter format = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
 
+  private static final DateTimeFormatter timestampParser =
+      new DateTimeFormatterBuilder()
+          .appendOptional(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+          .optionalStart()
+          .appendOffsetId()
+          .optionalEnd()
+          .toFormatter()
+          .withZone(ZoneOffset.UTC);
+
   private final long seconds;
   private final int nanos;
 
@@ -170,7 +181,8 @@ public com.google.protobuf.Timestamp toProto() {
    * the timezone offset (always ends in "Z").
    */
   public static Timestamp parseTimestamp(String timestamp) {
-    Instant instant = Instant.parse(timestamp);
+    TemporalAccessor temporalAccessor = timestampParser.parse(timestamp);
+    Instant instant = Instant.from(temporalAccessor);
     return ofTimeSecondsAndNanos(instant.getEpochSecond(), instant.getNano());
   }
 
diff --git a/branches/autosynth-video-intelligence/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java b/branches/autosynth-video-intelligence/google-cloud-clients/google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java
@@ -185,6 +185,15 @@ public void parseTimestamp() {
         .isEqualTo(Timestamp.ofTimeSecondsAndNanos(TEST_TIME_SECONDS, 0));
   }
 
+  @Test
+  public void parseTimestampWithoutTimeZoneOffset() {
+    assertThat(Timestamp.parseTimestamp("0001-01-01T00:00:00")).isEqualTo(Timestamp.MIN_VALUE);
+    assertThat(Timestamp.parseTimestamp("9999-12-31T23:59:59.999999999"))
+        .isEqualTo(Timestamp.MAX_VALUE);
+    assertThat(Timestamp.parseTimestamp("2015-10-12T15:14:54"))
+        .isEqualTo(Timestamp.ofTimeSecondsAndNanos(TEST_TIME_SECONDS, 0));
+  }
+
   @Test
   public void fromProto() {
     com.google.protobuf.Timestamp proto =
