Skip to content

Commit ae8d201

Browse files
vbabaninvbabanin
committed
Use createOperationContext.
1 parent 0cb9bf2 commit ae8d201

7 files changed

+37
-34
lines changed

‎driver-core/src/test/functional/com/mongodb/internal/operation/AggregateOperationSpecification.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
355355

356356
def binding = ClusterFixture.getBinding()
357357
new CommandReadOperation<>(getDatabaseName(), new BsonDocument('profile', new BsonInt32(2)),
358-
new BsonDocumentCodec()).execute(binding, getOperationContext(binding.getReadPreference()))
358+
new BsonDocumentCodec()).execute(binding, createOperationContext(binding.getReadPreference()))
359359
def expectedComment = 'this is a comment'
360360
def operation = new AggregateOperation<Document>(getNamespace(), [], new DocumentCodec())
361361
.comment(new BsonString(expectedComment))
@@ -371,7 +371,7 @@ class AggregateOperationSpecification extends OperationFunctionalSpecification {
371371
cleanup:
372372
binding = ClusterFixture.getBinding()
373373
new CommandReadOperation<>(getDatabaseName(), new BsonDocument('profile', new BsonInt32(0)),
374-
new BsonDocumentCodec()).execute(binding, getOperationContext(binding.getReadPreference()))
374+
new BsonDocumentCodec()).execute(binding, createOperationContext(binding.getReadPreference()))
375375
profileCollectionHelper.drop()
376376

377377
where:

‎driver-core/src/test/functional/com/mongodb/internal/operation/CreateViewOperationSpecification.groovy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import org.bson.BsonString
2929
import org.bson.codecs.BsonDocumentCodec
3030
import spock.lang.IgnoreIf
3131

32+
import static com.mongodb.ClusterFixture.createOperationContext
3233
import static com.mongodb.ClusterFixture.getBinding
3334
import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
3435

@@ -123,7 +124,7 @@ class CreateViewOperationSpecification extends OperationFunctionalSpecification
123124
def getCollectionInfo(String collectionName) {
124125
def binding = getBinding()
125126
new ListCollectionsOperation(databaseName, new BsonDocumentCodec()).filter(new BsonDocument('name',
126-
new BsonString(collectionName))).execute(binding, getOperationContext(binding.getReadPreference())).tryNext()?.head()
127+
new BsonString(collectionName))).execute(binding, createOperationContext(binding.getReadPreference())).tryNext()?.head()
127128
}
128129

129130
def collectionNameExists(String collectionName) {

‎driver-core/src/test/functional/com/mongodb/internal/operation/DropDatabaseOperationSpecification.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.mongodb.internal.operation
1818

19-
2019
import com.mongodb.MongoWriteConcernException
2120
import com.mongodb.OperationFunctionalSpecification
2221
import com.mongodb.WriteConcern
@@ -25,6 +24,7 @@ import org.bson.Document
2524
import org.bson.codecs.DocumentCodec
2625
import spock.lang.IgnoreIf
2726

27+
import static com.mongodb.ClusterFixture.createOperationContext
2828
import static com.mongodb.ClusterFixture.configureFailPoint
2929
import static com.mongodb.ClusterFixture.executeAsync
3030
import static com.mongodb.ClusterFixture.getBinding
@@ -79,7 +79,7 @@ class DropDatabaseOperationSpecification extends OperationFunctionalSpecificatio
7979

8080
def binding = getBinding()
8181
when:
82-
async ? executeAsync(operation) : operation.execute(binding, getOperationContext(binding.getReadPreference()))
82+
async ? executeAsync(operation) : operation.execute(binding, createOperationContext(binding.getReadPreference()))
8383

8484
then:
8585
def ex = thrown(MongoWriteConcernException)
@@ -92,7 +92,7 @@ class DropDatabaseOperationSpecification extends OperationFunctionalSpecificatio
9292

9393
def databaseNameExists(String databaseName) {
9494
new ListDatabasesOperation(new DocumentCodec()).execute(binding,
95-
getOperationContext(binding.getReadPreference())).next()*.name.contains(databaseName)
95+
createOperationContext(binding.getReadPreference())).next()*.name.contains(databaseName)
9696
}
9797

9898
}

‎driver-core/src/test/functional/com/mongodb/internal/operation/FindOperationSpecification.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
389389

390390
def binding = getBinding()
391391
new CommandReadOperation<>(getDatabaseName(), new BsonDocument('profile', new BsonInt32(2)),
392-
new BsonDocumentCodec()).execute(binding, getOperationContext(binding.getReadPreference()))
392+
new BsonDocumentCodec()).execute(binding, createOperationContext(binding.getReadPreference()))
393393
def expectedComment = 'this is a comment'
394394
def operation = new FindOperation<Document>(getNamespace(), new DocumentCodec())
395395
.comment(new BsonString(expectedComment))
@@ -404,7 +404,7 @@ class FindOperationSpecification extends OperationFunctionalSpecification {
404404
cleanup:
405405
new CommandReadOperation<>(getDatabaseName(), new BsonDocument('profile', new BsonInt32(0)),
406406
new BsonDocumentCodec())
407-
.execute(binding, getOperationContext(binding.getReadPreference()))
407+
.execute(binding, createOperationContext(binding.getReadPreference()))
408408
profileCollectionHelper.drop()
409409

410410
where:

‎driver-core/src/test/functional/com/mongodb/internal/operation/ListCollectionsOperationSpecification.groovy‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import org.bson.Document
4444
import org.bson.codecs.Decoder
4545
import org.bson.codecs.DocumentCodec
4646

47+
import static com.mongodb.ClusterFixture.createOperationContext
4748
import static com.mongodb.ClusterFixture.executeAsync
4849
import static com.mongodb.ClusterFixture.getBinding
4950
import static org.junit.jupiter.api.Assertions.assertEquals
@@ -59,7 +60,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
5960

6061
def binding = getBinding()
6162
when:
62-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
63+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
6364

6465
then:
6566
!cursor.hasNext()
@@ -97,7 +98,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
9798

9899
def binding = getBinding()
99100
when:
100-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
101+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
101102
def collections = cursor.next()
102103
def names = collections*.get('name')
103104

@@ -120,7 +121,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
120121

121122
def binding = getBinding()
122123
when:
123-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference())
124+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference())
124125
)
125126
def collections = cursor.next()
126127
def names = collections*.get('name')
@@ -142,7 +143,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
142143

143144
def binding = getBinding()
144145
when:
145-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
146+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
146147
def collections = cursor.next()
147148
def names = collections*.get('name')
148149

@@ -160,7 +161,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
160161

161162
def binding = getBinding()
162163
when:
163-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
164+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
164165
def collection = cursor.next()[0]
165166

166167
then:
@@ -177,7 +178,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
177178

178179
def binding = getBinding()
179180
when:
180-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
181+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
181182
def collection = cursor.next()[0]
182183

183184
then:
@@ -194,7 +195,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
194195

195196
def binding = getBinding()
196197
when:
197-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
198+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
198199
def collection = cursor.next()[0]
199200

200201
then:
@@ -226,14 +227,14 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
226227
def binding = getBinding()
227228
given:
228229
new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED)
229-
.execute(binding, getOperationContext(binding.getReadPreference()))
230+
.execute(binding, createOperationContext(binding.getReadPreference()))
230231
addSeveralIndexes()
231232
def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2)
232233

233234

234235
when:
235236
binding = getBinding()
236-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
237+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
237238

238239
then:
239240
cursor.hasNext()
@@ -246,13 +247,13 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
246247
def binding = getBinding()
247248
given:
248249
new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED)
249-
.execute(binding, getOperationContext(binding.getReadPreference()))
250+
.execute(binding, createOperationContext(binding.getReadPreference()))
250251
addSeveralIndexes()
251252
def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2)
252253

253254
when:
254255
binding = getBinding()
255-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
256+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
256257
def list = cursorToListWithNext(cursor)
257258

258259
then:
@@ -271,14 +272,14 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
271272
def binding = getBinding()
272273
given:
273274
new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED)
274-
.execute(binding, getOperationContext(binding.getReadPreference()))
275+
.execute(binding, createOperationContext(binding.getReadPreference()))
275276
addSeveralIndexes()
276277
def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2)
277278

278279

279280
when:
280281
binding = getBinding()
281-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
282+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
282283

283284
then:
284285
cursor.hasNext()
@@ -297,13 +298,13 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
297298
given:
298299
def binding = getBinding()
299300
new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED)
300-
.execute(binding, getOperationContext(binding.getReadPreference()))
301+
.execute(binding, createOperationContext(binding.getReadPreference()))
301302
addSeveralIndexes()
302303
def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2)
303304

304305
when:
305306
binding = getBinding()
306-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
307+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
307308
def list = cursorToListWithTryNext(cursor)
308309

309310
then:
@@ -317,7 +318,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
317318
given:
318319
def binding = getBinding()
319320
new DropDatabaseOperation(databaseName, WriteConcern.ACKNOWLEDGED)
320-
.execute(binding, getOperationContext(binding.getReadPreference()))
321+
.execute(binding, createOperationContext(binding.getReadPreference()))
321322
addSeveralIndexes()
322323
def operation = new ListCollectionsOperation(databaseName, new DocumentCodec()).batchSize(2)
323324

@@ -343,7 +344,7 @@ class ListCollectionsOperationSpecification extends OperationFunctionalSpecifica
343344

344345
when:
345346
def binding = getBinding()
346-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
347+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
347348
def collections = cursor.next()
348349

349350
then:

‎driver-core/src/test/functional/com/mongodb/internal/operation/ListIndexesOperationSpecification.groovy‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
5757

5858
def binding = getBinding()
5959
when:
60-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
60+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
6161

6262
then:
6363
!cursor.hasNext()
@@ -86,7 +86,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
8686

8787
def binding = getBinding()
8888
when:
89-
BatchCursor<Document> indexes = operation.execute(binding, getOperationContext(binding.getReadPreference()))
89+
BatchCursor<Document> indexes = operation.execute(binding, createOperationContext(binding.getReadPreference()))
9090

9191
then:
9292
def firstBatch = indexes.next()
@@ -121,11 +121,11 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
121121
def binding = getBinding()
122122
new CreateIndexesOperation(namespace,
123123
[new IndexRequest(new BsonDocument('unique', new BsonInt32(1))).unique(true)], null).execute(binding,
124-
getOperationContext(binding.getReadPreference()))
124+
createOperationContext(binding.getReadPreference()))
125125

126126
when:
127127
binding = getBinding()
128-
BatchCursor cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
128+
BatchCursor cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
129129

130130
then:
131131
def indexes = cursor.next()
@@ -145,7 +145,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
145145
def binding = getBinding()
146146
new CreateIndexesOperation(namespace,
147147
[new IndexRequest(new BsonDocument('unique', new BsonInt32(1))).unique(true)], null).execute(binding,
148-
getOperationContext(binding.getReadPreference()))
148+
createOperationContext(binding.getReadPreference()))
149149

150150
when:
151151
def cursor = executeAsync(operation)
@@ -171,7 +171,7 @@ class ListIndexesOperationSpecification extends OperationFunctionalSpecification
171171

172172
def binding = getBinding()
173173
when:
174-
def cursor = operation.execute(binding, getOperationContext(binding.getReadPreference()))
174+
def cursor = operation.execute(binding, createOperationContext(binding.getReadPreference()))
175175
def collections = cursor.next()
176176

177177
then:

‎driver-core/src/test/functional/com/mongodb/internal/operation/RenameCollectionOperationSpecification.groovy‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import org.bson.Document
2626
import org.bson.codecs.DocumentCodec
2727
import spock.lang.IgnoreIf
2828

29+
import static com.mongodb.ClusterFixture.createOperationContext
2930
import static com.mongodb.ClusterFixture.executeAsync
3031
import static com.mongodb.ClusterFixture.getBinding
3132
import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet
@@ -37,7 +38,7 @@ class RenameCollectionOperationSpecification extends OperationFunctionalSpecific
3738
def cleanup() {
3839
def binding = getBinding()
3940
new DropCollectionOperation(new MongoNamespace(getDatabaseName(), 'newCollection'),
40-
WriteConcern.ACKNOWLEDGED).execute(binding, getOperationContext(binding.getReadPreference()))
41+
WriteConcern.ACKNOWLEDGED).execute(binding, createOperationContext(binding.getReadPreference()))
4142
}
4243

4344
def 'should return rename a collection'() {
@@ -86,7 +87,7 @@ class RenameCollectionOperationSpecification extends OperationFunctionalSpecific
8687

8788
def binding = getBinding()
8889
when:
89-
async ? executeAsync(operation) : operation.execute(binding, getOperationContext(binding.getReadPreference()))
90+
async ? executeAsync(operation) : operation.execute(binding, createOperationContext(binding.getReadPreference()))
9091

9192
then:
9293
def ex = thrown(MongoWriteConcernException)
@@ -100,7 +101,7 @@ class RenameCollectionOperationSpecification extends OperationFunctionalSpecific
100101
def collectionNameExists(String collectionName) {
101102
def binding = getBinding()
102103
def cursor = new ListCollectionsOperation(databaseName, new DocumentCodec()).execute(binding,
103-
getOperationContext(binding.getReadPreference()))
104+
createOperationContext(binding.getReadPreference()))
104105
if (!cursor.hasNext()) {
105106
return false
106107
}

0 commit comments

Comments
 (0)