fixed not-found error handling in ArangoCollectionImpl

Author: rashtao

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

@@ -26,11 +26,10 @@
 import com.arangodb.entity.*;
 import com.arangodb.model.*;
 import com.arangodb.util.RawData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
 
+import static com.arangodb.internal.ArangoErrors.*;
 import static com.arangodb.internal.serde.SerdeUtils.constructParametricType;
 
 /**
@@ -39,8 +38,6 @@
  */
 public class ArangoCollectionImpl extends InternalArangoCollection implements ArangoCollection {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ArangoCollectionImpl.class);
-
     private final ArangoDatabase db;
 
     protected ArangoCollectionImpl(final ArangoDatabaseImpl db, final String name) {
@@ -139,17 +136,10 @@ public <T> T getDocument(final String key, final Class<T> type, final DocumentRe
         try {
             return executorSync().execute(getDocumentRequest(key, options), getDocumentResponseDeserializer(type));
         } catch (final ArangoDBException e) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug(e.getMessage(), e);
-            }
-
-            // handle Response: 404, Error: 1655 - transaction not found
-            if (e.getErrorNum() != null && e.getErrorNum() == 1655) {
-                throw e;
-            }
-
-            if ((e.getResponseCode() != null && (e.getResponseCode() == 404 || e.getResponseCode() == 304
-                    || e.getResponseCode() == 412))) {
+            if (matches(e, 304)
+                    || matches(e, 404, ERROR_ARANGO_DOCUMENT_NOT_FOUND)
+                    || matches(e, 412, ERROR_ARANGO_CONFLICT)
+            ) {
                 return null;
             }
             throw e;
@@ -332,14 +322,10 @@ public Boolean documentExists(final String key, final DocumentExistsOptions opti
             executorSync().execute(documentExistsRequest(key, options), Void.class);
             return true;
         } catch (final ArangoDBException e) {
-
-            // handle Response: 404, Error: 1655 - transaction not found
-            if (e.getErrorNum() != null && e.getErrorNum() == 1655) {
-                throw e;
-            }
-
-            if ((e.getResponseCode() != null &&
-                    (e.getResponseCode() == 404 || e.getResponseCode() == 304 || e.getResponseCode() == 412))) {
+            if (matches(e, 304)
+                    || matches(e, 404)
+                    || matches(e, 412)
+            ) {
                 return false;
             }
             throw e;
@@ -408,10 +394,10 @@ public boolean exists() {
             getInfo();
             return true;
         } catch (final ArangoDBException e) {
-            if (ArangoErrors.ERROR_ARANGO_DATA_SOURCE_NOT_FOUND.equals(e.getErrorNum())) {
-                return false;
+            if (!matches(e, 404, ERROR_ARANGO_DATA_SOURCE_NOT_FOUND)) {
+                throw e;
             }
-            throw e;
+            return false;
         }
     }
 

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

@@ -20,16 +20,29 @@
 
 package com.arangodb.internal;
 
+import com.arangodb.ArangoDBException;
+
 /**
  * @author Mark Vollmary
  */
 public final class ArangoErrors {
 
+    public static final Integer ERROR_ARANGO_CONFLICT = 1200;
+    public static final Integer ERROR_ARANGO_DOCUMENT_NOT_FOUND = 1202;
     public static final Integer ERROR_ARANGO_DATA_SOURCE_NOT_FOUND = 1203;
     public static final Integer ERROR_ARANGO_DATABASE_NOT_FOUND = 1228;
     public static final Integer ERROR_GRAPH_NOT_FOUND = 1924;
     public static final Integer QUEUE_TIME_VIOLATED = 21004;
 
+    public static boolean matches(ArangoDBException e, int responseCode, int errorNum) {
+        return matches(e, responseCode)
+                && e.getErrorNum() != null && e.getErrorNum() == errorNum;
+    }
+
+    public static boolean matches(ArangoDBException e, int responseCode) {
+        return e.getResponseCode() != null && e.getResponseCode() == responseCode;
+    }
+
     private ArangoErrors() {
         super();
     }