update debugging a bit, repair tests and make some fields protected instead of private

Author: guFalcon

pom.xml

@@ -10,7 +10,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>websocket-server</artifactId>
-	<version>1.0.6</version>
+	<version>1.0.7</version>
 	<name>WebsocketServer</name>
 	<packaging>jar</packaging>
 

src/main/java/info/unterrainer/websocketserver/WsOauthHandlerBase.java

@@ -18,9 +18,9 @@
 @Slf4j
 public class WsOauthHandlerBase extends WsHandlerBase {
 
-	private OauthTokenManager tokenHandler;
-	private Set<WsConnectContext> clientsConnected = ConcurrentHashMap.newKeySet();
-	private Set<WsConnectContext> clientsQuarantined = ConcurrentHashMap.newKeySet();
+	protected OauthTokenManager tokenHandler;
+	protected Set<WsConnectContext> clientsConnected = ConcurrentHashMap.newKeySet();
+	protected Set<WsConnectContext> clientsQuarantined = ConcurrentHashMap.newKeySet();
 
 	void setTokenHandler(OauthTokenManager tokenHandler) {
 		this.tokenHandler = tokenHandler;
@@ -89,6 +89,8 @@ public void onMessage(WsMessageContext ctx) throws Exception {
 			try {
 				tokenHandler.checkAccess(ctx.message());
 				WsConnectContext client = getQuarantinedClient(ctx.session);
+				log.debug("Client [{}] passed token validation. Moving from quarantine to connected.",
+						ctx.session.getRemoteAddress());
 				clientsQuarantined.removeIf(c -> c.session.equals(ctx.session));
 				clientsConnected.add(client);
 			} catch (Exception e) {

src/test/java/info/unterrainer/websocketserver/AiComm.java

@@ -1,36 +1,18 @@
 package info.unterrainer.websocketserver;
 
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import io.javalin.websocket.WsCloseContext;
 import io.javalin.websocket.WsConnectContext;
 import io.javalin.websocket.WsMessageContext;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class AiComm extends WsOauthHandlerBase {
 
-	private Set<WsConnectContext> connectedWsClients = ConcurrentHashMap.newKeySet();
-
-	@Override
-	public void onConnect(WsConnectContext ctx) throws Exception {
-		super.onConnect(ctx);
-		connectedWsClients.add(ctx);
-		ctx.send("Welcome to our websocket-server!");
-	}
-
-	@Override
-	public void onClose(WsCloseContext ctx) {
-		connectedWsClients.removeIf(client -> client.session.equals(ctx.session));
-	}
-
 	@Override
 	public void onMessage(WsMessageContext ctx) throws Exception {
 		super.onMessage(ctx);
 
 		// Broadcast to all connected WS clients.
-		for (WsConnectContext client : connectedWsClients) {
+		for (WsConnectContext client : clientsConnected) {
 			if (client.session.isOpen()) {
 				client.send("Echo from server: [" + ctx.message() + "]");
 			}