Skip to content

Commit

Permalink
Issue #6328 - renaming and javadoc from review
Browse files Browse the repository at this point in the history 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
  • Loading branch information
@lachlan-roberts
lachlan-roberts committed Jun 3, 2022
1 parent f4cdfaa commit 49adfe5
Show file tree
Hide file tree
Showing 35 changed files with 301 additions and 352 deletions.
8 changes: 4 additions & 4 deletions ...src/main/java/org/eclipse/jetty/websocket/core/internal/messages/AbstractMessageSink.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
import java.util.Objects;

import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.internal.util.JettyMethodHandle;
import org.eclipse.jetty.websocket.core.internal.util.MethodHolder;

public abstract class AbstractMessageSink implements MessageSink
{
protected final CoreSession session;
protected final JettyMethodHandle methodHandle;
protected final MethodHolder methodHolder;

public AbstractMessageSink(CoreSession session, JettyMethodHandle methodHandle)
public AbstractMessageSink(CoreSession session, MethodHolder methodHolder)
{
this.session = Objects.requireNonNull(session, "CoreSession");
this.methodHandle = Objects.requireNonNull(methodHandle, "MethodHandle");
this.methodHolder = Objects.requireNonNull(methodHolder, "MethodHandle");
}
}
12 changes: 6 additions & 6 deletions ...rc/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteArrayMessageSink.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
import org.eclipse.jetty.websocket.core.internal.util.JettyMethodHandle;
import org.eclipse.jetty.websocket.core.internal.util.MethodHolder;

public class ByteArrayMessageSink extends AbstractMessageSink
{
private static final byte[] EMPTY_BUFFER = new byte[0];
private ByteBufferCallbackAccumulator out;

public ByteArrayMessageSink(CoreSession session, JettyMethodHandle methodHandle)
public ByteArrayMessageSink(CoreSession session, MethodHolder methodHolder)
{
super(session, methodHandle);
super(session, methodHolder);
}

@Override
Expand All @@ -52,10 +52,10 @@ public void accept(Frame frame, Callback callback)
if (frame.hasPayload())
{
byte[] buf = BufferUtil.toArray(frame.getPayload());
methodHandle.invoke(buf, 0, buf.length);
methodHolder.invoke(buf, 0, buf.length);
}
else
methodHandle.invoke(EMPTY_BUFFER, 0, 0);
methodHolder.invoke(EMPTY_BUFFER, 0, 0);

callback.succeeded();
session.demand(1);
Expand All @@ -76,7 +76,7 @@ public void accept(Frame frame, Callback callback)
if (frame.isFin())
{
byte[] buf = out.takeByteArray();
methodHandle.invoke(buf, 0, buf.length);
methodHolder.invoke(buf, 0, buf.length);
}

session.demand(1);
Expand Down
14 changes: 7 additions & 7 deletions ...c/main/java/org/eclipse/jetty/websocket/core/internal/messages/ByteBufferMessageSink.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,21 @@
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
import org.eclipse.jetty.websocket.core.internal.util.JettyMethodHandle;
import org.eclipse.jetty.websocket.core.internal.util.MethodHolder;

public class ByteBufferMessageSink extends AbstractMessageSink
{
private ByteBufferCallbackAccumulator out;

public ByteBufferMessageSink(CoreSession session, JettyMethodHandle methodHandle)
public ByteBufferMessageSink(CoreSession session, MethodHolder methodHolder)
{
super(session, methodHandle);
super(session, methodHolder);
}

@Deprecated
public ByteBufferMessageSink(CoreSession session, MethodHandle methodHandle)
{
this(session, JettyMethodHandle.from(methodHandle));
this(session, MethodHolder.from(methodHandle));
}

@Override
Expand All @@ -57,9 +57,9 @@ public void accept(Frame frame, Callback callback)
if (frame.isFin() && (out == null))
{
if (frame.hasPayload())
methodHandle.invoke(frame.getPayload());
methodHolder.invoke(frame.getPayload());
else
methodHandle.invoke(BufferUtil.EMPTY_BUFFER);
methodHolder.invoke(BufferUtil.EMPTY_BUFFER);

callback.succeeded();
session.demand(1);
Expand All @@ -85,7 +85,7 @@ public void accept(Frame frame, Callback callback)

try
{
methodHandle.invoke(buffer);
methodHolder.invoke(buffer);
}
finally
{
Expand Down
8 changes: 4 additions & 4 deletions ...c/main/java/org/eclipse/jetty/websocket/core/internal/messages/DispatchedMessageSink.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.internal.util.JettyMethodHandle;
import org.eclipse.jetty.websocket.core.internal.util.MethodHolder;

/**
* Centralized logic for Dispatched Message Handling.
Expand Down Expand Up @@ -98,9 +98,9 @@ public abstract class DispatchedMessageSink extends AbstractMessageSink
private MessageSink typeSink;
private final Executor executor;

public DispatchedMessageSink(CoreSession session, JettyMethodHandle methodHandle)
public DispatchedMessageSink(CoreSession session, MethodHolder methodHolder)
{
super(session, methodHandle);
super(session, methodHolder);
executor = session.getWebSocketComponents().getExecutor();
}

Expand All @@ -119,7 +119,7 @@ public void accept(Frame frame, final Callback callback)
{
try
{
methodHandle.invoke(typeSink);
methodHolder.invoke(typeSink);
if (typeSink instanceof Closeable)
IO.close((Closeable)typeSink);

Expand Down
8 changes: 4 additions & 4 deletions .../main/java/org/eclipse/jetty/websocket/core/internal/messages/InputStreamMessageSink.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@

import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.internal.util.JettyMethodHandle;
import org.eclipse.jetty.websocket.core.internal.util.MethodHolder;

public class InputStreamMessageSink extends DispatchedMessageSink
{
public InputStreamMessageSink(CoreSession session, JettyMethodHandle methodHandle)
public InputStreamMessageSink(CoreSession session, MethodHolder methodHolder)
{
super(session, methodHandle);
super(session, methodHolder);
}

@Deprecated
public InputStreamMessageSink(CoreSession session, MethodHandle methodHandle)
{
this(session, JettyMethodHandle.from(methodHandle));
this(session, MethodHolder.from(methodHandle));
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions .../java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteArrayMessageSink.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.internal.util.JettyMethodHandle;
import org.eclipse.jetty.websocket.core.internal.util.MethodHolder;

public class PartialByteArrayMessageSink extends AbstractMessageSink
{
private static final byte[] EMPTY_BUFFER = new byte[0];

public PartialByteArrayMessageSink(CoreSession session, JettyMethodHandle methodHandle)
public PartialByteArrayMessageSink(CoreSession session, MethodHolder methodHolder)
{
super(session, methodHandle);
super(session, methodHolder);
}

@Override
Expand All @@ -36,7 +36,7 @@ public void accept(Frame frame, Callback callback)
if (frame.hasPayload() || frame.isFin())
{
byte[] buffer = frame.hasPayload() ? BufferUtil.toArray(frame.getPayload()) : EMPTY_BUFFER;
methodHandle.invoke(buffer, frame.isFin());
methodHolder.invoke(buffer, frame.isFin());
}

callback.succeeded();
Expand Down
8 changes: 4 additions & 4 deletions ...java/org/eclipse/jetty/websocket/core/internal/messages/PartialByteBufferMessageSink.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.internal.util.JettyMethodHandle;
import org.eclipse.jetty.websocket.core.internal.util.MethodHolder;

public class PartialByteBufferMessageSink extends AbstractMessageSink
{
public PartialByteBufferMessageSink(CoreSession session, JettyMethodHandle methodHandle)
public PartialByteBufferMessageSink(CoreSession session, MethodHolder methodHolder)
{
super(session, methodHandle);
super(session, methodHolder);
}

@Override
Expand All @@ -31,7 +31,7 @@ public void accept(Frame frame, Callback callback)
try
{
if (frame.hasPayload() || frame.isFin())
methodHandle.invoke(frame.getPayload(), frame.isFin());
methodHolder.invoke(frame.getPayload(), frame.isFin());

callback.succeeded();
session.demand(1);
Expand Down
18 changes: 5 additions & 13 deletions ...ain/java/org/eclipse/jetty/websocket/core/internal/messages/PartialStringMessageSink.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,19 @@

package org.eclipse.jetty.websocket.core.internal.messages;

import java.lang.invoke.MethodHandle;

import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.Utf8StringBuilder;
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.internal.util.JettyMethodHandle;
import org.eclipse.jetty.websocket.core.internal.util.MethodHolder;

public class PartialStringMessageSink extends AbstractMessageSink
{
private Utf8StringBuilder out;

public PartialStringMessageSink(CoreSession session, JettyMethodHandle methodHandle)
{
super(session, methodHandle);
}

@Deprecated
public PartialStringMessageSink(CoreSession session, MethodHandle methodHandle)
public PartialStringMessageSink(CoreSession session, MethodHolder methodHolder)
{
this(session, JettyMethodHandle.from(methodHandle));
super(session, methodHolder);
}

@Override
Expand All @@ -47,12 +39,12 @@ public void accept(Frame frame, Callback callback)
out.append(frame.getPayload());
if (frame.isFin())
{
methodHandle.invoke(out.toString(), true);
methodHolder.invoke(out.toString(), true);
out = null;
}
else
{
methodHandle.invoke(out.takePartialString(), false);
methodHolder.invoke(out.takePartialString(), false);
}

callback.succeeded();
Expand Down
8 changes: 4 additions & 4 deletions ...n/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/ReaderMessageSink.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@

import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.internal.util.JettyMethodHandle;
import org.eclipse.jetty.websocket.core.internal.util.MethodHolder;

public class ReaderMessageSink extends DispatchedMessageSink
{
public ReaderMessageSink(CoreSession session, JettyMethodHandle methodHandle)
public ReaderMessageSink(CoreSession session, MethodHolder methodHolder)
{
super(session, methodHandle);
super(session, methodHolder);
}

@Deprecated
public ReaderMessageSink(CoreSession session, MethodHandle methodHandle)
{
this(session, JettyMethodHandle.from(methodHandle));
this(session, MethodHolder.from(methodHandle));
}

@Override
Expand Down
10 changes: 5 additions & 5 deletions ...n/src/main/java/org/eclipse/jetty/websocket/core/internal/messages/StringMessageSink.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
import org.eclipse.jetty.websocket.core.internal.util.JettyMethodHandle;
import org.eclipse.jetty.websocket.core.internal.util.MethodHolder;

public class StringMessageSink extends AbstractMessageSink
{
private Utf8StringBuilder out;
private int size;

public StringMessageSink(CoreSession session, JettyMethodHandle methodHandle)
public StringMessageSink(CoreSession session, MethodHolder methodHolder)
{
super(session, methodHandle);
super(session, methodHolder);
this.size = 0;
}

@Deprecated
public StringMessageSink(CoreSession session, MethodHandle methodHandle)
{
this(session, JettyMethodHandle.from(methodHandle));
this(session, MethodHolder.from(methodHandle));
}

@Override
Expand All @@ -57,7 +57,7 @@ public void accept(Frame frame, Callback callback)

out.append(frame.getPayload());
if (frame.isFin())
methodHandle.invoke(out.toString());
methodHolder.invoke(out.toString());

callback.succeeded();
session.demand(1);
Expand Down
55 changes: 0 additions & 55 deletions ...c/main/java/org/eclipse/jetty/websocket/core/internal/util/AbstractJettyMethodHandle.java
View file

This file was deleted.

Loading

0 comments on commit 49adfe5

Please sign in to comment.