Author: remy.maucherat(a)jboss.com Date: 2014-10-16 09:41:28 -0400 (Thu, 16 Oct 2014) New Revision: 2526 Modified: branches/7.5.x/src/main/java/javax/websocket/Session.java branches/7.5.x/src/main/java/org/apache/tomcat/websocket/WsSession.java Log: BZ1152526: Downgrade to the Websocket 1.0 signature. Modified: branches/7.5.x/src/main/java/javax/websocket/Session.java =================================================================== --- branches/7.5.x/src/main/java/javax/websocket/Session.java 2014-10-09 13:28:38 UTC (rev 2525) +++ branches/7.5.x/src/main/java/javax/websocket/Session.java 2014-10-16 13:41:28 UTC (rev 2526) @@ -31,22 +31,8 @@ */ WebSocketContainer getContainer(); - /** - * Registers a {@link MessageHandler} for incoming messages. Only one - * {@link MessageHandler} may be registered for each message type (text, - * binary, pong). The message type will be derived at runtime from the - * provided {@link MessageHandler} instance. It is not always possible to do - * this so it is better to use - * {@link #addMessageHandler(Class, javax.websocket.MessageHandler.Partial)} - * or - * {@link #addMessageHandler(Class, javax.websocket.MessageHandler.Whole)}. - * - * @param listener The message handler for a incoming message - * - * @throws IllegalStateException If a message handler has already been - * registered for the associated message type - */ - void addMessageHandler(MessageHandler listener) throws IllegalStateException; + void addMessageHandler(MessageHandler listener) + throws IllegalStateException; Set<MessageHandler> getMessageHandlers(); @@ -140,34 +126,4 @@ * this session is associated with. */ Set<Session> getOpenSessions(); - - /** - * Registers a {@link MessageHandler} for partial incoming messages. Only - * one {@link MessageHandler} may be registered for each message type (text - * or binary, pong messages are never presented as partial messages). - * - * @param clazz The type of message that the given handler is intended - * for - * @param listener The message handler for a incoming message - * - * @throws IllegalStateException If a message handler has already been - * registered for the associated message type - */ - <T> void addMessageHandler(Class<T> clazz, MessageHandler.Partial<T> handler) - throws IllegalStateException; - - /** - * Registers a {@link MessageHandler} for whole incoming messages. Only - * one {@link MessageHandler} may be registered for each message type (text, - * binary, pong). - * - * @param clazz The type of message that the given handler is intended - * for - * @param listener The message handler for a incoming message - * - * @throws IllegalStateException If a message handler has already been - * registered for the associated message type - */ - <T> void addMessageHandler(Class<T> clazz, MessageHandler.Whole<T> handler) - throws IllegalStateException; } Modified: branches/7.5.x/src/main/java/org/apache/tomcat/websocket/WsSession.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-10-09 13:28:38 UTC (rev 2525) +++ branches/7.5.x/src/main/java/org/apache/tomcat/websocket/WsSession.java 2014-10-16 13:41:28 UTC (rev 2526) @@ -170,14 +170,12 @@ } - @Override public <T> void addMessageHandler(Class<T> clazz, Partial<T> handler) throws IllegalStateException { doAddMessageHandler(clazz, handler); } - @Override public <T> void addMessageHandler(Class<T> clazz, Whole<T> handler) throws IllegalStateException { doAddMessageHandler(clazz, handler);