From 080dcad218e2ecc3646e27ced0e42bc1d09def01 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 2 Jul 2016 15:46:21 +0200 Subject: [PATCH] Add missing package-info file for new test.context.web.socket package Issue: SPR-14420 --- .../context/web/socket/MockServerContainer.java | 13 +++++++------ .../MockServerContainerContextCustomizer.java | 10 ++-------- ...kServerContainerContextCustomizerFactory.java | 16 ++++++++-------- .../test/context/web/socket/package-info.java | 4 ++++ 4 files changed, 21 insertions(+), 22 deletions(-) create mode 100644 spring-test/src/main/java/org/springframework/test/context/web/socket/package-info.java diff --git a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainer.java b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainer.java index 9996e733e2..bd7c725758 100644 --- a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainer.java +++ b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainer.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.net.URI; import java.util.Collections; import java.util.Set; - import javax.websocket.ClientEndpointConfig; import javax.websocket.DeploymentException; import javax.websocket.Endpoint; @@ -30,8 +29,7 @@ import javax.websocket.server.ServerContainer; import javax.websocket.server.ServerEndpointConfig; /** - * Mock implementation of the {@link javax.websocket.server.ServerContainer} - * interface. + * Mock implementation of the {@link javax.websocket.server.ServerContainer} interface. * * @author Sam Brannen * @since 4.3.1 @@ -107,17 +105,20 @@ class MockServerContainer implements ServerContainer { @Override public Session connectToServer(Endpoint endpointInstance, ClientEndpointConfig cec, URI path) throws DeploymentException, IOException { + throw new UnsupportedOperationException( - "MockServerContainer does not support connectToServer(Endpoint, ClientEndpointConfig, URI)"); + "MockServerContainer does not support connectToServer(Endpoint, ClientEndpointConfig, URI)"); } @Override public Session connectToServer(Class endpointClass, ClientEndpointConfig cec, URI path) throws DeploymentException, IOException { + throw new UnsupportedOperationException( - "MockServerContainer does not support connectToServer(Class, ClientEndpointConfig, URI)"); + "MockServerContainer does not support connectToServer(Class, ClientEndpointConfig, URI)"); } + // --- ServerContainer ----------------------------------------------------- @Override @@ -128,7 +129,7 @@ class MockServerContainer implements ServerContainer { @Override public void addEndpoint(ServerEndpointConfig serverConfig) throws DeploymentException { throw new UnsupportedOperationException( - "MockServerContainer does not support addEndpoint(ServerEndpointConfig)"); + "MockServerContainer does not support addEndpoint(ServerEndpointConfig)"); } } diff --git a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java index 5a53b8e2ee..e68914eea5 100644 --- a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java +++ b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java @@ -40,14 +40,8 @@ class MockServerContainerContextCustomizer implements ContextCustomizer { } @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null || this.getClass() != that.getClass()) { - return false; - } - return true; + public boolean equals(Object other) { + return (this == other || (other != null && getClass() == other.getClass())); } @Override diff --git a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizerFactory.java b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizerFactory.java index d1adb79985..c76959c35a 100644 --- a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizerFactory.java +++ b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizerFactory.java @@ -35,15 +35,15 @@ import org.springframework.util.ClassUtils; */ class MockServerContainerContextCustomizerFactory implements ContextCustomizerFactory { - private static final boolean webSocketPresent = ClassUtils.isPresent("javax.websocket.server.ServerContainer", - MockServerContainerContextCustomizerFactory.class.getClassLoader()); - private static final String WEB_APP_CONFIGURATION_ANNOTATION_CLASS_NAME = "org.springframework.test.context.web.WebAppConfiguration"; private static final String MOCK_SERVER_CONTAINER_CONTEXT_CUSTOMIZER_CLASS_NAME = "org.springframework.test.context.web.socket.MockServerContainerContextCustomizer"; + private static final boolean webSocketPresent = ClassUtils.isPresent("javax.websocket.server.ServerContainer", + MockServerContainerContextCustomizerFactory.class.getClassLoader()); + @Override public ContextCustomizer createContextCustomizer(Class testClass, @@ -52,12 +52,12 @@ class MockServerContainerContextCustomizerFactory implements ContextCustomizerFa if (webSocketPresent && isAnnotatedWithWebAppConfiguration(testClass)) { try { Class clazz = ClassUtils.forName(MOCK_SERVER_CONTAINER_CONTEXT_CUSTOMIZER_CLASS_NAME, - getClass().getClassLoader()); + getClass().getClassLoader()); return (ContextCustomizer) BeanUtils.instantiateClass(clazz); } catch (Throwable ex) { - throw new IllegalStateException("Failed to enable WebSocket test support; could not load class: " - + MOCK_SERVER_CONTAINER_CONTEXT_CUSTOMIZER_CLASS_NAME, ex); + throw new IllegalStateException("Failed to enable WebSocket test support; could not load class: " + + MOCK_SERVER_CONTAINER_CONTEXT_CUSTOMIZER_CLASS_NAME, ex); } } @@ -66,8 +66,8 @@ class MockServerContainerContextCustomizerFactory implements ContextCustomizerFa } private static boolean isAnnotatedWithWebAppConfiguration(Class testClass) { - return AnnotatedElementUtils.findMergedAnnotationAttributes(testClass, - WEB_APP_CONFIGURATION_ANNOTATION_CLASS_NAME, false, false) != null; + return (AnnotatedElementUtils.findMergedAnnotationAttributes(testClass, + WEB_APP_CONFIGURATION_ANNOTATION_CLASS_NAME, false, false) != null); } } diff --git a/spring-test/src/main/java/org/springframework/test/context/web/socket/package-info.java b/spring-test/src/main/java/org/springframework/test/context/web/socket/package-info.java new file mode 100644 index 0000000000..7b97278f92 --- /dev/null +++ b/spring-test/src/main/java/org/springframework/test/context/web/socket/package-info.java @@ -0,0 +1,4 @@ +/** + * WebSocket support classes for the Spring TestContext Framework. + */ +package org.springframework.test.context.web.socket;