Update JS API to remove last calls to fetchObject

deephaven · Aug 10, 2023 · 9fd19d9 · 9fd19d9
1 parent addbe97
commit 9fd19d9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 26 deletions.
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/WorkerConnection.java b/web/client-api/src/main/java/io/deephaven/web/client/api/WorkerConnection.java
@@ -46,7 +46,6 @@
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb_service.ConsoleServiceClient;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.hierarchicaltable_pb_service.HierarchicalTableServiceClient;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.inputtable_pb_service.InputTableServiceClient;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.object_pb.FetchObjectRequest;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.object_pb.FetchObjectResponse;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.object_pb_service.ObjectServiceClient;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.partitionedtable_pb_service.PartitionedTableServiceClient;
@@ -83,6 +82,7 @@
 import io.deephaven.web.client.api.state.StateCache;
 import io.deephaven.web.client.api.tree.JsTreeTable;
 import io.deephaven.web.client.api.widget.JsWidget;
+import io.deephaven.web.client.api.widget.JsWidgetExportedObject;
 import io.deephaven.web.client.api.widget.plot.JsFigure;
 import io.deephaven.web.client.fu.JsItr;
 import io.deephaven.web.client.fu.JsLog;
@@ -94,7 +94,6 @@
 import io.deephaven.web.shared.data.RangeSet;
 import io.deephaven.web.shared.data.TableSnapshot;
 import io.deephaven.web.shared.data.TableSubscriptionRequest;
-import io.deephaven.web.shared.fu.JsBiConsumer;
 import io.deephaven.web.shared.fu.JsConsumer;
 import io.deephaven.web.shared.fu.JsRunnable;
 import jsinterop.annotations.JsMethod;
@@ -882,7 +881,20 @@ public Promise<JsFigure> getFigure(JsVariableDefinition varDef) {
         }
         return whenServerReady("get a figure")
                 .then(server -> new JsFigure(this,
-                        c -> fetchObject(varDef, c)).refetch());
+                        c -> {
+                            getWidget(varDef).then(widget -> {
+                                FetchObjectResponse legacyResponse = new FetchObjectResponse();
+                                legacyResponse.setData(widget.getDataAsU8());
+                                legacyResponse.setType(widget.getType());
+                                legacyResponse.setTypedExportIdsList(Arrays.stream(widget.getExportedObjects())
+                                        .map(JsWidgetExportedObject::typedTicket).toArray(TypedTicket[]::new));
+                                c.apply(null, legacyResponse);
+                                return null;
+                            }, error -> {
+                                c.apply(error, null);
+                                return null;
+                            });
+                        }).refetch());
     }
 
     private TypedTicket createTypedTicket(JsVariableDefinition varDef) {
@@ -892,16 +904,13 @@ private TypedTicket createTypedTicket(JsVariableDefinition varDef) {
         return typedTicket;
     }
 
-    private void fetchObject(JsVariableDefinition varDef, JsBiConsumer<Object, FetchObjectResponse> c) {
-        FetchObjectRequest request = new FetchObjectRequest();
-        TypedTicket typedTicket = createTypedTicket(varDef);
-        request.setSourceId(typedTicket);
-        objectServiceClient().fetchObject(request, metadata(), c::apply);
+    public Promise<JsWidget> getWidget(JsVariableDefinition varDef) {
+        return getWidget(createTypedTicket(varDef));
     }
 
-    public Promise<JsWidget> getWidget(JsVariableDefinition varDef) {
+    public Promise<JsWidget> getWidget(TypedTicket typedTicket) {
         return whenServerReady("get a widget")
-                .then(response -> new JsWidget(this, createTypedTicket(varDef)).refetch());
+                .then(response -> new JsWidget(this, typedTicket).refetch());
     }
 
     public void registerSimpleReconnectable(HasLifecycle figure) {

diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsFigure.java b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsFigure.java
@@ -9,7 +9,6 @@
 import elemental2.promise.Promise;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.FigureDescriptor;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.figuredescriptor.AxisDescriptor;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.object_pb.FetchObjectRequest;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.object_pb.FetchObjectResponse;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.ExportedTableCreationResponse;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.TypedTicket;
@@ -788,21 +787,14 @@ public Promise<FigureTableFetchData> fetch(JsFigure figure, FetchObjectResponse
                     });
                 } else if (ticket.getType().equals(JsVariableType.PARTITIONEDTABLE)) {
                     int partitionedTableIndex = nextPartitionedTableIndex++;
-                    promises[i] = Callbacks.<FetchObjectResponse, Object>grpcUnaryPromise(c -> {
-                        FetchObjectRequest partitionedTableRequest = new FetchObjectRequest();
-                        partitionedTableRequest.setSourceId(ticket);
-                        connection.objectServiceClient().fetchObject(partitionedTableRequest, connection.metadata(),
-                                c::apply);
-                    }).then(object -> {
-                        JsPartitionedTable partitionedTable =
-                                new JsPartitionedTable(connection, new JsWidget(connection, ticket));
-                        // TODO(deephaven-core#3604) if using a new session don't attempt a reconnect, since we might
-                        // have a different figure schema entirely
-                        // partitionedTable.addEventListener(JsPartitionedTable.EVENT_DISCONNECT, ignore ->
-                        // partitionedTable.close());
-                        partitionedTables[partitionedTableIndex] = partitionedTable;
-                        return partitionedTable.refetch();
-                    });
+                    JsPartitionedTable partitionedTable =
+                            new JsPartitionedTable(connection, new JsWidget(connection, ticket));
+                    // TODO(deephaven-core#3604) if using a new session don't attempt a reconnect, since we might
+                    // have a different figure schema entirely
+                    // partitionedTable.addEventListener(JsPartitionedTable.EVENT_DISCONNECT, ignore ->
+                    // partitionedTable.close());
+                    partitionedTables[partitionedTableIndex] = partitionedTable;
+                    promises[i] = partitionedTable.refetch();
                 } else {
                     throw new IllegalStateException("Ticket type not recognized in a Figure: " + ticket.getType());
                 }