Map Netty protocol names to NoSQL HttpConstants

Author: liujoey

driver/src/main/java/oracle/nosql/driver/NoSQLHandleConfig.java

@@ -21,7 +21,7 @@
 
 import oracle.nosql.driver.Region.RegionProvider;
 import oracle.nosql.driver.iam.SignatureProvider;
-import io.netty.handler.ssl.ApplicationProtocolNames;
+import oracle.nosql.driver.util.HttpConstants;
 import io.netty.handler.ssl.SslContext;
 
 /**
@@ -148,7 +148,7 @@ public class NoSQLHandleConfig implements Cloneable {
      *
      * Default: prefer H2 but fallback to Http1.1
      */
-    private List<String> httpProtocols = new ArrayList<>(Arrays.asList(ApplicationProtocolNames.HTTP_2, ApplicationProtocolNames.HTTP_1_1));
+    private List<String> httpProtocols = new ArrayList<>(Arrays.asList(HttpConstants.HTTP_2, HttpConstants.HTTP_1_1));
 
     /**
      * A RetryHandler, or null if not configured by the user.
@@ -569,15 +569,6 @@ public List<String> getHttpProtocols() {
         return httpProtocols;
     }
 
-    /**
-     * Check if "h2" is in the protocols list
-     *
-     * @return true if "h2" is in the protocols list
-     */
-    public boolean useHttp2() {
-        return this.httpProtocols.contains(ApplicationProtocolNames.HTTP_2);
-    }
-
     /**
      * Returns the configured table request timeout value, in milliseconds.
      * The table request timeout default can be specified independently to allow

driver/src/main/java/oracle/nosql/driver/http/NoSQLHandleImpl.java

@@ -50,6 +50,7 @@
 import oracle.nosql.driver.ops.TableUsageResult;
 import oracle.nosql.driver.ops.WriteMultipleRequest;
 import oracle.nosql.driver.ops.WriteMultipleResult;
+import oracle.nosql.driver.util.HttpConstants;
 import oracle.nosql.driver.values.FieldValue;
 import oracle.nosql.driver.values.JsonUtils;
 import oracle.nosql.driver.values.MapValue;
@@ -128,7 +129,7 @@ private void configSslContext(NoSQLHandleConfig config) {
                 }
                 builder.sessionTimeout(config.getSSLSessionTimeout());
                 builder.sessionCacheSize(config.getSSLSessionCacheSize());
-                if (config.useHttp2()) {
+                if (config.getHttpProtocols().contains(HttpConstants.HTTP_2)) {
                     builder.ciphers(Http2SecurityUtil.CIPHERS, SupportedCipherSuiteFilter.INSTANCE);
                 }
                 builder.applicationProtocolConfig(

driver/src/main/java/oracle/nosql/driver/httpclient/HttpClient.java

@@ -34,7 +34,6 @@
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.codec.http.DefaultFullHttpRequest;
 import io.netty.handler.codec.http.HttpRequest;
-import io.netty.handler.ssl.ApplicationProtocolNames;
 import io.netty.handler.ssl.SslContext;
 import io.netty.util.AttributeKey;
 import io.netty.util.concurrent.Future;
@@ -43,6 +42,7 @@
  * from this config needs to be be abstracted to a generic class.
  */
 import oracle.nosql.driver.NoSQLHandleConfig;
+import oracle.nosql.driver.util.HttpConstants;
 
 /**
  * Netty HTTP client. Initialization process:
@@ -231,12 +231,12 @@ private HttpClient(String host,
 
         this.httpProtocols = httpProtocols.size() > 0 ?
                 httpProtocols :
-                new ArrayList<>(Arrays.asList(ApplicationProtocolNames.HTTP_2, ApplicationProtocolNames.HTTP_1_1));
+                new ArrayList<>(Arrays.asList(HttpConstants.HTTP_2, HttpConstants.HTTP_1_1));
 
         // If Http1.1 is in the httpProtocols list, we prefer use it as the fallback
         // Else we use the last protocol in the httpProtocols list.
-        this.httpFallbackProtocol = this.httpProtocols.contains(ApplicationProtocolNames.HTTP_1_1) ?
-            ApplicationProtocolNames.HTTP_1_1 : this.httpProtocols.get(this.httpProtocols.size() - 1);
+        this.httpFallbackProtocol = this.httpProtocols.contains(HttpConstants.HTTP_1_1) ?
+            HttpConstants.HTTP_1_1 : this.httpProtocols.get(this.httpProtocols.size() - 1);
 
         this.maxContentLength = (maxContentLength == 0 ?
             DEFAULT_MAX_CONTENT_LENGTH : maxContentLength);
@@ -382,15 +382,6 @@ public int getFreeChannelCount() {
         return pool.getFreeChannels();
     }
 
-    /**
-     * Check if "h2" is in the protocols list
-     *
-     * @return true if "h2" is in the protocols list
-     */
-    public boolean useHttp2() {
-        return this.httpProtocols.contains(ApplicationProtocolNames.HTTP_2);
-    }
-
     /* available for testing */
     ConnectionPool getConnectionPool() {
         return pool;

driver/src/main/java/oracle/nosql/driver/httpclient/HttpClientChannelPoolHandler.java

@@ -23,10 +23,10 @@
 import io.netty.channel.pool.ChannelHealthChecker;
 import io.netty.channel.pool.ChannelPoolHandler;
 import io.netty.handler.proxy.HttpProxyHandler;
-import io.netty.handler.ssl.ApplicationProtocolNames;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.handler.ssl.SslHandshakeCompletionEvent;
 import io.netty.util.concurrent.Future;
+import oracle.nosql.driver.util.HttpConstants;
 
 /**
  * This is an instance of Netty's ChannelPoolHandler used to initialize
@@ -71,11 +71,12 @@ private void configureSSL(Channel ch) {
     private void configureClearText(Channel ch) {
         ChannelPipeline p = ch.pipeline();
         HttpClientHandler handler = new HttpClientHandler(client.getLogger());
+        boolean useHttp2 = client.getHttpProtocols().contains(HttpConstants.HTTP_2);
 
         // Only true when HTTP_2 is the only protocol, as if user set:
-        // config.setHttpProtocols(ApplicationProtocolNames.HTTP_2);
-        if (client.useHttp2() &&
-            ApplicationProtocolNames.HTTP_2.equals(client.getHttpFallbackProtocol())) {
+        // config.setHttpProtocols(HttpConstants.HTTP_2);
+        if (useHttp2 &&
+            HttpConstants.HTTP_2.equals(client.getHttpFallbackProtocol())) {
             // If choose to use H2 and fallback is also H2
             // Then there is no need to upgrade from Http1.1 to H2C
             // Directly connects with H2 protocol, so called Http2-prior-knowledge
@@ -85,19 +86,19 @@ private void configureClearText(Channel ch) {
         }
 
         // Only true when HTTP_1_1 is the only protocol, as if user set:
-        // config.setHttpProtocols(ApplicationProtocolNames.HTTP_1_1);
-        if (!client.useHttp2() &&
-            ApplicationProtocolNames.HTTP_1_1.equals(client.getHttpFallbackProtocol())) {
+        // config.setHttpProtocols(HttpConstants.HTTP_1_1);
+        if (!useHttp2 &&
+            HttpConstants.HTTP_1_1.equals(client.getHttpFallbackProtocol())) {
             HttpUtil.configureHttp1(ch.pipeline(), client.getMaxChunkSize(), client.getMaxContentLength());
             p.addLast(handler);
             return;
         }
 
         // Only true when both HTTP_2 and HTTP_1_1 are available, the default option:
-        // config.setHttpProtocols(ApplicationProtocolNames.HTTP_2,
-        //                         ApplicationProtocolNames.HTTP_1_1)
-        if (client.useHttp2() &&
-            ApplicationProtocolNames.HTTP_1_1.equals(client.getHttpFallbackProtocol())) {
+        // config.setHttpProtocols(HttpConstants.HTTP_2,
+        //                         HttpConstants.HTTP_1_1)
+        if (useHttp2 &&
+            HttpConstants.HTTP_1_1.equals(client.getHttpFallbackProtocol())) {
             HttpUtil.configureH2C(ch.pipeline(), client.getMaxChunkSize(), client.getMaxContentLength());
             p.addLast(handler);
             return;

driver/src/main/java/oracle/nosql/driver/httpclient/HttpProtocolNegotiationHandler.java

@@ -16,9 +16,9 @@
 import io.netty.channel.ChannelOutboundHandler;
 import io.netty.channel.ChannelPromise;
 import io.netty.handler.codec.http.HttpMessage;
-import io.netty.handler.ssl.ApplicationProtocolNames;
 import io.netty.handler.ssl.ApplicationProtocolNegotiationHandler;
 import io.netty.util.internal.RecyclableArrayList;
+import oracle.nosql.driver.util.HttpConstants;
 
 /**
  * Handle TLS protocol negotiation result, either Http1.1 or H2
@@ -50,9 +50,9 @@ public HttpProtocolNegotiationHandler(String fallbackProtocol, HttpClientHandler
 
     @Override
     protected void configurePipeline(ChannelHandlerContext ctx, String protocol) {
-        if (ApplicationProtocolNames.HTTP_2.equals(protocol)) {
+        if (HttpConstants.HTTP_2.equals(protocol)) {
             HttpUtil.configureHttp2(ctx.pipeline(), this.maxContentLength);
-        } else if (ApplicationProtocolNames.HTTP_1_1.equals(protocol)) {
+        } else if (HttpConstants.HTTP_1_1.equals(protocol)) {
             HttpUtil.configureHttp1(ctx.pipeline(), this.maxChunkSize, this.maxContentLength);
         } else {
             throw new IllegalStateException("unknown http protocol: " + protocol);

driver/src/main/java/oracle/nosql/driver/httpclient/HttpUtil.java

@@ -9,18 +9,24 @@
 
 import static io.netty.handler.logging.LogLevel.DEBUG;
 
+import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.Objects;
 
+import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
 import io.netty.handler.codec.http.HttpClientCodec;
 import io.netty.handler.codec.http.HttpClientUpgradeHandler;
+import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpObjectAggregator;
+import io.netty.handler.codec.http.HttpVersion;
 import io.netty.handler.codec.http2.DefaultHttp2Connection;
 import io.netty.handler.codec.http2.DelegatingDecompressorFrameListener;
 import io.netty.handler.codec.http2.Http2ClientUpgradeCodec;
@@ -30,6 +36,7 @@
 import io.netty.handler.codec.http2.HttpToHttp2ConnectionHandler;
 import io.netty.handler.codec.http2.HttpToHttp2ConnectionHandlerBuilder;
 import io.netty.handler.codec.http2.InboundHttp2ToHttpAdapterBuilder;
+import io.netty.util.ReferenceCountUtil;
 import io.netty.util.internal.RecyclableArrayList;
 
 public class HttpUtil {
@@ -100,8 +107,7 @@ public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
     }
 
     /**
-     * A handler that holds HttpMessages (Except the first one)
-     * So the upgrade handler can have time to finish clear text protocol upgrade
+     * A handler that triggers the cleartext upgrade to HTTP/2 by sending an initial HTTP request.
      */
     private static final class UpgradeRequestHandler extends ChannelDuplexHandler {
         private final int maxContentLength;
@@ -139,10 +145,6 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
         @Override
         public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
             if (msg instanceof HttpMessage) {
-                // Only let the very first HttpMessage pass through
-                // The H2C upgrade handler modifies the first message,
-                // and tries to negotiate a new protocol with the server
-                // This process takes one round trip
                 if (upgrading) {
                     Pair<Object, ChannelPromise> p = Pair.of(msg, promise);
                     this.bufferedMessages.add(p);

driver/src/main/java/oracle/nosql/driver/util/HttpConstants.java

@@ -14,6 +14,16 @@
  */
 public class HttpConstants {
 
+    /**
+     * {@code "h2"}: HTTP version 2
+     */
+    public static final String HTTP_2 = "h2";
+
+    /**
+     * {@code "http/1.1"}: HTTP version 1.1
+     */
+    public static final String HTTP_1_1 = "http/1.1";
+
     /**
      * The http header that identifies the client scoped unique request id
      * associated with each request. The request header is returned by the