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

Issue #3129 - refactor of javax websocket package names 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2018-11-29 17:28:48 +01:00
parent aeb200e583
commit e8ba030904
380 changed files with 836 additions and 838 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java
View File

@ -25,7 +25,7 @@ import javax.websocket.server.ServerEndpoint;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.websocket.jsr356.server.JavaxWebSocketServerContainerInitializer; import org.eclipse.jetty.websocket.javax.server.JavaxWebSocketServerContainerInitializer;
/** /**
* Example of setting up a javax.websocket server with Jetty embedded * Example of setting up a javax.websocket server with Jetty embedded

2
jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
View File

@ -95,7 +95,7 @@
<Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item> <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JmxConfiguration</Item> <Item>org.eclipse.jetty.webapp.JmxConfiguration</Item>
<Item>org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration</Item> <Item>org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.websocket.jsr356.JavaxWebSocketExtensionConfig</Item> <Item>JavaxWebSocketExtensionConfig</Item>
<Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item> <Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item> <Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item> <Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item>

2
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
View File

@ -82,7 +82,7 @@
<Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item> <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JmxConfiguration</Item> <Item>org.eclipse.jetty.webapp.JmxConfiguration</Item>
<Item>org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration</Item> <Item>org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.websocket.jsr356.JavaxWebSocketExtensionConfig</Item> <Item>org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtensionConfig</Item>
<Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item> <Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item> <Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item> <Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item>

2
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
View File

@ -86,7 +86,7 @@
<Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item> <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
<Item>org.eclipse.jetty.webapp.JmxConfiguration</Item> <Item>org.eclipse.jetty.webapp.JmxConfiguration</Item>
<Item>org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration</Item> <Item>org.eclipse.jetty.websocket.server.JettyWebSocketConfiguration</Item>
<Item>org.eclipse.jetty.websocket.jsr356.JavaxWebSocketExtensionConfig</Item> <Item>org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtensionConfig</Item>
<Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item> <Item>org.eclipse.jetty.osgi.annotations.AnnotationConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item> <Item>org.eclipse.jetty.osgi.boot.OSGiWebInfConfiguration</Item>
<Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item> <Item>org.eclipse.jetty.osgi.boot.OSGiMetaInfConfiguration</Item>

4
jetty-websocket/javax-websocket-client/src/main/java/module-info.java
View File

@ -18,11 +18,11 @@
import javax.websocket.ContainerProvider; import javax.websocket.ContainerProvider;
import org.eclipse.jetty.websocket.jsr356.client.JavaxWebSocketClientContainerProvider; import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider;
module org.eclipse.jetty.websocket.javax.client module org.eclipse.jetty.websocket.javax.client
{ {
exports org.eclipse.jetty.websocket.jsr356.client; exports org.eclipse.jetty.websocket.javax.client;
requires javax.websocket.api; requires javax.websocket.api;
requires org.eclipse.jetty.util; requires org.eclipse.jetty.util;

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

@ -16,9 +16,9 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException;
import javax.websocket.ClientEndpoint; import javax.websocket.ClientEndpoint;
import javax.websocket.ClientEndpointConfig; import javax.websocket.ClientEndpointConfig;

8
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/ClientUpgradeRequestImpl.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/ClientUpgradeRequestImpl.java
View File

@ -16,14 +16,14 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.client.HttpResponse; import org.eclipse.jetty.client.HttpResponse;
import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandler; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandler;
import org.eclipse.jetty.websocket.jsr356.UpgradeRequest; import org.eclipse.jetty.websocket.javax.common.UpgradeRequest;
import org.eclipse.jetty.websocket.jsr356.UpgradeResponse; import org.eclipse.jetty.websocket.javax.common.UpgradeResponse;
import javax.websocket.Session; import javax.websocket.Session;
import java.net.URI; import java.net.URI;

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

@ -16,9 +16,9 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.websocket.jsr356.UpgradeRequest; import org.eclipse.jetty.websocket.javax.common.UpgradeRequest;
import java.net.URI; import java.net.URI;
import java.security.Principal; import java.security.Principal;

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

@ -16,12 +16,12 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.client.HttpResponse; import org.eclipse.jetty.client.HttpResponse;
import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;
import org.eclipse.jetty.websocket.jsr356.UpgradeResponse; import org.eclipse.jetty.websocket.javax.common.UpgradeResponse;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

2
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/EmptyClientEndpointConfig.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyClientEndpointConfig.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import javax.websocket.ClientEndpointConfig; import javax.websocket.ClientEndpointConfig;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/EmptyConfigurator.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/EmptyConfigurator.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import javax.websocket.ClientEndpointConfig; import javax.websocket.ClientEndpointConfig;
import javax.websocket.HandshakeResponse; import javax.websocket.HandshakeResponse;

12
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientContainer.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainer.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.ByteBufferPool;
@ -24,11 +24,11 @@ import org.eclipse.jetty.util.DecoratedObjectFactory;
import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedObject;
import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry; import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient; import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
import org.eclipse.jetty.websocket.jsr356.ConfiguredEndpoint; import org.eclipse.jetty.websocket.javax.common.ConfiguredEndpoint;
import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketContainer; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketExtensionConfig; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketExtensionConfig;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerFactory; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
import javax.websocket.ClientEndpoint; import javax.websocket.ClientEndpoint;
import javax.websocket.ClientEndpointConfig; import javax.websocket.ClientEndpointConfig;

2
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientContainerProvider.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientContainerProvider.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.thread.ShutdownThread; import org.eclipse.jetty.util.thread.ShutdownThread;

10
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JavaxWebSocketClientFrameHandlerFactory.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JavaxWebSocketClientFrameHandlerFactory.java
View File

@ -16,12 +16,12 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketContainer; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketContainer;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerFactory; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerFactory;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerMetadata; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata;
import org.eclipse.jetty.websocket.jsr356.util.InvokerUtils; import org.eclipse.jetty.websocket.javax.common.util.InvokerUtils;
import javax.websocket.ClientEndpoint; import javax.websocket.ClientEndpoint;
import javax.websocket.Endpoint; import javax.websocket.Endpoint;

2
jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/jsr356/client/JsrUpgradeListener.java → jetty-websocket/javax-websocket-client/src/main/java/org/eclipse/jetty/websocket/javax/client/JsrUpgradeListener.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.client; package org.eclipse.jetty.websocket.javax.client;
import org.eclipse.jetty.client.HttpRequest; import org.eclipse.jetty.client.HttpRequest;
import org.eclipse.jetty.client.HttpResponse; import org.eclipse.jetty.client.HttpResponse;

2
jetty-websocket/javax-websocket-client/src/main/resources/META-INF/services/javax.websocket.ContainerProvider
View File

@ -1 +1 @@
org.eclipse.jetty.websocket.jsr356.client.JavaxWebSocketClientContainerProvider org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider

10
jetty-websocket/javax-websocket-common/src/main/java/module-info.java
View File

@ -18,11 +18,11 @@
module org.eclipse.jetty.websocket.javax.common module org.eclipse.jetty.websocket.javax.common
{ {
exports org.eclipse.jetty.websocket.jsr356; exports org.eclipse.jetty.websocket.javax.common;
exports org.eclipse.jetty.websocket.jsr356.decoders; exports org.eclipse.jetty.websocket.javax.common.decoders;
exports org.eclipse.jetty.websocket.jsr356.encoders; exports org.eclipse.jetty.websocket.javax.common.encoders;
exports org.eclipse.jetty.websocket.jsr356.messages; exports org.eclipse.jetty.websocket.javax.common.messages;
exports org.eclipse.jetty.websocket.jsr356.util; exports org.eclipse.jetty.websocket.javax.common.util;
requires javax.websocket.api; requires javax.websocket.api;
requires org.eclipse.jetty.util; requires org.eclipse.jetty.util;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/BasicEndpointConfig.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/BasicEndpointConfig.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import javax.websocket.Decoder; import javax.websocket.Decoder;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/CompletableFutureCallback.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/CompletableFutureCallback.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/ConfiguredEndpoint.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/ConfiguredEndpoint.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/DuplicateCoderException.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/DuplicateCoderException.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
/** /**
* Thrown when a duplicate coder is encountered when attempting to identify a Endpoint's metadata ({@link javax.websocket.Decoder} or {@link javax.websocket.Encoder}) * Thrown when a duplicate coder is encountered when attempting to identify a Endpoint's metadata ({@link javax.websocket.Decoder} or {@link javax.websocket.Encoder})

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/InitException.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InitException.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
/** /**
* Exception during initialization of the Endpoint * Exception during initialization of the Endpoint

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/InvalidWebSocketException.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/InvalidWebSocketException.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.websocket.core.WebSocketException; import org.eclipse.jetty.websocket.core.WebSocketException;

8
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketAsyncRemote.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketAsyncRemote.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.FutureCallback; import org.eclipse.jetty.util.FutureCallback;
@ -25,9 +25,9 @@ import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.jsr356.messages.MessageOutputStream; import org.eclipse.jetty.websocket.javax.common.messages.MessageOutputStream;
import org.eclipse.jetty.websocket.jsr356.messages.MessageWriter; import org.eclipse.jetty.websocket.javax.common.messages.MessageWriter;
import org.eclipse.jetty.websocket.jsr356.util.TextUtil; import org.eclipse.jetty.websocket.javax.common.util.TextUtil;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketBasicRemote.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketBasicRemote.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.SharedBlockingCallback; import org.eclipse.jetty.util.SharedBlockingCallback;
@ -25,7 +25,7 @@ import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.jsr356.util.TextUtil; import org.eclipse.jetty.websocket.javax.common.util.TextUtil;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.RemoteEndpoint; import javax.websocket.RemoteEndpoint;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketContainer.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketContainer.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.util.DecoratedObjectFactory; import org.eclipse.jetty.util.DecoratedObjectFactory;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketExtension.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtension.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketExtensionConfig.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketExtensionConfig.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;

46
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandler.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
@ -29,15 +29,15 @@ import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.core.ProtocolException; import org.eclipse.jetty.websocket.core.ProtocolException;
import org.eclipse.jetty.websocket.core.WebSocketConstants; import org.eclipse.jetty.websocket.core.WebSocketConstants;
import org.eclipse.jetty.websocket.core.WebSocketException; import org.eclipse.jetty.websocket.core.WebSocketException;
import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedBinaryMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedBinaryStreamMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryStreamMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedTextMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedTextStreamMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.PartialByteArrayMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.PartialByteArrayMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.PartialByteBufferMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.PartialByteBufferMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.PartialStringMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.PartialStringMessageSink;
import org.eclipse.jetty.websocket.jsr356.util.InvokerUtils; import org.eclipse.jetty.websocket.javax.common.util.InvokerUtils;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.Decoder; import javax.websocket.Decoder;
@ -57,8 +57,6 @@ import java.util.Set;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerMetadata.MessageMetadata;
public class JavaxWebSocketFrameHandler implements FrameHandler public class JavaxWebSocketFrameHandler implements FrameHandler
{ {
private final Logger LOG; private final Logger LOG;
@ -94,8 +92,8 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
private MethodHandle openHandle; private MethodHandle openHandle;
private MethodHandle closeHandle; private MethodHandle closeHandle;
private MethodHandle errorHandle; private MethodHandle errorHandle;
private MessageMetadata textMetadata; private JavaxWebSocketFrameHandlerMetadata.MessageMetadata textMetadata;
private MessageMetadata binaryMetadata; private JavaxWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata;
// TODO: need pingHandle ? // TODO: need pingHandle ?
private MethodHandle pongHandle; private MethodHandle pongHandle;
/** /**
@ -124,8 +122,8 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
Object endpointInstance, Object endpointInstance,
UpgradeRequest upgradeRequest, UpgradeResponse upgradeResponse, UpgradeRequest upgradeRequest, UpgradeResponse upgradeResponse,
MethodHandle openHandle, MethodHandle closeHandle, MethodHandle errorHandle, MethodHandle openHandle, MethodHandle closeHandle, MethodHandle errorHandle,
MessageMetadata textMetadata, JavaxWebSocketFrameHandlerMetadata.MessageMetadata textMetadata,
MessageMetadata binaryMetadata, JavaxWebSocketFrameHandlerMetadata.MessageMetadata binaryMetadata,
MethodHandle pongHandle, MethodHandle pongHandle,
String id, String id,
EndpointConfig endpointConfig, EndpointConfig endpointConfig,
@ -245,8 +243,8 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
closeHandle = InvokerUtils.bindTo(closeHandle, session); closeHandle = InvokerUtils.bindTo(closeHandle, session);
errorHandle = InvokerUtils.bindTo(errorHandle, session); errorHandle = InvokerUtils.bindTo(errorHandle, session);
MessageMetadata actualTextMetadata = MessageMetadata.copyOf(textMetadata); JavaxWebSocketFrameHandlerMetadata.MessageMetadata actualTextMetadata = JavaxWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(textMetadata);
MessageMetadata actualBinaryMetadata = MessageMetadata.copyOf(binaryMetadata); JavaxWebSocketFrameHandlerMetadata.MessageMetadata actualBinaryMetadata = JavaxWebSocketFrameHandlerMetadata.MessageMetadata.copyOf(binaryMetadata);
pongHandle = InvokerUtils.bindTo(pongHandle, session); pongHandle = InvokerUtils.bindTo(pongHandle, session);
@ -333,12 +331,12 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
return messageHandlerMap; return messageHandlerMap;
} }
public MessageMetadata getBinaryMetadata() public JavaxWebSocketFrameHandlerMetadata.MessageMetadata getBinaryMetadata()
{ {
return binaryMetadata; return binaryMetadata;
} }
public MessageMetadata getTextMetadata() public JavaxWebSocketFrameHandlerMetadata.MessageMetadata getTextMetadata()
{ {
return textMetadata; return textMetadata;
} }
@ -368,7 +366,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName()); assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName());
MessageSink messageSink = new PartialByteArrayMessageSink(session, partialMessageHandler); MessageSink messageSink = new PartialByteArrayMessageSink(session, partialMessageHandler);
this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink); this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink);
MessageMetadata metadata = new MessageMetadata(); JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata();
metadata.handle = partialMessageHandler; metadata.handle = partialMessageHandler;
metadata.sinkClass = PartialByteArrayMessageSink.class; metadata.sinkClass = PartialByteArrayMessageSink.class;
this.binaryMetadata = metadata; this.binaryMetadata = metadata;
@ -378,7 +376,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName()); assertBasicTypeNotRegistered(OpCode.BINARY, this.binaryMetadata, handler.getClass().getName());
MessageSink messageSink = new PartialByteBufferMessageSink(session, partialMessageHandler); MessageSink messageSink = new PartialByteBufferMessageSink(session, partialMessageHandler);
this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink); this.binarySink = registerMessageHandler(OpCode.BINARY, clazz, handler, messageSink);
MessageMetadata metadata = new MessageMetadata(); JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata();
metadata.handle = partialMessageHandler; metadata.handle = partialMessageHandler;
metadata.sinkClass = PartialByteBufferMessageSink.class; metadata.sinkClass = PartialByteBufferMessageSink.class;
this.binaryMetadata = metadata; this.binaryMetadata = metadata;
@ -388,7 +386,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
assertBasicTypeNotRegistered(OpCode.TEXT, this.textMetadata, handler.getClass().getName()); assertBasicTypeNotRegistered(OpCode.TEXT, this.textMetadata, handler.getClass().getName());
MessageSink messageSink = new PartialStringMessageSink(session, partialMessageHandler); MessageSink messageSink = new PartialStringMessageSink(session, partialMessageHandler);
this.textSink = registerMessageHandler(OpCode.TEXT, clazz, handler, messageSink); this.textSink = registerMessageHandler(OpCode.TEXT, clazz, handler, messageSink);
MessageMetadata metadata = new MessageMetadata(); JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata();
metadata.handle = partialMessageHandler; metadata.handle = partialMessageHandler;
metadata.sinkClass = PartialStringMessageSink.class; metadata.sinkClass = PartialStringMessageSink.class;
this.textMetadata = metadata; this.textMetadata = metadata;
@ -435,7 +433,7 @@ public class JavaxWebSocketFrameHandler implements FrameHandler
throw new IllegalStateException("Unable to find Decoder for type: " + clazz); throw new IllegalStateException("Unable to find Decoder for type: " + clazz);
} }
MessageMetadata metadata = new MessageMetadata(); JavaxWebSocketFrameHandlerMetadata.MessageMetadata metadata = new JavaxWebSocketFrameHandlerMetadata.MessageMetadata();
metadata.handle = wholeMsgMethodHandle; metadata.handle = wholeMsgMethodHandle;
metadata.registeredDecoder = registeredDecoder; metadata.registeredDecoder = registeredDecoder;

131
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandlerFactory.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerFactory.java
View File

@ -16,26 +16,26 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
import org.eclipse.jetty.websocket.jsr356.messages.ByteArrayMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.ByteArrayMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.ByteBufferMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.ByteBufferMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedBinaryMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedBinaryStreamMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedBinaryStreamMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedTextMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.DecodedTextStreamMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.DecodedTextStreamMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.InputStreamMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.InputStreamMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.PartialByteArrayMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.PartialByteArrayMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.PartialByteBufferMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.PartialByteBufferMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.PartialStringMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.PartialStringMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.ReaderMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.ReaderMessageSink;
import org.eclipse.jetty.websocket.jsr356.messages.StringMessageSink; import org.eclipse.jetty.websocket.javax.common.messages.StringMessageSink;
import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException;
import org.eclipse.jetty.websocket.jsr356.util.InvokerUtils; import org.eclipse.jetty.websocket.javax.common.util.InvokerUtils;
import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.Decoder; import javax.websocket.Decoder;
@ -63,8 +63,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandlerMetadata.MessageMetadata; import static org.eclipse.jetty.websocket.javax.common.JavaxWebSocketFrameHandlerMetadata.MessageMetadata;
import static org.eclipse.jetty.websocket.jsr356.util.InvokerUtils.Arg;
public abstract class JavaxWebSocketFrameHandlerFactory public abstract class JavaxWebSocketFrameHandlerFactory
{ {
@ -396,8 +395,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
if (onmethod != null) if (onmethod != null)
{ {
assertSignatureValid(endpointClass, onmethod, OnOpen.class); assertSignatureValid(endpointClass, onmethod, OnOpen.class);
final Arg SESSION = new Arg(Session.class); final InvokerUtils.Arg SESSION = new InvokerUtils.Arg(Session.class);
final Arg ENDPOINT_CONFIG = new Arg(EndpointConfig.class); final InvokerUtils.Arg ENDPOINT_CONFIG = new InvokerUtils.Arg(EndpointConfig.class);
MethodHandle methodHandle = InvokerUtils MethodHandle methodHandle = InvokerUtils
.mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, ENDPOINT_CONFIG); .mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, ENDPOINT_CONFIG);
metadata.setOpenHandler(methodHandle, onmethod); metadata.setOpenHandler(methodHandle, onmethod);
@ -408,8 +407,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
if (onmethod != null) if (onmethod != null)
{ {
assertSignatureValid(endpointClass, onmethod, OnClose.class); assertSignatureValid(endpointClass, onmethod, OnClose.class);
final Arg SESSION = new Arg(Session.class); final InvokerUtils.Arg SESSION = new InvokerUtils.Arg(Session.class);
final Arg CLOSE_REASON = new Arg(CloseReason.class); final InvokerUtils.Arg CLOSE_REASON = new InvokerUtils.Arg(CloseReason.class);
MethodHandle methodHandle = InvokerUtils MethodHandle methodHandle = InvokerUtils
.mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, CLOSE_REASON); .mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, CLOSE_REASON);
metadata.setCloseHandler(methodHandle, onmethod); metadata.setCloseHandler(methodHandle, onmethod);
@ -419,8 +418,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
if (onmethod != null) if (onmethod != null)
{ {
assertSignatureValid(endpointClass, onmethod, OnError.class); assertSignatureValid(endpointClass, onmethod, OnError.class);
final Arg SESSION = new Arg(Session.class); final InvokerUtils.Arg SESSION = new InvokerUtils.Arg(Session.class);
final Arg CAUSE = new Arg(Throwable.class).required(); final InvokerUtils.Arg CAUSE = new InvokerUtils.Arg(Throwable.class).required();
MethodHandle methodHandle = InvokerUtils MethodHandle methodHandle = InvokerUtils
.mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, CAUSE); .mutatedInvoker(endpointClass, onmethod, paramIdentifier, metadata.getNamedTemplateVariables(), SESSION, CAUSE);
metadata.setErrorHandler(methodHandle, onmethod); metadata.setErrorHandler(methodHandle, onmethod);
@ -431,52 +430,52 @@ public abstract class JavaxWebSocketFrameHandlerFactory
if (onMessages != null && onMessages.length > 0) if (onMessages != null && onMessages.length > 0)
{ {
// The different kind of @OnMessage method parameter signatures expected // The different kind of @OnMessage method parameter signatures expected
Arg textCallingArgs[] = new Arg[] { InvokerUtils.Arg textCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(String.class).required() new InvokerUtils.Arg(String.class).required()
}; };
Arg textPartialCallingArgs[] = new Arg[] { InvokerUtils.Arg textPartialCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(String.class).required(), new InvokerUtils.Arg(String.class).required(),
new Arg(boolean.class).required() new InvokerUtils.Arg(boolean.class).required()
}; };
Arg binaryBufferCallingArgs[] = new Arg[] { InvokerUtils.Arg binaryBufferCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(ByteBuffer.class).required() new InvokerUtils.Arg(ByteBuffer.class).required()
}; };
Arg binaryPartialBufferCallingArgs[] = new Arg[] { InvokerUtils.Arg binaryPartialBufferCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(ByteBuffer.class).required(), new InvokerUtils.Arg(ByteBuffer.class).required(),
new Arg(boolean.class).required() new InvokerUtils.Arg(boolean.class).required()
}; };
Arg binaryArrayCallingArgs[] = new Arg[] { InvokerUtils.Arg binaryArrayCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(byte[].class).required() new InvokerUtils.Arg(byte[].class).required()
}; };
Arg binaryPartialArrayCallingArgs[] = new Arg[] { InvokerUtils.Arg binaryPartialArrayCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(byte[].class).required(), new InvokerUtils.Arg(byte[].class).required(),
new Arg(boolean.class).required() new InvokerUtils.Arg(boolean.class).required()
}; };
Arg inputStreamCallingArgs[] = new Arg[] { InvokerUtils.Arg inputStreamCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(InputStream.class).required() new InvokerUtils.Arg(InputStream.class).required()
}; };
Arg readerCallingArgs[] = new Arg[] { InvokerUtils.Arg readerCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(Reader.class).required() new InvokerUtils.Arg(Reader.class).required()
}; };
Arg pongCallingArgs[] = new Arg[] { InvokerUtils.Arg pongCallingArgs[] = new InvokerUtils.Arg[] {
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(PongMessage.class).required() new InvokerUtils.Arg(PongMessage.class).required()
}; };
List<DecodedArgs> decodedTextCallingArgs = new ArrayList<>(); List<DecodedArgs> decodedTextCallingArgs = new ArrayList<>();
@ -490,8 +489,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
{ {
decodedTextCallingArgs.add( decodedTextCallingArgs.add(
new DecodedArgs(decoder, new DecodedArgs(decoder,
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(decoder.objectType).required() new InvokerUtils.Arg(decoder.objectType).required()
)); ));
} }
@ -499,8 +498,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
{ {
decodedTextStreamCallingArgs.add( decodedTextStreamCallingArgs.add(
new DecodedArgs(decoder, new DecodedArgs(decoder,
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(decoder.objectType).required() new InvokerUtils.Arg(decoder.objectType).required()
)); ));
} }
@ -508,8 +507,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
{ {
decodedBinaryCallingArgs.add( decodedBinaryCallingArgs.add(
new DecodedArgs(decoder, new DecodedArgs(decoder,
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(decoder.objectType).required() new InvokerUtils.Arg(decoder.objectType).required()
)); ));
} }
@ -517,8 +516,8 @@ public abstract class JavaxWebSocketFrameHandlerFactory
{ {
decodedBinaryStreamCallingArgs.add( decodedBinaryStreamCallingArgs.add(
new DecodedArgs(decoder, new DecodedArgs(decoder,
new Arg(Session.class), new InvokerUtils.Arg(Session.class),
new Arg(decoder.objectType).required() new InvokerUtils.Arg(decoder.objectType).required()
)); ));
} }
} }
@ -767,9 +766,9 @@ public abstract class JavaxWebSocketFrameHandlerFactory
private static class DecodedArgs private static class DecodedArgs
{ {
public final AvailableDecoders.RegisteredDecoder registeredDecoder; public final AvailableDecoders.RegisteredDecoder registeredDecoder;
public final Arg[] args; public final InvokerUtils.Arg[] args;
public DecodedArgs(AvailableDecoders.RegisteredDecoder registeredDecoder, Arg... args) public DecodedArgs(AvailableDecoders.RegisteredDecoder registeredDecoder, InvokerUtils.Arg... args)
{ {
this.registeredDecoder = registeredDecoder; this.registeredDecoder = registeredDecoder;
this.args = args; this.args = args;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketFrameHandlerMetadata.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandlerMetadata.java
View File

@ -16,11 +16,11 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec; import org.eclipse.jetty.http.pathmap.UriTemplatePathSpec;
import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
import org.eclipse.jetty.websocket.jsr356.encoders.AvailableEncoders; import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
import javax.websocket.Decoder; import javax.websocket.Decoder;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketPongMessage.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketPongMessage.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketRemoteEndpoint.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketRemoteEndpoint.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
@ -28,8 +28,8 @@ import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.core.OpCode; import org.eclipse.jetty.websocket.core.OpCode;
import org.eclipse.jetty.websocket.core.OutgoingFrames; import org.eclipse.jetty.websocket.core.OutgoingFrames;
import org.eclipse.jetty.websocket.core.WebSocketException; import org.eclipse.jetty.websocket.core.WebSocketException;
import org.eclipse.jetty.websocket.jsr356.messages.MessageOutputStream; import org.eclipse.jetty.websocket.javax.common.messages.MessageOutputStream;
import org.eclipse.jetty.websocket.jsr356.messages.MessageWriter; import org.eclipse.jetty.websocket.javax.common.messages.MessageWriter;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

9
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketSession.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketSession.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.SharedBlockingCallback; import org.eclipse.jetty.util.SharedBlockingCallback;
import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.AbstractLifeCycle;
@ -24,9 +24,9 @@ import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;
import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
import org.eclipse.jetty.websocket.jsr356.encoders.AvailableEncoders; import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;
@ -37,7 +37,6 @@ import javax.websocket.RemoteEndpoint.Basic;
import javax.websocket.Session; import javax.websocket.Session;
import javax.websocket.WebSocketContainer; import javax.websocket.WebSocketContainer;
import java.io.IOException; import java.io.IOException;
import java.lang.invoke.MethodHandle;
import java.net.URI; import java.net.URI;
import java.security.Principal; import java.security.Principal;
import java.time.Duration; import java.time.Duration;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketUpgradeRequest.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeRequest.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import java.net.URI; import java.net.URI;
import java.util.List; import java.util.List;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/JavaxWebSocketUpgradeResponse.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketUpgradeResponse.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/MessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/MessageSink.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/PathParamProvider.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/PathParamProvider.java
View File

@ -16,13 +16,13 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import java.util.Map; import java.util.Map;
/** /**
* Optional interface for custom {@link javax.websocket.EndpointConfig} implementations * Optional interface for custom {@link javax.websocket.EndpointConfig} implementations
* in Jetty to expose Path Param values used during the {@link org.eclipse.jetty.websocket.jsr356.JavaxWebSocketFrameHandler} * in Jetty to expose Path Param values used during the {@link JavaxWebSocketFrameHandler}
* resolution of methods. * resolution of methods.
* <p> * <p>
* Mostly a feature of the JSR356 Server implementation and its {@code &#064;javax.websocket.server.PathParam} annotation. * Mostly a feature of the JSR356 Server implementation and its {@code &#064;javax.websocket.server.PathParam} annotation.

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/RegisteredMessageHandler.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/RegisteredMessageHandler.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import javax.websocket.MessageHandler; import javax.websocket.MessageHandler;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/SendHandlerCallback.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/SendHandlerCallback.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeRequest.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequest.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import java.net.URI; import java.net.URI;
import java.security.Principal; import java.security.Principal;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeRequestAdapter.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeRequestAdapter.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import java.net.URI; import java.net.URI;
import java.security.Principal; import java.security.Principal;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeResponse.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponse.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/UpgradeResponseAdapter.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/UpgradeResponseAdapter.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import org.eclipse.jetty.websocket.core.ExtensionConfig; import org.eclipse.jetty.websocket.core.ExtensionConfig;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/AbstractDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AbstractDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.Decoder; import javax.websocket.Decoder;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;

10
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/AvailableDecoders.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/AvailableDecoders.java
View File

@ -16,12 +16,12 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import org.eclipse.jetty.websocket.jsr356.InitException; import org.eclipse.jetty.websocket.javax.common.InitException;
import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException;
import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException;
import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/BooleanDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/BooleanDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteArrayDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteArrayDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteBufferDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteBufferDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ByteDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ByteDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/CharacterDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/CharacterDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/DoubleDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/DoubleDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/FloatDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/FloatDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/InputStreamDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/InputStreamDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/IntegerDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/IntegerDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/LongDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/LongDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/PongMessageDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/PongMessageDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ReaderDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ReaderDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/ShortDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/ShortDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/decoders/StringDecoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/decoders/StringDecoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.decoders; package org.eclipse.jetty.websocket.javax.common.decoders;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;
import javax.websocket.Decoder; import javax.websocket.Decoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/AbstractEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AbstractEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.Encoder; import javax.websocket.Encoder;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;

10
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/AvailableEncoders.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/AvailableEncoders.java
View File

@ -16,12 +16,12 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import org.eclipse.jetty.websocket.jsr356.InitException; import org.eclipse.jetty.websocket.javax.common.InitException;
import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException;
import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException;
import org.eclipse.jetty.websocket.jsr356.util.ReflectUtils; import org.eclipse.jetty.websocket.javax.common.util.ReflectUtils;
import javax.websocket.Encoder; import javax.websocket.Encoder;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/BooleanEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/BooleanEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteArrayEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteArrayEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteBufferEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteBufferEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ByteEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ByteEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/CharacterEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/CharacterEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/DoubleEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/DoubleEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/EncodeFailedFuture.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/EncodeFailedFuture.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.Encoder; import javax.websocket.Encoder;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/FloatEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/FloatEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/IntegerEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/IntegerEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/LongEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/LongEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/ShortEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/ShortEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/encoders/StringEncoder.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/encoders/StringEncoder.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.encoders; package org.eclipse.jetty.websocket.javax.common.encoders;
import javax.websocket.EncodeException; import javax.websocket.EncodeException;
import javax.websocket.Encoder; import javax.websocket.Encoder;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/AbstractMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/AbstractMessageSink.java
View File

@ -16,10 +16,10 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
import java.util.Objects; import java.util.Objects;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ByteArrayMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteArrayMessageSink.java
View File

@ -16,14 +16,14 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.MessageTooLargeException; import org.eclipse.jetty.websocket.core.MessageTooLargeException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ByteBufferMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ByteBufferMessageSink.java
View File

@ -16,13 +16,13 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.MessageTooLargeException; import org.eclipse.jetty.websocket.core.MessageTooLargeException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/CallbackBuffer.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/CallbackBuffer.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryMessageSink.java
View File

@ -16,11 +16,11 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.websocket.core.CloseException; import org.eclipse.jetty.websocket.core.CloseException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedBinaryStreamMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedBinaryStreamMessageSink.java
View File

@ -16,11 +16,11 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.websocket.core.CloseException; import org.eclipse.jetty.websocket.core.CloseException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedMessageSink.java
View File

@ -16,14 +16,14 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import javax.websocket.Decoder; import javax.websocket.Decoder;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextMessageSink.java
View File

@ -16,11 +16,11 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.websocket.core.CloseException; import org.eclipse.jetty.websocket.core.CloseException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DecodedTextStreamMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DecodedTextStreamMessageSink.java
View File

@ -16,11 +16,11 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.websocket.core.CloseException; import org.eclipse.jetty.websocket.core.CloseException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
import javax.websocket.DecodeException; import javax.websocket.DecodeException;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/DispatchedMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/DispatchedMessageSink.java
View File

@ -16,12 +16,12 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
import java.util.Objects; import java.util.Objects;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/InputStreamMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/InputStreamMessageSink.java
View File

@ -16,11 +16,11 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import java.io.InputStream; import java.io.InputStream;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageInputStream.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageInputStream.java
View File

@ -16,14 +16,14 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageOutputStream.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageOutputStream.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageReader.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageReader.java
View File

@ -16,11 +16,11 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.jsr356.MessageSink; import org.eclipse.jetty.websocket.javax.common.MessageSink;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/MessageWriter.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/MessageWriter.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;

6
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/PartialByteArrayMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteArrayMessageSink.java
View File

@ -16,13 +16,13 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import org.eclipse.jetty.websocket.jsr356.util.InvalidSignatureException; import org.eclipse.jetty.websocket.javax.common.util.InvalidSignatureException;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodType; import java.lang.invoke.MethodType;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/PartialByteBufferMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialByteBufferMessageSink.java
View File

@ -16,12 +16,12 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/PartialStringMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/PartialStringMessageSink.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
@ -24,7 +24,7 @@ import org.eclipse.jetty.util.Utf8StringBuilder;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/ReaderMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/ReaderMessageSink.java
View File

@ -16,10 +16,10 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import java.io.Reader; import java.io.Reader;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/messages/StringMessageSink.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/messages/StringMessageSink.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.messages; package org.eclipse.jetty.websocket.javax.common.messages;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
@ -25,7 +25,7 @@ import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.core.Frame; import org.eclipse.jetty.websocket.core.Frame;
import org.eclipse.jetty.websocket.core.MessageTooLargeException; import org.eclipse.jetty.websocket.core.MessageTooLargeException;
import org.eclipse.jetty.websocket.jsr356.JavaxWebSocketSession; import org.eclipse.jetty.websocket.javax.common.JavaxWebSocketSession;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/DuplicateAnnotationException.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/DuplicateAnnotationException.java
View File

@ -16,9 +16,9 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.util; package org.eclipse.jetty.websocket.javax.common.util;
import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.Method; import java.lang.reflect.Method;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/InvalidSignatureException.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvalidSignatureException.java
View File

@ -16,9 +16,9 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.util; package org.eclipse.jetty.websocket.javax.common.util;
import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.invoke.MethodType; import java.lang.invoke.MethodType;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/InvokerUtils.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/InvokerUtils.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.util; package org.eclipse.jetty.websocket.javax.common.util;
import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles;

4
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/ReflectUtils.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/ReflectUtils.java
View File

@ -16,9 +16,9 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.util; package org.eclipse.jetty.websocket.javax.common.util;
import org.eclipse.jetty.websocket.jsr356.InvalidWebSocketException; import org.eclipse.jetty.websocket.javax.common.InvalidWebSocketException;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.invoke.MethodType; import java.lang.invoke.MethodType;

2
jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/jsr356/util/TextUtil.java → jetty-websocket/javax-websocket-common/src/main/java/org/eclipse/jetty/websocket/javax/common/util/TextUtil.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356.util; package org.eclipse.jetty.websocket.javax.common.util;
/** /**
* Collection of utility methods for Text content * Collection of utility methods for Text content

6
jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/jsr356/AbstractJavaxWebSocketFrameHandlerTest.java → jetty-websocket/javax-websocket-common/src/test/java/org/eclipse/jetty/websocket/javax/common/AbstractJavaxWebSocketFrameHandlerTest.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package org.eclipse.jetty.websocket.jsr356; package org.eclipse.jetty.websocket.javax.common;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -25,8 +25,8 @@ import java.util.concurrent.CompletableFuture;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;
import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.FrameHandler;
import org.eclipse.jetty.websocket.jsr356.decoders.AvailableDecoders; import org.eclipse.jetty.websocket.javax.common.decoders.AvailableDecoders;
import org.eclipse.jetty.websocket.jsr356.encoders.AvailableEncoders; import org.eclipse.jetty.websocket.javax.common.encoders.AvailableEncoders;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;

Some files were not shown because too many files have changed in this diff Show More