fix: correct usage of Optional tenant

Author: bevzzz

src/it/java/io/weaviate/containers/Weaviate.java

@@ -42,7 +42,7 @@ public enum Version {
     V133(1, 33, 11),
     V134(1, 34, 7),
     V135(1, 35, 2),
-    V136(1, 36, "0-rc.0");
+    V136(1, 36, 0);
 
     public final SemanticVersion semver;
 
@@ -300,6 +300,8 @@ public Weaviate build() {
         c.withEnv("ENABLE_MODULES", String.join(",", enableModules));
       }
 
+      c.withEnv("OBJECTS_TTL_DELETE_SCHEDULE", "0 */6 * * *");
+
       var apiKeyUsers = new HashSet<String>();
       apiKeyUsers.addAll(adminUsers);
       apiKeyUsers.addAll(viewerUsers);

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

@@ -34,7 +34,7 @@ public static final <PropertiesT> Endpoint<InsertObjectRequest<PropertiesT>, Wea
             new WeaviateObject<>(
                 request.object.uuid(),
                 collection.collectionName(),
-                defaults.tenant().get(),
+                defaults.tenant().orElse(null),
                 request.object.properties(),
                 request.object.vectors(),
                 request.object.createdAt(),

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

@@ -33,7 +33,7 @@ static final <PropertiesT> Endpoint<ReplaceObjectRequest<PropertiesT>, Void> end
             new WeaviateObject<>(
                 request.object.uuid(),
                 collection.collectionName(),
-                defaults.tenant().get(),
+                defaults.tenant().orElse(null),
                 request.object.properties(),
                 request.object.vectors(),
                 request.object.createdAt(),

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

@@ -33,7 +33,7 @@ static final <PropertiesT> Endpoint<UpdateObjectRequest<PropertiesT>, Void> endp
             new WeaviateObject<>(
                 request.object.uuid(),
                 collection.collectionName(),
-                defaults.tenant().get(),
+                defaults.tenant().orElse(null),
                 request.object.properties(),
                 request.object.vectors(),
                 request.object.createdAt(),

src/test/java/io/weaviate/client6/v1/api/collections/CollectionHandleDefaultsTest.java

@@ -7,25 +7,32 @@
 
 import io.weaviate.client6.v1.api.collections.query.ConsistencyLevel;
 import io.weaviate.client6.v1.internal.ObjectBuilder;
+import io.weaviate.client6.v1.internal.grpc.GrpcTransport;
 import io.weaviate.client6.v1.internal.orm.CollectionDescriptor;
+import io.weaviate.client6.v1.internal.rest.RestTransport;
+import io.weaviate.testutil.transport.MockGrpcTransport;
+import io.weaviate.testutil.transport.MockRestTransport;
 
 public class CollectionHandleDefaultsTest {
   private static final CollectionDescriptor<Map<String, Object>> DESCRIPTOR = CollectionDescriptor.ofMap("Things");
   private static final CollectionHandleDefaults NONE_DEFAULTS = CollectionHandleDefaults.of(ObjectBuilder.identity());
 
+  private static final RestTransport REST = new MockRestTransport();
+  private static final GrpcTransport GRPC = new MockGrpcTransport();
+
   /** CollectionHandle with no defaults. */
   private static final CollectionHandle<Map<String, Object>> HANDLE_NONE = new CollectionHandle<>(
-      null, null, DESCRIPTOR, NONE_DEFAULTS);
+      REST, GRPC, DESCRIPTOR, NONE_DEFAULTS);
 
   /** CollectionHandleAsync with no defaults. */
   private static final CollectionHandleAsync<Map<String, Object>> HANDLE_NONE_ASYNC = new CollectionHandleAsync<>(
-      null, null, DESCRIPTOR, NONE_DEFAULTS);
+      REST, GRPC, DESCRIPTOR, NONE_DEFAULTS);
 
   /** All defaults are {@code null} if none were set. */
   @Test
   public void test_defaults() {
     Assertions.assertThat(HANDLE_NONE.consistencyLevel()).as("default ConsistencyLevel").isEmpty();
-    Assertions.assertThat(HANDLE_NONE.tenant()).as("default tenant").isNull();
+    Assertions.assertThat(HANDLE_NONE.tenant()).as("default tenant").isEmpty();
   }
 
   /**
@@ -57,7 +64,7 @@ public void test_withConsistencyLevel_async() {
   @Test
   public void test_withTenant() {
     var handle = HANDLE_NONE.withTenant("john_doe");
-    Assertions.assertThat(handle.tenant()).isEqualTo("john_doe");
+    Assertions.assertThat(handle.tenant()).get().isEqualTo("john_doe");
     Assertions.assertThat(HANDLE_NONE.consistencyLevel()).isEmpty();
   }
 
@@ -68,7 +75,7 @@ public void test_withTenant() {
   @Test
   public void test_withTenant_async() {
     var handle = HANDLE_NONE_ASYNC.withTenant("john_doe");
-    Assertions.assertThat(handle.tenant()).isEqualTo("john_doe");
+    Assertions.assertThat(handle.tenant()).get().isEqualTo("john_doe");
     Assertions.assertThat(HANDLE_NONE_ASYNC.consistencyLevel()).isEmpty();
   }
 }