RouteOptions List<Point> should be serialized as double[][] (#865)

Author: osana

services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsJsonObject.java

@@ -2,6 +2,8 @@
 
 import com.google.gson.GsonBuilder;
 import com.mapbox.api.directions.v5.DirectionsAdapterFactory;
+import com.mapbox.geojson.Point;
+import com.mapbox.geojson.gson.PointSerializer;
 
 import java.io.Serializable;
 
@@ -22,6 +24,7 @@ public class DirectionsJsonObject implements Serializable {
   public String toJson() {
     GsonBuilder gson = new GsonBuilder();
     gson.registerTypeAdapterFactory(DirectionsAdapterFactory.create());
+    gson.registerTypeAdapter(Point.class, new PointSerializer());
     return gson.create().toJson(this);
   }
 }

services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsResponse.java

@@ -7,6 +7,8 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.TypeAdapter;
 import com.mapbox.api.directions.v5.DirectionsAdapterFactory;
+import com.mapbox.geojson.Point;
+import com.mapbox.geojson.gson.PointDeserializer;
 
 import java.util.List;
 
@@ -126,6 +128,7 @@ public static TypeAdapter<DirectionsResponse> typeAdapter(Gson gson) {
   public static DirectionsResponse fromJson(String json) {
     GsonBuilder gson = new GsonBuilder();
     gson.registerTypeAdapterFactory(DirectionsAdapterFactory.create());
+    gson.registerTypeAdapter(Point.class, new PointDeserializer());
     return gson.create().fromJson(json, DirectionsResponse.class);
   }
 

services-directions/src/main/java/com/mapbox/api/directions/v5/models/DirectionsRoute.java

@@ -9,6 +9,8 @@
 import com.google.gson.annotations.SerializedName;
 import com.mapbox.api.directions.v5.DirectionsAdapterFactory;
 import com.mapbox.api.directions.v5.MapboxDirections;
+import com.mapbox.geojson.Point;
+import com.mapbox.geojson.gson.PointDeserializer;
 
 import java.util.List;
 
@@ -144,6 +146,7 @@ public static TypeAdapter<DirectionsRoute> typeAdapter(Gson gson) {
   public static DirectionsRoute fromJson(String json) {
     GsonBuilder gson = new GsonBuilder();
     gson.registerTypeAdapterFactory(DirectionsAdapterFactory.create());
+    gson.registerTypeAdapter(Point.class, new PointDeserializer());
     return gson.create().fromJson(json, DirectionsRoute.class);
   }
 

services-directions/src/main/java/com/mapbox/api/directions/v5/models/RouteOptions.java

@@ -11,6 +11,7 @@
 import com.mapbox.api.directions.v5.DirectionsCriteria;
 import com.mapbox.api.directions.v5.MapboxDirections;
 import com.mapbox.geojson.Point;
+import com.mapbox.geojson.gson.PointDeserializer;
 
 import java.util.List;
 
@@ -289,10 +290,11 @@ public static TypeAdapter<RouteOptions> typeAdapter(Gson gson) {
    *   method
    * @since 3.4.0
    */
-  public static RouteLeg fromJson(String json) {
+  public static RouteOptions fromJson(String json) {
     GsonBuilder gson = new GsonBuilder();
     gson.registerTypeAdapterFactory(DirectionsAdapterFactory.create());
-    return gson.create().fromJson(json, RouteLeg.class);
+    gson.registerTypeAdapter(Point.class, new PointDeserializer());
+    return gson.create().fromJson(json, RouteOptions.class);
   }
 
   /**

services-directions/src/test/java/com/mapbox/api/directions/v5/models/RouteOptionsTest.java

@@ -190,4 +190,28 @@ public void directionsRequestResult_doesContainOverview() throws Exception {
 
     assertEquals(DirectionsCriteria.OVERVIEW_SIMPLIFIED, route.routeOptions().overview());
   }
+
+  @Test
+  public void toJson_fromJson() throws Exception {
+    Response<DirectionsResponse> response = MapboxDirections.builder()
+      .geometries(DirectionsCriteria.GEOMETRY_POLYLINE6)
+      .baseUrl(mockUrl.toString())
+      .accessToken(ACCESS_TOKEN)
+      .origin(Point.fromLngLat(1.0, 1.0))
+      .destination(Point.fromLngLat(5.0, 5.0))
+      .profile(DirectionsCriteria.PROFILE_WALKING)
+      .continueStraight(false)
+      .language(Locale.CANADA)
+      .overview(DirectionsCriteria.OVERVIEW_SIMPLIFIED)
+      .alternatives(true)
+      .build()
+      .executeCall();
+
+    RouteOptions routeOptions = response.body().routes().get(0).routeOptions();
+
+    String jsonString = routeOptions.toJson();
+    RouteOptions routeOptionsFromJson = RouteOptions.fromJson(jsonString);
+
+    assertEquals(routeOptions, routeOptionsFromJson);
+  }
 }