test: get tenant from inserted object

Author: bevzzz

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

@@ -23,12 +23,14 @@
 import io.weaviate.client6.v1.api.collections.data.BatchReference;
 import io.weaviate.client6.v1.api.collections.data.DeleteManyResponse;
 import io.weaviate.client6.v1.api.collections.data.Reference;
+import io.weaviate.client6.v1.api.collections.data.WriteWeaviateObject;
+import io.weaviate.client6.v1.api.collections.query.Filter;
 import io.weaviate.client6.v1.api.collections.query.Metadata;
 import io.weaviate.client6.v1.api.collections.query.Metadata.MetadataField;
 import io.weaviate.client6.v1.api.collections.query.QueryMetadata;
 import io.weaviate.client6.v1.api.collections.query.QueryReference;
 import io.weaviate.client6.v1.api.collections.query.ReadWeaviateObject;
-import io.weaviate.client6.v1.api.collections.query.Filter;
+import io.weaviate.client6.v1.api.collections.tenants.Tenant;
 import io.weaviate.containers.Container;
 
 public class DataITest extends ConcurrentTest {
@@ -86,6 +88,7 @@ public void testCreateGetDelete() throws IOException {
         .as("object not exists after deletion").isFalse();
 
     deleted = artists.data.deleteById(id);
+
     // TODO: Change to isFalse() after fixed in Weaviate server
     Assertions.assertThat(deleted)
         .as("object wasn't deleted").isTrue();
@@ -536,4 +539,22 @@ public void testNestedProperties_insertMany() throws IOException {
     // Assert
     Assertions.assertThat(result.errors()).isEmpty();
   }
+
+  @Test
+  public void test_multiTenant() throws IOException {
+    // Arrange
+    var nsEmails = ns("Emails");
+    var emails = client.collections.create(nsEmails,
+        c -> c.multiTenancy(mt -> mt.enabled(true)));
+
+    var johndoe = "john-doe";
+    emails.tenants.create(Tenant.active(johndoe));
+    emails = emails.withTenant(johndoe);
+
+    // Act
+    var inserted = emails.data.insert(Map.of("subject", "McDonald's Xmas Bonanza"));
+
+    // Assert
+    Assertions.assertThat(inserted).returns(johndoe, WriteWeaviateObject::tenant);
+  }
 }

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

@@ -33,7 +33,7 @@ public record CollectionConfig(
     List<ReferenceProperty> references,
     /** Vector indexes configured for this collection. */
     @SerializedName("vectorConfig") Map<String, VectorConfig> vectors,
-    /** Multi-tenantcy options. */
+    /** Multi-tenancy options. */
     @SerializedName("multiTenancyConfig") MultiTenancy multiTenancy,
     /** Sharding configuration. */
     @SerializedName("shardingConfig") Sharding sharding,
@@ -193,14 +193,13 @@ public Builder sharding(Function<Sharding.Builder, ObjectBuilder<Sharding>> fn)
     }
 
     /** Configure multi-tenancy. */
-    public Builder multiTenancy(MultiTenancy multiTenancy) {
-      this.multiTenancy = multiTenancy;
-      return this;
+    public Builder multiTenancy(Function<MultiTenancy.Builder, ObjectBuilder<MultiTenancy>> fn) {
+      return multiTenancy(MultiTenancy.of(fn));
     }
 
     /** Configure multi-tenancy. */
-    public Builder multiTenancy(Function<MultiTenancy.Builder, ObjectBuilder<MultiTenancy>> fn) {
-      this.multiTenancy = MultiTenancy.of(fn);
+    public Builder multiTenancy(MultiTenancy multiTenancy) {
+      this.multiTenancy = multiTenancy;
       return this;
     }