Merge pull request #218 from weaviate/multi_tenancy_support_p3

Multi tenancy support (part 3)

Author: antas-marcin

src/main/java/io/weaviate/client/v1/batch/api/ObjectsBatchDeleter.java

@@ -18,7 +18,7 @@ public class ObjectsBatchDeleter extends BaseClient<BatchDeleteResponse> impleme
   private final ObjectsPath objectsPath;
   private String className;
   private String consistencyLevel;
-  private String tenantKey;
+  private String tenant;
   private WhereFilter where;
   private String output;
   private Boolean dryRun;
@@ -40,8 +40,8 @@ public ObjectsBatchDeleter withConsistencyLevel(String consistencyLevel) {
     return this;
   }
 
-  public ObjectsBatchDeleter withTenantKey(String tenantKey) {
-    this.tenantKey = tenantKey;
+  public ObjectsBatchDeleter withTenant(String tenant) {
+    this.tenant = tenant;
     return this;
   }
 
@@ -74,7 +74,7 @@ public Result<BatchDeleteResponse> run() {
       .build();
     String path = objectsPath.buildDelete(ObjectsPath.Params.builder()
       .consistencyLevel(consistencyLevel)
-      .tenantKey(tenantKey)
+      .tenant(tenant)
       .build());
     Response<BatchDeleteResponse> resp = sendDeleteRequest(path, batchDelete, BatchDeleteResponse.class);
     return new Result<>(resp);

src/main/java/io/weaviate/client/v1/batch/api/ObjectsBatcher.java

@@ -58,7 +58,6 @@ public class ObjectsBatcher extends BaseClient<ObjectGetResponse[]>
   private final DelayedExecutor<?> delayedExecutor;
   private final List<WeaviateObject> objects;
   private String consistencyLevel;
-  private String tenantKey;
   private final List<CompletableFuture<Result<ObjectGetResponse[]>>> undoneFutures;
 
 
@@ -115,11 +114,6 @@ public ObjectsBatcher withConsistencyLevel(String consistencyLevel) {
     return this;
   }
 
-  public ObjectsBatcher withTenantKey(String tenantKey) {
-    this.tenantKey = tenantKey;
-    return this;
-  }
-
   @Override
   public Result<ObjectGetResponse[]> run() {
     if (autoRunEnabled) {
@@ -273,7 +267,6 @@ private Result<ObjectGetResponse[]> internalRun(List<WeaviateObject> batch) {
       .build();
     String path = objectsPath.buildCreate(ObjectsPath.Params.builder()
         .consistencyLevel(consistencyLevel)
-        .tenantKey(tenantKey)
         .build());
     Response<ObjectGetResponse[]> resp = sendPostRequest(path, batchRequest, ObjectGetResponse[].class);
     return new Result<>(resp);

src/main/java/io/weaviate/client/v1/batch/api/ReferencePayloadBuilder.java

@@ -14,6 +14,7 @@ public class ReferencePayloadBuilder {
   private String fromPropertyName;
   private String toUUID;
   private String toClassName;
+  private String tenant;
 
   @Deprecated
   public ReferencePayloadBuilder() {
@@ -50,6 +51,11 @@ public ReferencePayloadBuilder withToClassName(String className) {
     return this;
   }
 
+  public ReferencePayloadBuilder withTenant(String tenant) {
+    this.tenant = tenant;
+    return this;
+  }
+
   public BatchReference payload() {
     if (StringUtils.isBlank(fromClassName) || StringUtils.isBlank(fromUUID) ||
             StringUtils.isBlank(fromPropertyName) || StringUtils.isBlank(toUUID)) {
@@ -73,7 +79,7 @@ public BatchReference payload() {
       to = beaconToDeprecated();
     }
 
-    return BatchReference.builder().from(from).to(to).build();
+    return BatchReference.builder().from(from).to(to).tenant(tenant).build();
   }
 
   private String beaconFromDeprecated() {

src/main/java/io/weaviate/client/v1/batch/api/ReferencesBatcher.java

@@ -49,7 +49,6 @@ public class ReferencesBatcher extends BaseClient<BatchReferenceResponse[]>
   private final DelayedExecutor<?> delayedExecutor;
   private final List<BatchReference> references;
   private String consistencyLevel;
-  private String tenantKey;
   private final List<CompletableFuture<Result<BatchReferenceResponse[]>>> undoneFutures;
 
 
@@ -104,11 +103,6 @@ public ReferencesBatcher withConsistencyLevel(String consistencyLevel) {
     return this;
   }
 
-  public ReferencesBatcher withTenantKey(String tenantKey) {
-    this.tenantKey = tenantKey;
-    return this;
-  }
-
   @Override
   public Result<BatchReferenceResponse[]> run() {
     if (autoRunEnabled) {
@@ -247,7 +241,6 @@ private Result<BatchReferenceResponse[]> internalRun(List<BatchReference> batch)
     BatchReference[] payload = batch.toArray(new BatchReference[0]);
     String path = referencesPath.buildCreate(ReferencesPath.Params.builder()
         .consistencyLevel(consistencyLevel)
-        .tenantKey(tenantKey)
         .build());
     Response<BatchReferenceResponse[]> resp = sendPostRequest(path, payload, BatchReferenceResponse[].class);
     return new Result<>(resp);

src/main/java/io/weaviate/client/v1/batch/model/BatchReference.java

@@ -15,4 +15,5 @@
 public class BatchReference {
   String from;
   String to;
+  String tenant;
 }

src/main/java/io/weaviate/client/v1/batch/model/BatchReferenceResponseAO1Result.java

@@ -7,12 +7,31 @@
 import lombok.ToString;
 import lombok.experimental.FieldDefaults;
 
+import java.util.List;
+
 @Getter
 @Setter
 @ToString
 @EqualsAndHashCode
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class BatchReferenceResponseAO1Result {
-  String errors;
+  ErrorResponse errors;
   String status;
+
+
+  @Getter
+  @ToString
+  @EqualsAndHashCode
+  @FieldDefaults(level = AccessLevel.PRIVATE)
+  public static class ErrorResponse {
+    List<ErrorItem> error;
+  }
+
+  @Getter
+  @ToString
+  @EqualsAndHashCode
+  @FieldDefaults(level = AccessLevel.PRIVATE)
+  public static class ErrorItem {
+    String message;
+  }
 }

src/main/java/io/weaviate/client/v1/batch/model/ObjectGetResponse.java

@@ -26,6 +26,7 @@ public class ObjectGetResponse {
   Map<String, Object> additional;
   Float[] vector;
   Object vectorWeights;
+  String tenant;
 
   Deprecation[] deprecations;
   ObjectsGetResponseAO2Result result;

src/main/java/io/weaviate/client/v1/batch/util/ObjectsPath.java

@@ -16,18 +16,17 @@
 public class ObjectsPath {
 
   public String buildCreate(Params params) {
-    return commonBuild(params);
+    return build(
+      params,
+      this::addQueryConsistencyLevel
+    );
   }
 
   public String buildDelete(Params params) {
-    return commonBuild(params);
-  }
-
-  private String commonBuild(Params params) {
     return build(
       params,
       this::addQueryConsistencyLevel,
-      this::addQueryTenantKey
+      this::addQueryTenant
     );
   }
 
@@ -55,9 +54,9 @@ private void addQueryConsistencyLevel(Params params, List<String> pathParams, Li
     }
   }
 
-  private void addQueryTenantKey(Params params, List<String> pathParams, List<String> queryParams) {
-    if (StringUtils.isNotBlank(params.tenantKey)) {
-      queryParams.add(UrlEncoder.encodeQueryParam("tenant_key", params.tenantKey));
+  private void addQueryTenant(Params params, List<String> pathParams, List<String> queryParams) {
+    if (StringUtils.isNotBlank(params.tenant)) {
+      queryParams.add(UrlEncoder.encodeQueryParam("tenant", params.tenant));
     }
   }
 
@@ -68,6 +67,6 @@ private void addQueryTenantKey(Params params, List<String> pathParams, List<Stri
   public static class Params {
 
     String consistencyLevel;
-    String tenantKey;
+    String tenant;
   }
 }

src/main/java/io/weaviate/client/v1/batch/util/ReferencesPath.java

@@ -18,8 +18,7 @@ public class ReferencesPath {
   public String buildCreate(Params params) {
     return build(
       params,
-      this::addQueryConsistencyLevel,
-      this::addQueryTenantKey
+      this::addQueryConsistencyLevel
     );
   }
 
@@ -47,19 +46,12 @@ private void addQueryConsistencyLevel(Params params, List<String> pathParams, Li
     }
   }
 
-  private void addQueryTenantKey(Params params, List<String> pathParams, List<String> queryParams) {
-    if (StringUtils.isNotBlank(params.tenantKey)) {
-      queryParams.add(UrlEncoder.encodeQueryParam("tenant_key", params.tenantKey));
-    }
-  }
-
 
   @Builder
   @ToString
   @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
   public static class Params {
 
     String consistencyLevel;
-    String tenantKey;
   }
 }

src/main/java/io/weaviate/client/v1/cluster/api/NodesStatusGetter.java

@@ -6,17 +6,34 @@
 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.cluster.model.NodesStatusResponse;
+import org.apache.commons.lang3.StringUtils;
 
 public class NodesStatusGetter extends BaseClient<NodesStatusResponse> implements ClientResult<NodesStatusResponse> {
 
+  private String className;
+
   public NodesStatusGetter(HttpClient httpClient, Config config) {
     super(httpClient, config);
   }
 
+  public NodesStatusGetter withClassName(String className) {
+    this.className = className;
+    return this;
+  }
+
   @Override
   public Result<NodesStatusResponse> run() {
-    Response<NodesStatusResponse> resp = sendGetRequest("/nodes", NodesStatusResponse.class);
+    Response<NodesStatusResponse> resp = sendGetRequest(path(), NodesStatusResponse.class);
     return new Result<>(resp);
   }
+
+  private String path() {
+    String path = "/nodes";
+    if (StringUtils.isNotBlank(className)) {
+      path = String.format("%s/%s", path, UrlEncoder.encodePathParam(className));
+    }
+    return path;
+  }
 }