Merge pull request #61 from indigo-dc/new_exception

New exception

Author: micafer

pom.xml

@@ -20,7 +20,7 @@
     <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
     <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
     <mockserver-netty.version>3.10.4</mockserver-netty.version>
-    <jacoco-maven-plugin.version>0.7.7.201606060606</jacoco-maven-plugin.version>
+    <jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
     <mockito.version>2.0.70-beta</mockito.version>
   </properties>
 

src/main/java/es/upv/i3m/grycap/im/rest/client/ImClient.java

@@ -31,6 +31,7 @@
 
 import java.nio.file.Path;
 
+import javax.ws.rs.ProcessingException;
 import javax.ws.rs.ServerErrorException;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.client.Client;
@@ -173,7 +174,17 @@ public <T> T delete(final String path, final Class<T> type,
   private static ResponseError
       createReponseError(WebApplicationException exception) {
     Response clientReponse = exception.getResponse();
-    return clientReponse.readEntity(ResponseError.class);
+
+    ResponseError response;
+    try {
+      response = clientReponse.readEntity(ResponseError.class);
+    } catch (ProcessingException e) {
+      // if the error msg is not the expected JSON, get it as String
+      String errorMessage = clientReponse.readEntity(String.class);
+      response = new ResponseError(errorMessage, clientReponse.getStatus());
+    }
+
+    return response;
   }
 
   /**

src/test/java/es/upv/i3m/grycap/im/rest/client/ImClientTest.java

@@ -17,7 +17,6 @@
 package es.upv.i3m.grycap.im.rest.client;
 
 import es.upv.i3m.grycap.ImTestWatcher;
-import es.upv.i3m.grycap.im.exceptions.ImClientServerErrorException;
 import es.upv.i3m.grycap.im.exceptions.ImClientErrorException;
 import es.upv.i3m.grycap.im.exceptions.ImClientException;
 import es.upv.i3m.grycap.im.pojo.ResponseError;
@@ -35,7 +34,6 @@ public class ImClientTest extends ImTestWatcher {
   private static final String AUTH_FILE_PATH = "./src/test/resources/auth.dat";
   private static final Integer EXPECTED_ERROR_CODE = 404;
   private static final String EXPECTED_ERROR_MESSAGE = "Not found: '/'";
-  private static final String IM_FAKE_PROVIDER_URL = "http://localhost:1234";
 
   private ImClient getImClient() {
     return imClient;