Deprecate CONNECTING

marci4 · marci4 · commit 0d90fc9d344d · 2018-03-20T18:42:26.000+01:00
diff --git a/src/main/java/org/java_websocket/WebSocket.java b/src/main/java/org/java_websocket/WebSocket.java
@@ -46,7 +46,9 @@ enum Role {
 	 * Enum which represents the state a websocket may be in
 	 */
 	enum READYSTATE {
-		NOT_YET_CONNECTED, CONNECTING, OPEN, CLOSING, CLOSED
+		NOT_YET_CONNECTED,
+		@Deprecated
+		CONNECTING, OPEN, CLOSING, CLOSED
 	}
 
 	/**
@@ -172,6 +174,7 @@ enum READYSTATE {
 	 * Is the websocket in the state CONNECTING
 	 * @return state equals READYSTATE.CONNECTING
 	 */
+	@Deprecated
 	boolean isConnecting();
 
 	/**
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -647,8 +647,6 @@ public boolean hasBufferedData() {
 	}
 
 	public void startHandshake( ClientHandshakeBuilder handshakedata ) throws InvalidHandshakeException {
-		assert ( getReadyState() != READYSTATE.CONNECTING ) : "shall only be called once";
-
 		// Store the Handshake Request we are about to send
 		this.handshakerequest = draft.postProcessHandshakeRequestAsClient( handshakedata );
 
@@ -710,6 +708,7 @@ private void open( Handshakedata d ) {
 	}
 
 	@Override
+	@Deprecated
 	public boolean isConnecting() {
 		assert ( !flushandclosestate || getReadyState() == READYSTATE.CONNECTING );
 		return getReadyState() == READYSTATE.CONNECTING; // ifflushandclosestate
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -707,6 +707,7 @@ public boolean isClosing() {
 	}
 
 	@Override
+	@Deprecated
 	public boolean isConnecting() {
 		return engine.isConnecting();
 	}

Original file line number	Diff line number	Diff line change
`@@ -647,8 +647,6 @@ public boolean hasBufferedData() {`
`647`	`647`	`}`
`648`	`648`
`649`	`649`	`public void startHandshake( ClientHandshakeBuilder handshakedata ) throws InvalidHandshakeException {`
`650`		`- assert ( getReadyState() != READYSTATE.CONNECTING ) : "shall only be called once";`
`651`		`-`
`652`	`650`	`// Store the Handshake Request we are about to send`
`653`	`651`	`this.handshakerequest = draft.postProcessHandshakeRequestAsClient( handshakedata );`
`654`	`652`
`@@ -710,6 +708,7 @@ private void open( Handshakedata d ) {`
`710`	`708`	`}`
`711`	`709`
`712`	`710`	`@Override`
	`711`	`+ @Deprecated`
`713`	`712`	`public boolean isConnecting() {`
`714`	`713`	`assert ( !flushandclosestate \|\| getReadyState() == READYSTATE.CONNECTING );`
`715`	`714`	`return getReadyState() == READYSTATE.CONNECTING; // ifflushandclosestate`
Original file line number	Diff line number	Diff line change
`@@ -707,6 +707,7 @@ public boolean isClosing() {`
`707`	`707`	`}`
`708`	`708`
`709`	`709`	`@Override`
	`710`	`+ @Deprecated`
`710`	`711`	`public boolean isConnecting() {`
`711`	`712`	`return engine.isConnecting();`
`712`	`713`	`}`