Issue #5320 - changes from review

Signed-off-by: Lachlan Roberts <[email protected]>
jetty · Nov 9, 2020 · 42ebdc1 · 42ebdc1
1 parent e842c16
commit 42ebdc1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 34 deletions.
diff --git a/...ain/java/org/eclipse/jetty/websocket/client/config/JettyWebSocketClientConfiguration.java b/...ain/java/org/eclipse/jetty/websocket/client/config/JettyWebSocketClientConfiguration.java
@@ -47,28 +47,11 @@ public class JettyWebSocketClientConfiguration extends AbstractConfiguration
     public JettyWebSocketClientConfiguration()
     {
         addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class);
-        addDependents("org.eclipse.jetty.osgi.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName());
         addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName());
 
         protectAndExpose("org.eclipse.jetty.websocket.api.");
         protectAndExpose("org.eclipse.jetty.websocket.client.");
         hide("org.eclipse.jetty.client.impl.");
         hide("org.eclipse.jetty.client.config.");
     }
-
-    @Override
-    public boolean isAvailable()
-    {
-        try
-        {
-            ClassLoader classLoader = JettyWebSocketClientConfiguration.class.getClassLoader();
-            return classLoader.loadClass("org.eclipse.jetty.websocket.client.WebSocketClient") != null;
-        }
-        catch (Throwable e)
-        {
-            LOG.trace("IGNORED", e);
-        }
-
-        return false;
-    }
 }
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
@@ -48,7 +48,6 @@ public class JettyWebSocketConfiguration extends AbstractConfiguration
     public JettyWebSocketConfiguration()
     {
         addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class, FragmentConfiguration.class);
-        addDependents("org.eclipse.jetty.osgi.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName());
         addDependents("org.eclipse.jetty.annotations.AnnotationConfiguration", WebAppConfiguration.class.getName());
 
         protectAndExpose("org.eclipse.jetty.websocket.api.");
@@ -57,20 +56,4 @@ public JettyWebSocketConfiguration()
         hide("org.eclipse.jetty.server.internal.");
         hide("org.eclipse.jetty.server.config.");
     }
-
-    @Override
-    public boolean isAvailable()
-    {
-        try
-        {
-            ClassLoader classLoader = JettyWebSocketConfiguration.class.getClassLoader();
-            return classLoader.loadClass("org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer") != null;
-        }
-        catch (Throwable e)
-        {
-            LOG.trace("IGNORED", e);
-        }
-
-        return false;
-    }
 }