googleapis · sduskis · Feb 12, 2019 · Feb 8, 2019 · Feb 8, 2019
diff --git a/google-cloud-clients/google-cloud-compute/pom.xml b/google-cloud-clients/google-cloud-compute/pom.xml
@@ -31,11 +31,6 @@
       <artifactId>google-api-services-compute</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <scope>compile</scope>
-    </dependency>
 
     <!-- Test dependencies -->
     <dependency>

diff --git a/...s/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AddressInfo.java b/...s/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/AddressInfo.java
@@ -27,8 +27,9 @@
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Objects;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
+import org.threeten.bp.Instant;
+import org.threeten.bp.ZoneOffset;
+import org.threeten.bp.format.DateTimeFormatter;
 
 /**
  * A Google Compute Engine address. With Compute Engine you can create static external IP addresses
@@ -61,7 +62,8 @@ public Address apply(AddressInfo addressInfo) {
       };
 
   private static final long serialVersionUID = 7678434703520207500L;
-  private static final DateTimeFormatter TIMESTAMP_FORMATTER = ISODateTimeFormat.dateTime();
+  private static final DateTimeFormatter TIMESTAMP_FORMATTER =
+      DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC);
 
   private final String address;
   private final Long creationTimestamp;
@@ -324,7 +326,10 @@ static final class BuilderImpl extends Builder {
       }
       address = addressPb.getAddress();
       if (addressPb.getCreationTimestamp() != null) {
-        creationTimestamp = TIMESTAMP_FORMATTER.parseMillis(addressPb.getCreationTimestamp());
+        creationTimestamp =
+            TIMESTAMP_FORMATTER
+                .parse(addressPb.getCreationTimestamp(), Instant.FROM)
+                .toEpochMilli();
       }
       description = addressPb.getDescription();
       if (addressPb.getId() != null) {
@@ -485,7 +490,8 @@ Address toPb() {
     Address addressPb = usage != null ? usage.toPb() : new Address();
     addressPb.setAddress(address);
     if (creationTimestamp != null) {
-      addressPb.setCreationTimestamp(TIMESTAMP_FORMATTER.print(creationTimestamp));
+      addressPb.setCreationTimestamp(
+          TIMESTAMP_FORMATTER.format(Instant.ofEpochMilli(creationTimestamp)));
     }
     addressPb.setDescription(description);
     if (generatedId != null) {

diff --git a/...le-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DeprecationStatus.java b/...le-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DeprecationStatus.java
@@ -22,8 +22,10 @@
 import com.google.common.base.MoreObjects;
 import java.io.Serializable;
 import java.util.Objects;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
+import org.threeten.bp.Instant;
+import org.threeten.bp.ZoneOffset;
+import org.threeten.bp.format.DateTimeFormatter;
+import org.threeten.bp.format.DateTimeParseException;
 
 /**
  * The deprecation status associated to a Google Compute Engine resource.
@@ -33,8 +35,8 @@
 public final class DeprecationStatus<T extends ResourceId> implements Serializable {
 
   private static final long serialVersionUID = -2695077634793679794L;
-  private static final DateTimeFormatter TIMESTAMP_FORMATTER = ISODateTimeFormat.dateTime();
-  private static final DateTimeFormatter TIMESTAMP_PARSER = ISODateTimeFormat.dateTimeParser();
+  private static final DateTimeFormatter TIMESTAMP_FORMATTER =
+      DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC);
 
   private final String deleted;
   private final String deprecated;
@@ -127,7 +129,7 @@ Builder<T> setObsolete(String obsolete) {
      * to {@link Status#DELETED}. In milliseconds since epoch.
      */
     public Builder<T> setDeleted(long deleted) {
-      this.deleted = TIMESTAMP_FORMATTER.print(deleted);
+      this.deleted = TIMESTAMP_FORMATTER.format(Instant.ofEpochMilli(deleted));
       return this;
     }
 
@@ -136,7 +138,7 @@ public Builder<T> setDeleted(long deleted) {
      * to {@link Status#DEPRECATED}. In milliseconds since epoch.
      */
     public Builder<T> setDeprecated(long deprecated) {
-      this.deprecated = TIMESTAMP_FORMATTER.print(deprecated);
+      this.deprecated = TIMESTAMP_FORMATTER.format(Instant.ofEpochMilli(deprecated));
       return this;
     }
 
@@ -145,7 +147,7 @@ public Builder<T> setDeprecated(long deprecated) {
      * to {@link Status#OBSOLETE}. In milliseconds since epoch.
      */
     public Builder<T> setObsolete(long obsolete) {
-      this.obsolete = TIMESTAMP_FORMATTER.print(obsolete);
+      this.obsolete = TIMESTAMP_FORMATTER.format(Instant.ofEpochMilli(obsolete));
       return this;
     }
 
@@ -222,8 +224,10 @@ public String getObsolete() {
    */
   public Long getDeletedMillis() {
     try {
-      return deleted != null ? TIMESTAMP_PARSER.parseMillis(deleted) : null;
-    } catch (IllegalArgumentException ex) {
+      return deleted != null
+          ? TIMESTAMP_FORMATTER.parse(deleted, Instant.FROM).toEpochMilli()
+          : null;
+    } catch (DateTimeParseException ex) {
       throw new IllegalStateException(ex.getMessage(), ex);
     }
   }
@@ -236,8 +240,10 @@ public Long getDeletedMillis() {
    */
   public Long getDeprecatedMillis() {
     try {
-      return deprecated != null ? TIMESTAMP_PARSER.parseMillis(deprecated) : null;
-    } catch (IllegalArgumentException ex) {
+      return deprecated != null
+          ? TIMESTAMP_FORMATTER.parse(deprecated, Instant.FROM).toEpochMilli()
+          : null;
+    } catch (DateTimeParseException ex) {
       throw new IllegalStateException(ex.getMessage(), ex);
     }
   }
@@ -250,8 +256,10 @@ public Long getDeprecatedMillis() {
    */
   public Long getObsoleteMillis() {
     try {
-      return obsolete != null ? TIMESTAMP_PARSER.parseMillis(obsolete) : null;
-    } catch (IllegalArgumentException ex) {
+      return obsolete != null
+          ? TIMESTAMP_FORMATTER.parse(obsolete, Instant.FROM).toEpochMilli()
+          : null;
+    } catch (DateTimeParseException ex) {
       throw new IllegalStateException(ex.getMessage(), ex);
     }
   }

diff --git a/...ents/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskInfo.java b/...ents/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskInfo.java
@@ -27,8 +27,9 @@
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Objects;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
+import org.threeten.bp.Instant;
+import org.threeten.bp.ZoneOffset;
+import org.threeten.bp.format.DateTimeFormatter;
 
 /**
  * A Google Compute Engine persistent disk. A disk can be used as primary storage for your virtual
@@ -54,7 +55,8 @@ public Disk apply(DiskInfo diskType) {
       };
 
   private static final long serialVersionUID = -7173418340679279619L;
-  private static final DateTimeFormatter TIMESTAMP_FORMATTER = ISODateTimeFormat.dateTime();
+  private static final DateTimeFormatter TIMESTAMP_FORMATTER =
+      DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC);
 
   private final String generatedId;
   private final DiskId diskId;
@@ -149,7 +151,8 @@ static final class BuilderImpl extends Builder {
       }
       this.configuration = DiskConfiguration.fromPb(diskPb);
       if (diskPb.getCreationTimestamp() != null) {
-        this.creationTimestamp = TIMESTAMP_FORMATTER.parseMillis(diskPb.getCreationTimestamp());
+        this.creationTimestamp =
+            TIMESTAMP_FORMATTER.parse(diskPb.getCreationTimestamp(), Instant.FROM).toEpochMilli();
       }
       if (diskPb.getStatus() != null) {
         this.creationStatus = CreationStatus.valueOf(diskPb.getStatus());
@@ -163,10 +166,12 @@ static final class BuilderImpl extends Builder {
         this.attachedInstances = Lists.transform(diskPb.getUsers(), InstanceId.FROM_URL_FUNCTION);
       }
       if (diskPb.getLastAttachTimestamp() != null) {
-        this.lastAttachTimestamp = TIMESTAMP_FORMATTER.parseMillis(diskPb.getLastAttachTimestamp());
+        this.lastAttachTimestamp =
+            TIMESTAMP_FORMATTER.parse(diskPb.getLastAttachTimestamp(), Instant.FROM).toEpochMilli();
       }
       if (diskPb.getLastDetachTimestamp() != null) {
-        this.lastDetachTimestamp = TIMESTAMP_FORMATTER.parseMillis(diskPb.getLastDetachTimestamp());
+        this.lastDetachTimestamp =
+            TIMESTAMP_FORMATTER.parse(diskPb.getLastDetachTimestamp(), Instant.FROM).toEpochMilli();
       }
     }
 
@@ -377,7 +382,8 @@ Disk toPb() {
       diskPb.setId(new BigInteger(generatedId));
     }
     if (creationTimestamp != null) {
-      diskPb.setCreationTimestamp(TIMESTAMP_FORMATTER.print(creationTimestamp));
+      diskPb.setCreationTimestamp(
+          TIMESTAMP_FORMATTER.format(Instant.ofEpochMilli(creationTimestamp)));
     }
     diskPb.setZone(diskId.getZoneId().getSelfLink());
     if (creationStatus != null) {
@@ -393,10 +399,12 @@ Disk toPb() {
       diskPb.setUsers(Lists.transform(attachedInstances, InstanceId.TO_URL_FUNCTION));
     }
     if (lastAttachTimestamp != null) {
-      diskPb.setLastAttachTimestamp(TIMESTAMP_FORMATTER.print(lastAttachTimestamp));
+      diskPb.setLastAttachTimestamp(
+          TIMESTAMP_FORMATTER.format(Instant.ofEpochMilli(lastAttachTimestamp)));
     }
     if (lastDetachTimestamp != null) {
-      diskPb.setLastDetachTimestamp(TIMESTAMP_FORMATTER.print(lastDetachTimestamp));
+      diskPb.setLastDetachTimestamp(
+          TIMESTAMP_FORMATTER.format(Instant.ofEpochMilli(lastDetachTimestamp)));
     }
     return diskPb;
   }

diff --git a/...ents/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskType.java b/...ents/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/DiskType.java
@@ -21,8 +21,9 @@
 import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.Objects;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
+import org.threeten.bp.Instant;
+import org.threeten.bp.ZoneOffset;
+import org.threeten.bp.format.DateTimeFormatter;
 
 /**
  * A Google Compute Engine disk type. A disk type represents the type of disk to use, such as {@code
@@ -48,7 +49,8 @@ public com.google.api.services.compute.model.DiskType apply(DiskType diskType) {
       };
 
   private static final long serialVersionUID = -944042261695072026L;
-  private static final DateTimeFormatter TIMESTAMP_FORMATTER = ISODateTimeFormat.dateTime();
+  private static final DateTimeFormatter TIMESTAMP_FORMATTER =
+      DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC);
 
   private final String generatedId;
   private final DiskTypeId diskTypeId;
@@ -191,7 +193,8 @@ com.google.api.services.compute.model.DiskType toPb() {
       diskTypePb.setId(new BigInteger(generatedId));
     }
     if (creationTimestamp != null) {
-      diskTypePb.setCreationTimestamp(TIMESTAMP_FORMATTER.print(creationTimestamp));
+      diskTypePb.setCreationTimestamp(
+          TIMESTAMP_FORMATTER.format(Instant.ofEpochMilli(creationTimestamp)));
     }
     diskTypePb.setDescription(description);
     diskTypePb.setValidDiskSize(validDiskSize);
@@ -215,7 +218,9 @@ static DiskType fromPb(com.google.api.services.compute.model.DiskType diskTypePb
     }
     if (diskTypePb.getCreationTimestamp() != null) {
       builder.setCreationTimestamp(
-          TIMESTAMP_FORMATTER.parseMillis(diskTypePb.getCreationTimestamp()));
+          TIMESTAMP_FORMATTER
+              .parse(diskTypePb.getCreationTimestamp(), Instant.FROM)
+              .toEpochMilli());
     }
     builder.setDiskTypeId(DiskTypeId.fromUrl(diskTypePb.getSelfLink()));
     builder.setDescription(diskTypePb.getDescription());

diff --git a/...nts/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageInfo.java b/...nts/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/ImageInfo.java
@@ -27,8 +27,9 @@
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Objects;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
+import org.threeten.bp.Instant;
+import org.threeten.bp.ZoneOffset;
+import org.threeten.bp.format.DateTimeFormatter;
 
 /**
  * A Google Compute Engine Image. An image contains a boot loader, an operating system and a root
@@ -59,7 +60,8 @@ public Image apply(ImageInfo image) {
       };
 
   private static final long serialVersionUID = -1061916352807358977L;
-  private static final DateTimeFormatter TIMESTAMP_FORMATTER = ISODateTimeFormat.dateTime();
+  private static final DateTimeFormatter TIMESTAMP_FORMATTER =
+      DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC);
 
   private final String generatedId;
   private final ImageId imageId;
@@ -149,7 +151,8 @@ static final class BuilderImpl extends Builder {
         this.generatedId = imagePb.getId().toString();
       }
       if (imagePb.getCreationTimestamp() != null) {
-        this.creationTimestamp = TIMESTAMP_FORMATTER.parseMillis(imagePb.getCreationTimestamp());
+        this.creationTimestamp =
+            TIMESTAMP_FORMATTER.parse(imagePb.getCreationTimestamp(), Instant.FROM).toEpochMilli();
       }
       this.imageId = ImageId.fromUrl(imagePb.getSelfLink());
       this.description = imagePb.getDescription();
@@ -350,7 +353,8 @@ Image toPb() {
       imagePb.setId(new BigInteger(generatedId));
     }
     if (creationTimestamp != null) {
-      imagePb.setCreationTimestamp(TIMESTAMP_FORMATTER.print(creationTimestamp));
+      imagePb.setCreationTimestamp(
+          TIMESTAMP_FORMATTER.format(Instant.ofEpochMilli(creationTimestamp)));
     }
     imagePb.setName(imageId.getImage());
     imagePb.setDescription(description);

diff --git a/.../google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/InstanceInfo.java b/.../google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/InstanceInfo.java
@@ -28,8 +28,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
+import org.threeten.bp.Instant;
+import org.threeten.bp.ZoneOffset;
+import org.threeten.bp.format.DateTimeFormatter;
 
 /**
  * A Google Compute Engine VM Instance. An instance is a virtual machine (VM) hosted on Google's
@@ -67,7 +68,8 @@ public Instance apply(InstanceInfo instance) {
       };
 
   private static final long serialVersionUID = -6601223112628977168L;
-  private static final DateTimeFormatter TIMESTAMP_FORMATTER = ISODateTimeFormat.dateTime();
+  private static final DateTimeFormatter TIMESTAMP_FORMATTER =
+      DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC);
 
   private final String generatedId;
   private final InstanceId instanceId;
@@ -243,7 +245,10 @@ public static final class BuilderImpl extends Builder {
       }
       this.instanceId = InstanceId.fromUrl(instancePb.getSelfLink());
       if (instancePb.getCreationTimestamp() != null) {
-        this.creationTimestamp = TIMESTAMP_FORMATTER.parseMillis(instancePb.getCreationTimestamp());
+        this.creationTimestamp =
+            TIMESTAMP_FORMATTER
+                .parse(instancePb.getCreationTimestamp(), Instant.FROM)
+                .toEpochMilli();
       }
       this.description = instancePb.getDescription();
       if (instancePb.getStatus() != null) {
@@ -585,7 +590,8 @@ Instance toPb() {
       instancePb.setId(new BigInteger(generatedId));
     }
     if (creationTimestamp != null) {
-      instancePb.setCreationTimestamp(TIMESTAMP_FORMATTER.print(creationTimestamp));
+      instancePb.setCreationTimestamp(
+          TIMESTAMP_FORMATTER.format(Instant.ofEpochMilli(creationTimestamp)));
     }
     instancePb.setName(instanceId.getInstance());
     instancePb.setDescription(description);

diff --git a/...s/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/MachineType.java b/...s/google-cloud-compute/src/main/java/com/google/cloud/compute/deprecated/MachineType.java
@@ -24,8 +24,9 @@
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Objects;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
+import org.threeten.bp.Instant;
+import org.threeten.bp.ZoneOffset;
+import org.threeten.bp.format.DateTimeFormatter;
 
 /**
  * A Google Compute Engine machine type. A machine type determine the virtualized hardware
@@ -52,7 +53,8 @@ public com.google.api.services.compute.model.MachineType apply(MachineType type)
               return type.toPb();
             }
           };
-  private static final DateTimeFormatter TIMESTAMP_FORMATTER = ISODateTimeFormat.dateTime();
+  private static final DateTimeFormatter TIMESTAMP_FORMATTER =
+      DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC);
 
   private static final long serialVersionUID = -4210962597502860450L;
 
@@ -241,7 +243,8 @@ com.google.api.services.compute.model.MachineType toPb() {
       machineTypePb.setId(new BigInteger(generatedId));
     }
     if (creationTimestamp != null) {
-      machineTypePb.setCreationTimestamp(TIMESTAMP_FORMATTER.print(creationTimestamp));
+      machineTypePb.setCreationTimestamp(
+          TIMESTAMP_FORMATTER.format(Instant.ofEpochMilli(creationTimestamp)));
     }
     machineTypePb.setName(machineTypeId.getType());
     machineTypePb.setDescription(description);
@@ -280,7 +283,9 @@ static MachineType fromPb(com.google.api.services.compute.model.MachineType mach
     }
     if (machineTypePb.getCreationTimestamp() != null) {
       builder.setCreationTimestamp(
-          TIMESTAMP_FORMATTER.parseMillis(machineTypePb.getCreationTimestamp()));
+          TIMESTAMP_FORMATTER
+              .parse(machineTypePb.getCreationTimestamp(), Instant.FROM)
+              .toEpochMilli());
     }
     builder.setDescription(machineTypePb.getDescription());
     builder.setCpus(machineTypePb.getGuestCpus());