Skip to content

Commit 5ef637f

Browse files
committed
Encapsulate constructors
1 parent 1f89e94 commit 5ef637f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

driver-core/src/main/com/mongodb/internal/TimeoutContext.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,20 @@ public static TimeoutContext createTimeoutContext(final ClientSession session, f
105105
return new TimeoutContext(timeoutSettings);
106106
}
107107

108+
// Creates a copy of the timeout context that can be reset without resetting the original.
109+
public TimeoutContext copyTimeoutContext() {
110+
return new TimeoutContext(getTimeoutSettings(), getTimeout());
111+
}
112+
108113
public TimeoutContext(final TimeoutSettings timeoutSettings) {
109114
this(false, timeoutSettings, startTimeout(timeoutSettings.getTimeoutMS()));
110115
}
111116

112-
public TimeoutContext(final TimeoutSettings timeoutSettings, @Nullable final Timeout timeout) {
117+
private TimeoutContext(final TimeoutSettings timeoutSettings, @Nullable final Timeout timeout) {
113118
this(false, timeoutSettings, timeout);
114119
}
115120

116-
TimeoutContext(final boolean isMaintenanceContext, final TimeoutSettings timeoutSettings, @Nullable final Timeout timeout) {
121+
private TimeoutContext(final boolean isMaintenanceContext, final TimeoutSettings timeoutSettings, @Nullable final Timeout timeout) {
117122
this.isMaintenanceContext = isMaintenanceContext;
118123
this.timeoutSettings = timeoutSettings;
119124
this.timeout = timeout;

driver-sync/src/main/com/mongodb/client/internal/ClientSessionImpl.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public <T> T withTransaction(final TransactionBody<T> transactionBody, final Tra
224224
while (true) {
225225
T retVal;
226226
try {
227-
startTransaction(options, copyTimeoutContext(withTransactionTimeoutContext));
227+
startTransaction(options, withTransactionTimeoutContext.copyTimeoutContext());
228228
retVal = transactionBody.execute();
229229
} catch (Throwable e) {
230230
if (transactionState == TransactionState.IN) {
@@ -304,9 +304,4 @@ private TimeoutContext createTimeoutContext(final TransactionOptions transaction
304304
TransactionOptions.merge(transactionOptions, getOptions().getDefaultTransactionOptions()),
305305
operationExecutor.getTimeoutSettings()));
306306
}
307-
308-
// Creates a copy of the timeout context that can be reset without resetting the original.
309-
private TimeoutContext copyTimeoutContext(final TimeoutContext timeoutContext) {
310-
return new TimeoutContext(timeoutContext.getTimeoutSettings(), timeoutContext.getTimeout());
311-
}
312307
}

0 commit comments

Comments
 (0)