Skip to content

Commit

Permalink
Converting from javax.* to jakarta.* (#312)
Browse files Browse the repository at this point in the history
* Converting from javax.* to jakarta.*
* Updating spec version to 2.0

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
  • Loading branch information
joakime authored and markt-asf committed Nov 27, 2019
1 parent 00f2151 commit 90dcca8
Show file tree
Hide file tree
Showing 40 changed files with 88 additions and 88 deletions.
2 changes: 1 addition & 1 deletion api/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-all</artifactId>
<version>1.1.2-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>jakarta.websocket-client-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand All @@ -24,7 +24,7 @@

/**
* The ClientEndpoint annotation a class level annotation is used to denote that a POJO is a web socket client and can
* be deployed as such. Similar to {@code javax.websocket.server.ServerEndpoint}, POJOs that are annotated with this
* be deployed as such. Similar to {@code jakarta.websocket.server.ServerEndpoint}, POJOs that are annotated with this
* annotation can have methods that, using the web socket method level annotations, are web socket lifecycle methods.
* <p>
* For example:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.util.ArrayList;
import java.util.Collections;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.io.UnsupportedEncodingException;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.util.Iterator;
import java.util.ServiceLoader;
Expand All @@ -25,7 +25,7 @@
* provider class uses the
* <a href="http://docs.oracle.com/javase/7/docs/api/java/util/ServiceLoader.html">ServiceLoader</a> to load an
* implementation of ContainerProvider. Specifically, the fully qualified class name of the container implementation of
* ContainerProvider must be listed in the "META-INF/services/javax.websocket.ContainerProvider" file in the
* ContainerProvider must be listed in the "META-INF/services/jakarta.websocket.ContainerProvider" file in the
* implementation JAR file.
*
* @author dannycoward
Expand All @@ -34,7 +34,7 @@ public abstract class ContainerProvider {

/**
* Obtain a new instance of a WebSocketContainer. The method looks for the ContainerProvider implementation class in
* the order listed in the "META-INF/services/javax.websocket.ContainerProvider" file, returning the first
* the order listed in the "META-INF/services/jakarta.websocket.ContainerProvider" file, returning the first
* WebSocketContainer implementation from the ContainerProvider implementation that is not {@code null}.
*
* @return an implementation provided instance of type WebSocketContainer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.nio.ByteBuffer;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -26,7 +26,7 @@
* The Decoder interface holds member interfaces that define how a developer can provide the web socket container a way
* web socket messages into developer defined custom objects. The websocket implementation creates a new instance of the
* decoder per endpoint instance per connection. The lifecycle of the Decoder instance is governed by the container
* calls to the {@link Decoder#init(javax.websocket.EndpointConfig)} and {@link Decoder#destroy() } methods.
* calls to the {@link Decoder#init(jakarta.websocket.EndpointConfig)} and {@link Decoder#destroy() } methods.
*
* @author dannycoward
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.util.Collections;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

/**
* Checked exception indicating some kind of failure either to publish an endpoint on its server, or a failure to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

/**
* A general exception that occurs when trying to encode a custom object to a string or binary message.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.io.IOException;
import java.io.OutputStream;
Expand All @@ -28,7 +28,7 @@
* text, binary data, character stream and write to an output stream. The websocket implementation creates a new
* instance of the encoder per endpoint instance per connection. This means that each encoder instance has at most one
* calling thread at a time. The lifecycle of the Encoder instance is governed by the container calls to the
* {@link Encoder#init(javax.websocket.EndpointConfig)} and {@link Encoder#destroy() } methods.
* {@link Encoder#init(jakarta.websocket.EndpointConfig)} and {@link Encoder#destroy() } methods.
*
* @author dannycoward
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

/**
* The Web Socket Endpoint represents an object that can handle websocket conversations. Developers may extend this
* class in order to implement a programmatic websocket endpoint. The Endpoint class holds lifecycle methods that may be
* overridden to intercept websocket open, error and close events. By implementing the
* {@link Endpoint#onOpen(javax.websocket.Session, javax.websocket.EndpointConfig) onOpen} method, the programmatic
* {@link Endpoint#onOpen(jakarta.websocket.Session, jakarta.websocket.EndpointConfig) onOpen} method, the programmatic
* endpoint gains access to the {@link Session} object, to which the developer may add {@link MessageHandler}
* implementations in order to intercept incoming websocket messages. Each instance of a websocket endpoint is
* guaranteed not to be called by more than one thread at a time per active connection.
Expand All @@ -31,14 +31,14 @@
*
* <p>
* When deployed as a server endpoint, the implementation uses the
* {@code javax.websocket.server.ServerEndpointConfig.Configurator#getEndpointInstance} method to obtain the endpoint
* {@code jakarta.websocket.server.ServerEndpointConfig.Configurator#getEndpointInstance} method to obtain the endpoint
* instance it will use for each new client connection. If the developer uses the default
* {@code javax.websocket.server.ServerEndpointConfig.Configurator}, there will be precisely one endpoint instance per
* {@code jakarta.websocket.server.ServerEndpointConfig.Configurator}, there will be precisely one endpoint instance per
* active client connection. Consequently, in this typical case, when implementing/overriding the methods of Endpoint,
* the developer is guaranteed that there will be at most one thread calling each endpoint instance at a time.
*
* <p>
* If the developer provides a custom {@code javax.websocket.server.ServerEndpointConfig.Configurator} which overrides
* If the developer provides a custom {@code jakarta.websocket.server.ServerEndpointConfig.Configurator} which overrides
* the default policy for endpoint instance creation, for example, using a single Endpoint instance for multiple client
* connections, the developer may need to write code that can execute concurrently.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.util.List;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.util.List;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

/**
* Developers implement MessageHandlers in order to receive incoming messages during a web socket conversation. Each web
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand All @@ -31,7 +31,7 @@
* <ul>
* <li>optional {@link Session} parameter</li>
* <li>optional {@link CloseReason} parameter</li>
* <li>Zero to n String parameters annotated with the {@code javax.websocket.server.PathParam} annotation.</li>
* <li>Zero to n String parameters annotated with the {@code jakarta.websocket.server.PathParam} annotation.</li>
* </ul>
*
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand All @@ -31,7 +31,7 @@
* <ul>
* <li>optional {@link Session} parameter</li>
* <li>a {@link java.lang.Throwable} parameter</li>
* <li>Zero to n String parameters annotated with the {@code javax.websocket.server.PathParam} annotation</li>
* <li>Zero to n String parameters annotated with the {@code jakarta.websocket.server.PathParam} annotation</li>
* </ul>
*
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down Expand Up @@ -58,7 +58,7 @@
* </li>
* </ul>
* </li>
* <li>and Zero to n String or Java primitive parameters annotated with the {@code javax.websocket.server.PathParam}
* <li>and Zero to n String or Java primitive parameters annotated with the {@code jakarta.websocket.server.PathParam}
* annotation for server endpoints.</li>
* <li>and an optional {@link Session} parameter</li>
* </ol>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand All @@ -31,7 +31,7 @@
* <ul>
* <li>optional {@link Session} parameter</li>
* <li>optional {@link EndpointConfig} parameter</li>
* <li>Zero to n String parameters annotated with the {@code javax.websocket.server.PathParam} annotation.</li>
* <li>Zero to n String parameters annotated with the {@code jakarta.websocket.server.PathParam} annotation.</li>
* </ul>
*
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.nio.ByteBuffer;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.io.IOException;
import java.io.OutputStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

/**
* A simple callback object for asynchronous sending of web socket messages.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

/**
* The result of asynchronously sending a web socket message. A SendResult is either ok indicating there was no problem,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.io.Closeable;
import java.io.IOException;
Expand Down Expand Up @@ -61,10 +61,10 @@ public interface Session extends Closeable {
* Adding more than one of any one type will result in a runtime exception.
* <p>
* This method is not safe to use unless you are providing an anonymous class derived directly from
* {@link javax.websocket.MessageHandler.Whole} or {@link javax.websocket.MessageHandler.Partial}. In all other
* {@link jakarta.websocket.MessageHandler.Whole} or {@link jakarta.websocket.MessageHandler.Partial}. In all other
* cases (Lambda Expressions, more complex inheritance or generic type arrangements), one of the following methods
* have to be used: {@link #addMessageHandler(Class, javax.websocket.MessageHandler.Whole)} or
* {@link #addMessageHandler(Class, javax.websocket.MessageHandler.Partial)}.
* have to be used: {@link #addMessageHandler(Class, jakarta.websocket.MessageHandler.Whole)} or
* {@link #addMessageHandler(Class, jakarta.websocket.MessageHandler.Partial)}.
*
* @param handler the MessageHandler to be added.
* @throws IllegalStateException if there is already a MessageHandler registered for the same native websocket
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

/**
* A SessionException represents a general exception type reporting problems occurring on a websocket session.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package javax.websocket;
package jakarta.websocket;

import java.io.*;
import java.net.URI;
Expand Down Expand Up @@ -58,7 +58,7 @@ public interface WebSocketContainer {

/**
* Connect the supplied annotated endpoint instance to its server. The supplied object must be a class decorated
* with the class level {@code javax.websocket.server.ServerEndpoint} annotation. This method blocks until the
* with the class level {@code jakarta.websocket.server.ServerEndpoint} annotation. This method blocks until the
* connection is established, or throws an error if either the connection could not be made or there was a problem
* with the supplied endpoint class. If the developer uses this method to deploy the client endpoint, services like
* dependency injection that are supported, for example, when the implementation is part of the Java EE platform may
Expand All @@ -77,7 +77,7 @@ public interface WebSocketContainer {

/**
* Connect the supplied annotated endpoint to its server. The supplied object must be a class decorated with the
* class level {@code javax.websocket.server.ServerEndpoint} annotation. This method blocks until the connection is
* class level {@code jakarta.websocket.server.ServerEndpoint} annotation. This method blocks until the connection is
* established, or throws an error if either the connection could not be made or there was a problem with the
* supplied endpoint class.
*
Expand All @@ -97,7 +97,7 @@ public interface WebSocketContainer {
* developer uses this method to deploy the client endpoint, services like dependency injection that are supported,
* for example, when the implementation is part of the Java EE platform may not be available. If the client endpoint
* uses dependency injection, use
* {@link WebSocketContainer#connectToServer(java.lang.Class, javax.websocket.ClientEndpointConfig, java.net.URI) }
* {@link WebSocketContainer#connectToServer(java.lang.Class, jakarta.websocket.ClientEndpointConfig, java.net.URI) }
* instead.
*
* @param endpointInstance the programmatic client endpoint instance {@link Endpoint}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
/**
* This package contains all the Jakartq WebSocket APIs common to both the client and server side.
*/
package javax.websocket;
package jakarta.websocket;

0 comments on commit 90dcca8

Please sign in to comment.