revert addition of amenities to rest stop

Author: abhishek1508

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

@@ -1,6 +1,5 @@
 package com.mapbox.api.directions.v5.models;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.google.auto.value.AutoValue;
@@ -10,8 +9,6 @@
 import com.mapbox.api.directions.v5.DirectionsAdapterFactory;
 import com.mapbox.api.directions.v5.DirectionsCriteria;
 
-import java.util.List;
-
 /**
  * An object containing information about passing rest stops along the route.
  * Only available on the {@link DirectionsCriteria#PROFILE_DRIVING} profile.
@@ -33,12 +30,6 @@ public abstract class RestStop extends DirectionsJsonObject {
   @Nullable
   public abstract String name();
 
-  /**
-   * The list of amenities at the rest stop if available.
-   */
-  @Nullable
-  public abstract List<Amenities> amenities();
-
   /**
    * Create a new instance of this class by using the {@link Builder} class.
    *
@@ -93,31 +84,20 @@ public abstract static class Builder extends DirectionsJsonObject.Builder<Builde
      *
      * @param type rest stop type
      */
-    @NonNull
     public abstract Builder type(@Nullable String type);
 
     /**
      * The name of the rest stop. Optionally included if data is available.
      *
      * @param name rest stop name
      */
-    @NonNull
     public abstract Builder name(@Nullable String name);
 
-    /**
-     * The list of amenities at the rest stop if available.
-     *
-     * @param amenities list of amenities
-     */
-    @NonNull
-    public abstract Builder amenities(@Nullable List<Amenities> amenities);
-
     /**
      * Build a new {@link RestStop} object.
      *
      * @return a new {@link RestStop} using the provided values in this builder
      */
-    @NonNull
     public abstract RestStop build();
   }
 }

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

@@ -17,7 +17,6 @@ public void sanity() throws Exception {
     RestStop restStop = RestStop.builder()
         .name("ABCD")
         .type("service_area")
-        .amenities(Collections.<Amenities>emptyList())
         .build();
     assertNotNull(restStop);
   }
@@ -28,7 +27,6 @@ public void serializableObject() throws Exception {
         .builder()
         .name("ABCD")
         .type("service_area")
-        .amenities(Collections.<Amenities>emptyList())
         .build();
 
     RestStop actual = deserialize(
@@ -45,7 +43,6 @@ public void toFromJson() {
         .builder()
         .name("ABCD")
         .type("service_area")
-        .amenities(Collections.<Amenities>emptyList())
         .build();
 
     RestStop actual = RestStop.fromJson(expected.toJson());
@@ -61,7 +58,6 @@ public void fromJson_correctlyBuildsFromJson() throws Exception {
     RestStop restStop = response.routes().get(0).legs().get(0).steps().get(1).intersections().get(0).restStop();
 
     assertNotNull(restStop);
-    assertNotNull(restStop.amenities());
     assertEquals("SA", restStop.name());
     assertEquals("service_area", restStop.type());
   }