From 3a1a59e7680e387ec62053ae73adbee2fce08b6a Mon Sep 17 00:00:00 2001
From: Cameron Mace <cameron@mapbox.com>
Date: Wed, 29 Nov 2017 14:51:43 -0500
Subject: [PATCH 1/2] save access token used in request

---
 .../main/java/com/mapbox/directions/v5/MapboxDirections.java  | 1 +
 .../java/com/mapbox/directions/v5/models/RouteOptions.java    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/services-directions/src/main/java/com/mapbox/directions/v5/MapboxDirections.java b/services-directions/src/main/java/com/mapbox/directions/v5/MapboxDirections.java
index 0e7be4564..7bcc7c291 100644
--- a/services-directions/src/main/java/com/mapbox/directions/v5/MapboxDirections.java
+++ b/services-directions/src/main/java/com/mapbox/directions/v5/MapboxDirections.java
@@ -206,6 +206,7 @@ private List<DirectionsRoute> generateRouteOptions(List<DirectionsRoute> routes)
           .bannerInstructions(bannerInstructions())
           .exclude(exclude())
           .voiceUnits(voiceUnits())
+          .accessToken(accessToken())
           .build()
       ).build());
     }
diff --git a/services-directions/src/main/java/com/mapbox/directions/v5/models/RouteOptions.java b/services-directions/src/main/java/com/mapbox/directions/v5/models/RouteOptions.java
index 56edb78e1..ff149a71c 100644
--- a/services-directions/src/main/java/com/mapbox/directions/v5/models/RouteOptions.java
+++ b/services-directions/src/main/java/com/mapbox/directions/v5/models/RouteOptions.java
@@ -140,6 +140,8 @@ public static Builder builder() {
   @Nullable
   public abstract String voiceUnits();
 
+  public abstract String accessToken();
+
   /**
    * Gson type adapter for parsing Gson to this class.
    *
@@ -249,6 +251,8 @@ public abstract static class Builder {
 
     public abstract Builder voiceUnits(@Nullable String voiceUnits);
 
+    public abstract Builder accessToken(String accessToken);
+
     /**
      * The same exclusions the user originally made when the request was made.
      *

From 238385439dfb058a2249f6dcdab3dd68e51d3b11 Mon Sep 17 00:00:00 2001
From: Cameron Mace <cameron@mapbox.com>
Date: Wed, 29 Nov 2017 15:03:51 -0500
Subject: [PATCH 2/2] add UUID to route options

---
 .../com/mapbox/directions/v5/MapboxDirections.java     | 10 +++++-----
 .../com/mapbox/directions/v5/models/RouteOptions.java  |  5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/services-directions/src/main/java/com/mapbox/directions/v5/MapboxDirections.java b/services-directions/src/main/java/com/mapbox/directions/v5/MapboxDirections.java
index 7bcc7c291..18bf6e87d 100644
--- a/services-directions/src/main/java/com/mapbox/directions/v5/MapboxDirections.java
+++ b/services-directions/src/main/java/com/mapbox/directions/v5/MapboxDirections.java
@@ -135,9 +135,8 @@ public Response<DirectionsResponse> executeCall() throws IOException {
     if (!response.isSuccessful()) {
       errorDidOccur(null, response);
     }
-    List<DirectionsRoute> routes = response.body().routes();
     return Response.success(response.body().toBuilder().routes(
-      generateRouteOptions(routes)).build());
+      generateRouteOptions(response)).build());
   }
 
   /**
@@ -161,7 +160,7 @@ public void onResponse(Call<DirectionsResponse> call, Response<DirectionsRespons
           callback.onResponse(call, response);
         }
         DirectionsResponse newResponse = response.body().toBuilder().routes(
-          generateRouteOptions(response.body().routes())).build();
+          generateRouteOptions(response)).build();
         callback.onResponse(call, Response.success(newResponse));
       }
 
@@ -188,8 +187,8 @@ private void errorDidOccur(@Nullable Callback<DirectionsResponse> callback,
     }
   }
 
-
-  private List<DirectionsRoute> generateRouteOptions(List<DirectionsRoute> routes) {
+  private List<DirectionsRoute> generateRouteOptions(Response<DirectionsResponse> response) {
+    List<DirectionsRoute> routes = response.body().routes();
     List<DirectionsRoute> modifiedRoutes = new ArrayList<>();
     for (DirectionsRoute route : routes) {
       modifiedRoutes.add(route.toBuilder().routeOptions(
@@ -207,6 +206,7 @@ private List<DirectionsRoute> generateRouteOptions(List<DirectionsRoute> routes)
           .exclude(exclude())
           .voiceUnits(voiceUnits())
           .accessToken(accessToken())
+          .requestUuid(response.body().uuid())
           .build()
       ).build());
     }
diff --git a/services-directions/src/main/java/com/mapbox/directions/v5/models/RouteOptions.java b/services-directions/src/main/java/com/mapbox/directions/v5/models/RouteOptions.java
index ff149a71c..7e19ffffd 100644
--- a/services-directions/src/main/java/com/mapbox/directions/v5/models/RouteOptions.java
+++ b/services-directions/src/main/java/com/mapbox/directions/v5/models/RouteOptions.java
@@ -142,6 +142,9 @@ public static Builder builder() {
 
   public abstract String accessToken();
 
+  @Nullable
+  public abstract String requestUuid();
+
   /**
    * Gson type adapter for parsing Gson to this class.
    *
@@ -253,6 +256,8 @@ public abstract static class Builder {
 
     public abstract Builder accessToken(String accessToken);
 
+    public abstract Builder requestUuid(String requestUuid);
+
     /**
      * The same exclusions the user originally made when the request was made.
      *