DX-1036 (#19)

* DX-1036

* Bubbled up the status code

Author: jchavez443

src/main/java/com/bandwidth/iris/sdk/IrisClient.java

@@ -52,12 +52,12 @@ private void initHttpClient(String userName, String password) {
         httpClient.getCredentialsProvider().setCredentials(AuthScope.ANY, credentials);
     }
 
-    private <T> T processResponse(String responseBody, Class<T> returnType) throws Exception {
-        T parsedResponse = XmlUtils.fromXml(responseBody, returnType);
+    private <T> T processResponse(IrisResponse response, Class<T> returnType) throws Exception {
+        T parsedResponse = XmlUtils.fromXml(response.getResponseBody(), returnType);
         if (parsedResponse instanceof BaseResponse) {
             BaseResponse baseResponse = (BaseResponse) parsedResponse;
             if (baseResponse.getResponseStatus() != null) {
-                throw new IrisClientException(baseResponse.getResponseStatus().getErrorCode(),
+                throw new IrisClientException(response.getStatusCode(), baseResponse.getResponseStatus().getErrorCode(),
                         baseResponse.getResponseStatus().getDescription());
             }
         }
@@ -66,15 +66,15 @@ private <T> T processResponse(String responseBody, Class<T> returnType) throws E
 
     public <T> T get(String uri, Class<T> returnType) throws Exception {
         IrisResponse response = get(uri);
-        return processResponse(response.getResponseBody(), returnType);
+        return processResponse(response, returnType);
     }
 
     public byte[] getFile(String uri) throws Exception {
         HttpGet get = new HttpGet(uri);
         HttpResponse response = httpClient.execute(get);
 
         if (response.getStatusLine().getStatusCode() != 200) {
-            throw new IrisClientException("Status code getting LOAS file:  " + response.getStatusLine().getStatusCode());
+            throw new IrisClientException( response.getStatusLine().getStatusCode(), "Status code getting LOAS file:  " + response.getStatusLine().getStatusCode(), "");
         }
         return response.getEntity() != null ? EntityUtils.toByteArray(response.getEntity()) : new byte[]{};
     }
@@ -86,7 +86,7 @@ public IrisResponse get(String uri) throws Exception {
 
     public <T> T post(String uri, BaseModel data, Class<T> returnType) throws Exception {
         IrisResponse response = post(uri, data);
-        return processResponse(response.getResponseBody(), returnType);
+        return processResponse(response, returnType);
     }
 
     public IrisResponse post(String uri, BaseModel data) throws Exception {
@@ -104,7 +104,7 @@ public IrisResponse delete(String uri) throws Exception {
 
     public <T> T put(String uri, BaseModel data, Class<T> returnType) throws Exception {
         IrisResponse response = put(uri, data);
-        return processResponse(response.getResponseBody(), returnType);
+        return processResponse(response, returnType);
     }
 
     public IrisResponse put(String uri, BaseModel data) throws Exception {
@@ -170,7 +170,7 @@ protected IrisResponse executeRequest(HttpUriRequest request) throws Exception {
         irisResponse.setHeaders(headers);
 
         if (!irisResponse.isOK()) {
-            throw new IrisClientException(irisResponse.getResponseBody());
+            throw new IrisClientException(irisResponse.getStatusCode(), "", irisResponse.getResponseBody());
         }
         return irisResponse;
     }
@@ -179,10 +179,10 @@ public String getIdFromLocationHeader(String locationHeader) {
         return locationHeader.substring(locationHeader.lastIndexOf("/") + 1);
     }
 
-    public void checkResponse(BaseResponse response) throws IrisClientException {
-        if (response.getResponseStatus() != null) {
-            throw new IrisClientException(response.getResponseStatus().getErrorCode(),
-                    response.getResponseStatus().getDescription());
+    public void checkResponse( IrisResponse response, BaseResponse baseResponse ) throws IrisClientException{
+        if(baseResponse.getResponseStatus() != null ){
+            throw new IrisClientException(response.getStatusCode(),baseResponse.getResponseStatus().getErrorCode(),
+                    baseResponse.getResponseStatus().getDescription());
         }
     }
 

src/main/java/com/bandwidth/iris/sdk/IrisClientException.java

@@ -3,19 +3,17 @@
 public class IrisClientException extends Exception {
     private String errorCode;
     private String description;
+    private int statusCode;
 
     public IrisClientException(Throwable e) {
         super(e);
     }
-
-    public IrisClientException(String message) {
-        super(message);
-    }
-
-    public IrisClientException(String errorCode, String description) {
+    
+    public IrisClientException(int statusCode, String errorCode, String description) {
         super(description);
         this.errorCode = errorCode;
         this.description = description;
+        this.statusCode = statusCode;
     }
 
     public String getErrorCode() {
@@ -26,4 +24,6 @@ public String getDescription() {
         return description;
     }
 
+    public int getStatusCode() { return statusCode; }
+
 }

src/main/java/com/bandwidth/iris/sdk/model/Reservation.java

@@ -38,7 +38,7 @@ public static Reservation create(IrisClient client, Reservation reservation) thr
         if (response.getStatusCode() == HttpStatus.SC_BAD_REQUEST) {
             ReservationResponse reservationResponse =
                     XmlUtils.fromXml(response.getResponseBody(), ReservationResponse.class);
-            client.checkResponse(reservationResponse);
+            client.checkResponse(response, reservationResponse);
         }
         return result;
     }

src/main/java/com/bandwidth/iris/sdk/model/Site.java

@@ -40,7 +40,6 @@ public static Site create(IrisClient client, Site site) throws Exception {
     public static List<Site> list(IrisClient client) throws Exception {
         SitesResponse sitesResponse = client
                 .get(client.buildAccountModelUri(new String[] { IrisPath.SITES_URI_PATH }), SitesResponse.class);
-        client.checkResponse(sitesResponse);
         List<Site> sites = sitesResponse.getSites();
         for (Site s : sites) {
             s.setClient(client);

src/main/java/com/bandwidth/iris/sdk/model/Tns.java

@@ -40,7 +40,7 @@ public static TelephoneNumberResponse checkStatus(IrisClient client, String tn)
         //Have to manually parse for this error because of how it's returned
         if (irisResponse.getResponseBody().indexOf("ErrorResponse") != -1) {
             ErrorResponse errorResponse = XmlUtils.fromXml(irisResponse.getResponseBody(), ErrorResponse.class);
-            throw new IrisClientException(errorResponse.getIrisStatus().getCode(),
+            throw new IrisClientException(irisResponse.getStatusCode(),errorResponse.getIrisStatus().getCode(),
                     errorResponse.getIrisStatus().getDescription());
         } else {
             return XmlUtils.fromXml(irisResponse.getResponseBody(), TelephoneNumberResponse.class);

src/test/java/com/bandwidth/iris/sdk/AvailableNpaNxxTests.java

@@ -28,4 +28,24 @@ public void testSearchNpaNxx() throws Exception {
         assertEquals(2, result.size());
         assertEquals("919", result.get(0).getNpa());
     }
+
+    @Test
+    public void testIrisClientException() throws Exception {
+        String url = "/v1.0/accounts/accountId/availableNpaNxx.*";
+        stubFor(get(urlMatching(url))
+                .willReturn(aResponse()
+                        .withStatus(400).withBody(IrisClientTestUtils.availableNpaNxxSearchResultExceptionXml)));
+
+        Map<String, Object> query = new HashMap<String, Object>();
+        query.put("areaCode", "919");
+
+
+        try {
+            List<AvailableNpaNxx> result = AvailableNpaNxx.list(getDefaultClient(), query);
+        } catch ( IrisClientException ex ){
+            assertEquals(400, ex.getStatusCode());
+        }
+
+
+    }
 }

src/test/java/com/bandwidth/iris/sdk/IrisClientTestUtils.java

@@ -111,6 +111,7 @@ public class IrisClientTestUtils {
      */
     public static String localAreaSearchResultXml = "<SearchResult><ResultCount>2</ResultCount><TelephoneNumberDetailList><TelephoneNumberDetail><City>JERSEY CITY</City><LATA>224</LATA><RateCenter>JERSEYCITY</RateCenter><State>NJ</State><TelephoneNumber>2012001555</TelephoneNumber></TelephoneNumberDetail><TelephoneNumberDetail><City>JERSEY CITY</City><LATA>224</LATA><RateCenter>JERSEYCITY</RateCenter><State>NJ</State><TelephoneNumber>123123123</TelephoneNumber></TelephoneNumberDetail></TelephoneNumberDetailList></SearchResult>";
     public static String availableNpaNxxSearchResultXml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><SearchResultForAvailableNpaNxx><AvailableNpaNxxList><AvailableNpaNxx><City>RALEIGH</City><Npa>919</Npa><Nxx>555</Nxx><Quantity>52</Quantity><State>NC</State></AvailableNpaNxx><AvailableNpaNxx><City>CARY</City><Npa>919</Npa><Nxx>556</Nxx><Quantity>168</Quantity><State>NC</State></AvailableNpaNxx></AvailableNpaNxxList></SearchResultForAvailableNpaNxx>";
+    public static String availableNpaNxxSearchResultExceptionXml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><SearchResultForAvailableNpaNxx><ResponseStatus><ErrorCode>12016</ErrorCode><Description>Site '5001' does not exist</Description></ResponseStatus><AvailableNpaNxxList><AvailableNpaNxx><City>RALEIGH</City><Npa>919</Npa><Nxx>555</Nxx><Quantity>52</Quantity><State>NC</State></AvailableNpaNxx><AvailableNpaNxx><City>CARY</City><Npa>919</Npa><Nxx>556</Nxx><Quantity>168</Quantity><State>NC</State></AvailableNpaNxx></AvailableNpaNxxList></SearchResultForAvailableNpaNxx>";
     /**
      * Sites Xmls
      */