Skip to content

Commit 1f18bb6

Browse files
committed
Make getWebsocket return optional
1 parent b974ba1 commit 1f18bb6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/main/java/com/exaroton/api/server/Server.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,8 @@ public void removeTickSubscriber(@NotNull TickSubscriber subscriber) {
558558
* Get the current WebSocketConnection. A new connection will be created automatically if a subscriber is added.
559559
* @return web socket connection or null
560560
*/
561-
public @Nullable WebSocketConnection getWebSocket() {
562-
return webSocket;
561+
public Optional<WebSocketConnection> getWebSocket() {
562+
return Optional.ofNullable(webSocket);
563563
}
564564

565565
/**

src/test/java/WebSocketTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void testStartServer() throws IOException, ExecutionException, InterruptedExcept
4747
restartServer();
4848
stopServer();
4949

50-
assertNull(server.getWebSocket());
50+
assertTrue(server.getWebSocket().isEmpty(), "Expected websocket to be closed");
5151
}
5252

5353
void testHeapSubscriber() throws ExecutionException, InterruptedException, TimeoutException {
@@ -134,8 +134,8 @@ void restartServer() throws IOException, ExecutionException, InterruptedExceptio
134134
assertEquals(ServerStatus.ONLINE, server.getStatus());
135135

136136
var restartingFuture = server.waitForStatus(ServerStatus.RESTARTING);
137-
assertNotNull(server.getWebSocket());
138-
server.getWebSocket().waitForReady().get(1, TimeUnit.MINUTES);
137+
assertTrue(server.getWebSocket().isPresent());
138+
server.getWebSocket().get().waitForReady().get(1, TimeUnit.MINUTES);
139139

140140
server.restart().join();
141141
restartingFuture.get(1, TimeUnit.MINUTES);

0 commit comments

Comments
 (0)