Skip to content

Commit 1f2df2b

Browse files
rozzarozza
committed
Renamed the validation methods in the OperationHelper
1 parent e2b4e26 commit 1f2df2b

19 files changed

+96
-96
lines changed

‎driver-core/src/main/com/mongodb/operation/AggregateExplainOperation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
4141
import static com.mongodb.operation.OperationHelper.CallableWithConnection;
4242
import static com.mongodb.operation.OperationHelper.LOGGER;
43-
import static com.mongodb.operation.OperationHelper.checkValidCollation;
43+
import static com.mongodb.operation.OperationHelper.validateCollation;
4444
import static com.mongodb.operation.OperationHelper.releasingCallback;
4545
import static com.mongodb.operation.OperationHelper.withConnection;
4646

@@ -111,7 +111,7 @@ public BsonDocument execute(final ReadBinding binding) {
111111
return withConnection(binding, new CallableWithConnection<BsonDocument>() {
112112
@Override
113113
public BsonDocument call(final Connection connection) {
114-
checkValidCollation(connection, collation);
114+
validateCollation(connection, collation);
115115
return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(), connection);
116116
}
117117
});
@@ -127,7 +127,7 @@ public void call(final AsyncConnection connection, final Throwable t) {
127127
errHandlingCallback.onResult(null, t);
128128
} else {
129129
final SingleResultCallback<BsonDocument> wrappedCallback = releasingCallback(errHandlingCallback, connection);
130-
checkValidCollation(connection, collation, new AsyncCallableWithConnection() {
130+
validateCollation(connection, collation, new AsyncCallableWithConnection() {
131131
@Override
132132
public void call(final AsyncConnection connection, final Throwable t) {
133133
if (t != null) {

‎driver-core/src/main/com/mongodb/operation/AggregateOperation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnectionAndSource;
5151
import static com.mongodb.operation.OperationHelper.CallableWithConnectionAndSource;
5252
import static com.mongodb.operation.OperationHelper.LOGGER;
53-
import static com.mongodb.operation.OperationHelper.checkValidReadConcernAndCollation;
53+
import static com.mongodb.operation.OperationHelper.validateReadConcernAndCollation;
5454
import static com.mongodb.operation.OperationHelper.cursorDocumentToQueryResult;
5555
import static com.mongodb.operation.OperationHelper.releasingCallback;
5656
import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionTwoDotSix;
@@ -253,7 +253,7 @@ public BatchCursor<T> execute(final ReadBinding binding) {
253253
return withConnection(binding, new CallableWithConnectionAndSource<BatchCursor<T>>() {
254254
@Override
255255
public BatchCursor<T> call(final ConnectionSource source, final Connection connection) {
256-
checkValidReadConcernAndCollation(connection, readConcern, collation);
256+
validateReadConcernAndCollation(connection, readConcern, collation);
257257
return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
258258
CommandResultDocumentCodec.create(decoder, getFieldNameWithResults(connection.getDescription())),
259259
connection, transformer(source, connection));
@@ -272,7 +272,7 @@ public void call(final AsyncConnectionSource source, final AsyncConnection conne
272272
} else {
273273
final SingleResultCallback<AsyncBatchCursor<T>> wrappedCallback =
274274
releasingCallback(errHandlingCallback, source, connection);
275-
checkValidReadConcernAndCollation(source, connection, readConcern, collation,
275+
validateReadConcernAndCollation(source, connection, readConcern, collation,
276276
new AsyncCallableWithConnectionAndSource() {
277277
@Override
278278
public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {

‎driver-core/src/main/com/mongodb/operation/AggregateToCollectionOperation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
4343
import static com.mongodb.operation.OperationHelper.CallableWithConnection;
4444
import static com.mongodb.operation.OperationHelper.LOGGER;
45-
import static com.mongodb.operation.OperationHelper.checkValidCollation;
45+
import static com.mongodb.operation.OperationHelper.validateCollation;
4646
import static com.mongodb.operation.OperationHelper.releasingCallback;
4747
import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo;
4848
import static com.mongodb.operation.OperationHelper.withConnection;
@@ -224,7 +224,7 @@ public Void execute(final WriteBinding binding) {
224224
return withConnection(binding, new CallableWithConnection<Void>() {
225225
@Override
226226
public Void call(final Connection connection) {
227-
checkValidCollation(connection, collation);
227+
validateCollation(connection, collation);
228228
return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
229229
connection, writeConcernErrorTransformer());
230230
}
@@ -241,7 +241,7 @@ public void call(final AsyncConnection connection, final Throwable t) {
241241
errHandlingCallback.onResult(null, t);
242242
} else {
243243
final SingleResultCallback<Void> wrappedCallback = releasingCallback(errHandlingCallback, connection);
244-
checkValidCollation(connection, collation, new AsyncCallableWithConnection() {
244+
validateCollation(connection, collation, new AsyncCallableWithConnection() {
245245
@Override
246246
public void call(final AsyncConnection connection, final Throwable t) {
247247
if (t != null) {

‎driver-core/src/main/com/mongodb/operation/CountOperation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import static com.mongodb.operation.DocumentHelper.putIfNotNull;
4444
import static com.mongodb.operation.DocumentHelper.putIfNotZero;
4545
import static com.mongodb.operation.OperationHelper.LOGGER;
46-
import static com.mongodb.operation.OperationHelper.checkValidReadConcernAndCollation;
46+
import static com.mongodb.operation.OperationHelper.validateReadConcernAndCollation;
4747
import static com.mongodb.operation.OperationHelper.releasingCallback;
4848
import static com.mongodb.operation.OperationHelper.withConnection;
4949

@@ -232,7 +232,7 @@ public Long execute(final ReadBinding binding) {
232232
return withConnection(binding, new CallableWithConnection<Long>() {
233233
@Override
234234
public Long call(final Connection connection) {
235-
checkValidReadConcernAndCollation(connection, readConcern, collation);
235+
validateReadConcernAndCollation(connection, readConcern, collation);
236236
return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(), new BsonDocumentCodec(),
237237
connection, transformer());
238238
}
@@ -249,7 +249,7 @@ public void call(final AsyncConnection connection, final Throwable t) {
249249
errHandlingCallback.onResult(null, t);
250250
} else {
251251
final SingleResultCallback<Long> wrappedCallback = releasingCallback(errHandlingCallback, connection);
252-
checkValidReadConcernAndCollation(connection, readConcern, collation, new AsyncCallableWithConnection() {
252+
validateReadConcernAndCollation(connection, readConcern, collation, new AsyncCallableWithConnection() {
253253
@Override
254254
public void call(final AsyncConnection connection, final Throwable t) {
255255
if (t != null) {

‎driver-core/src/main/com/mongodb/operation/CreateCollectionOperation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import static com.mongodb.operation.CommandOperationHelper.executeWrappedCommandProtocolAsync;
3838
import static com.mongodb.operation.DocumentHelper.putIfNotZero;
3939
import static com.mongodb.operation.OperationHelper.LOGGER;
40-
import static com.mongodb.operation.OperationHelper.checkValidCollation;
40+
import static com.mongodb.operation.OperationHelper.validateCollation;
4141
import static com.mongodb.operation.OperationHelper.releasingCallback;
4242
import static com.mongodb.operation.OperationHelper.withConnection;
4343
import static com.mongodb.operation.WriteConcernHelper.appendWriteConcernToCommand;
@@ -371,7 +371,7 @@ public Void execute(final WriteBinding binding) {
371371
return withConnection(binding, new CallableWithConnection<Void>() {
372372
@Override
373373
public Void call(final Connection connection) {
374-
checkValidCollation(connection, collation);
374+
validateCollation(connection, collation);
375375
executeWrappedCommandProtocol(binding, databaseName, getCommand(connection.getDescription()), connection,
376376
writeConcernErrorTransformer());
377377
return null;
@@ -389,7 +389,7 @@ public void call(final AsyncConnection connection, final Throwable t) {
389389
errHandlingCallback.onResult(null, t);
390390
} else {
391391
final SingleResultCallback<Void> wrappedCallback = releasingCallback(errHandlingCallback, connection);
392-
checkValidCollation(connection, collation, new OperationHelper.AsyncCallableWithConnection() {
392+
validateCollation(connection, collation, new OperationHelper.AsyncCallableWithConnection() {
393393
@Override
394394
public void call(final AsyncConnection connection, final Throwable t) {
395395
if (t != null) {

‎driver-core/src/main/com/mongodb/operation/CreateIndexesOperation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
5353
import static com.mongodb.operation.OperationHelper.CallableWithConnection;
5454
import static com.mongodb.operation.OperationHelper.LOGGER;
55-
import static com.mongodb.operation.OperationHelper.checkValidIndexRequestCollations;
55+
import static com.mongodb.operation.OperationHelper.validateIndexRequestCollations;
5656
import static com.mongodb.operation.OperationHelper.releasingCallback;
5757
import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionTwoDotSix;
5858
import static com.mongodb.operation.OperationHelper.withConnection;
@@ -146,7 +146,7 @@ public Void execute(final WriteBinding binding) {
146146
public Void call(final Connection connection) {
147147
if (serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
148148
try {
149-
checkValidIndexRequestCollations(connection, requests);
149+
validateIndexRequestCollations(connection, requests);
150150
executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
151151
connection, writeConcernErrorTransformer());
152152
} catch (MongoCommandException e) {
@@ -174,7 +174,7 @@ public void call(final AsyncConnection connection, final Throwable t) {
174174
} else {
175175
final SingleResultCallback<Void> wrappedCallback = releasingCallback(errHandlingCallback, connection);
176176
if (serverIsAtLeastVersionTwoDotSix(connection.getDescription())) {
177-
checkValidIndexRequestCollations(connection, requests, new AsyncCallableWithConnection(){
177+
validateIndexRequestCollations(connection, requests, new AsyncCallableWithConnection(){
178178
@Override
179179
public void call(final AsyncConnection connection, final Throwable t) {
180180
if (t != null) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
import static com.mongodb.assertions.Assertions.notNull;
3232
import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
33-
import static com.mongodb.operation.OperationHelper.checkValidWriteRequestCollations;
33+
import static com.mongodb.operation.OperationHelper.validateWriteRequestCollations;
3434

3535
/**
3636
* An operation that deletes one or more documents from a collection.
@@ -65,14 +65,14 @@ public List<DeleteRequest> getDeleteRequests() {
6565

6666
@Override
6767
protected WriteConcernResult executeProtocol(final Connection connection) {
68-
checkValidWriteRequestCollations(connection, deleteRequests, getWriteConcern());
68+
validateWriteRequestCollations(connection, deleteRequests, getWriteConcern());
6969
return connection.delete(getNamespace(), isOrdered(), getWriteConcern(), deleteRequests);
7070
}
7171

7272
@Override
7373
protected void executeProtocolAsync(final AsyncConnection connection,
7474
final SingleResultCallback<WriteConcernResult> callback) {
75-
checkValidWriteRequestCollations(connection, deleteRequests, getWriteConcern(), new AsyncCallableWithConnection(){
75+
validateWriteRequestCollations(connection, deleteRequests, getWriteConcern(), new AsyncCallableWithConnection(){
7676
@Override
7777
public void call(final AsyncConnection connection, final Throwable t) {
7878
if (t != null) {
@@ -86,13 +86,13 @@ public void call(final AsyncConnection connection, final Throwable t) {
8686

8787
@Override
8888
protected BulkWriteResult executeCommandProtocol(final Connection connection) {
89-
checkValidWriteRequestCollations(connection, deleteRequests, getWriteConcern());
89+
validateWriteRequestCollations(connection, deleteRequests, getWriteConcern());
9090
return connection.deleteCommand(getNamespace(), isOrdered(), getWriteConcern(), deleteRequests);
9191
}
9292

9393
@Override
9494
protected void executeCommandProtocolAsync(final AsyncConnection connection, final SingleResultCallback<BulkWriteResult> callback) {
95-
checkValidWriteRequestCollations(connection, deleteRequests, getWriteConcern(), new AsyncCallableWithConnection(){
95+
validateWriteRequestCollations(connection, deleteRequests, getWriteConcern(), new AsyncCallableWithConnection(){
9696
@Override
9797
public void call(final AsyncConnection connection, final Throwable t) {
9898
if (t != null) {

‎driver-core/src/main/com/mongodb/operation/DistinctOperation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import static com.mongodb.operation.DocumentHelper.putIfNotNull;
4848
import static com.mongodb.operation.DocumentHelper.putIfNotZero;
4949
import static com.mongodb.operation.OperationHelper.LOGGER;
50-
import static com.mongodb.operation.OperationHelper.checkValidReadConcernAndCollation;
50+
import static com.mongodb.operation.OperationHelper.validateReadConcernAndCollation;
5151
import static com.mongodb.operation.OperationHelper.releasingCallback;
5252
import static com.mongodb.operation.OperationHelper.withConnection;
5353

@@ -183,7 +183,7 @@ public BatchCursor<T> execute(final ReadBinding binding) {
183183
return withConnection(binding, new CallableWithConnectionAndSource<BatchCursor<T>>() {
184184
@Override
185185
public BatchCursor<T> call(final ConnectionSource source, final Connection connection) {
186-
checkValidReadConcernAndCollation(connection, readConcern, collation);
186+
validateReadConcernAndCollation(connection, readConcern, collation);
187187
return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(), createCommandDecoder(),
188188
connection, transformer(source, connection));
189189
}
@@ -201,7 +201,7 @@ public void call(final AsyncConnectionSource source, final AsyncConnection conne
201201
} else {
202202
final SingleResultCallback<AsyncBatchCursor<T>> wrappedCallback = releasingCallback(
203203
errHandlingCallback, source, connection);
204-
checkValidReadConcernAndCollation(source, connection, readConcern, collation,
204+
validateReadConcernAndCollation(source, connection, readConcern, collation,
205205
new AsyncCallableWithConnectionAndSource() {
206206
@Override
207207
public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {

‎driver-core/src/main/com/mongodb/operation/FindAndDeleteOperation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import static com.mongodb.operation.DocumentHelper.putIfNotNull;
4242
import static com.mongodb.operation.DocumentHelper.putIfNotZero;
4343
import static com.mongodb.operation.OperationHelper.LOGGER;
44-
import static com.mongodb.operation.OperationHelper.checkValidCollation;
44+
import static com.mongodb.operation.OperationHelper.validateCollation;
4545
import static com.mongodb.operation.OperationHelper.releasingCallback;
4646
import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo;
4747
import static com.mongodb.operation.OperationHelper.withConnection;
@@ -241,7 +241,7 @@ public T execute(final WriteBinding binding) {
241241
return withConnection(binding, new CallableWithConnection<T>() {
242242
@Override
243243
public T call(final Connection connection) {
244-
checkValidCollation(connection, collation);
244+
validateCollation(connection, collation);
245245
return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
246246
CommandResultDocumentCodec.create(decoder, "value"), connection,
247247
FindAndModifyHelper.<T>transformer());
@@ -259,7 +259,7 @@ public void call(final AsyncConnection connection, final Throwable t) {
259259
errHandlingCallback.onResult(null, t);
260260
} else {
261261
final SingleResultCallback<T> wrappedCallback = releasingCallback(errHandlingCallback, connection);
262-
checkValidCollation(connection, collation, new AsyncCallableWithConnection() {
262+
validateCollation(connection, collation, new AsyncCallableWithConnection() {
263263
@Override
264264
public void call(final AsyncConnection connection, final Throwable t) {
265265
if (t != null) {

‎driver-core/src/main/com/mongodb/operation/FindAndReplaceOperation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import static com.mongodb.operation.DocumentHelper.putIfNotZero;
4949
import static com.mongodb.operation.DocumentHelper.putIfTrue;
5050
import static com.mongodb.operation.OperationHelper.LOGGER;
51-
import static com.mongodb.operation.OperationHelper.checkValidCollation;
51+
import static com.mongodb.operation.OperationHelper.validateCollation;
5252
import static com.mongodb.operation.OperationHelper.releasingCallback;
5353
import static com.mongodb.operation.OperationHelper.serverIsAtLeastVersionThreeDotTwo;
5454
import static com.mongodb.operation.OperationHelper.withConnection;
@@ -331,7 +331,7 @@ public T execute(final WriteBinding binding) {
331331
return withConnection(binding, new CallableWithConnection<T>() {
332332
@Override
333333
public T call(final Connection connection) {
334-
checkValidCollation(connection, collation);
334+
validateCollation(connection, collation);
335335
return executeWrappedCommandProtocol(binding, namespace.getDatabaseName(), getCommand(connection.getDescription()),
336336
getValidator(), CommandResultDocumentCodec.create(decoder, "value"), connection,
337337
FindAndModifyHelper.<T>transformer());
@@ -349,7 +349,7 @@ public void call(final AsyncConnection connection, final Throwable t) {
349349
errHandlingCallback.onResult(null, t);
350350
} else {
351351
final SingleResultCallback<T> wrappedCallback = releasingCallback(errHandlingCallback, connection);
352-
checkValidCollation(connection, collation, new AsyncCallableWithConnection() {
352+
validateCollation(connection, collation, new AsyncCallableWithConnection() {
353353
@Override
354354
public void call(final AsyncConnection connection, final Throwable t) {
355355
if (t != null) {

0 commit comments

Comments
 (0)