Update backpressure to latest main

bson/src/main/org/bson/BinaryVector.java

@@ -32,6 +32,9 @@
  * @since 5.3
  */
 public abstract class BinaryVector {
+    /**
+     * The BinaryVector logger
+     */
     protected static final Logger LOGGER = Loggers.getLogger("BinaryVector");
     private final DataType dataType;
 

bson/src/main/org/bson/BsonBinary.java

@@ -127,9 +127,14 @@ public BsonBinary(final UUID uuid, final UuidRepresentation uuidRepresentation)
     }
 
     /**
-     * Returns the binary as a UUID. The binary type must be 4.
+     * Returns the binary as a UUID.
+     *
+     * <p><strong>Note:</strong>The BsonBinary subtype must be {@link BsonBinarySubType#UUID_STANDARD}.</p>
      *
      * @return the uuid
+     * @throws BsonInvalidOperationException if BsonBinary subtype is not {@link BsonBinarySubType#UUID_STANDARD}
+     * @see #asUuid(UuidRepresentation)
+     * @see BsonBinarySubType
      * @since 3.9
      */
     public UUID asUuid() {
@@ -162,8 +167,15 @@ public BinaryVector asVector() {
     /**
      * Returns the binary as a UUID.
      *
-     * @param uuidRepresentation the UUID representation
+     * <p><strong>Note:</strong>The BsonBinary subtype must be either {@link BsonBinarySubType#UUID_STANDARD} or
+     * {@link BsonBinarySubType#UUID_LEGACY}.</p>
+     *
+     * @param uuidRepresentation the UUID representation, must be {@link UuidRepresentation#STANDARD} or
+     *                           {@link UuidRepresentation#JAVA_LEGACY}
      * @return the uuid
+     * @throws BsonInvalidOperationException if the BsonBinary subtype is incompatible with the given {@code uuidRepresentation}, or if
+     *                                       the {@code uuidRepresentation} is not {@link UuidRepresentation#STANDARD} or
+     *                                       {@link UuidRepresentation#JAVA_LEGACY}.
      * @since 3.9
      */
     public UUID asUuid(final UuidRepresentation uuidRepresentation) {

bson/src/main/org/bson/BsonBinarySubType.java

@@ -93,7 +93,7 @@ public enum BsonBinarySubType {
      * Returns true if the given value is a UUID subtype.
      *
      * @param value the subtype value as a byte.
-     * @return true if value is a UUID subtype.
+     * @return true if value has a {@link #UUID_STANDARD} or {@link #UUID_LEGACY} subtype.
      * @since 3.4
      */
     public static boolean isUuid(final byte value) {

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

@@ -331,9 +331,10 @@ static Stream<Arguments> shouldChooseTimeoutMsWhenItIsLessThenConnectTimeoutMS()
         );
     }
 
-    @ParameterizedTest
-    @MethodSource
     @DisplayName("should choose timeoutMS when timeoutMS is less than connectTimeoutMS")
+    @ParameterizedTest(name = "should choose timeoutMS when timeoutMS is less than connectTimeoutMS. "
+            + "Parameters: connectTimeoutMS: {0}, timeoutMS: {1}, expected: {2}")
+    @MethodSource
     void shouldChooseTimeoutMsWhenItIsLessThenConnectTimeoutMS(final Long connectTimeoutMS,
                                                           final Long timeoutMS,
                                                           final long expected) {
@@ -345,7 +346,7 @@ void shouldChooseTimeoutMsWhenItIsLessThenConnectTimeoutMS(final Long connectTim
                         0));
 
         long calculatedTimeoutMS = timeoutContext.getConnectTimeoutMs();
-        assertTrue(expected - calculatedTimeoutMS <= 1);
+        assertTrue(expected - calculatedTimeoutMS <= 2);
     }
 
     private TimeoutContextTest() {

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/TimeoutHelper.java

@@ -55,18 +55,29 @@ public static <T> MongoCollection<T> collectionWithTimeout(final MongoCollection
 
     public static <T> Mono<MongoCollection<T>> collectionWithTimeoutMono(final MongoCollection<T> collection,
                                                                          @Nullable final Timeout timeout) {
+       return collectionWithTimeoutMono(collection, timeout, DEFAULT_TIMEOUT_MESSAGE);
+    }
+
+    public static <T> Mono<MongoCollection<T>> collectionWithTimeoutMono(final MongoCollection<T> collection,
+                                                                         @Nullable final Timeout timeout,
+                                                                         final String message) {
         try {
-            return Mono.just(collectionWithTimeout(collection, timeout));
+            return Mono.just(collectionWithTimeout(collection, timeout, message));
         } catch (MongoOperationTimeoutException e) {
             return Mono.error(e);
         }
     }
 
     public static <T> Mono<MongoCollection<T>> collectionWithTimeoutDeferred(final MongoCollection<T> collection,
                                                                              @Nullable final Timeout timeout) {
-        return Mono.defer(() -> collectionWithTimeoutMono(collection, timeout));
+        return collectionWithTimeoutDeferred(collection, timeout, DEFAULT_TIMEOUT_MESSAGE);
     }
 
+    public static <T> Mono<MongoCollection<T>> collectionWithTimeoutDeferred(final MongoCollection<T> collection,
+                                                                             @Nullable final Timeout timeout,
+                                                                             final String message) {
+        return Mono.defer(() -> collectionWithTimeoutMono(collection, timeout, message));
+    }
 
     public static MongoDatabase databaseWithTimeout(final MongoDatabase database,
                                                     @Nullable final Timeout timeout) {

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSUploadPublisherImpl.java

@@ -54,7 +54,8 @@
  */
 public final class GridFSUploadPublisherImpl implements GridFSUploadPublisher<Void> {
 
-    private static final String TIMEOUT_ERROR_MESSAGE = "Saving chunks exceeded the timeout limit.";
+    private static final String TIMEOUT_ERROR_MESSAGE_CHUNKS_SAVING = "Saving chunks exceeded the timeout limit.";
+    private static final String TIMEOUT_ERROR_MESSAGE_UPLOAD_CANCELLATION = "Upload cancellation exceeded the timeout limit.";
     private static final Document PROJECTION = new Document("_id", 1);
     private static final Document FILES_INDEX = new Document("filename", 1).append("uploadDate", 1);
     private static final Document CHUNKS_INDEX = new Document("files_id", 1).append("n", 1);
@@ -226,8 +227,8 @@ private Mono<Long> createSaveChunksMono(final AtomicBoolean terminated, @Nullabl
                             .append("data", data);
 
                     Publisher<InsertOneResult> insertOnePublisher = clientSession == null
-                            ? collectionWithTimeout(chunksCollection, timeout, TIMEOUT_ERROR_MESSAGE).insertOne(chunkDocument)
-                            : collectionWithTimeout(chunksCollection, timeout, TIMEOUT_ERROR_MESSAGE)
+                            ? collectionWithTimeout(chunksCollection, timeout, TIMEOUT_ERROR_MESSAGE_CHUNKS_SAVING).insertOne(chunkDocument)
+                            : collectionWithTimeout(chunksCollection, timeout, TIMEOUT_ERROR_MESSAGE_CHUNKS_SAVING)
                                .insertOne(clientSession, chunkDocument);
 
                     return Mono.from(insertOnePublisher).thenReturn(data.length());
@@ -270,7 +271,8 @@ private Mono<InsertOneResult> createSaveFileDataMono(final AtomicBoolean termina
     }
 
     private Mono<DeleteResult> createCancellationMono(final AtomicBoolean terminated, @Nullable final Timeout timeout) {
-        Mono<MongoCollection<Document>> chunksCollectionMono = collectionWithTimeoutDeferred(chunksCollection, timeout);
+        Mono<MongoCollection<Document>> chunksCollectionMono = collectionWithTimeoutDeferred(chunksCollection, timeout,
+                TIMEOUT_ERROR_MESSAGE_UPLOAD_CANCELLATION);
         if (terminated.compareAndSet(false, true)) {
             if (clientSession != null) {
                 return chunksCollectionMono.flatMap(collection -> Mono.from(collection