update exception handling

Author: guFalcon

pom.xml

@@ -10,7 +10,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>websocket-client</artifactId>
-	<version>1.0.3</version>
+	<version>1.0.5</version>
 	<name>WebsocketClient</name>
 	<packaging>jar</packaging>
 

src/main/java/info/unterrainer/websocketclient/SendingMessageWebsocketException.java

@@ -11,6 +11,9 @@
 
 import info.unterrainer.oauthtokenmanager.LocalOauthTokens;
 import info.unterrainer.oauthtokenmanager.OauthTokenManager;
+import info.unterrainer.websocketclient.exceptions.WebsocketClosingException;
+import info.unterrainer.websocketclient.exceptions.WebsocketConnectingException;
+import info.unterrainer.websocketclient.exceptions.WebsocketSendingMessageException;
 import jakarta.websocket.ClientEndpointConfig;
 import jakarta.websocket.ClientEndpointConfig.Builder;
 import jakarta.websocket.CloseReason;
@@ -57,7 +60,7 @@ public void send(String message) {
 			s.getBasicRemote().sendText(message);
 		} catch (Exception e) {
 			log.error("Error sending message: ", e);
-			throw new SendingMessageWebsocketException(String.format("Failed to send message [%s].", message), e);
+			throw new WebsocketSendingMessageException(String.format("Failed to send message [%s].", message), e);
 		}
 		log.debug("Sent message: " + message);
 	}
@@ -69,6 +72,7 @@ public void close() {
 			s.close(new CloseReason(CloseReason.CloseCodes.NORMAL_CLOSURE, "Normal closure"));
 		} catch (IOException e) {
 			log.error("Error closing session.", e);
+			throw new WebsocketClosingException("Failed to close WebSocket session.", e);
 		}
 	}
 
@@ -82,7 +86,7 @@ public void establish() {
 			log.info("ClientManager created");
 		} catch (Exception e) {
 			log.error("Failed to create ClientManager: {}", e.getMessage(), e);
-			return;
+			throw new WebsocketConnectingException("Failed to create WebSocket ClientManager.", e);
 		}
 		endpoints = new WebsocketEndpoints(this);
 		Builder c = ClientEndpointConfig.Builder.create();
@@ -107,7 +111,7 @@ public void beforeRequest(Map<String, List<String>> headers) {
 			container.connectToServer(endpoints, config, URI.create(host));
 		} catch (Exception e) {
 			log.error("Error connecting to WebSocket server: ", e);
-			return;
+			throw new WebsocketConnectingException("Failed to connect to WebSocket server at " + host, e);
 		}
 		log.info("WebSocket client connected to: {}", host);
 	}

src/main/java/info/unterrainer/websocketclient/WebsocketConnection.java

@@ -0,0 +1,22 @@
+package info.unterrainer.websocketclient.exceptions;
+
+public class WebsocketClosingException extends WebsocketException {
+
+	private static final long serialVersionUID = -8862710911083647793L;
+
+	public WebsocketClosingException() {
+		super();
+	}
+
+	public WebsocketClosingException(String message) {
+		super(message);
+	}
+
+	public WebsocketClosingException(Throwable cause) {
+		super(cause);
+	}
+
+	public WebsocketClosingException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}

src/main/java/info/unterrainer/websocketclient/exceptions/WebsocketClosingException.java

@@ -0,0 +1,22 @@
+package info.unterrainer.websocketclient.exceptions;
+
+public class WebsocketConnectingException extends WebsocketException {
+
+	private static final long serialVersionUID = 2783771228373284782L;
+
+	public WebsocketConnectingException() {
+		super();
+	}
+
+	public WebsocketConnectingException(String message) {
+		super(message);
+	}
+
+	public WebsocketConnectingException(Throwable cause) {
+		super(cause);
+	}
+
+	public WebsocketConnectingException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}

src/main/java/info/unterrainer/websocketclient/exceptions/WebsocketConnectingException.java

@@ -0,0 +1,23 @@
+package info.unterrainer.websocketclient.exceptions;
+
+public class WebsocketException extends RuntimeException {
+
+	private static final long serialVersionUID = -700574755132411939L;
+
+	public WebsocketException() {
+		super();
+	}
+
+	public WebsocketException(String message) {
+		super(message);
+	}
+
+	public WebsocketException(Throwable cause) {
+		super(cause);
+	}
+
+	public WebsocketException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+}

src/main/java/info/unterrainer/websocketclient/exceptions/WebsocketException.java

@@ -0,0 +1,22 @@
+package info.unterrainer.websocketclient.exceptions;
+
+public class WebsocketSendingMessageException extends WebsocketException {
+
+	private static final long serialVersionUID = 6354296246039531090L;
+
+	public WebsocketSendingMessageException() {
+		super();
+	}
+
+	public WebsocketSendingMessageException(String message) {
+		super(message);
+	}
+
+	public WebsocketSendingMessageException(Throwable cause) {
+		super(cause);
+	}
+
+	public WebsocketSendingMessageException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}