fixed vertex not-found error handling

Author: rashtao

core/src/main/java/com/arangodb/internal/ArangoVertexCollectionAsyncImpl.java

@@ -20,23 +20,23 @@
 
 package com.arangodb.internal;
 
+import com.arangodb.ArangoDBException;
 import com.arangodb.ArangoGraphAsync;
 import com.arangodb.ArangoVertexCollectionAsync;
 import com.arangodb.entity.VertexEntity;
 import com.arangodb.entity.VertexUpdateEntity;
 import com.arangodb.model.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+
+import static com.arangodb.internal.ArangoErrors.*;
 
 /**
  * @author Mark Vollmary
  */
 public class ArangoVertexCollectionAsyncImpl extends InternalArangoVertexCollection implements ArangoVertexCollectionAsync {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ArangoVertexCollectionAsyncImpl.class);
-
     private final ArangoGraphAsync graph;
 
     protected ArangoVertexCollectionAsyncImpl(final ArangoGraphAsyncImpl graph, final String name) {
@@ -72,27 +72,24 @@ public CompletableFuture<VertexEntity> insertVertex(final Object value, final Ve
 
     @Override
     public <T> CompletableFuture<T> getVertex(final String key, final Class<T> type) {
-        return executorAsync().execute(() -> getVertexRequest(key, new GraphDocumentReadOptions()),
-                        getVertexResponseDeserializer(type))
-                .exceptionally(e -> {
-                    // FIXME
-                    if (LOGGER.isDebugEnabled()) {
-                        LOGGER.debug(e.getMessage(), e);
-                    }
-                    return null;
-                });
-
+        return getVertex(key, type, null);
     }
 
     @Override
     public <T> CompletableFuture<T> getVertex(final String key, final Class<T> type, final GraphDocumentReadOptions options) {
         return executorAsync().execute(() -> getVertexRequest(key, options), getVertexResponseDeserializer(type))
-                .exceptionally(e -> {
-                    // FIXME
-                    if (LOGGER.isDebugEnabled()) {
-                        LOGGER.debug(e.getMessage(), e);
+                .exceptionally(err -> {
+                    Throwable e = err instanceof CompletionException ? err.getCause() : err;
+                    if (e instanceof ArangoDBException) {
+                        ArangoDBException aEx = (ArangoDBException) e;
+                        if (matches(aEx, 304)
+                                || matches(aEx, 404, ERROR_ARANGO_DOCUMENT_NOT_FOUND)
+                                || matches(aEx, 412, ERROR_ARANGO_CONFLICT)
+                        ) {
+                            return null;
+                        }
                     }
-                    return null;
+                    throw ArangoDBException.of(e);
                 });
     }
 

core/src/main/java/com/arangodb/internal/ArangoVertexCollectionImpl.java

@@ -26,16 +26,14 @@
 import com.arangodb.entity.VertexEntity;
 import com.arangodb.entity.VertexUpdateEntity;
 import com.arangodb.model.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import static com.arangodb.internal.ArangoErrors.*;
 
 /**
  * @author Mark Vollmary
  */
 public class ArangoVertexCollectionImpl extends InternalArangoVertexCollection implements ArangoVertexCollection {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ArangoVertexCollectionImpl.class);
-
     private final ArangoGraph graph;
 
     protected ArangoVertexCollectionImpl(final ArangoGraphImpl graph, final String name) {
@@ -71,28 +69,21 @@ public VertexEntity insertVertex(final Object value, final VertexCreateOptions o
 
     @Override
     public <T> T getVertex(final String key, final Class<T> type) {
-        // FIXME
-        try {
-            return executorSync().execute(getVertexRequest(key, new GraphDocumentReadOptions()),
-                    getVertexResponseDeserializer(type));
-        } catch (final ArangoDBException e) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug(e.getMessage(), e);
-            }
-            return null;
-        }
+        return getVertex(key, type, null);
     }
 
     @Override
     public <T> T getVertex(final String key, final Class<T> type, final GraphDocumentReadOptions options) {
-        // FIXME
         try {
             return executorSync().execute(getVertexRequest(key, options), getVertexResponseDeserializer(type));
         } catch (final ArangoDBException e) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug(e.getMessage(), e);
+            if (matches(e, 304)
+                    || matches(e, 404, ERROR_ARANGO_DOCUMENT_NOT_FOUND)
+                    || matches(e, 412, ERROR_ARANGO_CONFLICT)
+            ) {
+                return null;
             }
-            return null;
+            throw e;
         }
     }