Skip to content

Commit 23d40a9

Browse files
aburmeisaburmeis
committedDec 5, 2024
fix merge errors
1 parent 1e97f58 commit 23d40a9

File tree

2 files changed

+143
-16
lines changed

2 files changed

+143
-16
lines changed
 

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

+19-15
Original file line numberDiff line numberDiff line change
@@ -262,22 +262,26 @@ private static void ensureTtlIndex(final CollectionOperations collection, final
262262
}
263263

264264
private static void ensureMDIndex(final CollectionOperations collection, final MDIndex annotation, Collection<IndexEntity> existing) {
265-
collection.ensureMDIndex(Arrays.asList(annotation.fields()),
266-
new MDIndexOptions()
267-
.unique(annotation.unique())
268-
.fieldValueTypes(annotation.fieldValueTypes())
269-
.sparse(annotation.sparse())
270-
);
265+
final MDIndexOptions options = new MDIndexOptions()
266+
.unique(annotation.unique())
267+
.fieldValueTypes(annotation.fieldValueTypes())
268+
.sparse(annotation.sparse());
269+
Collection<String> fields = Arrays.asList(annotation.fields());
270+
if (createNewIndex(IndexType.mdi, fields, existing)) {
271+
existing.add(collection.ensureMDIndex(fields, options));
272+
}
271273
}
272274

273275
private static void ensureMDPrefixedIndex(final CollectionOperations collection, final MDPrefixedIndex annotation, Collection<IndexEntity> existing) {
274-
collection.ensureMDPrefixedIndex(Arrays.asList(annotation.fields()),
275-
new MDPrefixedIndexOptions()
276-
.prefixFields(Arrays.asList(annotation.prefixFields()))
277-
.unique(annotation.unique())
278-
.fieldValueTypes(annotation.fieldValueTypes())
279-
.sparse(annotation.sparse())
280-
);
276+
final MDPrefixedIndexOptions options = new MDPrefixedIndexOptions()
277+
.prefixFields(Arrays.asList(annotation.prefixFields()))
278+
.unique(annotation.unique())
279+
.fieldValueTypes(annotation.fieldValueTypes())
280+
.sparse(annotation.sparse());
281+
Collection<String> fields = Arrays.asList(annotation.fields());
282+
if (createNewIndex(IndexType.mdiPrefixed, fields, existing)) {
283+
existing.add(collection.ensureMDPrefixedIndex(fields, options));
284+
}
281285
}
282286

283287
private static boolean createNewIndex(IndexType type, Collection<String> fields, Collection<IndexEntity> existing) {
@@ -507,7 +511,7 @@ public <T> Iterable<T> findAll(final Iterable<?> ids, DocumentReadOptions option
507511
final Collection<String> keys = new ArrayList<>();
508512
ids.forEach(id -> keys.add(determineDocumentKeyFromId(id)));
509513
boolean transactional = options != null && options.getStreamTransactionId() != null;
510-
Collection<T> docs = _collection(entityClass, transactional).getDocuments(keys, entityClass).getDocuments();
514+
Collection<T> docs = _collection(entityClass, transactional).getDocuments(keys, entityClass, options).getDocuments();
511515
for (T doc : docs) {
512516
if (doc != null) {
513517
potentiallyEmitEvent(new AfterLoadEvent<>(doc));
@@ -574,7 +578,7 @@ public <T> T repsert(final T value, AqlQueryOptions options) throws DataAccessEx
574578
bindVars,
575579
options, clazz
576580
);
577-
result = it.hasNext() ? it.next() : null;
581+
result = it.next();
578582
} catch (final ArangoDBException e) {
579583
throw translateException(e);
580584
}

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

+124-1
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@
55
import com.arangodb.springframework.repository.ActorRepository;
66
import com.arangodb.springframework.repository.MovieRepository;
77
import com.arangodb.springframework.testdata.Movie;
8+
import org.junit.jupiter.api.Disabled;
89
import org.junit.jupiter.api.Test;
910
import org.springframework.beans.factory.annotation.Autowired;
11+
import org.springframework.data.util.Streamable;
1012
import org.springframework.test.context.ContextConfiguration;
1113
import org.springframework.test.context.transaction.TestTransaction;
1214
import org.springframework.transaction.annotation.Transactional;
1315

16+
import java.util.List;
17+
1418
import static org.assertj.core.api.Assertions.assertThat;
1519

1620
@ContextConfiguration(classes = { ArangoTransactionalTestConfiguration.class })
17-
public class ArangoTransactionManagerRepositoryTest extends AbstractArangoTest {
21+
class ArangoTransactionManagerRepositoryTest extends AbstractArangoTest {
1822

1923
public ArangoTransactionManagerRepositoryTest() {
2024
super(Movie.class);
@@ -71,4 +75,123 @@ public void shouldRollbackWithinTransaction() {
7175
public void shouldCreateCollectionsBeforeTransaction() {
7276
actorRepository.findAll();
7377
}
78+
79+
@Test
80+
@Transactional
81+
public void shouldFindSavedEntityWithinTransaction_findAllById() {
82+
Movie saved = movieRepository.save(starWars);
83+
84+
List<Movie> list = Streamable.of(movieRepository.findAllById(List.of(saved.getId()))).toList();
85+
86+
assertThat(list).hasSize(1);
87+
assertThat(list.getFirst().getId()).isEqualTo(saved.getId());
88+
}
89+
90+
@Test
91+
@Transactional
92+
public void shouldFindSavedEntityWithinTransaction_findById() {
93+
Movie saved = movieRepository.save(starWars);
94+
95+
Movie found = movieRepository.findById(saved.getId()).orElseThrow();
96+
97+
assertThat(found.getId()).isEqualTo(saved.getId());
98+
}
99+
100+
@Test
101+
@Transactional
102+
public void shouldFindSavedEntityWithinTransaction_existsById() {
103+
Movie saved = movieRepository.save(starWars);
104+
105+
Boolean exists = movieRepository.existsById(saved.getId());
106+
107+
assertThat(exists).isTrue();
108+
}
109+
110+
@Test
111+
@Transactional
112+
public void shouldFindSavedEntityWithinTransaction_saveAll() {
113+
Movie saved = Streamable.of(movieRepository.saveAll(List.of(starWars))).stream().toList().getFirst();
114+
115+
Boolean exists = movieRepository.existsById(saved.getId());
116+
117+
assertThat(exists).isTrue();
118+
}
119+
120+
@Test
121+
@Transactional
122+
public void shouldFindSavedEntityWithinTransaction_findAll() {
123+
Movie saved = movieRepository.save(starWars);
124+
125+
List<Movie> list = Streamable.of(movieRepository.findAll()).toList();
126+
127+
assertThat(list).hasSize(1);
128+
assertThat(list.getFirst().getId()).isEqualTo(saved.getId());
129+
}
130+
131+
@Test
132+
@Transactional
133+
@Disabled("count is not transactional")
134+
public void shouldFindSavedEntityWithinTransaction_count() {
135+
movieRepository.save(starWars);
136+
137+
long count = movieRepository.count();
138+
139+
assertThat(count).isEqualTo(1);
140+
}
141+
142+
@Test
143+
@Transactional
144+
public void shouldFindSavedEntityWithinTransaction_deleteById() {
145+
Movie saved = movieRepository.save(starWars);
146+
147+
movieRepository.deleteById(saved.getId());
148+
Boolean exists = movieRepository.existsById(saved.getId());
149+
150+
assertThat(exists).isFalse();
151+
}
152+
153+
@Test
154+
@Transactional
155+
public void shouldFindSavedEntityWithinTransaction_delete() {
156+
Movie saved = movieRepository.save(starWars);
157+
158+
movieRepository.delete(saved);
159+
Boolean exists = movieRepository.existsById(saved.getId());
160+
161+
assertThat(exists).isFalse();
162+
}
163+
164+
@Test
165+
@Transactional
166+
public void shouldFindSavedEntityWithinTransaction_deleteAllById() {
167+
Movie saved = movieRepository.save(starWars);
168+
169+
movieRepository.deleteAllById(List.of(saved.getId()));
170+
Boolean exists = movieRepository.existsById(saved.getId());
171+
172+
assertThat(exists).isFalse();
173+
}
174+
175+
@Test
176+
@Transactional
177+
public void shouldFindSavedEntityWithinTransaction_deleteAll() {
178+
Movie saved = movieRepository.save(starWars);
179+
180+
movieRepository.deleteAll(List.of(saved));
181+
Boolean exists = movieRepository.existsById(saved.getId());
182+
183+
assertThat(exists).isFalse();
184+
}
185+
186+
@Test
187+
@Transactional
188+
@Disabled("delete all is not transactional")
189+
public void shouldFindSavedEntityWithinTransaction_deleteAllNoArg() {
190+
Movie saved = movieRepository.save(starWars);
191+
192+
movieRepository.deleteAll();
193+
Boolean exists = movieRepository.existsById(saved.getId());
194+
195+
assertThat(exists).isFalse();
196+
}
74197
}

0 commit comments

Comments
 (0)