fix walking options serialization to match what the service expects / generates (#1028)

Author: Pablo Guardiola

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

@@ -7,6 +7,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.SerializedName;
 
 /**
  * Class for specifying options for use with the walking profile.
@@ -22,6 +23,7 @@ public abstract class WalkingOptions {
    * @return walkingSpeed in meters per second
    * @since 4.8.0
    */
+  @SerializedName("walking_speed")
   @Nullable
   public abstract Double walkingSpeed();
 
@@ -34,6 +36,7 @@ public abstract class WalkingOptions {
    * @return walkwayBias bias to prefer or avoid walkways
    * @since 4.8.0
    */
+  @SerializedName("walkway_bias")
   @Nullable
   public abstract Double walkwayBias();
 
@@ -45,6 +48,7 @@ public abstract class WalkingOptions {
    * @return alleyBias bias to prefer or avoid alleys
    * @since 4.8.0
    */
+  @SerializedName("alley_bias")
   @Nullable
   public abstract Double alleyBias();
 

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

@@ -180,15 +180,39 @@ public void build_originDestinationGetAddedToListCorrectly() throws Exception {
   }
 
   @Test
-  public void build_walkingOptions() {
+  public void build_walkingWalkingSpeedOptions() {
     MapboxDirections directions = MapboxDirections.builder()
       .destination(Point.fromLngLat(13.4930, 9.958))
       .origin(Point.fromLngLat(1.234, 2.345))
       .accessToken(ACCESS_TOKEN)
       .profile(DirectionsCriteria.PROFILE_WALKING)
-      .walkingOptions(WalkingOptions.builder().alleyBias(2d).build())
+      .walkingOptions(WalkingOptions.builder().walkingSpeed(1d).build())
       .build();
-    assertTrue(directions.cloneCall().request().url().toString().contains("alley_bias=2.0"));
+    assertTrue(directions.cloneCall().request().url().toString().contains("walking_speed=1.0"));
+  }
+
+  @Test
+  public void build_walkingWalkwayBiasOptions() {
+    MapboxDirections directions = MapboxDirections.builder()
+      .destination(Point.fromLngLat(13.4930, 9.958))
+      .origin(Point.fromLngLat(1.234, 2.345))
+      .accessToken(ACCESS_TOKEN)
+      .profile(DirectionsCriteria.PROFILE_WALKING)
+      .walkingOptions(WalkingOptions.builder().walkwayBias(1d).build())
+      .build();
+    assertTrue(directions.cloneCall().request().url().toString().contains("walkway_bias=1.0"));
+  }
+
+  @Test
+  public void build_walkingAlleyBiasOptions() {
+    MapboxDirections directions = MapboxDirections.builder()
+      .destination(Point.fromLngLat(13.4930, 9.958))
+      .origin(Point.fromLngLat(1.234, 2.345))
+      .accessToken(ACCESS_TOKEN)
+      .profile(DirectionsCriteria.PROFILE_WALKING)
+      .walkingOptions(WalkingOptions.builder().alleyBias(1d).build())
+      .build();
+    assertTrue(directions.cloneCall().request().url().toString().contains("alley_bias=1.0"));
   }
 
   @Test

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

@@ -245,7 +245,8 @@ public void fromJson() {
       "\"voice_instructions\": true," +
       "\"banner_instructions\": true," +
       "\"voice_units\": \"imperial\"," +
-      "\"uuid\": \"uuid1\"" +
+      "\"uuid\": \"uuid1\"," +
+      "\"walkingOptions\": { \"walking_speed\": 1.0, \"walkway_bias\": 0.6, \"alley_bias\": 0.7 }" +
       "}";
 
     RouteOptions routeOptions = RouteOptions.fromJson(jsonString);
@@ -267,6 +268,9 @@ public void fromJson() {
     assertEquals(true, routeOptions.bannerInstructions());
     assertEquals("imperial", routeOptions.voiceUnits());
     assertEquals("uuid1", routeOptions.requestUuid());
+    assertEquals(1.0, routeOptions.walkingOptions().walkingSpeed(), 0.1);
+    assertEquals(0.6, routeOptions.walkingOptions().walkwayBias(), 0.1);
+    assertEquals(0.7, routeOptions.walkingOptions().alleyBias(), 0.1);
   }
 
   @Test
@@ -290,6 +294,11 @@ public void toJson() {
       .bannerInstructions(true)
       .voiceUnits("imperial")
       .requestUuid("uuid1")
+      .walkingOptions(WalkingOptions.builder()
+        .walkingSpeed(1.0)
+        .walkwayBias(0.6)
+        .alleyBias(0.7)
+        .build())
       .build();
 
     String jsonString = routeOptions.toJson();
@@ -311,7 +320,9 @@ public void toJson() {
       "\"voice_instructions\": true," +
       "\"banner_instructions\": true," +
       "\"voice_units\": \"imperial\"," +
-      "\"uuid\": \"uuid1\"}";
+      "\"uuid\": \"uuid1\"," +
+      "\"walkingOptions\": { \"walking_speed\": 1.0, \"walkway_bias\": 0.6, \"alley_bias\": 0.7 }" +
+      "}";
     compareJson(expectedJsonString, jsonString);
   }
 }

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

@@ -8,7 +8,7 @@
   import static org.junit.Assert.assertEquals;
 
 public class WalkingOptionsTest extends TestUtils {
- private static final String JSON = "{\"walkingSpeed\":1.0,\"walkwayBias\":0.6,\"alleyBias\":0" +
+ private static final String JSON = "{\"walking_speed\":1.0,\"walkway_bias\":0.6,\"alley_bias\":0" +
    ".7}";
 
  @Test