bugfix: do not return same entity instance from ArangoOperations.repsert()

Author: rashtao

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

@@ -563,7 +563,7 @@ public <T> T repsert(final T value) throws DataAccessException {
 
         updateDBFieldsFromObject(value, result);
         potentiallyEmitEvent(new AfterSaveEvent<>(result));
-        return value;
+        return result;
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
@@ -593,7 +593,7 @@ public <T> Iterable<T> repsertAll(final Iterable<T> values, final Class<? super
 
         updateDBFieldsFromObjects(values, result);
         result.forEach(it -> potentiallyEmitEvent(new AfterSaveEvent<>(it)));
-        return values;
+        return result;
     }
 
     private void updateDBFieldsFromObjects(final Iterable<?> values, final Iterable<?> res) {

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

@@ -74,7 +74,8 @@ public SimpleArangoRepository(final ArangoOperations arangoOperations, final Cla
 	 */
 	@Override
 	public <S extends T> S save(final S entity) {
-		return arangoOperations.repsert(entity);
+		arangoOperations.repsert(entity);
+		return entity;
 	}
 
 	/**
@@ -86,7 +87,8 @@ public <S extends T> S save(final S entity) {
 	 */
 	@Override
 	public <S extends T> Iterable<S> saveAll(final Iterable<S> entities) {
-		return arangoOperations.repsertAll(entities, domainClass);
+		arangoOperations.repsertAll(entities, domainClass);
+		return entities;
 	}
 
 	/**

src/test/java/com/arangodb/springframework/core/template/ArangoTemplateTest.java

@@ -131,49 +131,32 @@ public void repsertDocument() {
 		Customer repsert1 = template.repsert(customer);
 		Customer repsert2 = template.repsert(customer);
 
-		// in place updates
-		assertThat(repsert1, sameInstance(customer));
-		assertThat(repsert2, sameInstance(customer));
+		assertThat(repsert1.getId(), is(customer.getId()));
+		assertThat(repsert1.getName(), is(customer.getName()));
+		assertThat(repsert1.getSurname(), is(customer.getSurname()));
+		assertThat(repsert1.getAge(), is(customer.getAge()));
 
-		Customer read = template.find(repsert1.getId(), Customer.class).orElseThrow();
-		assertThat(read.getId(), is(customer.getId()));
-		assertThat(read.getName(), is(customer.getName()));
-		assertThat(read.getSurname(), is(customer.getSurname()));
-		assertThat(read.getAge(), is(customer.getAge()));
+		assertThat(repsert2.getId(), is(customer.getId()));
+		assertThat(repsert2.getName(), is(customer.getName()));
+		assertThat(repsert2.getSurname(), is(customer.getSurname()));
+		assertThat(repsert2.getAge(), is(customer.getAge()));
 	}
 
 	@Test
 	public void repsertDocuments() {
-		Customer c1 = new Customer("John", "Doe", 11);
-		Customer c2 = new Customer("John2", "Doe2", 22);
-		Iterable<Customer> repsert1 = template.repsertAll(List.of(c1, c2), Customer.class);
-		Iterable<Customer> repsert2 = template.repsertAll(List.of(c1, c2), Customer.class);
-
-		Iterator<Customer> rit1 = repsert1.iterator();
-		Iterator<Customer> rit2 = repsert2.iterator();
-
-		// in place updates
-		assertThat(rit1.next(), sameInstance(c1));
-		assertThat(rit2.next(), sameInstance(c1));
-		assertThat(rit1.next(), sameInstance(c2));
-		assertThat(rit2.next(), sameInstance(c2));
-
-		List<String> ids = StreamSupport.stream(repsert1.spliterator(), false).map(Customer::getId).toList();
-
-		Iterable<Customer> read = template.findAll(ids, Customer.class);
-		Iterator<Customer> rit = read.iterator();
-
-		Customer read1 = rit.next();
-		assertThat(read1.getId(), is(c1.getId()));
-		assertThat(read1.getName(), is(c1.getName()));
-		assertThat(read1.getSurname(), is(c1.getSurname()));
-		assertThat(read1.getAge(), is(c1.getAge()));
-
-		Customer read2 = rit.next();
-		assertThat(read2.getId(), is(c2.getId()));
-		assertThat(read2.getName(), is(c2.getName()));
-		assertThat(read2.getSurname(), is(c2.getSurname()));
-		assertThat(read2.getAge(), is(c2.getAge()));
+		List<Customer> customers = List.of(
+				new Customer("John", "Doe", 11),
+				new Customer("John2", "Doe2", 22)
+		);
+		Iterable<Customer> res = template.repsertAll(customers, Customer.class);
+		Iterator<Customer> cIt = customers.iterator();
+		for (Customer re : res) {
+			Customer c = cIt.next();
+			assertThat(re.getId(), is(c.getId()));
+			assertThat(re.getName(), is(c.getName()));
+			assertThat(re.getSurname(), is(c.getSurname()));
+			assertThat(re.getAge(), is(c.getAge()));
+		}
 	}
 
 	@Test

src/test/java/com/arangodb/springframework/example/polymorphic/template/PolymorphicTemplate.java

@@ -213,7 +213,7 @@ public void repsertVariance() {
         dog.setTeeths(11);
 
         Dog res = template.repsert(dog);
-        assertThat(res, sameInstance(dog));
+        assertThat(res, is(dog));
         assertThat(col().documentExists(dog.getId()), is(true));
     }
 

src/test/java/com/arangodb/springframework/repository/ArangoRepositoryTest.java

@@ -1,14 +1,9 @@
 package com.arangodb.springframework.repository;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.*;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.data.domain.*;
@@ -23,6 +18,13 @@
  */
 public class ArangoRepositoryTest extends AbstractArangoRepositoryTest {
 
+	@Test
+	public void saveTest() {
+		Customer res = repository.save(john);
+		assertThat(res, sameInstance(john));
+		assertThat(res.getId(), is(notNullValue()));
+	}
+
 	@Test
 	public void findOneTest() {
 		repository.save(john);
@@ -37,8 +39,12 @@ public void findOneTest() {
 
 	@Test
 	public void saveAllTest() {
-		repository.saveAll(customers);
-		Iterable<Customer> docs = repository.findAll();
+		Iterable<Customer> res = repository.saveAll(customers);
+		Iterator<Customer> cIt = customers.iterator();
+        for (Customer re : res) {
+            assertThat(re, sameInstance(cIt.next()));
+        }
+        Iterable<Customer> docs = repository.findAll();
 		docs.forEach(d -> d.setName("saveAllTest"));
 		repository.saveAll(docs);
 		repository.findAll().forEach(it -> assertThat("name does not match", it.getName(), equalTo("saveAllTest")));