remove server-side WebSocket implementation from the core and add it to the client.

Author: arturobernalg

httpcore5-websocket/pom.xml

@@ -60,11 +60,6 @@
       <artifactId>junit-platform-launcher</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>

httpcore5-websocket/src/main/java/org/apache/hc/core5/websocket/PerMessageDeflateExtension.java

@@ -28,6 +28,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.zip.Deflater;
 import java.util.zip.Inflater;
@@ -147,7 +148,7 @@ public ByteBuffer encode(final WebSocketFrameType type, final boolean fin, final
 
     @Override
     public WebSocketExtensionData getResponseData() {
-        final Map<String, String> params = new java.util.LinkedHashMap<>();
+        final Map<String, String> params = new LinkedHashMap<>();
         if (serverNoContextTakeover) {
             params.put("server_no_context_takeover", null);
         }

httpcore5-websocket/src/main/java/org/apache/hc/core5/websocket/WebSocketFrameReader.java

@@ -31,6 +31,7 @@
 import java.nio.ByteBuffer;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Predicate;
 
 import org.apache.hc.core5.util.Args;
 
@@ -131,7 +132,7 @@ WebSocketFrame readFrame() throws IOException {
         return new WebSocketFrame(fin, false, false, false, type, data);
     }
 
-    private WebSocketExtension selectExtension(final java.util.function.Predicate<WebSocketExtension> predicate) {
+    private WebSocketExtension selectExtension(final Predicate<WebSocketExtension> predicate) {
         WebSocketExtension selected = null;
         for (final WebSocketExtension extension : extensions) {
             if (predicate.test(extension)) {

httpcore5-websocket/src/main/java/org/apache/hc/core5/websocket/WebSocketHandshake.java

@@ -29,6 +29,7 @@
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 
 import org.apache.hc.core5.http.Header;
@@ -74,7 +75,7 @@ public static String createAcceptKey(final String key) throws WebSocketException
             final MessageDigest sha1 = MessageDigest.getInstance("SHA-1");
             final String acceptSource = key.trim() + WebSocketConstants.WEBSOCKET_GUID;
             final byte[] digest = sha1.digest(acceptSource.getBytes(StandardCharsets.ISO_8859_1));
-            return java.util.Base64.getEncoder().encodeToString(digest);
+            return Base64.getEncoder().encodeToString(digest);
         } catch (final Exception ex) {
             throw new WebSocketException("Unable to compute Sec-WebSocket-Accept", ex);
         }