Skip to content

Commit c33105d

Browse files
authored
Update netty to 4.1.115.Final
Also clean up a number of javadoc warnings from Java 21
1 parent 8babf7f commit c33105d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+398
-251
lines changed

driver/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<copyright>Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved.</copyright>
4747
<java.apidoc>http://docs.oracle.com/javase/8/docs/api</java.apidoc>
4848
<maven.deploy.skip>false</maven.deploy.skip>
49-
<netty.version>4.1.108.Final</netty.version>
49+
<netty.version>4.1.115.Final</netty.version>
5050
<jackson.version>2.15.2</jackson.version>
5151
<!-- by default, skip tests; tests require a profile -->
5252
<maven.test.skip>true</maven.test.skip>
@@ -379,7 +379,7 @@
379379
<version>3.5.0</version>
380380
<configuration>
381381
<quiet>true</quiet>
382-
<!-- consider this: <doclint>-missing</doclint> -->
382+
<doclint>-missing</doclint>
383383
<source>8</source>
384384
<doctitle>${project.name} ${project.version}</doctitle>
385385
<windowtitle>${project.name} ${project.version}</windowtitle>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ public class BatchOperationNumberLimitException extends ResourceLimitException {
1919
private static final long serialVersionUID = 1L;
2020

2121
/**
22-
* @hidden
22+
* internal use only
2323
* @param msg the message
24+
* @hidden
2425
*/
2526
public BatchOperationNumberLimitException(String msg) {
2627
super(msg);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ public class DeploymentException extends ResourceLimitException {
2020
private static final long serialVersionUID = 1L;
2121

2222
/**
23-
* @hidden
23+
* internal use only
2424
* @param msg the exception message
25+
* @hidden
2526
*/
2627
public DeploymentException(String msg) {
2728
super(msg);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
import java.util.jar.Manifest;
1515

1616
/**
17-
* @hidden
18-
*
1917
* A simple main for the driver jar file. At this time it only handles a
2018
* "version" command. If it ever is extended for other arguments it should
2119
* be better abstracted for multiple commands
20+
*
21+
* @hidden
2222
*/
2323
public class DriverMain {
2424

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ public class EvolutionLimitException extends ResourceLimitException {
1818
private static final long serialVersionUID = 1L;
1919

2020
/**
21-
* @hidden
21+
* internal use only
2222
*
2323
* @param msg the exception message
24+
* @hidden
2425
*/
2526
public EvolutionLimitException(String msg) {
2627
super(msg);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ public class IndexExistsException extends ResourceExistsException {
1616
private static final long serialVersionUID = 1L;
1717

1818
/**
19-
* @hidden
19+
* internal use only
2020
* @param msg the exception message
21+
* @hidden
2122
*/
2223
public IndexExistsException(String msg) {
2324
super(msg);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ public class IndexLimitException extends ResourceLimitException {
1818
private static final long serialVersionUID = 1L;
1919

2020
/**
21-
* @hidden
21+
* internal use only
2222
* @param msg the exception message
23+
* @hidden
2324
*/
2425
public IndexLimitException(String msg) {
2526
super(msg);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ public class IndexNotFoundException extends ResourceNotFoundException {
1616
private static final long serialVersionUID = 1L;
1717

1818
/**
19-
* @hidden
19+
* internal use only
2020
* @param msg the exception message
21+
* @hidden
2122
*/
2223
public IndexNotFoundException(String msg) {
2324
super(msg);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ public class InvalidAuthorizationException extends NoSQLException {
1616
private static final long serialVersionUID = 1L;
1717

1818
/**
19-
* @hidden
19+
* internal use only
2020
* @param msg the exception message
21+
* @hidden
2122
*/
2223
public InvalidAuthorizationException(String msg) {
2324
super(msg);

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,19 @@ public class JsonParseException extends NoSQLException {
2626
private JsonLocation location;
2727

2828
/**
29-
* @hidden
29+
* internal use only
3030
* @param msg the exception message
31+
* @hidden
3132
*/
3233
public JsonParseException(String msg) {
3334
super(msg);
3435
}
3536

3637
/**
37-
* @hidden
38+
* internal use only
3839
* @param msg the exception message
3940
* @param location the exception location in the input
41+
* @hidden
4042
*/
4143
public JsonParseException(String msg, JsonLocation location) {
4244
super(msg);
@@ -79,8 +81,9 @@ public String toString() {
7981
}
8082

8183
/**
82-
* @hidden
84+
* Internal use only
8385
* @return the location of the exception in the input
86+
* @hidden
8487
*/
8588
public JsonLocation getLocation() {
8689
return location;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ public class KeySizeLimitException extends ResourceLimitException {
1818
private static final long serialVersionUID = 1L;
1919

2020
/**
21-
* @hidden
21+
* internal use only
2222
* @param msg the exception message
23+
* @hidden
2324
*/
2425
public KeySizeLimitException(String msg) {
2526
super(msg);

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,19 @@ public class NoSQLException extends RuntimeException {
1717
private static final long serialVersionUID = 1L;
1818

1919
/**
20-
* @hidden
20+
* internal use only
2121
* @param msg the message
22+
* @hidden
2223
*/
2324
public /*protected*/ NoSQLException(String msg) {
2425
super(msg + " (" + SDKVersion.VERSION + ")");
2526
}
2627

2728
/**
28-
* @hidden
29-
*
29+
* internal use only
3030
* @param msg the message
3131
* @param cause the cause
32+
* @hidden
3233
*/
3334
public /*protected*/ NoSQLException(String msg, Throwable cause) {
3435
super(msg + " (" + SDKVersion.VERSION + ")", cause);

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

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -427,12 +427,12 @@ public NoSQLHandleConfig(AuthorizationProvider provider) {
427427
}
428428

429429
/**
430-
* @hidden
431-
*
430+
* internal use only
432431
* @param endpoint the endpoint to use
433432
* @param path the path to use
434433
* @return the constructed URL
435434
* Return a URL from an endpoint string
435+
* @hidden
436436
*/
437437
public static URL createURL(String endpoint, String path) {
438438
requireNonNull(endpoint,
@@ -767,8 +767,6 @@ public NoSQLHandleConfig setConnectionPoolMinSize(int poolMinSize) {
767767
}
768768

769769
/**
770-
* @hidden
771-
*
772770
* Sets an inactivity period, in seconds, used to time out idle connections
773771
* in the connection pool. This setting allows unused connections to be
774772
* reclaimed when the system goes idle, reducing resource use. If 0 for
@@ -780,6 +778,7 @@ public NoSQLHandleConfig setConnectionPoolMinSize(int poolMinSize) {
780778
* @return this
781779
*
782780
* @since 5.3.2
781+
* @hidden
783782
*/
784783
public NoSQLHandleConfig setConnectionPoolInactivityPeriod(
785784
int poolInactivityPeriod) {
@@ -834,14 +833,14 @@ public int getMaxContentLength() {
834833
}
835834

836835
/**
837-
* @hidden
838836
* Sets the maximum size in bytes of http chunks.
839837
* If not set, or set to zero, the default value of 64KB is used.
840838
*
841839
* @param maxChunkSize the maximum bytes allowed in
842840
* http chunks. Pass zero to use the default.
843841
*
844842
* @return this
843+
* @hidden
845844
*/
846845
public NoSQLHandleConfig setMaxChunkSize(int maxChunkSize) {
847846
if (maxChunkSize < 0) {
@@ -854,10 +853,10 @@ public NoSQLHandleConfig setMaxChunkSize(int maxChunkSize) {
854853
}
855854

856855
/**
857-
* @hidden
858856
* Returns the maximum size, in bytes, of any http chunk
859857
*
860858
* @return the size
859+
* @hidden
861860
*/
862861
public int getMaxChunkSize() {
863862
return maxChunkSize;
@@ -892,14 +891,14 @@ public int getConnectionPoolMinSize() {
892891
}
893892

894893
/**
895-
* @hidden
896894
* Returns the inactivity period, in seconds, to use to time out idle
897895
* connections. This allows the connection pool to shrink after a period
898896
* of inactivity, reducing resource use.
899897
*
900898
* @return the inactivity period, or 0 if not set
901899
*
902900
* @since 5.3.2
901+
* @hidden
903902
*/
904903
public int getConnectionPoolInactivityPeriod() {
905904
return connectionPoolInactivityPeriod;
@@ -976,9 +975,9 @@ public NoSQLHandleConfig setRateLimitingEnabled(boolean enable) {
976975
}
977976

978977
/**
979-
* @hidden
980978
* Internal use only
981979
* @return true if rate limiting is enabled
980+
* @hidden
982981
*/
983982
public boolean getRateLimitingEnabled() {
984983
return rateLimitingEnabled;
@@ -1007,9 +1006,9 @@ public void setDefaultRateLimitingPercentage(double percent) {
10071006
}
10081007

10091008
/**
1010-
* @hidden
10111009
* Internal use only
10121010
* @return the default percentage
1011+
* @hidden
10131012
*/
10141013
public double getDefaultRateLimitingPercentage() {
10151014
if (defaultRateLimiterPercentage == 0.0) {
@@ -1354,58 +1353,60 @@ public NoSQLHandleConfig setProxyPort(int proxyPort) {
13541353
}
13551354

13561355
/**
1357-
* @hidden
13581356
* Returns a proxy host, or null if not configured
13591357
*
13601358
* @return the host, or null
1359+
* @hidden
13611360
*/
13621361
public String getProxyHost() {
13631362
return proxyHost;
13641363
}
13651364

13661365
/**
1367-
* @hidden
13681366
* Returns a proxy user name, or null if not configured
13691367
*
13701368
* @return the user name, or null
1369+
* @hidden
13711370
*/
13721371
public String getProxyUsername() {
13731372
return proxyUsername;
13741373
}
13751374

13761375
/**
1377-
* @hidden
13781376
* Returns a proxy password, or null if not configured
13791377
*
13801378
* @return the password, or null
1379+
* @hidden
13811380
*/
13821381
public String getProxyPassword() {
13831382
return proxyPassword;
13841383
}
13851384

13861385
/**
1387-
* @hidden
13881386
* Returns a proxy port, or 0 if not configured
13891387
*
13901388
* @return the proxy port
1389+
* @hidden
13911390
*/
13921391
public int getProxyPort() {
13931392
return proxyPort;
13941393
}
13951394

13961395
/**
1397-
* @hidden
1396+
* internal use only
13981397
* @param sslCtx the SSL context to set
13991398
* @return this
1399+
* @hidden
14001400
*/
14011401
public NoSQLHandleConfig setSslContext(SslContext sslCtx) {
14021402
this.sslCtx = sslCtx;
14031403
return this;
14041404
}
14051405

14061406
/**
1407-
* @hidden
1407+
* internal use only
14081408
* @return the SSL context
1409+
* @hidden
14091410
*/
14101411
public SslContext getSslContext() {
14111412
return sslCtx;
@@ -1549,8 +1550,6 @@ public StatsControl.StatsHandler getStatsHandler() {
15491550
}
15501551

15511552
/**
1552-
* @hidden
1553-
*
15541553
* Cloud service only.
15551554
* Turns on, or off internal, automatic refresh of auth information based on
15561555
* tracked requests. This is present in case the refresh really isn't
@@ -1561,21 +1560,21 @@ public StatsControl.StatsHandler getStatsHandler() {
15611560
* @return this
15621561
*
15631562
* @since 5.3.2
1563+
* @hidden
15641564
*/
15651565
public NoSQLHandleConfig setAuthRefresh(boolean value) {
15661566
this.authRefresh = value;
15671567
return this;
15681568
}
15691569

15701570
/**
1571-
* @hidden
1572-
*
15731571
* Cloud service only.
15741572
* Returns the state of the authRefresh flag
15751573
*
15761574
* @return true if auth refresh is enabled
15771575
*
15781576
* @since 5.3.2
1577+
* @hidden
15791578
*/
15801579
public boolean getAuthRefresh() {
15811580
return authRefresh;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ public class OperationNotSupportedException extends NoSQLException {
1616
private static final long serialVersionUID = 1L;
1717

1818
/**
19-
* @hidden
19+
* Internal use only
2020
* @param msg the exception message
21+
* @hidden
2122
*/
2223
public OperationNotSupportedException(String msg) {
2324
super(msg);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ public class OperationThrottlingException extends ThrottlingException {
2525
private static final long serialVersionUID = 1L;
2626

2727
/**
28-
* @hidden
28+
* Internal use only
2929
* @param msg the exception message
30+
* @hidden
3031
*/
3132
public OperationThrottlingException(String msg) {
3233
super(msg);

0 commit comments

Comments
 (0)