Merge pull request #5 from dchrzascik/issue-4

Issue #4 Passing transaction exception message to future's result

Author: mpv1989

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

@@ -140,9 +140,7 @@ public CompletableFuture<Response> execute(final Request request, final Connecti
 						if (response.getResponseCode() >= 300) {
 							if (response.getBody() != null) {
 								final ErrorEntity errorEntity = util.deserialize(response.getBody(), ErrorEntity.class);
-								final String errorMessage = String.format("Response: %s, Error: %s - %s",
-									errorEntity.getCode(), errorEntity.getErrorNum(), errorEntity.getErrorMessage());
-								rfuture.completeExceptionally(new ArangoDBException(errorMessage));
+								rfuture.completeExceptionally(new ArangoDBException(errorEntity));
 							} else {
 								rfuture.completeExceptionally(new ArangoDBException(
 										String.format("Response Code: %s", response.getResponseCode())));

src/test/java/com/arangodb/ArangoDatabaseTest.java

@@ -28,6 +28,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
@@ -38,6 +39,7 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -1029,6 +1031,26 @@ public void getDocument() throws InterruptedException, ExecutionException {
 		}
 	}
 
+
+	@Test
+	public void shouldIncludeExceptionMessage() {
+		final String exceptionMessage = "My error context";
+		final String action = "function (params) {"
+				+ "throw '" + exceptionMessage + "';"
+				+ "}";
+		try {
+			db.transaction(action, VPackSlice.class, null).join();
+			fail();
+		} catch (final CompletionException e) {
+			Throwable cause = e.getCause();
+			if (cause instanceof ArangoDBException) {
+				assertTrue(((ArangoDBException) cause).getException().equals(exceptionMessage));
+			} else {
+				fail("Root cause expected to be an ArangoDBException");
+			}
+		}
+	}
+
 	@Test(expected = ArangoDBException.class)
 	public void getDocumentWrongId() throws InterruptedException, ExecutionException {
 		db.getDocument("123", BaseDocument.class).get();