Issue #3872 Javax Websocket Packaging

improve comments tighten exposed classes more Signed-off-by: Greg Wilkins <gregw@webtide.com>
jetty · Jul 14, 2019 · 294e90b · 294e90b
1 parent f709fbe
commit 294e90b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/jetty-websocket/javax-websocket-server/src/main/java/module-info.java b/jetty-websocket/javax-websocket-server/src/main/java/module-info.java
@@ -27,7 +27,7 @@
 module org.eclipse.jetty.websocket.javax.server
 {
     exports org.eclipse.jetty.websocket.javax.server.config;
-    exports org.eclipse.jetty.websocket.javax.server.tests; // TODO removed this hack for the tests
+    exports org.eclipse.jetty.websocket.javax.server.tests; // TODO remove this hack
 
     requires jetty.servlet.api;
     requires jetty.websocket.api;

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
@@ -38,7 +38,11 @@ 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.servlet."); // For WebSocketUpgradeFilter
-        protectAndExpose("org.eclipse.jetty.websocket.javax.server."); // TODO
-        // hide("org.eclipse.jetty.websocket.javax.server.internal");
+        protectAndExpose("org.eclipse.jetty.websocket.javax.server.config.");
+        hide("org.eclipse.jetty.websocket.javax.server.internal");
+
+
+        // TODO get rid of this!!!
+        protectAndExpose("org.eclipse.jetty.websocket.javax.server.internal.ContainerDefaultConfigurator");
     }
 }
diff --git a/...-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/tests/Empty.java b/...-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/tests/Empty.java
@@ -18,7 +18,7 @@
 
 package org.eclipse.jetty.websocket.javax.server.tests;
 
-// TODO remove this hack class and package for the tests
+// TODO remove this hack class and package
 public class Empty
 {
 }