Skip to content

Commit e94ae72

Browse files
authored
Move legacy write operations into driver-legacy (#1030)
JAVA-4795
1 parent 9b9239b commit e94ae72

15 files changed

+400
-1204
lines changed

driver-core/src/main/com/mongodb/internal/operation/DeleteOperation.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

driver-core/src/main/com/mongodb/internal/operation/InsertOperation.java

Lines changed: 0 additions & 59 deletions
This file was deleted.

driver-core/src/main/com/mongodb/internal/operation/UpdateOperation.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

driver-core/src/test/functional/com/mongodb/OperationFunctionalSpecification.groovy

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import com.mongodb.internal.connection.ServerHelper
4949
import com.mongodb.internal.connection.SplittablePayload
5050
import com.mongodb.internal.operation.AsyncReadOperation
5151
import com.mongodb.internal.operation.AsyncWriteOperation
52-
import com.mongodb.internal.operation.InsertOperation
52+
import com.mongodb.internal.operation.MixedBulkWriteOperation
5353
import com.mongodb.internal.operation.ReadOperation
5454
import com.mongodb.internal.operation.WriteOperation
5555
import com.mongodb.internal.session.SessionContext
@@ -108,12 +108,13 @@ class OperationFunctionalSpecification extends Specification {
108108
}
109109

110110
void acknowledgeWrite(final SingleConnectionBinding binding) {
111-
new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, [new InsertRequest(new BsonDocument())]).execute(binding)
111+
new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(new BsonDocument())], true, ACKNOWLEDGED, false).execute(binding)
112112
binding.release()
113113
}
114114

115115
void acknowledgeWrite(final AsyncSingleConnectionBinding binding) {
116-
executeAsync(new InsertOperation(getNamespace(), true, ACKNOWLEDGED, false, [new InsertRequest(new BsonDocument())]), binding)
116+
executeAsync(new MixedBulkWriteOperation(getNamespace(), [new InsertRequest(new BsonDocument())], true, ACKNOWLEDGED, false),
117+
binding)
117118
binding.release()
118119
}
119120

@@ -129,6 +130,10 @@ class OperationFunctionalSpecification extends Specification {
129130
new CollectionHelper<Worker>(new WorkerCodec(), getNamespace())
130131
}
131132

133+
def execute(operation) {
134+
execute(operation, false)
135+
}
136+
132137
def execute(operation, boolean async) {
133138
def executor = async ? ClusterFixture.&executeAsync : ClusterFixture.&executeSync
134139
executor(operation)

driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import com.mongodb.internal.operation.DropCollectionOperation;
4343
import com.mongodb.internal.operation.DropDatabaseOperation;
4444
import com.mongodb.internal.operation.FindOperation;
45-
import com.mongodb.internal.operation.InsertOperation;
4645
import com.mongodb.internal.operation.ListIndexesOperation;
4746
import com.mongodb.internal.operation.MixedBulkWriteOperation;
4847
import org.bson.BsonArray;
@@ -191,7 +190,7 @@ public void insertDocuments(final List<BsonDocument> documents, final WriteConce
191190
for (BsonDocument document : documents) {
192191
insertRequests.add(new InsertRequest(document));
193192
}
194-
new InsertOperation(namespace, true, writeConcern, false, insertRequests).execute(binding);
193+
new MixedBulkWriteOperation(namespace, insertRequests, true, writeConcern, false).execute(binding);
195194
}
196195

197196
public void insertDocuments(final Document... documents) {

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

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

1717
package com.mongodb.internal.operation
1818

19+
import com.mongodb.MongoBulkWriteException
1920
import com.mongodb.MongoWriteConcernException
2021
import com.mongodb.OperationFunctionalSpecification
2122
import com.mongodb.WriteConcern
22-
import com.mongodb.WriteConcernException
2323
import com.mongodb.client.model.ValidationAction
2424
import com.mongodb.client.model.ValidationLevel
2525
import org.bson.BsonDocument
@@ -241,8 +241,8 @@ class CreateCollectionOperationSpecification extends OperationFunctionalSpecific
241241
getCollectionHelper().insertDocuments(BsonDocument.parse('{ level: 8}'))
242242

243243
then:
244-
WriteConcernException writeConcernException = thrown()
245-
writeConcernException.getErrorCode() == 121
244+
MongoBulkWriteException writeConcernException = thrown()
245+
writeConcernException.getWriteErrors().get(0).getCode() == 121
246246

247247
where:
248248
async << [true, false]

0 commit comments

Comments
 (0)