Replace more instances of ApplicationProtocolNames

oracle · Oct 18, 2022 · 7495015 · 7495015
1 parent 80d2523
commit 7495015
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/driver/src/main/java/oracle/nosql/driver/http/NoSQLHandleImpl.java b/driver/src/main/java/oracle/nosql/driver/http/NoSQLHandleImpl.java
@@ -14,7 +14,6 @@
 
 import io.netty.handler.codec.http2.Http2SecurityUtil;
 import io.netty.handler.ssl.ApplicationProtocolConfig;
-import io.netty.handler.ssl.ApplicationProtocolNames;
 import io.netty.handler.ssl.SupportedCipherSuiteFilter;
 import oracle.nosql.driver.AuthorizationProvider;
 import oracle.nosql.driver.NoSQLHandle;

diff --git a/driver/src/main/java/oracle/nosql/driver/iam/InstancePrincipalsProvider.java b/driver/src/main/java/oracle/nosql/driver/iam/InstancePrincipalsProvider.java
@@ -24,7 +24,6 @@
 import java.util.Set;
 import java.util.logging.Logger;
 
-import io.netty.handler.ssl.ApplicationProtocolNames;
 import oracle.nosql.driver.NoSQLHandleConfig;
 import oracle.nosql.driver.Region;
 import oracle.nosql.driver.Region.RegionProvider;
@@ -34,6 +33,7 @@
 import oracle.nosql.driver.iam.SecurityTokenSupplier.SecurityTokenBasedProvider;
 import oracle.nosql.driver.iam.SessionKeyPairSupplier.DefaultSessionKeySupplier;
 import oracle.nosql.driver.iam.SessionKeyPairSupplier.JDKKeyPairSupplier;
+import oracle.nosql.driver.util.HttpConstants;
 import oracle.nosql.driver.util.HttpRequestUtil;
 import oracle.nosql.driver.util.HttpRequestUtil.HttpResponse;
 
@@ -300,7 +300,7 @@ private void autoDetectEndpointUsingMetadataUrl() {
                                                         null,
                                                         0,
                                                         "InstanceMDClient",
-                                                        Arrays.asList(ApplicationProtocolNames.HTTP_1_1),
+                                                        Arrays.asList(HttpConstants.HTTP_1_1),
                                                         logger);
 
                 HttpResponse response = HttpRequestUtil.doGetRequest

diff --git a/driver/src/test/java/oracle/nosql/driver/ProxyTestBase.java b/driver/src/test/java/oracle/nosql/driver/ProxyTestBase.java
@@ -33,7 +33,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import io.netty.handler.ssl.ApplicationProtocolNames;
 import oracle.nosql.driver.http.Client;
 import oracle.nosql.driver.http.NoSQLHandleImpl;
 import oracle.nosql.driver.kv.StoreAccessTokenProvider;
@@ -53,6 +52,7 @@
 import oracle.nosql.driver.ops.TableResult;
 import oracle.nosql.driver.ops.WriteMultipleRequest;
 import oracle.nosql.driver.ops.WriteMultipleResult;
+import oracle.nosql.driver.util.HttpConstants;
 import oracle.nosql.driver.values.ArrayValue;
 import oracle.nosql.driver.values.MapValue;
 
@@ -467,11 +467,11 @@ protected NoSQLHandle getHandle(NoSQLHandleConfig config) {
 
         boolean useHttp1only = Boolean.getBoolean("test.http1only");
         if (useHttp1only) {
-            config.setHttpProtocols(ApplicationProtocolNames.HTTP_1_1);
+            config.setHttpProtocols(HttpConstants.HTTP_1_1);
         }
         boolean useHttp2only = Boolean.getBoolean("test.http2only");
         if (useHttp2only) {
-            config.setHttpProtocols(ApplicationProtocolNames.HTTP_2);
+            config.setHttpProtocols(HttpConstants.HTTP_2);
         }
 
         /*

diff --git a/driver/src/test/java/oracle/nosql/driver/httpclient/ConnectionPoolTest.java b/driver/src/test/java/oracle/nosql/driver/httpclient/ConnectionPoolTest.java
@@ -17,7 +17,6 @@
 import javax.net.ssl.SSLException;
 import java.net.URL;
 
-import io.netty.handler.ssl.ApplicationProtocolNames;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -26,6 +25,7 @@
 import io.netty.handler.ssl.SslContextBuilder;
 
 import oracle.nosql.driver.NoSQLHandleConfig;
+import oracle.nosql.driver.util.HttpConstants;
 
 /**
  * This test is excluded from the test profiles and must be run standalone.
@@ -73,7 +73,7 @@ public void poolTest() throws Exception {
             null, // sslCtx
             0,    // ssl handshake timeout
             "Pool Test",
-            Arrays.asList(ApplicationProtocolNames.HTTP_1_1),
+            Arrays.asList(HttpConstants.HTTP_1_1),
             logger);
 
         ConnectionPool pool = client.getConnectionPool();
@@ -173,7 +173,7 @@ public void testCloudTimeout() throws Exception {
             buildSslContext(),
             0,    // ssl handshake timeout
             "Pool Cloud Test",
-            Arrays.asList(ApplicationProtocolNames.HTTP_1_1),
+            Arrays.asList(HttpConstants.HTTP_1_1),
             logger);
 
         ConnectionPool pool = client.getConnectionPool();