feat: rethrow io.grpc.StatusRuntimeException as WeaviateApiException

Author: bevzzz

src/it/java/io/weaviate/integration/SearchITest.java

@@ -16,6 +16,7 @@
 import org.junit.rules.TestRule;
 
 import io.weaviate.ConcurrentTest;
+import io.weaviate.client6.v1.api.WeaviateApiException;
 import io.weaviate.client6.v1.api.WeaviateClient;
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.Vectorizers;
@@ -374,4 +375,43 @@ public void testHybrid() throws IOException {
     Assertions.assertThat(first.metadata().explainScore())
         .as("metadata::explainScore").isNotNull();
   }
+
+  @Test(expected = WeaviateApiException.class)
+  public void testBadRequest() throws IOException {
+    // Arrange
+    var nsThings = ns("Things");
+
+    client.collections.create(nsThings,
+        collection -> collection
+            .properties(Property.text("name"))
+            .vectors(Vectorizers.text2vecContextionary()));
+
+    var things = client.collections.use(nsThings);
+    var balloon = things.data.insert(Map.of("name", "balloon"));
+
+    things.query.nearObject(balloon.uuid(), q -> q.limit(-1));
+  }
+
+  @Test(expected = WeaviateApiException.class)
+  public void testBadRequest_async() throws Throwable {
+    // Arrange
+    var nsThings = ns("Things");
+
+    try (final var async = client.async()) {
+      async.collections.create(nsThings,
+          collection -> collection
+              .properties(Property.text("name"))
+              .vectors(Vectorizers.text2vecContextionary()))
+          .get();
+
+      var things = async.collections.use(nsThings);
+      var balloon = things.data.insert(Map.of("name", "balloon")).get();
+
+      try {
+        things.query.nearObject(balloon.uuid(), q -> q.limit(-1)).get();
+      } catch (ExecutionException e) {
+        throw e.getCause();
+      }
+    }
+  }
 }

src/main/java/io/weaviate/client6/v1/api/WeaviateApiException.java

@@ -6,20 +6,48 @@
  * a bad request or a server error.
  */
 public class WeaviateApiException extends RuntimeException {
+  private final String errorMessage;
+  private final Source source;
   private final String endpoint;
-  private final int statusCode;
+  private final Integer statusCode;
+  private final String grpcStatus;
 
-  public WeaviateApiException(String method, String endpoint, int statusCode, String errorMessage) {
+  private enum Source {
+    HTTP, GRPC;
+  };
+
+  public static WeaviateApiException http(String method, String endpoint, int statusCode, String errorMessage) {
+    return new WeaviateApiException(method, endpoint, statusCode, errorMessage);
+  }
+
+  public static WeaviateApiException gRPC(io.grpc.StatusRuntimeException ex) {
+    var status = ex.getStatus();
+    return new WeaviateApiException(status.getCode().toString(), status.getDescription());
+  }
+
+  private WeaviateApiException(String status, String errorMessage) {
+    super("%s: %s".formatted(status, errorMessage));
+    this.source = Source.GRPC;
+    this.errorMessage = errorMessage;
+    this.grpcStatus = status;
+    this.endpoint = null;
+    this.statusCode = null;
+  }
+
+  private WeaviateApiException(String method, String endpoint, int statusCode, String errorMessage) {
     super("HTTP %d: %s %s: %s".formatted(statusCode, method, endpoint, errorMessage));
+    this.source = Source.HTTP;
+    this.errorMessage = errorMessage;
     this.endpoint = endpoint;
     this.statusCode = statusCode;
+    this.grpcStatus = null;
   }
 
   public String endpoint() {
     return endpoint;
   }
 
-  public int statusCode() {
+  public Integer statusCode() {
     return statusCode;
   }
 }

src/main/java/io/weaviate/client6/v1/internal/grpc/DefaultGrpcTransport.java

@@ -10,10 +10,12 @@
 import com.google.common.util.concurrent.ListenableFuture;
 
 import io.grpc.ManagedChannel;
+import io.grpc.StatusRuntimeException;
 import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
 import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
 import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
 import io.grpc.stub.MetadataUtils;
+import io.weaviate.client6.v1.api.WeaviateApiException;
 import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateGrpc;
 import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateGrpc.WeaviateBlockingStub;
 import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateGrpc.WeaviateFutureStub;
@@ -48,8 +50,12 @@ public <RequestT, RequestM, ReplyM, ResponseT> ResponseT performRequest(RequestT
       Rpc<RequestT, RequestM, ResponseT, ReplyM> rpc) {
     var message = rpc.marshal(request);
     var method = rpc.method();
-    var reply = method.apply(blockingStub, message);
-    return rpc.unmarshal(reply);
+    try {
+      var reply = method.apply(blockingStub, message);
+      return rpc.unmarshal(reply);
+    } catch (io.grpc.StatusRuntimeException e) {
+      throw WeaviateApiException.gRPC(e);
+    }
   }
 
   @Override
@@ -76,6 +82,10 @@ public void onSuccess(T result) {
 
       @Override
       public void onFailure(Throwable t) {
+        if (t instanceof StatusRuntimeException e) {
+          completable.completeExceptionally(WeaviateApiException.gRPC(e));
+          return;
+        }
         completable.completeExceptionally(t);
       }
 

src/main/java/io/weaviate/client6/v1/internal/rest/DefaultRestTransport.java

@@ -164,7 +164,7 @@ private <ResponseT> ResponseT _handleResponse(Endpoint<?, ResponseT> endpoint, S
       int statusCode, String body) {
     if (endpoint.isError(statusCode)) {
       var message = endpoint.deserializeError(statusCode, body);
-      throw new WeaviateApiException(method, url, statusCode, message);
+      throw WeaviateApiException.http(method, url, statusCode, message);
     }
 
     if (endpoint instanceof JsonEndpoint json) {