Inlined timeoutOrAlternative

Removed the timeoutOrAlternative method

JAVA-5412

Author: rozza

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

@@ -174,24 +174,6 @@ public Timeout timeoutIncludingRoundTrip() {
         return timeout == null ? null : timeout.shortenBy(minRoundTripTimeMS, MILLISECONDS);
     }
 
-    /**
-     * Returns the remaining {@code timeoutMS} if set or the {@code alternativeTimeoutMS}.
-     * zero means infinite timeout.
-     *
-     * @param alternativeTimeoutMS the alternative timeout.
-     * @return timeout to use.
-     */
-    public long timeoutOrAlternative(final long alternativeTimeoutMS) {
-        if (timeout == null) {
-            return alternativeTimeoutMS;
-        } else {
-            return timeout.call(MILLISECONDS,
-                    () -> 0L,
-                    (ms) -> ms,
-                    () -> throwMongoTimeoutException("The operation exceeded the timeout limit."));
-        }
-    }
-
     public TimeoutSettings getTimeoutSettings() {
         return timeoutSettings;
     }
@@ -211,16 +193,34 @@ public long getMaxAwaitTimeMS() {
 
     @VisibleForTesting(otherwise = PRIVATE)
     public long getMaxCommitTimeMS() {
-        Long maxCommitTimeMS = timeoutSettings.getMaxCommitTimeMS();
-        return timeoutOrAlternative(maxCommitTimeMS != null ? maxCommitTimeMS : 0);
+        if (timeout == null) {
+            Long maxCommitTimeMS = timeoutSettings.getMaxCommitTimeMS();
+            return maxCommitTimeMS != null ? maxCommitTimeMS : 0;
+        }
+        return timeout.call(MILLISECONDS,
+                () -> 0L,
+                (ms) -> ms,
+                () -> throwMongoTimeoutException("The operation exceeded the timeout limit."));
     }
 
     public long getReadTimeoutMS() {
-        return timeoutOrAlternative(timeoutSettings.getReadTimeoutMS());
+        if (timeout == null) {
+            return timeoutSettings.getReadTimeoutMS();
+        }
+        return timeout.call(MILLISECONDS,
+                () -> 0L,
+                (ms) -> ms,
+                () -> throwMongoTimeoutException("The operation exceeded the timeout limit."));
     }
 
     public long getWriteTimeoutMS() {
-        return timeoutOrAlternative(0);
+        if (timeout == null) {
+            return 0;
+        }
+        return timeout.call(MILLISECONDS,
+                () -> 0L,
+                (ms) -> ms,
+                () -> throwMongoTimeoutException("The operation exceeded the timeout limit."));
     }
 
     public int getConnectTimeoutMs() {

driver-core/src/test/functional/com/mongodb/internal/binding/AsyncSingleConnectionBinding.java

@@ -110,7 +110,8 @@ public AsyncSingleConnectionBinding(final Cluster cluster, final ReadPreference
 
     private void awaitLatch(final CountDownLatch latch) {
         try {
-            if (!latch.await(operationContext.getTimeoutContext().timeoutOrAlternative(10000), TimeUnit.MILLISECONDS)) {
+            long readTimeoutMS = operationContext.getTimeoutContext().getReadTimeoutMS();
+            if (!latch.await(readTimeoutMS > 0 ? readTimeoutMS : 10000, TimeUnit.MILLISECONDS)) {
                 throw new MongoTimeoutException("Failed to get servers");
             }
         } catch (InterruptedException e) {

driver-core/src/test/unit/com/mongodb/internal/TimeoutContextTest.java

@@ -140,22 +140,22 @@ void testAllDeprecatedOptionsSet() {
     @Test
     @DisplayName("Use timeout if available or the alternative")
     void testUseTimeoutIfAvailableOrTheAlternative() {
+        // No CSOT: returns alternative values
         TimeoutContext timeoutContext = new TimeoutContext(TIMEOUT_SETTINGS);
-        assertEquals(99L, timeoutContext.timeoutOrAlternative(99));
+        assertEquals(TIMEOUT_SETTINGS.getReadTimeoutMS(), timeoutContext.getReadTimeoutMS());
+        assertEquals(0, timeoutContext.getWriteTimeoutMS());
+        assertEquals(0, timeoutContext.getMaxCommitTimeMS());
 
+        // CSOT with infinite timeout (0): returns 0
         timeoutContext = new TimeoutContext(TIMEOUT_SETTINGS.withTimeoutMS(0L));
-        assertEquals(0L, timeoutContext.timeoutOrAlternative(99));
-
-        timeoutContext = new TimeoutContext(TIMEOUT_SETTINGS.withTimeoutMS(999L));
-        assertTrue(timeoutContext.timeoutOrAlternative(0) <= 999);
-
-        timeoutContext = new TimeoutContext(TIMEOUT_SETTINGS.withTimeoutMS(999L));
-        assertTrue(timeoutContext.timeoutOrAlternative(999999) <= 999);
-
-        timeoutContext = new TimeoutContext(TIMEOUT_SETTINGS);
-        assertEquals(0, timeoutContext.getMaxCommitTimeMS());
+        assertEquals(0L, timeoutContext.getReadTimeoutMS());
+        assertEquals(0L, timeoutContext.getWriteTimeoutMS());
+        assertEquals(0L, timeoutContext.getMaxCommitTimeMS());
 
+        // CSOT with finite timeout: returns remaining time
         timeoutContext = new TimeoutContext(TIMEOUT_SETTINGS.withTimeoutMS(999L));
+        assertTrue(timeoutContext.getReadTimeoutMS() <= 999);
+        assertTrue(timeoutContext.getWriteTimeoutMS() <= 999);
         assertTrue(timeoutContext.getMaxCommitTimeMS() <= 999);
     }
 
@@ -207,19 +207,16 @@ void testThrowsWhenExpired() {
         assertThrows(MongoOperationTimeoutException.class, smallTimeout::getConnectTimeoutMs);
         assertThrows(MongoOperationTimeoutException.class, () -> getMaxTimeMS(smallTimeout));
         assertThrows(MongoOperationTimeoutException.class, smallTimeout::getMaxCommitTimeMS);
-        assertThrows(MongoOperationTimeoutException.class, () -> smallTimeout.timeoutOrAlternative(1));
         assertDoesNotThrow(longTimeout::getReadTimeoutMS);
         assertDoesNotThrow(longTimeout::getWriteTimeoutMS);
         assertDoesNotThrow(longTimeout::getConnectTimeoutMs);
         assertDoesNotThrow(() -> getMaxTimeMS(longTimeout));
         assertDoesNotThrow(longTimeout::getMaxCommitTimeMS);
-        assertDoesNotThrow(() -> longTimeout.timeoutOrAlternative(1));
         assertDoesNotThrow(noTimeout::getReadTimeoutMS);
         assertDoesNotThrow(noTimeout::getWriteTimeoutMS);
         assertDoesNotThrow(noTimeout::getConnectTimeoutMs);
         assertDoesNotThrow(() -> getMaxTimeMS(noTimeout));
         assertDoesNotThrow(noTimeout::getMaxCommitTimeMS);
-        assertDoesNotThrow(() -> noTimeout.timeoutOrAlternative(1));
     }
 
     @Test