Skip to content

Commit 87e7b21

Browse files
committed
Fixed shared type bytes union members
1 parent 7e88120 commit 87e7b21

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

web/client-api/src/main/java/io/deephaven/web/client/api/WorkerConnection.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -796,10 +796,10 @@ public Promise<SharedExportBytesUnion> shareObject(ServerObject object, SharedEx
796796
private Ticket sharedTicketFromStringOrBytes(SharedExportBytesUnion sharedTicketBytes) {
797797
final TypedArray.SetArrayUnionType array;
798798
if (sharedTicketBytes.isString()) {
799-
byte[] arr = sharedTicketBytes.toString().getBytes(StandardCharsets.UTF_8);
799+
byte[] arr = sharedTicketBytes.asString().getBytes(StandardCharsets.UTF_8);
800800
array = TypedArray.SetArrayUnionType.of(arr);
801801
} else {
802-
Uint8Array bytes = (Uint8Array) sharedTicketBytes;
802+
Uint8Array bytes = sharedTicketBytes.asUint8Array();
803803
array = TypedArray.SetArrayUnionType.of(bytes);
804804
}
805805
return tickets.sharedTicket(array);

web/client-api/src/main/java/io/deephaven/web/client/ide/SharedExportBytesUnion.java

+13
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package io.deephaven.web.client.ide;
55

66
import com.vertispan.tsdefs.annotations.TsUnion;
7+
import com.vertispan.tsdefs.annotations.TsUnionMember;
78
import elemental2.core.Uint8Array;
89
import jsinterop.annotations.JsOverlay;
910
import jsinterop.annotations.JsPackage;
@@ -27,4 +28,16 @@ default boolean isString() {
2728
default boolean isUint8Array() {
2829
return this instanceof Uint8Array;
2930
}
31+
32+
@TsUnionMember
33+
@JsOverlay
34+
default String asString() {
35+
return Js.cast(this);
36+
}
37+
38+
@TsUnionMember
39+
@JsOverlay
40+
default Uint8Array asUint8Array() {
41+
return (Uint8Array) this;
42+
}
3043
}

0 commit comments

Comments
 (0)