diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/AbstractWebSocketHandlerRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/AbstractWebSocketHandlerRegistration.java similarity index 97% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/config/AbstractWebSocketHandlerRegistration.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/AbstractWebSocketHandlerRegistration.java index c5f3c60688d..229b1769e94 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/AbstractWebSocketHandlerRegistration.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/AbstractWebSocketHandlerRegistration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config; +package org.springframework.web.socket.config; import java.util.Arrays; @@ -23,7 +23,7 @@ import org.springframework.util.Assert; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.server.DefaultHandshakeHandler; +import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.server.HandshakeHandler; import org.springframework.web.socket.server.HandshakeInterceptor; import org.springframework.web.socket.sockjs.SockJsService; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/DelegatingWebSocketConfiguration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/DelegatingWebSocketConfiguration.java similarity index 96% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/config/DelegatingWebSocketConfiguration.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/DelegatingWebSocketConfiguration.java index 8e4272981df..d625e77a517 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/DelegatingWebSocketConfiguration.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/DelegatingWebSocketConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config; +package org.springframework.web.socket.config; import java.util.ArrayList; import java.util.List; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/EnableWebSocket.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/EnableWebSocket.java similarity index 97% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/config/EnableWebSocket.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/EnableWebSocket.java index 94913ebcb3d..aefba3eb78c 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/EnableWebSocket.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/EnableWebSocket.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.springframework.web.socket.server.config; +package org.springframework.web.socket.config; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/xml/HandlersBeanDefinitionParser.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/HandlersBeanDefinitionParser.java similarity index 97% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/config/xml/HandlersBeanDefinitionParser.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/HandlersBeanDefinitionParser.java index 2945da48588..227d0b1a173 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/xml/HandlersBeanDefinitionParser.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/HandlersBeanDefinitionParser.java @@ -14,7 +14,12 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config.xml; +package org.springframework.web.socket.config; + +import java.util.Arrays; +import java.util.List; + +import org.w3c.dom.Element; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConstructorArgumentValues; @@ -28,13 +33,9 @@ import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.util.xml.DomUtils; import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping; +import org.springframework.web.socket.config.WebSocketNamespaceUtils; import org.springframework.web.socket.server.support.WebSocketHttpRequestHandler; import org.springframework.web.socket.sockjs.SockJsHttpRequestHandler; -import org.w3c.dom.Element; - -import java.util.Arrays; -import java.util.List; - /** * A {@link BeanDefinitionParser} that provides the configuration for the @@ -46,7 +47,7 @@ import java.util.List; * @author Brian Clozel * @since 4.0 */ -public class HandlersBeanDefinitionParser implements BeanDefinitionParser { +class HandlersBeanDefinitionParser implements BeanDefinitionParser { private static final String SOCK_JS_SCHEDULER_NAME = "SockJsScheduler"; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/xml/MessageBrokerBeanDefinitionParser.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java similarity index 98% rename from spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/xml/MessageBrokerBeanDefinitionParser.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java index 1f8f9944726..eb1ace09d31 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/xml/MessageBrokerBeanDefinitionParser.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java @@ -14,7 +14,12 @@ * limitations under the License. */ -package org.springframework.web.socket.messaging.config.xml; +package org.springframework.web.socket.config; + +import java.util.Arrays; +import java.util.List; + +import org.w3c.dom.Element; import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.factory.config.BeanDefinition; @@ -49,13 +54,8 @@ import org.springframework.util.xml.DomUtils; import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping; import org.springframework.web.socket.messaging.StompSubProtocolHandler; import org.springframework.web.socket.messaging.SubProtocolWebSocketHandler; -import org.springframework.web.socket.server.config.xml.WebSocketNamespaceUtils; import org.springframework.web.socket.server.support.WebSocketHttpRequestHandler; import org.springframework.web.socket.sockjs.SockJsHttpRequestHandler; -import org.w3c.dom.Element; - -import java.util.Arrays; -import java.util.List; /** @@ -85,7 +85,7 @@ import java.util.List; * @author Rossen Stoyanchev * @since 4.0 */ -public class MessageBrokerBeanDefinitionParser implements BeanDefinitionParser { +class MessageBrokerBeanDefinitionParser implements BeanDefinitionParser { protected static final String SOCKJS_SCHEDULER_BEAN_NAME = "messageBrokerSockJsScheduler"; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/ServletWebSocketHandlerRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/ServletWebSocketHandlerRegistration.java similarity index 98% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/config/ServletWebSocketHandlerRegistration.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/ServletWebSocketHandlerRegistration.java index 683a182b00b..cadc7d46c9f 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/ServletWebSocketHandlerRegistration.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/ServletWebSocketHandlerRegistration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config; +package org.springframework.web.socket.config; import java.util.Arrays; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/ServletWebSocketHandlerRegistry.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/ServletWebSocketHandlerRegistry.java similarity index 98% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/config/ServletWebSocketHandlerRegistry.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/ServletWebSocketHandlerRegistry.java index f0463ff0f88..205fbf3ca85 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/ServletWebSocketHandlerRegistry.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/ServletWebSocketHandlerRegistry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config; +package org.springframework.web.socket.config; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/SockJsServiceRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/SockJsServiceRegistration.java similarity index 99% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/config/SockJsServiceRegistration.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/SockJsServiceRegistration.java index c7cef7471eb..5cdc7d595d8 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/SockJsServiceRegistration.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/SockJsServiceRegistration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config; +package org.springframework.web.socket.config; import java.util.ArrayList; import java.util.Arrays; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/WebSocketConfigurationSupport.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketConfigurationSupport.java similarity index 97% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/config/WebSocketConfigurationSupport.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketConfigurationSupport.java index 55b8cc50b3f..fcf4b62f99e 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/WebSocketConfigurationSupport.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketConfigurationSupport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config; +package org.springframework.web.socket.config; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/WebSocketConfigurer.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketConfigurer.java similarity index 95% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/config/WebSocketConfigurer.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketConfigurer.java index 698b241a7df..d429c1abd01 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/WebSocketConfigurer.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config; +package org.springframework.web.socket.config; import org.springframework.web.socket.WebSocketHandler; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/WebSocketHandlerRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketHandlerRegistration.java similarity index 96% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/config/WebSocketHandlerRegistration.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketHandlerRegistration.java index aa85fbda89d..9fdf654d50a 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/WebSocketHandlerRegistration.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketHandlerRegistration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config; +package org.springframework.web.socket.config; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.server.HandshakeHandler; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/WebSocketHandlerRegistry.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketHandlerRegistry.java similarity index 94% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/config/WebSocketHandlerRegistry.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketHandlerRegistry.java index 31ac93ecdf4..53a937873a0 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/WebSocketHandlerRegistry.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketHandlerRegistry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config; +package org.springframework.web.socket.config; import org.springframework.web.socket.WebSocketHandler; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/xml/WebSocketNamespaceHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceHandler.java similarity index 90% rename from spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/xml/WebSocketNamespaceHandler.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceHandler.java index 12c1d1d3afe..b919934a004 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/xml/WebSocketNamespaceHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceHandler.java @@ -14,12 +14,10 @@ * limitations under the License. */ -package org.springframework.web.socket.messaging.config.xml; +package org.springframework.web.socket.config; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; import org.springframework.util.ClassUtils; -import org.springframework.web.socket.server.config.xml.HandlersBeanDefinitionParser; - /** * {@link org.springframework.beans.factory.xml.NamespaceHandler} for Spring WebSocket @@ -41,4 +39,5 @@ public class WebSocketNamespaceHandler extends NamespaceHandlerSupport { registerBeanDefinitionParser("message-broker", new MessageBrokerBeanDefinitionParser()); } } + } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/xml/WebSocketNamespaceUtils.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceUtils.java similarity index 91% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/config/xml/WebSocketNamespaceUtils.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceUtils.java index 038bb7a5773..a81801f4370 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/xml/WebSocketNamespaceUtils.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceUtils.java @@ -14,7 +14,11 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config.xml; +package org.springframework.web.socket.config; + +import java.util.Collections; + +import org.w3c.dom.Element; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConstructorArgumentValues; @@ -25,11 +29,8 @@ import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.xml.DomUtils; -import org.springframework.web.socket.server.DefaultHandshakeHandler; +import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.sockjs.transport.handler.DefaultSockJsService; -import org.w3c.dom.Element; - -import java.util.Collections; /** * Provides utility methods for parsing common WebSocket XML namespace elements. @@ -38,15 +39,12 @@ import java.util.Collections; * @author Rossen Stoyanchev * @since 4.0 */ -public class WebSocketNamespaceUtils { - +class WebSocketNamespaceUtils { public static RuntimeBeanReference registerHandshakeHandler(Element element, ParserContext parserContext, Object source) { - RuntimeBeanReference handlerRef; - Element handlerElem = DomUtils.getChildElementByTagName(element, "handshake-handler"); - if(handlerElem != null) { + if (handlerElem != null) { handlerRef = new RuntimeBeanReference(handlerElem.getAttribute("ref")); } else { @@ -56,7 +54,6 @@ public class WebSocketNamespaceUtils { String handlerName = parserContext.getReaderContext().registerWithGeneratedName(defaultHandlerDef); handlerRef = new RuntimeBeanReference(handlerName); } - return handlerRef; } @@ -65,13 +62,13 @@ public class WebSocketNamespaceUtils { Element sockJsElement = DomUtils.getChildElementByTagName(element, "sockjs"); - if(sockJsElement != null) { + if (sockJsElement != null) { ConstructorArgumentValues cavs = new ConstructorArgumentValues(); // TODO: polish the way constructor arguments are set String customTaskSchedulerName = sockJsElement.getAttribute("task-scheduler"); - if(!customTaskSchedulerName.isEmpty()) { + if (!customTaskSchedulerName.isEmpty()) { cavs.addIndexedArgumentValue(0, new RuntimeBeanReference(customTaskSchedulerName)); } else { @@ -80,16 +77,16 @@ public class WebSocketNamespaceUtils { Element transportHandlersElement = DomUtils.getChildElementByTagName(sockJsElement, "transport-handlers"); boolean registerDefaults = true; - if(transportHandlersElement != null) { + if (transportHandlersElement != null) { String registerDefaultsAttribute = transportHandlersElement.getAttribute("register-defaults"); registerDefaults = !registerDefaultsAttribute.equals("false"); } ManagedList transportHandlersList = parseBeanSubElements(transportHandlersElement, parserContext); - if(registerDefaults) { + if (registerDefaults) { cavs.addIndexedArgumentValue(1, Collections.emptyList()); - if(transportHandlersList.isEmpty()) { + if (transportHandlersList.isEmpty()) { cavs.addIndexedArgumentValue(2, new ConstructorArgumentValues.ValueHolder(null)); } else { @@ -97,7 +94,7 @@ public class WebSocketNamespaceUtils { } } else { - if(transportHandlersList.isEmpty()) { + if (transportHandlersList.isEmpty()) { cavs.addIndexedArgumentValue(1, new ConstructorArgumentValues.ValueHolder(null)); } else { @@ -110,31 +107,31 @@ public class WebSocketNamespaceUtils { sockJsServiceDef.setSource(source); String attrValue = sockJsElement.getAttribute("name"); - if(!attrValue.isEmpty()) { + if (!attrValue.isEmpty()) { sockJsServiceDef.getPropertyValues().add("name", attrValue); } attrValue = sockJsElement.getAttribute("websocket-enabled"); - if(!attrValue.isEmpty()) { + if (!attrValue.isEmpty()) { sockJsServiceDef.getPropertyValues().add("webSocketsEnabled", Boolean.valueOf(attrValue)); } attrValue = sockJsElement.getAttribute("session-cookie-needed"); - if(!attrValue.isEmpty()) { + if (!attrValue.isEmpty()) { sockJsServiceDef.getPropertyValues().add("sessionCookieNeeded", Boolean.valueOf(attrValue)); } attrValue = sockJsElement.getAttribute("stream-bytes-limit"); - if(!attrValue.isEmpty()) { + if (!attrValue.isEmpty()) { sockJsServiceDef.getPropertyValues().add("streamBytesLimit", Integer.valueOf(attrValue)); } attrValue = sockJsElement.getAttribute("disconnect-delay"); - if(!attrValue.isEmpty()) { + if (!attrValue.isEmpty()) { sockJsServiceDef.getPropertyValues().add("disconnectDelay", Long.valueOf(attrValue)); } attrValue = sockJsElement.getAttribute("http-message-cache-size"); - if(!attrValue.isEmpty()) { + if (!attrValue.isEmpty()) { sockJsServiceDef.getPropertyValues().add("httpMessageCacheSize", Integer.valueOf(attrValue)); } attrValue = sockJsElement.getAttribute("heartbeat-time"); - if(!attrValue.isEmpty()) { + if (!attrValue.isEmpty()) { sockJsServiceDef.getPropertyValues().add("heartbeatTime", Long.valueOf(attrValue)); } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/package-info.java similarity index 92% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/config/package-info.java rename to spring-websocket/src/main/java/org/springframework/web/socket/config/package-info.java index ce3fcab8706..f4e7fe82a20 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/package-info.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/package-info.java @@ -17,5 +17,5 @@ /** * Configuration support for WebSocket request handling. */ -package org.springframework.web.socket.server.config; +package org.springframework.web.socket.config; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/StompWebSocketEndpointRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/StompWebSocketEndpointRegistration.java index c501f63d570..0107e024a71 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/StompWebSocketEndpointRegistration.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/StompWebSocketEndpointRegistration.java @@ -17,7 +17,7 @@ package org.springframework.web.socket.messaging.config; import org.springframework.web.socket.server.HandshakeHandler; -import org.springframework.web.socket.server.config.SockJsServiceRegistration; +import org.springframework.web.socket.config.SockJsServiceRegistration; /** * A contract for configuring a STOMP over WebSocket endpoint. diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/WebMvcStompWebSocketEndpointRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/WebMvcStompWebSocketEndpointRegistration.java index 904227efc3e..74ff5e9526c 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/WebMvcStompWebSocketEndpointRegistration.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/WebMvcStompWebSocketEndpointRegistration.java @@ -23,7 +23,7 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.HttpRequestHandler; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.server.HandshakeHandler; -import org.springframework.web.socket.server.config.SockJsServiceRegistration; +import org.springframework.web.socket.config.SockJsServiceRegistration; import org.springframework.web.socket.server.support.WebSocketHttpRequestHandler; import org.springframework.web.socket.sockjs.SockJsHttpRequestHandler; import org.springframework.web.socket.sockjs.SockJsService; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/WebSocketMessageBrokerConfigurationSupport.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/WebSocketMessageBrokerConfigurationSupport.java index d523e8344d6..11335e72ead 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/WebSocketMessageBrokerConfigurationSupport.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/WebSocketMessageBrokerConfigurationSupport.java @@ -21,7 +21,7 @@ import org.springframework.messaging.simp.config.AbstractMessageBrokerConfigurat import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.server.config.SockJsServiceRegistration; +import org.springframework.web.socket.config.SockJsServiceRegistration; import org.springframework.web.socket.messaging.SubProtocolWebSocketHandler; /** diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/xml/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/xml/package-info.java deleted file mode 100644 index 4e0e8f7dbc8..00000000000 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/config/xml/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Support for the {@code } XML namespace element. - */ -package org.springframework.web.socket.messaging.config.xml; \ No newline at end of file diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/xml/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/config/xml/package-info.java deleted file mode 100644 index ae07cbf2417..00000000000 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/config/xml/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Support for the {@code } XML namespace element. - */ -package org.springframework.web.socket.server.config.xml; \ No newline at end of file diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/package-info.java deleted file mode 100644 index 5417c6cdfdb..00000000000 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/package-info.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Server classes for use with standard Java WebSocket endpoints providing configuration - * and initialization support. - */ -package org.springframework.web.socket.server.endpoint; - diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractGlassFishRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractGlassFishRequestUpgradeStrategy.java index 4c4f5cc3dd5..f48e508d396 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractGlassFishRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractGlassFishRequestUpgradeStrategy.java @@ -50,8 +50,6 @@ import org.springframework.util.ClassUtils; import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.socket.server.HandshakeFailureException; -import org.springframework.web.socket.server.endpoint.ServerEndpointRegistration; -import org.springframework.web.socket.server.endpoint.ServletServerContainerFactoryBean; /** * GlassFish support for upgrading a request during a WebSocket handshake. To modify diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/DefaultHandshakeHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java similarity index 96% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/DefaultHandshakeHandler.java rename to spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java index 99ca0e4d294..e9136ea3fb7 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/DefaultHandshakeHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server; +package org.springframework.web.socket.server.support; import java.io.IOException; import java.util.ArrayList; @@ -25,6 +25,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.BeanUtils; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -32,21 +33,24 @@ import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; +import org.springframework.web.socket.WebSocketHandler; +import org.springframework.web.socket.server.HandshakeFailureException; +import org.springframework.web.socket.server.HandshakeHandler; +import org.springframework.web.socket.server.RequestUpgradeStrategy; import org.springframework.web.socket.support.SubProtocolCapable; import org.springframework.web.socket.support.WebSocketExtension; -import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.support.WebSocketHandlerDecorator; import org.springframework.web.socket.support.WebSocketHttpHeaders; /** - * A default {@link HandshakeHandler} implementation. Performs initial validation of the + * A default {@link org.springframework.web.socket.server.HandshakeHandler} implementation. Performs initial validation of the * WebSocket handshake request -- possibly rejecting it through the appropriate HTTP * status code -- while also allowing sub-classes to override various parts of the * negotiation process (e.g. origin validation, sub-protocol negotiation, * extensions negotiation, etc). * *

If the negotiation succeeds, the actual upgrade is delegated to a server-specific - * {@link RequestUpgradeStrategy}, which will update the response as necessary and + * {@link org.springframework.web.socket.server.RequestUpgradeStrategy}, which will update the response as necessary and * initialize the WebSocket. Currently supported servers are Tomcat 7 and 8, Jetty 9, and * Glassfish 4. * diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/ServerEndpointExporter.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/ServerEndpointExporter.java similarity index 99% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/ServerEndpointExporter.java rename to spring-websocket/src/main/java/org/springframework/web/socket/server/support/ServerEndpointExporter.java index eb050dc65bd..fb3b926c497 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/ServerEndpointExporter.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/ServerEndpointExporter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.endpoint; +package org.springframework.web.socket.server.support; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/ServerEndpointRegistration.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/ServerEndpointRegistration.java similarity index 99% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/ServerEndpointRegistration.java rename to spring-websocket/src/main/java/org/springframework/web/socket/server/support/ServerEndpointRegistration.java index a30591875bf..24da19b28c6 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/ServerEndpointRegistration.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/ServerEndpointRegistration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.endpoint; +package org.springframework.web.socket.server.support; import java.util.ArrayList; import java.util.HashMap; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/ServletServerContainerFactoryBean.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/ServletServerContainerFactoryBean.java similarity index 85% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/ServletServerContainerFactoryBean.java rename to spring-websocket/src/main/java/org/springframework/web/socket/server/support/ServletServerContainerFactoryBean.java index 5267594cfbf..a6c99c1823c 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/ServletServerContainerFactoryBean.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/ServletServerContainerFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.endpoint; +package org.springframework.web.socket.server.support; import javax.servlet.ServletContext; import javax.websocket.WebSocketContainer; @@ -24,8 +24,6 @@ import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; import org.springframework.web.context.ServletContextAware; -import org.springframework.web.socket.server.DefaultHandshakeHandler; -import org.springframework.web.socket.sockjs.SockJsService; /** * A FactoryBean for configuring {@link javax.websocket.server.ServerContainer}. Since @@ -36,9 +34,9 @@ import org.springframework.web.socket.sockjs.SockJsService; * *

This is useful even if the {@code ServerContainer} is not injected into any other * bean. For example, an application can configure a {@link DefaultHandshakeHandler}, a - * {@link SockJsService}, or {@link ServerEndpointExporter}, and separately declare this - * FactoryBean in order to customize the properties of the (one and only) - * {@code ServerContainer} instance. + * {@link org.springframework.web.socket.sockjs.SockJsService}, or {@link ServerEndpointExporter}, + * and separately declare this FactoryBean in order to customize the properties of the + * (one and only) {@code ServerContainer} instance. * * @author Rossen Stoyanchev * @since 4.0 @@ -94,26 +92,11 @@ public class ServletServerContainerFactoryBean this.serverContainer = (ServerContainer) servletContext.getAttribute("javax.websocket.server.ServerContainer"); } - @Override - public ServerContainer getObject() { - return this.serverContainer; - } @Override - public Class getObjectType() { - return ServerContainer.class; - } - - @Override - public boolean isSingleton() { - return false; - } - - @Override - public void afterPropertiesSet() throws Exception { - - Assert.state(this.serverContainer != null, "A ServletContext is required to " - + "access the javax.websocket.server.ServerContainer instance"); + public void afterPropertiesSet() { + Assert.state(this.serverContainer != null, + "A ServletContext is required to access the javax.websocket.server.ServerContainer instance"); if (this.asyncSendTimeout != null) { this.serverContainer.setAsyncSendTimeout(this.asyncSendTimeout); @@ -129,4 +112,20 @@ public class ServletServerContainerFactoryBean } } + + @Override + public ServerContainer getObject() { + return this.serverContainer; + } + + @Override + public Class getObjectType() { + return ServerContainer.class; + } + + @Override + public boolean isSingleton() { + return true; + } + } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/SpringConfigurator.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/SpringConfigurator.java similarity index 98% rename from spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/SpringConfigurator.java rename to spring-websocket/src/main/java/org/springframework/web/socket/server/support/SpringConfigurator.java index 7fdceb3c303..202833f3148 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/SpringConfigurator.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/SpringConfigurator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.endpoint; +package org.springframework.web.socket.server.support; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/TomcatRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/TomcatRequestUpgradeStrategy.java index 661425ae3d3..5af90542ba1 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/TomcatRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/TomcatRequestUpgradeStrategy.java @@ -35,8 +35,6 @@ import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.http.server.ServletServerHttpResponse; import org.springframework.util.Assert; import org.springframework.web.socket.server.HandshakeFailureException; -import org.springframework.web.socket.server.endpoint.ServerEndpointRegistration; -import org.springframework.web.socket.server.endpoint.ServletServerContainerFactoryBean; /** * Tomcat support for upgrading an {@link HttpServletRequest} during a WebSocket diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java index 8a2ea0ed1e6..80c87f07588 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -33,7 +32,6 @@ import org.springframework.http.server.ServletServerHttpResponse; import org.springframework.util.Assert; import org.springframework.web.HttpRequestHandler; import org.springframework.web.socket.WebSocketHandler; -import org.springframework.web.socket.server.DefaultHandshakeHandler; import org.springframework.web.socket.server.HandshakeFailureException; import org.springframework.web.socket.server.HandshakeHandler; import org.springframework.web.socket.server.HandshakeInterceptor; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java index a5278b9c102..d487daad454 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java @@ -40,10 +40,10 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketSession; -import org.springframework.web.socket.server.DefaultHandshakeHandler; import org.springframework.web.socket.server.HandshakeFailureException; import org.springframework.web.socket.server.HandshakeHandler; import org.springframework.web.socket.server.HandshakeInterceptor; +import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.server.support.HandshakeInterceptorChain; import org.springframework.web.socket.sockjs.SockJsException; import org.springframework.web.socket.sockjs.SockJsService; diff --git a/spring-websocket/src/main/resources/META-INF/spring.handlers b/spring-websocket/src/main/resources/META-INF/spring.handlers index a544492f093..5abebf29461 100644 --- a/spring-websocket/src/main/resources/META-INF/spring.handlers +++ b/spring-websocket/src/main/resources/META-INF/spring.handlers @@ -1,17 +1 @@ -# -# Copyright 2002-2013 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -http\://www.springframework.org/schema/websocket=org.springframework.web.socket.messaging.config.xml.WebSocketNamespaceHandler \ No newline at end of file +http\://www.springframework.org/schema/websocket=org.springframework.web.socket.config.WebSocketNamespaceHandler diff --git a/spring-websocket/src/main/resources/META-INF/spring.schemas b/spring-websocket/src/main/resources/META-INF/spring.schemas index f6cd0a347b3..21071f78efc 100644 --- a/spring-websocket/src/main/resources/META-INF/spring.schemas +++ b/spring-websocket/src/main/resources/META-INF/spring.schemas @@ -1,18 +1,2 @@ -# -# Copyright 2002-2013 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -http\://www.springframework.org/schema/websocket/spring-websocket-4.0.xsd=org/springframework/web/socket/server/config/xml/spring-websocket-4.0.xsd -http\://www.springframework.org/schema/websocket/spring-websocket.xsd=org/springframework/web/socket/server/config/xml/spring-websocket-4.0.xsd +http\://www.springframework.org/schema/websocket/spring-websocket-4.0.xsd=org/springframework/web/socket/config/spring-websocket-4.0.xsd +http\://www.springframework.org/schema/websocket/spring-websocket.xsd=org/springframework/web/socket/config/spring-websocket-4.0.xsd diff --git a/spring-websocket/src/main/resources/org/springframework/web/socket/server/config/xml/spring-websocket-4.0.xsd b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.0.xsd similarity index 100% rename from spring-websocket/src/main/resources/org/springframework/web/socket/server/config/xml/spring-websocket-4.0.xsd rename to spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.0.xsd diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java index e41c42322ab..043374edc74 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.util.concurrent.ListenableFuture; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; import org.springframework.web.socket.client.WebSocketClient; -import org.springframework.web.socket.server.DefaultHandshakeHandler; +import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.server.RequestUpgradeStrategy; import org.springframework.web.socket.server.support.JettyRequestUpgradeStrategy; import org.springframework.web.socket.server.support.TomcatRequestUpgradeStrategy; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java index be11394d2b2..b1d5bdc3e72 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java @@ -30,10 +30,10 @@ import org.springframework.web.socket.adapter.TextWebSocketHandlerAdapter; import org.springframework.web.socket.adapter.WebSocketHandlerAdapter; import org.springframework.web.socket.client.endpoint.StandardWebSocketClient; import org.springframework.web.socket.client.jetty.JettyWebSocketClient; -import org.springframework.web.socket.server.DefaultHandshakeHandler; -import org.springframework.web.socket.server.config.EnableWebSocket; -import org.springframework.web.socket.server.config.WebSocketConfigurer; -import org.springframework.web.socket.server.config.WebSocketHandlerRegistry; +import org.springframework.web.socket.server.support.DefaultHandshakeHandler; +import org.springframework.web.socket.config.EnableWebSocket; +import org.springframework.web.socket.config.WebSocketConfigurer; +import org.springframework.web.socket.config.WebSocketHandlerRegistry; import org.springframework.web.socket.support.WebSocketHttpHeaders; import static org.junit.Assert.*; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/config/AbstractWebSocketHandlerRegistrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/AbstractWebSocketHandlerRegistrationTests.java similarity index 98% rename from spring-websocket/src/test/java/org/springframework/web/socket/server/config/AbstractWebSocketHandlerRegistrationTests.java rename to spring-websocket/src/test/java/org/springframework/web/socket/config/AbstractWebSocketHandlerRegistrationTests.java index 55ddfcdcd29..9031919138f 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/config/AbstractWebSocketHandlerRegistrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/AbstractWebSocketHandlerRegistrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config; +package org.springframework.web.socket.config; import java.util.ArrayList; import java.util.Arrays; @@ -26,7 +26,7 @@ import org.mockito.Mockito; import org.springframework.scheduling.TaskScheduler; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.adapter.TextWebSocketHandlerAdapter; -import org.springframework.web.socket.server.DefaultHandshakeHandler; +import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.server.HandshakeHandler; import org.springframework.web.socket.server.HandshakeInterceptor; import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/config/xml/HandlersBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java similarity index 99% rename from spring-websocket/src/test/java/org/springframework/web/socket/server/config/xml/HandlersBeanDefinitionParserTests.java rename to spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java index d3b56f96c1a..21ce98170e6 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/config/xml/HandlersBeanDefinitionParserTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config.xml; +package org.springframework.web.socket.config; import org.hamcrest.Matchers; import org.junit.Before; @@ -34,7 +34,7 @@ import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketMessage; import org.springframework.web.socket.WebSocketSession; -import org.springframework.web.socket.server.DefaultHandshakeHandler; +import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.server.HandshakeFailureException; import org.springframework.web.socket.server.HandshakeHandler; import org.springframework.web.socket.server.HandshakeInterceptor; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/xml/MessageBrokerBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java similarity index 99% rename from spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/xml/MessageBrokerBeanDefinitionParserTests.java rename to spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java index 3965d7d9448..a0e105b39b4 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/xml/MessageBrokerBeanDefinitionParserTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.messaging.config.xml; +package org.springframework.web.socket.config; import org.hamcrest.Matchers; import org.junit.Before; @@ -43,7 +43,6 @@ import org.springframework.web.socket.support.WebSocketHandlerDecorator; import java.util.Arrays; import java.util.List; -import java.util.Map; import static org.junit.Assert.*; @@ -64,7 +63,6 @@ public class MessageBrokerBeanDefinitionParserTests { @Test public void simpleBroker() { - loadBeanDefinitions("websocket-config-broker-simple.xml"); HandlerMapping hm = this.appContext.getBean(HandlerMapping.class); @@ -136,7 +134,6 @@ public class MessageBrokerBeanDefinitionParserTests { @Test public void stompBrokerRelay() { - loadBeanDefinitions("websocket-config-broker-relay.xml"); HandlerMapping hm = this.appContext.getBean(HandlerMapping.class); @@ -198,7 +195,6 @@ public class MessageBrokerBeanDefinitionParserTests { @Test public void annotationMethodMessageHandler() { - loadBeanDefinitions("websocket-config-broker-simple.xml"); SimpAnnotationMethodMessageHandler annotationMethodMessageHandler = @@ -221,7 +217,6 @@ public class MessageBrokerBeanDefinitionParserTests { @Test public void customChannels() { - loadBeanDefinitions("websocket-config-broker-customchannels.xml"); List> subscriberTypes = diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/config/WebSocketConfigurationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketConfigurationTests.java similarity index 98% rename from spring-websocket/src/test/java/org/springframework/web/socket/server/config/WebSocketConfigurationTests.java rename to spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketConfigurationTests.java index 4ccefcc31f6..a2d077b45c4 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/config/WebSocketConfigurationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/WebSocketConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.socket.server.config; +package org.springframework.web.socket.config; import java.util.Arrays; import java.util.concurrent.CountDownLatch; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebMvcStompEndpointRegistrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebMvcStompEndpointRegistrationTests.java index ba180d4b831..5f1e8a466d8 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebMvcStompEndpointRegistrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/messaging/config/WebMvcStompEndpointRegistrationTests.java @@ -28,7 +28,7 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.util.MultiValueMap; import org.springframework.web.HttpRequestHandler; import org.springframework.web.socket.messaging.SubProtocolWebSocketHandler; -import org.springframework.web.socket.server.DefaultHandshakeHandler; +import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.server.support.WebSocketHttpRequestHandler; import org.springframework.web.socket.sockjs.SockJsHttpRequestHandler; import org.springframework.web.socket.sockjs.transport.TransportType; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java index 00f7d7fb1a0..859853f958b 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/DefaultHandshakeHandlerTests.java @@ -26,6 +26,7 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.springframework.web.socket.AbstractHttpRequestTests; +import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.support.SubProtocolCapable; import org.springframework.web.socket.support.WebSocketExtension; import org.springframework.web.socket.WebSocketHandler; @@ -36,7 +37,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; /** - * Test fixture for {@link DefaultHandshakeHandler}. + * Test fixture for {@link org.springframework.web.socket.server.support.DefaultHandshakeHandler}. * * @author Rossen Stoyanchev */ diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/endpoint/ServerEndpointExporterTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/endpoint/ServerEndpointExporterTests.java index 8b1ed431698..b3d509d3919 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/endpoint/ServerEndpointExporterTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/endpoint/ServerEndpointExporterTests.java @@ -28,11 +28,13 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mock.web.test.MockServletContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import org.springframework.web.socket.server.support.ServerEndpointExporter; +import org.springframework.web.socket.server.support.ServerEndpointRegistration; import static org.mockito.Mockito.*; /** - * Test fixture for {@link ServerEndpointExporter}. + * Test fixture for {@link org.springframework.web.socket.server.support.ServerEndpointExporter}. * * @author Rossen Stoyanchev */ diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/endpoint/ServerEndpointRegistrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/endpoint/ServerEndpointRegistrationTests.java index aa3bbde2ffe..2b5a21303d5 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/endpoint/ServerEndpointRegistrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/endpoint/ServerEndpointRegistrationTests.java @@ -26,11 +26,12 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.support.ServerEndpointRegistration; import static org.junit.Assert.*; /** - * Test fixture for {@link ServerEndpointRegistration}. + * Test fixture for {@link org.springframework.web.socket.server.support.ServerEndpointRegistration}. * * @author Rossen Stoyanchev */ diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/server/endpoint/SpringConfiguratorTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/server/endpoint/SpringConfiguratorTests.java index 8e49ba9bbff..a4614570565 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/server/endpoint/SpringConfiguratorTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/server/endpoint/SpringConfiguratorTests.java @@ -29,6 +29,7 @@ import org.springframework.mock.web.test.MockServletContext; import org.springframework.stereotype.Component; import org.springframework.web.context.ContextLoader; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import org.springframework.web.socket.server.support.SpringConfigurator; import static org.junit.Assert.*; diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/messaging/config/xml/websocket-config-broker-customchannels.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels.xml similarity index 55% rename from spring-websocket/src/test/resources/org/springframework/web/socket/messaging/config/xml/websocket-config-broker-customchannels.xml rename to spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels.xml index 5f0a809e6b5..f1a4f0d57b5 100644 --- a/spring-websocket/src/test/resources/org/springframework/web/socket/messaging/config/xml/websocket-config-broker-customchannels.xml +++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels.xml @@ -1,19 +1,3 @@ - - - + - + - + - + - + - - + + - + - + - + diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/messaging/config/xml/websocket-config-broker-relay.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-relay.xml similarity index 54% rename from spring-websocket/src/test/resources/org/springframework/web/socket/messaging/config/xml/websocket-config-broker-relay.xml rename to spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-relay.xml index a60341a4803..03e2cdfb4a0 100644 --- a/spring-websocket/src/test/resources/org/springframework/web/socket/messaging/config/xml/websocket-config-broker-relay.xml +++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-relay.xml @@ -1,19 +1,3 @@ - - - - + + - + + diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml new file mode 100644 index 00000000000..01daf446e38 --- /dev/null +++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-attributes.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-attributes.xml new file mode 100644 index 00000000000..e84d9fd77a5 --- /dev/null +++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-attributes.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/server/config/xml/websocket-config-handlers-sockjs-attributes.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs-attributes.xml similarity index 58% rename from spring-websocket/src/test/resources/org/springframework/web/socket/server/config/xml/websocket-config-handlers-sockjs-attributes.xml rename to spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs-attributes.xml index 38ab610280e..e6ef9cdd506 100644 --- a/spring-websocket/src/test/resources/org/springframework/web/socket/server/config/xml/websocket-config-handlers-sockjs-attributes.xml +++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs-attributes.xml @@ -1,19 +1,3 @@ - - - + - + + class="org.springframework.web.socket.config.TestWebSocketHandler"/> + class="org.springframework.web.socket.sockjs.transport.handler.XhrStreamingTransportHandler"/> + class="org.springframework.web.socket.config.TestTaskScheduler"/> diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs.xml new file mode 100644 index 00000000000..a7f75dbada5 --- /dev/null +++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers.xml new file mode 100644 index 00000000000..4a79d2a5a39 --- /dev/null +++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/messaging/config/xml/websocket-config-broker-simple.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/messaging/config/xml/websocket-config-broker-simple.xml deleted file mode 100644 index 387d3343b37..00000000000 --- a/spring-websocket/src/test/resources/org/springframework/web/socket/messaging/config/xml/websocket-config-broker-simple.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/server/config/xml/websocket-config-handlers-attributes.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/server/config/xml/websocket-config-handlers-attributes.xml deleted file mode 100644 index dd2b9a75714..00000000000 --- a/spring-websocket/src/test/resources/org/springframework/web/socket/server/config/xml/websocket-config-handlers-attributes.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/server/config/xml/websocket-config-handlers-sockjs.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/server/config/xml/websocket-config-handlers-sockjs.xml deleted file mode 100644 index f37802b1d1b..00000000000 --- a/spring-websocket/src/test/resources/org/springframework/web/socket/server/config/xml/websocket-config-handlers-sockjs.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/server/config/xml/websocket-config-handlers.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/server/config/xml/websocket-config-handlers.xml deleted file mode 100644 index 8a9cb3794b7..00000000000 --- a/spring-websocket/src/test/resources/org/springframework/web/socket/server/config/xml/websocket-config-handlers.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - -