refactor: remove Vectors.Builder in favour of a merge-constructor

This makes for a cleaner syntax in obj -> obj.vectors(Vectors.of(...), Vectors.of(named, ...));

Author: bevzzz

src/main/java/io/weaviate/client6/v1/api/collections/ObjectMetadata.java

@@ -36,9 +36,9 @@ public Builder uuid(String uuid) {
       return this;
     }
 
-    /** Attach custom vector to the object.. */
-    public Builder vectors(Vectors vectors) {
-      this.vectors = vectors;
+    /** Attach custom vectors to the object.. */
+    public Builder vectors(Vectors... vectors) {
+      this.vectors = new Vectors(vectors);
       return this;
     }
 

src/main/java/io/weaviate/client6/v1/api/collections/Vectors.java

@@ -4,7 +4,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.Function;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -48,14 +47,6 @@ public static Vectors of(String name, float[][] vector) {
     return new Vectors(name, vector);
   }
 
-  public static Vectors of(Function<Builder, ObjectBuilder<Vectors>> fn) {
-    return fn.apply(new Builder()).build();
-  }
-
-  public Vectors(Builder builder) {
-    this.namedVectors = builder.namedVectors;
-  }
-
   /**
    * Create a single named vector.
    *
@@ -84,23 +75,13 @@ private Vectors(Map<String, Object> namedVectors) {
     this.namedVectors = namedVectors;
   }
 
-  public static class Builder implements ObjectBuilder<Vectors> {
-    private final Map<String, Object> namedVectors = new HashMap<>();
-
-    public Builder vector(String name, float[] vector) {
-      this.namedVectors.put(name, vector);
-      return this;
-    }
-
-    public Builder vector(String name, float[][] vector) {
-      this.namedVectors.put(name, vector);
-      return this;
-    }
-
-    @Override
-    public Vectors build() {
-      return new Vectors(this);
+  /** Merge all vectors in a single vector map. */
+  public Vectors(Vectors... vectors) {
+    var namedVectors = new HashMap<String, Object>();
+    for (var vec : vectors) {
+      namedVectors.putAll(vec.asMap());
     }
+    this.namedVectors = namedVectors;
   }
 
   /**

src/main/java/io/weaviate/client6/v1/api/collections/data/InsertObjectRequest.java

@@ -63,7 +63,7 @@ public Builder<T> uuid(String uuid) {
       return this;
     }
 
-    public Builder<T> vectors(Vectors vectors) {
+    public Builder<T> vectors(Vectors... vectors) {
       this.metadata.vectors(vectors);
       return this;
     }

src/main/java/io/weaviate/client6/v1/api/collections/data/ReplaceObjectRequest.java

@@ -54,7 +54,7 @@ public Builder<T> properties(T properties) {
       return this;
     }
 
-    public Builder<T> vectors(Vectors vectors) {
+    public Builder<T> vectors(Vectors... vectors) {
       this.metadata.vectors(vectors);
       return this;
     }

src/main/java/io/weaviate/client6/v1/api/collections/data/UpdateObjectRequest.java

@@ -54,7 +54,7 @@ public Builder<T> properties(T properties) {
       return this;
     }
 
-    public Builder<T> vectors(Vectors vectors) {
+    public Builder<T> vectors(Vectors... vectors) {
       this.metadata.vectors(vectors);
       return this;
     }

src/main/java/io/weaviate/client6/v1/api/collections/query/QueryRequest.java

@@ -177,22 +177,23 @@ private static <T> WeaviateObject<T, Object, ObjectMetadata> unmarshalWithRefere
       var metadataBuilder = new ObjectMetadata.Builder()
           .uuid(metadataResult.getId());
 
-      var vectors = new Vectors.Builder();
+      var vectors = new Vectors[metadataResult.getVectorsList().size()];
+      var i = 0;
       for (final var vector : metadataResult.getVectorsList()) {
         var vectorName = vector.getName();
         var vbytes = vector.getVectorBytes();
         switch (vector.getType()) {
           case VECTOR_TYPE_SINGLE_FP32:
-            vectors.vector(vectorName, ByteStringUtil.decodeVectorSingle(vbytes));
+            vectors[i++] = Vectors.of(vectorName, ByteStringUtil.decodeVectorSingle(vbytes));
             break;
           case VECTOR_TYPE_MULTI_FP32:
-            vectors.vector(vectorName, ByteStringUtil.decodeVectorMulti(vbytes));
+            vectors[i++] = Vectors.of(vectorName, ByteStringUtil.decodeVectorMulti(vbytes));
             break;
           default:
             continue;
         }
       }
-      metadataBuilder.vectors(vectors.build());
+      metadataBuilder.vectors(vectors);
       metadata = metadataBuilder.build();
     }
 

src/test/java/io/weaviate/client6/v1/internal/json/JSONTest.java

@@ -210,9 +210,9 @@ public static Object[][] testCases() {
         },
         {
             Vectors.class,
-            Vectors.of(named -> named
-                .vector("1d", new float[] { 1f, 2f })
-                .vector("2d", new float[][] { { 1f, 2f }, { 3f, 4f } })),
+            new Vectors(
+                Vectors.of("1d", new float[] { 1f, 2f }),
+                Vectors.of("2d", new float[][] { { 1f, 2f }, { 3f, 4f } })),
             "{\"1d\": [1.0, 2.0], \"2d\": [[1.0, 2.0], [3.0, 4.0]]}",
             (CustomAssert) JSONTest::compareVectors,
         },