remove the extensions package as extensions are now written in websocket-core

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

jetty-websocket/websocket-jetty-api/src/main/java/module-info.java

@@ -16,6 +16,8 @@
 // ========================================================================
 //
 
+import org.eclipse.jetty.websocket.api.ExtensionConfig;
+
 module org.eclipse.jetty.websocket.jetty.api
 {
     exports org.eclipse.jetty.websocket.api;
@@ -24,5 +26,5 @@ module org.eclipse.jetty.websocket.jetty.api
     exports org.eclipse.jetty.websocket.api.extensions;
     exports org.eclipse.jetty.websocket.api.util;
 
-    uses org.eclipse.jetty.websocket.api.extensions.ExtensionConfig.Parser;
+    uses ExtensionConfig.Parser;
 }

jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/ExtensionConfig.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.websocket.api.extensions;
+package org.eclipse.jetty.websocket.api;
 
 import java.util.Map;
 import java.util.ServiceLoader;

jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java

@@ -24,8 +24,6 @@ import java.security.Principal;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
-
 /**
  * The HTTP Upgrade to WebSocket Request
  */

jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeResponse.java

@@ -22,8 +22,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
-
 /**
  * The HTTP Upgrade to WebSocket Response
  */

jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/exceptions/package-info.java

@@ -17,7 +17,7 @@
 //
 
 /**
- * Jetty WebSocket API : WebSocket Extension API
+ * Jetty WebSocket API : Exception Types
  */
-package org.eclipse.jetty.websocket.api.extensions;
+package org.eclipse.jetty.websocket.api.exceptions;
 

jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/util/WSURI.java

@@ -22,8 +22,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Objects;
 
-// @checkstyle-disable-check : AbbreviationAsWordInNameCheck
-
 /**
  * Utility methods for converting a {@link URI} between a HTTP(S) and WS(S) URI.
  */

jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java

@@ -31,9 +31,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpScheme;
+import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.eclipse.jetty.websocket.api.UpgradeRequest;
 import org.eclipse.jetty.websocket.api.UpgradeResponse;
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
 
 /**
  * Client based UpgradeRequest API

jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeRequest.java

@@ -32,8 +32,8 @@ import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.util.MultiMap;
 import org.eclipse.jetty.util.UrlEncoded;
+import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.eclipse.jetty.websocket.api.UpgradeRequest;
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
 import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 
 import static java.nio.charset.StandardCharsets.UTF_8;

jetty-websocket/websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/impl/DelegatedJettyClientUpgradeResponse.java

@@ -26,8 +26,8 @@ import java.util.stream.Collectors;
 
 import org.eclipse.jetty.client.HttpResponse;
 import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.eclipse.jetty.websocket.api.UpgradeResponse;
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
 
 /**
  * Representing the Jetty {@link org.eclipse.jetty.client.HttpClient}'s {@link org.eclipse.jetty.client.HttpResponse}

jetty-websocket/websocket-jetty-common/src/main/java/module-info.java

@@ -16,7 +16,7 @@
 // ========================================================================
 //
 
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
+import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.eclipse.jetty.websocket.common.ExtensionConfigParser;
 
 module org.eclipse.jetty.websocket.jetty.common

jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/ExtensionConfigParser.java

@@ -20,7 +20,7 @@ package org.eclipse.jetty.websocket.common;
 
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
 
-public class ExtensionConfigParser implements org.eclipse.jetty.websocket.api.extensions.ExtensionConfig.Parser
+public class ExtensionConfigParser implements org.eclipse.jetty.websocket.api.ExtensionConfig.Parser
 {
     /**
      * Parse a single parameterized name.

jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyExtensionConfig.java

@@ -26,7 +26,7 @@ import org.eclipse.jetty.websocket.core.ExtensionConfig;
 /**
  * Represents an Extension Configuration, as seen during the connection Handshake process.
  */
-public class JettyExtensionConfig implements org.eclipse.jetty.websocket.api.extensions.ExtensionConfig
+public class JettyExtensionConfig implements org.eclipse.jetty.websocket.api.ExtensionConfig
 {
 
     private final ExtensionConfig config;

jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyServerUpgradeResponse.java

@@ -21,9 +21,9 @@ package org.eclipse.jetty.websocket.server;
 import java.io.IOException;
 import java.util.List;
 
+import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.eclipse.jetty.websocket.api.UpgradeRequest;
 import org.eclipse.jetty.websocket.api.UpgradeResponse;
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
 
 public interface JettyServerUpgradeResponse extends UpgradeResponse
 {

jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/DelegatedServerUpgradeRequest.java

@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
+import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.eclipse.jetty.websocket.common.JettyExtensionConfig;
 import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
 import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeRequest;

jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/internal/DelegatedServerUpgradeResponse.java

@@ -24,7 +24,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
+import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.eclipse.jetty.websocket.common.JettyExtensionConfig;
 import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
 import org.eclipse.jetty.websocket.util.server.internal.ServerUpgradeResponse;

jetty-websocket/websocket-jetty-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java

@@ -37,7 +37,7 @@ import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 import org.eclipse.jetty.util.resource.PathResource;
 import org.eclipse.jetty.util.resource.Resource;
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
+import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
 import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
 import org.eclipse.jetty.websocket.server.JettyWebSocketCreator;

jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebSocketExtensionConfigTest.java

@@ -30,8 +30,8 @@ import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.eclipse.jetty.websocket.api.Session;
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
 import org.eclipse.jetty.websocket.client.JettyUpgradeListener;
 import org.eclipse.jetty.websocket.client.WebSocketClient;

jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/ExtensionConfigTest.java

@@ -21,7 +21,7 @@ package org.eclipse.jetty.websocket.tests.extensions;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig;
+import org.eclipse.jetty.websocket.api.ExtensionConfig;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;