Skip to content

Commit d16114b

Browse files
committed
Merge branch 'develop' into TASK-5610
2 parents 01e59e7 + f7347a1 commit d16114b

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

.github/workflows/pull-request-approved.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77

88
jobs:
99
calculate-xetabase-branch:
10+
if: github.event.review.state == 'approved'
1011
name: Calculate Xetabase branch
1112
runs-on: ubuntu-22.04
1213
outputs:

commons-datastore/commons-datastore-mongodb/src/main/java/org/opencb/commons/datastore/mongodb/MongoDBCollection.java

+9
Original file line numberDiff line numberDiff line change
@@ -322,13 +322,22 @@ public <T> List<DataResult<T>> privateFind(List<? extends Bson> queries, Bson pr
322322
return queryResultList;
323323
}
324324

325+
public DataResult<Document> aggregate(ClientSession clientSession, List<? extends Bson> operations,
326+
QueryOptions options) {
327+
return aggregate(clientSession, operations, null, options);
328+
}
329+
325330
public DataResult<Document> aggregate(List<? extends Bson> operations, QueryOptions options) {
326331
return aggregate(operations, null, options);
327332
}
328333

329334
public <T> DataResult<T> aggregate(List<? extends Bson> operations, ComplexTypeConverter<T, Document> converter,
330335
QueryOptions options) {
336+
return aggregate(null, operations, converter, options);
337+
}
331338

339+
public <T> DataResult<T> aggregate(ClientSession clientSession, List<? extends Bson> operations,
340+
ComplexTypeConverter<T, Document> converter, QueryOptions options) {
332341
long start = startQuery();
333342
DataResult<T> queryResult;
334343
List<T> list = new LinkedList<>();

0 commit comments

Comments
 (0)