Merge pull request #10 from SimpliRoute/better-handling-osrmproxy-httpsstatuses

Improve handling for osrm proxy errors

Author: javierseixas

src/main/java/com/osrm/client/DistanceMatrixResponseException.java

@@ -0,0 +1,7 @@
+package com.osrm.client;
+
+public class DistanceMatrixResponseException extends RuntimeException {
+  public DistanceMatrixResponseException(String message) {
+    super(message);
+  }
+}

src/main/java/com/osrm/client/OSRMClient.java

@@ -61,11 +61,17 @@ public OSRMDistanceResponse getDistanceMatrix(List<GeoLocation> locations, doubl
 
         try {
             Response response = client.newCall(request).execute();
+
+            if (!response.isSuccessful()) {
+                UnsuccessfulResponse unsuccessfulResponse = UnsuccessfulResponse.fromJSON(response.body().string());
+                throw new DistanceMatrixResponseException("OSRM Error: " + unsuccessfulResponse.getMessage());
+            }
+
             osrmDistanceResponse = OSRMDistanceResponse.fromJSON(response.body().string());
         }
         catch(Exception e) {
             System.out.print(e.getMessage());
-            throw new OptimizationDistanceMatrixException("Error while connecting to osrm server");
+            throw new OptimizationDistanceMatrixException("Error while connecting to OSRM Server");
         }
 
         return osrmDistanceResponse;

src/main/java/com/osrm/client/UnsuccessfulResponse.java

@@ -0,0 +1,31 @@
+package com.osrm.client;
+
+import com.google.gson.Gson;
+
+public class UnsuccessfulResponse {
+  private String message;
+  private String statusCode;
+  private String error;
+
+  public UnsuccessfulResponse(String message, String statusCode, String error) {
+    this.message = message;
+    this.statusCode = statusCode;
+    this.error = error;
+  }
+
+  public String getMessage() {
+    return message;
+  }
+
+  public String getStatusCode() {
+    return statusCode;
+  }
+
+  public String getError() {
+    return error;
+  }
+
+  public static UnsuccessfulResponse fromJSON (String json) {
+    return new Gson().fromJson(json, UnsuccessfulResponse.class);
+  }
+}