adds support for getting and deleting tenants

Author: aliszka

src/main/java/io/weaviate/client/v1/schema/Schema.java

@@ -12,7 +12,9 @@
 import io.weaviate.client.v1.schema.api.ShardUpdater;
 import io.weaviate.client.v1.schema.api.ShardsGetter;
 import io.weaviate.client.v1.schema.api.ShardsUpdater;
-import io.weaviate.client.v1.schema.api.TenantCreator;
+import io.weaviate.client.v1.schema.api.TenantsCreator;
+import io.weaviate.client.v1.schema.api.TenantsDeleter;
+import io.weaviate.client.v1.schema.api.TenantsGetter;
 
 public class Schema {
   private final Config config;
@@ -63,7 +65,15 @@ public ShardsUpdater shardsUpdater() {
     return new ShardsUpdater(httpClient, config);
   }
 
-  public TenantCreator tenantCreator() {
-    return new TenantCreator(httpClient, config);
+  public TenantsCreator tenantsCreator() {
+    return new TenantsCreator(httpClient, config);
+  }
+
+  public TenantsDeleter tenantsDeleter() {
+    return new TenantsDeleter(httpClient, config);
+  }
+
+  public TenantsGetter tenantsGetter() {
+    return new TenantsGetter(httpClient, config);
   }
 }

src/main/java/io/weaviate/client/v1/schema/api/TenantCreator.java renamed to src/main/java/io/weaviate/client/v1/schema/api/TenantsCreator.java

@@ -6,44 +6,33 @@
 import io.weaviate.client.base.Response;
 import io.weaviate.client.base.Result;
 import io.weaviate.client.base.http.HttpClient;
+import io.weaviate.client.base.util.UrlEncoder;
 import io.weaviate.client.v1.schema.model.Tenant;
 import org.apache.http.HttpStatus;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-
-public class TenantCreator extends BaseClient<Tenant[]> implements ClientResult<Boolean> {
+public class TenantsCreator extends BaseClient<Tenant[]> implements ClientResult<Boolean> {
 
   private String className;
   private Tenant[] tenants;
 
-  public TenantCreator(HttpClient httpClient, Config config) {
+  public TenantsCreator(HttpClient httpClient, Config config) {
     super(httpClient, config);
   }
 
-  public TenantCreator withClassName(String className) {
+  public TenantsCreator withClassName(String className) {
     this.className = className;
     return this;
   }
 
-  public TenantCreator withTenants(Tenant... tenants) {
+  public TenantsCreator withTenants(Tenant... tenants) {
     this.tenants = tenants;
     return this;
   }
 
   @Override
   public Result<Boolean> run() {
-    String path = String.format("/schema/%s/tenants", encode(className));
+    String path = String.format("/schema/%s/tenants", UrlEncoder.encodePathParam(className));
     Response<Tenant[]> resp = sendPostRequest(path, tenants, Tenant[].class);
     return new Result<>(resp.getStatusCode(), resp.getStatusCode() == HttpStatus.SC_OK, resp.getErrors());
   }
-
-  private String encode(String value) {
-    try {
-      return URLEncoder.encode(value, StandardCharsets.UTF_8.toString());
-    } catch (UnsupportedEncodingException e) {
-      return null;
-    }
-  }
 }

src/main/java/io/weaviate/client/v1/schema/api/TenantsDeleter.java

@@ -0,0 +1,37 @@
+package io.weaviate.client.v1.schema.api;
+
+import io.weaviate.client.Config;
+import io.weaviate.client.base.BaseClient;
+import io.weaviate.client.base.ClientResult;
+import io.weaviate.client.base.Response;
+import io.weaviate.client.base.Result;
+import io.weaviate.client.base.http.HttpClient;
+import io.weaviate.client.base.util.UrlEncoder;
+import org.apache.http.HttpStatus;
+
+public class TenantsDeleter extends BaseClient<Object> implements ClientResult<Boolean> {
+
+  private String className;
+  private String[] tenants;
+
+  public TenantsDeleter(HttpClient httpClient, Config config) {
+    super(httpClient, config);
+  }
+
+  public TenantsDeleter withClassName(String className) {
+    this.className = className;
+    return this;
+  }
+
+  public TenantsDeleter withTenants(String... tenants) {
+    this.tenants = tenants;
+    return this;
+  }
+
+  @Override
+  public Result<Boolean> run() {
+    String path = String.format("/schema/%s/tenants", UrlEncoder.encodePathParam(className));
+    Response<Object> resp = sendDeleteRequest(path, tenants, Object.class);
+    return new Result<>(resp.getStatusCode(), resp.getStatusCode() == HttpStatus.SC_OK, resp.getErrors());
+  }
+}

src/main/java/io/weaviate/client/v1/schema/api/TenantsGetter.java

@@ -0,0 +1,39 @@
+package io.weaviate.client.v1.schema.api;
+
+import io.weaviate.client.Config;
+import io.weaviate.client.base.BaseClient;
+import io.weaviate.client.base.ClientResult;
+import io.weaviate.client.base.Response;
+import io.weaviate.client.base.Result;
+import io.weaviate.client.base.http.HttpClient;
+import io.weaviate.client.base.util.UrlEncoder;
+import io.weaviate.client.v1.schema.model.Tenant;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+public class TenantsGetter extends BaseClient<Tenant[]> implements ClientResult<List<Tenant>> {
+
+  private String className;
+
+  public TenantsGetter(HttpClient httpClient, Config config) {
+    super(httpClient, config);
+  }
+
+  public TenantsGetter withClassName(String className) {
+    this.className = className;
+    return this;
+  }
+
+  @Override
+  public Result<List<Tenant>> run() {
+    String path = String.format("/schema/%s/tenants", UrlEncoder.encodePathParam(className));
+    Response<Tenant[]> resp = sendGetRequest(path, Tenant[].class);
+
+    List<Tenant> tenants = Optional.ofNullable(resp.getBody())
+      .map(Arrays::asList)
+      .orElse(null);
+    return new Result<>(resp.getStatusCode(), tenants, resp.getErrors());
+  }
+}

src/test/java/io/weaviate/integration/client/WeaviateTestGenerics.java

@@ -386,7 +386,7 @@ private void createTenants(WeaviateClient client, String className, String[] ten
       .map(tenant -> Tenant.builder().name(tenant).build())
       .toArray(Tenant[]::new);
 
-    Result<Boolean> createStatus = client.schema().tenantCreator()
+    Result<Boolean> createStatus = client.schema().tenantsCreator()
       .withClassName(className)
       .withTenants(t)
       .run();