exposed DirectionsRoute.Builder#routeIndex

Author: Łukasz Paczos

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

@@ -134,10 +134,7 @@ public static TypeAdapter<DirectionsResponse> typeAdapter(Gson gson) {
    * @since 3.0.0
    */
   public static DirectionsResponse fromJson(@NonNull String json) {
-    GsonBuilder gson = new GsonBuilder();
-    gson.registerTypeAdapterFactory(DirectionsAdapterFactory.create());
-    gson.registerTypeAdapter(Point.class, new PointAsCoordinatesTypeAdapter());
-    return gson.create().fromJson(json, DirectionsResponse.class);
+    return fromJson(json, null, null);
   }
 
   /**

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

@@ -322,8 +322,14 @@ public abstract static class Builder {
     @NonNull
     public abstract Builder requestUuid(@Nullable String requestUuid);
 
+    /**
+     * The index of the route in the list of routes returned by the original response.
+     *
+     * @param routeIndex string of an int value representing the index
+     * @return this builder for chaining options together
+     */
     @NonNull
-    abstract Builder routeIndex(String routeIndex);
+    public abstract Builder routeIndex(String routeIndex);
 
     /**
      * Build a new {@link DirectionsRoute} object.

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

@@ -4,6 +4,7 @@
 import com.mapbox.core.TestUtils;
 import com.mapbox.geojson.Point;
 
+import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -15,6 +16,7 @@
 public class DirectionsResponseTest extends TestUtils {
 
   private static final String DIRECTIONS_V5_PRECISION6_FIXTURE = "directions_v5_precision_6.json";
+  private static final String DIRECTIONS_V5_MULTIPLE_ROUTES = "directions_v5_multiple_routes.json";
 
   @Test
   public void sanity() throws Exception {
@@ -41,7 +43,6 @@ public void testToFromJson() throws Exception {
     String jsonString = responseFromJson1.toJson();
     DirectionsResponse responseFromJson2 = DirectionsResponse.fromJson(jsonString);
 
-
     Assert.assertEquals(responseFromJson1, responseFromJson2);
     Assert.assertEquals(responseFromJson2, responseFromJson1);
   }
@@ -62,4 +63,14 @@ public void fromJson_correctlyBuildsFromJsonWithOptionsAndUuid() throws Exceptio
     assertEquals(options, response.routes().get(0).routeOptions());
     assertEquals(uuid, response.routes().get(0).requestUuid());
   }
+
+  @Test
+  public void fromJson_multipleRoutesHaveCorrectIndices() throws Exception {
+    String json = loadJsonFixture(DIRECTIONS_V5_MULTIPLE_ROUTES);
+
+    List<DirectionsRoute> routes = DirectionsResponse.fromJson(json).routes();
+
+    assertEquals("0", routes.get(0).routeIndex());
+    assertEquals("1", routes.get(1).routeIndex());
+  }
 }

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

@@ -96,4 +96,22 @@ public void directionsRoute_json_withOptionsAndUUID_roundTripping() throws Excep
 
     assertEquals(route, newRoute);
   }
+
+  @Test
+  public void directionsRoute_canSetIndex() throws Exception {
+    String json = loadJsonFixture("directions_v5-with-closure_precision_6.json");
+    RouteOptions options = RouteOptions.builder()
+      .profile(DirectionsCriteria.PROFILE_DRIVING_TRAFFIC)
+      .coordinatesList(new ArrayList<Point>() {{
+        add(Point.fromLngLat(1.0, 1.0));
+        add(Point.fromLngLat(2.0, 2.0));
+      }})
+      .build();
+    String uuid = "123";
+    DirectionsRoute route = DirectionsRoute.fromJson(json, options, uuid);
+
+    DirectionsRoute newRoute = route.toBuilder().routeIndex("0").build();
+
+    assertEquals("0", newRoute.routeIndex());
+  }
 }