You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2025/12/16 17:19:50 UTC

(commons-dbcp) branch master updated (0c2d641c -> 60c72af7)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git


    from 0c2d641c Updates for the next release
     new 21b5cdd4 Fix indent
     new b3094a8f Remove blank line
     new 60c72af7 Remove unnecessary modifiers

The 3 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:
 .../apache/commons/dbcp2/DelegatingConnection.java |  6 ++---
 .../commons/dbcp2/DriverConnectionFactory.java     |  2 +-
 .../commons/dbcp2/LifetimeExceededException.java   |  4 ++--
 .../apache/commons/dbcp2/ObjectNameWrapper.java    |  2 +-
 .../java/org/apache/commons/dbcp2/PStmtKey.java    | 28 +++++++++++-----------
 .../apache/commons/dbcp2/PoolableConnection.java   |  4 ++--
 src/main/java/org/apache/commons/dbcp2/Utils.java  |  2 +-
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java    |  2 +-
 .../datasources/AbstractConnectionFactory.java     |  3 ++-
 .../dbcp2/datasources/CPDSConnectionFactory.java   |  2 +-
 .../datasources/KeyedCPDSConnectionFactory.java    |  2 +-
 .../dbcp2/datasources/PooledConnectionManager.java |  6 ++---
 .../apache/commons/dbcp2/managed/package-info.java |  1 -
 13 files changed, 32 insertions(+), 32 deletions(-)


(commons-dbcp) 01/03: Fix indent

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git

commit 21b5cdd4358a565d339a58ce6d5eb279d885536c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 16 17:17:36 2025 +0000

    Fix indent
---
 .../apache/commons/dbcp2/DelegatingConnection.java |  6 ++---
 .../commons/dbcp2/DriverConnectionFactory.java     |  2 +-
 .../java/org/apache/commons/dbcp2/PStmtKey.java    | 28 +++++++++++-----------
 .../apache/commons/dbcp2/PoolableConnection.java   |  4 ++--
 src/main/java/org/apache/commons/dbcp2/Utils.java  |  2 +-
 .../dbcp2/cpdsadapter/PooledConnectionImpl.java    |  2 +-
 .../dbcp2/datasources/PooledConnectionManager.java |  6 ++---
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
index 98af01cd..a56c6b47 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -291,7 +291,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
     @SuppressWarnings("resource") // Caller is responsible for closing the resource.
     @Override
     public Statement createStatement(final int resultSetType, final int resultSetConcurrency,
-        final int resultSetHoldability) throws SQLException {
+            final int resultSetHoldability) throws SQLException {
         checkOpen();
         try {
             return init(new DelegatingStatement(this,
@@ -719,7 +719,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
     @SuppressWarnings("resource") // Caller is responsible for closing the resource.
     @Override
     public CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency,
-        final int resultSetHoldability) throws SQLException {
+            final int resultSetHoldability) throws SQLException {
         checkOpen();
         try {
             return init(new DelegatingCallableStatement(this,
@@ -771,7 +771,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
     @SuppressWarnings("resource") // Caller is responsible for closing the resource.
     @Override
     public PreparedStatement prepareStatement(final String sql, final int resultSetType, final int resultSetConcurrency,
-        final int resultSetHoldability) throws SQLException {
+            final int resultSetHoldability) throws SQLException {
         checkOpen();
         try {
             return init(new DelegatingPreparedStatement(this,
diff --git a/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java
index db31faf1..9eb1c294 100644
--- a/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/DriverConnectionFactory.java
@@ -85,6 +85,6 @@ public class DriverConnectionFactory implements ConnectionFactory {
     @Override
     public String toString() {
         return this.getClass().getName() + " [" + driver + ";" + connectionString + ";"
-            + Utils.cloneWithoutCredentials(properties) + "]";
+                + Utils.cloneWithoutCredentials(properties) + "]";
     }
 }
diff --git a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
index 56d58128..20642a56 100644
--- a/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
@@ -224,7 +224,7 @@ public class PStmtKey {
      */
     @Deprecated
     public PStmtKey(final String sql, final String catalog, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability,
-        final StatementType statementType) {
+            final StatementType statementType) {
         this(sql, catalog, null, resultSetType, resultSetConcurrency, resultSetHoldability, null, null, null, statementType,
             k -> match(statementType, StatementHoldability, CallHoldability));
     }
@@ -244,7 +244,7 @@ public class PStmtKey {
     @Deprecated
     public PStmtKey(final String sql, final String catalog, final int resultSetType, final int resultSetConcurrency, final StatementType statementType) {
         this(sql, catalog, null, resultSetType, resultSetConcurrency, null, null, null, null, statementType,
-            k -> match(statementType, StatementConcurrency, CallConcurrency));
+                k -> match(statementType, StatementConcurrency, CallConcurrency));
     }
 
     /**
@@ -287,7 +287,7 @@ public class PStmtKey {
     @Deprecated
     public PStmtKey(final String sql, final String catalog, final StatementType statementType, final Integer autoGeneratedKeys) {
         this(sql, catalog, null, null, null, null, autoGeneratedKeys, null, null, statementType,
-            k -> match(statementType, StatementAutoGeneratedKeys, CallSQL));
+                k -> match(statementType, StatementAutoGeneratedKeys, CallSQL));
     }
 
     /**
@@ -346,7 +346,7 @@ public class PStmtKey {
      * @since 2.5.0
      */
     public PStmtKey(final String sql, final String catalog, final String schema, final int resultSetType, final int resultSetConcurrency,
-        final int resultSetHoldability) {
+            final int resultSetHoldability) {
         this(sql, catalog, schema, resultSetType, resultSetConcurrency, resultSetHoldability, StatementType.PREPARED_STATEMENT);
     }
 
@@ -366,9 +366,9 @@ public class PStmtKey {
      * @since 2.5.0
      */
     public PStmtKey(final String sql, final String catalog, final String schema, final int resultSetType, final int resultSetConcurrency,
-        final int resultSetHoldability, final StatementType statementType) {
+            final int resultSetHoldability, final StatementType statementType) {
         this(sql, catalog, schema, resultSetType, resultSetConcurrency, resultSetHoldability, null, null, null, statementType,
-            k -> match(statementType, StatementHoldability, CallHoldability));
+                k -> match(statementType, StatementHoldability, CallHoldability));
     }
 
     /**
@@ -385,9 +385,9 @@ public class PStmtKey {
      * @since 2.5.0
      */
     public PStmtKey(final String sql, final String catalog, final String schema, final int resultSetType, final int resultSetConcurrency,
-        final StatementType statementType) {
+            final StatementType statementType) {
         this(sql, catalog, schema, resultSetType, resultSetConcurrency, null, null, null, null, statementType,
-            k -> match(statementType, StatementConcurrency, CallConcurrency));
+                k -> match(statementType, StatementConcurrency, CallConcurrency));
     }
 
     /**
@@ -404,8 +404,8 @@ public class PStmtKey {
     }
 
     private PStmtKey(final String sql, final String catalog, final String schema, final Integer resultSetType, final Integer resultSetConcurrency,
-        final Integer resultSetHoldability, final Integer autoGeneratedKeys, final int[] columnIndexes, final String[] columnNames,
-        final StatementType statementType, final Function<PStmtKey, StatementBuilder> statementBuilder) {
+            final Integer resultSetHoldability, final Integer autoGeneratedKeys, final int[] columnIndexes, final String[] columnNames,
+            final StatementType statementType, final Function<PStmtKey, StatementBuilder> statementBuilder) {
         this.sql = Objects.requireNonNull(sql, "sql").trim();
         this.catalog = catalog;
         this.schema = schema;
@@ -421,8 +421,8 @@ public class PStmtKey {
 
     // Root constructor.
     private PStmtKey(final String sql, final String catalog, final String schema, final Integer resultSetType, final Integer resultSetConcurrency,
-        final Integer resultSetHoldability, final Integer autoGeneratedKeys, final int[] columnIndexes, final String[] columnNames,
-        final StatementType statementType, final StatementBuilder statementBuilder) {
+            final Integer resultSetHoldability, final Integer autoGeneratedKeys, final int[] columnIndexes, final String[] columnNames,
+            final StatementType statementType, final StatementBuilder statementBuilder) {
         this.sql = sql;
         this.catalog = catalog;
         this.schema = schema;
@@ -462,7 +462,7 @@ public class PStmtKey {
      */
     public PStmtKey(final String sql, final String catalog, final String schema, final StatementType statementType, final Integer autoGeneratedKeys) {
         this(sql, catalog, schema, null, null, null, autoGeneratedKeys, null, null, statementType,
-            k -> match(statementType, StatementAutoGeneratedKeys, CallSQL));
+                k -> match(statementType, StatementAutoGeneratedKeys, CallSQL));
     }
 
     /**
@@ -632,7 +632,7 @@ public class PStmtKey {
     @Override
     public int hashCode() {
         return Objects.hash(autoGeneratedKeys, catalog, Arrays.hashCode(columnIndexes), Arrays.hashCode(columnNames), resultSetConcurrency,
-            resultSetHoldability, resultSetType, schema, sql, statementType);
+                resultSetHoldability, resultSetType, schema, sql, statementType);
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
index e39ea1bc..0b4e1b6c 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
@@ -311,8 +311,8 @@ public class PoolableConnection extends DelegatingConnection<Connection> impleme
                 return false;
             }
             fatalException = disconnectionSqlCodes == null
-                ? sqlState.startsWith(Utils.DISCONNECTION_SQL_CODE_PREFIX) || Utils.isDisconnectionSqlCode(sqlState)
-                : disconnectionSqlCodes.contains(sqlState);
+                    ? sqlState.startsWith(Utils.DISCONNECTION_SQL_CODE_PREFIX) || Utils.isDisconnectionSqlCode(sqlState)
+                    : disconnectionSqlCodes.contains(sqlState);
         }
         return fatalException;
     }
diff --git a/src/main/java/org/apache/commons/dbcp2/Utils.java b/src/main/java/org/apache/commons/dbcp2/Utils.java
index 47a5de59..3892fbf9 100644
--- a/src/main/java/org/apache/commons/dbcp2/Utils.java
+++ b/src/main/java/org/apache/commons/dbcp2/Utils.java
@@ -39,7 +39,7 @@ import org.apache.commons.pool2.PooledObject;
 public final class Utils {
 
     private static final ResourceBundle messages = ResourceBundle
-        .getBundle(Utils.class.getPackage().getName() + ".LocalStrings");
+            .getBundle(Utils.class.getPackage().getName() + ".LocalStrings");
 
     /**
      * Whether the security manager is enabled.
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 3ba38694..42433aa9 100644
--- a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
+++ b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
@@ -260,7 +260,7 @@ final class PooledConnectionImpl
      * @since 2.4.0
      */
     protected PStmtKey createKey(final String sql, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability,
-        final StatementType statementType) {
+            final StatementType statementType) {
         return new PStmtKey(sql, getCatalogOrNull(), getSchemaOrNull(), resultSetType, resultSetConcurrency, resultSetHoldability, statementType);
     }
 
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java b/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java
index b7f288cf..5030ab38 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionManager.java
@@ -54,9 +54,9 @@ interface PooledConnectionManager {
      * @param password password used when authenticating to the database.
      * @since 2.14.0
      */
-     default void setPassword(final char[] password) {
-         setPassword(String.copyValueOf(password));
-     }
+    default void setPassword(final char[] password) {
+        setPassword(String.copyValueOf(password));
+    }
 
     /**
      * Sets the database password used when creating connections.


(commons-dbcp) 02/03: Remove blank line

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git

commit b3094a8f71ebb7868312df96bac26b39a59babae
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 16 17:17:53 2025 +0000

    Remove blank line
---
 src/main/java/org/apache/commons/dbcp2/managed/package-info.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/apache/commons/dbcp2/managed/package-info.java b/src/main/java/org/apache/commons/dbcp2/managed/package-info.java
index c808e1b9..65e04704 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/package-info.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/package-info.java
@@ -29,7 +29,6 @@
  * transaction is committed or rolled back the enlisted connections are
  * committed or rolled back.
  * </p>
-
  * <p>
  * This package supports full XADataSources and non-XA data sources using
  * local transaction semantics. non-XA data sources commit and rollback as


(commons-dbcp) 03/03: Remove unnecessary modifiers

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git

commit 60c72af72cee84d4c6e694d2f147aa2f325df647
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 16 17:18:15 2025 +0000

    Remove unnecessary modifiers
---
 src/main/java/org/apache/commons/dbcp2/LifetimeExceededException.java | 4 ++--
 src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java         | 2 +-
 .../apache/commons/dbcp2/datasources/AbstractConnectionFactory.java   | 3 ++-
 .../org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java   | 2 +-
 .../apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java  | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/commons/dbcp2/LifetimeExceededException.java b/src/main/java/org/apache/commons/dbcp2/LifetimeExceededException.java
index 2ac2fa7a..4e019326 100644
--- a/src/main/java/org/apache/commons/dbcp2/LifetimeExceededException.java
+++ b/src/main/java/org/apache/commons/dbcp2/LifetimeExceededException.java
@@ -30,7 +30,7 @@ final class LifetimeExceededException extends SQLException {
     /**
      * Constructs a new instance.
      */
-    public LifetimeExceededException() {
+    LifetimeExceededException() {
     }
 
     /**
@@ -38,7 +38,7 @@ final class LifetimeExceededException extends SQLException {
      *
      * @param reason a description of the exception
      */
-    public LifetimeExceededException(final String reason) {
+    LifetimeExceededException(final String reason) {
         super(reason);
     }
 }
diff --git a/src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java b/src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java
index 67a81658..6a7ff8f1 100644
--- a/src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java
+++ b/src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java
@@ -61,7 +61,7 @@ final class ObjectNameWrapper {
 
     private final ObjectName objectName;
 
-    public ObjectNameWrapper(final ObjectName objectName) {
+    ObjectNameWrapper(final ObjectName objectName) {
         this.objectName = objectName;
     }
 
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/AbstractConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/AbstractConnectionFactory.java
index 91ea7fcb..4aef3f46 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/AbstractConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/AbstractConnectionFactory.java
@@ -54,7 +54,8 @@ class AbstractConnectionFactory {
     protected final String validationQuery;
     protected final Duration validationQueryTimeoutDuration;
 
-    public AbstractConnectionFactory(final ConnectionPoolDataSource cpds, final String validationQuery, final Duration validationQueryTimeoutDuration, final boolean rollbackAfterValidation) {
+    AbstractConnectionFactory(final ConnectionPoolDataSource cpds, final String validationQuery,
+            final Duration validationQueryTimeoutDuration, final boolean rollbackAfterValidation) {
         this.cpds = cpds;
         this.validationQuery = validationQuery;
         this.validationQueryTimeoutDuration = validationQueryTimeoutDuration;
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
index f5a68ec4..1ae9d99b 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
@@ -63,7 +63,7 @@ final class CPDSConnectionFactory extends AbstractConnectionFactory
      *            The password to use to create connections
      * @since 2.10.0
      */
-    public CPDSConnectionFactory(final ConnectionPoolDataSource cpds, final String validationQuery,
+    CPDSConnectionFactory(final ConnectionPoolDataSource cpds, final String validationQuery,
             final Duration validationQueryTimeoutDuration, final boolean rollbackAfterValidation, final String userName,
             final char[] userPassword) {
         super(cpds, validationQuery, validationQueryTimeoutDuration, rollbackAfterValidation);
diff --git a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
index c0ae6501..40b76fe2 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
@@ -57,7 +57,7 @@ final class KeyedCPDSConnectionFactory extends AbstractConnectionFactory
      *            whether a rollback should be issued after {@link #validateObject validating} {@link Connection}s.
      * @since 2.10.0
      */
-    public KeyedCPDSConnectionFactory(final ConnectionPoolDataSource cpds, final String validationQuery, final Duration validationQueryTimeoutDuration,
+    KeyedCPDSConnectionFactory(final ConnectionPoolDataSource cpds, final String validationQuery, final Duration validationQueryTimeoutDuration,
             final boolean rollbackAfterValidation) {
         super(cpds, validationQuery, validationQueryTimeoutDuration, rollbackAfterValidation);
     }