Ensure that HTTP status code is set on CouchDBException

Author: ricellis

cloudant-client/src/main/java/com/cloudant/client/org/lightcouch/CouchDbClient.java

@@ -564,7 +564,7 @@ public HttpConnection execute(HttpConnection connection) {
                         exception.error = e.error;
                     }
                 } else {
-                    exception = new CouchDbException(e.getMessage(), e);
+                    exception = new CouchDbException(e.getMessage(), e, e.statusCode);
                     exception.error = e.error;
                     exception.reason = e.reason;
                 }

cloudant-client/src/test/java/com/cloudant/tests/HttpIamTest.java

@@ -319,7 +319,7 @@ public void iamRenewalFailureOnIamToken() throws Exception {
                 assertThrows(CouchDbException.class,
                         () -> c.executeRequest(Http.GET(c.getBaseUri())).responseAsString(),
                         "Failure to get a token should throw a CouchDbException.");
-        assertTrue(re.getMessage().startsWith("HTTP response error getting session"), "The " +
+        assertTrue(re.getMessage().startsWith("500 HTTP response error getting session"), "The " +
                 "exception should have been for a HTTP response error.");
 
         // cloudant mock server
@@ -570,10 +570,8 @@ public void iamTokenServer429RetryAndFail() throws Exception {
                 assertThrows(CouchDbException.class,
                         () -> c.executeRequest(Http.GET(c.getBaseUri())).responseAsString(),
                         "Failure to get a token should throw a CouchDbException.");
-        assertTrue(re.getMessage().startsWith("HTTP response error getting session"), "The " +
-                "exception should have been for a HTTP response error.");
-        assertTrue(re.getMessage().contains("response code 429"), "The exception should report a " +
-                "429 response code");
+        assertTrue(re.getMessage().startsWith("429 HTTP response error getting session"), "The " +
+                "exception should have been for a 429 HTTP response error.");
 
         // iam mock server
 

cloudant-client/src/test/java/com/cloudant/tests/HttpTest.java

@@ -1050,7 +1050,7 @@ public void badCredsCookieThrows() {
                         () -> c.executeRequest(Http.GET(c.getBaseUri())).responseAsString(),
                         "Bad credentials should throw a CouchDbException.");
 
-        assertTrue(re.getMessage().startsWith("Credentials are incorrect for server"), "The " +
+        assertTrue(re.getMessage().startsWith("401 Credentials are incorrect for server"), "The " +
                 "exception should have been for bad creds.");
     }
 

cloudant-http/src/main/java/com/cloudant/http/internal/interceptors/CookieInterceptorBase.java

@@ -141,14 +141,17 @@ HttpConnection makeSessionRequest(URL url, byte[] payload, String contentMimeTyp
                         .getErrorStream());
                 // Log the error stream content
                 logger.fine(error);
+                HttpConnectionInterceptorException e;
                 if (responseCode == 401) {
-                    throw new HttpConnectionInterceptorException(String.format("Credentials are " +
+                     e = new HttpConnectionInterceptorException(String.format("Credentials are " +
                             "incorrect for server %s", url));
                 } else {
                     // catch any other response code
-                    throw new HttpConnectionInterceptorException(String.format("HTTP response " +
-                            "error getting session at %s, response code %s", url, responseCode));
+                    e = new HttpConnectionInterceptorException(String.format("HTTP response " +
+                            "error getting session at %s.", url));
                 }
+                e.statusCode = responseCode;
+                throw e;
             }
         } catch (IOException e) {
             throw wrapIOException("Failed to read server response from ", conn.getConnection(), e);

cloudant-http/src/main/java/com/cloudant/http/internal/interceptors/HttpConnectionInterceptorException.java

@@ -19,6 +19,7 @@ public class HttpConnectionInterceptorException extends RuntimeException {
     public boolean deserialize = false;
     public final String error;
     public final String reason;
+    public int statusCode;
 
     public HttpConnectionInterceptorException(Throwable cause) {
         this.initCause(cause);