refactor: use dedicated WriteWeaviateObject in .data operations

Author: bevzzz

src/it/java/io/weaviate/integration/DataITest.java

@@ -99,7 +99,7 @@ public void testBlobData() throws IOException {
         "breed", "ragdoll",
         "img", ragdollPng));
 
-    var got = cats.query.byId(ragdoll.metadata().uuid(),
+    var got = cats.query.byId(ragdoll.uuid(),
         cat -> cat.returnProperties("img"));
 
     Assertions.assertThat(got).get()
@@ -140,12 +140,12 @@ public void testReferences_AddReplaceDelete() throws IOException {
 
     // Act: add reference
     persons.data.referenceAdd(
-        john.metadata().uuid(),
+        john.uuid(),
         "hasFriend",
         Reference.object(albie));
 
     // Assert
-    var johnWithFriends = persons.query.byId(john.metadata().uuid(),
+    var johnWithFriends = persons.query.byId(john.uuid(),
         query -> query.returnReferences(
             QueryReference.single("hasFriend",
                 friend -> friend.returnProperties("name"))));
@@ -161,11 +161,11 @@ public void testReferences_AddReplaceDelete() throws IOException {
     // Act: replace reference
     var barbara = persons.data.insert(Map.of("name", "barbara"));
     persons.data.referenceReplace(
-        john.metadata().uuid(),
+        john.uuid(),
         "hasFriend",
         Reference.object(barbara));
 
-    johnWithFriends = persons.query.byId(john.metadata().uuid(),
+    johnWithFriends = persons.query.byId(john.uuid(),
         query -> query.returnReferences(
             QueryReference.single("hasFriend",
                 friend -> friend.returnProperties("name"))));
@@ -180,12 +180,12 @@ public void testReferences_AddReplaceDelete() throws IOException {
 
     // Act: delete reference
     persons.data.referenceDelete(
-        john.metadata().uuid(),
+        john.uuid(),
         "hasFriend",
         Reference.object(barbara));
 
     // Assert
-    johnWithFriends = persons.query.byId(john.metadata().uuid(),
+    johnWithFriends = persons.query.byId(john.uuid(),
         query -> query.returnReferences(
             QueryReference.single("hasFriend")));
 
@@ -210,11 +210,11 @@ public void testReplace() throws IOException {
     var ivanhoe = books.data.insert(Map.of("title", "ivanhoe"));
 
     // Act
-    books.data.replace(ivanhoe.metadata().uuid(),
+    books.data.replace(ivanhoe.uuid(),
         replace -> replace.properties(Map.of("year", 1819)));
 
     // Assert
-    var replacedIvanhoe = books.query.byId(ivanhoe.metadata().uuid());
+    var replacedIvanhoe = books.query.byId(ivanhoe.uuid());
 
     Assertions.assertThat(replacedIvanhoe).get()
         .as("has ONLY year property")
@@ -251,15 +251,15 @@ public void testUpdate() throws IOException {
     var ivanhoe = books.data.insert(Map.of("title", "ivanhoe"));
 
     // Act
-    books.data.update(ivanhoe.metadata().uuid(),
+    books.data.update(ivanhoe.uuid(),
         update -> update
             .properties(Map.of("year", 1819))
             .reference("writtenBy", Reference.objects(walter))
             .vectors(Vectors.of(vector)));
 
     // Assert
     var updIvanhoe = books.query.byId(
-        ivanhoe.metadata().uuid(),
+        ivanhoe.uuid(),
         query -> query
             .includeVector()
             .returnReferences(QueryReference.single("writtenBy")));
@@ -298,8 +298,8 @@ public void testDeleteMany() throws IOException {
 
     var things = client.collections.use(nsThings);
     things.data.insert(Map.of("last_used", 1));
-    var delete_1 = things.data.insert(Map.of("last_used", 5)).metadata().uuid();
-    var delete_2 = things.data.insert(Map.of("last_used", 9)).metadata().uuid();
+    var delete_1 = things.data.insert(Map.of("last_used", 5)).uuid();
+    var delete_2 = things.data.insert(Map.of("last_used", 9)).uuid();
 
     // Act (dry run)
     things.data.deleteMany(
@@ -387,7 +387,7 @@ public void testReferenceAddMany() throws IOException {
     // Assert
     Assertions.assertThat(response.errors()).isEmpty();
 
-    var goodburgAirports = cities.query.byId(goodburg.metadata().uuid(),
+    var goodburgAirports = cities.query.byId(goodburg.uuid(),
         city -> city.returnReferences(
             QueryReference.single("hasAirports")));
 

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

@@ -11,7 +11,7 @@ public record ObjectMetadata(
     @SerializedName("id") String uuid,
     @SerializedName("vectors") Vectors vectors,
     @SerializedName("creationTimeUnix") Long createdAt,
-    @SerializedName("lastUpdateTImeUnix") Long lastUpdatedAt) implements WeaviateMetadata {
+    @SerializedName("lastUpdateTimeUnix") Long lastUpdatedAt) implements WeaviateMetadata {
 
   public ObjectMetadata(Builder builder) {
     this(builder.uuid, builder.vectors, null, null);

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

@@ -81,6 +81,20 @@ public Vectors(Vectors... vectors) {
     this.vectorsMap = namedVectors;
   }
 
+  /**
+   * Add more vector objects.
+   *
+   * @param vectors Vector objects.
+   * @return A new {@code Vectors} object containing all vectors.
+   */
+  public Vectors withVectors(Vectors... vectors) {
+    var combined = new HashMap<>(vectorsMap);
+    for (var v : vectors) {
+      combined.putAll(v.vectorsMap);
+    }
+    return new Vectors(combined);
+  }
+
   /**
    * Check if a vector exists in the query result.
    *
@@ -90,6 +104,11 @@ public boolean contains(String name) {
     return vectorsMap.containsKey(name);
   }
 
+  /** Returns the number of vectors contained. */
+  public int size() {
+    return vectorsMap.size();
+  }
+
   /**
    * Get 1-dimensional vector by name.
    *

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

@@ -7,24 +7,24 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 
-import io.weaviate.client6.v1.api.collections.WeaviateObject;
+import io.weaviate.client6.v1.api.collections.IWeaviateObject;
 
 public record BatchReference(String fromCollection, String fromProperty, String fromUuid, Reference reference) {
 
-  public static BatchReference[] objects(WeaviateObject<?, ?, ?> fromObject, String fromProperty,
-      WeaviateObject<?, ?, ?>... toObjects) {
+  public static BatchReference[] objects(IWeaviateObject fromObject, String fromProperty,
+      IWeaviateObject... toObjects) {
     return Arrays.stream(toObjects)
         .map(to -> new BatchReference(
-            fromObject.collection(), fromProperty, fromObject.metadata().uuid(),
+            fromObject.collection(), fromProperty, fromObject.uuid(),
             Reference.object(to)))
         .toArray(BatchReference[]::new);
   }
 
-  public static BatchReference[] uuids(WeaviateObject<?, ?, ?> fromObject, String fromProperty,
+  public static BatchReference[] uuids(IWeaviateObject fromObject, String fromProperty,
       String... toUuids) {
     return Arrays.stream(toUuids)
         .map(to -> new BatchReference(
-            fromObject.collection(), fromProperty, fromObject.metadata().uuid(),
+            fromObject.collection(), fromProperty, fromObject.uuid(),
             Reference.uuids(to)))
         .toArray(BatchReference[]::new);
   }

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

@@ -9,9 +9,7 @@
 
 import io.weaviate.client6.v1.api.collections.CollectionHandleDefaults;
 import io.weaviate.client6.v1.api.collections.GeoCoordinates;
-import io.weaviate.client6.v1.api.collections.ObjectMetadata;
 import io.weaviate.client6.v1.api.collections.PhoneNumber;
-import io.weaviate.client6.v1.api.collections.WeaviateObject;
 import io.weaviate.client6.v1.internal.MapUtil;
 import io.weaviate.client6.v1.internal.grpc.ByteStringUtil;
 import io.weaviate.client6.v1.internal.grpc.Rpc;
@@ -22,25 +20,25 @@
 import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateProtoBatch;
 import io.weaviate.client6.v1.internal.orm.CollectionDescriptor;
 
-public record InsertManyRequest<T>(List<WeaviateObject<T, Reference, ObjectMetadata>> objects) {
+public record InsertManyRequest<PropertiesT>(List<WriteWeaviateObject<PropertiesT>> objects) {
 
   @SafeVarargs
-  public InsertManyRequest(WeaviateObject<T, Reference, ObjectMetadata>... objects) {
+  public InsertManyRequest(WriteWeaviateObject<PropertiesT>... objects) {
     this(Arrays.asList(objects));
   }
 
+  @SuppressWarnings("unchecked")
   @SafeVarargs
-  public static final <T> InsertManyRequest<T> of(T... properties) {
+  public static final <PropertiesT> InsertManyRequest<PropertiesT> of(PropertiesT... properties) {
     var objects = Arrays.stream(properties)
-        .map(p -> WeaviateObject.<T, Reference, ObjectMetadata>of(
-            obj -> obj.properties(p).metadata(ObjectMetadata.of())))
+        .map(p -> (WriteWeaviateObject<PropertiesT>) WriteWeaviateObject.of(obj -> obj.properties(p)))
         .toList();
-    return new InsertManyRequest<T>(objects);
+    return new InsertManyRequest<>(objects);
   }
 
-  public static <T> Rpc<InsertManyRequest<T>, WeaviateProtoBatch.BatchObjectsRequest, InsertManyResponse, WeaviateProtoBatch.BatchObjectsReply> rpc(
-      List<WeaviateObject<T, Reference, ObjectMetadata>> insertObjects,
-      CollectionDescriptor<T> collection,
+  public static <PropertiesT> Rpc<InsertManyRequest<PropertiesT>, WeaviateProtoBatch.BatchObjectsRequest, InsertManyResponse, WeaviateProtoBatch.BatchObjectsReply> rpc(
+      List<WriteWeaviateObject<PropertiesT>> insertObjects,
+      CollectionDescriptor<PropertiesT> collection,
       CollectionHandleDefaults defaults) {
     return Rpc.insert(
         request -> {
@@ -75,8 +73,8 @@ public static <T> Rpc<InsertManyRequest<T>, WeaviateProtoBatch.BatchObjectsReque
           while (iter.hasNext()) {
             var idx = iter.nextIndex();
             var next = iter.next();
-            var uuid = next.metadata() != null ? next.metadata().uuid() : null;
 
+            var uuid = next.uuid();
             if (failed.containsKey(idx)) {
               var err = failed.get(idx);
               errors.add(err);
@@ -94,72 +92,62 @@ public static <T> Rpc<InsertManyRequest<T>, WeaviateProtoBatch.BatchObjectsReque
   }
 
   public static <T> void buildObject(WeaviateProtoBatch.BatchObject.Builder object,
-      WeaviateObject<T, Reference, ObjectMetadata> insert,
+      WriteWeaviateObject<T> insert,
       CollectionDescriptor<T> collection,
       CollectionHandleDefaults defaults) {
     object.setCollection(collection.collectionName());
 
-    var metadata = insert.metadata();
-    if (metadata != null) {
-      object.setUuid(metadata.uuid());
-
-      if (metadata.vectors() != null) {
-        var vectors = metadata.vectors().asMap()
-            .entrySet().stream().map(entry -> {
-              var value = entry.getValue();
-              var vector = WeaviateProtoBase.Vectors.newBuilder()
-                  .setName(entry.getKey());
-
-              if (value instanceof float[] single) {
-                vector.setType(VectorType.VECTOR_TYPE_SINGLE_FP32);
-                vector.setVectorBytes(ByteStringUtil.encodeVectorSingle(single));
-              } else if (value instanceof float[][] multi) {
-                vector.setVectorBytes(ByteStringUtil.encodeVectorMulti(multi));
-                vector.setType(VectorType.VECTOR_TYPE_MULTI_FP32);
-              }
-
-              return vector.build();
-            }).toList();
-        object.addAllVectors(vectors);
-      }
-      if (defaults.tenant() != null) {
-        object.setTenant(defaults.tenant());
-      }
+    object.setUuid(insert.uuid());
+
+    if (insert.vectors() != null) {
+      var vectors = insert.vectors().asMap()
+          .entrySet().stream().map(entry -> {
+            var value = entry.getValue();
+            var vector = WeaviateProtoBase.Vectors.newBuilder()
+                .setName(entry.getKey());
+
+            if (value instanceof float[] single) {
+              vector.setType(VectorType.VECTOR_TYPE_SINGLE_FP32);
+              vector.setVectorBytes(ByteStringUtil.encodeVectorSingle(single));
+            } else if (value instanceof float[][] multi) {
+              vector.setVectorBytes(ByteStringUtil.encodeVectorMulti(multi));
+              vector.setType(VectorType.VECTOR_TYPE_MULTI_FP32);
+            }
+
+            return vector.build();
+          }).toList();
+      object.addAllVectors(vectors);
+    }
+    if (defaults.tenant() != null) {
+      object.setTenant(defaults.tenant());
     }
 
     var singleRef = new ArrayList<WeaviateProtoBatch.BatchObject.SingleTargetRefProps>();
     var multiRef = new ArrayList<WeaviateProtoBatch.BatchObject.MultiTargetRefProps>();
 
-    insert.references()
-        .entrySet().stream().forEach(entry -> {
-          var references = entry.getValue();
-
-          // dyma: How are we supposed to know if the reference
-          // is single- or multi-target?
-          for (var ref : references) {
-            if (ref.collection() == null) {
-              singleRef.add(
-                  WeaviateProtoBatch.BatchObject.SingleTargetRefProps.newBuilder()
-                      .addAllUuids(ref.uuids())
-                      .setPropName(entry.getKey())
-                      .build());
-            } else {
-              multiRef.add(
-                  WeaviateProtoBatch.BatchObject.MultiTargetRefProps.newBuilder()
-                      .setTargetCollection(ref.collection())
-                      .addAllUuids(ref.uuids())
-                      .setPropName(entry.getKey())
-                      .build());
-            }
-          }
-        });
+    insert.references().entrySet().stream().forEach(entry -> {
+      var references = entry.getValue();
+
+      // dyma: How are we supposed to know if the reference
+      // is single- or multi-target?
+      for (var ref : references) {
+        if (ref.collection() == null) {
+          singleRef.add(WeaviateProtoBatch.BatchObject.SingleTargetRefProps.newBuilder().addAllUuids(ref.uuids())
+              .setPropName(entry.getKey()).build());
+        } else {
+          multiRef.add(WeaviateProtoBatch.BatchObject.MultiTargetRefProps.newBuilder()
+              .setTargetCollection(ref.collection()).addAllUuids(ref.uuids()).setPropName(entry.getKey()).build());
+        }
+      }
+    });
 
     var properties = WeaviateProtoBatch.BatchObject.Properties.newBuilder()
         .addAllSingleTargetRefProps(singleRef)
         .addAllMultiTargetRefProps(multiRef);
 
     if (insert.properties() != null) {
-      var nonRef = marshalStruct(collection.propertiesReader(insert.properties()).readProperties());
+      var nonRef = marshalStruct(collection.propertiesReader(insert.properties())
+          .readProperties());
       properties.setNonRefProperties(nonRef);
     }
     object.setProperties(properties);