This is an automated email from the ASF dual-hosted git repository.
ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
commit 35da73485fcb50ee7a2a05ff326493fbb279454b
Author: Emmanuel Bourg <ebo...@apache.org>
AuthorDate: Fri Dec 4 13:40:35 2020 +0100
Use Java-style array declarations
---
.../org/apache/commons/dbcp2/DelegatingConnection.java | 4 ++--
.../org/apache/commons/dbcp2/DelegatingStatement.java | 8 ++++----
.../org/apache/commons/dbcp2/PoolingConnection.java | 8 ++++----
.../commons/dbcp2/cpdsadapter/ConnectionImpl.java | 4 ++--
.../apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java | 4 ++--
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 8 ++++----
.../apache/commons/dbcp2/TestPoolingConnection.java | 2 +-
.../apache/commons/dbcp2/TesterCallableStatement.java | 2 +-
.../org/apache/commons/dbcp2/TesterConnection.java | 4 ++--
.../apache/commons/dbcp2/TesterPreparedStatement.java | 18 +++++++++---------
.../java/org/apache/commons/dbcp2/TesterResultSet.java | 4 ++--
.../java/org/apache/commons/dbcp2/TesterStatement.java | 8 ++++----
12 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
index e7aeb61..fd163dc 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -767,7 +767,7 @@ public class DelegatingConnection<C extends Connection>
extends AbandonedTrace i
}
@Override
- public PreparedStatement prepareStatement(final String sql, final int
columnIndexes[]) throws SQLException {
+ public PreparedStatement prepareStatement(final String sql, final int[]
columnIndexes) throws SQLException {
checkOpen();
try {
final DelegatingPreparedStatement dps = new
DelegatingPreparedStatement(this,
@@ -781,7 +781,7 @@ public class DelegatingConnection<C extends Connection>
extends AbandonedTrace i
}
@Override
- public PreparedStatement prepareStatement(final String sql, final String
columnNames[]) throws SQLException {
+ public PreparedStatement prepareStatement(final String sql, final String[]
columnNames) throws SQLException {
checkOpen();
try {
final DelegatingPreparedStatement dps = new
DelegatingPreparedStatement(this,
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
index 71d4cbc..a2976ba 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
@@ -211,7 +211,7 @@ public class DelegatingStatement extends AbandonedTrace
implements Statement {
}
@Override
- public boolean execute(final String sql, final int columnIndexes[]) throws
SQLException {
+ public boolean execute(final String sql, final int[] columnIndexes) throws
SQLException {
checkOpen();
setLastUsedInParent();
try {
@@ -223,7 +223,7 @@ public class DelegatingStatement extends AbandonedTrace
implements Statement {
}
@Override
- public boolean execute(final String sql, final String columnNames[])
throws SQLException {
+ public boolean execute(final String sql, final String[] columnNames)
throws SQLException {
checkOpen();
setLastUsedInParent();
try {
@@ -358,7 +358,7 @@ public class DelegatingStatement extends AbandonedTrace
implements Statement {
}
@Override
- public int executeUpdate(final String sql, final int columnIndexes[])
throws SQLException {
+ public int executeUpdate(final String sql, final int[] columnIndexes)
throws SQLException {
checkOpen();
setLastUsedInParent();
try {
@@ -370,7 +370,7 @@ public class DelegatingStatement extends AbandonedTrace
implements Statement {
}
@Override
- public int executeUpdate(final String sql, final String columnNames[])
throws SQLException {
+ public int executeUpdate(final String sql, final String[] columnNames)
throws SQLException {
checkOpen();
setLastUsedInParent();
try {
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
index 98a284b..c629f87 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
@@ -158,7 +158,7 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
*
* @return the PStmtKey created for the given arguments.
*/
- protected PStmtKey createKey(final String sql, final int columnIndexes[]) {
+ protected PStmtKey createKey(final String sql, final int[] columnIndexes) {
return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(),
getSchemaOrNull(), columnIndexes);
}
@@ -278,7 +278,7 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
*
* @return the PStmtKey created for the given arguments.
*/
- protected PStmtKey createKey(final String sql, final String columnNames[])
{
+ protected PStmtKey createKey(final String sql, final String[] columnNames)
{
return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(),
getSchemaOrNull(), columnNames);
}
@@ -519,7 +519,7 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
*
*/
@Override
- public PreparedStatement prepareStatement(final String sql, final int
columnIndexes[]) throws SQLException {
+ public PreparedStatement prepareStatement(final String sql, final int[]
columnIndexes) throws SQLException {
return prepareStatement(createKey(sql, columnIndexes));
}
@@ -575,7 +575,7 @@ public class PoolingConnection extends
DelegatingConnection<Connection>
* Wraps an underlying exception.
*/
@Override
- public PreparedStatement prepareStatement(final String sql, final String
columnNames[]) throws SQLException {
+ public PreparedStatement prepareStatement(final String sql, final String[]
columnNames) throws SQLException {
return prepareStatement(createKey(sql, columnNames));
}
diff --git
a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
index 2226e8e..f997695 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
@@ -242,7 +242,7 @@ class ConnectionImpl extends
DelegatingConnection<Connection> {
}
@Override
- public PreparedStatement prepareStatement(final String sql, final int
columnIndexes[]) throws SQLException {
+ public PreparedStatement prepareStatement(final String sql, final int[]
columnIndexes) throws SQLException {
checkOpen();
try {
return new DelegatingPreparedStatement(this,
pooledConnection.prepareStatement(sql, columnIndexes));
@@ -253,7 +253,7 @@ class ConnectionImpl extends
DelegatingConnection<Connection> {
}
@Override
- public PreparedStatement prepareStatement(final String sql, final String
columnNames[]) throws SQLException {
+ public PreparedStatement prepareStatement(final String sql, final String[]
columnNames) throws SQLException {
checkOpen();
try {
return new DelegatingPreparedStatement(this,
pooledConnection.prepareStatement(sql, columnNames));
diff --git
a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java
b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java
index f314fca..8cbf966 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java
@@ -95,7 +95,7 @@ public class PStmtKeyCPDS extends PStmtKey {
* An array of column indexes indicating the columns that
should be returned from the inserted row or
* rows.
*/
- public PStmtKeyCPDS(final String sql, final int columnIndexes[]) {
+ public PStmtKeyCPDS(final String sql, final int[] columnIndexes) {
super(sql, null, columnIndexes);
}
@@ -107,7 +107,7 @@ public class PStmtKeyCPDS extends PStmtKey {
* @param columnNames
* An array of column names indicating the columns that should
be returned from the inserted row or rows.
*/
- public PStmtKeyCPDS(final String sql, final String columnNames[]) {
+ public PStmtKeyCPDS(final String sql, final String[] columnNames) {
super(sql, null, columnNames);
}
}
diff --git
a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
index 1f74af4..fa02309 100644
---
a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
+++
b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
@@ -214,7 +214,7 @@ class PooledConnectionImpl
* rows.
* @return a key to uniquely identify a prepared statement.
*/
- protected PStmtKey createKey(final String sql, final int columnIndexes[]) {
+ protected PStmtKey createKey(final String sql, final int[] columnIndexes) {
return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(),
getSchemaOrNull(), columnIndexes);
}
@@ -327,7 +327,7 @@ class PooledConnectionImpl
* An array of column names indicating the columns that should
be returned from the inserted row or rows.
* @return a key to uniquely identify a prepared statement.
*/
- protected PStmtKey createKey(final String sql, final String columnNames[])
{
+ protected PStmtKey createKey(final String sql, final String[] columnNames)
{
return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(),
getSchemaOrNull(), columnNames);
}
@@ -615,7 +615,7 @@ class PooledConnectionImpl
}
}
- PreparedStatement prepareStatement(final String sql, final int
columnIndexes[]) throws SQLException {
+ PreparedStatement prepareStatement(final String sql, final int[]
columnIndexes) throws SQLException {
if (pStmtPool == null) {
return connection.prepareStatement(sql, columnIndexes);
}
@@ -672,7 +672,7 @@ class PooledConnectionImpl
}
}
- PreparedStatement prepareStatement(final String sql, final String
columnNames[]) throws SQLException {
+ PreparedStatement prepareStatement(final String sql, final String[]
columnNames) throws SQLException {
if (pStmtPool == null) {
return connection.prepareStatement(sql, columnNames);
}
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
index a431f03..c243248 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
@@ -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 = new String[]{"columnName1"};
final DelegatingPreparedStatement statement =
(DelegatingPreparedStatement)con.prepareStatement(sql, columnNames);
final TesterPreparedStatement testStatement =
(TesterPreparedStatement) statement.getInnermostDelegate();
// assert
diff --git
a/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
b/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
index d9abb92..36010ad 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterCallableStatement.java
@@ -472,7 +472,7 @@ public class TesterCallableStatement extends
TesterPreparedStatement implements
}
@Override
- public void setBytes(final String parameterName, final byte x[]) throws
SQLException {
+ public void setBytes(final String parameterName, final byte[] x) throws
SQLException {
}
@Override
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
b/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
index acf8a99..f136377 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterConnection.java
@@ -292,7 +292,7 @@ public class TesterConnection extends AbandonedTrace
implements Connection {
}
@Override
- public PreparedStatement prepareStatement(final String sql, final int
columnIndexes[])
+ public PreparedStatement prepareStatement(final String sql, final int[]
columnIndexes)
throws SQLException {
return new TesterPreparedStatement(this, sql, columnIndexes);
}
@@ -314,7 +314,7 @@ public class TesterConnection extends AbandonedTrace
implements Connection {
@Override
- public PreparedStatement prepareStatement(final String sql, final String
columnNames[])
+ public PreparedStatement prepareStatement(final String sql, final String[]
columnNames)
throws SQLException {
return new TesterPreparedStatement(this, sql, columnNames);
}
diff --git
a/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
b/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
index be671b2..facec22 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
@@ -77,7 +77,7 @@ public class TesterPreparedStatement extends TesterStatement
implements Prepared
}
}
- public TesterPreparedStatement(final Connection conn, final String sql,
final int columnIndexes[]) {
+ public TesterPreparedStatement(final Connection conn, final String sql,
final int[] columnIndexes) {
super(conn);
_sql = sql;
_columnIndexes = columnIndexes;
@@ -109,7 +109,7 @@ public class TesterPreparedStatement extends
TesterStatement implements Prepared
}
}
- public TesterPreparedStatement(final Connection conn, final String sql,
final String columnNames[]) {
+ public TesterPreparedStatement(final Connection conn, final String sql,
final String[] columnNames) {
super(conn);
_sql = sql;
_columnNames = columnNames;
@@ -142,13 +142,13 @@ public class TesterPreparedStatement extends
TesterStatement implements Prepared
}
@Override
- public boolean execute(final String sl, final int columnIndexes[]) throws
SQLException {
+ public boolean execute(final String sl, final int[] columnIndexes) throws
SQLException {
checkOpen();
return true;
}
@Override
- public boolean execute(final String sql, final String columnNames[])
throws SQLException {
+ public boolean execute(final String sql, final String[] columnNames)
throws SQLException {
checkOpen();
return true;
}
@@ -172,13 +172,13 @@ public class TesterPreparedStatement extends
TesterStatement implements Prepared
}
@Override
- public long executeLargeUpdate(final String sql, final int
columnIndexes[]) throws SQLException {
+ public long executeLargeUpdate(final String sql, final int[]
columnIndexes) throws SQLException {
checkOpen();
return 0;
}
@Override
- public long executeLargeUpdate(final String sql, final String
columnNames[]) throws SQLException {
+ public long executeLargeUpdate(final String sql, final String[]
columnNames) throws SQLException {
checkOpen();
return 0;
}
@@ -224,13 +224,13 @@ public class TesterPreparedStatement extends
TesterStatement implements Prepared
}
@Override
- public int executeUpdate(final String sql, final int columnIndexes[])
throws SQLException {
+ public int executeUpdate(final String sql, final int[] columnIndexes)
throws SQLException {
checkOpen();
return 0;
}
@Override
- public int executeUpdate(final String sql, final String columnNames[])
throws SQLException {
+ public int executeUpdate(final String sql, final String[] columnNames)
throws SQLException {
checkOpen();
return 0;
}
@@ -344,7 +344,7 @@ public class TesterPreparedStatement extends
TesterStatement implements Prepared
}
@Override
- public void setBytes(final int parameterIndex, final byte x[]) throws
SQLException {
+ public void setBytes(final int parameterIndex, final byte[] x) throws
SQLException {
checkOpen();
}
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
b/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
index 3d90277..73b5545 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
@@ -879,12 +879,12 @@ public java.sql.Date getDate(final int columnIndex, final
Calendar cal) throws S
}
@Override
- public void updateBytes(final int columnIndex, final byte x[]) throws
SQLException {
+ public void updateBytes(final int columnIndex, final byte[] x) throws
SQLException {
checkOpen();
}
@Override
- public void updateBytes(final String columnName, final byte x[]) throws
SQLException {
+ public void updateBytes(final String columnName, final byte[] x) throws
SQLException {
checkOpen();
}
diff --git a/src/test/java/org/apache/commons/dbcp2/TesterStatement.java
b/src/test/java/org/apache/commons/dbcp2/TesterStatement.java
index 3032396..42878a0 100644
--- a/src/test/java/org/apache/commons/dbcp2/TesterStatement.java
+++ b/src/test/java/org/apache/commons/dbcp2/TesterStatement.java
@@ -128,13 +128,13 @@ public class TesterStatement extends AbandonedTrace
implements Statement {
}
@Override
- public boolean execute(final String sql, final int columnIndexes[])
+ public boolean execute(final String sql, final int[] columnIndexes)
throws SQLException {
throw new SQLException("Not implemented.");
}
@Override
- public boolean execute(final String sql, final String columnNames[])
+ public boolean execute(final String sql, final String[] columnNames)
throws SQLException {
throw new SQLException("Not implemented.");
}
@@ -208,12 +208,12 @@ public class TesterStatement extends AbandonedTrace
implements Statement {
}
@Override
- public int executeUpdate(final String sql, final int columnIndexes[])
throws SQLException {
+ public int executeUpdate(final String sql, final int[] columnIndexes)
throws SQLException {
throw new SQLException("Not implemented.");
}
@Override
- public int executeUpdate(final String sql, final String columnNames[])
throws SQLException {
+ public int executeUpdate(final String sql, final String[] columnNames)
throws SQLException {
throw new SQLException("Not implemented.");
}
