Fix delete with revision in ArangoRepository (#317)

* test: CrudRepository.delete() and CrudRepository.deleteAll() should throw OptimisticLockingFailureException

* fixed delete with _rev in ArangoRepository

* fix maven-surefire-report-plugin version

Author: rashtao

pom.xml

@@ -61,7 +61,7 @@
 
     <properties>
         <java-module-name>com.arangodb.springframework</java-module-name>
-        <arangodb.version>7.7.1</arangodb.version>
+        <arangodb.version>7.8.0</arangodb.version>
 
         <!-- enforce dependencies convergence -->
         <slf4j>2.0.13</slf4j>
@@ -220,6 +220,15 @@
 
         </plugins>
 
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-report-plugin</artifactId>
+                    <version>3.4.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <dependencies>

src/main/java/com/arangodb/springframework/core/convert/ArangoConverter.java

@@ -52,6 +52,8 @@ void readProperty(
 
 	ConversionService getConversionService();
 
+	<T> T convertIfNecessary(Object source, Class<T> type);
+
 	String convertId(Object id);
 
 }

src/main/java/com/arangodb/springframework/core/convert/DefaultArangoConverter.java

@@ -829,7 +829,8 @@ public boolean isEntityType(final Class<?> type) {
     }
 
     @SuppressWarnings("unchecked")
-    private <T> T convertIfNecessary(final Object source, final Class<T> type) {
+    @Override
+    public <T> T convertIfNecessary(final Object source, final Class<T> type) {
         return (T) (source == null ? null
                 : type.isAssignableFrom(source.getClass()) ? source : conversionService.convert(source, type));
     }

src/main/java/com/arangodb/springframework/core/template/ArangoTemplate.java

@@ -239,6 +239,10 @@ private String determineDocumentKeyFromId(final Object id) {
         return MetadataUtils.determineDocumentKeyFromId(converter.convertId(id));
     }
 
+    public RuntimeException translateException(RuntimeException e) {
+        return DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+    }
+
     @Override
     public ArangoDB driver() {
         return arango;
@@ -252,7 +256,7 @@ public ArangoDBVersion getVersion() throws DataAccessException {
             }
             return version;
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
     }
 
@@ -280,7 +284,7 @@ public <T> ArangoCursor<T> query(final String query, final Map<String, Object> b
             ArangoCursor<T> cursor = db().query(query, entityClass, bindVars == null ? null : prepareBindVars(bindVars), options);
             return new ArangoExtCursor<>(cursor, entityClass, eventPublisher);
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
     }
 
@@ -309,7 +313,7 @@ public <T> MultiDocumentEntity<DocumentDeleteEntity<T>> deleteAll(
         try {
             result = _collection(entityClass).deleteDocuments(toList(values), options, entityClass);
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
 
         potentiallyEmitAfterDeleteEvent(values, entityClass, result);
@@ -327,8 +331,14 @@ public MultiDocumentEntity<DocumentDeleteEntity<?>> deleteAll(
 
     @Override
     public <T> MultiDocumentEntity<DocumentDeleteEntity<T>> deleteAllById(Iterable<?> ids, DocumentDeleteOptions options, Class<T> entityClass) throws DataAccessException {
+        if (ids == null) {
+            throw new IllegalArgumentException("ids must not be null");
+        }
         ArrayList<String> convertedIds = new ArrayList<>();
         for (Object id : ids) {
+            if (id == null) {
+                throw new IllegalArgumentException("id must not be null");
+            }
             convertedIds.add(converter.convertId(id));
         }
         return deleteAll(convertedIds, options, entityClass);
@@ -350,7 +360,7 @@ public <T> DocumentDeleteEntity<T> delete(final Object id, final DocumentDeleteO
         try {
             result = _collection(entityClass, id).deleteDocument(determineDocumentKeyFromId(id), options, entityClass);
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
 
         potentiallyEmitEvent(new AfterDeleteEvent<>(id, entityClass));
@@ -375,7 +385,7 @@ public <T> MultiDocumentEntity<DocumentUpdateEntity<T>> updateAll(
         try {
             result = _collection(entityClass).updateDocuments(toList(values), options, entityClass);
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
 
         updateDBFields(values, result);
@@ -402,7 +412,7 @@ public <T> DocumentUpdateEntity<T> update(final Object id, final T value, final
         try {
             result = _collection(value.getClass(), id).updateDocument(determineDocumentKeyFromId(id), value, options);
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
 
         updateDBFields(value, result);
@@ -428,7 +438,7 @@ public <T> MultiDocumentEntity<DocumentUpdateEntity<T>> replaceAll(
         try {
             result = _collection(entityClass).replaceDocuments(toList(values), options, entityClass);
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
 
         updateDBFields(values, result);
@@ -454,7 +464,7 @@ public <T> DocumentUpdateEntity<T> replace(final Object id, final T value, final
         try {
             result = _collection(value.getClass(), id).replaceDocument(determineDocumentKeyFromId(id), value, options);
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
 
         updateDBFields(value, result);
@@ -477,7 +487,7 @@ public <T> Optional<T> find(final Object id, final Class<T> entityClass, final D
             }
             return Optional.ofNullable(res);
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
     }
 
@@ -507,7 +517,7 @@ public <T> Iterable<T> findAll(final Iterable<?> ids, final Class<T> entityClass
             }
             return docs;
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
     }
 
@@ -521,7 +531,7 @@ public <T> MultiDocumentEntity<DocumentCreateEntity<T>> insertAll(
         try {
             result = _collection(entityClass).insertDocuments(toList(values), options, entityClass);
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
 
         updateDBFields(values, result);
@@ -543,7 +553,7 @@ public <T> DocumentCreateEntity<T> insert(final T value, final DocumentCreateOpt
         try {
             result = _collection(value.getClass()).insertDocument(value, options);
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
 
         updateDBFields(value, result);
@@ -576,7 +586,7 @@ public <T> T repsert(final T value) throws DataAccessException {
             );
             result = it.hasNext() ? it.next() : null;
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
 
         updateDBFieldsFromObject(value, result);
@@ -606,7 +616,7 @@ public <T> Iterable<T> repsertAll(final Iterable<T> values, final Class<? super
                     entityClass
             ).asListRemaining();
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
 
         updateDBFieldsFromObjects(values, result);
@@ -694,7 +704,7 @@ public boolean exists(final Object id, final Class<?> entityClass) throws DataAc
         try {
             return _collection(entityClass).documentExists(determineDocumentKeyFromId(id));
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
     }
 
@@ -704,7 +714,7 @@ public void dropDatabase() throws DataAccessException {
         try {
             db.drop();
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
         databaseCache.remove(db.name());
         collectionCache.keySet().stream().filter(key -> key.getDb().equals(db.name()))
@@ -741,7 +751,7 @@ public Iterable<UserEntity> getUsers() throws DataAccessException {
         try {
             return arango.getUsers();
         } catch (final ArangoDBException e) {
-            throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+            throw translateException(e);
         }
     }
 

src/main/java/com/arangodb/springframework/core/template/DefaultCollectionOperations.java

@@ -67,7 +67,7 @@ public void drop() throws DataAccessException {
 		try {
 			collection.drop();
 		} catch (final ArangoDBException e) {
-			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+			throw translateException(e);
 		}
 	}
 
@@ -76,7 +76,7 @@ public void truncate() throws DataAccessException {
 		try {
 			collection.truncate();
 		} catch (final ArangoDBException e) {
-			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+			throw translateException(e);
 		}
 	}
 
@@ -86,7 +86,7 @@ public long count() throws DataAccessException {
 			final Long count = collection.count().getCount();
 			return count != null ? count : -1L;
 		} catch (final ArangoDBException e) {
-			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+			throw translateException(e);
 		}
 	}
 
@@ -95,7 +95,7 @@ public CollectionPropertiesEntity getProperties() throws DataAccessException {
 		try {
 			return collection.getProperties();
 		} catch (final ArangoDBException e) {
-			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+			throw translateException(e);
 		}
 	}
 
@@ -104,7 +104,7 @@ public Collection<IndexEntity> getIndexes() throws DataAccessException {
 		try {
 			return collection.getIndexes();
 		} catch (final ArangoDBException e) {
-			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+			throw translateException(e);
 		}
 	}
 
@@ -114,7 +114,7 @@ public IndexEntity ensurePersistentIndex(final Iterable<String> fields, final Pe
 		try {
 			return collection.ensurePersistentIndex(fields, options);
 		} catch (final ArangoDBException e) {
-			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+			throw translateException(e);
 		}
 	}
 
@@ -124,7 +124,7 @@ public IndexEntity ensureGeoIndex(final Iterable<String> fields, final GeoIndexO
 		try {
 			return collection.ensureGeoIndex(fields, options);
 		} catch (final ArangoDBException e) {
-			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+			throw translateException(e);
 		}
 	}
 
@@ -135,7 +135,7 @@ public IndexEntity ensureFulltextIndex(final Iterable<String> fields, final Full
 		try {
 			return collection.ensureFulltextIndex(fields, options);
 		} catch (final ArangoDBException e) {
-			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+			throw translateException(e);
 		}
 	}
 
@@ -144,7 +144,7 @@ public IndexEntity ensureTtlIndex(Iterable<String> fields, TtlIndexOptions optio
 		try {
 			return collection.ensureTtlIndex(fields, options);
 		} catch (final ArangoDBException e) {
-			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+			throw translateException(e);
 		}
 	}
 
@@ -153,7 +153,7 @@ public void dropIndex(final String id) throws DataAccessException {
 		try {
 			collection.deleteIndex(id);
 		} catch (final ArangoDBException e) {
-			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+			throw translateException(e);
 		}
 	}
 
@@ -162,7 +162,7 @@ public void grantAccess(final String username, final Permissions permissions) {
 		try {
 			collection.grantAccess(username, permissions);
 		} catch (final ArangoDBException e) {
-			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+			throw translateException(e);
 		}
 	}
 
@@ -171,7 +171,7 @@ public void resetAccess(final String username) {
 		try {
 			collection.resetAccess(username);
 		} catch (final ArangoDBException e) {
-			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+			throw translateException(e);
 		}
 	}
 
@@ -180,8 +180,12 @@ public Permissions getPermissions(final String username) throws DataAccessExcept
 		try {
 			return collection.getPermissions(username);
 		} catch (final ArangoDBException e) {
-			throw DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+			throw translateException(e);
 		}
 	}
 
+	private RuntimeException translateException(RuntimeException e) {
+		return DataAccessUtils.translateIfNecessary(e, exceptionTranslator);
+	}
+
 }