tomasz
/
code-examples
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small refactoring in code no 2 + and removing deprecated websocketclient creator.

master
Tomasz Polgrabia 2024-08-02 00:59:05 +02:00
parent 22e0a6ffbd
commit 34e397682b
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
2024/08/chat_demo1/chat_demo1_web/src/main/java/ch/polgrabia/demos/client/WebsocketClientApp.java
View File

@ -12,7 +12,9 @@ public class WebsocketClientApp {
WebsocketClientParticle websocketClientParticle = new WebsocketClientParticle("localhost", 8080, "/");
vertx.deployVerticle(websocketClientParticle);
logger.info("Deployed websocket particle");
websocketClientParticle.waitingUntilFinished();
websocketClientParticle
.waitingUntilFinished()
.join();
vertx.close();
}
}

18
2024/08/chat_demo1/chat_demo1_web/src/main/java/ch/polgrabia/demos/client/WebsocketClientParticle.java
View File

@ -3,11 +3,16 @@ package ch.polgrabia.demos.client;
import io.vertx.core.AbstractVerticle;
import io.vertx.core.AsyncResult;
import io.vertx.core.http.HttpClient;
import io.vertx.core.http.HttpClientOptions;
import io.vertx.core.http.WebSocket;
import io.vertx.core.http.impl.WebSocketClientImpl;
import io.vertx.core.impl.CloseFuture;
import io.vertx.core.impl.VertxInternal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayOutputStream;
import java.util.concurrent.CompletableFuture;
public class WebsocketClientParticle extends AbstractVerticle {
private static final Logger logger = LoggerFactory.getLogger(WebsocketClientParticle.class);
@ -29,8 +34,8 @@ public class WebsocketClientParticle extends AbstractVerticle {
public void start() throws Exception {
this.client = getVertx()
.createHttpClient();
// TODO refactor it as it's deprecated
client.webSocket(port, hostname, path, this::handleMessage);
new WebSocketClientImpl((VertxInternal) getVertx(), new HttpClientOptions(), new CloseFuture())
.webSocket(port, hostname, path, this::handleMessage);
}
private void handleMessage(AsyncResult<WebSocket> webSocketAsyncResult) {
@ -67,17 +72,20 @@ public class WebsocketClientParticle extends AbstractVerticle {
}
}
public void waitingUntilFinished() {
while(!isShuttingDownActivated) {
public CompletableFuture<Boolean> waitingUntilFinished() {
return CompletableFuture.supplyAsync(() -> {
while (!isShuttingDownActivated) {
synchronized (runningMonitor) {
try {
runningMonitor.wait();
return;
return true;
} catch (InterruptedException e) {
logger.warn("Got interrupted", e);
}
}
}
return false;
});
}
}