Skip to content

Commit b561d1b

Browse files
committed
fixes mongodb
1 parent deeef1f commit b561d1b

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

mongodb-driver/src/test/java/org/jnosql/diana/mongodb/document/MongoDBDocumentCollectionManagerAsyncTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import java.util.concurrent.atomic.AtomicLong;
3535
import java.util.concurrent.atomic.AtomicReference;
3636
import java.util.function.Consumer;
37+
import java.util.stream.Collectors;
38+
import java.util.stream.Stream;
3739

3840
import static jakarta.nosql.document.DocumentDeleteQuery.delete;
3941
import static jakarta.nosql.document.DocumentQuery.select;
@@ -129,15 +131,15 @@ public void shouldSelect() throws InterruptedException {
129131
}
130132
AtomicBoolean condition = new AtomicBoolean(false);
131133
DocumentQuery query = select().from(entity.getName()).build();
132-
AtomicReference<List<DocumentEntity>> atomicReference = new AtomicReference<>();
134+
AtomicReference<Stream<DocumentEntity>> atomicReference = new AtomicReference<>();
133135

134136
entityManager.select(query, c -> {
135137
condition.set(true);
136138
atomicReference.set(c);
137139
});
138140

139141
await().untilTrue(condition);
140-
List<DocumentEntity> entities = atomicReference.get();
142+
List<DocumentEntity> entities = atomicReference.get().collect(Collectors.toList());
141143
assertTrue(condition.get());
142144
assertFalse(entities.isEmpty());
143145

@@ -164,7 +166,7 @@ public void shouldRemoveEntityAsync() throws InterruptedException {
164166
await().untilTrue(condition);
165167

166168
AtomicBoolean selectCondition = new AtomicBoolean(false);
167-
AtomicReference<List<DocumentEntity>> reference = new AtomicReference<>();
169+
AtomicReference<Stream<DocumentEntity>> reference = new AtomicReference<>();
168170
DocumentQuery selectQuery = select().from(collection)
169171
.where("name").eq(document.get())
170172
.build();
@@ -174,7 +176,7 @@ public void shouldRemoveEntityAsync() throws InterruptedException {
174176
});
175177
await().untilTrue(selectCondition);
176178

177-
assertTrue(reference.get().isEmpty());
179+
assertTrue(reference.get().collect(Collectors.toList()).isEmpty());
178180
}
179181

180182
@Test

mongodb-driver/src/test/java/org/jnosql/diana/mongodb/document/MongoDBDocumentCollectionManagerTest.java

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void shouldRemoveEntity() {
9898
.build();
9999

100100
entityManager.delete(deleteQuery);
101-
assertTrue(entityManager.select(query).isEmpty());
101+
assertTrue(entityManager.select(query).collect(Collectors.toList()).isEmpty());
102102
}
103103

104104
@Test
@@ -110,12 +110,11 @@ public void shouldFindDocument() {
110110
.where("_id").eq(id.get().get())
111111
.build();
112112

113-
List<DocumentEntity> entities = entityManager.select(query);
113+
List<DocumentEntity> entities = entityManager.select(query).collect(Collectors.toList());
114114
assertFalse(entities.isEmpty());
115115
assertThat(entities, contains(entity));
116116
}
117117

118-
119118
@Test
120119
public void shouldFindDocument2() {
121120
DocumentEntity entity = entityManager.insert(getEntity());
@@ -126,7 +125,7 @@ public void shouldFindDocument2() {
126125
.and("city").eq("Salvador").and("_id").eq(id.get().get())
127126
.build();
128127

129-
List<DocumentEntity> entities = entityManager.select(query);
128+
List<DocumentEntity> entities = entityManager.select(query).collect(Collectors.toList());
130129
assertFalse(entities.isEmpty());
131130
assertThat(entities, contains(entity));
132131
}
@@ -141,7 +140,7 @@ public void shouldFindDocument3() {
141140
.and(id.get().getName()).eq(id.get().get())
142141
.build();
143142

144-
List<DocumentEntity> entities = entityManager.select(query);
143+
List<DocumentEntity> entities = entityManager.select(query).collect(Collectors.toList());
145144
assertFalse(entities.isEmpty());
146145
assertThat(entities, contains(entity));
147146
}
@@ -158,7 +157,7 @@ public void shouldFindDocumentGreaterThan() {
158157
.and("type").eq("V")
159158
.build();
160159

161-
List<DocumentEntity> entitiesFound = entityManager.select(query);
160+
List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
162161
assertTrue(entitiesFound.size() == 2);
163162
assertThat(entitiesFound, not(contains(entities.get(0))));
164163
}
@@ -175,7 +174,7 @@ public void shouldFindDocumentGreaterEqualsThan() {
175174
.and("type").eq("V")
176175
.build();
177176

178-
List<DocumentEntity> entitiesFound = entityManager.select(query);
177+
List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
179178
assertTrue(entitiesFound.size() == 2);
180179
assertThat(entitiesFound, not(contains(entities.get(0))));
181180
}
@@ -192,7 +191,7 @@ public void shouldFindDocumentLesserThan() {
192191
.and("type").eq("V")
193192
.build();
194193

195-
List<DocumentEntity> entitiesFound = entityManager.select(query);
194+
List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
196195
assertTrue(entitiesFound.size() == 1);
197196
assertThat(entitiesFound, contains(entities.get(0)));
198197
}
@@ -209,7 +208,7 @@ public void shouldFindDocumentLesserEqualsThan() {
209208
.and("type").eq("V")
210209
.build();
211210

212-
List<DocumentEntity> entitiesFound = entityManager.select(query);
211+
List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
213212
assertTrue(entitiesFound.size() == 2);
214213
assertThat(entitiesFound, contains(entities.get(0), entities.get(2)));
215214
}
@@ -226,7 +225,7 @@ public void shouldFindDocumentLike() {
226225
.and("type").eq("V")
227226
.build();
228227

229-
List<DocumentEntity> entitiesFound = entityManager.select(query);
228+
List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
230229
assertTrue(entitiesFound.size() == 2);
231230
assertThat(entitiesFound, contains(entities.get(0), entities.get(2)));
232231
}
@@ -243,7 +242,7 @@ public void shouldFindDocumentIn() {
243242
.and("type").eq("V")
244243
.build();
245244

246-
assertEquals(entities, entityManager.select(query));
245+
assertEquals(entities, entityManager.select(query).collect(Collectors.toList()));
247246
}
248247

249248
@Test
@@ -259,7 +258,7 @@ public void shouldFindDocumentStart() {
259258
.skip(1L)
260259
.build();
261260

262-
List<DocumentEntity> entitiesFound = entityManager.select(query);
261+
List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
263262
assertEquals(1, entitiesFound.size());
264263
assertThat(entitiesFound, not(contains(entities.get(0))));
265264

@@ -269,7 +268,7 @@ public void shouldFindDocumentStart() {
269268
.skip(2L)
270269
.build();
271270

272-
entitiesFound = entityManager.select(query);
271+
entitiesFound = entityManager.select(query).collect(Collectors.toList());
273272
assertTrue(entitiesFound.isEmpty());
274273

275274
}
@@ -287,7 +286,7 @@ public void shouldFindDocumentLimit() {
287286
.limit(1L)
288287
.build();
289288

290-
List<DocumentEntity> entitiesFound = entityManager.select(query);
289+
List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
291290
assertEquals(1, entitiesFound.size());
292291
assertThat(entitiesFound, not(contains(entities.get(0))));
293292

@@ -297,7 +296,7 @@ public void shouldFindDocumentLimit() {
297296
.limit(2L)
298297
.build();
299298

300-
entitiesFound = entityManager.select(query);
299+
entitiesFound = entityManager.select(query).collect(Collectors.toList());
301300
assertEquals(2, entitiesFound.size());
302301

303302
}
@@ -315,7 +314,7 @@ public void shouldFindDocumentSort() {
315314
.orderBy("age").asc()
316315
.build();
317316

318-
List<DocumentEntity> entitiesFound = entityManager.select(query);
317+
List<DocumentEntity> entitiesFound = entityManager.select(query).collect(Collectors.toList());
319318
assertEquals(2, entitiesFound.size());
320319
List<Integer> ages = entitiesFound.stream()
321320
.map(e -> e.find("age").get().get(Integer.class))
@@ -329,7 +328,7 @@ public void shouldFindDocumentSort() {
329328
.orderBy("age").desc()
330329
.build();
331330

332-
entitiesFound = entityManager.select(query);
331+
entitiesFound = entityManager.select(query).collect(Collectors.toList());
333332
ages = entitiesFound.stream()
334333
.map(e -> e.find("age").get().get(Integer.class))
335334
.collect(Collectors.toList());
@@ -342,27 +341,27 @@ public void shouldFindDocumentSort() {
342341
public void shouldFindAll() {
343342
entityManager.insert(getEntity());
344343
DocumentQuery query = select().from(COLLECTION_NAME).build();
345-
List<DocumentEntity> entities = entityManager.select(query);
344+
List<DocumentEntity> entities = entityManager.select(query).collect(Collectors.toList());
346345
assertFalse(entities.isEmpty());
347346
}
348347

349348
@Test
350349
public void shouldDeleteAll() {
351350
entityManager.insert(getEntity());
352351
DocumentQuery query = select().from(COLLECTION_NAME).build();
353-
List<DocumentEntity> entities = entityManager.select(query);
352+
List<DocumentEntity> entities = entityManager.select(query).collect(Collectors.toList());
354353
assertFalse(entities.isEmpty());
355354
DocumentDeleteQuery deleteQuery = delete().from(COLLECTION_NAME).build();
356355
entityManager.delete(deleteQuery);
357-
entities = entityManager.select(query);
356+
entities = entityManager.select(query).collect(Collectors.toList());
358357
assertTrue(entities.isEmpty());
359358
}
360359

361360
@Test
362361
public void shouldFindAllByFields() {
363362
entityManager.insert(getEntity());
364363
DocumentQuery query = select("name").from(COLLECTION_NAME).build();
365-
List<DocumentEntity> entities = entityManager.select(query);
364+
List<DocumentEntity> entities = entityManager.select(query).collect(Collectors.toList());
366365
assertFalse(entities.isEmpty());
367366
final DocumentEntity entity = entities.get(0);
368367
assertEquals(2, entity.size());
@@ -382,7 +381,7 @@ public void shouldSaveSubDocument() {
382381
.where("_id").eq(id.get())
383382
.build();
384383

385-
DocumentEntity entityFound = entityManager.select(query).get(0);
384+
DocumentEntity entityFound = entityManager.select(query).collect(Collectors.toList()).get(0);
386385
Document subDocument = entityFound.find("phones").get();
387386
List<Document> documents = subDocument.get(new TypeReference<List<Document>>() {
388387
});
@@ -399,7 +398,7 @@ public void shouldSaveSubDocument2() {
399398
DocumentQuery query = select().from(COLLECTION_NAME)
400399
.where(id.getName()).eq(id.get())
401400
.build();
402-
DocumentEntity entityFound = entityManager.select(query).get(0);
401+
DocumentEntity entityFound = entityManager.select(query).collect(Collectors.toList()).get(0);
403402
Document subDocument = entityFound.find("phones").get();
404403
List<Document> documents = subDocument.get(new TypeReference<List<Document>>() {
405404
});
@@ -418,7 +417,7 @@ public void shouldCreateEntityByteArray() {
418417
entityManager.insert(entity);
419418

420419
List<DocumentEntity> entities = entityManager.select(select().from("download")
421-
.where("_id").eq(id).build());
420+
.where("_id").eq(id).build()).collect(Collectors.toList());
422421

423422
assertEquals(1, entities.size());
424423
DocumentEntity documentEntity = entities.get(0);
@@ -442,7 +441,7 @@ public void shouldCreateDate() {
442441
entityManager.insert(entity);
443442

444443
List<DocumentEntity> entities = entityManager.select(select().from("download")
445-
.where("_id").eq(id).build());
444+
.where("_id").eq(id).build()).collect(Collectors.toList());
446445

447446
assertEquals(1, entities.size());
448447
DocumentEntity documentEntity = entities.get(0);
@@ -501,7 +500,6 @@ private DocumentEntity createSubdocumentList() {
501500
return entity;
502501
}
503502

504-
505503
private DocumentEntity getEntity() {
506504
DocumentEntity entity = DocumentEntity.of(COLLECTION_NAME);
507505
Map<String, Object> map = new HashMap<>();

0 commit comments

Comments
 (0)