diff --git a/spring-websocket/src/main/java/org/springframework/websocket/support/StandardSessionAdapter.java b/spring-websocket/src/main/java/org/springframework/websocket/endpoint/StandardSessionAdapter.java similarity index 96% rename from spring-websocket/src/main/java/org/springframework/websocket/support/StandardSessionAdapter.java rename to spring-websocket/src/main/java/org/springframework/websocket/endpoint/StandardSessionAdapter.java index 32f04f74be1..4366ec026b3 100644 --- a/spring-websocket/src/main/java/org/springframework/websocket/support/StandardSessionAdapter.java +++ b/spring-websocket/src/main/java/org/springframework/websocket/endpoint/StandardSessionAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.websocket.support; +package org.springframework.websocket.endpoint; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-websocket/src/main/java/org/springframework/websocket/support/StandardWebSocketHandlerAdapter.java b/spring-websocket/src/main/java/org/springframework/websocket/endpoint/StandardWebSocketHandlerAdapter.java similarity index 98% rename from spring-websocket/src/main/java/org/springframework/websocket/support/StandardWebSocketHandlerAdapter.java rename to spring-websocket/src/main/java/org/springframework/websocket/endpoint/StandardWebSocketHandlerAdapter.java index 76674870225..608be8f932a 100644 --- a/spring-websocket/src/main/java/org/springframework/websocket/support/StandardWebSocketHandlerAdapter.java +++ b/spring-websocket/src/main/java/org/springframework/websocket/endpoint/StandardWebSocketHandlerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.websocket.support; +package org.springframework.websocket.endpoint; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/spring-websocket/src/main/java/org/springframework/websocket/endpoint/package-info.java b/spring-websocket/src/main/java/org/springframework/websocket/endpoint/package-info.java new file mode 100644 index 00000000000..1e5962b911c --- /dev/null +++ b/spring-websocket/src/main/java/org/springframework/websocket/endpoint/package-info.java @@ -0,0 +1,8 @@ + +/** + * + * Support for working with standard Java WebSocket Endpoint's. + * + */ +package org.springframework.websocket.endpoint; + diff --git a/spring-websocket/src/main/java/org/springframework/websocket/AbstractHandshakeRequestHandler.java b/spring-websocket/src/main/java/org/springframework/websocket/server/AbstractHandshakeRequestHandler.java similarity index 99% rename from spring-websocket/src/main/java/org/springframework/websocket/AbstractHandshakeRequestHandler.java rename to spring-websocket/src/main/java/org/springframework/websocket/server/AbstractHandshakeRequestHandler.java index 696b0bf7ce0..0f8de388554 100644 --- a/spring-websocket/src/main/java/org/springframework/websocket/AbstractHandshakeRequestHandler.java +++ b/spring-websocket/src/main/java/org/springframework/websocket/server/AbstractHandshakeRequestHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.websocket; +package org.springframework.websocket.server; import java.io.IOException; import java.nio.charset.Charset; diff --git a/spring-websocket/src/main/java/org/springframework/websocket/HandshakeRequestHandler.java b/spring-websocket/src/main/java/org/springframework/websocket/server/HandshakeRequestHandler.java similarity index 95% rename from spring-websocket/src/main/java/org/springframework/websocket/HandshakeRequestHandler.java rename to spring-websocket/src/main/java/org/springframework/websocket/server/HandshakeRequestHandler.java index e40aa72c3ba..9e2f9f1962d 100644 --- a/spring-websocket/src/main/java/org/springframework/websocket/HandshakeRequestHandler.java +++ b/spring-websocket/src/main/java/org/springframework/websocket/server/HandshakeRequestHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.websocket; +package org.springframework.websocket.server; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; diff --git a/spring-websocket/src/main/java/org/springframework/websocket/support/ServerEndpointPostProcessor.java b/spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/ServerEndpointExporter.java similarity index 90% rename from spring-websocket/src/main/java/org/springframework/websocket/support/ServerEndpointPostProcessor.java rename to spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/ServerEndpointExporter.java index adaf3b69e8a..bb821144846 100644 --- a/spring-websocket/src/main/java/org/springframework/websocket/support/ServerEndpointPostProcessor.java +++ b/spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/ServerEndpointExporter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.websocket.support; +package org.springframework.websocket.server.endpoint; import javax.websocket.DeploymentException; import javax.websocket.server.ServerContainer; @@ -28,16 +28,17 @@ import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.util.Assert; /** - * BeanPostProcessor that registers {@link javax.websocket.server.ServerEndpointConfig} - * beans with a standard Java WebSocket runtime and also configures the underlying + * BeanPostProcessor that detects beans of type + * {@link javax.websocket.server.ServerEndpointConfig} and registers them with a standard + * Java WebSocket runtime and also configures the underlying * {@link javax.websocket.server.ServerContainer}. * * @author Rossen Stoyanchev * @since 4.0 */ -public class ServerEndpointPostProcessor implements BeanPostProcessor, InitializingBean { +public class ServerEndpointExporter implements BeanPostProcessor, InitializingBean { - private static Log logger = LogFactory.getLog(ServerEndpointPostProcessor.class); + private static Log logger = LogFactory.getLog(ServerEndpointExporter.class); private Long maxSessionIdleTimeout; diff --git a/spring-websocket/src/main/java/org/springframework/websocket/support/ServerEndpointRegistration.java b/spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/ServerEndpointRegistration.java similarity index 96% rename from spring-websocket/src/main/java/org/springframework/websocket/support/ServerEndpointRegistration.java rename to spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/ServerEndpointRegistration.java index 22d0386771e..8179253e6be 100644 --- a/spring-websocket/src/main/java/org/springframework/websocket/support/ServerEndpointRegistration.java +++ b/spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/ServerEndpointRegistration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.websocket.support; +package org.springframework.websocket.server.endpoint; import java.util.ArrayList; import java.util.Collections; @@ -36,6 +36,7 @@ import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.websocket.WebSocketHandler; +import org.springframework.websocket.endpoint.StandardWebSocketHandlerAdapter; /** @@ -45,7 +46,7 @@ import org.springframework.websocket.WebSocketHandler; * which case it will be adapted via {@link StandardWebSocketHandlerAdapter}. * *

- * Beans of this type are detected by {@link ServerEndpointPostProcessor} and + * Beans of this type are detected by {@link ServerEndpointExporter} and * registered with a Java WebSocket runtime at startup. * * @author Rossen Stoyanchev diff --git a/spring-websocket/src/main/java/org/springframework/websocket/servlet/ServletServerEndpointPostProcessor.java b/spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/ServletServerEndpointExporter.java similarity index 85% rename from spring-websocket/src/main/java/org/springframework/websocket/servlet/ServletServerEndpointPostProcessor.java rename to spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/ServletServerEndpointExporter.java index bcf288f9cfd..2c7ca73808e 100644 --- a/spring-websocket/src/main/java/org/springframework/websocket/servlet/ServletServerEndpointPostProcessor.java +++ b/spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/ServletServerEndpointExporter.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package org.springframework.websocket.servlet; +package org.springframework.websocket.server.endpoint; import javax.servlet.ServletContext; import org.apache.tomcat.websocket.server.WsServerContainer; import org.springframework.web.context.ServletContextAware; -import org.springframework.websocket.support.ServerEndpointPostProcessor; /** @@ -28,7 +27,7 @@ import org.springframework.websocket.support.ServerEndpointPostProcessor; * @author Rossen Stoyanchev * @since 4.0 */ -public class ServletServerEndpointPostProcessor extends ServerEndpointPostProcessor implements ServletContextAware { +public class ServletServerEndpointExporter extends ServerEndpointExporter implements ServletContextAware { private ServletContext servletContext; diff --git a/spring-websocket/src/main/java/org/springframework/websocket/servlet/TomcatHandshakeRequestHandler.java b/spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/TomcatHandshakeRequestHandler.java similarity index 82% rename from spring-websocket/src/main/java/org/springframework/websocket/servlet/TomcatHandshakeRequestHandler.java rename to spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/TomcatHandshakeRequestHandler.java index 5dabaf0f6b9..a185f67ad3e 100644 --- a/spring-websocket/src/main/java/org/springframework/websocket/servlet/TomcatHandshakeRequestHandler.java +++ b/spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/TomcatHandshakeRequestHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.websocket.servlet; +package org.springframework.websocket.server.endpoint; import java.lang.reflect.Method; import java.util.Collections; @@ -31,17 +31,16 @@ import org.springframework.http.server.ServerHttpResponse; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; -import org.springframework.websocket.AbstractHandshakeRequestHandler; import org.springframework.websocket.WebSocketHandler; -import org.springframework.websocket.support.ServerEndpointRegistration; -import org.springframework.websocket.support.StandardWebSocketHandlerAdapter; +import org.springframework.websocket.endpoint.StandardWebSocketHandlerAdapter; +import org.springframework.websocket.server.AbstractHandshakeRequestHandler; /** -* -* @author Rossen Stoyanchev + * + * @author Rossen Stoyanchev * @since 4.0 -*/ + */ public class TomcatHandshakeRequestHandler extends AbstractHandshakeRequestHandler { private final Endpoint endpoint; @@ -50,13 +49,12 @@ public class TomcatHandshakeRequestHandler extends AbstractHandshakeRequestHandl public TomcatHandshakeRequestHandler(WebSocketHandler webSocketHandler) { - this.endpoint = new StandardWebSocketHandlerAdapter(webSocketHandler); - this.endpointConfig = new ServerEndpointRegistration("/shouldnotmatter", this.endpoint); + this(new StandardWebSocketHandlerAdapter(webSocketHandler)); } public TomcatHandshakeRequestHandler(Endpoint endpoint) { this.endpoint = endpoint; - this.endpointConfig = new ServerEndpointRegistration("/shouldnotmatter", this.endpoint); + this.endpointConfig = new ServerEndpointRegistration("/dummy", this.endpoint); } @Override diff --git a/spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/package-info.java b/spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/package-info.java new file mode 100644 index 00000000000..a5f66584f8c --- /dev/null +++ b/spring-websocket/src/main/java/org/springframework/websocket/server/endpoint/package-info.java @@ -0,0 +1,8 @@ + +/** + * + * Server-specific support for working with standard Java WebSocket Endpoint's. + * + */ +package org.springframework.websocket.server.endpoint; +