Merge pull request #73 from LeonisX/master

Avoid StackOverflowError in XeroExceptionHandler
XeroAPI · Apr 30, 2018 · 6c519b2 · 6c519b2
2 parents 8677946 + 6e39dae
commit 6c519b2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/com/xero/api/exception/XeroExceptionHandler.java b/src/main/java/com/xero/api/exception/XeroExceptionHandler.java
@@ -80,7 +80,7 @@ public XeroApiException handleBadRequest(HttpResponseException httpResponseExcep
                 return convertException(httpResponseException);
             }
         } else {
-            return convertException(httpResponseException);
+            return newApiException(httpResponseException);
         }
     }
 

diff --git a/src/test/java/com/xero/api/exception/XeroExceptionHandlerTest.java b/src/test/java/com/xero/api/exception/XeroExceptionHandlerTest.java
@@ -13,9 +13,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -67,6 +65,17 @@ public void handleOAuthErrorRequest() throws Exception {
         assertNotNull(xeroApiException.getMessage());
     }
 
+    @Test
+    public void handleOtherErrorRequest() throws Exception {
+        when(httpResponseException.getContent()).thenReturn("dummy");
+        when(httpResponseException.getStatusCode()).thenReturn(400);
+        XeroApiException xeroApiException = xeroExceptionHandler.handleBadRequest(httpResponseException);
+        assertNotNull(xeroApiException);
+        assertNotNull(xeroApiException.getMessages());
+        assertNotNull(xeroApiException.getMessage());
+        assertEquals(xeroApiException.getResponseCode(), 400);
+    }
+
     /**
      * sample oauth exception
      * @return oauth exception