fix #434 - pass thru full response body when an error message doesn't conform to expected formats

(cherry picked from commit e6daf26)

Author: sammefford

src/main/java/com/marklogic/client/impl/JerseyServices.java

@@ -18,10 +18,12 @@
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.net.URI;
@@ -221,13 +223,23 @@ public JerseyServices() {
 
 	private FailedRequest extractErrorFields(ClientResponse response) {
 		if ( response == null ) return null;
-		InputStream is = response.getEntityInputStream();
+		if ( response.getStatus() == 401 ) {
+			FailedRequest failure = new FailedRequest();
+			failure.setMessageString("Unauthorized");
+			failure.setStatusString("Failed Auth");
+			return failure;
+		}
+		String responseBody = response.getEntity(String.class);
 		try {
+			InputStream is = new ByteArrayInputStream(responseBody.getBytes("UTF-8"));
 			FailedRequest handler = FailedRequest.getFailedRequest(
 					response.getStatus(), response.getType(), is);
+			if ( handler.getMessage() == null ) {
+				handler.setMessageString(responseBody);
+			}
 			return handler;
-		} catch (RuntimeException e) {
-			throw (e);
+		} catch (UnsupportedEncodingException e) {
+			throw new IllegalStateException("UTF-8 is unsupported", e);
 		} finally {
 			response.close();
 		}

src/test/java/com/marklogic/client/test/InvalidUserTest.java

@@ -21,6 +21,7 @@
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.DatabaseClientFactory;
+import com.marklogic.client.FailedRequestException;
 import com.marklogic.client.DatabaseClientFactory.Authentication;
 import com.marklogic.client.document.TextDocumentManager;
 import com.marklogic.client.io.StringHandle;
@@ -29,6 +30,7 @@ public class InvalidUserTest {
     @Test
     public void testInvalidUserAuth() {
 
+        //System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.http.wire", "debug");
         // create the client
         DatabaseClient client = DatabaseClientFactory.newClient(
           "localhost", 8012, "MyFooUser", "x", Authentication.DIGEST);
@@ -48,7 +50,7 @@ public void testInvalidUserAuth() {
             // the next line will only run if write doesn't throw an exception
             docMgr.delete(docId);
         }
-        catch (Exception e) {
+        catch (FailedRequestException e) {
             exception = e.toString();
         } finally {
             client.release();