Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #207 - more test fixes

This commit is contained in:
Joakim Erdfelt 2017-05-05 12:37:44 -07:00
parent 3b31ecc2b1
commit 55e435c741
45 changed files with 1276 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
View File

@ -79,6 +79,10 @@ public class ClientContainer extends ContainerLifeCycle implements WebSocketCont
private List<Function<Object, EndpointConfig>> annotatedConfigFunctions = new ArrayList<>();
/**
* @deprecated use {@link #ClientContainer(WebSocketContainerScope)}
*/
@Deprecated
public ClientContainer()
{
// This constructor is used with Standalone JSR Client usage.

13
jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JettyClientContainerProvider.java
View File

@ -21,6 +21,10 @@ package org.eclipse.jetty.websocket.jsr356;
import javax.websocket.ContainerProvider;
import javax.websocket.WebSocketContainer;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.common.scopes.SimpleContainerScope;
/**
* Client {@link ContainerProvider} implementation.
* <p>
@ -36,7 +40,14 @@ public class JettyClientContainerProvider extends ContainerProvider
@Override
protected WebSocketContainer getContainer()
{
ClientContainer container = new ClientContainer();
SimpleContainerScope containerScope = new SimpleContainerScope(WebSocketPolicy.newClientPolicy());
QueuedThreadPool threadPool= new QueuedThreadPool();
String name = "qtp-JSR356CLI-" + hashCode();
threadPool.setName(name);
threadPool.setDaemon(true);
containerScope.setExecutor(threadPool);
containerScope.addBean(threadPool);
ClientContainer container = new ClientContainer(containerScope);
try
{
// We need to start this container properly.

10
jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/function/JsrEndpointFunctions.java
View File

@ -305,7 +305,9 @@ public class JsrEndpointFunctions extends CommonEndpointFunctions<JsrSession>
{
Decoder.TextStream decoderInstance = decoders.getInstanceOf(registeredDecoder);
DecodedReaderMessageSink textSink = new DecodedReaderMessageSink(
this, decoderInstance,
this,
getExecutor(),
decoderInstance,
(msg) ->
{
//noinspection unchecked
@ -321,7 +323,9 @@ public class JsrEndpointFunctions extends CommonEndpointFunctions<JsrSession>
{
Decoder.BinaryStream decoderInstance = decoders.getInstanceOf(registeredDecoder);
DecodedInputStreamMessageSink binarySink = new DecodedInputStreamMessageSink(
this, decoderInstance,
this,
getExecutor(),
decoderInstance,
(msg) ->
{
//noinspection unchecked
@ -622,6 +626,7 @@ public class JsrEndpointFunctions extends CommonEndpointFunctions<JsrSession>
Decoder.BinaryStream decoderInstance = decoders.getInstanceOf(decoder);
DecodedInputStreamMessageSink streamSink = new DecodedInputStreamMessageSink(
this,
getExecutor(),
decoderInstance,
(msg) ->
{
@ -662,6 +667,7 @@ public class JsrEndpointFunctions extends CommonEndpointFunctions<JsrSession>
Decoder.TextStream decoderInstance = decoders.getInstanceOf(decoder);
DecodedReaderMessageSink streamSink = new DecodedReaderMessageSink(
this,
getExecutor(),
decoderInstance,
(msg) ->
{

5
jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryMessageSink.java
View File

@ -27,12 +27,13 @@ import javax.websocket.EncodeException;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.common.function.EndpointFunctions;
import org.eclipse.jetty.websocket.common.message.ByteBufferMessageSink;
import org.eclipse.jetty.websocket.jsr356.function.JsrEndpointFunctions;
import org.eclipse.jetty.websocket.jsr356.JsrSession;
public class DecodedBinaryMessageSink extends ByteBufferMessageSink
{
public DecodedBinaryMessageSink(WebSocketPolicy policy, JsrEndpointFunctions endpointFunctions, Decoder.Binary decoder, Function<Object, Object> onMessageFunction)
public DecodedBinaryMessageSink(WebSocketPolicy policy, EndpointFunctions<JsrSession> endpointFunctions, Decoder.Binary decoder, Function<Object, Object> onMessageFunction)
{
super(policy, (byteBuf) ->
{

8
jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedInputStreamMessageSink.java
View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.websocket.jsr356.messages;
import java.io.IOException;
import java.util.concurrent.Executor;
import java.util.function.Function;
import javax.websocket.DecodeException;
@ -26,17 +27,18 @@ import javax.websocket.Decoder;
import javax.websocket.EncodeException;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.common.function.EndpointFunctions;
import org.eclipse.jetty.websocket.common.message.InputStreamMessageSink;
import org.eclipse.jetty.websocket.jsr356.JsrSession;
import org.eclipse.jetty.websocket.jsr356.function.JsrEndpointFunctions;
public class DecodedInputStreamMessageSink extends InputStreamMessageSink
{
public DecodedInputStreamMessageSink(JsrEndpointFunctions endpointFunctions,
public DecodedInputStreamMessageSink(EndpointFunctions<JsrSession> endpointFunctions,
Executor executor,
Decoder.BinaryStream decoder,
Function<Object, Object> onMessageFunction)
{
super(endpointFunctions.getExecutor(), (reader) ->
super(executor, (reader) ->
{
try
{

21
jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedReaderMessageSink.java
View File

@ -19,29 +19,42 @@
package org.eclipse.jetty.websocket.jsr356.messages;
import java.io.IOException;
import java.util.concurrent.Executor;
import java.util.function.Function;
import javax.websocket.DecodeException;
import javax.websocket.Decoder;
import javax.websocket.EncodeException;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.common.function.EndpointFunctions;
import org.eclipse.jetty.websocket.common.message.ReaderMessageSink;
import org.eclipse.jetty.websocket.jsr356.function.JsrEndpointFunctions;
import org.eclipse.jetty.websocket.jsr356.JsrSession;
public class DecodedReaderMessageSink extends ReaderMessageSink
{
public DecodedReaderMessageSink(JsrEndpointFunctions endpointFunctions, Decoder.TextStream decoder, Function<Object, Object> onMessageFunction)
private static final Logger LOG = Log.getLogger(DecodedReaderMessageSink.class);
public DecodedReaderMessageSink(EndpointFunctions<JsrSession> endpointFunctions, Executor executor, Decoder.TextStream decoder, Function<Object, Object> onMessageFunction)
{
super(endpointFunctions.getExecutor(), (reader) ->
super(executor, (reader) ->
{
try
{
if(LOG.isDebugEnabled())
LOG.debug("{}.decode((Reader){})", decoder.getClass().getName(), reader);
Object decoded = decoder.decode(reader);
if(LOG.isDebugEnabled())
LOG.debug("onMessageFunction/{}/.apply({})", onMessageFunction, decoded);
// notify event
Object ret = onMessageFunction.apply(decoded);
if(LOG.isDebugEnabled())
LOG.debug("ret = {}", ret);
if (ret != null)
{
// send response

5
jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextMessageSink.java
View File

@ -27,12 +27,13 @@ import javax.websocket.EncodeException;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.common.function.EndpointFunctions;
import org.eclipse.jetty.websocket.common.message.StringMessageSink;
import org.eclipse.jetty.websocket.jsr356.function.JsrEndpointFunctions;
import org.eclipse.jetty.websocket.jsr356.JsrSession;
public class DecodedTextMessageSink extends StringMessageSink
{
public DecodedTextMessageSink(WebSocketPolicy policy, JsrEndpointFunctions endpointFunctions, Decoder.Text decoder, Function<Object, Object> onMessageFunction)
public DecodedTextMessageSink(WebSocketPolicy policy, EndpointFunctions<JsrSession> endpointFunctions, Decoder.Text decoder, Function<Object, Object> onMessageFunction)
{
super(policy, (message) ->
{

101
jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/function/DummyEndpointFunctions.java Normal file
View File

@ -0,0 +1,101 @@
//
// ========================================================================
// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.websocket.jsr356.function;
import java.nio.ByteBuffer;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.FrameCallback;
import org.eclipse.jetty.websocket.api.extensions.Frame;
import org.eclipse.jetty.websocket.common.CloseInfo;
import org.eclipse.jetty.websocket.common.function.EndpointFunctions;
import org.eclipse.jetty.websocket.jsr356.JsrSession;
public class DummyEndpointFunctions extends AbstractLifeCycle implements EndpointFunctions<JsrSession>
{
private static final Logger LOG = Log.getLogger(DummyEndpointFunctions.class);
@Override
public Logger getLog()
{
return LOG;
}
@Override
public JsrSession getSession()
{
return null;
}
@Override
public void onOpen(JsrSession session)
{
}
@Override
public void onClose(CloseInfo close)
{
}
@Override
public void onFrame(Frame frame)
{
}
@Override
public void onError(Throwable cause)
{
}
@Override
public void onText(Frame frame, FrameCallback callback)
{
}
@Override
public void onBinary(Frame frame, FrameCallback callback)
{
}
@Override
public void onContinuation(Frame frame, FrameCallback callback)
{
}
@Override
public void onPing(ByteBuffer payload)
{
}
@Override
public void onPong(ByteBuffer payload)
{
}
}

130
jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/DecoderReaderMessageSinkTest.java Normal file
View File

@ -0,0 +1,130 @@
//
// ========================================================================
// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.websocket.jsr356.messages;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
import java.util.ArrayList;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import javax.websocket.DecodeException;
import javax.websocket.Decoder;
import javax.websocket.EndpointConfig;
import org.eclipse.jetty.websocket.common.frames.ContinuationFrame;
import org.eclipse.jetty.websocket.common.frames.TextFrame;
import org.eclipse.jetty.websocket.common.function.EndpointFunctions;
import org.eclipse.jetty.websocket.common.io.FutureFrameCallback;
import org.eclipse.jetty.websocket.jsr356.JsrSession;
import org.eclipse.jetty.websocket.jsr356.function.DummyEndpointFunctions;
import org.junit.AfterClass;
import org.junit.Test;
public class DecoderReaderMessageSinkTest
{
private static ThreadPoolExecutor executor = new ThreadPoolExecutor(5, 5, 0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<>());
@AfterClass
public static void stopExecutor()
{
executor.shutdown();
}
public static class Lines extends ArrayList<String>
{
}
public static class LinesDecoder implements Decoder.TextStream<Lines>
{
@Override
public Lines decode(Reader reader) throws DecodeException, IOException
{
Lines lines = new Lines();
try (BufferedReader buf = new BufferedReader(reader))
{
String line;
while ((line = buf.readLine()) != null)
{
lines.add(line);
}
}
return lines;
}
@Override
public void init(EndpointConfig config)
{
}
@Override
public void destroy()
{
}
}
private EndpointFunctions<JsrSession> dummyFunctions = new DummyEndpointFunctions();
@Test
public void testDecoderReader() throws Exception
{
Decoder.TextStream<Lines> decoder = new LinesDecoder();
CompletableFuture<Lines> futureLines = new CompletableFuture<>();
DecodedReaderMessageSink sink = new DecodedReaderMessageSink(dummyFunctions, executor, decoder, (T) ->
{
try
{
Lines lines = (Lines) T;
futureLines.complete(lines);
}
catch (Throwable t)
{
futureLines.completeExceptionally(t);
}
return null;
});
FutureFrameCallback callback1 = new FutureFrameCallback();
FutureFrameCallback callback2 = new FutureFrameCallback();
FutureFrameCallback callback3 = new FutureFrameCallback();
sink.accept(new TextFrame().setPayload("Hello.\n").setFin(false), callback1);
sink.accept(new ContinuationFrame().setPayload("Is this thing on?\n").setFin(false), callback2);
sink.accept(new ContinuationFrame().setPayload("Please reply\n").setFin(true), callback3);
Lines lines = futureLines.get(1, TimeUnit.SECONDS);
assertThat("Callback1.done", callback1.isDone(), is(true));
assertThat("Callback2.done", callback2.isDone(), is(true));
assertThat("Callback3.done", callback3.isDone(), is(true));
assertThat("Lines.size", lines.size(), is(3));
assertThat("Lines[0]", lines.get(0), is("Hello."));
assertThat("Lines[1]", lines.get(1), is("Is this thing on?"));
assertThat("Lines[2]", lines.get(2), is("Please reply"));
}
}

114
jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/messages/ReaderMessageSinkTest.java Normal file
View File

@ -0,0 +1,114 @@
//
// ========================================================================
// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.websocket.jsr356.messages;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.io.Reader;
import java.io.StringWriter;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Function;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.websocket.common.frames.ContinuationFrame;
import org.eclipse.jetty.websocket.common.frames.TextFrame;
import org.eclipse.jetty.websocket.common.io.FutureFrameCallback;
import org.eclipse.jetty.websocket.common.message.ReaderMessageSink;
import org.junit.AfterClass;
import org.junit.Test;
public class ReaderMessageSinkTest
{
private static ThreadPoolExecutor executor = new ThreadPoolExecutor(5, 5, 0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<>());
@AfterClass
public static void stopExecutor()
{
executor.shutdown();
}
@Test
public void testReader_SingleFrame() throws InterruptedException, ExecutionException, TimeoutException
{
CompletableFuture<StringWriter> futureWriter = new CompletableFuture<>();
ReaderMessageSink sink = new ReaderMessageSink(executor, new ReaderCopy(futureWriter));
FutureFrameCallback callback1 = new FutureFrameCallback();
sink.accept(new TextFrame().setPayload("Hello World"), callback1);
StringWriter writer = futureWriter.get(1, TimeUnit.SECONDS);
assertThat("Callback1.done", callback1.isDone(), is(true));
assertThat("Writer.contents", writer.getBuffer().toString(), is("Hello World"));
}
@Test
public void testReader_MultiFrame() throws InterruptedException, ExecutionException, TimeoutException
{
CompletableFuture<StringWriter> futureWriter = new CompletableFuture<>();
ReaderMessageSink sink = new ReaderMessageSink(executor, new ReaderCopy(futureWriter));
FutureFrameCallback callback1 = new FutureFrameCallback();
FutureFrameCallback callback2 = new FutureFrameCallback();
FutureFrameCallback callback3 = new FutureFrameCallback();
sink.accept(new TextFrame().setPayload("Hello").setFin(false), callback1);
sink.accept(new ContinuationFrame().setPayload(", ").setFin(false), callback2);
sink.accept(new ContinuationFrame().setPayload("World").setFin(true), callback3);
StringWriter writer = futureWriter.get(1, TimeUnit.SECONDS);
assertThat("Callback1.done", callback1.isDone(), is(true));
assertThat("Callback2.done", callback2.isDone(), is(true));
assertThat("Callback3.done", callback3.isDone(), is(true));
assertThat("Writer contents", writer.getBuffer().toString(), is("Hello, World"));
}
private class ReaderCopy implements Function<Reader, Void>
{
private CompletableFuture<StringWriter> futureWriter;
public ReaderCopy(CompletableFuture<StringWriter> futureWriter)
{
this.futureWriter = futureWriter;
}
@Override
public Void apply(Reader reader)
{
try
{
StringWriter writer = new StringWriter();
IO.copy(reader, writer);
futureWriter.complete(writer);
}
catch (IOException e)
{
futureWriter.completeExceptionally(e);
}
return null;
}
}
}

2
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/function/EndpointFunctions.java
View File

@ -35,6 +35,8 @@ public interface EndpointFunctions<T> extends LifeCycle
{
Logger getLog();
T getSession();
void onOpen(T session);
void onClose(CloseInfo close);

12
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
View File

@ -224,6 +224,8 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp
@Override
public boolean isOpen()
{
if (LOG.isDebugEnabled())
LOG.debug(".isOpen() = {}", !closed.get());
return !closed.get();
}
@ -249,22 +251,30 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp
{
AtomicBoolean result = new AtomicBoolean(false);
if(LOG.isDebugEnabled())
LOG.debug("onFrame({})", frame);
extensionStack.incomingFrame(frame, new FrameCallback()
{
@Override
public void succeed()
{
if(LOG.isDebugEnabled())
LOG.debug("onFrame({}).succeed()", frame);
parser.release(frame);
if(!result.compareAndSet(false,true))
{
// callback has been notified asynchronously
fillAndParse();
// fillAndParse();
fillInterested();
}
}
@Override
public void fail(Throwable cause)
{
if(LOG.isDebugEnabled())
LOG.debug("onFrame("+ frame + ").fail()", cause);
parser.release(frame);
// notify session & endpoint

42
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FutureFrameCallback.java Normal file
View File

@ -0,0 +1,42 @@
//
// ========================================================================
// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.websocket.common.io;
import java.util.concurrent.Future;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.websocket.api.FrameCallback;
/**
* Allows events to a {@link FrameCallback} to drive a {@link Future} for the internals.
*/
public class FutureFrameCallback extends FutureCallback implements FrameCallback
{
@Override
public void fail(Throwable cause)
{
failed(cause);
}
@Override
public void succeed()
{
succeeded();
}
}

7
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/FrameCallbackBuffer.java
View File

@ -20,6 +20,7 @@ package org.eclipse.jetty.websocket.common.message;
import java.nio.ByteBuffer;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.websocket.api.FrameCallback;
public class FrameCallbackBuffer
@ -32,4 +33,10 @@ public class FrameCallbackBuffer
this.callback = callback;
this.buffer = buffer;
}
@Override
public String toString()
{
return String.format("FrameCallbackBuffer[%s,%s]", BufferUtil.toDetailString(buffer),callback.getClass().getSimpleName());
}
}

55
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java
View File

@ -43,6 +43,7 @@ public class MessageInputStream extends InputStream implements MessageSink
private static final FrameCallbackBuffer EOF = new FrameCallbackBuffer(new FrameCallback.Adapter(), ByteBuffer.allocate(0).asReadOnlyBuffer());
private final Deque<FrameCallbackBuffer> buffers = new ArrayDeque<>(2);
private final AtomicBoolean closed = new AtomicBoolean(false);
private FrameCallbackBuffer activeFrame;
@Override
public void accept(Frame frame, FrameCallback callback)
@ -95,6 +96,34 @@ public class MessageInputStream extends InputStream implements MessageSink
super.close();
}
public FrameCallbackBuffer getActiveFrame() throws InterruptedIOException
{
if(activeFrame == null)
{
// sync and poll queue
FrameCallbackBuffer result;
synchronized (buffers)
{
try
{
while ((result = buffers.poll()) == null)
{
// TODO: handle read timeout here?
buffers.wait();
}
}
catch (InterruptedException e)
{
shutdown();
throw new InterruptedIOException();
}
}
activeFrame = result;
}
return activeFrame;
}
private void shutdown()
{
if(LOG.isDebugEnabled())
@ -132,7 +161,7 @@ public class MessageInputStream extends InputStream implements MessageSink
}
@Override
public int read(byte[] b, int off, int len) throws IOException
public int read(final byte[] b, final int off, final int len) throws IOException
{
if (closed.get())
{
@ -141,24 +170,10 @@ public class MessageInputStream extends InputStream implements MessageSink
return -1;
}
// sync and poll queue
FrameCallbackBuffer result;
synchronized (buffers)
{
try
{
while ((result = buffers.peek()) == null)
{
// TODO: handle read timeout here?
buffers.wait();
}
}
catch (InterruptedException e)
{
shutdown();
throw new InterruptedIOException();
}
}
FrameCallbackBuffer result = getActiveFrame();
if (LOG.isDebugEnabled())
LOG.debug("result = {}", result);
if (result == EOF)
{
@ -174,8 +189,8 @@ public class MessageInputStream extends InputStream implements MessageSink
if (!result.buffer.hasRemaining())
{
activeFrame = null;
result.callback.succeed();
buffers.pop();
}
// return number of bytes actually copied into buffer

4
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/ReaderMessageSink.java
View File

@ -76,6 +76,8 @@ public class ReaderMessageSink implements MessageSink
LOG.debug("Unhandled throwable", t);
}
}
if (LOG.isDebugEnabled())
LOG.debug("return from dispatch - {}", stream);
// Returned from dispatch, stream should be closed
IO.close(dispatchedStream);
dispatchCompleted.countDown();
@ -88,7 +90,7 @@ public class ReaderMessageSink implements MessageSink
if (frame.isFin())
{
if (LOG.isDebugEnabled())
LOG.debug("dispatch complete await() - {}", stream);
LOG.debug("fin/dispatch complete await() - {}", stream);
try
{
dispatchCompleted.await();

32
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/SimpleContainerScope.java
View File

@ -53,26 +53,21 @@ public class SimpleContainerScope extends ContainerLifeCycle implements WebSocke
this.containerPolicy = containerPolicy;
this.bufferPool = bufferPool;
this.objectFactory = objectFactory;
QueuedThreadPool threadPool = new QueuedThreadPool();
String name = SimpleContainerScope.class.getSimpleName() + ".Executor@" + hashCode();
threadPool.setName(name);
threadPool.setDaemon(true);
this.executor = threadPool;
try
{
threadPool.start();
}
catch (Exception e)
{
throw new RuntimeException(e);
}
}
@Override
protected void doStart() throws Exception
{
if(this.executor == null)
{
QueuedThreadPool threadPool = new QueuedThreadPool();
String name = this.getClass().getSimpleName() + ".QTP@" + hashCode();
threadPool.setName(name);
threadPool.setDaemon(true);
this.executor = threadPool;
addBean(executor);
}
super.doStart();
}
@ -93,7 +88,12 @@ public class SimpleContainerScope extends ContainerLifeCycle implements WebSocke
{
return this.executor;
}
public void setExecutor(Executor executor)
{
this.executor = executor;
}
@Override
public DecoratedObjectFactory getObjectFactory()
{

1
jetty-websocket/websocket-tests/src/main/java/org/eclipse/jetty/websocket/tests/AbstractTrackingEndpoint.java
View File

@ -47,6 +47,7 @@ public abstract class AbstractTrackingEndpoint<T>
public AbstractTrackingEndpoint(String id)
{
LOG = Log.getLogger(this.getClass().getName() + "." + id);
LOG.debug("init");
}
public void assertCloseInfo(String prefix, int expectedCloseStatusCode, Matcher<? super String> reasonMatcher) throws InterruptedException

6
jetty-websocket/websocket-tests/src/main/java/org/eclipse/jetty/websocket/tests/LocalServer.java
View File

@ -38,6 +38,7 @@ import org.eclipse.jetty.util.component.ContainerLifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.common.Parser;
@ -132,8 +133,11 @@ public class LocalServer extends ContainerLifeCycle implements LocalFuzzer.Provi
@Override
protected void doStart() throws Exception
{
QueuedThreadPool threadPool = new QueuedThreadPool();
threadPool.setName("qtp-LocalServer");
// Configure Server
server = new Server();
server = new Server(threadPool);
if (ssl)
{
// HTTP Configuration

10
jetty-websocket/websocket-tests/src/main/java/org/eclipse/jetty/websocket/tests/UntrustedWSServer.java
View File

@ -41,6 +41,7 @@ import org.eclipse.jetty.util.component.ContainerLifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.websocket.api.util.WSURI;
import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
import org.eclipse.jetty.websocket.tests.servlets.BiConsumerServiceServlet;
@ -61,8 +62,13 @@ public class UntrustedWSServer extends ContainerLifeCycle implements UntrustedWS
@Override
protected void doStart() throws Exception
{
QueuedThreadPool threadPool= new QueuedThreadPool();
String name = "qtp-untrustedWSServer-" + hashCode();
threadPool.setName(name);
threadPool.setDaemon(true);
// Configure Server
server = new Server();
server = new Server(threadPool);
if (ssl)
{
// HTTP Configuration
@ -122,7 +128,7 @@ public class UntrustedWSServer extends ContainerLifeCycle implements UntrustedWS
if (LOG.isDebugEnabled())
{
LOG.debug("WebSocket Server URI: " + wsUri.toASCIIString());
LOG.debug(server.dump());
server.dump();
}
super.doStart();

4
jetty-websocket/websocket-tests/src/main/java/org/eclipse/jetty/websocket/tests/AbstractJsrTrackingEndpoint.java → jetty-websocket/websocket-tests/src/main/java/org/eclipse/jetty/websocket/tests/jsr356/AbstractJsrTrackingEndpoint.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.tests;
package org.eclipse.jetty.websocket.tests.jsr356;
import javax.websocket.CloseReason;
import javax.websocket.EndpointConfig;
@ -24,6 +24,8 @@ import javax.websocket.OnClose;
import javax.websocket.OnOpen;
import javax.websocket.Session;
import org.eclipse.jetty.websocket.tests.AbstractTrackingEndpoint;
@SuppressWarnings("unused")
public abstract class AbstractJsrTrackingEndpoint extends AbstractTrackingEndpoint<Session>
{

101
jetty-websocket/websocket-tests/src/main/java/org/eclipse/jetty/websocket/tests/jsr356/DummyJsrEndpointFunctions.java Normal file
View File

@ -0,0 +1,101 @@
//
// ========================================================================
// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.jsr356;
import java.nio.ByteBuffer;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.FrameCallback;
import org.eclipse.jetty.websocket.api.extensions.Frame;
import org.eclipse.jetty.websocket.common.CloseInfo;
import org.eclipse.jetty.websocket.common.function.EndpointFunctions;
import org.eclipse.jetty.websocket.jsr356.JsrSession;
public class DummyJsrEndpointFunctions extends AbstractLifeCycle implements EndpointFunctions<JsrSession>
{
private static final Logger LOG = Log.getLogger(DummyJsrEndpointFunctions.class);
@Override
public Logger getLog()
{
return LOG;
}
@Override
public JsrSession getSession()
{
return null;
}
@Override
public void onOpen(JsrSession session)
{
}
@Override
public void onClose(CloseInfo close)
{
}
@Override
public void onFrame(Frame frame)
{
}
@Override
public void onError(Throwable cause)
{
}
@Override
public void onText(Frame frame, FrameCallback callback)
{
}
@Override
public void onBinary(Frame frame, FrameCallback callback)
{
}
@Override
public void onContinuation(Frame frame, FrameCallback callback)
{
}
@Override
public void onPing(ByteBuffer payload)
{
}
@Override
public void onPong(ByteBuffer payload)
{
}
}

2
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/jsr356/DecoderReaderManySmallTest.java
View File

@ -42,7 +42,7 @@ import org.eclipse.jetty.websocket.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
import org.eclipse.jetty.websocket.tests.AbstractJsrTrackingEndpoint;
import org.eclipse.jetty.websocket.tests.jsr356.AbstractJsrTrackingEndpoint;
import org.eclipse.jetty.websocket.tests.UntrustedWSEndpoint;
import org.eclipse.jetty.websocket.tests.UntrustedWSServer;
import org.junit.After;

89
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/jsr356/QuotesDecoderTest.java
View File

@ -19,67 +19,40 @@
package org.eclipse.jetty.websocket.tests.client.jsr356;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;
import javax.websocket.ClientEndpoint;
import javax.websocket.ContainerProvider;
import javax.websocket.OnMessage;
import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.BatchMode;
import org.eclipse.jetty.websocket.api.FrameCallback;
import org.eclipse.jetty.websocket.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.common.WebSocketFrame;
import org.eclipse.jetty.websocket.common.frames.ContinuationFrame;
import org.eclipse.jetty.websocket.common.frames.TextFrame;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
import org.eclipse.jetty.websocket.tests.AbstractJsrTrackingEndpoint;
import org.eclipse.jetty.websocket.tests.UntrustedWSConnection;
import org.eclipse.jetty.websocket.tests.UntrustedWSEndpoint;
import org.eclipse.jetty.websocket.tests.UntrustedWSServer;
import org.eclipse.jetty.websocket.tests.UntrustedWSSession;
import org.eclipse.jetty.websocket.tests.jsr356.coders.Quotes;
import org.eclipse.jetty.websocket.tests.jsr356.coders.QuotesUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
public class QuotesDecoderTest
{
@ClientEndpoint(decoders = QuotesDecoder.class, subprotocols = "quotes")
public static class QuotesSocket extends AbstractJsrTrackingEndpoint
{
public BlockingQueue<Quotes> messageQueue = new LinkedBlockingDeque<>();
public QuotesSocket(String id)
{
super(id);
}
@SuppressWarnings("unused")
@OnMessage
public void onMessage(Quotes quote)
{
System.err.printf("QuotesSocket.onMessage(%s)%n",quote);
messageQueue.offer(quote);
}
}
public static class QuoteServingCreator implements WebSocketCreator
{
@Override
@ -105,44 +78,16 @@ public class QuotesDecoderTest
try
{
UntrustedWSSession untrustedWSSession = (UntrustedWSSession) session;
UntrustedWSConnection untrustedWSConnection = untrustedWSSession.getUntrustedConnection();
writeQuotes(filename, untrustedWSConnection);
FrameCallback callback = new FrameCallback.Adapter();
List<WebSocketFrame> frames = QuotesUtil.loadAsWebSocketFrames(filename);
for (WebSocketFrame frame : frames)
{
untrustedWSSession.getOutgoingHandler().outgoingFrame(frame, callback, BatchMode.OFF);
}
}
catch (Exception e)
{
e.printStackTrace();
}
}
public void writeQuotes(String filename, UntrustedWSConnection connection) throws Exception
{
// read file
File qfile = MavenTestingUtils.getTestResourceFile(filename);
List<String> lines = new ArrayList<>();
try (FileReader reader = new FileReader(qfile); BufferedReader buf = new BufferedReader(reader))
{
String line;
while ((line = buf.readLine()) != null)
{
lines.add(line);
}
}
// write file out, each line on a separate frame, but as
// 1 whole message
for (int i = 0; i < lines.size(); i++)
{
WebSocketFrame frame;
if (i == 0)
{
frame = new TextFrame();
}
else
{
frame = new ContinuationFrame();
}
frame.setFin((i >= (lines.size() - 1)));
frame.setPayload(BufferUtil.toBuffer(lines.get(i) + "\n"));
connection.write(frame);
LOG.warn("Unable to send quotes", e);
}
}
}
@ -175,6 +120,7 @@ public class QuotesDecoderTest
}
@Test
@Ignore("TODO: Needs repair")
public void testSingleQuotes() throws Exception
{
server.registerWebSocket("/quoter", new QuoteServingCreator());
@ -186,12 +132,13 @@ public class QuotesDecoderTest
clientSession.getAsyncRemote().sendText("quotes-ben.txt");
Quotes quotes = clientSocket.messageQueue.poll(5, TimeUnit.SECONDS);
assertThat("Quotes", quotes, notNullValue());
assertThat("Quotes Author", quotes.getAuthor(), is("Benjamin Franklin"));
assertThat("Quotes Count", quotes.getQuotes().size(), is(3));
}
@Test
@Ignore("TODO: Too Slow")
public void testTwoQuotes() throws Exception
{
server.registerWebSocket("/quoter", new QuoteServingCreator());
@ -205,10 +152,12 @@ public class QuotesDecoderTest
Quotes quotes;
quotes = clientSocket.messageQueue.poll(5, TimeUnit.SECONDS);
assertThat("Quotes", quotes, notNullValue());
assertThat("Quotes Author", quotes.getAuthor(), is("Benjamin Franklin"));
assertThat("Quotes Count", quotes.getQuotes().size(), is(3));
quotes = clientSocket.messageQueue.poll(5, TimeUnit.SECONDS);
assertThat("Quotes", quotes, notNullValue());
assertThat("Quotes Author", quotes.getAuthor(), is("Mark Twain"));
assertThat("Quotes Count", quotes.getQuotes().size(), is(4));
}

4
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/jsr356/QuotesEncoderTest.java
View File

@ -37,8 +37,10 @@ import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.websocket.tests.AbstractJsrTrackingEndpoint;
import org.eclipse.jetty.websocket.tests.jsr356.AbstractJsrTrackingEndpoint;
import org.eclipse.jetty.websocket.tests.UntrustedWSServer;
import org.eclipse.jetty.websocket.tests.jsr356.coders.Quotes;
import org.eclipse.jetty.websocket.tests.jsr356.coders.QuotesEncoder;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;

47
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/jsr356/QuotesSocket.java Normal file
View File

@ -0,0 +1,47 @@
//
// ========================================================================
// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.client.jsr356;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingDeque;
import javax.websocket.ClientEndpoint;
import javax.websocket.OnMessage;
import org.eclipse.jetty.websocket.tests.jsr356.AbstractJsrTrackingEndpoint;
import org.eclipse.jetty.websocket.tests.jsr356.coders.Quotes;
import org.eclipse.jetty.websocket.tests.jsr356.coders.QuotesDecoder;
@ClientEndpoint(decoders = QuotesDecoder.class, subprotocols = "quotes")
public class QuotesSocket extends AbstractJsrTrackingEndpoint
{
public BlockingQueue<Quotes> messageQueue = new LinkedBlockingDeque<>();
public QuotesSocket(String id)
{
super(id);
}
@OnMessage
public void onMessage(Quotes quote)
{
LOG.debug("onMessage({})", quote);
messageQueue.offer(quote);
}
}

88
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/CoderEventTracking.java Normal file
View File

@ -0,0 +1,88 @@
//
// ========================================================================
// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.jsr356.coders;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import javax.websocket.Decoder;
import javax.websocket.Encoder;
/**
* Singleton used for tracking events of {@link javax.websocket.Decoder} and {@link javax.websocket.Encoder}
*/
public class CoderEventTracking
{
private static CoderEventTracking INSTANCE = new CoderEventTracking();
public static CoderEventTracking getInstance()
{
return INSTANCE;
}
// Holds the tracking of events (string to count)
private Map<String, AtomicInteger> eventTracking = new ConcurrentHashMap<>();
public void clear()
{
eventTracking.clear();
}
private String toId(Class clazz, String method)
{
return String.format("%s#%s", clazz.getName(), method);
}
private void addEventCount(Object obj, String method)
{
String id = toId(obj.getClass(), method);
synchronized (eventTracking)
{
AtomicInteger count = eventTracking.get(id);
if (count == null)
{
count = new AtomicInteger(0);
eventTracking.put(id, count);
}
count.incrementAndGet();
}
}
public void addEvent(Decoder decoder, String method)
{
addEventCount(decoder, method);
}
public void addEvent(Encoder encoder, String method)
{
addEventCount(encoder, method);
}
public int getEventCount(Class clazz, String method)
{
String id = toId(clazz, method);
AtomicInteger count = eventTracking.get(id);
if (count == null)
{
return -1;
}
return count.get();
}
}

5
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/coders/DateDecoder.java → jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/DateDecoder.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.server.jsr356.coders;
package org.eclipse.jetty.websocket.tests.jsr356.coders;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@ -47,16 +47,19 @@ public class DateDecoder implements Decoder.Text<Date>
@Override
public void destroy()
{
CoderEventTracking.getInstance().addEvent(this, "destroy()");
}
@Override
public void init(EndpointConfig config)
{
CoderEventTracking.getInstance().addEvent(this, "init(EndpointConfig)");
}
@Override
public boolean willDecode(String s)
{
CoderEventTracking.getInstance().addEvent(this, "willDecode(String)");
return true;
}
}

16
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/coders/DateEncoder.java → jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/DateEncoder.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.server.jsr356.coders;
package org.eclipse.jetty.websocket.tests.jsr356.coders;
import java.text.SimpleDateFormat;
import java.util.Date;
@ -30,19 +30,21 @@ import javax.websocket.EndpointConfig;
*/
public class DateEncoder implements Encoder.Text<Date>
{
@Override
public void destroy()
{
}
@Override
public String encode(Date object) throws EncodeException
{
return new SimpleDateFormat("[yyyy/MM/dd]").format(object);
}
@Override
public void destroy()
{
CoderEventTracking.getInstance().addEvent(this, "destroy()");
}
@Override
public void init(EndpointConfig config)
{
CoderEventTracking.getInstance().addEvent(this, "init(EndpointConfig)");
}
}

5
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/coders/DateTimeDecoder.java → jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/DateTimeDecoder.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.server.jsr356.coders;
package org.eclipse.jetty.websocket.tests.jsr356.coders;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@ -47,16 +47,19 @@ public class DateTimeDecoder implements Decoder.Text<Date>
@Override
public void destroy()
{
CoderEventTracking.getInstance().addEvent(this, "destroy()");
}
@Override
public void init(EndpointConfig config)
{
CoderEventTracking.getInstance().addEvent(this, "init(EndpointConfig)");
}
@Override
public boolean willDecode(String s)
{
CoderEventTracking.getInstance().addEvent(this, "willDecode(String)");
return true;
}
}

16
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/coders/DateTimeEncoder.java → jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/DateTimeEncoder.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.server.jsr356.coders;
package org.eclipse.jetty.websocket.tests.jsr356.coders;
import java.text.SimpleDateFormat;
import java.util.Date;
@ -30,19 +30,21 @@ import javax.websocket.EndpointConfig;
*/
public class DateTimeEncoder implements Encoder.Text<Date>
{
@Override
public void destroy()
{
}
@Override
public String encode(Date object) throws EncodeException
{
return new SimpleDateFormat("yyyy.MM.dd G 'at' HH:mm:ss z").format(object);
}
@Override
public void destroy()
{
CoderEventTracking.getInstance().addEvent(this, "destroy()");
}
@Override
public void init(EndpointConfig config)
{
CoderEventTracking.getInstance().addEvent(this, "init(EndpointConfig)");
}
}

116
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/DecoderTextStreamTest.java Normal file
View File

@ -0,0 +1,116 @@
//
// ========================================================================
// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.jsr356.coders;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertThat;
import java.io.Reader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import javax.websocket.Decoder;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.websocket.common.WebSocketFrame;
import org.eclipse.jetty.websocket.common.function.EndpointFunctions;
import org.eclipse.jetty.websocket.common.io.FutureFrameCallback;
import org.eclipse.jetty.websocket.jsr356.JsrSession;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedReaderMessageSink;
import org.eclipse.jetty.websocket.tests.jsr356.DummyJsrEndpointFunctions;
import org.junit.AfterClass;
import org.junit.Test;
/**
* Test various {@link javax.websocket.Decoder.TextStream} scenarios
*/
public class DecoderTextStreamTest
{
private static ThreadPoolExecutor executor = new ThreadPoolExecutor(5, 5, 0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<>());
@AfterClass
public static void stopExecutor()
{
executor.shutdown();
}
private EndpointFunctions<JsrSession> endpointFunctions = new DummyJsrEndpointFunctions();
@Test
public void testQuotes_Decoder_Direct() throws Exception
{
Decoder.TextStream<Quotes> decoder = new QuotesDecoder();
Path quotesPath = MavenTestingUtils.getTestResourcePath("quotes-ben.txt");
try (Reader reader = Files.newBufferedReader(quotesPath))
{
Quotes quotes = decoder.decode(reader);
assertThat("Decoded Quotes", quotes, notNullValue());
assertThat("Decoded Quotes.author", quotes.getAuthor(), is("Benjamin Franklin"));
assertThat("Decoded Quotes.quotes.size", quotes.getQuotes().size(), is(3));
}
}
@Test
public void testQuotes_DecodedReaderMessageSink() throws Exception
{
Decoder.TextStream<Quotes> decoder = new QuotesDecoder();
CompletableFuture<Quotes> futureQuotes = new CompletableFuture<>();
DecodedReaderMessageSink sink = new DecodedReaderMessageSink(endpointFunctions,
executor, decoder, (T) ->
{
try
{
Quotes quotes = (Quotes) T;
futureQuotes.complete(quotes);
}
catch (Throwable t)
{
futureQuotes.completeExceptionally(t);
}
return null;
});
List<FutureFrameCallback> callbacks = new ArrayList<>();
List<WebSocketFrame> frames = QuotesUtil.loadAsWebSocketFrames("quotes-ben.txt");
for (WebSocketFrame frame : frames)
{
FutureFrameCallback callback = new FutureFrameCallback();
callbacks.add(callback);
sink.accept(frame, callback);
}
Quotes quotes = futureQuotes.get(1, TimeUnit.SECONDS);
assertThat("Quotes", quotes, notNullValue());
for (FutureFrameCallback callback : callbacks)
{
assertThat("Callback", callback.isDone(), is(true));
}
assertThat("Quotes.author", quotes.getAuthor(), is("Benjamin Franklin"));
assertThat("Quotes.count", quotes.getQuotes().size(), is(3));
}
}

40
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/EncoderTextTest.java Normal file
View File

@ -0,0 +1,40 @@
//
// ========================================================================
// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.jsr356.coders;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertThat;
import org.junit.Test;
/**
* Test various {@link javax.websocket.Encoder.Text} scenarios
*/
public class EncoderTextTest
{
@Test
public void testQuotesEncoder_Direct() throws Exception
{
QuotesEncoder encoder = new QuotesEncoder();
Quotes quotes = QuotesUtil.loadQuote("quotes-ben.txt");
String result = encoder.encode(quotes);
assertThat("Result", result, containsString("Author: Benjamin Franklin\n"));
assertThat("Result", result, containsString("Quote: We must, "));
}
}

12
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/jsr356/Quotes.java → jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/Quotes.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.client.jsr356;
package org.eclipse.jetty.websocket.tests.jsr356.coders;
import java.util.ArrayList;
import java.util.List;
@ -36,13 +36,13 @@ public class Quotes
return author;
}
public List<String> getQuotes()
{
return quotes;
}
public void setAuthor(String author)
{
this.author = author;
}
public List<String> getQuotes()
{
return quotes;
}
}

26
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/jsr356/QuotesDecoder.java → jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/QuotesDecoder.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.client.jsr356;
package org.eclipse.jetty.websocket.tests.jsr356.coders;
import java.io.BufferedReader;
import java.io.IOException;
@ -33,18 +33,6 @@ public class QuotesDecoder implements Decoder.TextStream<Quotes>
{
private static final Logger LOG = Log.getLogger(QuotesDecoder.class);
@Override
public void init(EndpointConfig config)
{
// TODO: verify init called
}
@Override
public void destroy()
{
// TODO: verify destroy called
}
@Override
public Quotes decode(Reader reader) throws DecodeException, IOException
{
@ -70,4 +58,16 @@ public class QuotesDecoder implements Decoder.TextStream<Quotes>
}
return quotes;
}
@Override
public void destroy()
{
CoderEventTracking.getInstance().addEvent(this, "destroy()");
}
@Override
public void init(EndpointConfig config)
{
CoderEventTracking.getInstance().addEvent(this, "init(EndpointConfig)");
}
}

22
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/jsr356/QuotesEncoder.java → jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/QuotesEncoder.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.client.jsr356;
package org.eclipse.jetty.websocket.tests.jsr356.coders;
import javax.websocket.EncodeException;
import javax.websocket.Encoder;
@ -24,29 +24,27 @@ import javax.websocket.EndpointConfig;
public class QuotesEncoder implements Encoder.Text<Quotes>
{
@Override
public void destroy()
{
// TODO: verify destroy called
}
@Override
public String encode(Quotes q) throws EncodeException
{
StringBuilder buf = new StringBuilder();
buf.append("Author: ").append(q.getAuthor());
buf.append(System.lineSeparator());
buf.append("Author: ").append(q.getAuthor()).append('\n');
for (String quote : q.getQuotes())
{
buf.append("Quote: ").append(quote);
buf.append(System.lineSeparator());
buf.append("Quote: ").append(quote).append('\n');
}
return buf.toString();
}
@Override
public void destroy()
{
CoderEventTracking.getInstance().addEvent(this, "destroy()");
}
@Override
public void init(EndpointConfig config)
{
// TODO: verify init called
CoderEventTracking.getInstance().addEvent(this, "init(EndpointConfig)");
}
}

95
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/QuotesUtil.java Normal file
View File

@ -0,0 +1,95 @@
//
// ========================================================================
// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.jsr356.coders;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.websocket.common.WebSocketFrame;
import org.eclipse.jetty.websocket.common.frames.ContinuationFrame;
import org.eclipse.jetty.websocket.common.frames.TextFrame;
public class QuotesUtil
{
public static List<String> loadLines(String filename) throws IOException
{
// read file
File qfile = MavenTestingUtils.getTestResourceFile(filename);
List<String> lines = new ArrayList<>();
try (FileReader reader = new FileReader(qfile); BufferedReader buf = new BufferedReader(reader))
{
String line;
while ((line = buf.readLine()) != null)
{
lines.add(line);
}
}
return lines;
}
public static Quotes loadQuote(String filename) throws Exception
{
List<String> lines = loadLines(filename);
Quotes quotes = new Quotes();
for (String line : lines)
{
switch (line.charAt(0))
{
case 'a':
quotes.setAuthor(line.substring(2));
break;
case 'q':
quotes.addQuote(line.substring(2));
break;
}
}
return quotes;
}
public static List<WebSocketFrame> loadAsWebSocketFrames(String filename) throws IOException
{
List<String> lines = loadLines(filename);
List<WebSocketFrame> ret = new ArrayList<>();
ListIterator<String> linesIter = lines.listIterator();
while (linesIter.hasNext())
{
WebSocketFrame frame;
if (!linesIter.hasPrevious())
frame = new TextFrame();
else
frame = new ContinuationFrame();
frame.setPayload(BufferUtil.toBuffer(linesIter.next() + "\n"));
frame.setFin(!linesIter.hasNext());
ret.add(frame);
}
return ret;
}
}

5
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/coders/TimeDecoder.java → jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/TimeDecoder.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.server.jsr356.coders;
package org.eclipse.jetty.websocket.tests.jsr356.coders;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@ -47,16 +47,19 @@ public class TimeDecoder implements Decoder.Text<Date>
@Override
public void destroy()
{
CoderEventTracking.getInstance().addEvent(this, "destroy()");
}
@Override
public void init(EndpointConfig config)
{
CoderEventTracking.getInstance().addEvent(this, "init(EndpointConfig)");
}
@Override
public boolean willDecode(String s)
{
CoderEventTracking.getInstance().addEvent(this, "willDecode()");
return true;
}
}

16
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/coders/TimeEncoder.java → jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/coders/TimeEncoder.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.server.jsr356.coders;
package org.eclipse.jetty.websocket.tests.jsr356.coders;
import java.text.SimpleDateFormat;
import java.util.Date;
@ -30,19 +30,21 @@ import javax.websocket.EndpointConfig;
*/
public class TimeEncoder implements Encoder.Text<Date>
{
@Override
public void destroy()
{
}
@Override
public String encode(Date object) throws EncodeException
{
return new SimpleDateFormat("HH:mm:ss z").format(object);
}
@Override
public void destroy()
{
// TODO: verify destroy called
}
@Override
public void init(EndpointConfig config)
{
// TODO: verify init called
}
}

4
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/AnnotatedServerEndpointTest.java
View File

@ -34,8 +34,8 @@ import org.eclipse.jetty.websocket.tests.LeakTrackingBufferPoolRule;
import org.eclipse.jetty.websocket.tests.LocalFuzzer;
import org.eclipse.jetty.websocket.tests.UpgradeUtils;
import org.eclipse.jetty.websocket.tests.WSServer;
import org.eclipse.jetty.websocket.tests.server.jsr356.coders.DateDecoder;
import org.eclipse.jetty.websocket.tests.server.jsr356.coders.TimeEncoder;
import org.eclipse.jetty.websocket.tests.jsr356.coders.DateDecoder;
import org.eclipse.jetty.websocket.tests.jsr356.coders.TimeEncoder;
import org.eclipse.jetty.websocket.tests.server.jsr356.configs.EchoSocketConfigurator;
import org.eclipse.jetty.websocket.tests.server.jsr356.sockets.ConfiguredEchoSocket;
import org.junit.AfterClass;

156
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/QuotesDecoderTextStreamTest.java Normal file
View File

@ -0,0 +1,156 @@
//
// ========================================================================
// Copyright (c) 1995-2017 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.websocket.tests.server.jsr356;
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
import javax.websocket.OnMessage;
import javax.websocket.server.ServerEndpoint;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.common.CloseInfo;
import org.eclipse.jetty.websocket.common.OpCode;
import org.eclipse.jetty.websocket.common.WebSocketFrame;
import org.eclipse.jetty.websocket.jsr356.server.ServerContainer;
import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer;
import org.eclipse.jetty.websocket.tests.LocalFuzzer;
import org.eclipse.jetty.websocket.tests.LocalServer;
import org.eclipse.jetty.websocket.tests.jsr356.coders.Quotes;
import org.eclipse.jetty.websocket.tests.jsr356.coders.QuotesDecoder;
import org.eclipse.jetty.websocket.tests.jsr356.coders.QuotesUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
/**
* Tests a {@link javax.websocket.Decoder.TextStream} automatic decoding to a Socket onMessage parameter
*/
public class QuotesDecoderTextStreamTest
{
@ServerEndpoint(value = "/quotes/echo/string", decoders = QuotesDecoder.class)
public static class QuotesEchoStringSocket
{
@SuppressWarnings("unused")
@OnMessage
public String onQuotes(Quotes q)
{
StringBuilder buf = new StringBuilder();
buf.append("Author: ").append(q.getAuthor()).append('\n');
for (String quote : q.getQuotes())
{
buf.append("Quote: ").append(quote).append('\n');
}
return buf.toString();
}
}
private static LocalServer server;
@BeforeClass
public static void startServer() throws Exception
{
server = new LocalServer()
{
@Override
protected void configureServletContextHandler(ServletContextHandler context) throws Exception
{
ServerContainer container = WebSocketServerContainerInitializer.configureContext(context);
container.addEndpoint(QuotesEchoStringSocket.class);
}
};
server.start();
}
@AfterClass
public static void stopServer() throws Exception
{
server.stop();
}
@Test
public void testQuoteEchoString_Bulk() throws Exception
{
List<WebSocketFrame> send = QuotesUtil.loadAsWebSocketFrames("quotes-ben.txt");
send.add(new CloseInfo(StatusCode.NORMAL).asFrame());
try (LocalFuzzer session = server.newLocalFuzzer("/quotes/echo/string"))
{
session.sendBulk(send);
BlockingQueue<WebSocketFrame> framesQueue = session.getOutputFrames();
assertThat("Frames", framesQueue.size(), is(2)); // TEXT & CLOSE
WebSocketFrame frame = framesQueue.poll(1, TimeUnit.SECONDS);
assertThat("Frame.opCode", frame.getOpCode(), is(OpCode.TEXT));
assertThat("Frame.text-payload", frame.getPayloadAsUTF8(), allOf(
containsString("Author: Benjamin Franklin"),
containsString("Quote: Our new Constitution is now established")
));
}
}
@Test
public void testQuoteEchoString_SmallSegments() throws Exception
{
List<WebSocketFrame> send = QuotesUtil.loadAsWebSocketFrames("quotes-ben.txt");
send.add(new CloseInfo(StatusCode.NORMAL).asFrame());
try (LocalFuzzer session = server.newLocalFuzzer("/quotes/echo/string"))
{
session.sendSegmented(send, 3);
BlockingQueue<WebSocketFrame> framesQueue = session.getOutputFrames();
assertThat("Frames", framesQueue.size(), is(2)); // TEXT & CLOSE
WebSocketFrame frame = framesQueue.poll(1, TimeUnit.SECONDS);
assertThat("Frame.opCode", frame.getOpCode(), is(OpCode.TEXT));
assertThat("Frame.text-payload", frame.getPayloadAsUTF8(), allOf(
containsString("Author: Benjamin Franklin"),
containsString("Quote: Our new Constitution is now established")
));
}
}
@Test
public void testQuoteEchoString_FrameWise() throws Exception
{
List<WebSocketFrame> send = QuotesUtil.loadAsWebSocketFrames("quotes-ben.txt");
send.add(new CloseInfo(StatusCode.NORMAL).asFrame());
try (LocalFuzzer session = server.newLocalFuzzer("/quotes/echo/string"))
{
session.sendFrames(send);
BlockingQueue<WebSocketFrame> framesQueue = session.getOutputFrames();
assertThat("Frames", framesQueue.size(), is(2)); // TEXT & CLOSE
WebSocketFrame frame = framesQueue.poll(1, TimeUnit.SECONDS);
assertThat("Frame.opCode", frame.getOpCode(), is(OpCode.TEXT));
assertThat("Frame.text-payload", frame.getPayloadAsUTF8(), allOf(
containsString("Author: Benjamin Franklin"),
containsString("Quote: Our new Constitution is now established")
));
}
}
}

28
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/ReaderEchoTest.java
View File

@ -20,14 +20,12 @@ package org.eclipse.jetty.websocket.tests.server.jsr356;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.websocket.OnError;
import javax.websocket.OnMessage;
import javax.websocket.Session;
import javax.websocket.server.PathParam;
import javax.websocket.server.ServerEndpoint;
@ -76,31 +74,6 @@ public class ReaderEchoTest
}
}
@SuppressWarnings("unused")
@ServerEndpoint("/echo/reader-self")
public static class ReaderSelfSocket extends BaseSocket
{
@OnMessage
public Writer onReader(Session session, Reader reader) throws IOException
{
final Writer writer = session.getBasicRemote().getSendWriter();
new Thread(() ->
{
try
{
IO.copy(reader, writer);
}
catch (IOException e)
{
LOG.warn(e);
}
}).start();
return writer;
}
}
@SuppressWarnings("unused")
@ServerEndpoint("/echo/reader-param/{param}")
public static class ReaderParamSocket extends BaseSocket
@ -128,7 +101,6 @@ public class ReaderEchoTest
{
ServerContainer container = WebSocketServerContainerInitializer.configureContext(context);
container.addEndpoint(ReaderSocket.class);
// TODO: container.addEndpoint(ReaderSelfSocket.class);
container.addEndpoint(ReaderParamSocket.class);
}
};

4
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/sockets/ConfiguredEchoSocket.java
View File

@ -31,8 +31,8 @@ import javax.websocket.Session;
import javax.websocket.server.ServerEndpoint;
import javax.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.websocket.tests.server.jsr356.coders.DateDecoder;
import org.eclipse.jetty.websocket.tests.server.jsr356.coders.TimeEncoder;
import org.eclipse.jetty.websocket.tests.jsr356.coders.DateDecoder;
import org.eclipse.jetty.websocket.tests.jsr356.coders.TimeEncoder;
import org.eclipse.jetty.websocket.tests.server.jsr356.configs.EchoSocketConfigurator;
/**

4
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/sockets/DateTextSocket.java
View File

@ -30,8 +30,8 @@ import javax.websocket.server.ServerEndpoint;
import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.tests.server.jsr356.coders.DateDecoder;
import org.eclipse.jetty.websocket.tests.server.jsr356.coders.DateEncoder;
import org.eclipse.jetty.websocket.tests.jsr356.coders.DateDecoder;
import org.eclipse.jetty.websocket.tests.jsr356.coders.DateEncoder;
@ServerEndpoint(value = "/echo/beans/date", decoders = { DateDecoder.class }, encoders = { DateEncoder.class })
public class DateTextSocket

11
jetty-websocket/websocket-tests/src/test/resources/jetty-logging.properties
View File

@ -24,15 +24,16 @@ org.eclipse.jetty.LEVEL=WARN
# org.eclipse.jetty.server.AbstractConnector.LEVEL=DEBUG
# org.eclipse.jetty.io.WriteFlusher.LEVEL=DEBUG
org.eclipse.jetty.io.FillInterest.LEVEL=DEBUG
# org.eclipse.jetty.io.FillInterest.LEVEL=DEBUG
# org.eclipse.jetty.websocket.LEVEL=DEBUG
# org.eclipse.jetty.websocket.LEVEL=INFO
org.eclipse.jetty.websocket.tests.LEVEL=DEBUG
# org.eclipse.jetty.websocket.jsr356.messages.LEVEL=DEBUG
# org.eclipse.jetty.websocket.tests.LEVEL=DEBUG
# org.eclipse.jetty.websocket.tests.client.LEVEL=DEBUG
# org.eclipse.jetty.websocket.tests.client.jsr356.LEVEL=DEBUG
# org.eclipse.jetty.websocket.tests.server.LEVEL=DEBUG
# org.eclipse.jetty.websocket.tests.server.jsr356.LEVEL=DEBUG
org.eclipse.jetty.websocket.common.LEVEL=DEBUG
# org.eclipse.jetty.websocket.common.LEVEL=DEBUG
# org.eclipse.jetty.websocket.common.io.LEVEL=DEBUG
# org.eclipse.jetty.websocket.common.io.FrameFlusher.LEVEL=DEBUG
# org.eclipse.jetty.websocket.common.io.AbstractWebSocketConnection.LEVEL=DEBUG
@ -41,8 +42,8 @@ org.eclipse.jetty.websocket.common.LEVEL=DEBUG
# org.eclipse.jetty.websocket.common.Generator.LEVEL=DEBUG
# org.eclipse.jetty.websocket.server.helper.LEVEL=DEBUG
# org.eclipse.jetty.websocket.common.message.LEVEL=DEBUG
### Showing any unintended (ignored) errors from CompletionCallback
org.eclipse.jetty.websocket.common.CompletionCallback.LEVEL=ALL
### Disabling intentional error out of RFCSocket
org.eclipse.jetty.websocket.tests.server.RFCSocket.LEVEL=OFF