Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass error responses for Mapbox Directions and MapMatching #963

Merged
merged 2 commits into from
Feb 12, 2019
Merged

Pass error responses for Mapbox Directions and MapMatching #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59c786d
Pass error responses in Callback#onResponse for Mapbox Directions and…
danesfeder Feb 12, 2019
3394f9d
Delete unneeded file
danesfeder Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 81 additions & 0 deletions ...ices-directions/src/main/java/com/mapbox/api/directions/v5/DirectionsResponseFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
package com.mapbox.api.directions.v5;

import com.mapbox.api.directions.v5.models.DirectionsResponse;
import com.mapbox.api.directions.v5.models.DirectionsRoute;
import com.mapbox.api.directions.v5.models.RouteOptions;

import java.util.ArrayList;
import java.util.List;

import retrofit2.Response;

class DirectionsResponseFactory {

private final MapboxDirections mapboxDirections;

DirectionsResponseFactory(MapboxDirections mapboxDirections) {
this.mapboxDirections = mapboxDirections;
}

Response<DirectionsResponse> generate(Response<DirectionsResponse> response) {
if (isNotSuccessful(response)) {
return response;
} else {
return Response.success(
response
.body()
.toBuilder()
.routes(generateRouteOptions(response))
.build(),
new okhttp3.Response.Builder()
.code(200)
.message("OK")
.protocol(response.raw().protocol())
.headers(response.headers())
.request(response.raw().request())
.build());
}
}

private boolean isNotSuccessful(Response<DirectionsResponse> response) {
return !response.isSuccessful()
|| response.body() == null
|| response.body().routes().isEmpty();
}

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(
RouteOptions.builder()
.profile(mapboxDirections.profile())
.coordinates(mapboxDirections.coordinates())
.waypointIndices(mapboxDirections.waypointIndices())
.waypointNames(mapboxDirections.waypointNames())
.waypointTargets(mapboxDirections.waypointTargets())
.continueStraight(mapboxDirections.continueStraight())
.annotations(mapboxDirections.annotation())
.approaches(mapboxDirections.approaches())
.bearings(mapboxDirections.bearing())
.alternatives(mapboxDirections.alternatives())
.language(mapboxDirections.language())
.radiuses(mapboxDirections.radius())
.user(mapboxDirections.user())
.voiceInstructions(mapboxDirections.voiceInstructions())
.bannerInstructions(mapboxDirections.bannerInstructions())
.roundaboutExits(mapboxDirections.roundaboutExits())
.geometries(mapboxDirections.geometries())
.overview(mapboxDirections.overview())
.steps(mapboxDirections.steps())
.exclude(mapboxDirections.exclude())
.voiceUnits(mapboxDirections.voiceUnits())
.accessToken(mapboxDirections.accessToken())
.requestUuid(response.body().uuid())
.baseUrl(mapboxDirections.baseUrl())
.build()
).build());
}
return modifiedRoutes;
}
}
115 changes: 5 additions & 110 deletions services-directions/src/main/java/com/mapbox/api/directions/v5/MapboxDirections.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@
import com.mapbox.api.directions.v5.DirectionsCriteria.OverviewCriteria;
import com.mapbox.api.directions.v5.DirectionsCriteria.ProfileCriteria;
import com.mapbox.api.directions.v5.DirectionsCriteria.VoiceUnitCriteria;
import com.mapbox.api.directions.v5.models.DirectionsError;
import com.mapbox.api.directions.v5.models.DirectionsResponse;
import com.mapbox.api.directions.v5.models.DirectionsRoute;
import com.mapbox.api.directions.v5.models.RouteLeg;
import com.mapbox.api.directions.v5.models.RouteOptions;
import com.mapbox.core.MapboxService;
import com.mapbox.core.constants.Constants;
import com.mapbox.core.exceptions.ServicesException;
Expand All @@ -27,21 +24,16 @@
import com.mapbox.geojson.Point;

import java.io.IOException;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.logging.Level;
import java.util.logging.Logger;

import okhttp3.EventListener;
import okhttp3.Interceptor;
import okhttp3.OkHttpClient;
import okhttp3.ResponseBody;
import okhttp3.logging.HttpLoggingInterceptor;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Converter;
import retrofit2.Response;

/**
Expand Down Expand Up @@ -114,26 +106,8 @@ protected GsonBuilder getGsonBuilder() {
@Override
public Response<DirectionsResponse> executeCall() throws IOException {
Response<DirectionsResponse> response = super.executeCall();
if (response.isSuccessful()) {
if (response.body() != null && !response.body().routes().isEmpty()) {
return Response.success(
response.body()
.toBuilder()
.routes(generateRouteOptions(response))
.build(),
new okhttp3.Response.Builder()
.code(200)
.message("OK")
.protocol(response.raw().protocol())
.headers(response.headers())
.request(response.raw().request())
.build());
}
} else {
errorDidOccur(null, response);
}

return response;
DirectionsResponseFactory factory = new DirectionsResponseFactory(this);
return factory.generate(response);
}

/**
Expand All @@ -149,33 +123,9 @@ public void enqueueCall(final Callback<DirectionsResponse> callback) {
getCall().enqueue(new Callback<DirectionsResponse>() {
@Override
public void onResponse(Call<DirectionsResponse> call, Response<DirectionsResponse> response) {
if (!response.isSuccessful()) {
errorDidOccur(callback, response);

} else if (callback != null) {
if (response.body() == null || response.body().routes().isEmpty()) {
// If null just pass the original object back since there's nothing to modify.
callback.onResponse(call, response);

} else {
Response<DirectionsResponse> newResponse =
Response.success(
response
.body()
.toBuilder()
.routes(generateRouteOptions(response))
.build(),
new okhttp3.Response.Builder()
.code(200)
.message("OK")
.protocol(response.raw().protocol())
.headers(response.headers())
.request(response.raw().request())
.build());

callback.onResponse(call, newResponse);
}
}
DirectionsResponseFactory factory = new DirectionsResponseFactory(MapboxDirections.this);
Response<DirectionsResponse> generatedResponse = factory.generate(response);
callback.onResponse(call, generatedResponse);
}

@Override
Expand Down Expand Up @@ -208,61 +158,6 @@ protected synchronized OkHttpClient getOkHttpClient() {
return okHttpClient;
}

private void errorDidOccur(@Nullable Callback<DirectionsResponse> callback,
@NonNull Response<DirectionsResponse> response) {
// Response gave an error, we try to LOGGER any messages into the LOGGER here.
Converter<ResponseBody, DirectionsError> errorConverter =
getRetrofit().responseBodyConverter(DirectionsError.class, new Annotation[0]);
if (callback == null) {
Logger.getLogger(MapboxDirections.class.getName()).log(
Level.WARNING, "Failed to complete your request and callback is null");
} else {
try {
callback.onFailure(getCall(),
new Throwable(errorConverter.convert(response.errorBody()).message()));
} catch (IOException ioException) {
Logger.getLogger(MapboxDirections.class.getName()).log(
Level.WARNING, "Failed to complete your request. ", ioException);
}
}
}

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(
RouteOptions.builder()
.profile(profile())
.coordinates(coordinates())
.waypointIndices(waypointIndices())
.waypointNames(waypointNames())
.waypointTargets(waypointTargets())
.continueStraight(continueStraight())
.annotations(annotation())
.approaches(approaches())
.bearings(bearing())
.alternatives(alternatives())
.language(language())
.radiuses(radius())
.user(user())
.voiceInstructions(voiceInstructions())
.bannerInstructions(bannerInstructions())
.roundaboutExits(roundaboutExits())
.geometries(geometries())
.overview(overview())
.steps(steps())
.exclude(exclude())
.voiceUnits(voiceUnits())
.accessToken(accessToken())
.requestUuid(response.body().uuid())
.baseUrl(baseUrl())
.build()
).build());
}
return modifiedRoutes;
}

private static String formatCoordinates(List<Point> coordinates) {
String[] coordinatesFormatted = new String[coordinates.size()];
int index = 0;
Expand Down
Loading