Merge pull request #31 from Sybit-Education/develop

 simplify/streamline exception handling

Author: stritti

.gitignore

@@ -20,3 +20,5 @@ src/itest/resources/credentials.properties
 # IDE
 .idea
 src/itest/resources/credentials.properties
+out/
+*.iml

src/itest/java/com/sybit/airtable/TableSelectJacksonOMTest.java

@@ -7,6 +7,7 @@
 package com.sybit.airtable;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 import com.mashape.unirest.http.ObjectMapper;
 import com.sybit.airtable.exception.AirtableException;
 import com.sybit.airtable.movies.Movie;
@@ -36,6 +37,15 @@ public void setup() throws AirtableException {
             public <T> T readValue(final String value, final Class<T> valueType) {
                 try {
                     return objectMapper.readValue(value, valueType);
+                } catch (UnrecognizedPropertyException e) {
+                    try {
+                        // dummy instance to follow code flow and execute HttpResponseExceptionHandler.onResponse
+                        T instance = valueType.newInstance();
+                        return instance;
+                    }
+                    catch (IllegalAccessException | InstantiationException e1) {
+                        throw new RuntimeException(e);
+                    }
                 } catch (IOException e) {
                     throw new RuntimeException(e);
                 }
@@ -120,4 +130,16 @@ public void testSelectNonExistingTable() throws AirtableException, HttpResponseE
     }
 
 
+    @Test
+    public void testSelectNonExistingExceptionMessageTable() throws HttpResponseException {
+
+        String message;
+        try {
+            base.table("NotExists", Movie.class).select();
+            message = "Success";
+        } catch (AirtableException e) {
+            message = e.getMessage();
+        }
+        assertEquals("Could not find table NotExists in application " + base.name() + " (TABLE_NOT_FOUND) [Http code 404]", message);
+    }
 }

src/itest/java/com/sybit/airtable/TableSelectTest.java

@@ -79,6 +79,19 @@ public void testSelectNonExistingTable() throws AirtableException, HttpResponseE
         assertNotNull(retval);
     }
 
+    @Test
+    public void testSelectNonExistingTableExceptionMessage() throws HttpResponseException {
+
+        String message;
+        try {
+            base.table("NotExists", Movie.class).select();
+            message = "Success";
+        } catch (AirtableException e) {
+            message = e.getMessage();
+        }
+        assertEquals("Could not find table NotExists in application " + base.name() + " (TABLE_NOT_FOUND) [Http code 404]", message);
+    }
+
 //    @Test
 //    public void testSelectWithSerializedNames() throws AirtableException, HttpResponseException {
 //

src/main/java/com/sybit/airtable/exception/HttpResponseExceptionHandler.java

@@ -10,6 +10,8 @@
 import com.mashape.unirest.http.HttpResponse;
 import com.sybit.airtable.vo.Error;
 
+import java.util.Map;
+
 /**
  * Handle HTTP responses and create exceptions.
  *
@@ -22,36 +24,27 @@ public static void onResponse(HttpResponse response) throws AirtableException {
         final Integer statusCode = response.getStatus();
         String message = convertStreamToString(response.getRawBody());
 
-        final Gson gson = new Gson();
-        Error err = gson.fromJson(message, Error.class);
-        switch (statusCode) {
-            case 401:
-                throw new AirtableException("AUTHENTICATION_REQUIRED", "You should provide valid api key to perform this operation", statusCode);
-            case 403:
-                throw new AirtableException("NOT_AUTHORIZED", "You are not authorized to perform this operation", statusCode);
-
-            case 404:
-                message = ( err.getMessage() != null) ?  err.getMessage() : "Could not find what you are looking for";
-                throw new AirtableException("NOT_FOUND", message, statusCode);
-
-            case 413:
-                throw new AirtableException("REQUEST_TOO_LARGE", "Request body is too large", statusCode);
+        Error err = extractError(message);
 
-            case  422:
-                throw new AirtableException(err.getType(), err.getMessage(), statusCode);
-
-            case  429:
-                throw new AirtableException("TOO_MANY_REQUESTS", "You have made too many requests in a short period of time. Please retry your request later", statusCode);
+        throw new AirtableException(err.getType(), err.getMessage(), statusCode);
+    }
 
-            case 500:
-                throw new AirtableException("SERVER_ERROR", "Try again. If the problem persists, contact support.", statusCode);
+    private static Error extractError(String message) {
 
-            case  503:
-                throw new AirtableException("SERVICE_UNAVAILABLE", "The service is temporarily unavailable. Please retry shortly.", statusCode);
+        final Gson gson = new Gson();
 
-            default:
-                throw new AirtableException("UNDEFINED_ERROR", message, statusCode);
+        Error err;
+        try {
+            Map<String, Object> jsonMap = gson.fromJson(message, Map.class);
+            String innerJson = gson.toJson(jsonMap.get("error"));
+            err = gson.fromJson(innerJson, Error.class);
+        } catch (Exception ignored) {
+            err = new Error();
+            err.setType("UNDEFINED_ERROR");
+            err.setMessage(message);
         }
+
+        return err;
     }
 
     public static String convertStreamToString(java.io.InputStream is) {