removed request parameters verification in favor of letting the service respond with a correct error

Author: Łukasz Paczos

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

@@ -30,9 +30,12 @@
 public abstract class RouteOptions extends DirectionsJsonObject {
 
   /**
-   * Build a new instance of this RouteOptions.
-   *
-   * @return {@link RouteOptions.Builder}
+   * Build a new instance of {@link RouteOptions} and sets default values for:
+   * <ul>
+   *   <li>{@link #baseUrl()} equal to {@link DirectionsCriteria#BASE_API_URL}.</li>
+   *   <li>{@link #user()} equal to {@link DirectionsCriteria#PROFILE_DEFAULT_USER}.</li>
+   *   <li>{@link #geometries()} equal to {@link DirectionsCriteria#GEOMETRY_POLYLINE6}.</li>
+   * </ul>
    */
   public static Builder builder() {
     return new AutoValue_RouteOptions.Builder()
@@ -1140,7 +1143,7 @@ public Builder annotationsList(@Nullable List<String> annotations) {
      */
     @NonNull
     public Builder approachesList(@Nullable List<String> approaches) {
-      String result = FormatUtils.formatApproaches(approaches);
+      String result = FormatUtils.join(";", approaches);
       if (result != null) {
         approaches(result);
       }
@@ -1416,130 +1419,11 @@ public Builder snappingIncludeClosuresList(@Nullable List<Boolean> snappingClosu
     public abstract Builder enableRefresh(@Nullable Boolean enableRefresh);
 
     /**
-     * Package private used to build the object and verify.
-     */
-    @NonNull
-    abstract RouteOptions autoBuild();
-
-    /**
-     * This uses the provided parameters set using the {@link Builder} and first checks that all
-     * values are valid, and creates a new {@link RouteOptions} object with the values provided.
+     * Builds the object.
      *
      * @return a new instance of {@link RouteOptions}
      */
     @NonNull
-    public RouteOptions build() {
-      RouteOptions routeOptions = autoBuild();
-
-      List<Point> coordinates = routeOptions.coordinatesList();
-      if (coordinates.size() < 2) {
-        throw new RuntimeException(
-          "An origin and destination are required before making the directions API request."
-        );
-      }
-
-      List<Integer> waypointIndices = routeOptions.waypointIndicesList();
-      if (waypointIndices != null && !waypointIndices.isEmpty()) {
-        if (waypointIndices.size() < 2) {
-          throw new RuntimeException(
-            "Waypoints indices must be a list of at least two indexes, origin and destination."
-          );
-        }
-        if (waypointIndices.get(0) != 0 || waypointIndices.get(waypointIndices.size() - 1)
-          != coordinates.size() - 1) {
-          throw new RuntimeException(
-            "First and last waypoints indices must match the origin and final destination."
-          );
-        }
-        for (int i = 1; i < waypointIndices.size() - 1; i++) {
-          if (waypointIndices.get(i) < 0
-            || waypointIndices.get(i) >= coordinates.size()) {
-            throw new RuntimeException(
-              "Waypoints index out of bounds (no corresponding coordinate).");
-          }
-        }
-      }
-
-      checkSizeMatchingWaypoints(
-        "waypointTargets",
-        true,
-        routeOptions.waypointTargetsList(),
-        coordinates,
-        routeOptions.waypointIndicesList()
-      );
-
-      checkSizeMatchingWaypoints(
-        "approaches",
-        false,
-        routeOptions.approachesList(),
-        coordinates,
-        routeOptions.waypointIndicesList()
-      );
-
-      checkSizeMatchingWaypoints(
-        "snappingIncludeClosures",
-        false,
-        routeOptions.snappingIncludeClosuresList(),
-        coordinates,
-        routeOptions.waypointIndicesList()
-      );
-
-      checkSizeMatchingWaypoints(
-        "bearings",
-        false,
-        routeOptions.bearingsList(),
-        coordinates,
-        routeOptions.waypointIndicesList()
-      );
-
-      checkSizeMatchingWaypoints(
-        "radiuses",
-        false,
-        routeOptions.radiusesList(),
-        coordinates,
-        routeOptions.waypointIndicesList()
-      );
-
-      checkSizeMatchingWaypoints(
-        "waypointNames",
-        true,
-        routeOptions.waypointNamesList(),
-        coordinates,
-        routeOptions.waypointIndicesList()
-      );
-
-      return routeOptions;
-    }
-
-    private void checkSizeMatchingWaypoints(
-      String paramName,
-      boolean waypointIndicesDependent,
-      List<?> testedParam,
-      List<Point> coordinates,
-      List<Integer> waypointIndices
-    ) {
-      if (testedParam != null && !testedParam.isEmpty()) {
-        boolean error = false;
-        if (waypointIndicesDependent && waypointIndices != null && !waypointIndices.isEmpty()) {
-          if (testedParam.size() != waypointIndices.size()) {
-            error = true;
-          }
-        } else if (testedParam.size() != coordinates.size()) {
-          error = true;
-        }
-        if (error) {
-          StringBuilder builder = new StringBuilder();
-          builder.append("Number of ");
-          builder.append(paramName);
-          builder.append(" must match the number of coordinates");
-          if (waypointIndicesDependent) {
-            builder.append(" or waypoints indices (if present)");
-          }
-          builder.append(".");
-
-          throw new RuntimeException(builder.toString());
-        }
-      }
-    }
+    public abstract RouteOptions build();
   }
 }

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

@@ -83,10 +83,6 @@ public static String formatRadiuses(@Nullable List<Double> radiuses) {
     for (Double radius : radiuses) {
       if (radius == null) {
         radiusesToJoin.add(null);
-      } else if (radius <= 0) {
-        throw new RuntimeException(
-          "Radiuses need to be greater than 0 or Double.POSITIVE_INFINITY."
-        );
       } else if (radius == Double.POSITIVE_INFINITY) {
         radiusesToJoin.add("unlimited");
       } else {
@@ -116,14 +112,6 @@ public static String formatBearings(@Nullable List<Bearing> bearings) {
         double angle = bearing.angle();
         double tolerance = bearing.degrees();
 
-        if (angle < 0 || angle > 360) {
-          throw new RuntimeException("Angle has to be from 0 to 360.");
-        }
-
-        if (tolerance < 0 || tolerance > 180) {
-          throw new RuntimeException("Degrees has to be from 0 to 180.");
-        }
-
         bearingsToJoin.add(String.format(Locale.US, "%s,%s",
           formatDouble(angle),
           formatDouble(tolerance)));
@@ -157,29 +145,6 @@ public static String formatDistributions(@Nullable List<Integer[]> distributions
     return join(";", distributionsToJoin);
   }
 
-  /**
-   * Converts String list with approaches values to a string ready for API consumption. An approach
-   * could be unrestricted, curb or null.
-   *
-   * @param approaches a list representing approaches to each coordinate.
-   * @return a formatted string.
-   */
-  @Nullable
-  public static String formatApproaches(@Nullable List<String> approaches) {
-    if (approaches == null) {
-      return null;
-    }
-
-    for (String approach : approaches) {
-      if (approach != null && !approach.equals("unrestricted") && !approach.equals("curb")) {
-        throw new RuntimeException(
-          "Approach should be one of unrestricted or curb"
-        );
-      }
-    }
-    return join(";", approaches);
-  }
-
   /**
    * Converts list of points to a string ready for API consumption.
    *