WebSocketSession.getUri() may return null

Issue: SPR-15721

Author: jhoeller

spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java

@@ -43,7 +43,9 @@ public interface WebSocketSession extends Closeable {
 
 	/**
 	 * Return the URI used to open the WebSocket connection.
+	 * ({@code null} on the client side).
 	 */
+	@Nullable
 	URI getUri();
 
 	/**

spring-websocket/src/main/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketSession.java

@@ -103,7 +103,7 @@ public String getId() {
 
 	@Override
 	public URI getUri() {
-		Assert.state(this.uri != null, "WebSocket session is not yet initialized");
+		checkNativeSessionInitialized();
 		return this.uri;
 	}
 

spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardWebSocketSession.java

@@ -118,7 +118,7 @@ public String getId() {
 
 	@Override
 	public URI getUri() {
-		Assert.state(this.uri != null, "WebSocket session is not yet initialized");
+		checkNativeSessionInitialized();
 		return this.uri;
 	}
 

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/XhrClientSockJsSession.java

@@ -79,7 +79,8 @@ public InetSocketAddress getLocalAddress() {
 
 	@Override
 	public InetSocketAddress getRemoteAddress() {
-		return new InetSocketAddress(getUri().getHost(), getUri().getPort());
+		URI uri = getUri();
+		return (uri != null ? new InetSocketAddress(uri.getHost(), uri.getPort()) : null);
 	}
 
 	@Override

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java

@@ -127,8 +127,8 @@ private enum State {NEW, OPEN, CLOSED}
 	public AbstractSockJsSession(String id, SockJsServiceConfig config, WebSocketHandler handler,
 			@Nullable Map<String, Object> attributes) {
 
-		Assert.notNull(id, "SessionId must not be null");
-		Assert.notNull(config, "SockJsConfig must not be null");
+		Assert.notNull(id, "Session id must not be null");
+		Assert.notNull(config, "SockJsServiceConfig must not be null");
 		Assert.notNull(handler, "WebSocketHandler must not be null");
 
 		this.id = id;