diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/QueryConnectable.java b/web/client-api/src/main/java/io/deephaven/web/client/api/QueryConnectable.java index 2a73b357a5e..a05fc06cc0d 100644 --- a/web/client-api/src/main/java/io/deephaven/web/client/api/QueryConnectable.java +++ b/web/client-api/src/main/java/io/deephaven/web/client/api/QueryConnectable.java @@ -10,6 +10,7 @@ import io.deephaven.javascript.proto.dhinternal.grpcweb.client.RpcOptions; import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.session_pb.TerminationNotificationResponse; import io.deephaven.web.client.api.event.HasEventHandling; +import io.deephaven.web.client.api.grpc.GrpcTransportFactory; import io.deephaven.web.client.ide.IdeSession; import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.*; import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.Ticket; @@ -255,7 +256,7 @@ public T createClient(BiFunction constructor) { public RpcOptions makeRpcOptions() { RpcOptions options = RpcOptions.create(); options.setDebug(getOptions().debug); - options.setTransport(getOptions().transportFactory.adapt()); + options.setTransport(GrpcTransportFactory.adapt(getOptions().transportFactory)); return options; } } diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/event/Event.java b/web/client-api/src/main/java/io/deephaven/web/client/api/event/Event.java index 8749a68c755..8ac021545fe 100644 --- a/web/client-api/src/main/java/io/deephaven/web/client/api/event/Event.java +++ b/web/client-api/src/main/java/io/deephaven/web/client/api/event/Event.java @@ -5,7 +5,6 @@ import com.vertispan.tsdefs.annotations.TsInterface; import com.vertispan.tsdefs.annotations.TsName; -import jsinterop.annotations.JsNullable; import jsinterop.annotations.JsProperty; /** @@ -31,7 +30,6 @@ public String getType() { } @JsProperty - @JsNullable public T getDetail() { return detail; } diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/GrpcTransportFactory.java b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/GrpcTransportFactory.java index 978e1a36426..e0430809b05 100644 --- a/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/GrpcTransportFactory.java +++ b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/GrpcTransportFactory.java @@ -8,6 +8,7 @@ import io.deephaven.javascript.proto.dhinternal.browserheaders.BrowserHeaders; import io.deephaven.javascript.proto.dhinternal.grpcweb.transports.transport.Transport; import io.deephaven.javascript.proto.dhinternal.grpcweb.transports.transport.TransportFactory; +import jsinterop.annotations.JsIgnore; import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsProperty; import jsinterop.annotations.JsType; @@ -17,7 +18,7 @@ * Factory for creating gRPC transports. */ @TsInterface -@JsType(namespace = "dh.grpc", isNative = true) +@JsType(namespace = "dh.grpc") public interface GrpcTransportFactory { /** * Create a new transport instance. @@ -40,10 +41,10 @@ public interface GrpcTransportFactory { /** * Adapt this factory to the transport factory used by the gRPC-web library. */ - @JsOverlay - default TransportFactory adapt() { + @JsIgnore + static TransportFactory adapt(GrpcTransportFactory instance) { return options -> { - GrpcTransport impl = create(GrpcTransportOptions.from(options)); + GrpcTransport impl = instance.create(GrpcTransportOptions.from(options)); return new Transport() { @Override public void cancel() { diff --git a/web/client-api/types/build.gradle b/web/client-api/types/build.gradle index 71d70988a7f..7d08554d0a3 100644 --- a/web/client-api/types/build.gradle +++ b/web/client-api/types/build.gradle @@ -50,7 +50,6 @@ def typedocAndTarball = Docker.registerDockerTask(project, 'typedoc') { mv deephaven-jsapi-types*.tgz /out/; \\ node_modules/.bin/typedoc dist/index.d.ts \\ --out /out/documentation \\ - --skipErrorChecking \\ --hideGenerator \\ --disableSources \\ --customCss theme.css; \\