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 2022/07/03 13:00:23 UTC
[commons-dbcp] branch master updated (c56a6a49 -> 35eb56d7)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
from c56a6a49 Bump maven-surefire-plugin 2.22.2 to 3.0.0-M7
new bb5f594d Javadoc
new 35eb56d7 Refactor duplicate code
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/dbcp2/DelegatingPreparedStatement.java | 1420 ++++++++++----------
.../commons/dbcp2/PoolableCallableStatement.java | 31 +-
.../commons/dbcp2/PoolablePreparedStatement.java | 31 +-
.../dbcp2/cpdsadapter/PooledConnectionImpl.java | 2 +-
4 files changed, 729 insertions(+), 755 deletions(-)
[commons-dbcp] 01/02: Javadoc
Posted by gg...@apache.org.
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 bb5f594d14a7bf6adde4a72b05f7baf78ef1c490
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jul 3 08:57:49 2022 -0400
Javadoc
---
.../java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 d50329f1..331de90b 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
@@ -42,7 +42,7 @@ import org.apache.commons.pool2.PooledObject;
import org.apache.commons.pool2.impl.DefaultPooledObject;
/**
- * Implementation of PooledConnection that is returned by PooledConnectionDataSource.
+ * Implementation of {@link PooledConnection} that is returned by {@link DriverAdapterCPDS}.
*
* @since 2.0
*/
[commons-dbcp] 02/02: Refactor duplicate code
Posted by gg...@apache.org.
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 35eb56d70d79425cd367aaeb141330e7d1f68e56
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jul 3 09:00:17 2022 -0400
Refactor duplicate code
---
.../commons/dbcp2/DelegatingPreparedStatement.java | 1420 ++++++++++----------
.../commons/dbcp2/PoolableCallableStatement.java | 31 +-
.../commons/dbcp2/PoolablePreparedStatement.java | 31 +-
3 files changed, 728 insertions(+), 754 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
index 8cb54819..4f343b39 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
@@ -1,694 +1,726 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.dbcp2;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Date;
-import java.sql.NClob;
-import java.sql.PreparedStatement;
-import java.sql.Ref;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.RowId;
-import java.sql.SQLException;
-import java.sql.SQLType;
-import java.sql.SQLXML;
-import java.sql.Statement;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Calendar;
-
-/**
- * A base delegating implementation of {@link PreparedStatement}.
- * <p>
- * All of the methods from the {@link PreparedStatement} interface simply check to see that the
- * {@link PreparedStatement} is active, and call the corresponding method on the "delegate" provided in my constructor.
- * <p>
- * Extends AbandonedTrace to implement Statement tracking and logging of code which created the Statement. Tracking the
- * Statement ensures that the Connection which created it can close any open Statement's on Connection close.
- *
- * @since 2.0
- */
-public class DelegatingPreparedStatement extends DelegatingStatement implements PreparedStatement {
-
- /**
- * Create a wrapper for the Statement which traces this Statement to the Connection which created it and the code
- * which created it.
- *
- * @param statement
- * the {@link PreparedStatement} to delegate all calls to.
- * @param connection
- * the {@link DelegatingConnection} that created this statement.
- */
- public DelegatingPreparedStatement(final DelegatingConnection<?> connection, final PreparedStatement statement) {
- super(connection, statement);
- }
-
- @Override
- public void addBatch() throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().addBatch();
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void clearParameters() throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().clearParameters();
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public boolean execute() throws SQLException {
- checkOpen();
- if (getConnectionInternal() != null) {
- getConnectionInternal().setLastUsed();
- }
- try {
- return getDelegatePreparedStatement().execute();
- } catch (final SQLException e) {
- handleException(e);
- return false;
- }
- }
-
- /**
- * @since 2.5.0
- */
- @Override
- public long executeLargeUpdate() throws SQLException {
- checkOpen();
- try {
- return getDelegatePreparedStatement().executeLargeUpdate();
- } catch (final SQLException e) {
- handleException(e);
- return 0;
- }
- }
-
- @Override
- public ResultSet executeQuery() throws SQLException {
- checkOpen();
- if (getConnectionInternal() != null) {
- getConnectionInternal().setLastUsed();
- }
- try {
- return DelegatingResultSet.wrapResultSet(this, getDelegatePreparedStatement().executeQuery());
- } catch (final SQLException e) {
- handleException(e);
- throw new AssertionError();
- }
- }
-
- @Override
- public int executeUpdate() throws SQLException {
- checkOpen();
- if (getConnectionInternal() != null) {
- getConnectionInternal().setLastUsed();
- }
- try {
- return getDelegatePreparedStatement().executeUpdate();
- } catch (final SQLException e) {
- handleException(e);
- return 0;
- }
- }
-
- private PreparedStatement getDelegatePreparedStatement() {
- return (PreparedStatement) getDelegate();
- }
-
- @Override
- public ResultSetMetaData getMetaData() throws SQLException {
- checkOpen();
- try {
- return getDelegatePreparedStatement().getMetaData();
- } catch (final SQLException e) {
- handleException(e);
- throw new AssertionError();
- }
- }
-
- @Override
- public java.sql.ParameterMetaData getParameterMetaData() throws SQLException {
- checkOpen();
- try {
- return getDelegatePreparedStatement().getParameterMetaData();
- } catch (final SQLException e) {
- handleException(e);
- throw new AssertionError();
- }
- }
-
- @Override
- public void setArray(final int i, final Array x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setArray(i, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setAsciiStream(final int parameterIndex, final InputStream inputStream) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setAsciiStream(parameterIndex, inputStream);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setAsciiStream(final int parameterIndex, final InputStream x, final int length) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setAsciiStream(parameterIndex, x, length);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setAsciiStream(final int parameterIndex, final InputStream inputStream, final long length)
- throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setAsciiStream(parameterIndex, inputStream, length);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setBigDecimal(final int parameterIndex, final BigDecimal x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setBigDecimal(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setBinaryStream(final int parameterIndex, final InputStream inputStream) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setBinaryStream(parameterIndex, inputStream);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setBinaryStream(final int parameterIndex, final InputStream x, final int length) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setBinaryStream(parameterIndex, x, length);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setBinaryStream(final int parameterIndex, final InputStream inputStream, final long length)
- throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setBinaryStream(parameterIndex, inputStream, length);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setBlob(final int i, final Blob x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setBlob(i, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setBlob(final int parameterIndex, final InputStream inputStream) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setBlob(parameterIndex, inputStream);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setBlob(final int parameterIndex, final InputStream inputStream, final long length)
- throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setBlob(parameterIndex, inputStream, length);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setBoolean(final int parameterIndex, final boolean x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setBoolean(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setByte(final int parameterIndex, final byte x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setByte(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setBytes(final int parameterIndex, final byte[] x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setBytes(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setCharacterStream(final int parameterIndex, final Reader reader) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setCharacterStream(parameterIndex, reader);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setCharacterStream(final int parameterIndex, final Reader reader, final int length)
- throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setCharacterStream(parameterIndex, reader, length);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setCharacterStream(final int parameterIndex, final Reader reader, final long length)
- throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setCharacterStream(parameterIndex, reader, length);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setClob(final int i, final Clob x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setClob(i, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setClob(final int parameterIndex, final Reader reader) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setClob(parameterIndex, reader);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setClob(final int parameterIndex, final Reader reader, final long length) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setClob(parameterIndex, reader, length);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setDate(final int parameterIndex, final Date x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setDate(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setDate(final int parameterIndex, final Date x, final Calendar cal) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setDate(parameterIndex, x, cal);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setDouble(final int parameterIndex, final double x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setDouble(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setFloat(final int parameterIndex, final float x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setFloat(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setInt(final int parameterIndex, final int x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setInt(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setLong(final int parameterIndex, final long x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setLong(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setNCharacterStream(final int parameterIndex, final Reader reader) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setNCharacterStream(parameterIndex, reader);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setNCharacterStream(final int parameterIndex, final Reader value, final long length)
- throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setNCharacterStream(parameterIndex, value, length);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setNClob(final int parameterIndex, final NClob value) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setNClob(parameterIndex, value);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setNClob(final int parameterIndex, final Reader reader) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setNClob(parameterIndex, reader);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setNClob(final int parameterIndex, final Reader reader, final long length) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setNClob(parameterIndex, reader, length);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setNString(final int parameterIndex, final String value) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setNString(parameterIndex, value);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setNull(final int parameterIndex, final int sqlType) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setNull(parameterIndex, sqlType);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setNull(final int paramIndex, final int sqlType, final String typeName) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setNull(paramIndex, sqlType, typeName);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setObject(final int parameterIndex, final Object x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setObject(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setObject(final int parameterIndex, final Object x, final int targetSqlType) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setObject(parameterIndex, x, targetSqlType);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setObject(final int parameterIndex, final Object x, final int targetSqlType, final int scale)
- throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setObject(parameterIndex, x, targetSqlType, scale);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- /**
- * @since 2.5.0
- */
- @Override
- public void setObject(final int parameterIndex, final Object x, final SQLType targetSqlType) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setObject(parameterIndex, x, targetSqlType);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- /**
- * @since 2.5.0
- */
- @Override
- public void setObject(final int parameterIndex, final Object x, final SQLType targetSqlType, final int scaleOrLength) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setObject(parameterIndex, x, targetSqlType, scaleOrLength);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setRef(final int i, final Ref x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setRef(i, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setRowId(final int parameterIndex, final RowId value) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setRowId(parameterIndex, value);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setShort(final int parameterIndex, final short x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setShort(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setSQLXML(final int parameterIndex, final SQLXML value) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setSQLXML(parameterIndex, value);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setString(final int parameterIndex, final String x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setString(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setTime(final int parameterIndex, final Time x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setTime(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setTime(final int parameterIndex, final Time x, final Calendar cal) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setTime(parameterIndex, x, cal);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setTimestamp(final int parameterIndex, final Timestamp x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setTimestamp(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setTimestamp(final int parameterIndex, final Timestamp x, final Calendar cal) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setTimestamp(parameterIndex, x, cal);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- /** @deprecated Use setAsciiStream(), setCharacterStream() or setNCharacterStream() */
- @Deprecated
- @Override
- public void setUnicodeStream(final int parameterIndex, final InputStream x, final int length) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setUnicodeStream(parameterIndex, x, length);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- @Override
- public void setURL(final int parameterIndex, final java.net.URL x) throws SQLException {
- checkOpen();
- try {
- getDelegatePreparedStatement().setURL(parameterIndex, x);
- } catch (final SQLException e) {
- handleException(e);
- }
- }
-
- /**
- * Returns a String representation of this object.
- *
- * @return String
- */
- @SuppressWarnings("resource")
- @Override
- public synchronized String toString() {
- final Statement statement = getDelegate();
- return statement == null ? "NULL" : statement.toString();
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.dbcp2;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.Date;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.Ref;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowId;
+import java.sql.SQLException;
+import java.sql.SQLType;
+import java.sql.SQLXML;
+import java.sql.Statement;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+/**
+ * A base delegating implementation of {@link PreparedStatement}.
+ * <p>
+ * All of the methods from the {@link PreparedStatement} interface simply check to see that the
+ * {@link PreparedStatement} is active, and call the corresponding method on the "delegate" provided in my constructor.
+ * <p>
+ * Extends AbandonedTrace to implement Statement tracking and logging of code which created the Statement. Tracking the
+ * Statement ensures that the Connection which created it can close any open Statement's on Connection close.
+ *
+ * @since 2.0
+ */
+public class DelegatingPreparedStatement extends DelegatingStatement implements PreparedStatement {
+
+ /**
+ * Create a wrapper for the Statement which traces this Statement to the Connection which created it and the code
+ * which created it.
+ *
+ * @param statement
+ * the {@link PreparedStatement} to delegate all calls to.
+ * @param connection
+ * the {@link DelegatingConnection} that created this statement.
+ */
+ public DelegatingPreparedStatement(final DelegatingConnection<?> connection, final PreparedStatement statement) {
+ super(connection, statement);
+ }
+
+ @Override
+ public void addBatch() throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().addBatch();
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void clearParameters() throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().clearParameters();
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public boolean execute() throws SQLException {
+ checkOpen();
+ if (getConnectionInternal() != null) {
+ getConnectionInternal().setLastUsed();
+ }
+ try {
+ return getDelegatePreparedStatement().execute();
+ } catch (final SQLException e) {
+ handleException(e);
+ return false;
+ }
+ }
+
+ /**
+ * @since 2.5.0
+ */
+ @Override
+ public long executeLargeUpdate() throws SQLException {
+ checkOpen();
+ try {
+ return getDelegatePreparedStatement().executeLargeUpdate();
+ } catch (final SQLException e) {
+ handleException(e);
+ return 0;
+ }
+ }
+
+ @Override
+ public ResultSet executeQuery() throws SQLException {
+ checkOpen();
+ if (getConnectionInternal() != null) {
+ getConnectionInternal().setLastUsed();
+ }
+ try {
+ return DelegatingResultSet.wrapResultSet(this, getDelegatePreparedStatement().executeQuery());
+ } catch (final SQLException e) {
+ handleException(e);
+ throw new AssertionError();
+ }
+ }
+
+ @Override
+ public int executeUpdate() throws SQLException {
+ checkOpen();
+ if (getConnectionInternal() != null) {
+ getConnectionInternal().setLastUsed();
+ }
+ try {
+ return getDelegatePreparedStatement().executeUpdate();
+ } catch (final SQLException e) {
+ handleException(e);
+ return 0;
+ }
+ }
+
+ private PreparedStatement getDelegatePreparedStatement() {
+ return (PreparedStatement) getDelegate();
+ }
+
+ @Override
+ public ResultSetMetaData getMetaData() throws SQLException {
+ checkOpen();
+ try {
+ return getDelegatePreparedStatement().getMetaData();
+ } catch (final SQLException e) {
+ handleException(e);
+ throw new AssertionError();
+ }
+ }
+
+ @Override
+ public java.sql.ParameterMetaData getParameterMetaData() throws SQLException {
+ checkOpen();
+ try {
+ return getDelegatePreparedStatement().getParameterMetaData();
+ } catch (final SQLException e) {
+ handleException(e);
+ throw new AssertionError();
+ }
+ }
+
+ @Override
+ public void setArray(final int i, final Array x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setArray(i, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setAsciiStream(final int parameterIndex, final InputStream inputStream) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setAsciiStream(parameterIndex, inputStream);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setAsciiStream(final int parameterIndex, final InputStream x, final int length) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setAsciiStream(parameterIndex, x, length);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setAsciiStream(final int parameterIndex, final InputStream inputStream, final long length)
+ throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setAsciiStream(parameterIndex, inputStream, length);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setBigDecimal(final int parameterIndex, final BigDecimal x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setBigDecimal(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setBinaryStream(final int parameterIndex, final InputStream inputStream) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setBinaryStream(parameterIndex, inputStream);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setBinaryStream(final int parameterIndex, final InputStream x, final int length) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setBinaryStream(parameterIndex, x, length);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setBinaryStream(final int parameterIndex, final InputStream inputStream, final long length)
+ throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setBinaryStream(parameterIndex, inputStream, length);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setBlob(final int i, final Blob x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setBlob(i, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setBlob(final int parameterIndex, final InputStream inputStream) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setBlob(parameterIndex, inputStream);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setBlob(final int parameterIndex, final InputStream inputStream, final long length)
+ throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setBlob(parameterIndex, inputStream, length);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setBoolean(final int parameterIndex, final boolean x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setBoolean(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setByte(final int parameterIndex, final byte x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setByte(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setBytes(final int parameterIndex, final byte[] x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setBytes(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setCharacterStream(final int parameterIndex, final Reader reader) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setCharacterStream(parameterIndex, reader);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setCharacterStream(final int parameterIndex, final Reader reader, final int length)
+ throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setCharacterStream(parameterIndex, reader, length);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setCharacterStream(final int parameterIndex, final Reader reader, final long length)
+ throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setCharacterStream(parameterIndex, reader, length);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setClob(final int i, final Clob x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setClob(i, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setClob(final int parameterIndex, final Reader reader) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setClob(parameterIndex, reader);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setClob(final int parameterIndex, final Reader reader, final long length) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setClob(parameterIndex, reader, length);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setDate(final int parameterIndex, final Date x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setDate(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setDate(final int parameterIndex, final Date x, final Calendar cal) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setDate(parameterIndex, x, cal);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setDouble(final int parameterIndex, final double x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setDouble(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setFloat(final int parameterIndex, final float x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setFloat(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setInt(final int parameterIndex, final int x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setInt(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setLong(final int parameterIndex, final long x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setLong(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setNCharacterStream(final int parameterIndex, final Reader reader) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setNCharacterStream(parameterIndex, reader);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setNCharacterStream(final int parameterIndex, final Reader value, final long length)
+ throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setNCharacterStream(parameterIndex, value, length);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setNClob(final int parameterIndex, final NClob value) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setNClob(parameterIndex, value);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setNClob(final int parameterIndex, final Reader reader) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setNClob(parameterIndex, reader);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setNClob(final int parameterIndex, final Reader reader, final long length) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setNClob(parameterIndex, reader, length);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setNString(final int parameterIndex, final String value) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setNString(parameterIndex, value);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setNull(final int parameterIndex, final int sqlType) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setNull(parameterIndex, sqlType);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setNull(final int paramIndex, final int sqlType, final String typeName) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setNull(paramIndex, sqlType, typeName);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setObject(final int parameterIndex, final Object x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setObject(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setObject(final int parameterIndex, final Object x, final int targetSqlType) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setObject(parameterIndex, x, targetSqlType);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setObject(final int parameterIndex, final Object x, final int targetSqlType, final int scale)
+ throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setObject(parameterIndex, x, targetSqlType, scale);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ /**
+ * @since 2.5.0
+ */
+ @Override
+ public void setObject(final int parameterIndex, final Object x, final SQLType targetSqlType) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setObject(parameterIndex, x, targetSqlType);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ /**
+ * @since 2.5.0
+ */
+ @Override
+ public void setObject(final int parameterIndex, final Object x, final SQLType targetSqlType, final int scaleOrLength) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setObject(parameterIndex, x, targetSqlType, scaleOrLength);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setRef(final int i, final Ref x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setRef(i, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setRowId(final int parameterIndex, final RowId value) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setRowId(parameterIndex, value);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setShort(final int parameterIndex, final short x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setShort(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setSQLXML(final int parameterIndex, final SQLXML value) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setSQLXML(parameterIndex, value);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setString(final int parameterIndex, final String x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setString(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setTime(final int parameterIndex, final Time x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setTime(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setTime(final int parameterIndex, final Time x, final Calendar cal) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setTime(parameterIndex, x, cal);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setTimestamp(final int parameterIndex, final Timestamp x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setTimestamp(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setTimestamp(final int parameterIndex, final Timestamp x, final Calendar cal) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setTimestamp(parameterIndex, x, cal);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ /** @deprecated Use setAsciiStream(), setCharacterStream() or setNCharacterStream() */
+ @Deprecated
+ @Override
+ public void setUnicodeStream(final int parameterIndex, final InputStream x, final int length) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setUnicodeStream(parameterIndex, x, length);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ @Override
+ public void setURL(final int parameterIndex, final java.net.URL x) throws SQLException {
+ checkOpen();
+ try {
+ getDelegatePreparedStatement().setURL(parameterIndex, x);
+ } catch (final SQLException e) {
+ handleException(e);
+ }
+ }
+
+ /**
+ * Returns a String representation of this object.
+ *
+ * @return String
+ */
+ @SuppressWarnings("resource")
+ @Override
+ public synchronized String toString() {
+ final Statement statement = getDelegate();
+ return statement == null ? "NULL" : statement.toString();
+ }
+
+ protected void prepareToReturn() throws SQLException {
+ setClosedInternal(true);
+ removeThisTrace(getConnectionInternal());
+
+ // The JDBC spec requires that a statement close any open
+ // ResultSet's when it is closed.
+ // FIXME The PreparedStatement we're wrapping should handle this for us.
+ // See DBCP-10 for what could happen when ResultSets are closed twice.
+ final List<AbandonedTrace> resultSetList = getTrace();
+ if (resultSetList != null) {
+ final List<Exception> thrownList = new ArrayList<>();
+ final ResultSet[] resultSets = resultSetList.toArray(Utils.EMPTY_RESULT_SET_ARRAY);
+ for (final ResultSet resultSet : resultSets) {
+ if (resultSet != null) {
+ try {
+ resultSet.close();
+ } catch (final Exception e) {
+ thrownList.add(e);
+ }
+ }
+ }
+ clearTrace();
+ if (!thrownList.isEmpty()) {
+ throw new SQLExceptionList(thrownList);
+ }
+ }
+
+ super.passivate();
+ }
+}
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java b/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
index 3f42aa1d..788bf90f 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
@@ -18,10 +18,7 @@ package org.apache.commons.dbcp2;
import java.sql.CallableStatement;
import java.sql.Connection;
-import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.commons.pool2.KeyedObjectPool;
@@ -110,33 +107,7 @@ public class PoolableCallableStatement extends DelegatingCallableStatement {
*/
@Override
public void passivate() throws SQLException {
- setClosedInternal(true);
- removeThisTrace(getConnectionInternal());
-
- // The JDBC spec requires that a statement close any open
- // ResultSet's when it is closed.
- // FIXME The PreparedStatement we're wrapping should handle this for us.
- // See DBCP-10 for what could happen when ResultSets are closed twice.
- final List<AbandonedTrace> resultSetList = getTrace();
- if (resultSetList != null) {
- final List<Exception> thrownList = new ArrayList<>();
- final ResultSet[] resultSets = resultSetList.toArray(Utils.EMPTY_RESULT_SET_ARRAY);
- for (final ResultSet resultSet : resultSets) {
- if (resultSet != null) {
- try {
- resultSet.close();
- } catch (final Exception e) {
- thrownList.add(e);
- }
- }
- }
- clearTrace();
- if (!thrownList.isEmpty()) {
- throw new SQLExceptionList(thrownList);
- }
- }
-
- super.passivate();
+ prepareToReturn();
}
}
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java b/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
index 2d716be1..2c730059 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
@@ -17,10 +17,7 @@
package org.apache.commons.dbcp2;
import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.commons.pool2.KeyedObjectPool;
@@ -125,32 +122,6 @@ public class PoolablePreparedStatement<K> extends DelegatingPreparedStatement {
if (batchAdded) {
clearBatch();
}
- setClosedInternal(true);
- removeThisTrace(getConnectionInternal());
-
- // The JDBC spec requires that a statement closes any open
- // ResultSet's when it is closed.
- // FIXME The PreparedStatement we're wrapping should handle this for us.
- // See bug 17301 for what could happen when ResultSets are closed twice.
- final List<AbandonedTrace> resultSetList = getTrace();
- if (resultSetList != null) {
- final List<Exception> thrownList = new ArrayList<>();
- final ResultSet[] resultSets = resultSetList.toArray(Utils.EMPTY_RESULT_SET_ARRAY);
- for (final ResultSet resultSet : resultSets) {
- if (resultSet != null) {
- try {
- resultSet.close();
- } catch (final Exception e) {
- thrownList.add(e);
- }
- }
- }
- clearTrace();
- if (!thrownList.isEmpty()) {
- throw new SQLExceptionList(thrownList);
- }
- }
-
- super.passivate();
+ prepareToReturn();
}
}