Fix javadoc on websocket configuration classes.

Signed-off-by: Lachlan Roberts <[email protected]>
jetty · Nov 11, 2020 · a4160c4 · a4160c4
1 parent 8ff545f
commit a4160c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 20 deletions.
diff --git a/...ain/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java b/...ain/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java
@@ -28,15 +28,15 @@
 /**
  * <p>Websocket Configuration</p>
  * <p>This configuration configures the WebAppContext server/system classes to
- * be able to see the org.eclipse.jetty.websocket package.
- * </p>
+ * be able to see the {@code org.eclipse.jetty.websocket.javax} packages.</p>
  */
 public class JavaxWebSocketConfiguration extends AbstractConfiguration
 {
     public JavaxWebSocketConfiguration()
     {
         addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class);
         addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName());
+
         protectAndExpose("org.eclipse.jetty.websocket.util.server."); // For WebSocketUpgradeFilter
         protectAndExpose("org.eclipse.jetty.websocket.javax.server.config.");
         protectAndExpose("org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider");

diff --git a/...ain/java/org/eclipse/jetty/websocket/client/config/JettyWebSocketClientConfiguration.java b/...ain/java/org/eclipse/jetty/websocket/client/config/JettyWebSocketClientConfiguration.java
@@ -18,10 +18,7 @@
 
 package org.eclipse.jetty.websocket.client.config;
 
-import java.util.ServiceLoader;
-
 import org.eclipse.jetty.webapp.AbstractConfiguration;
-import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.FragmentConfiguration;
 import org.eclipse.jetty.webapp.MetaInfConfiguration;
 import org.eclipse.jetty.webapp.WebAppConfiguration;
@@ -33,12 +30,7 @@
 /**
  * <p>Websocket Configuration</p>
  * <p>This configuration configures the WebAppContext server/system classes to
- * be able to see the {@code org.eclipse.jetty.websocket.client} package.
- * This class is defined in the webapp package, as it implements the {@link Configuration} interface,
- * which is unknown to the websocket package.  However, the corresponding {@link ServiceLoader}
- * resource is defined in the websocket package, so that this configuration only be
- * loaded if the jetty-websocket jars are on the classpath.
- * </p>
+ * be able to see the {@code org.eclipse.jetty.websocket.client} package.</p>
  */
 public class JettyWebSocketClientConfiguration extends AbstractConfiguration
 {

diff --git a/.../src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java b/.../src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java
@@ -18,10 +18,7 @@
 
 package org.eclipse.jetty.websocket.server.config;
 
-import java.util.ServiceLoader;
-
 import org.eclipse.jetty.webapp.AbstractConfiguration;
-import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.FragmentConfiguration;
 import org.eclipse.jetty.webapp.MetaInfConfiguration;
 import org.eclipse.jetty.webapp.WebAppConfiguration;
@@ -34,12 +31,7 @@
  * <p>Websocket Configuration</p>
  * <p>This configuration configures the WebAppContext server/system classes to
  * be able to see the {@code org.eclipse.jetty.websocket.api}, {@code org.eclipse.jetty.websocket.server} and
- * {@code org.eclipse.jetty.websocket.util.server} packages.
- * This class is defined in the webapp package, as it implements the {@link Configuration} interface,
- * which is unknown to the websocket package.  However, the corresponding {@link ServiceLoader}
- * resource is defined in the websocket package, so that this configuration only be
- * loaded if the jetty-websocket jars are on the classpath.
- * </p>
+ * {@code org.eclipse.jetty.websocket.util.server} packages.</p>
  */
 public class JettyWebSocketConfiguration extends AbstractConfiguration
 {