Merge pull request #421 from ptahchiev/master

Migrate to java.time

Author: domesticmouse

build.gradle

@@ -22,7 +22,7 @@ apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
 
 group = 'com.google.maps'
-sourceCompatibility = 1.7
+sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
@@ -45,18 +45,17 @@ artifacts {
 }
 
 dependencies {
-    compileOnly 'com.google.appengine:appengine-api-1.0-sdk:1.9.64'
-    api 'com.squareup.okhttp3:okhttp:3.11.0'
-    api 'joda-time:joda-time:2.10'
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'org.slf4j:slf4j-api:1.7.25'
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.21.0'
-    testImplementation 'com.squareup.okhttp3:mockwebserver:3.11.0'
-    testImplementation 'org.apache.httpcomponents:httpclient:4.5.6'
-    testImplementation 'org.slf4j:slf4j-simple:1.7.25'
-    testImplementation 'commons-lang:commons-lang:2.6'
-    testImplementation 'org.json:json:20180813'
+    compile 'com.google.code.gson:gson:2.8.1'
+    compile 'com.squareup.okhttp3:okhttp:3.8.1'
+    compileOnly 'com.google.appengine:appengine-api-1.0-sdk:1.9.54'
+    compile 'org.slf4j:slf4j-api:1.7.25'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.3'
+    testCompile 'org.slf4j:slf4j-simple:1.7.25'
+    testCompile 'commons-lang:commons-lang:2.6'
+    testCompile 'org.json:json:20170516'
 }
 
 task updateVersion(type: Copy) {

src/main/java/com/google/maps/DirectionsApiRequest.java

@@ -25,7 +25,8 @@
 import com.google.maps.model.TransitRoutingPreference;
 import com.google.maps.model.TravelMode;
 import com.google.maps.model.Unit;
-import org.joda.time.ReadableInstant;
+
+import java.time.Instant;
 
 /** Request for the Directions API. */
 public class DirectionsApiRequest
@@ -149,8 +150,8 @@ public DirectionsApiRequest region(String region) {
    * @param time The arrival time to calculate directions for.
    * @return Returns this {@code DirectionsApiRequest} for call chaining.
    */
-  public DirectionsApiRequest arrivalTime(ReadableInstant time) {
-    return param("arrival_time", Long.toString(time.getMillis() / 1000L));
+  public DirectionsApiRequest arrivalTime(Instant time) {
+    return param("arrival_time", Long.toString(time.toEpochMilli() / 1000L));
   }
 
   /**
@@ -161,8 +162,8 @@ public DirectionsApiRequest arrivalTime(ReadableInstant time) {
    * @param time The departure time to calculate directions for.
    * @return Returns this {@code DirectionsApiRequest} for call chaining.
    */
-  public DirectionsApiRequest departureTime(ReadableInstant time) {
-    return param("departure_time", Long.toString(time.getMillis() / 1000L));
+  public DirectionsApiRequest departureTime(Instant time) {
+    return param("departure_time", Long.toString(time.toEpochMilli() / 1000L));
   }
 
   /**

src/main/java/com/google/maps/DistanceMatrixApiRequest.java

@@ -26,7 +26,7 @@
 import com.google.maps.model.TransitRoutingPreference;
 import com.google.maps.model.TravelMode;
 import com.google.maps.model.Unit;
-import org.joda.time.ReadableInstant;
+import java.time.Instant;
 
 /** A request to the Distance Matrix API. */
 public class DistanceMatrixApiRequest
@@ -156,8 +156,8 @@ public DistanceMatrixApiRequest units(Unit unit) {
    * @param departureTime The time of departure.
    * @return Returns this {@code DistanceMatrixApiRequest} for call chaining.
    */
-  public DistanceMatrixApiRequest departureTime(ReadableInstant departureTime) {
-    return param("departure_time", Long.toString(departureTime.getMillis() / 1000L));
+  public DistanceMatrixApiRequest departureTime(Instant departureTime) {
+    return param("departure_time", Long.toString(departureTime.toEpochMilli() / 1000L));
   }
 
   /**
@@ -178,8 +178,8 @@ public DistanceMatrixApiRequest trafficModel(TrafficModel trafficModel) {
    * @param arrivalTime The preferred arrival time.
    * @return Returns this {@code DistanceMatrixApiRequest} for call chaining.
    */
-  public DistanceMatrixApiRequest arrivalTime(ReadableInstant arrivalTime) {
-    return param("arrival_time", Long.toString(arrivalTime.getMillis() / 1000L));
+  public DistanceMatrixApiRequest arrivalTime(Instant arrivalTime) {
+    return param("arrival_time", Long.toString(arrivalTime.toEpochMilli() / 1000L));
   }
 
   /**

src/main/java/com/google/maps/internal/DateTimeAdapter.java

@@ -20,20 +20,21 @@
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 
 /**
- * This class handles conversion from JSON to {@link DateTime}s.
+ * This class handles conversion from JSON to {@link LocalDateTime}s.
  *
  * <p>Please see <a
  * href="https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/TypeAdapter.html">TypeAdapter</a>
  * for more detail.
  */
-public class DateTimeAdapter extends TypeAdapter<DateTime> {
+public class DateTimeAdapter extends TypeAdapter<LocalDateTime> {
 
   /**
-   * Read a Time object from a Directions API result and convert it to a {@link DateTime}.
+   * Read a Time object from a Directions API result and convert it to a {@link LocalDateTime}.
    *
    * <p>We are expecting to receive something akin to the following:
    *
@@ -46,7 +47,7 @@ public class DateTimeAdapter extends TypeAdapter<DateTime> {
    * </pre>
    */
   @Override
-  public DateTime read(JsonReader reader) throws IOException {
+  public LocalDateTime read(JsonReader reader) throws IOException {
     if (reader.peek() == JsonToken.NULL) {
       reader.nextNull();
       return null;
@@ -69,12 +70,12 @@ public DateTime read(JsonReader reader) throws IOException {
     }
     reader.endObject();
 
-    return new DateTime(secondsSinceEpoch * 1000, DateTimeZone.forID(timeZoneId));
+    return LocalDateTime.ofInstant(Instant.ofEpochMilli(secondsSinceEpoch * 1000), ZoneId.of(timeZoneId));
   }
 
   /** This method is not implemented. */
   @Override
-  public void write(JsonWriter writer, DateTime value) throws IOException {
+  public void write(JsonWriter writer, LocalDateTime value) throws IOException {
     throw new UnsupportedOperationException("Unimplemented method");
   }
 }

src/main/java/com/google/maps/internal/GaePendingResult.java

@@ -42,13 +42,13 @@
 import com.google.maps.model.TravelMode;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-import org.joda.time.DateTime;
-import org.joda.time.Instant;
-import org.joda.time.LocalTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -166,7 +166,7 @@ private T parseResponse(GaePendingResult<T, R> request, HTTPResponse response)
 
     Gson gson =
         new GsonBuilder()
-            .registerTypeAdapter(DateTime.class, new DateTimeAdapter())
+            .registerTypeAdapter(LocalDateTime.class, new DateTimeAdapter())
             .registerTypeAdapter(Distance.class, new DistanceAdapter())
             .registerTypeAdapter(Duration.class, new DurationAdapter())
             .registerTypeAdapter(Fare.class, new FareAdapter())

src/main/java/com/google/maps/internal/InstantAdapter.java

@@ -20,7 +20,7 @@
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import org.joda.time.Instant;
+import java.time.Instant;
 
 /** This class handles conversion from JSON to {@link Instant}. */
 public class InstantAdapter extends TypeAdapter<Instant> {
@@ -35,7 +35,7 @@ public Instant read(JsonReader reader) throws IOException {
 
     if (reader.peek() == JsonToken.NUMBER) {
       // Number is the number of seconds since Epoch.
-      return new Instant(reader.nextLong() * 1000L);
+      return Instant.ofEpochMilli(reader.nextLong() * 1000L);
     }
 
     throw new UnsupportedOperationException("Unsupported format");

src/main/java/com/google/maps/internal/LocalTimeAdapter.java

@@ -20,9 +20,8 @@
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import org.joda.time.LocalTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 
 /** This class handles conversion from JSON to {@link LocalTime}. */
 public class LocalTimeAdapter extends TypeAdapter<LocalTime> {
@@ -35,7 +34,7 @@ public LocalTime read(JsonReader reader) throws IOException {
     }
 
     if (reader.peek() == JsonToken.STRING) {
-      DateTimeFormatter dtf = DateTimeFormat.forPattern("HHmm");
+      DateTimeFormatter dtf = DateTimeFormatter.ofPattern("HHmm");
       return LocalTime.parse(reader.nextString(), dtf);
     }
 

src/main/java/com/google/maps/internal/OkHttpPendingResult.java

@@ -35,6 +35,9 @@
 import com.google.maps.model.PriceLevel;
 import com.google.maps.model.TravelMode;
 import java.io.IOException;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -45,9 +48,6 @@
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
-import org.joda.time.DateTime;
-import org.joda.time.Instant;
-import org.joda.time.LocalTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -240,7 +240,7 @@ private T parseResponse(OkHttpPendingResult<T, R> request, Response response)
 
     Gson gson =
         new GsonBuilder()
-            .registerTypeAdapter(DateTime.class, new DateTimeAdapter())
+            .registerTypeAdapter(LocalDateTime.class, new DateTimeAdapter())
             .registerTypeAdapter(Distance.class, new DistanceAdapter())
             .registerTypeAdapter(Duration.class, new DurationAdapter())
             .registerTypeAdapter(Fare.class, new FareAdapter())

src/main/java/com/google/maps/model/DirectionsLeg.java

@@ -16,7 +16,7 @@
 package com.google.maps.model;
 
 import java.io.Serializable;
-import org.joda.time.DateTime;
+import java.time.LocalDateTime;
 
 /**
  * A component of a Directions API result.
@@ -58,13 +58,13 @@ public class DirectionsLeg implements Serializable {
    * The estimated time of arrival for this leg. This property is only returned for transit
    * directions.
    */
-  public DateTime arrivalTime;
+  public LocalDateTime arrivalTime;
 
   /**
    * The estimated time of departure for this leg. The departureTime is only available for transit
    * directions.
    */
-  public DateTime departureTime;
+  public LocalDateTime departureTime;
 
   /**
    * The latitude/longitude coordinates of the origin of this leg. Because the Directions API

src/main/java/com/google/maps/model/OpeningHours.java

@@ -16,8 +16,8 @@
 package com.google.maps.model;
 
 import java.io.Serializable;
+import java.time.LocalTime;
 import java.util.Arrays;
-import org.joda.time.LocalTime;
 
 /**
  * Opening hours for a Place Details result. Please see <a