Integration of WebSockets POC into Helidon 2.0

bom/pom.xml

@@ -63,6 +63,11 @@
                 <artifactId>helidon-webserver-test-support</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.webserver</groupId>
+                <artifactId>helidon-webserver-tyrus</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
             <!-- Helidon Jersey -->
             <dependency>
                 <groupId>io.helidon.jersey</groupId>
@@ -421,6 +426,11 @@
                 <artifactId>helidon-microprofile-access-log</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.microprofile.websocket</groupId>
+                <artifactId>helidon-microprofile-websocket</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
             <!-- metrics -->
             <dependency>
                 <groupId>io.helidon.metrics</groupId>

common/http/src/main/java/io/helidon/common/http/DataChunk.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 package io.helidon.common.http;
 
 import java.nio.ByteBuffer;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * The DataChunk represents a part of the HTTP body content.
@@ -105,6 +107,7 @@ static DataChunk create(boolean flush, ByteBuffer data, Runnable releaseCallback
     static DataChunk create(boolean flush, ByteBuffer data, Runnable releaseCallback, boolean readOnly) {
         return new DataChunk() {
             private boolean isReleased = false;
+            private CompletableFuture<DataChunk> writeFuture;
 
             @Override
             public ByteBuffer data() {
@@ -131,6 +134,16 @@ public boolean isReleased() {
             public boolean isReadOnly() {
                 return readOnly;
             }
+
+            @Override
+            public void writeFuture(CompletableFuture<DataChunk> writeFuture) {
+                this.writeFuture = writeFuture;
+            }
+
+            @Override
+            public Optional<CompletableFuture<DataChunk>> writeFuture() {
+                return Optional.ofNullable(writeFuture);
+            }
         };
     }
 
@@ -259,4 +272,22 @@ default boolean isReadOnly() {
     default boolean isFlushChunk() {
         return flush() && data().limit() == 0;
     }
+
+    /**
+     * Set a write future that will complete when data chunk has been
+     * written to a connection.
+     *
+     * @param writeFuture Write future.
+     */
+    default void writeFuture(CompletableFuture<DataChunk> writeFuture) {
+    }
+
+    /**
+     * Returns a write future associated with this chunk.
+     *
+     * @return Write future if one has ben set.
+     */
+    default Optional<CompletableFuture<DataChunk>> writeFuture() {
+        return Optional.empty();
+    }
 }

common/reactive/src/test/java/io/helidon/common/reactive/OutputStreamPublisherTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,9 @@ public void testBasic() {
         printer.close();
         assertThat(subscriber.isComplete(), is(equalTo(true)));
         assertThat(subscriber.getLastError(), is(nullValue()));
-        assertThat(subscriber.getItems().size(),is(equalTo(1)));
+        // Filter out any OutputStreamPublisher#FLUSH_BUFFER
+        long size = subscriber.getItems().stream().filter(b -> b.capacity() > 0).count();
+        assertThat(size, is(equalTo(1L)));
         ByteBuffer bb = subscriber.getItems().get(0);
         assertThat(new String(bb.array()), is(equalTo("foo")));
     }

dependencies/pom.xml

@@ -46,6 +46,7 @@
         <version.lib.el-api>3.0.0</version.lib.el-api>
         <version.lib.el-impl>3.0.0</version.lib.el-impl>
         <version.lib.etcd4j>2.17.0</version.lib.etcd4j>
+        <version.lib.failsafe>2.3.1</version.lib.failsafe>
         <version.lib.google-api-client>1.30.5</version.lib.google-api-client>
         <version.lib.graalvm>19.2.0</version.lib.graalvm>
         <version.lib.grpc>1.25.0</version.lib.grpc>
@@ -54,6 +55,7 @@
         <version.lib.hamcrest>1.3</version.lib.hamcrest>
         <version.lib.hibernate>5.4.4.Final</version.lib.hibernate>
         <version.lib.hikaricp>3.4.1</version.lib.hikaricp>
+        <version.lib.hystrix>1.5.18</version.lib.hystrix>
         <version.lib.inject>1</version.lib.inject>
         <version.lib.interceptor-api>1.2.2</version.lib.interceptor-api>
         <version.lib.jackson>2.10.0</version.lib.jackson>
@@ -97,12 +99,13 @@
         <version.lib.snakeyaml>1.24</version.lib.snakeyaml>
         <version.lib.transaction-api>1.2</version.lib.transaction-api>
         <version.lib.typesafe-config>1.4.0</version.lib.typesafe-config>
+        <version.lib.tyrus>1.15</version.lib.tyrus>
         <version.lib.ucp>19.3.0.0</version.lib.ucp>
         <version.lib.validation-api>2.0.1.Final</version.lib.validation-api>
-        <version.lib.zipkin>2.12.0</version.lib.zipkin>
-        <version.lib.hystrix>1.5.18</version.lib.hystrix>
-        <version.lib.failsafe>2.3.1</version.lib.failsafe>
+        <version.lib.websockets-api>1.1.2</version.lib.websockets-api>
+        <version.lib.weld>3.1.1.Final</version.lib.weld>
         <version.lib.yasson>1.0.6</version.lib.yasson>
+        <version.lib.zipkin>2.12.0</version.lib.zipkin>
     </properties>
 
     <dependencyManagement>
@@ -346,6 +349,26 @@
                 <artifactId>reactive-streams</artifactId>
                 <version>${version.lib.reactivestreams}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.websocket</groupId>
+                <artifactId>jakarta.websocket-api</artifactId>
+                <version>${version.lib.websockets-api}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.tyrus</groupId>
+                <artifactId>tyrus-core</artifactId>
+                <version>${version.lib.tyrus}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.tyrus</groupId>
+                <artifactId>tyrus-client</artifactId>
+                <version>${version.lib.tyrus}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.tyrus</groupId>
+                <artifactId>tyrus-server</artifactId>
+                <version>${version.lib.tyrus}</version>
+            </dependency>
 
             <!-- Security related -->
             <dependency>