improved ArangoDBException with responseCode, errorNum, errorMessage

Author: Mark

ChangeLog

@@ -5,6 +5,7 @@ v4.1.8 (2017-02-xx)
 * changed java.sql.Timestamp serialization from VPack.date to VPack.string (ISO 8601)
 * added byte[] de-/serialization from/to VPack.string (Base64)
 * added ArangoCollection.drop(isSystem)
+* improved ArangoDBException with responseCode, errorNum, errorMessage
 
 v4.1.7 (2017-01-26)
 ---------------------------

src/main/java/com/arangodb/ArangoDBException.java

@@ -20,13 +20,22 @@
 
 package com.arangodb;
 
+import com.arangodb.entity.ErrorEntity;
+
 /**
  * @author Mark - mark at arangodb.com
  *
  */
 public class ArangoDBException extends RuntimeException {
 
 	private static final long serialVersionUID = 6165638002614173801L;
+	private ErrorEntity entity = null;
+
+	public ArangoDBException(final ErrorEntity errorEntity) {
+		super(String.format("Response: %s, Error: %s - %s", errorEntity.getCode(), errorEntity.getErrorNum(),
+			errorEntity.getErrorMessage()));
+		this.entity = errorEntity;
+	}
 
 	public ArangoDBException(final String message) {
 		super(message);
@@ -36,4 +45,16 @@ public ArangoDBException(final Throwable cause) {
 		super(cause);
 	}
 
+	public String getErrorMessage() {
+		return entity != null ? entity.getErrorMessage() : null;
+	}
+
+	public int getResponseCode() {
+		return entity != null ? entity.getCode() : null;
+	}
+
+	public int getErrorNum() {
+		return entity != null ? entity.getErrorNum() : null;
+	}
+
 }

src/main/java/com/arangodb/internal/velocystream/Communication.java

@@ -101,7 +101,8 @@ protected void checkError(final Response response) throws ArangoDBException {
 		try {
 			if (response.getResponseCode() >= ERROR_STATUS) {
 				if (response.getBody() != null) {
-					throw new ArangoDBException(createErrorMessage(response));
+					final ErrorEntity errorEntity = vpack.deserialize(response.getBody(), ErrorEntity.class);
+					throw new ArangoDBException(errorEntity);
 				} else {
 					throw new ArangoDBException(String.format("Response Code: %s", response.getResponseCode()));
 				}
@@ -111,14 +112,6 @@ protected void checkError(final Response response) throws ArangoDBException {
 		}
 	}
 
-	private String createErrorMessage(final Response response) throws VPackParserException {
-		String errorMessage;
-		final ErrorEntity errorEntity = vpack.deserialize(response.getBody(), ErrorEntity.class);
-		errorMessage = String.format("Response: %s, Error: %s - %s", errorEntity.getCode(), errorEntity.getErrorNum(),
-			errorEntity.getErrorMessage());
-		return errorMessage;
-	}
-
 	protected Response createResponse(final Message messsage) throws VPackParserException {
 		final Response response = vpack.deserialize(messsage.getHead(), Response.class);
 		if (messsage.getBody() != null) {

src/test/java/com/arangodb/ArangoDBTest.java

@@ -393,4 +393,17 @@ public void setLogLevel() {
 			arangoDB.setLogLevel(entity);
 		}
 	}
+
+	@Test
+	public void arangoDBException() {
+		final ArangoDB arangoDB = new ArangoDB.Builder().build();
+		try {
+			arangoDB.db("no").getInfo();
+			fail();
+		} catch (final ArangoDBException e) {
+			assertThat(e.getResponseCode(), is(404));
+			assertThat(e.getErrorNum(), is(1228));
+			assertThat(e.getErrorMessage(), is("database not found"));
+		}
+	}
 }