You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/05/31 15:20:18 UTC
[commons-dbcp] 01/03: Use final and simpler array initializations.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit bdc262055c99482800be541dfef0e4334cefbdeb
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon May 31 11:16:08 2021 -0400
Use final and simpler array initializations.
---
src/main/java/org/apache/commons/dbcp2/PoolableConnection.java | 2 +-
src/main/java/org/apache/commons/dbcp2/PoolingDriver.java | 2 +-
src/main/java/org/apache/commons/dbcp2/Utils.java | 4 ++--
.../org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java | 2 +-
src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
index 9bd367b..09502a6 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
@@ -240,7 +240,7 @@ public class PoolableConnection extends DelegatingConnection<Connection> impleme
* @since 2.9.0
*/
@Override
- public void abort(Executor executor) throws SQLException {
+ public void abort(final Executor executor) throws SQLException {
if (jmxObjectName != null) {
jmxObjectName.unregisterMBean();
}
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
index ae0c0da..4edaf1c 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
@@ -36,7 +36,7 @@ import org.apache.commons.pool2.ObjectPool;
*/
public class PoolingDriver implements Driver {
- private static final DriverPropertyInfo[] EMPTY_DRIVER_PROPERTY_INFO_ARRAY = new DriverPropertyInfo[0];
+ private static final DriverPropertyInfo[] EMPTY_DRIVER_PROPERTY_INFO_ARRAY = {};
/* Register myself with the {@link DriverManager}. */
static {
diff --git a/src/main/java/org/apache/commons/dbcp2/Utils.java b/src/main/java/org/apache/commons/dbcp2/Utils.java
index 5adc070..5a2f5af 100644
--- a/src/main/java/org/apache/commons/dbcp2/Utils.java
+++ b/src/main/java/org/apache/commons/dbcp2/Utils.java
@@ -58,8 +58,8 @@ public final class Utils {
*/
public static final Set<String> DISCONNECTION_SQL_CODES;
- static final ResultSet[] EMPTY_RESULT_SET_ARRAY = new ResultSet[0];
- static final String[] EMPTY_STRING_ARRAY = new String[0];
+ static final ResultSet[] EMPTY_RESULT_SET_ARRAY = {};
+ static final String[] EMPTY_STRING_ARRAY = {};
static {
DISCONNECTION_SQL_CODES = new HashSet<>();
diff --git a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
index 44faba8..6992ef2 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
@@ -50,7 +50,7 @@ public class LocalXAConnectionFactory implements XAConnectionFactory {
* @since 2.0
*/
protected static class LocalXAResource implements XAResource {
- private static final Xid[] EMPTY_XID_ARRAY = new Xid[0];
+ private static final Xid[] EMPTY_XID_ARRAY = {};
private final Connection connection;
private Xid currentXid; // @GuardedBy("this")
private boolean originalAutoCommit; // @GuardedBy("this")
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
index 2a46d37..31d8252 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
@@ -101,7 +101,7 @@ public class TestPoolingConnection {
@Test
public void testPrepareStatementWithColumnIndexes() throws Exception {
final String sql = "select 'a' from dual";
- final int[] columnIndexes = new int[]{1};
+ final int[] columnIndexes = {1};
final DelegatingPreparedStatement statement = (DelegatingPreparedStatement)con.prepareStatement(sql, columnIndexes);
final TesterPreparedStatement testStatement = (TesterPreparedStatement) statement.getInnermostDelegate();
// assert
@@ -112,7 +112,7 @@ public class TestPoolingConnection {
@Test
public void testPrepareStatementWithColumnNames() throws Exception {
final String sql = "select 'a' from dual";
- final String[] columnNames = new String[]{"columnName1"};
+ final String[] columnNames = {"columnName1"};
final DelegatingPreparedStatement statement = (DelegatingPreparedStatement)con.prepareStatement(sql, columnNames);
final TesterPreparedStatement testStatement = (TesterPreparedStatement) statement.getInnermostDelegate();
// assert