weaviategh-175 address review comments for constructor and http error…

… code
HeliosX7 · Apr 14, 2023 · 7cf2452 · 7cf2452
1 parent 1ea2774
commit 7cf2452
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/main/java/io/weaviate/client/v1/schema/Schema.java b/src/main/java/io/weaviate/client/v1/schema/Schema.java
@@ -31,7 +31,7 @@ public ClassGetter classGetter() {
   }
 
   public ClassExists exists() {
-    return new ClassExists(httpClient, config);
+    return new ClassExists(new ClassGetter(httpClient, config));
   }
 
   public ClassCreator classCreator() {

diff --git a/src/main/java/io/weaviate/client/v1/schema/api/ClassExists.java b/src/main/java/io/weaviate/client/v1/schema/api/ClassExists.java
@@ -1,25 +1,22 @@
 package io.weaviate.client.v1.schema.api;
 
-import io.weaviate.client.Config;
 import io.weaviate.client.base.ClientResult;
 import io.weaviate.client.base.Result;
 import io.weaviate.client.base.WeaviateError;
 import io.weaviate.client.base.WeaviateErrorMessage;
 import io.weaviate.client.base.WeaviateErrorResponse;
-import io.weaviate.client.base.http.HttpClient;
 import io.weaviate.client.v1.schema.model.WeaviateClass;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.Collections;
 
 public class ClassExists implements ClientResult<Boolean> {
   private final ClassGetter classGetter;
   private String className;
 
-  public ClassExists(HttpClient httpClient, Config config) {
-    this.classGetter = new ClassGetter(httpClient, config);
+  public ClassExists(ClassGetter classGetter) {
+    this.classGetter = classGetter;
   }
 
   public ClassExists withClassName(String className) {
@@ -33,17 +30,18 @@ private Result<Boolean> toResult(WeaviateError error) {
 
   @Override
   public Result<Boolean> run() {
-    if (StringUtils.isEmpty(this.className)) {
+    if (StringUtils.isEmpty(className)) {
       WeaviateErrorMessage errorMessage = WeaviateErrorMessage.builder()
         .message("classname cannot be empty").build();
       WeaviateErrorResponse errors = WeaviateErrorResponse.builder()
-        .error(Stream.of(errorMessage).collect(Collectors.toList())).build();
-      return new Result<>(500, null, errors);
+        .error(Collections.singletonList(errorMessage)).build();
+      return new Result<>(HttpStatus.SC_UNPROCESSABLE_ENTITY, null, errors);
     }
 
-    Result<WeaviateClass> getterClass = this.classGetter.withClassName(this.className).run();
+    Result<WeaviateClass> getterClass = classGetter.withClassName(className).run();
     if (getterClass.hasErrors()) {
-      return toResult(getterClass.getError());
+      WeaviateError error = getterClass.getError();
+      return new Result<>(error.getStatusCode(), null, WeaviateErrorResponse.builder().error(error.getMessages()).build());
     }
     return new Result<>(HttpStatus.SC_OK, getterClass.getResult() != null, null);
   }