fix: adjust as per failing tests

Author: bevzzz

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

@@ -97,7 +97,9 @@ public static <T> void buildObject(WeaviateProtoBatch.BatchObject.Builder object
       CollectionHandleDefaults defaults) {
     object.setCollection(collection.collectionName());
 
-    object.setUuid(insert.uuid());
+    if (insert.uuid() != null) {
+      object.setUuid(insert.uuid());
+    }
 
     if (insert.vectors() != null) {
       var vectors = insert.vectors().asMap()
@@ -125,21 +127,23 @@ public static <T> void buildObject(WeaviateProtoBatch.BatchObject.Builder object
     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());
+    if (insert.references() != null) {
+      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)

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

@@ -32,7 +32,7 @@ public static final <PropertiesT> Endpoint<InsertObjectRequest<PropertiesT>, Wri
         request -> JSON.serialize(
             new WriteWeaviateObject<>(
                 request.object.uuid(),
-                request.object.collection(),
+                collection.collectionName(),
                 defaults.tenant(),
                 request.object.properties(),
                 request.object.vectors(),

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

@@ -6,6 +6,7 @@
 
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
 import io.weaviate.client6.v1.api.collections.WeaviateObject;
@@ -80,6 +81,12 @@ public Reference read(JsonReader in) throws IOException {
       in.beginObject();
       in.nextName(); // expect "beacon"?
       var beacon = in.nextString();
+
+      // Skip to the end of the object. There's going to be the "href"
+      // key too, which is irrelevant for us.
+      while (in.peek() != JsonToken.END_OBJECT) {
+        in.skipValue();
+      }
       in.endObject();
 
       beacon = beacon.replaceFirst("weaviate://localhost/", "");

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

@@ -17,6 +17,5 @@ public static final Endpoint<ReferenceAddRequest, Void> endpoint(
             + request.fromProperty,
         request -> defaults.queryParameters(),
         request -> JSON.serialize(request.reference));
-
   }
 }

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

@@ -3,8 +3,10 @@
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.function.Function;
 
 import com.google.gson.Gson;
@@ -19,8 +21,8 @@
 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.Vectors;
+import io.weaviate.client6.v1.api.collections.WeaviateObject;
 import io.weaviate.client6.v1.internal.ObjectBuilder;
 
 public record WriteWeaviateObject<PropertiesT>(
@@ -52,12 +54,18 @@ public WriteWeaviateObject(Builder<PropertiesT> builder) {
   }
 
   public static class Builder<PropertiesT> implements ObjectBuilder<WriteWeaviateObject<PropertiesT>> {
-    private String uuid;
+    /**
+     * The server <i>should be</i> providing default UUIDs, but it does not do that
+     * during batch inserts and we have to provide our own.
+     * Rather than make this behaviour special to {@code insertMany}, we are going
+     * to provide a fallback UUID "globally".
+     */
+    private String uuid = UUID.randomUUID().toString();
     private String collection;
     private String tenant;
     private PropertiesT properties;
     private Vectors vectors;
-    private Map<String, List<Reference>> references;
+    private Map<String, List<Reference>> references = new HashMap<>();
 
     public Builder<PropertiesT> uuid(String uuid) {
       this.uuid = uuid;
@@ -122,28 +130,28 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
       var rawType = typeToken.getRawType();
       if (rawType != WriteWeaviateObject.class ||
           !(type instanceof ParameterizedType parameterized)
-          || parameterized.getActualTypeArguments().length < 1) {
+          || parameterized.getActualTypeArguments().length != 1) {
         return null;
       }
 
       var typeParams = parameterized.getActualTypeArguments();
       final var propertiesType = typeParams[0];
 
-      final TypeAdapter<WriteWeaviateObject<?>> delegate = (TypeAdapter<WriteWeaviateObject<?>>) gson
+      final var delegate = (TypeAdapter<WriteWeaviateObject<?>>) gson
           .getDelegateAdapter(this, typeToken);
-      final var propertiesAdapter = gson.getAdapter(TypeToken.get(propertiesType));
+      final var propertiesAdapter = (TypeAdapter<Object>) gson.getAdapter(TypeToken.get(propertiesType));
       final var referencesAdapter = gson.getAdapter(Reference.class);
 
       return (TypeAdapter<T>) new TypeAdapter<WriteWeaviateObject<?>>() {
 
         @Override
         public void write(JsonWriter out, WriteWeaviateObject<?> value) throws IOException {
           var json = delegate.toJsonTree(value).getAsJsonObject();
-          var properties = ((TypeAdapter<Object>) propertiesAdapter)
-              .toJsonTree(value.properties())
-              .getAsJsonObject();
+          var properties = value.properties() != null
+              ? propertiesAdapter.toJsonTree(value.properties()).getAsJsonObject()
+              : new JsonObject();
 
-          if (!value.references().isEmpty()) {
+          if (value.references() != null && !value.references().isEmpty()) {
             for (var refEntry : value.references().entrySet()) {
               var beacons = new JsonArray();
               for (var reference : refEntry.getValue()) {
@@ -154,7 +162,7 @@ public void write(JsonWriter out, WriteWeaviateObject<?> value) throws IOExcepti
             }
           }
 
-          json.add("properties", json);
+          json.add("properties", properties);
           json.remove("references");
           Streams.write(json, out);
         }
@@ -185,6 +193,7 @@ public WriteWeaviateObject<?> read(JsonReader in) throws IOException {
           }
 
           json.add("references", objectReferences);
+          json.add("properties", objectProperties);
           return delegate.fromJsonTree(json);
         }
       }.nullSafe();