Skip to content

Commit a9b4985

Browse files
jstewart148jstewart148
committed
Fix compiler warnings in OperationHelper.java
JAVA-3361
1 parent 2cfbfc3 commit a9b4985

21 files changed

+77
-60
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import static com.mongodb.operation.OperationHelper.releasingCallback;
5757
import static com.mongodb.operation.OperationHelper.validateCollation;
5858
import static com.mongodb.operation.OperationHelper.withConnection;
59+
import static com.mongodb.operation.OperationHelper.withAsyncConnection;
5960

6061
/**
6162
* An operation that executes an aggregation that writes its results to a collection (which is what makes this a write operation rather than
@@ -377,7 +378,7 @@ public Void call(final Connection connection) {
377378

378379
@Override
379380
public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
380-
withConnection(binding, new AsyncCallableWithConnection() {
381+
withAsyncConnection(binding, new AsyncCallableWithConnection() {
381382
@Override
382383
public void call(final AsyncConnection connection, final Throwable t) {
383384
SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
3434
import static com.mongodb.operation.ChangeStreamBatchCursorHelper.isRetryableError;
3535
import static com.mongodb.operation.OperationHelper.LOGGER;
36-
import static com.mongodb.operation.OperationHelper.withConnection;
36+
import static com.mongodb.operation.OperationHelper.withAsyncReadConnection;
3737

3838
final class AsyncChangeStreamBatchCursor<T> implements AsyncAggregateResponseBatchCursor<T> {
3939
private final AsyncReadBinding binding;
@@ -170,7 +170,7 @@ public void onResult(final List<RawBsonDocument> result, final Throwable t) {
170170
}
171171

172172
private void retryOperation(final AsyncBlock asyncBlock, final SingleResultCallback<List<RawBsonDocument>> callback) {
173-
withConnection(binding, new AsyncCallableWithSource() {
173+
withAsyncReadConnection(binding, new AsyncCallableWithSource() {
174174
@Override
175175
public void call(final AsyncConnectionSource source, final Throwable t) {
176176
if (t != null) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import java.util.List;
3333

3434
import static com.mongodb.operation.ChangeStreamBatchCursorHelper.isRetryableError;
35-
import static com.mongodb.operation.OperationHelper.withConnectionSource;
35+
import static com.mongodb.operation.OperationHelper.withReadConnectionSource;
3636

3737
final class ChangeStreamBatchCursor<T> implements AggregateResponseBatchCursor<T> {
3838
private final ReadBinding binding;
@@ -167,7 +167,7 @@ <R> R resumeableOperation(final Function<AggregateResponseBatchCursor<RawBsonDoc
167167
}
168168
wrapped.close();
169169

170-
withConnectionSource(binding, new CallableWithSource<Void>() {
170+
withReadConnectionSource(binding, new CallableWithSource<Void>() {
171171
@Override
172172
public Void call(final ConnectionSource source) {
173173
changeStreamOperation.setChangeStreamOptionsForResume(resumeToken, source.getServerDescription().getMaxWireVersion());

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
import java.util.concurrent.TimeUnit;
4848

4949
import static com.mongodb.assertions.Assertions.notNull;
50-
import static com.mongodb.operation.OperationHelper.withConnection;
51-
import static com.mongodb.operation.OperationHelper.withConnectionSource;
50+
import static com.mongodb.operation.OperationHelper.withAsyncReadConnection;
51+
import static com.mongodb.operation.OperationHelper.withReadConnectionSource;
5252

5353
/**
5454
* An operation that executes an {@code $changeStream} aggregation.
@@ -333,7 +333,7 @@ public boolean getRetryReads() {
333333

334334
@Override
335335
public BatchCursor<T> execute(final ReadBinding binding) {
336-
return withConnectionSource(binding, new CallableWithSource<BatchCursor<T>>() {
336+
return withReadConnectionSource(binding, new CallableWithSource<BatchCursor<T>>() {
337337
@Override
338338
public BatchCursor<T> call(final ConnectionSource source) {
339339
AggregateResponseBatchCursor<RawBsonDocument> cursor =
@@ -355,7 +355,7 @@ public void onResult(final AsyncBatchCursor<RawBsonDocument> result, final Throw
355355
} else {
356356
final AsyncAggregateResponseBatchCursor<RawBsonDocument> cursor =
357357
(AsyncAggregateResponseBatchCursor<RawBsonDocument>) result;
358-
withConnection(binding, new AsyncCallableWithSource() {
358+
withAsyncReadConnection(binding, new AsyncCallableWithSource() {
359359
@Override
360360
public void call(final AsyncConnectionSource source, final Throwable t) {
361361
if (t != null) {

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@
5656
import static com.mongodb.operation.OperationHelper.canRetryRead;
5757
import static com.mongodb.operation.OperationHelper.canRetryWrite;
5858
import static com.mongodb.operation.OperationHelper.releasingCallback;
59-
import static com.mongodb.operation.OperationHelper.withConnection;
60-
import static com.mongodb.operation.OperationHelper.withConnectionSource;
59+
import static com.mongodb.operation.OperationHelper.withAsyncConnection;
60+
import static com.mongodb.operation.OperationHelper.withAsyncReadConnection;
61+
import static com.mongodb.operation.OperationHelper.withReadConnectionSource;
6162
import static com.mongodb.operation.OperationHelper.withReleasableConnection;
6263
import static java.lang.String.format;
6364
import static java.util.Arrays.asList;
@@ -198,7 +199,7 @@ static <T> T executeCommand(final ReadBinding binding, final String database, fi
198199

199200
static <D, T> T executeCommand(final ReadBinding binding, final String database, final CommandCreator commandCreator,
200201
final Decoder<D> decoder, final CommandReadTransformer<D, T> transformer, final boolean retryReads) {
201-
return withConnectionSource(binding, new CallableWithSource<T>() {
202+
return withReadConnectionSource(binding, new CallableWithSource<T>() {
202203
@Override
203204
public T call(final ConnectionSource source) {
204205
return executeCommandWithConnection(binding, source, database, commandCreator, decoder,
@@ -404,7 +405,7 @@ static <D, T> void executeCommandAsync(final AsyncReadBinding binding,
404405
final boolean retryReads,
405406
final SingleResultCallback<T> originalCallback) {
406407
final SingleResultCallback<T> errorHandlingCallback = errorHandlingCallback(originalCallback, LOGGER);
407-
withConnection(binding, new AsyncCallableWithConnectionAndSource() {
408+
withAsyncReadConnection(binding, new AsyncCallableWithConnectionAndSource() {
408409
@Override
409410
public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
410411
if (t != null) {
@@ -497,7 +498,7 @@ private void checkRetryableException(final Throwable originalError, final Single
497498
}
498499

499500
private void retryableCommand(final Throwable originalError) {
500-
withConnection(binding, new AsyncCallableWithConnectionAndSource() {
501+
withAsyncReadConnection(binding, new AsyncCallableWithConnectionAndSource() {
501502
@Override
502503
public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
503504
if (t != null) {
@@ -837,7 +838,7 @@ private void checkRetryableException(final Throwable originalError, final Single
837838
private void retryableCommand(final Throwable originalError) {
838839
final BsonDocument retryCommand = retryCommandModifier.apply(command);
839840
logRetryExecute(retryCommand.getFirstKey(), originalError);
840-
withConnection(binding, new AsyncCallableWithConnectionAndSource() {
841+
withAsyncConnection(binding, new AsyncCallableWithConnectionAndSource() {
841842
@Override
842843
public void call(final AsyncConnectionSource source, final AsyncConnection connection, final Throwable t) {
843844
if (t != null) {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
import static com.mongodb.operation.OperationHelper.withConnection;
4646
import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
4747
import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
48+
import static com.mongodb.operation.OperationHelper.AsyncCallableWithConnection;
49+
import static com.mongodb.operation.OperationHelper.withAsyncConnection;
4850

4951
/**
5052
* An operation to create a collection
@@ -389,15 +391,15 @@ public Void call(final Connection connection) {
389391

390392
@Override
391393
public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
392-
withConnection(binding, new OperationHelper.AsyncCallableWithConnection() {
394+
withAsyncConnection(binding, new AsyncCallableWithConnection() {
393395
@Override
394396
public void call(final AsyncConnection connection, final Throwable t) {
395397
SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);
396398
if (t != null) {
397399
errHandlingCallback.onResult(null, t);
398400
} else {
399401
final SingleResultCallback<Void> wrappedCallback = releasingCallback(errHandlingCallback, connection);
400-
validateCollation(connection, collation, new OperationHelper.AsyncCallableWithConnection() {
402+
validateCollation(connection, collation, new AsyncCallableWithConnection() {
401403
@Override
402404
public void call(final AsyncConnection connection, final Throwable t) {
403405
if (t != null) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
import static com.mongodb.operation.OperationHelper.withConnection;
6060
import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
6161
import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
62+
import static com.mongodb.operation.OperationHelper.withAsyncConnection;
6263

6364
/**
6465
* An operation that creates one or more indexes.
@@ -185,7 +186,7 @@ public Void call(final Connection connection) {
185186

186187
@Override
187188
public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
188-
withConnection(binding, new AsyncCallableWithConnection() {
189+
withAsyncConnection(binding, new AsyncCallableWithConnection() {
189190
@Override
190191
public void call(final AsyncConnection connection, final Throwable t) {
191192
SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import static com.mongodb.operation.UserOperationHelper.userCommandCallback;
4343
import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
4444
import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
45+
import static com.mongodb.operation.OperationHelper.withAsyncConnection;
4546

4647
/**
4748
* An operation to create a user.
@@ -116,7 +117,7 @@ public Void call(final Connection connection) {
116117

117118
@Override
118119
public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
119-
withConnection(binding, new AsyncCallableWithConnection() {
120+
withAsyncConnection(binding, new AsyncCallableWithConnection() {
120121
@Override
121122
public void call(final AsyncConnection connection, final Throwable t) {
122123
SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import static com.mongodb.operation.OperationHelper.withConnection;
4545
import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
4646
import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
47+
import static com.mongodb.operation.OperationHelper.withAsyncConnection;
4748

4849
/**
4950
* An operation to create a view.
@@ -160,7 +161,7 @@ public Void call(final Connection connection) {
160161

161162
@Override
162163
public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
163-
withConnection(binding, new AsyncCallableWithConnection() {
164+
withAsyncConnection(binding, new AsyncCallableWithConnection() {
164165
@Override
165166
public void call(final AsyncConnection connection, final Throwable t) {
166167
SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import static com.mongodb.operation.OperationHelper.withConnection;
4343
import static com.mongodb.internal.operation.WriteConcernHelper.appendWriteConcernToCommand;
4444
import static com.mongodb.operation.CommandOperationHelper.writeConcernErrorTransformer;
45+
import static com.mongodb.operation.OperationHelper.withAsyncConnection;
4546

4647
/**
4748
* Operation to drop a Collection in MongoDB. The {@code execute} method throws MongoCommandFailureException if something goes wrong, but
@@ -105,7 +106,7 @@ public Void call(final Connection connection) {
105106

106107
@Override
107108
public void executeAsync(final AsyncWriteBinding binding, final SingleResultCallback<Void> callback) {
108-
withConnection(binding, new AsyncCallableWithConnection() {
109+
withAsyncConnection(binding, new AsyncCallableWithConnection() {
109110
@Override
110111
public void call(final AsyncConnection connection, final Throwable t) {
111112
SingleResultCallback<Void> errHandlingCallback = errorHandlingCallback(callback, LOGGER);

0 commit comments

Comments
 (0)