Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move websocket-util classes into websocket-core #5705

Merged
merged 31 commits into from
Dec 2, 2020
Merged

Move websocket-util classes into websocket-core #5705

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
704063d
merge websocket-util into websocket-core-common
lachlan-roberts Nov 19, 2020
855f125
move websocket-util-server implementation to websocket-core-server
lachlan-roberts Nov 19, 2020
67677b8
rename websocket-util-server to websocket-servlet
lachlan-roberts Nov 19, 2020
0ae5b8f
Negotiator should not need the WebSocketComponents, give this to hand…
lachlan-roberts Nov 19, 2020
b08a983
fix tests and WebSocketConfigurations
lachlan-roberts Nov 19, 2020
768a0c9
move exception classes in websocket-core-common
lachlan-roberts Nov 19, 2020
31cd606
move MessageSinks and util to internal package
lachlan-roberts Nov 20, 2020
b63b0fc
create internal package for websocket-core-client
lachlan-roberts Nov 20, 2020
fa17ab2
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…
lachlan-roberts Nov 23, 2020
50387ba
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…
lachlan-roberts Nov 23, 2020
6533d36
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…
lachlan-roberts Nov 24, 2020
f01b76b
fix JPMS warnings for websocket common modules
lachlan-roberts Nov 24, 2020
f79cc1e
Fixed exports declarations to make MethodHandles.publicLookup() worki…
sbordet Nov 24, 2020
d6ff622
fix broken tests with wrong WebSocketUpgradeFilter package name
lachlan-roberts Nov 25, 2020
6833a82
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…
lachlan-roberts Nov 25, 2020
fbf8113
remove -T3 option to not have parallel build
olamy Nov 26, 2020
e5bebf1
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…
lachlan-roberts Nov 26, 2020
85a2976
no need of jacoco here
olamy Nov 26, 2020
edb5b73
do no reuse forks
olamy Nov 26, 2020
ebc475c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…
lachlan-roberts Nov 27, 2020
6d14d48
remove logback dependency and disable debug log level
olamy Nov 27, 2020
fee17ec
make this test dynamic instead of hardcoded version...
olamy Nov 27, 2020
c930bee
use -fae
olamy Nov 27, 2020
ea71c81
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-websocket-util'.
sbordet Nov 27, 2020
df09b65
change websocket-servlet bundle symbolic name
lachlan-roberts Nov 30, 2020
63be444
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…
lachlan-roberts Dec 1, 2020
4636b22
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…
lachlan-roberts Dec 1, 2020
0206650
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-websocket-util'.
sbordet Dec 1, 2020
3525c76
cleanup changes
olamy Dec 1, 2020
2f61156
restore bugs....
olamy Dec 1, 2020
043d2d1
Updates after review.
sbordet Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pipeline {
steps {
container('jetty-build') {
timeout( time: 120, unit: 'MINUTES' ) {
joakime marked this conversation as resolved.
Show resolved Hide resolved
mavenBuild( "jdk11", "-T3 clean install", "maven3",
mavenBuild( "jdk11", "clean install", "maven3",
[[parserName: 'Maven'], [parserName: 'Java'], [parserName: 'JavaDoc']] )
// Collect up the jacoco execution results (only on main build)
jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
Expand Down Expand Up @@ -41,7 +41,7 @@ pipeline {
steps {
container( 'jetty-build' ) {
timeout( time: 120, unit: 'MINUTES' ) {
mavenBuild( "jdk15", "clean install -T3 -Djacoco.skip=true", "maven3",
mavenBuild( "jdk15", "clean install -Djacoco.skip=true", "maven3",
[[parserName: 'Maven'], [parserName: 'Java'], [parserName: 'JavaDoc']])
}
}
Expand Down
2 changes: 1 addition & 1 deletion demos/embedded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-util-server</artifactId>
<artifactId>websocket-servlet</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jetty-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-util-server</artifactId>
<artifactId>websocket-servlet</artifactId>
<version>10.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jetty-gcloud/jetty-gcloud-session-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-util-server</artifactId>
<artifactId>websocket-servlet</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion jetty-home/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-util-server</artifactId>
<artifactId>websocket-servlet</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jetty-osgi/test-jetty-osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-util-server</artifactId>
<artifactId>websocket-servlet</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
Expand Down
3 changes: 1 addition & 2 deletions jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,7 @@ public static List<Option> coreJettyDependencies()
res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-server").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-client").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-common").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-util").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-util-server").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-servlet").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-api").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-server").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-client").versionAsInProject().start());
Expand Down
3 changes: 1 addition & 2 deletions jetty-websocket/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
<module>websocket-javax-server</module>
<module>websocket-javax-tests</module>
<!-- Common WebSocket Implementation -->
<module>websocket-util</module>
<module>websocket-util-server</module>
<module>websocket-servlet</module>
</modules>
<build>
<plugins>
Expand Down
18 changes: 18 additions & 0 deletions jetty-websocket/websocket-core-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,24 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<executions>
<execution>
<id>generate-manifest</id>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Export-Package>*,org.eclipse.jetty.websocket.core.client.internal.*</Export-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
4 changes: 3 additions & 1 deletion ...lient/src/main/java/org/eclipse/jetty/websocket/core/client/CoreClientUpgradeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
import org.eclipse.jetty.websocket.core.ExtensionConfig;
import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.core.WebSocketConstants;
import org.eclipse.jetty.websocket.core.client.internal.HttpUpgraderOverHTTP;
import org.eclipse.jetty.websocket.core.client.internal.HttpUpgraderOverHTTP2;
import org.eclipse.jetty.websocket.core.exception.UpgradeException;
import org.eclipse.jetty.websocket.core.exception.WebSocketException;
import org.eclipse.jetty.websocket.core.internal.ExtensionStack;
Expand Down Expand Up @@ -281,7 +283,7 @@ protected void customize(EndPoint endPoint)

public abstract FrameHandler getFrameHandler();

void requestComplete()
public void requestComplete()
{
// Add extensions header filtering out internal extensions and internal parameters.
String extensionString = requestedExtensions.stream()
Expand Down
1 change: 1 addition & 0 deletions ...ore-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.core.WebSocketComponents;
import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
import org.eclipse.jetty.websocket.core.client.internal.HttpClientProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion ...ocket/core/client/HttpClientProvider.java → ...e/client/internal/HttpClientProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
Expand Down
3 changes: 2 additions & 1 deletion ...ket/core/client/HttpUpgraderOverHTTP.java → ...client/internal/HttpUpgraderOverHTTP.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import java.nio.charset.StandardCharsets;
import java.util.Base64;
Expand All @@ -34,6 +34,7 @@
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.WebSocketConstants;
import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
import org.eclipse.jetty.websocket.core.internal.WebSocketCore;

public class HttpUpgraderOverHTTP implements HttpUpgrader
Expand Down
3 changes: 2 additions & 1 deletion ...et/core/client/HttpUpgraderOverHTTP2.java → ...lient/internal/HttpUpgraderOverHTTP2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import org.eclipse.jetty.client.HttpRequest;
import org.eclipse.jetty.client.HttpResponse;
Expand All @@ -27,6 +27,7 @@
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.WebSocketConstants;
import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;

public class HttpUpgraderOverHTTP2 implements HttpUpgrader
{
Expand Down
4 changes: 2 additions & 2 deletions ...et/core/client/XmlHttpClientProvider.java → ...lient/internal/XmlHttpClientProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import java.net.URL;

Expand All @@ -26,7 +26,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

class XmlHttpClientProvider implements HttpClientProvider
public class XmlHttpClientProvider implements HttpClientProvider
{
private static final Logger LOG = LoggerFactory.getLogger(XmlHttpClientProvider.class);

Expand Down
22 changes: 21 additions & 1 deletion jetty-websocket/websocket-core-common/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,27 @@
{
exports org.eclipse.jetty.websocket.core;
exports org.eclipse.jetty.websocket.core.exception;
exports org.eclipse.jetty.websocket.core.internal to org.eclipse.jetty.websocket.core.client, org.eclipse.jetty.websocket.core.server, org.eclipse.jetty.util;

exports org.eclipse.jetty.websocket.core.internal to
org.eclipse.jetty.websocket.core.client,
org.eclipse.jetty.websocket.core.server;

// The Jetty & Javax API Layers need to access both access some internal utilities which we don't want to expose.
exports org.eclipse.jetty.websocket.core.internal.util to
org.eclipse.jetty.websocket.jetty.common,
org.eclipse.jetty.websocket.jetty.client,
org.eclipse.jetty.websocket.jetty.server,
org.eclipse.jetty.websocket.javax.common,
org.eclipse.jetty.websocket.javax.client,
org.eclipse.jetty.websocket.javax.server;

exports org.eclipse.jetty.websocket.core.internal.messages to
org.eclipse.jetty.websocket.jetty.common,
org.eclipse.jetty.websocket.jetty.client,
org.eclipse.jetty.websocket.jetty.server,
org.eclipse.jetty.websocket.javax.common,
org.eclipse.jetty.websocket.javax.client,
org.eclipse.jetty.websocket.javax.server;

requires org.eclipse.jetty.http;
requires transitive org.eclipse.jetty.io;
Expand Down
4 changes: 3 additions & 1 deletion ...et/util/DuplicateAnnotationException.java → ...ception/DuplicateAnnotationException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
// ========================================================================
//

package org.eclipse.jetty.websocket.util;
package org.eclipse.jetty.websocket.core.exception;

import java.lang.annotation.Annotation;
import java.lang.reflect.Method;

import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;

@SuppressWarnings("serial")
public class DuplicateAnnotationException extends InvalidWebSocketException
{
Expand Down
4 changes: 3 additions & 1 deletion ...ocket/util/InvalidSignatureException.java → .../exception/InvalidSignatureException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@
// ========================================================================
//

package org.eclipse.jetty.websocket.util;
package org.eclipse.jetty.websocket.core.exception;

import java.lang.annotation.Annotation;
import java.lang.invoke.MethodType;
import java.lang.reflect.Method;

import org.eclipse.jetty.websocket.core.internal.util.ReflectUtils;

@SuppressWarnings("serial")
public class InvalidSignatureException extends InvalidWebSocketException
{
Expand Down
4 changes: 1 addition & 3 deletions ...ocket/util/InvalidWebSocketException.java → .../exception/InvalidWebSocketException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
// ========================================================================
//

package org.eclipse.jetty.websocket.util;

import org.eclipse.jetty.websocket.core.exception.WebSocketException;
package org.eclipse.jetty.websocket.core.exception;

/**
* Indicating that the provided Class is not a valid WebSocket per the chosen API.
Expand Down
9 changes: 7 additions & 2 deletions .../jetty/websocket/core/MessageHandler.java → ...bsocket/core/internal/MessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import java.io.ByteArrayOutputStream;
import java.nio.ByteBuffer;
Expand All @@ -27,6 +27,11 @@
import org.eclipse.jetty.util.IteratingNestedCallback;
import org.eclipse.jetty.util.Utf8Appendable;
import org.eclipse.jetty.util.Utf8StringBuilder;
import org.eclipse.jetty.websocket.core.CloseStatus;
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.core.exception.BadPayloadException;
import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
import org.slf4j.Logger;
Expand Down Expand Up @@ -87,7 +92,7 @@ protected void onBinary(ByteBuffer message, Callback callback)
};
}

protected static final Logger LOG = LoggerFactory.getLogger(MessageHandler.class);
private static final Logger LOG = LoggerFactory.getLogger(MessageHandler.class);

private CoreSession coreSession;
private Utf8StringBuilder textMessageBuffer;
Expand Down
2 changes: 1 addition & 1 deletion ...et/util/messages/AbstractMessageSink.java → ...nternal/messages/AbstractMessageSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import java.lang.invoke.MethodHandle;
import java.util.Objects;
Expand Down
4 changes: 2 additions & 2 deletions ...t/util/messages/ByteArrayMessageSink.java → ...ternal/messages/ByteArrayMessageSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand All @@ -28,8 +28,8 @@
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.exception.InvalidSignatureException;
import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
import org.eclipse.jetty.websocket.util.InvalidSignatureException;

public class ByteArrayMessageSink extends AbstractMessageSink
{
Expand Down
4 changes: 2 additions & 2 deletions .../util/messages/ByteBufferMessageSink.java → ...ernal/messages/ByteBufferMessageSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand All @@ -29,8 +29,8 @@
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.exception.InvalidSignatureException;
import org.eclipse.jetty.websocket.core.exception.MessageTooLargeException;
import org.eclipse.jetty.websocket.util.InvalidSignatureException;

public class ByteBufferMessageSink extends AbstractMessageSink
{
Expand Down
2 changes: 1 addition & 1 deletion .../util/messages/DispatchedMessageSink.java → ...ernal/messages/DispatchedMessageSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import java.io.Closeable;
import java.lang.invoke.MethodHandle;
Expand Down
2 changes: 1 addition & 1 deletion ...util/messages/InputStreamMessageSink.java → ...rnal/messages/InputStreamMessageSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import java.lang.invoke.MethodHandle;

Expand Down
2 changes: 1 addition & 1 deletion ...ket/util/messages/MessageInputStream.java → ...internal/messages/MessageInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import java.io.IOException;
import java.io.InputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...et/util/messages/MessageOutputStream.java → ...nternal/messages/MessageOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import java.io.IOException;
import java.io.OutputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...ebsocket/util/messages/MessageReader.java → ...core/internal/messages/MessageReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import java.io.IOException;
import java.io.Reader;
Expand Down
2 changes: 1 addition & 1 deletion .../websocket/util/messages/MessageSink.java → ...t/core/internal/messages/MessageSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// ========================================================================
//

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

import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame;
Expand Down
Loading