Merge branch 'mongodb:main' into main

Author: nhachicha

.evergreen/run-kotlin-tests.sh

@@ -31,7 +31,10 @@ if [ "$SAFE_FOR_MULTI_MONGOS" == "true" ]; then
     export MULTI_MONGOS_URI_SYSTEM_PROPERTY="-Dorg.mongodb.test.multi.mongos.uri=${MONGODB_URI}"
 fi
 
-echo "Running Kotlin tests"
-
 ./gradlew -version
-./gradlew kotlinCheck -Dorg.mongodb.test.uri=${MONGODB_URI} ${MULTI_MONGOS_URI_SYSTEM_PROPERTY}
+
+echo "Running Kotlin Unit Tests"
+./gradlew :bson-kotlin:test :bson-kotlinx:test :driver-kotlin-sync:test :driver-kotlin-coroutine:test :driver-kotlin-extensions:test
+
+echo "Running Kotlin Integration Tests"
+./gradlew :driver-kotlin-sync:integrationTest :driver-kotlin-coroutine:integrationTest  -Dorg.mongodb.test.uri=${MONGODB_URI} ${MULTI_MONGOS_URI_SYSTEM_PROPERTY}

.evergreen/ssdlc-report.sh

@@ -40,10 +40,10 @@ declare -r EVERGREEN_BUILD_URL_PREFIX="https://spruce.mongodb.com/version"
 declare -r GIT_TAG="r${PRODUCT_VERSION}"
 GIT_COMMIT_HASH="$(git rev-list --ignore-missing -n 1 "${GIT_TAG}")"
 set +e
-    GIT_BRANCH_MASTER="$(git branch -a --contains "${GIT_TAG}" | grep 'master$')"
+    GIT_BRANCH_DEFAULT="$(git branch -a --contains "${GIT_TAG}" | grep 'main$')"
     GIT_BRANCH_PATCH="$(git branch -a --contains "${GIT_TAG}" | grep '\.x$')"
 set -e
-if [ -n "${GIT_BRANCH_MASTER}" ]; then
+if [ -n "${GIT_BRANCH_DEFAULT}" ]; then
     declare -r EVERGREEN_BUILD_URL="${EVERGREEN_BUILD_URL_PREFIX}/${EVERGREEN_PROJECT_NAME_PREFIX}_${GIT_COMMIT_HASH}"
 elif [ -n "${GIT_BRANCH_PATCH}" ]; then
     # strip out the patch version
@@ -65,7 +65,7 @@ printf "\nCreating SpotBugs SARIF reports\n"
 set +e
     # This `gradlew` command is expected to exit with a non-zero exit status,
     # because it reports all the findings that we normally explicitly exclude as "No Fix Needed"/"False Positive".
-    ./gradlew -PssdlcReport.enabled=true --continue -x test -x integrationTest -x spotlessApply check scalaCheck kotlinCheck
+    ./gradlew -PssdlcReport.enabled=true --continue -x test -x integrationTest -x spotlessApply check scalaCheck
 set -e
 printf "\nSpotBugs created the following SARIF reports\n"
 IFS=$'\n'

.evergreen/static-checks.sh

@@ -12,4 +12,4 @@ RELATIVE_DIR_PATH="$(dirname "${BASH_SOURCE[0]:-$0}")"
 echo "Compiling JVM drivers"
 
 ./gradlew -version
-./gradlew -PxmlReports.enabled=true --info -x test -x integrationTest -x spotlessApply clean check scalaCheck kotlinCheck jar testClasses docs
+./gradlew -PxmlReports.enabled=true --info -x test -x integrationTest -x spotlessApply clean check scalaCheck jar testClasses docs

THIRD-PARTY-NOTICES

@@ -161,3 +161,26 @@ https://github.com/mongodb/mongo-java-driver.
     See the License for the specific language governing permissions and
     limitations under the License.
 
+8) The following files (originally from https://github.com/Litote/kmongo):
+
+    Filters.kt
+    Properties.kt
+    KPropertyPath.kt
+    FiltersTest.kt
+    KPropertiesTest.kt
+
+    Copyright 2008-present MongoDB, Inc.
+    Copyright (C) 2016/2022 Litote
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+

bson-kotlin/build.gradle.kts

@@ -111,13 +111,6 @@ spotbugs { showProgress.set(true) }
 // ===========================
 //     Test Configuration
 // ===========================
-tasks.create("kotlinCheck") {
-    description = "Runs all the kotlin checks"
-    group = "verification"
-
-    dependsOn("clean", "check")
-    tasks.findByName("check")?.mustRunAfter("clean")
-}
 
 tasks.test { useJUnitPlatform() }
 

bson-kotlinx/build.gradle.kts

@@ -128,13 +128,6 @@ spotbugs { showProgress.set(true) }
 // ===========================
 //     Test Configuration
 // ===========================
-tasks.create("kotlinCheck") {
-    description = "Runs all the kotlin checks"
-    group = "verification"
-
-    dependsOn("clean", "check")
-    tasks.findByName("check")?.mustRunAfter("clean")
-}
 
 tasks.test { useJUnitPlatform() }
 

bson/src/main/org/bson/AbstractBsonWriter.java

@@ -748,6 +748,15 @@ protected void throwInvalidState(final String methodName, final State... validSt
                                                        methodName, validStatesString, state));
     }
 
+    /**
+     * {@inheritDoc}
+     * <p>
+     * The {@link #flush()} method of {@link AbstractBsonWriter} does nothing.</p>
+     */
+    @Override
+    public void flush() {
+    }
+
     @Override
     public void close() {
         closed = true;

bson/src/main/org/bson/BSONCallbackAdapter.java

@@ -39,11 +39,6 @@ protected BSONCallbackAdapter(final BsonWriterSettings settings, final BSONCallb
         this.bsonCallback = bsonCallback;
     }
 
-    @Override
-    public void flush() {
-        //Looks like should be no-op?
-    }
-
     @Override
     public void doWriteStartDocument() {
         BsonContextType contextType = getState() == State.SCOPE_DOCUMENT

bson/src/main/org/bson/Vector.java bson/src/main/org/bson/BinaryVector.javabson/src/main/org/bson/Vector.java renamed to bson/src/main/org/bson/BinaryVector.java

@@ -16,27 +16,26 @@
 
 package org.bson;
 
+import org.bson.annotations.Beta;
+import org.bson.annotations.Reason;
+
 import static org.bson.assertions.Assertions.isTrueArgument;
 import static org.bson.assertions.Assertions.notNull;
 
 /**
- * Represents a vector that is stored and retrieved using the BSON Binary Subtype 9 format.
- * This class supports multiple vector {@link DataType}'s and provides static methods to create
- * vectors.
- * <p>
- * Vectors are densely packed arrays of numbers, all the same type, which are stored efficiently
- * in BSON using a binary format.
+ * Binary Vectors are densely packed arrays of numbers, all the same type, which are stored and retrieved efficiently using the BSON Binary
+ * Subtype 9 format. This class supports multiple vector {@link DataType}'s and provides static methods to create vectors.
  * <p>
  * <b>NOTE:</b> This class should be treated as <b>sealed</b>: it must not be extended or implemented by consumers of the library.
  *
  * @mongodb.server.release 6.0
  * @see BsonBinary
  * @since 5.3
  */
-public abstract class Vector {
+public abstract class BinaryVector {
     private final DataType dataType;
 
-    Vector(final DataType dataType) {
+    BinaryVector(final DataType dataType) {
         this.dataType = dataType;
     }
 
@@ -56,18 +55,19 @@ public abstract class Vector {
      * </pre>
      * <p>
      * NOTE: The byte array `data` is not copied; changes to the provided array will be reflected
-     * in the created {@link PackedBitVector} instance.
+     * in the created {@link PackedBitBinaryVector} instance.
      *
      * @param data The byte array representing the packed bit vector data. Each byte can store 8 bits.
      * @param padding    The number of least-significant bits (0 to 7) to ignore in the final byte of the vector data.
-     * @return A {@link PackedBitVector} instance with the {@link DataType#PACKED_BIT} data type.
+     * @return A {@link PackedBitBinaryVector} instance with the {@link DataType#PACKED_BIT} data type.
      * @throws IllegalArgumentException If the padding value is greater than 7.
      */
-    public static PackedBitVector packedBitVector(final byte[] data, final byte padding) {
+    @Beta(Reason.SERVER)
+    public static PackedBitBinaryVector packedBitVector(final byte[] data, final byte padding) {
         notNull("data", data);
         isTrueArgument("Padding must be between 0 and 7 bits. Provided padding: " + padding, padding >= 0 && padding <= 7);
         isTrueArgument("Padding must be 0 if vector is empty. Provided padding: " + padding, padding == 0 || data.length > 0);
-        return new PackedBitVector(data, padding);
+        return new PackedBitBinaryVector(data, padding);
     }
 
     /**
@@ -77,14 +77,14 @@ public static PackedBitVector packedBitVector(final byte[] data, final byte padd
      * with values in the range [-128, 127].</p>
      * <p>
      * NOTE: The byte array `data` is not copied; changes to the provided array will be reflected
-     * in the created {@link Int8Vector} instance.
+     * in the created {@link Int8BinaryVector} instance.
      *
      * @param data The byte array representing the {@link DataType#INT8} vector data.
-     * @return A {@link Int8Vector} instance with the {@link DataType#INT8} data type.
+     * @return A {@link Int8BinaryVector} instance with the {@link DataType#INT8} data type.
      */
-    public static Int8Vector int8Vector(final byte[] data) {
+    public static Int8BinaryVector int8Vector(final byte[] data) {
         notNull("data", data);
-        return new Int8Vector(data);
+        return new Int8BinaryVector(data);
     }
 
     /**
@@ -93,50 +93,50 @@ public static Int8Vector int8Vector(final byte[] data) {
      * A {@link DataType#FLOAT32} vector is a vector of floating-point numbers, where each element in the vector is a float.</p>
      * <p>
      * NOTE: The float array `data` is not copied; changes to the provided array will be reflected
-     * in the created {@link Float32Vector} instance.
+     * in the created {@link Float32BinaryVector} instance.
      *
      * @param data The float array representing the {@link DataType#FLOAT32} vector data.
-     * @return A {@link Float32Vector} instance with the {@link DataType#FLOAT32} data type.
+     * @return A {@link Float32BinaryVector} instance with the {@link DataType#FLOAT32} data type.
      */
-    public static Float32Vector floatVector(final float[] data) {
+    public static Float32BinaryVector floatVector(final float[] data) {
         notNull("data", data);
-        return new Float32Vector(data);
+        return new Float32BinaryVector(data);
     }
 
     /**
-     * Returns the {@link PackedBitVector}.
+     * Returns the {@link PackedBitBinaryVector}.
      *
-     * @return {@link PackedBitVector}.
+     * @return {@link PackedBitBinaryVector}.
      * @throws IllegalStateException if this vector is not of type {@link DataType#PACKED_BIT}. Use {@link #getDataType()} to check the vector
      *                                   type before calling this method.
      */
-    public PackedBitVector asPackedBitVector() {
+    public PackedBitBinaryVector asPackedBitVector() {
         ensureType(DataType.PACKED_BIT);
-        return (PackedBitVector) this;
+        return (PackedBitBinaryVector) this;
     }
 
     /**
-     * Returns the {@link Int8Vector}.
+     * Returns the {@link Int8BinaryVector}.
      *
-     * @return {@link Int8Vector}.
+     * @return {@link Int8BinaryVector}.
      * @throws IllegalStateException if this vector is not of type {@link DataType#INT8}. Use {@link #getDataType()} to check the vector
      *                               type before calling this method.
      */
-    public Int8Vector asInt8Vector() {
+    public Int8BinaryVector asInt8Vector() {
         ensureType(DataType.INT8);
-        return (Int8Vector) this;
+        return (Int8BinaryVector) this;
     }
 
     /**
-     * Returns the {@link Float32Vector}.
+     * Returns the {@link Float32BinaryVector}.
      *
-     * @return {@link Float32Vector}.
+     * @return {@link Float32BinaryVector}.
      * @throws IllegalStateException if this vector is not of type {@link DataType#FLOAT32}. Use {@link #getDataType()} to check the vector
      *                               type before calling this method.
      */
-    public Float32Vector asFloat32Vector() {
+    public Float32BinaryVector asFloat32Vector() {
         ensureType(DataType.FLOAT32);
-        return (Float32Vector) this;
+        return (Float32BinaryVector) this;
     }
 
     /**

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

@@ -18,12 +18,12 @@
 
 import org.bson.assertions.Assertions;
 import org.bson.internal.UuidHelper;
-import org.bson.internal.vector.VectorHelper;
+import org.bson.internal.vector.BinaryVectorHelper;
 
 import java.util.Arrays;
 import java.util.UUID;
 
-import static org.bson.internal.vector.VectorHelper.encodeVectorToBinary;
+import static org.bson.internal.vector.BinaryVectorHelper.encodeVectorToBinary;
 
 /**
  * A representation of the BSON Binary type.  Note that for performance reasons instances of this class are not immutable,
@@ -93,12 +93,12 @@ public BsonBinary(final UUID uuid) {
     }
 
     /**
-     * Constructs a {@linkplain BsonBinarySubType#VECTOR subtype 9} {@link BsonBinary} from the given {@link Vector}.
+     * Constructs a {@linkplain BsonBinarySubType#VECTOR subtype 9} {@link BsonBinary} from the given {@link BinaryVector}.
      *
-     * @param vector the {@link Vector}
+     * @param vector the {@link BinaryVector}
      * @since 5.3
      */
-    public BsonBinary(final Vector vector) {
+    public BsonBinary(final BinaryVector vector) {
         if (vector == null) {
             throw new IllegalArgumentException("Vector must not be null");
         }
@@ -145,18 +145,18 @@ public UUID asUuid() {
     }
 
     /**
-     * Returns the binary as a {@link Vector}. The {@linkplain #getType() subtype} must be {@linkplain BsonBinarySubType#VECTOR 9}.
+     * Returns the binary as a {@link BinaryVector}. The {@linkplain #getType() subtype} must be {@linkplain BsonBinarySubType#VECTOR 9}.
      *
      * @return the vector
      * @throws BsonInvalidOperationException if the binary subtype is not {@link BsonBinarySubType#VECTOR}.
      * @since 5.3
      */
-    public Vector asVector() {
+    public BinaryVector asVector() {
         if (type != BsonBinarySubType.VECTOR.getValue()) {
             throw new BsonInvalidOperationException("type must be a Vector subtype.");
         }
 
-        return VectorHelper.decodeBinaryToVector(this.data);
+        return BinaryVectorHelper.decodeBinaryToVector(this.data);
     }
 
     /**