Skip to content

Commit 4875fc4

Browse files
committed
Replace more instances of ApplicationProtocolNames
1 parent 80d2523 commit 4875fc4

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

driver/src/main/java/oracle/nosql/driver/iam/InstancePrincipalsProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.Set;
2525
import java.util.logging.Logger;
2626

27-
import io.netty.handler.ssl.ApplicationProtocolNames;
2827
import oracle.nosql.driver.NoSQLHandleConfig;
2928
import oracle.nosql.driver.Region;
3029
import oracle.nosql.driver.Region.RegionProvider;
@@ -34,6 +33,7 @@
3433
import oracle.nosql.driver.iam.SecurityTokenSupplier.SecurityTokenBasedProvider;
3534
import oracle.nosql.driver.iam.SessionKeyPairSupplier.DefaultSessionKeySupplier;
3635
import oracle.nosql.driver.iam.SessionKeyPairSupplier.JDKKeyPairSupplier;
36+
import oracle.nosql.driver.util.HttpConstants;
3737
import oracle.nosql.driver.util.HttpRequestUtil;
3838
import oracle.nosql.driver.util.HttpRequestUtil.HttpResponse;
3939

@@ -300,7 +300,7 @@ private void autoDetectEndpointUsingMetadataUrl() {
300300
null,
301301
0,
302302
"InstanceMDClient",
303-
Arrays.asList(ApplicationProtocolNames.HTTP_1_1),
303+
Arrays.asList(HttpConstants.HTTP_1_1),
304304
logger);
305305

306306
HttpResponse response = HttpRequestUtil.doGetRequest

driver/src/test/java/oracle/nosql/driver/ProxyTestBase.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import java.util.logging.Level;
3434
import java.util.logging.Logger;
3535

36-
import io.netty.handler.ssl.ApplicationProtocolNames;
3736
import oracle.nosql.driver.http.Client;
3837
import oracle.nosql.driver.http.NoSQLHandleImpl;
3938
import oracle.nosql.driver.kv.StoreAccessTokenProvider;
@@ -53,6 +52,7 @@
5352
import oracle.nosql.driver.ops.TableResult;
5453
import oracle.nosql.driver.ops.WriteMultipleRequest;
5554
import oracle.nosql.driver.ops.WriteMultipleResult;
55+
import oracle.nosql.driver.util.HttpConstants;
5656
import oracle.nosql.driver.values.ArrayValue;
5757
import oracle.nosql.driver.values.MapValue;
5858

@@ -467,11 +467,11 @@ protected NoSQLHandle getHandle(NoSQLHandleConfig config) {
467467

468468
boolean useHttp1only = Boolean.getBoolean("test.http1only");
469469
if (useHttp1only) {
470-
config.setHttpProtocols(ApplicationProtocolNames.HTTP_1_1);
470+
config.setHttpProtocols(HttpConstants.HTTP_1_1);
471471
}
472472
boolean useHttp2only = Boolean.getBoolean("test.http2only");
473473
if (useHttp2only) {
474-
config.setHttpProtocols(ApplicationProtocolNames.HTTP_2);
474+
config.setHttpProtocols(HttpConstants.HTTP_2);
475475
}
476476

477477
/*

driver/src/test/java/oracle/nosql/driver/httpclient/ConnectionPoolTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import javax.net.ssl.SSLException;
1818
import java.net.URL;
1919

20-
import io.netty.handler.ssl.ApplicationProtocolNames;
2120
import org.junit.Before;
2221
import org.junit.Test;
2322

@@ -26,6 +25,7 @@
2625
import io.netty.handler.ssl.SslContextBuilder;
2726

2827
import oracle.nosql.driver.NoSQLHandleConfig;
28+
import oracle.nosql.driver.util.HttpConstants;
2929

3030
/**
3131
* This test is excluded from the test profiles and must be run standalone.
@@ -73,7 +73,7 @@ public void poolTest() throws Exception {
7373
null, // sslCtx
7474
0, // ssl handshake timeout
7575
"Pool Test",
76-
Arrays.asList(ApplicationProtocolNames.HTTP_1_1),
76+
Arrays.asList(HttpConstants.HTTP_1_1),
7777
logger);
7878

7979
ConnectionPool pool = client.getConnectionPool();
@@ -173,7 +173,7 @@ public void testCloudTimeout() throws Exception {
173173
buildSslContext(),
174174
0, // ssl handshake timeout
175175
"Pool Cloud Test",
176-
Arrays.asList(ApplicationProtocolNames.HTTP_1_1),
176+
Arrays.asList(HttpConstants.HTTP_1_1),
177177
logger);
178178

179179
ConnectionPool pool = client.getConnectionPool();

0 commit comments

Comments
 (0)