From 914ba483b27b4352cb95b33b80617cedc77009c3 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sat, 22 Aug 2015 15:15:42 +0200 Subject: [PATCH] Clean up warnings in spring-websocket --- .../socket/messaging/StompSubProtocolErrorHandler.java | 1 - .../web/socket/messaging/StompSubProtocolHandler.java | 4 +++- .../web/socket/sockjs/client/AbstractXhrTransport.java | 2 +- .../web/socket/sockjs/client/TransportRequest.java | 9 ++++----- .../WebSocketMessageBrokerConfigurationSupportTests.java | 3 --- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolErrorHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolErrorHandler.java index 47ce4a2634..9560d93385 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolErrorHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolErrorHandler.java @@ -62,7 +62,6 @@ public class StompSubProtocolErrorHandler implements SubProtocolErrorHandler handleInternal(StompHeaderAccessor errorHeaderAccessor, byte[] errorPayload, Throwable cause, StompHeaderAccessor clientHeaderAccessor) { diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java index c5d0414f4d..ead37f43f9 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java @@ -372,8 +372,8 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE /** * Handle STOMP messages going back out to WebSocket clients. */ - @SuppressWarnings("unchecked") @Override + @SuppressWarnings("unchecked") public void handleMessageToClient(WebSocketSession session, Message message) { if (!(message.getPayload() instanceof byte[])) { logger.error("Expected byte[] payload. Ignoring " + message + "."); @@ -527,6 +527,7 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE return (headerAccessor.isMutable() ? headerAccessor : StompHeaderAccessor.wrap(message)); } + @SuppressWarnings("deprecation") private StompHeaderAccessor afterStompSessionConnected(Message message, StompHeaderAccessor accessor, WebSocketSession session) { @@ -573,6 +574,7 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE } @Override + @SuppressWarnings("deprecation") public void afterSessionEnded(WebSocketSession session, CloseStatus closeStatus, MessageChannel outputChannel) { this.decoders.remove(session.getId()); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractXhrTransport.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractXhrTransport.java index ce77aeb279..7b7f51d22d 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractXhrTransport.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractXhrTransport.java @@ -112,8 +112,8 @@ public abstract class AbstractXhrTransport implements XhrTransport { // Transport methods - @SuppressWarnings("deprecation") @Override + @SuppressWarnings("deprecation") public ListenableFuture connect(TransportRequest request, WebSocketHandler handler) { SettableListenableFuture connectFuture = new SettableListenableFuture(); XhrClientSockJsSession session = new XhrClientSockJsSession(request, handler, this, connectFuture); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/TransportRequest.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/TransportRequest.java index 94bd3c65c6..bb378bde20 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/TransportRequest.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/TransportRequest.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.web.socket.sockjs.client; import java.net.URI; import java.security.Principal; import org.springframework.http.HttpHeaders; -import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.WebSocketHttpHeaders; import org.springframework.web.socket.sockjs.frame.SockJsMessageCodec; /** @@ -38,7 +37,7 @@ import org.springframework.web.socket.sockjs.frame.SockJsMessageCodec; public interface TransportRequest { /** - * Return information about the SockJS URL including server and session id.. + * Return information about the SockJS URL including server and session ID. */ SockJsUrlInfo getSockJsUrlInfo(); @@ -49,14 +48,14 @@ public interface TransportRequest { /** * Return the headers to add to all other HTTP requests besides the handshake - * request such XHR receive and send requests. + * request such as XHR receive and send requests. * @since 4.2 */ HttpHeaders getHttpRequestHeaders(); /** * Return the transport URL for the given transport. - * For an {@link XhrTransport} this is the URL for receiving messages. + *

For an {@link XhrTransport} this is the URL for receiving messages. */ URI getTransportUrl(); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java index 5a8da5016b..51f69532ce 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java @@ -72,7 +72,6 @@ import org.springframework.web.socket.server.support.WebSocketHttpRequestHandler */ public class WebSocketMessageBrokerConfigurationSupportTests { - @Test public void handlerMapping() { ApplicationContext config = createConfig(TestChannelConfig.class, TestConfigurer.class); @@ -204,7 +203,6 @@ public class WebSocketMessageBrokerConfigurationSupportTests { } - @SuppressWarnings("unused") @Controller static class TestController { @@ -220,7 +218,6 @@ public class WebSocketMessageBrokerConfigurationSupportTests { } } - @SuppressWarnings("unused") @Configuration static class TestConfigurer extends AbstractWebSocketMessageBrokerConfigurer {