feat: add default tenant to get-shards endpoint

Author: bevzzz

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

@@ -29,23 +29,23 @@ public CollectionHandle(
       GrpcTransport grpcTransport,
       CollectionDescriptor<PropertiesT> collection,
       CollectionHandleDefaults defaults) {
-    this.config = new WeaviateConfigClient(collection, restTransport, grpcTransport);
+    this.config = new WeaviateConfigClient(collection, restTransport, grpcTransport, defaults);
     this.aggregate = new WeaviateAggregateClient(collection, grpcTransport, defaults);
     this.query = new WeaviateQueryClient<>(collection, grpcTransport, defaults);
     this.data = new WeaviateDataClient<>(collection, restTransport, grpcTransport, defaults);
-    this.tenants = new WeaviateTenantsClient(collection, restTransport, grpcTransport);
-
     this.defaults = defaults;
+
+    this.tenants = new WeaviateTenantsClient(collection, restTransport, grpcTransport);
   }
 
   /** Copy constructor that sets new defaults. */
   private CollectionHandle(CollectionHandle<PropertiesT> c, CollectionHandleDefaults defaults) {
-    this.config = c.config;
     this.aggregate = c.aggregate;
     this.tenants = c.tenants;
+
+    this.config = new WeaviateConfigClient(c.config, defaults);
     this.query = new WeaviateQueryClient<>(c.query, defaults);
     this.data = new WeaviateDataClient<>(c.data, defaults);
-
     this.defaults = defaults;
   }
 

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

@@ -32,23 +32,23 @@ public CollectionHandleAsync(
       CollectionDescriptor<PropertiesT> collection,
       CollectionHandleDefaults defaults) {
 
-    this.config = new WeaviateConfigClientAsync(collection, restTransport, grpcTransport);
+    this.config = new WeaviateConfigClientAsync(collection, restTransport, grpcTransport, defaults);
     this.aggregate = new WeaviateAggregateClientAsync(collection, grpcTransport, defaults);
     this.query = new WeaviateQueryClientAsync<>(collection, grpcTransport, defaults);
     this.data = new WeaviateDataClientAsync<>(collection, restTransport, grpcTransport, defaults);
-    this.tenants = new WeaviateTenantsClientAsync(collection, restTransport, grpcTransport);
-
     this.defaults = defaults;
+
+    this.tenants = new WeaviateTenantsClientAsync(collection, restTransport, grpcTransport);
   }
 
   /** Copy constructor that sets new defaults. */
   private CollectionHandleAsync(CollectionHandleAsync<PropertiesT> c, CollectionHandleDefaults defaults) {
-    this.config = c.config;
     this.aggregate = c.aggregate;
     this.tenants = c.tenants;
+
+    this.config = new WeaviateConfigClientAsync(c.config, defaults);
     this.query = new WeaviateQueryClientAsync<>(c.query, defaults);
     this.data = new WeaviateDataClientAsync<>(c.data, defaults);
-
     this.defaults = defaults;
   }
 

src/main/java/io/weaviate/client6/v1/api/collections/config/GetShardsRequest.java

@@ -2,20 +2,29 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import com.google.gson.reflect.TypeToken;
 
+import io.weaviate.client6.v1.api.collections.CollectionHandleDefaults;
 import io.weaviate.client6.v1.internal.json.JSON;
+import io.weaviate.client6.v1.internal.orm.CollectionDescriptor;
 import io.weaviate.client6.v1.internal.rest.Endpoint;
 import io.weaviate.client6.v1.internal.rest.SimpleEndpoint;
 
-public record GetShardsRequest(String collectionName) {
+public record GetShardsRequest() {
 
   @SuppressWarnings("unchecked")
-  public static final Endpoint<GetShardsRequest, List<Shard>> _ENDPOINT = SimpleEndpoint.noBody(
-      request -> "GET",
-      request -> "/schema/" + request.collectionName + "/shards", // TODO: tenant support
-      request -> Collections.emptyMap(),
-      (statusCode, response) -> (List<Shard>) JSON.deserialize(response, TypeToken.getParameterized(
-          List.class, Shard.class)));
+  public static final Endpoint<Void, List<Shard>> endpoint(
+      CollectionDescriptor<?> collection,
+      CollectionHandleDefaults defaults) {
+    return SimpleEndpoint.noBody(
+        request -> "GET",
+        request -> "/schema/" + collection.name() + "/shards",
+        request -> defaults.tenant() != null
+            ? Map.of("tenant", defaults.tenant())
+            : Collections.emptyMap(),
+        (statusCode, response) -> (List<Shard>) JSON.deserialize(response, TypeToken.getParameterized(
+            List.class, Shard.class)));
+  }
 }

src/main/java/io/weaviate/client6/v1/api/collections/config/WeaviateConfigClient.java

@@ -7,6 +7,7 @@
 import java.util.function.Function;
 
 import io.weaviate.client6.v1.api.collections.CollectionConfig;
+import io.weaviate.client6.v1.api.collections.CollectionHandleDefaults;
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.WeaviateCollectionsClient;
 import io.weaviate.client6.v1.internal.ObjectBuilder;
@@ -18,14 +19,27 @@ public class WeaviateConfigClient {
   private final RestTransport restTransport;
   private final WeaviateCollectionsClient collectionsClient;
 
-  protected final CollectionDescriptor<?> collection;
+  private final CollectionDescriptor<?> collection;
+  private final CollectionHandleDefaults defaults;
 
-  public WeaviateConfigClient(CollectionDescriptor<?> collection, RestTransport restTransport,
-      GrpcTransport grpcTransport) {
+  public WeaviateConfigClient(
+      CollectionDescriptor<?> collection,
+      RestTransport restTransport,
+      GrpcTransport grpcTransport,
+      CollectionHandleDefaults defaults) {
     this.restTransport = restTransport;
     this.collectionsClient = new WeaviateCollectionsClient(restTransport, grpcTransport);
 
     this.collection = collection;
+    this.defaults = defaults;
+  }
+
+  /** Copy constructor that updates the {@link #defaults}. */
+  public WeaviateConfigClient(WeaviateConfigClient c, CollectionHandleDefaults defaults) {
+    this.restTransport = c.restTransport;
+    this.collectionsClient = c.collectionsClient;
+    this.collection = c.collection;
+    this.defaults = defaults;
   }
 
   public Optional<CollectionConfig> get() throws IOException {
@@ -49,7 +63,7 @@ public void update(String collectionName,
   }
 
   public List<Shard> getShards() throws IOException {
-    return this.restTransport.performRequest(new GetShardsRequest(collection.name()), GetShardsRequest._ENDPOINT);
+    return this.restTransport.performRequest(null, GetShardsRequest.endpoint(collection, defaults));
   }
 
   public List<Shard> updateShards(ShardStatus status, String... shards) throws IOException {

src/main/java/io/weaviate/client6/v1/api/collections/config/WeaviateConfigClientAsync.java

@@ -8,6 +8,7 @@
 import java.util.function.Function;
 
 import io.weaviate.client6.v1.api.collections.CollectionConfig;
+import io.weaviate.client6.v1.api.collections.CollectionHandleDefaults;
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.WeaviateCollectionsClientAsync;
 import io.weaviate.client6.v1.internal.ObjectBuilder;
@@ -19,22 +20,35 @@ public class WeaviateConfigClientAsync {
   private final RestTransport restTransport;
   private final WeaviateCollectionsClientAsync collectionsClient;
 
-  protected final CollectionDescriptor<?> collectionDescriptor;
+  private final CollectionDescriptor<?> collection;
+  private final CollectionHandleDefaults defaults;
 
-  public WeaviateConfigClientAsync(CollectionDescriptor<?> collection, RestTransport restTransport,
-      GrpcTransport grpcTransport) {
+  public WeaviateConfigClientAsync(
+      CollectionDescriptor<?> collection,
+      RestTransport restTransport,
+      GrpcTransport grpcTransport,
+      CollectionHandleDefaults defaults) {
     this.restTransport = restTransport;
     this.collectionsClient = new WeaviateCollectionsClientAsync(restTransport, grpcTransport);
 
-    this.collectionDescriptor = collection;
+    this.collection = collection;
+    this.defaults = defaults;
+  }
+
+  /** Copy constructor that updates the {@link #defaults}. */
+  public WeaviateConfigClientAsync(WeaviateConfigClientAsync c, CollectionHandleDefaults defaults) {
+    this.restTransport = c.restTransport;
+    this.collectionsClient = c.collectionsClient;
+    this.collection = c.collection;
+    this.defaults = defaults;
   }
 
   public CompletableFuture<Optional<CollectionConfig>> get() throws IOException {
-    return collectionsClient.getConfig(collectionDescriptor.name());
+    return collectionsClient.getConfig(collection.name());
   }
 
   public CompletableFuture<Void> addProperty(Property property) throws IOException {
-    return this.restTransport.performRequestAsync(new AddPropertyRequest(collectionDescriptor.name(), property),
+    return this.restTransport.performRequestAsync(new AddPropertyRequest(collection.name(), property),
         AddPropertyRequest._ENDPOINT);
   }
 
@@ -52,8 +66,7 @@ public CompletableFuture<Void> update(String collectionName,
   }
 
   public CompletableFuture<List<Shard>> getShards() {
-    return this.restTransport.performRequestAsync(new GetShardsRequest(collectionDescriptor.name()),
-        GetShardsRequest._ENDPOINT);
+    return this.restTransport.performRequestAsync(null, GetShardsRequest.endpoint(collection, defaults));
   }
 
   public CompletableFuture<List<Shard>> updateShards(ShardStatus status, String... shards) throws IOException {
@@ -63,7 +76,7 @@ public CompletableFuture<List<Shard>> updateShards(ShardStatus status, String...
   public CompletableFuture<List<Shard>> updateShards(ShardStatus status, List<String> shards) throws IOException {
     var updates = shards.stream().map(
         shard -> this.restTransport.performRequestAsync(
-            new UpdateShardStatusRequest(collectionDescriptor.name(), shard, status),
+            new UpdateShardStatusRequest(collection.name(), shard, status),
             UpdateShardStatusRequest._ENDPOINT))
         .toArray(CompletableFuture[]::new);
     return CompletableFuture.allOf(updates).thenCompose(__ -> getShards());

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

@@ -25,14 +25,14 @@ public class WeaviateDataClient<PropertiesT> {
   private final CollectionHandleDefaults defaults;
 
   public WeaviateDataClient(
-      CollectionDescriptor<PropertiesT> collectionDescriptor,
+      CollectionDescriptor<PropertiesT> collection,
       RestTransport restTransport,
       GrpcTransport grpcTransport,
       CollectionHandleDefaults defaults) {
     this.restTransport = restTransport;
     this.grpcTransport = grpcTransport;
-    this.collection = collectionDescriptor;
-    this.query = new WeaviateQueryClient<>(collectionDescriptor, grpcTransport, defaults);
+    this.collection = collection;
+    this.query = new WeaviateQueryClient<>(collection, grpcTransport, defaults);
     this.defaults = defaults;
   }