This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a377fd11df243d3a16e4aa63766d102f80d3b5f7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 3 11:59:47 2024 +0000
Fix IDE warnings
---
.../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 37 +++++++++++-----------
.../tomcat/dbcp/dbcp2/PoolingConnection.java | 1 -
.../dbcp2/datasources/PerUserPoolDataSource.java | 23 ++++++--------
3 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
index 21b27f18e0..573fe08d9a 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
@@ -81,7 +81,7 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
@Override
public boolean deletesAreDetected(final int type) throws SQLException {
- return getB(() -> databaseMetaData.deletesAreDetected(type));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.deletesAreDetected(type)));
}
@Override
@@ -92,7 +92,7 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
@Override
public boolean generatedKeyAlwaysReturned() throws SQLException {
connection.checkOpen();
- return getB(() ->
Jdbc41Bridge.generatedKeyAlwaysReturned(databaseMetaData));
+ return getB(() ->
Boolean.valueOf(Jdbc41Bridge.generatedKeyAlwaysReturned(databaseMetaData)));
}
private <T> T get(final Callable<T> s) throws SQLException {
@@ -117,7 +117,7 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
}
private boolean getB(final Callable<Boolean> s) throws SQLException {
- return get(s, false);
+ return get(s, Boolean.FALSE).booleanValue();
}
@Override
@@ -244,7 +244,7 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
}
private int getI(final Callable<Integer> s) throws SQLException {
- return get(s, 0);
+ return get(s, Integer.valueOf(0)).intValue();
}
@Override
@@ -297,7 +297,7 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
}
private long getL(final Callable<Long> s) throws SQLException {
- return get(s, 0L);
+ return get(s, Long.valueOf(0)).longValue();
}
@Override
@@ -450,7 +450,6 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
return get(databaseMetaData::getRowIdLifetime);
}
- @SuppressWarnings("resource")
private ResultSet getRS(final Callable<ResultSet> s) throws SQLException {
connection.checkOpen();
return DelegatingResultSet.wrapResultSet(connection, get(s));
@@ -566,7 +565,7 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
@Override
public boolean insertsAreDetected(final int type) throws SQLException {
- return getB(() -> databaseMetaData.insertsAreDetected(type));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.insertsAreDetected(type)));
}
@Override
@@ -622,32 +621,32 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
@Override
public boolean othersDeletesAreVisible(final int type) throws SQLException
{
- return getB(() -> databaseMetaData.othersDeletesAreVisible(type));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.othersDeletesAreVisible(type)));
}
@Override
public boolean othersInsertsAreVisible(final int type) throws SQLException
{
- return getB(() -> databaseMetaData.othersInsertsAreVisible(type));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.othersInsertsAreVisible(type)));
}
@Override
public boolean othersUpdatesAreVisible(final int type) throws SQLException
{
- return getB(() -> databaseMetaData.othersUpdatesAreVisible(type));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.othersUpdatesAreVisible(type)));
}
@Override
public boolean ownDeletesAreVisible(final int type) throws SQLException {
- return getB(() -> databaseMetaData.ownDeletesAreVisible(type));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.ownDeletesAreVisible(type)));
}
@Override
public boolean ownInsertsAreVisible(final int type) throws SQLException {
- return getB(() -> databaseMetaData.ownInsertsAreVisible(type));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.ownInsertsAreVisible(type)));
}
@Override
public boolean ownUpdatesAreVisible(final int type) throws SQLException {
- return getB(() -> databaseMetaData.ownUpdatesAreVisible(type));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.ownUpdatesAreVisible(type)));
}
@Override
@@ -748,7 +747,7 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
@Override
public boolean supportsConvert(final int fromType, final int toType)
throws SQLException {
- return getB(() -> databaseMetaData.supportsConvert(fromType, toType));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.supportsConvert(fromType, toType)));
}
@Override
@@ -916,17 +915,17 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
@Override
public boolean supportsResultSetConcurrency(final int type, final int
concurrency) throws SQLException {
- return getB(() -> databaseMetaData.supportsResultSetConcurrency(type,
concurrency));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.supportsResultSetConcurrency(type,
concurrency)));
}
@Override
public boolean supportsResultSetHoldability(final int holdability) throws
SQLException {
- return getB(() ->
databaseMetaData.supportsResultSetHoldability(holdability));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.supportsResultSetHoldability(holdability)));
}
@Override
public boolean supportsResultSetType(final int type) throws SQLException {
- return getB(() -> databaseMetaData.supportsResultSetType(type));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.supportsResultSetType(type)));
}
@Override
@@ -1006,7 +1005,7 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
@Override
public boolean supportsTransactionIsolationLevel(final int level) throws
SQLException {
- return getB(() ->
databaseMetaData.supportsTransactionIsolationLevel(level));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.supportsTransactionIsolationLevel(level)));
}
@Override
@@ -1037,7 +1036,7 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
@Override
public boolean updatesAreDetected(final int type) throws SQLException {
- return getB(() -> databaseMetaData.updatesAreDetected(type));
+ return getB(() ->
Boolean.valueOf(databaseMetaData.updatesAreDetected(type)));
}
@Override
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
b/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
index fdee6560e2..76d013033c 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
@@ -122,7 +122,6 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
}
} finally {
try {
- @SuppressWarnings("resource")
final Connection delegateInternal = getDelegateInternal();
if (delegateInternal != null) {
delegateInternal.close();
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
index 3d9dc292e1..8ceefe9b68 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
@@ -176,7 +176,6 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
* @see org.apache.tomcat.dbcp.pool2.ObjectPool#clear()
* @since 2.3.0
*/
- @SuppressWarnings("resource") // does not allocate a pool
public void clear() {
managers.values().forEach(manager -> {
try {
@@ -301,7 +300,7 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
* @return The user specific value.
*/
public boolean getPerUserBlockWhenExhausted(final String userName) {
- return get(perUserBlockWhenExhausted, userName,
this::getDefaultBlockWhenExhausted);
+ return get(perUserBlockWhenExhausted, userName,
this::getDefaultBlockWhenExhausted).booleanValue();
}
/**
@@ -375,7 +374,7 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
* @return The user specific value.
*/
public boolean getPerUserLifo(final String userName) {
- return get(perUserLifo, userName, this::getDefaultLifo);
+ return get(perUserLifo, userName, this::getDefaultLifo).booleanValue();
}
/**
@@ -387,7 +386,7 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
* @return The user specific value.
*/
public int getPerUserMaxIdle(final String userName) {
- return get(perUserMaxIdle, userName, this::getDefaultMaxIdle);
+ return get(perUserMaxIdle, userName,
this::getDefaultMaxIdle).intValue();
}
/**
@@ -399,7 +398,7 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
* @return The user specific value.
*/
public int getPerUserMaxTotal(final String userName) {
- return get(perUserMaxTotal, userName, this::getDefaultMaxTotal);
+ return get(perUserMaxTotal, userName,
this::getDefaultMaxTotal).intValue();
}
/**
@@ -465,7 +464,7 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
* @return The user specific value.
*/
public int getPerUserMinIdle(final String userName) {
- return get(perUserMinIdle, userName, this::getDefaultMinIdle);
+ return get(perUserMinIdle, userName,
this::getDefaultMinIdle).intValue();
}
/**
@@ -477,7 +476,7 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
* @return The user specific value.
*/
public int getPerUserNumTestsPerEvictionRun(final String userName) {
- return get(perUserNumTestsPerEvictionRun, userName,
this::getDefaultNumTestsPerEvictionRun);
+ return get(perUserNumTestsPerEvictionRun, userName,
this::getDefaultNumTestsPerEvictionRun).intValue();
}
/**
@@ -516,7 +515,7 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
* @return The user specific value.
*/
public boolean getPerUserTestOnBorrow(final String userName) {
- return get(perUserTestOnBorrow, userName,
this::getDefaultTestOnBorrow);
+ return get(perUserTestOnBorrow, userName,
this::getDefaultTestOnBorrow).booleanValue();
}
/**
@@ -528,7 +527,7 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
* @return The user specific value.
*/
public boolean getPerUserTestOnCreate(final String userName) {
- return get(perUserTestOnCreate, userName,
this::getDefaultTestOnCreate);
+ return get(perUserTestOnCreate, userName,
this::getDefaultTestOnCreate).booleanValue();
}
/**
@@ -540,7 +539,7 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
* @return The user specific value.
*/
public boolean getPerUserTestOnReturn(final String userName) {
- return get(perUserTestOnReturn, userName,
this::getDefaultTestOnReturn);
+ return get(perUserTestOnReturn, userName,
this::getDefaultTestOnReturn).booleanValue();
}
/**
@@ -552,7 +551,7 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
* @return The user specific value.
*/
public boolean getPerUserTestWhileIdle(final String userName) {
- return get(perUserTestWhileIdle, userName,
this::getDefaultTestWhileIdle);
+ return get(perUserTestWhileIdle, userName,
this::getDefaultTestWhileIdle).booleanValue();
}
/**
@@ -581,7 +580,6 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
return mgr == null ? null : mgr.getPool();
}
- @SuppressWarnings("resource") // does not allocate a pool
@Override
protected PooledConnectionAndInfo getPooledConnectionAndInfo(final String
userName, final String password) throws SQLException {
final PoolKey key = getPoolKey(userName);
@@ -690,7 +688,6 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
isRollbackAfterValidation(), userName, password);
factory.setMaxConn(getMaxConnDuration());
// Create an object pool to contain our PooledConnections
- @SuppressWarnings("resource")
final GenericObjectPool<PooledConnectionAndInfo> pool = new
GenericObjectPool<>(factory);
factory.setPool(pool);
pool.setBlockWhenExhausted(getPerUserBlockWhenExhausted(userName));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
