Author: markt
Date: Tue Mar 5 14:55:56 2013
New Revision: 1452824
URL: http://svn.apache.org/r1452824
Log:
Refactoring towards v014 API (not yet complete)
Added:
tomcat/trunk/java/javax/websocket/ClientEndpointConfig.java
- copied, changed from r1452204,
tomcat/trunk/java/javax/websocket/ClientEndpointConfiguration.java
tomcat/trunk/java/javax/websocket/DefaultClientEndpointConfig.java
- copied, changed from r1452204,
tomcat/trunk/java/javax/websocket/DefaultClientEndpointConfiguration.java
tomcat/trunk/java/javax/websocket/EndpointConfig.java
- copied, changed from r1452204,
tomcat/trunk/java/javax/websocket/EndpointConfiguration.java
Removed:
tomcat/trunk/java/javax/websocket/ClientEndpointConfiguration.java
tomcat/trunk/java/javax/websocket/DefaultClientEndpointConfiguration.java
tomcat/trunk/java/javax/websocket/EndpointConfiguration.java
Modified:
tomcat/trunk/java/javax/websocket/ClientEndpointConfigurationBuilder.java
tomcat/trunk/java/javax/websocket/Endpoint.java
tomcat/trunk/java/javax/websocket/MessageHandler.java
tomcat/trunk/java/javax/websocket/SendResult.java
tomcat/trunk/java/javax/websocket/WebSocketContainer.java
tomcat/trunk/java/javax/websocket/server/ServerEndpointConfiguration.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TesterSingleMessageClient.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
Copied: tomcat/trunk/java/javax/websocket/ClientEndpointConfig.java (from
r1452204, tomcat/trunk/java/javax/websocket/ClientEndpointConfiguration.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/ClientEndpointConfig.java?p2=tomcat/trunk/java/javax/websocket/ClientEndpointConfig.java&p1=tomcat/trunk/java/javax/websocket/ClientEndpointConfiguration.java&r1=1452204&r2=1452824&rev=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/ClientEndpointConfiguration.java
(original)
+++ tomcat/trunk/java/javax/websocket/ClientEndpointConfig.java Tue Mar 5
14:55:56 2013
@@ -18,7 +18,7 @@ package javax.websocket;
import java.util.List;
-public interface ClientEndpointConfiguration extends EndpointConfiguration {
+public interface ClientEndpointConfig extends EndpointConfig {
List<String> getPreferredSubprotocols();
Modified:
tomcat/trunk/java/javax/websocket/ClientEndpointConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/ClientEndpointConfigurationBuilder.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/ClientEndpointConfigurationBuilder.java
(original)
+++ tomcat/trunk/java/javax/websocket/ClientEndpointConfigurationBuilder.java
Tue Mar 5 14:55:56 2013
@@ -37,8 +37,8 @@ public class ClientEndpointConfiguration
private List<Decoder> decoders = Collections.EMPTY_LIST;
- public ClientEndpointConfiguration build() {
- return new DefaultClientEndpointConfiguration(preferredSubprotocols,
+ public ClientEndpointConfig build() {
+ return new DefaultClientEndpointConfig(preferredSubprotocols,
extensions, encoders, decoders, configurator);
}
Copied: tomcat/trunk/java/javax/websocket/DefaultClientEndpointConfig.java
(from r1452204,
tomcat/trunk/java/javax/websocket/DefaultClientEndpointConfiguration.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/DefaultClientEndpointConfig.java?p2=tomcat/trunk/java/javax/websocket/DefaultClientEndpointConfig.java&p1=tomcat/trunk/java/javax/websocket/DefaultClientEndpointConfiguration.java&r1=1452204&r2=1452824&rev=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/DefaultClientEndpointConfiguration.java
(original)
+++ tomcat/trunk/java/javax/websocket/DefaultClientEndpointConfig.java Tue Mar
5 14:55:56 2013
@@ -20,8 +20,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-public class DefaultClientEndpointConfiguration
- implements ClientEndpointConfiguration {
+final class DefaultClientEndpointConfig implements ClientEndpointConfig {
private final List<String> preferredSubprotocols;
private final List<Extension> extensions;
@@ -31,7 +30,7 @@ public class DefaultClientEndpointConfig
private final ClientEndpointConfigurator configurator;
- DefaultClientEndpointConfiguration(List<String> preferredSubprotocols,
+ DefaultClientEndpointConfig(List<String> preferredSubprotocols,
List<Extension> extensions, List<Encoder> encoders,
List<Decoder> decoders, ClientEndpointConfigurator configurator) {
this.preferredSubprotocols = preferredSubprotocols;
@@ -67,7 +66,7 @@ public class DefaultClientEndpointConfig
@Override
- public Map<String, Object> getUserProperties() {
+ public final Map<String, Object> getUserProperties() {
return userProperties;
}
Modified: tomcat/trunk/java/javax/websocket/Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/Endpoint.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/Endpoint.java (original)
+++ tomcat/trunk/java/javax/websocket/Endpoint.java Tue Mar 5 14:55:56 2013
@@ -23,7 +23,7 @@ public abstract class Endpoint {
*
* @param session The new session.
*/
- public abstract void onOpen(Session session, EndpointConfiguration config);
+ public abstract void onOpen(Session session, EndpointConfig config);
/**
* Event that is triggered when a session has closed.
Copied: tomcat/trunk/java/javax/websocket/EndpointConfig.java (from r1452204,
tomcat/trunk/java/javax/websocket/EndpointConfiguration.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/EndpointConfig.java?p2=tomcat/trunk/java/javax/websocket/EndpointConfig.java&p1=tomcat/trunk/java/javax/websocket/EndpointConfiguration.java&r1=1452204&r2=1452824&rev=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/EndpointConfiguration.java (original)
+++ tomcat/trunk/java/javax/websocket/EndpointConfig.java Tue Mar 5 14:55:56
2013
@@ -19,7 +19,7 @@ package javax.websocket;
import java.util.List;
import java.util.Map;
-public interface EndpointConfiguration {
+public interface EndpointConfig {
List<Encoder> getEncoders();
Modified: tomcat/trunk/java/javax/websocket/MessageHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/MessageHandler.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/MessageHandler.java (original)
+++ tomcat/trunk/java/javax/websocket/MessageHandler.java Tue Mar 5 14:55:56
2013
@@ -18,7 +18,7 @@ package javax.websocket;
public interface MessageHandler {
- interface Async<T> extends MessageHandler {
+ interface Partial<T> extends MessageHandler {
/**
* Called when part of a message is available to be processed.
@@ -30,7 +30,7 @@ public interface MessageHandler {
void onMessage(T messagePart, boolean last);
}
- interface Basic<T> extends MessageHandler {
+ interface Whole<T> extends MessageHandler {
/**
* Called when a whole message is available to be processed.
Modified: tomcat/trunk/java/javax/websocket/SendResult.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/SendResult.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/SendResult.java (original)
+++ tomcat/trunk/java/javax/websocket/SendResult.java Tue Mar 5 14:55:56 2013
@@ -16,7 +16,7 @@
*/
package javax.websocket;
-public class SendResult {
+public final class SendResult {
private Throwable exception;
private boolean ok = true;
Modified: tomcat/trunk/java/javax/websocket/WebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/WebSocketContainer.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/WebSocketContainer.java (original)
+++ tomcat/trunk/java/javax/websocket/WebSocketContainer.java Tue Mar 5
14:55:56 2013
@@ -53,7 +53,7 @@ public interface WebSocketContainer {
* @throws DeploymentException If the connection can not be established
*/
Session connectToServer(Class<? extends Endpoint> endpoint,
- ClientEndpointConfiguration clientEndpointConfiguration, URI path)
+ ClientEndpointConfig clientEndpointConfiguration, URI path)
throws DeploymentException, IOException;
/**
Modified:
tomcat/trunk/java/javax/websocket/server/ServerEndpointConfiguration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/server/ServerEndpointConfiguration.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/server/ServerEndpointConfiguration.java
(original)
+++ tomcat/trunk/java/javax/websocket/server/ServerEndpointConfiguration.java
Tue Mar 5 14:55:56 2013
@@ -18,7 +18,7 @@ package javax.websocket.server;
import java.util.List;
-import javax.websocket.EndpointConfiguration;
+import javax.websocket.EndpointConfig;
import javax.websocket.Extension;
/**
@@ -26,7 +26,7 @@ import javax.websocket.Extension;
* server. Applications may provide their own implementation or use
* {@link ServerEndpointConfigurationBuilder}.
*/
-public interface ServerEndpointConfiguration extends EndpointConfiguration {
+public interface ServerEndpointConfiguration extends EndpointConfig {
Class<?> getEndpointClass();
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Tue Mar 5
14:55:56 2013
@@ -290,7 +290,7 @@ public abstract class WsFrameBase {
wsSession.getBasicRemote().sendPong(controlBufferBinary);
}
} else if (opCode == Constants.OPCODE_PONG) {
- MessageHandler.Basic<PongMessage> mhPong =
+ MessageHandler.Whole<PongMessage> mhPong =
wsSession.getPongMessageHandler();
if (mhPong != null) {
mhPong.onMessage(new WsPongMessage(controlBufferBinary));
@@ -313,11 +313,11 @@ public abstract class WsFrameBase {
private void sendMessageText(boolean last) {
MessageHandler mh = wsSession.getTextMessageHandler();
if (mh != null) {
- if (mh instanceof MessageHandler.Async<?>) {
- ((MessageHandler.Async<String>) mh).onMessage(
+ if (mh instanceof MessageHandler.Partial<?>) {
+ ((MessageHandler.Partial<String>) mh).onMessage(
messageBufferText.toString(), last);
} else {
- ((MessageHandler.Basic<String>) mh).onMessage(
+ ((MessageHandler.Whole<String>) mh).onMessage(
messageBufferText.toString());
}
messageBufferText.clear();
@@ -464,10 +464,10 @@ public abstract class WsFrameBase {
private void sendMessageBinary(ByteBuffer msg, boolean last) {
MessageHandler mh = wsSession.getBinaryMessageHandler();
if (mh != null) {
- if (mh instanceof MessageHandler.Async<?>) {
- ((MessageHandler.Async<ByteBuffer>) mh).onMessage(msg, last);
+ if (mh instanceof MessageHandler.Partial<?>) {
+ ((MessageHandler.Partial<ByteBuffer>) mh).onMessage(msg, last);
} else {
- ((MessageHandler.Basic<ByteBuffer>) mh).onMessage(msg);
+ ((MessageHandler.Whole<ByteBuffer>) mh).onMessage(msg);
}
}
}
@@ -530,14 +530,14 @@ public abstract class WsFrameBase {
} else if (textMessage) {
MessageHandler mh = wsSession.getTextMessageHandler();
if (mh != null) {
- return mh instanceof MessageHandler.Async<?>;
+ return mh instanceof MessageHandler.Partial<?>;
}
return false;
} else {
// Must be binary
MessageHandler mh = wsSession.getBinaryMessageHandler();
if (mh != null) {
- return mh instanceof MessageHandler.Async<?>;
+ return mh instanceof MessageHandler.Partial<?>;
}
return false;
}
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Tue Mar 5
14:55:56 2013
@@ -65,7 +65,7 @@ public class WsSession implements Sessio
private MessageHandler textMessageHandler = null;
private MessageHandler binaryMessageHandler = null;
- private MessageHandler.Basic<PongMessage> pongMessageHandler = null;
+ private MessageHandler.Whole<PongMessage> pongMessageHandler = null;
private volatile boolean open = true;
private final Object closeLock = new Object();
private final Map<String,Object> userProperties = new
ConcurrentHashMap<>();
@@ -143,9 +143,9 @@ public class WsSession implements Sessio
throw new IllegalStateException(
sm.getString("wsSession.duplicateHandlerPong"));
}
- if (listener instanceof MessageHandler.Basic<?>) {
+ if (listener instanceof MessageHandler.Whole<?>) {
pongMessageHandler =
- (MessageHandler.Basic<PongMessage>) listener;
+ (MessageHandler.Whole<PongMessage>) listener;
} else {
throw new IllegalStateException(
sm.getString("wsSession.invalidHandlerTypePong"));
@@ -390,7 +390,7 @@ public class WsSession implements Sessio
}
- protected MessageHandler.Basic<PongMessage> getPongMessageHandler() {
+ protected MessageHandler.Whole<PongMessage> getPongMessageHandler() {
return pongMessageHandler;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Tue
Mar 5 14:55:56 2013
@@ -37,7 +37,7 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import javax.websocket.ClientEndpointConfiguration;
+import javax.websocket.ClientEndpointConfig;
import javax.websocket.DeploymentException;
import javax.websocket.Endpoint;
import javax.websocket.Extension;
@@ -79,7 +79,7 @@ public class WsWebSocketContainer
@Override
public Session connectToServer(Class<? extends Endpoint> clazz,
- ClientEndpointConfiguration clientEndpointConfiguration, URI path)
+ ClientEndpointConfig clientEndpointConfiguration, URI path)
throws DeploymentException {
String scheme = path.getScheme();
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java Tue
Mar 5 14:55:56 2013
@@ -21,7 +21,7 @@ import java.util.Map;
import javax.websocket.CloseReason;
import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfiguration;
+import javax.websocket.EndpointConfig;
import javax.websocket.MessageHandler;
import javax.websocket.Session;
import javax.websocket.server.ServerEndpointConfiguration;
@@ -45,7 +45,7 @@ public class PojoEndpoint extends Endpoi
@Override
public void onOpen(Session session,
- EndpointConfiguration endpointConfiguration) {
+ EndpointConfig endpointConfiguration) {
ServerEndpointConfiguration sec =
(ServerEndpointConfiguration) endpointConfiguration;
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java
Tue Mar 5 14:55:56 2013
@@ -30,7 +30,7 @@ import javax.websocket.Session;
* @param <T> The type of message to handle
*/
public abstract class PojoMessageHandlerAsyncBase<T>
- extends PojoMessageHandlerBase<T> implements MessageHandler.Async<T> {
+ extends PojoMessageHandlerBase<T> implements MessageHandler.Partial<T>
{
private final int indexBoolean;
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java
Tue Mar 5 14:55:56 2013
@@ -30,7 +30,7 @@ import javax.websocket.Session;
* @param <T> The type of message to handle
*/
public abstract class PojoMessageHandlerBasicBase<T>
- extends PojoMessageHandlerBase<T> implements MessageHandler.Basic<T> {
+ extends PojoMessageHandlerBase<T> implements MessageHandler.Whole<T> {
public PojoMessageHandlerBasicBase(Object pojo, Method method,
Session session, Object[] params, int indexPayload,
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
Tue Mar 5 14:55:56 2013
@@ -29,7 +29,7 @@ import javax.servlet.http.WebConnection;
import javax.websocket.CloseReason;
import javax.websocket.CloseReason.CloseCodes;
import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfiguration;
+import javax.websocket.EndpointConfig;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -49,7 +49,7 @@ public class WsProtocolHandler implement
LogFactory.getLog(WsProtocolHandler.class);
private final Endpoint ep;
- private final EndpointConfiguration endpointConfig;
+ private final EndpointConfig endpointConfig;
private final ClassLoader applicationClassLoader;
private final ServerContainerImpl webSocketContainer;
private final WsRequest request;
@@ -60,7 +60,7 @@ public class WsProtocolHandler implement
private WsSession wsSession;
- public WsProtocolHandler(Endpoint ep, EndpointConfiguration endpointConfig,
+ public WsProtocolHandler(Endpoint ep, EndpointConfig endpointConfig,
ServerContainerImpl wsc, WsRequest request, String subProtocol,
Map<String,String> pathParameters, boolean secure) {
this.ep = ep;
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java Tue Mar 5
14:55:56 2013
@@ -96,7 +96,7 @@ public class TestUtil {
private static class SimpleMessageHandler
- implements MessageHandler.Basic<String> {
+ implements MessageHandler.Whole<String> {
@Override
public void onMessage(String message) {
// NO-OP
@@ -109,7 +109,7 @@ public class TestUtil {
private abstract static class GenericMessageHandler<T>
- implements MessageHandler.Basic<T> {
+ implements MessageHandler.Whole<T> {
}
@@ -129,7 +129,7 @@ public class TestUtil {
private abstract static class GenericMultipleMessageHandler<A,B>
- implements MessageHandler.Basic<A>, Foo<B> {
+ implements MessageHandler.Whole<A>, Foo<B> {
}
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Tue Mar 5 14:55:56 2013
@@ -31,7 +31,7 @@ import javax.websocket.ClientEndpointCon
import javax.websocket.ContainerProvider;
import javax.websocket.DeploymentException;
import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfiguration;
+import javax.websocket.EndpointConfig;
import javax.websocket.MessageHandler;
import javax.websocket.OnMessage;
import javax.websocket.Session;
@@ -450,7 +450,7 @@ public class TestWsWebSocketContainer ex
public static class BlockingBinaryHandler
- implements MessageHandler.Async<ByteBuffer> {
+ implements MessageHandler.Partial<ByteBuffer> {
@Override
public void onMessage(ByteBuffer messagePart, boolean last) {
@@ -472,7 +472,7 @@ public class TestWsWebSocketContainer ex
@Override
- public void onOpen(Session session, EndpointConfiguration config) {
+ public void onOpen(Session session, EndpointConfig config) {
// Reset everything
timeout = -1;
@@ -676,7 +676,7 @@ public class TestWsWebSocketContainer ex
public static final class EndpointA extends Endpoint {
@Override
- public void onOpen(Session session, EndpointConfiguration config) {
+ public void onOpen(Session session, EndpointConfig config) {
// NO-OP
}
}
@@ -685,7 +685,7 @@ public class TestWsWebSocketContainer ex
public static final class EndpointB extends Endpoint {
@Override
- public void onOpen(Session session, EndpointConfiguration config) {
+ public void onOpen(Session session, EndpointConfig config) {
// NO-OP
}
}
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TesterSingleMessageClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterSingleMessageClient.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/websocket/TesterSingleMessageClient.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/TesterSingleMessageClient.java
Tue Mar 5 14:55:56 2013
@@ -23,7 +23,7 @@ import java.util.concurrent.CountDownLat
import javax.websocket.CloseReason;
import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfiguration;
+import javax.websocket.EndpointConfig;
import javax.websocket.MessageHandler;
import javax.websocket.Session;
@@ -52,14 +52,14 @@ public class TesterSingleMessageClient {
}
@Override
- public void onOpen(Session session, EndpointConfiguration config) {
+ public void onOpen(Session session, EndpointConfig config) {
// NO-OP
}
}
public abstract static class BasicHandler<T>
- implements MessageHandler.Basic<T> {
+ implements MessageHandler.Whole<T> {
private final CountDownLatch latch;
@@ -110,7 +110,7 @@ public class TesterSingleMessageClient {
}
public abstract static class AsyncHandler<T>
- implements MessageHandler.Async<T> {
+ implements MessageHandler.Partial<T> {
private final CountDownLatch latch;
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java?rev=1452824&r1=1452823&r2=1452824&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
Tue Mar 5 14:55:56 2013
@@ -21,7 +21,7 @@ import java.io.IOException;
import javax.websocket.CloseReason;
import javax.websocket.CloseReason.CloseCodes;
import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfiguration;
+import javax.websocket.EndpointConfig;
import javax.websocket.MessageHandler;
import javax.websocket.RemoteEndpoint;
import javax.websocket.Session;
@@ -29,7 +29,7 @@ import javax.websocket.Session;
public class EchoEndpoint extends Endpoint{
@Override
- public void onOpen(Session session, EndpointConfiguration endpointConfig) {
+ public void onOpen(Session session, EndpointConfig endpointConfig) {
RemoteEndpoint.Basic remoteEndpointBasic = session.getBasicRemote();
session.addMessageHandler(new EchoMessageHandler(remoteEndpointBasic));
}
@@ -45,7 +45,7 @@ public class EchoEndpoint extends Endpoi
}
private static class EchoMessageHandler
- implements MessageHandler.Basic<String> {
+ implements MessageHandler.Whole<String> {
private final RemoteEndpoint.Basic remoteEndpointBasic;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
