#80 make count and deleteAll transactional

Author: aburmeis

src/main/java/com/arangodb/springframework/core/CollectionOperations.java

@@ -57,15 +57,34 @@ public interface CollectionOperations {
 	 *
 	 * @throws DataAccessException
 	 */
-	void truncate() throws DataAccessException;
+	void truncate(CollectionTruncateOptions options) throws DataAccessException;
+
+	/**
+	 * Removes all documents from the collection, but leaves the indexes intact
+	 *
+	 * @throws DataAccessException
+	 */
+	default void truncate() throws DataAccessException {
+		truncate(new CollectionTruncateOptions());
+	}
+
+	/**
+	 * Counts the documents in a collection
+	 *
+	 * @return number of
+	 * @throws DataAccessException
+	 */
+	long count(CollectionCountOptions options) throws DataAccessException;
 
 	/**
 	 * Counts the documents in a collection
 	 *
 	 * @return number of
 	 * @throws DataAccessException
 	 */
-	long count() throws DataAccessException;
+	default long count() throws DataAccessException {
+		return count(new CollectionCountOptions());
+	}
 
 	/**
 	 * Reads the properties of the specified collection

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

@@ -69,18 +69,18 @@ public void drop() throws DataAccessException {
 	}
 
 	@Override
-	public void truncate() throws DataAccessException {
+	public void truncate(CollectionTruncateOptions options) throws DataAccessException {
 		try {
-			collection.truncate();
+			collection.truncate(options);
 		} catch (final ArangoDBException e) {
 			throw translateException(e);
 		}
 	}
 
 	@Override
-	public long count() throws DataAccessException {
+	public long count(CollectionCountOptions options) throws DataAccessException {
 		try {
-			final Long count = collection.count().getCount();
+			final Long count = collection.count(options).getCount();
 			return count != null ? count : -1L;
 		} catch (final ArangoDBException e) {
 			throw translateException(e);

src/main/java/com/arangodb/springframework/repository/SimpleArangoRepository.java

@@ -25,10 +25,7 @@
 import com.arangodb.entity.DocumentDeleteEntity;
 import com.arangodb.entity.ErrorEntity;
 import com.arangodb.entity.MultiDocumentEntity;
-import com.arangodb.model.AqlQueryOptions;
-import com.arangodb.model.DocumentDeleteOptions;
-import com.arangodb.model.DocumentExistsOptions;
-import com.arangodb.model.DocumentReadOptions;
+import com.arangodb.model.*;
 import com.arangodb.springframework.core.DocumentNotFoundException;
 import com.arangodb.springframework.core.convert.ArangoConverter;
 import com.arangodb.springframework.core.mapping.ArangoMappingContext;
@@ -160,7 +157,7 @@ public Iterable<T> findAllById(final Iterable<ID> ids) {
 	 */
 	@Override
 	public long count() {
-		return arangoTemplate.collection(domainClass).count();
+		return arangoTemplate.collection(domainClass).count(defaultCountOptions());
 	}
 
 	/**
@@ -228,7 +225,7 @@ public void deleteAll(final Iterable<? extends T> entities) {
 	 */
 	@Override
 	public void deleteAll() {
-		arangoTemplate.collection(domainClass).truncate();
+		arangoTemplate.collection(domainClass).truncate(defaultTruncateOptions());
 	}
 
 	/**
@@ -406,35 +403,33 @@ private String buildSortClause(final Sort sort, final String varName) {
     }
 
 	private DocumentReadOptions defaultReadOptions() {
-		DocumentReadOptions options = new DocumentReadOptions();
-		if (transactionBridge != null) {
-			options.streamTransactionId(transactionBridge.getCurrentTransaction(Collections.singleton(getCollectionName())));
-		}
-		return options;
+		return defaultTransactionalOptions(new DocumentReadOptions());
 	}
 
 	private AqlQueryOptions defaultQueryOptions() {
-		AqlQueryOptions options = new AqlQueryOptions();
-		if (transactionBridge != null) {
-			options.streamTransactionId(transactionBridge.getCurrentTransaction(Collections.singleton(getCollectionName())));
-		}
-		return options;
+		return defaultTransactionalOptions(new AqlQueryOptions());
 	}
 
 	private DocumentExistsOptions defaultExistsOptions() {
-		DocumentExistsOptions options = new DocumentExistsOptions();
-		if (transactionBridge != null) {
-			options.streamTransactionId(transactionBridge.getCurrentTransaction(Collections.singleton(getCollectionName())));
-		}
-		return options;
+		return defaultTransactionalOptions(new DocumentExistsOptions());
 	}
 
 	private DocumentDeleteOptions defaultDeleteOptions() {
-		DocumentDeleteOptions options = new DocumentDeleteOptions();
+		return defaultTransactionalOptions(new DocumentDeleteOptions());
+	}
+
+	private CollectionTruncateOptions defaultTruncateOptions() {
+		return defaultTransactionalOptions(new CollectionTruncateOptions());
+	}
+
+	private CollectionCountOptions defaultCountOptions() {
+		return defaultTransactionalOptions(new CollectionCountOptions());
+	}
+
+	private <O extends TransactionalOptions<O>> O defaultTransactionalOptions(O options) {
 		if (transactionBridge != null) {
 			options.streamTransactionId(transactionBridge.getCurrentTransaction(Collections.singleton(getCollectionName())));
 		}
 		return options;
 	}
-
 }

src/test/java/com/arangodb/springframework/transaction/ArangoTransactionManagerRepositoryTest.java

@@ -5,7 +5,6 @@
 import com.arangodb.springframework.repository.ActorRepository;
 import com.arangodb.springframework.repository.MovieRepository;
 import com.arangodb.springframework.testdata.Movie;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.util.Streamable;
@@ -84,7 +83,7 @@ public void shouldFindSavedEntityWithinTransaction_findAllById() {
 		List<Movie> list = Streamable.of(movieRepository.findAllById(List.of(saved.getId()))).toList();
 
 		assertThat(list).hasSize(1);
-		assertThat(list.getFirst().getId()).isEqualTo(saved.getId());
+		assertThat(list.get(0).getId()).isEqualTo(saved.getId());
 	}
 
 	@Test
@@ -110,7 +109,7 @@ public void shouldFindSavedEntityWithinTransaction_existsById() {
 	@Test
 	@Transactional
 	public void shouldFindSavedEntityWithinTransaction_saveAll() {
-		Movie saved = Streamable.of(movieRepository.saveAll(List.of(starWars))).stream().toList().getFirst();
+		Movie saved = Streamable.of(movieRepository.saveAll(List.of(starWars))).stream().toList().get(0);
 
 		Boolean exists = movieRepository.existsById(saved.getId());
 
@@ -125,12 +124,11 @@ public void shouldFindSavedEntityWithinTransaction_findAll() {
 		List<Movie> list = Streamable.of(movieRepository.findAll()).toList();
 
 		assertThat(list).hasSize(1);
-		assertThat(list.getFirst().getId()).isEqualTo(saved.getId());
+		assertThat(list.get(0).getId()).isEqualTo(saved.getId());
 	}
 
 	@Test
 	@Transactional
-	@Disabled("count is not transactional")
 	public void shouldFindSavedEntityWithinTransaction_count() {
 		movieRepository.save(starWars);
 
@@ -185,7 +183,6 @@ public void shouldFindSavedEntityWithinTransaction_deleteAll() {
 
 	@Test
 	@Transactional
-	@Disabled("delete all is not transactional")
 	public void shouldFindSavedEntityWithinTransaction_deleteAllNoArg() {
 		Movie saved = movieRepository.save(starWars);