diff --git a/pom.xml b/pom.xml
index f04193863f..b30a4c8e08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.1.4
+ 3.2.0
im.turms
@@ -31,44 +31,44 @@
0.10.0-SNAPSHOT
- 2.21.0
+ 2.21.40
1.0.8.RELEASE
4.0.0
11.1.0
- 23.0.1
- 73.2
- 4.0.1
- 2.20.0
- 3.24.4
- 2.2.16
- 5.7.2
+ 23.0.2
+ 74.1
+ 4.0.2
+ 2.22.0
+ 3.25.1
+ 2.2.19
+ 5.10.3
1.37
- 1.19.1
+ 1.19.3
- 10.12.4
+ 10.12.6
1.5.0
- 6.0.0
- 3.3.0
+ 7.0.0
+ 3.3.1
${java.version}
${java.version}
3.1.0
- 3.1.2
- 3.1.2
+ 3.2.2
+ 3.2.2
3.5.1
1.7.1
0.6.1
- 4.7.3.5
- 2.39.0
- 4.29
- 1.0.30.RELEASE
+ 4.8.1.0
+ 2.41.1
+ 4.30
+ 1.0.31.RELEASE
false
diff --git a/turms-server-common/src/main/java/com/mongodb/internal/operation/TurmsFindOperation.java b/turms-server-common/src/main/java/com/mongodb/internal/operation/TurmsFindOperation.java
index 62d50e01e7..e853bc59cf 100644
--- a/turms-server-common/src/main/java/com/mongodb/internal/operation/TurmsFindOperation.java
+++ b/turms-server-common/src/main/java/com/mongodb/internal/operation/TurmsFindOperation.java
@@ -37,14 +37,14 @@
import static com.mongodb.assertions.Assertions.notNull;
import static com.mongodb.internal.async.ErrorHandlingResultCallback.errorHandlingCallback;
-import static com.mongodb.internal.operation.CommandOperationHelper.createReadCommandAndExecuteAsync;
+import static com.mongodb.internal.operation.AsyncOperationHelper.createReadCommandAndExecuteAsync;
+import static com.mongodb.internal.operation.AsyncOperationHelper.decorateReadWithRetriesAsync;
+import static com.mongodb.internal.operation.AsyncOperationHelper.withAsyncSourceAndConnection;
import static com.mongodb.internal.operation.CommandOperationHelper.initialRetryState;
-import static com.mongodb.internal.operation.CommandOperationHelper.logRetryExecute;
import static com.mongodb.internal.operation.ExplainHelper.asExplainCommand;
import static com.mongodb.internal.operation.OperationHelper.LOGGER;
import static com.mongodb.internal.operation.OperationHelper.canRetryRead;
import static com.mongodb.internal.operation.OperationHelper.cursorDocumentToQueryResult;
-import static com.mongodb.internal.operation.OperationHelper.withAsyncSourceAndConnection;
import static com.mongodb.internal.operation.OperationReadConcernHelper.appendReadConcernToCommand;
import static com.mongodb.internal.operation.ServerVersionHelper.MIN_WIRE_VERSION;
@@ -90,33 +90,33 @@ public void executeAsync(
final SingleResultCallback> callback) {
RetryState retryState = initialRetryState(retryReads);
binding.retain();
- AsyncCallbackSupplier> asyncRead = CommandOperationHelper
- .>decorateReadWithRetries(retryState, funcCallback -> {
- logRetryExecute(retryState);
- withAsyncSourceAndConnection(binding::getReadConnectionSource,
- false,
- funcCallback,
- (source, connection, releasingCallback) -> {
- if (retryState
- .breakAndCompleteIfRetryAnd(
- () -> !canRetryRead(source.getServerDescription(),
- binding.getSessionContext()),
- releasingCallback)) {
- return;
- }
- final SingleResultCallback> wrappedCallback =
- exceptionTransformingCallback(releasingCallback);
- createReadCommandAndExecuteAsync(retryState,
- binding,
- source,
- namespace.getDatabaseName(),
- getCommandCreator(binding.getSessionContext()),
- CommandResultDocumentCodec.create(decoder, FIRST_BATCH),
- asyncTransformer(),
- connection,
- wrappedCallback);
- });
- })
+ AsyncCallbackSupplier> asyncRead = decorateReadWithRetriesAsync(
+ retryState,
+ binding.getOperationContext(),
+ (AsyncCallbackSupplier>) funcCallback -> withAsyncSourceAndConnection(
+ binding::getReadConnectionSource,
+ false,
+ funcCallback,
+ (source, connection, releasingCallback) -> {
+ if (retryState
+ .breakAndCompleteIfRetryAnd(
+ () -> !canRetryRead(source.getServerDescription(),
+ binding.getSessionContext()),
+ releasingCallback)) {
+ return;
+ }
+ SingleResultCallback> wrappedCallback =
+ exceptionTransformingCallback(releasingCallback);
+ createReadCommandAndExecuteAsync(retryState,
+ binding,
+ source,
+ namespace.getDatabaseName(),
+ getCommandCreator(binding.getSessionContext()),
+ CommandResultDocumentCodec.create(decoder, FIRST_BATCH),
+ asyncTransformer(),
+ connection,
+ wrappedCallback);
+ }))
.whenComplete(binding::release);
asyncRead.get(errorHandlingCallback(callback, LOGGER));
}
@@ -125,10 +125,11 @@ private static SingleResultCallback exceptionTransformingCallback(
final SingleResultCallback callback) {
return (result, t) -> {
if (t != null) {
- if (t instanceof MongoCommandException e) {
- MongoQueryException exception =
- new MongoQueryException(e.getResponse(), e.getServerAddress());
- callback.onResult(result, exception);
+ if (t instanceof MongoCommandException commandException) {
+ callback.onResult(result,
+ new MongoQueryException(
+ commandException.getResponse(),
+ commandException.getServerAddress()));
} else {
callback.onResult(result, t);
}
@@ -170,7 +171,7 @@ private CommandOperationHelper.CommandCreator getCommandCreator(
};
}
- private CommandOperationHelper.CommandReadTransformerAsync> asyncTransformer() {
+ private AsyncOperationHelper.CommandReadTransformerAsync> asyncTransformer() {
return (result, source, connection) -> {
QueryResult queryResult = cursorDocumentToQueryResult(result.getDocument("cursor"),
connection.getDescription()