From 0f761b85dc2f50ea4908e1375e06769333093c5c Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Mon, 2 Dec 2024 13:39:01 -0600 Subject: [PATCH] refactor: Rework earlier commit to annotate existing method (#6452) Followup #6466 --- .../api/subscription/AbstractTableSubscription.java | 3 +++ .../web/client/api/subscription/TableSubscription.java | 8 -------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/AbstractTableSubscription.java b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/AbstractTableSubscription.java index 5165bf5fcc2..f231a93a071 100644 --- a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/AbstractTableSubscription.java +++ b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/AbstractTableSubscription.java @@ -29,6 +29,7 @@ import io.deephaven.web.shared.data.RangeSet; import io.deephaven.web.shared.data.ShiftedRange; import io.deephaven.web.shared.fu.JsRunnable; +import jsinterop.annotations.JsMethod; import jsinterop.annotations.JsProperty; import jsinterop.base.Any; import jsinterop.base.Js; @@ -51,6 +52,7 @@ * exposed to api consumers, rather than wrapping in a Table type, as it handles the barrage stream and provides events * that client code can listen to. */ +@TsIgnore public abstract class AbstractTableSubscription extends HasEventHandling { /** * Indicates that some new data is available on the client, either an initial snapshot or a delta update. The @@ -534,6 +536,7 @@ public JsArray getColumns() { /** * Stops the subscription on the server. */ + @JsMethod public void close() { state.unretain(this); if (doExchange != null) { diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/TableSubscription.java b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/TableSubscription.java index 8bc2f25fd46..1decd7c5713 100644 --- a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/TableSubscription.java +++ b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/TableSubscription.java @@ -60,12 +60,4 @@ public void changeSubscription(JsArray columns, @JsNullable Double updat public JsArray getColumns() { return super.getColumns(); } - - /** - * Close the subscription. Need to redefine here so this is exposed to JS. - */ - @Override - public void close() { - super.close(); - } }