diff options
Diffstat (limited to 'jetty-websocket')
7 files changed, 34 insertions, 34 deletions
diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/HandshakeConnection.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/HandshakeConnection.java index 5ea0b01b85..cc2986c62b 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/HandshakeConnection.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/HandshakeConnection.java @@ -22,9 +22,9 @@ import java.util.Random; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor; -import org.eclipse.jetty.io.AbstractAsyncConnection; -import org.eclipse.jetty.io.AsyncConnection; -import org.eclipse.jetty.io.AsyncEndPoint; +import org.eclipse.jetty.io.AbstractConnection; +import org.eclipse.jetty.io.Connection; +import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.B64Code; import org.eclipse.jetty.util.FutureCallback; @@ -39,7 +39,7 @@ import org.eclipse.jetty.websocket.io.WebSocketAsyncConnection; * <p> * Results in a {@link WebSocketAsyncConnection} on successful handshake. */ -public class HandshakeConnection extends AbstractAsyncConnection implements AsyncConnection +public class HandshakeConnection extends AbstractConnection implements Connection { public static final String COOKIE_DELIM = "\"\\\n\r\t\f\b%+ ;="; private final WebSocketClient.ConnectFuture future; @@ -47,7 +47,7 @@ public class HandshakeConnection extends AbstractAsyncConnection implements Asyn private String key; - public HandshakeConnection(AsyncEndPoint endp, Executor executor, ByteBufferPool bufferPool, WebSocketClient.ConnectFuture future) + public HandshakeConnection(EndPoint endp, Executor executor, ByteBufferPool bufferPool, WebSocketClient.ConnectFuture future) { super(endp,executor); this.future = future; diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientAsyncConnection.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientAsyncConnection.java index 58ebadbc4f..07c328c508 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientAsyncConnection.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientAsyncConnection.java @@ -3,7 +3,7 @@ package org.eclipse.jetty.websocket.client.io; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.eclipse.jetty.io.AsyncEndPoint; +import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.client.WebSocketClientFactory; @@ -13,7 +13,7 @@ public class WebSocketClientAsyncConnection extends WebSocketAsyncConnection { private final WebSocketClientFactory factory; - public WebSocketClientAsyncConnection(AsyncEndPoint endp, Executor executor, ScheduledExecutorService scheduler, WebSocketPolicy policy, + public WebSocketClientAsyncConnection(EndPoint endp, Executor executor, ScheduledExecutorService scheduler, WebSocketPolicy policy, ByteBufferPool bufferPool, WebSocketClientFactory factory) { super(endp,executor,scheduler,policy,bufferPool); diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java index 5feec1d8b9..b6f8ce981c 100644 --- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java +++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/WebSocketClientSelectorManager.java @@ -25,8 +25,8 @@ import java.util.concurrent.atomic.AtomicReference; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLException; -import org.eclipse.jetty.io.AsyncConnection; -import org.eclipse.jetty.io.AsyncEndPoint; +import org.eclipse.jetty.io.Connection; +import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.SelectChannelEndPoint; import org.eclipse.jetty.io.SelectorManager; @@ -66,7 +66,7 @@ public class WebSocketClientSelectorManager extends SelectorManager return sslContextFactory; } - public AsyncConnection newAsyncConnection(SocketChannel channel, AsyncEndPoint endPoint, Object attachment) + public Connection newAsyncConnection(SocketChannel channel, EndPoint endPoint, Object attachment) { WebSocketClient.ConnectFuture confut = (WebSocketClient.ConnectFuture)attachment; WebSocketClientFactory factory = confut.getFactory(); @@ -78,7 +78,7 @@ public class WebSocketClientSelectorManager extends SelectorManager ScheduledExecutorService scheduler = factory.getScheduler(); WebSocketAsyncConnection connection = new WebSocketClientAsyncConnection(endPoint,executor,scheduler,policy,bufferPool,factory); - endPoint.setAsyncConnection(connection); + endPoint.setConnection(connection); connection.getParser().setIncomingFramesHandler(websocket); // TODO: track open websockets? bind open websocket to connection? @@ -87,7 +87,7 @@ public class WebSocketClientSelectorManager extends SelectorManager } @Override - public AsyncConnection newConnection(SocketChannel channel, AsyncEndPoint endPoint, Object attachment) + public Connection newConnection(SocketChannel channel, EndPoint endPoint, Object attachment) { WebSocketClient.ConnectFuture confut = (WebSocketClient.ConnectFuture)attachment; @@ -97,7 +97,7 @@ public class WebSocketClientSelectorManager extends SelectorManager if ((sslContextFactory != null) && ("wss".equalsIgnoreCase(scheme))) { - final AtomicReference<AsyncEndPoint> sslEndPointRef = new AtomicReference<>(); + final AtomicReference<EndPoint> sslEndPointRef = new AtomicReference<>(); final AtomicReference<Object> attachmentRef = new AtomicReference<>(attachment); SSLEngine engine = newSSLEngine(sslContextFactory,channel); SslConnection sslConnection = new SslConnection(bufferPool,executor,endPoint,engine) @@ -110,20 +110,20 @@ public class WebSocketClientSelectorManager extends SelectorManager super.onClose(); } }; - endPoint.setAsyncConnection(sslConnection); - AsyncEndPoint sslEndPoint = sslConnection.getDecryptedEndPoint(); + endPoint.setConnection(sslConnection); + EndPoint sslEndPoint = sslConnection.getDecryptedEndPoint(); sslEndPointRef.set(sslEndPoint); startHandshake(engine); - AsyncConnection connection = newAsyncConnection(channel,sslEndPoint,attachment); - endPoint.setAsyncConnection(connection); + Connection connection = newAsyncConnection(channel,sslEndPoint,attachment); + endPoint.setConnection(connection); return connection; } else { - AsyncConnection connection = newAsyncConnection(channel,endPoint,attachment); - endPoint.setAsyncConnection(connection); + Connection connection = newAsyncConnection(channel,endPoint,attachment); + endPoint.setConnection(connection); return connection; } } diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java index abaaae7eb1..0a815976bf 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java @@ -25,9 +25,9 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.eclipse.jetty.io.AbstractAsyncConnection; -import org.eclipse.jetty.io.AsyncConnection; -import org.eclipse.jetty.io.AsyncEndPoint; +import org.eclipse.jetty.io.AbstractConnection; +import org.eclipse.jetty.io.Connection; +import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; @@ -46,9 +46,9 @@ import org.eclipse.jetty.websocket.protocol.Parser; import org.eclipse.jetty.websocket.protocol.WebSocketFrame; /** - * Provides the implementation of {@link WebSocketConnection} within the framework of the new {@link AsyncConnection} framework of jetty-io + * Provides the implementation of {@link WebSocketConnection} within the framework of the new {@link Connection} framework of jetty-io */ -public abstract class WebSocketAsyncConnection extends AbstractAsyncConnection implements RawConnection, OutgoingFrames +public abstract class WebSocketAsyncConnection extends AbstractConnection implements RawConnection, OutgoingFrames { private static final Logger LOG = Log.getLogger(WebSocketAsyncConnection.class); private static final Logger LOG_FRAMES = Log.getLogger("org.eclipse.jetty.websocket.io.Frames"); @@ -64,7 +64,7 @@ public abstract class WebSocketAsyncConnection extends AbstractAsyncConnection i private boolean flushing; private AtomicLong writes; - public WebSocketAsyncConnection(AsyncEndPoint endp, Executor executor, ScheduledExecutorService scheduler, WebSocketPolicy policy, ByteBufferPool bufferPool) + public WebSocketAsyncConnection(EndPoint endp, Executor executor, ScheduledExecutorService scheduler, WebSocketPolicy policy, ByteBufferPool bufferPool) { super(endp,executor); this.policy = policy; @@ -111,7 +111,7 @@ public abstract class WebSocketAsyncConnection extends AbstractAsyncConnection i @Override public void disconnect(boolean onlyOutput) { - AsyncEndPoint endPoint = getEndPoint(); + EndPoint endPoint = getEndPoint(); // We need to gently close first, to allow // SSL close alerts to be sent by Jetty LOG.debug("Shutting down output {}",endPoint); @@ -275,7 +275,7 @@ public abstract class WebSocketAsyncConnection extends AbstractAsyncConnection i private int read(ByteBuffer buffer) { - AsyncEndPoint endPoint = getEndPoint(); + EndPoint endPoint = getEndPoint(); try { while (true) @@ -367,7 +367,7 @@ public abstract class WebSocketAsyncConnection extends AbstractAsyncConnection i private <C> void write(ByteBuffer buffer, WebSocketAsyncConnection webSocketAsyncConnection, FrameBytes<C> frameBytes) { - AsyncEndPoint endpoint = getEndPoint(); + EndPoint endpoint = getEndPoint(); if (LOG_FRAMES.isDebugEnabled()) { diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerAsyncConnection.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerAsyncConnection.java index b0f82bed8c..322d1fe11e 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerAsyncConnection.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerAsyncConnection.java @@ -3,7 +3,7 @@ package org.eclipse.jetty.websocket.server; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.eclipse.jetty.io.AsyncEndPoint; +import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.io.WebSocketAsyncConnection; @@ -13,7 +13,7 @@ public class WebSocketServerAsyncConnection extends WebSocketAsyncConnection private final WebSocketServerFactory factory; private boolean connected; - public WebSocketServerAsyncConnection(AsyncEndPoint endp, Executor executor, ScheduledExecutorService scheduler, WebSocketPolicy policy, + public WebSocketServerAsyncConnection(EndPoint endp, Executor executor, ScheduledExecutorService scheduler, WebSocketPolicy policy, ByteBufferPool bufferPool, WebSocketServerFactory factory) { super(endp,executor,scheduler,policy,bufferPool); diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java index 971798f4e8..ee6436c853 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java @@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.jetty.io.AsyncEndPoint; +import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.StandardByteBufferPool; import org.eclipse.jetty.server.HttpConnection; @@ -353,7 +353,7 @@ public class WebSocketServerFactory extends AbstractLifeCycle implements WebSock // Create connection HttpConnection http = HttpConnection.getCurrentConnection(); - AsyncEndPoint endp = http.getEndPoint(); + EndPoint endp = http.getEndPoint(); Executor executor = http.getConnector().getExecutor(); ByteBufferPool bufferPool = http.getConnector().getByteBufferPool(); WebSocketServerAsyncConnection connection = new WebSocketServerAsyncConnection(endp,executor,scheduler,websocket.getPolicy(),bufferPool,this); diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java index 7b4f385f24..bc9ce75167 100644 --- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java +++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; import junit.framework.Assert; -import org.eclipse.jetty.io.AsyncEndPoint; +import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.server.SelectChannelConnector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.DefaultHandler; @@ -59,7 +59,7 @@ public class WebSocketLoadRFC6455Test private final BufferedReader input; private final int iterations; private final CountDownLatch latch; - private/* final */AsyncEndPoint _endp; + private/* final */EndPoint _endp; private final Generator _generator; private final Parser _parser; private final IncomingFrames _handler = new IncomingFrames() |