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

Author: arturobernalg

httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/DefaultH2RequestConverter.java

@@ -142,6 +142,9 @@ public HttpRequest convert(final List<Header> headers) throws HttpException {
                 }
             }
         } else {
+            if (protocol != null) {
+                throw new ProtocolException("Header '%s' must not be set for %s request", H2PseudoRequestHeaders.PROTOCOL, method);
+            }
             if (scheme == null) {
                 throw new ProtocolException("Mandatory request header '%s' not found", H2PseudoRequestHeaders.SCHEME);
             }

httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/TestDefaultH2RequestConverter.java

@@ -241,6 +241,64 @@ void testConvertFromFieldsConnectPresentPath() {
                 "Header ':path' must not be set for CONNECT request");
     }
 
+    @Test
+    void testConvertFromFieldsExtendedConnect() throws Exception {
+        final List<Header> headers = Arrays.asList(
+                new BasicHeader(":method", "CONNECT"),
+                new BasicHeader(":protocol", "websocket"),
+                new BasicHeader(":scheme", "https"),
+                new BasicHeader(":authority", "www.example.com"),
+                new BasicHeader(":path", "/chat"));
+
+        final DefaultH2RequestConverter converter = new DefaultH2RequestConverter();
+        final HttpRequest request = converter.convert(headers);
+
+        Assertions.assertEquals("CONNECT", request.getMethod());
+        Assertions.assertEquals("https", request.getScheme());
+        Assertions.assertEquals("/chat", request.getPath());
+        Assertions.assertEquals("websocket", request.getFirstHeader(":protocol").getValue());
+    }
+
+    @Test
+    void testConvertFromFieldsExtendedConnectMissingScheme() {
+        final List<Header> headers = Arrays.asList(
+                new BasicHeader(":method", "CONNECT"),
+                new BasicHeader(":protocol", "websocket"),
+                new BasicHeader(":authority", "www.example.com"),
+                new BasicHeader(":path", "/chat"));
+
+        final DefaultH2RequestConverter converter = new DefaultH2RequestConverter();
+        Assertions.assertThrows(HttpException.class, () -> converter.convert(headers),
+                "Header ':scheme' is mandatory for extended CONNECT");
+    }
+
+    @Test
+    void testConvertFromFieldsExtendedConnectMissingPath() {
+        final List<Header> headers = Arrays.asList(
+                new BasicHeader(":method", "CONNECT"),
+                new BasicHeader(":protocol", "websocket"),
+                new BasicHeader(":scheme", "https"),
+                new BasicHeader(":authority", "www.example.com"));
+
+        final DefaultH2RequestConverter converter = new DefaultH2RequestConverter();
+        Assertions.assertThrows(HttpException.class, () -> converter.convert(headers),
+                "Header ':path' is mandatory for extended CONNECT");
+    }
+
+    @Test
+    void testConvertFromFieldsProtocolWithNonConnect() {
+        final List<Header> headers = Arrays.asList(
+                new BasicHeader(":method", "GET"),
+                new BasicHeader(":protocol", "websocket"),
+                new BasicHeader(":scheme", "https"),
+                new BasicHeader(":authority", "www.example.com"),
+                new BasicHeader(":path", "/"));
+
+        final DefaultH2RequestConverter converter = new DefaultH2RequestConverter();
+        Assertions.assertThrows(HttpException.class, () -> converter.convert(headers),
+                "Header ':protocol' must not be set for GET request");
+    }
+
     @Test
     void testConvertFromMessageBasic() throws Exception {
 
@@ -332,6 +390,53 @@ void testConvertFromMessageConnectWithPath() {
                 "CONNECT request path must be null");
     }
 
+    @Test
+    void testConvertFromMessageExtendedConnect() throws Exception {
+        final HttpRequest request = new BasicHttpRequest("CONNECT", new HttpHost("host"), "/chat");
+        request.setScheme("https");
+        request.setAuthority(new URIAuthority("host"));
+        request.addHeader(":protocol", "websocket");
+
+        final DefaultH2RequestConverter converter = new DefaultH2RequestConverter();
+        final List<Header> headers = converter.convert(request);
+
+        Assertions.assertTrue(headers.stream().anyMatch(h -> ":protocol".equals(h.getName())));
+    }
+
+    @Test
+    void testConvertFromMessageExtendedConnectMissingScheme() {
+        final HttpRequest request = new BasicHttpRequest("CONNECT", new HttpHost("host"), "/chat");
+        request.setAuthority(new URIAuthority("host"));
+        request.setScheme(null);
+        request.addHeader(":protocol", "websocket");
+
+        final DefaultH2RequestConverter converter = new DefaultH2RequestConverter();
+        Assertions.assertThrows(HttpException.class, () -> converter.convert(request),
+                "CONNECT request scheme is not set");
+    }
+
+    @Test
+    void testConvertFromMessageExtendedConnectMissingPath() {
+        final HttpRequest request = new BasicHttpRequest("CONNECT", new HttpHost("host"), null);
+        request.setAuthority(new URIAuthority("host"));
+        request.setScheme("https");
+        request.addHeader(":protocol", "websocket");
+
+        final DefaultH2RequestConverter converter = new DefaultH2RequestConverter();
+        Assertions.assertThrows(HttpException.class, () -> converter.convert(request),
+                "CONNECT request path is not set");
+    }
+
+    @Test
+    void testConvertFromMessageProtocolWithNonConnect() {
+        final HttpRequest request = new BasicHttpRequest("GET", new HttpHost("host"), "/");
+        request.addHeader(":protocol", "websocket");
+
+        final DefaultH2RequestConverter converter = new DefaultH2RequestConverter();
+        Assertions.assertThrows(HttpException.class, () -> converter.convert(request),
+                "Header name ':protocol' is invalid");
+    }
+
     @Test
     void testConvertFromFieldsTETrailerHeader() throws Exception {
 

httpcore5-h2/src/test/java/org/apache/hc/core5/http2/impl/TestExtendedConnectRequestConverter.java

@@ -28,6 +28,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -75,6 +76,6 @@ void emitsProtocolPseudoHeader() throws Exception {
                 break;
             }
         }
-        assertEquals(true, found);
+        assertTrue(found);
     }
 }