Add tests and change validation message.

JAVA-5544

bson/src/main/org/bson/codecs/ContainerCodecHelper.java

@@ -30,6 +30,8 @@
 import java.util.Arrays;
 import java.util.UUID;
 
+import static org.bson.internal.UuidHelper.isLegacyUUID;
+
 /**
  * Helper methods for Codec implementations for containers, e.g. {@code Map} and {@code Iterable}.
  */
@@ -48,7 +50,8 @@ static Object readValue(final BsonReader reader, final DecoderContext decoderCon
 
             if (bsonType == BsonType.BINARY) {
                 byte binarySubType = reader.peekBinarySubType();
-                currentCodec = getBinarySubTypeCodec(reader,
+                currentCodec = getBinarySubTypeCodec(
+                        reader,
                         uuidRepresentation,
                         registry, binarySubType,
                         currentCodec);
@@ -62,21 +65,17 @@ private static Codec<?> getBinarySubTypeCodec(final BsonReader reader,
                                                   final UuidRepresentation uuidRepresentation,
                                                   final CodecRegistry registry,
                                                   final byte binarySubType,
-                                                  final Codec<?> currentTypeCodec) {
+                                                  final Codec<?> binaryTypeCodec) {
 
         if (binarySubType == BsonBinarySubType.VECTOR.getValue()) {
             Codec<Vector> vectorCodec = registry.get(Vector.class, registry);
             if (vectorCodec != null) {
                 return vectorCodec;
             }
-        }
-
-        if (reader.peekBinarySize() == 16) {
+        } else if (reader.peekBinarySize() == 16) {
             switch (binarySubType) {
                 case 3:
-                    if (uuidRepresentation == UuidRepresentation.JAVA_LEGACY
-                            || uuidRepresentation == UuidRepresentation.C_SHARP_LEGACY
-                            || uuidRepresentation == UuidRepresentation.PYTHON_LEGACY) {
+                    if (isLegacyUUID(uuidRepresentation)) {
                         return registry.get(UUID.class);
                     }
                     break;
@@ -90,7 +89,7 @@ private static Codec<?> getBinarySubTypeCodec(final BsonReader reader,
             }
         }
 
-        return currentTypeCodec;
+        return binaryTypeCodec;
     }
 
     static Codec<?> getCodec(final CodecRegistry codecRegistry, final Type type) {
@@ -104,7 +103,6 @@ static Codec<?> getCodec(final CodecRegistry codecRegistry, final Type type) {
         }
     }
 
-
     private ContainerCodecHelper() {
     }
 }

bson/src/main/org/bson/internal/UuidHelper.java

@@ -124,6 +124,12 @@ public static UUID decodeBinaryToUuid(final byte[] data, final byte type, final
         return new UUID(readLongFromArrayBigEndian(localData, 0), readLongFromArrayBigEndian(localData, 8));
     }
 
+    public static boolean isLegacyUUID(final UuidRepresentation uuidRepresentation) {
+        return uuidRepresentation == UuidRepresentation.JAVA_LEGACY
+                || uuidRepresentation == UuidRepresentation.C_SHARP_LEGACY
+                || uuidRepresentation == UuidRepresentation.PYTHON_LEGACY;
+    }
+
     private UuidHelper() {
     }
 }

bson/src/main/org/bson/internal/vector/VectorHelper.java

@@ -72,7 +72,7 @@ public static byte[] encodeVectorToBinary(final Vector vector) {
      * encodedVector is not mutated nor stored in the returned {@link Vector}.
      */
     public static Vector decodeBinaryToVector(final byte[] encodedVector) {
-        isTrue("Vector encoded array length must be at least 2.", encodedVector.length >= METADATA_SIZE);
+        isTrue("Vector encoded array length must be at least 2, but found: " + encodedVector.length, encodedVector.length >= METADATA_SIZE);
         Vector.DataType dataType = determineVectorDType(encodedVector[0]);
         byte padding = encodedVector[1];
         switch (dataType) {

bson/src/test/unit/org/bson/BsonBinaryTest.java

@@ -191,6 +191,20 @@ void shouldThrowExceptionForInvalidFloatArrayLengthWhenDecode() {
                 thrown.getMessage());
     }
 
+    @ParameterizedTest
+    @ValueSource(ints = {0, 1})
+    void shouldThrowExceptionWhenEncodedVectorLengthIsLessThenMetadataLength(final int encodedVectorLength) {
+        // given
+        byte[] invalidData = new byte[encodedVectorLength];
+
+        // when & Then
+        BsonInvalidOperationException thrown = assertThrows(BsonInvalidOperationException.class, () -> {
+            new BsonBinary(BsonBinarySubType.VECTOR, invalidData).asVector();
+        });
+        assertEquals("Vector encoded array length must be at least 2, but found: " + encodedVectorLength,
+                thrown.getMessage());
+    }
+
     @ParameterizedTest
     @ValueSource(bytes = {-1, 1})
     void shouldThrowExceptionForInvalidFloatArrayPaddingWhenDecode(final byte invalidPadding) {