arangodb · rashtao · Sep 6, 2023 · Sep 5, 2023 · Sep 5, 2023 · Sep 5, 2023
diff --git a/src/main/java/com/arangodb/springframework/core/template/ArangoTemplate.java b/src/main/java/com/arangodb/springframework/core/template/ArangoTemplate.java
@@ -64,6 +64,7 @@
 import org.springframework.context.expression.BeanFactoryAccessor;
 import org.springframework.context.expression.BeanFactoryResolver;
 import org.springframework.dao.DataAccessException;
+import org.springframework.dao.support.DataAccessUtils;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.expression.Expression;
@@ -150,10 +151,6 @@ private ArangoDatabase db() {
 		});
 	}
 
-	private DataAccessException translateExceptionIfPossible(final RuntimeException exception) {
-		return exceptionTranslator.translateExceptionIfPossible(exception);
-	}
-
 	private ArangoCollection _collection(final String name) {
 		return _collection(name, null, null);
 	}
@@ -299,7 +296,7 @@ public ArangoDBVersion getVersion() throws DataAccessException {
 			}
 			return version;
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -327,7 +324,7 @@ public <T> ArangoCursor<T> query(final String query, final Map<String, Object> b
 			ArangoCursor<JsonNode> cursor = db().query(query, JsonNode.class, bindVars == null ? null : prepareBindVars(bindVars), options);
 			return new ArangoExtCursor<>(cursor, entityClass, converter, eventPublisher);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -353,7 +350,7 @@ public MultiDocumentEntity<? extends DocumentEntity> delete(final Iterable<Objec
 		try {
 			result = _collection(entityClass).deleteDocuments(toJsonNodeCollection(values), options, entityClass);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 
 		potentiallyEmitAfterDeleteEvent(values, entityClass, result);
@@ -376,7 +373,7 @@ public DocumentEntity delete(final Object id, final Class<?> entityClass, final
 		try {
 			result = _collection(entityClass, id).deleteDocument(determineDocumentKeyFromId(id), options, entityClass);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 
 		potentiallyEmitEvent(new AfterDeleteEvent<>(id, entityClass));
@@ -398,7 +395,7 @@ public <T> MultiDocumentEntity<? extends DocumentEntity> update(final Iterable<T
 		try {
 			result = _collection(entityClass).updateDocuments(toJsonNodeCollection(values), options);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 
 		updateDBFields(values, result);
@@ -423,7 +420,7 @@ public DocumentEntity update(final Object id, final Object value, final Document
 			result = _collection(value.getClass(), id).updateDocument(determineDocumentKeyFromId(id), toJsonNode(value),
 					options);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 
 		updateDBFields(value, result);
@@ -446,7 +443,7 @@ public <T> MultiDocumentEntity<? extends DocumentEntity> replace(final Iterable<
 		try {
 			result = _collection(entityClass).replaceDocuments(toJsonNodeCollection(values), options);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 
 		updateDBFields(values, result);
@@ -470,7 +467,7 @@ public DocumentEntity replace(final Object id, final Object value, final Documen
 			result = _collection(value.getClass(), id).replaceDocument(determineDocumentKeyFromId(id), toJsonNode(value),
 					options);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 
 		updateDBFields(value, result);
@@ -491,7 +488,7 @@ public <T> Optional<T> find(final Object id, final Class<T> entityClass, final D
 					JsonNode.class, options);
 			return Optional.ofNullable(fromJsonNode(entityClass, doc));
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -516,7 +513,7 @@ public <T> Iterable<T> find(final Iterable<?> ids, final Class<T> entityClass)
 			final MultiDocumentEntity<JsonNode> docs = _collection(entityClass).getDocuments(keys, JsonNode.class);
 			return docs.getDocuments().stream().map(doc -> fromJsonNode(entityClass, doc)).collect(Collectors.toList());
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -530,7 +527,7 @@ public <T> MultiDocumentEntity<? extends DocumentEntity> insert(final Iterable<T
 		try {
 			result = _collection(entityClass).insertDocuments(toJsonNodeCollection(values), options);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 
 		updateDBFields(values, result);
@@ -552,7 +549,7 @@ public DocumentEntity insert(final Object value, final DocumentCreateOptions opt
 		try {
 			result = _collection(value.getClass()).insertDocument(toJsonNode(value), options);
 		} catch (final ArangoDBException e) {
-			throw exceptionTranslator.translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 
 		updateDBFields(value, result);
@@ -574,7 +571,7 @@ public DocumentEntity insert(final String collectionName, final Object value, fi
 		try {
 			result = _collection(collectionName).insertDocument(toJsonNode(value), options);
 		} catch (final ArangoDBException e) {
-			throw exceptionTranslator.translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 
 		updateDBFields(value, result);
@@ -607,7 +604,7 @@ public <T> void repsert(final T value) throws DataAccessException {
 			);
 			result = it.hasNext() ? it.next() : null;
 		} catch (final ArangoDBException e) {
-			throw exceptionTranslator.translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 
 		updateDBFieldsFromObject(value, result);
@@ -635,7 +632,7 @@ public <T> void repsert(final Iterable<? extends T> values, final Class<T> entit
 					entityClass
 			).asListRemaining();
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 
 		updateDBFieldsFromObjects(values, result);
@@ -715,7 +712,7 @@ public boolean exists(final Object id, final Class<?> entityClass) throws DataAc
 		try {
 			return _collection(entityClass).documentExists(determineDocumentKeyFromId(id));
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -725,7 +722,7 @@ public void dropDatabase() throws DataAccessException {
 		try {
 			db.drop();
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 		databaseCache.remove(db.name());
 		collectionCache.keySet().stream().filter(key -> key.getDb().equals(db.name()))
@@ -762,7 +759,7 @@ public Iterable<UserEntity> getUsers() throws DataAccessException {
 		try {
 			return arango.getUsers();
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 

diff --git a/src/main/java/com/arangodb/springframework/core/template/DefaultCollectionOperations.java b/src/main/java/com/arangodb/springframework/core/template/DefaultCollectionOperations.java
@@ -24,6 +24,7 @@
 import java.util.Map;
 
 import org.springframework.dao.DataAccessException;
+import org.springframework.dao.support.DataAccessUtils;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 
 import com.arangodb.ArangoCollection;
@@ -55,10 +56,6 @@ protected DefaultCollectionOperations(final ArangoCollection collection,
 		this.exceptionTranslator = exceptionTranslator;
 	}
 
-	private DataAccessException translateExceptionIfPossible(final RuntimeException exception) {
-		return exceptionTranslator.translateExceptionIfPossible(exception);
-	}
-
 	@Override
 	public String name() {
 		return collection.name();
@@ -70,7 +67,7 @@ public void drop() throws DataAccessException {
 		try {
 			collection.drop();
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -79,7 +76,7 @@ public void truncate() throws DataAccessException {
 		try {
 			collection.truncate();
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -89,7 +86,7 @@ public long count() throws DataAccessException {
 			final Long count = collection.count().getCount();
 			return count != null ? count : -1L;
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -98,7 +95,7 @@ public CollectionPropertiesEntity getProperties() throws DataAccessException {
 		try {
 			return collection.getProperties();
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -107,7 +104,7 @@ public Collection<IndexEntity> getIndexes() throws DataAccessException {
 		try {
 			return collection.getIndexes();
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -117,7 +114,7 @@ public IndexEntity ensurePersistentIndex(final Iterable<String> fields, final Pe
 		try {
 			return collection.ensurePersistentIndex(fields, options);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -127,7 +124,7 @@ public IndexEntity ensureGeoIndex(final Iterable<String> fields, final GeoIndexO
 		try {
 			return collection.ensureGeoIndex(fields, options);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -138,7 +135,7 @@ public IndexEntity ensureFulltextIndex(final Iterable<String> fields, final Full
 		try {
 			return collection.ensureFulltextIndex(fields, options);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -147,7 +144,7 @@ public IndexEntity ensureTtlIndex(Iterable<String> fields, TtlIndexOptions optio
 		try {
 			return collection.ensureTtlIndex(fields, options);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -156,7 +153,7 @@ public void dropIndex(final String id) throws DataAccessException {
 		try {
 			collection.deleteIndex(id);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -165,7 +162,7 @@ public void grantAccess(final String username, final Permissions permissions) {
 		try {
 			collection.grantAccess(username, permissions);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -174,7 +171,7 @@ public void resetAccess(final String username) {
 		try {
 			collection.resetAccess(username);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}
 
@@ -183,7 +180,7 @@ public Permissions getPermissions(final String username) throws DataAccessExcept
 		try {
 			return collection.getPermissions(username);
 		} catch (final ArangoDBException e) {
-			throw translateExceptionIfPossible(e);
+			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
 		}
 	}