You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by Gary Gregory <ga...@gmail.com> on 2021/09/02 15:16:46 UTC
Re: [commons-dbcp] branch master updated: Trivial format fix. Use
consistent formatting for all classes.
The space after the license is on purpose, it is NOT like a Javadoc
comment, so I do not see why the change is needed. I add that space when it
is missing!
Gary
On Thu, Sep 2, 2021, 10:43 <ma...@apache.org> wrote:
> 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
>
>
> The following commit(s) were added to refs/heads/master by this push:
> new ac829cd Trivial format fix. Use consistent formatting for all
> classes.
> ac829cd is described below
>
> commit ac829cd7192977c8c1f702b149fcd2a74e00e812
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Thu Sep 2 15:42:36 2021 +0100
>
> Trivial format fix. Use consistent formatting for all classes.
> ---
> src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java | 1 -
> .../java/org/apache/commons/dbcp2/DelegatingCallableStatement.java | 1 -
> src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java | 1 -
> .../java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java | 1 -
> src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java | 1 -
> src/main/java/org/apache/commons/dbcp2/DriverFactory.java | 1 -
> .../org/apache/commons/dbcp2/DriverManagerConnectionFactory.java | 1 -
> src/main/java/org/apache/commons/dbcp2/ListException.java | 1 -
> src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java | 1 -
> .../java/org/apache/commons/dbcp2/PoolableCallableStatement.java | 1 -
> .../java/org/apache/commons/dbcp2/PoolableConnectionFactory.java | 1 -
> .../java/org/apache/commons/dbcp2/PoolablePreparedStatement.java | 1 -
> src/main/java/org/apache/commons/dbcp2/PoolingConnection.java | 1 -
> src/main/java/org/apache/commons/dbcp2/SQLExceptionList.java | 1 -
> src/main/java/org/apache/commons/dbcp2/Utils.java | 1 -
> .../java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java | 1 -
> .../java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 1 -
> .../org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java | 1 -
> .../org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java | 5
> ++---
> .../apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java | 3
> +--
> .../commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java | 1 -
> src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java | 1 -
> .../apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java | 1 -
> .../org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java | 1 -
> .../commons/dbcp2/datasources/SharedPoolDataSourceFactory.java | 1 -
> src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java | 1 -
> 26 files changed, 3 insertions(+), 29 deletions(-)
>
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
> b/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
> index dcc8a34..b008413 100644
> --- a/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
> +++ b/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.sql.Driver;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
> b/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
> index 2e36c2b..dd430b8 100644
> ---
> a/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
> +++
> b/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.io.InputStream;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
> b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
> index 0d5df62..5b41b0a 100644
> --- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
> +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.sql.Array;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
> b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
> index 048687c..8cb5481 100644
> ---
> a/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
> +++
> b/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.io.InputStream;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
> b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
> index 5b65bd7..83e5162 100644
> --- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
> +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.io.InputStream;
> diff --git a/src/main/java/org/apache/commons/dbcp2/DriverFactory.java
> b/src/main/java/org/apache/commons/dbcp2/DriverFactory.java
> index 3c2df3f..28d5705 100644
> --- a/src/main/java/org/apache/commons/dbcp2/DriverFactory.java
> +++ b/src/main/java/org/apache/commons/dbcp2/DriverFactory.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.sql.Driver;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java
> b/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java
> index c409e73..1b2226a 100644
> ---
> a/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java
> +++
> b/src/main/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.sql.Connection;
> diff --git a/src/main/java/org/apache/commons/dbcp2/ListException.java
> b/src/main/java/org/apache/commons/dbcp2/ListException.java
> index 1d2ae60..ba5047b 100644
> --- a/src/main/java/org/apache/commons/dbcp2/ListException.java
> +++ b/src/main/java/org/apache/commons/dbcp2/ListException.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.util.List;
> diff --git a/src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java
> b/src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java
> index 62b09f2..e0ffd1f 100644
> --- a/src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java
> +++ b/src/main/java/org/apache/commons/dbcp2/ObjectNameWrapper.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.lang.management.ManagementFactory;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
> b/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
> index 148899e..3f42aa1 100644
> --- a/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
> +++ b/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.sql.CallableStatement;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
> b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
> index 5d85db6..46355e8 100644
> --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
> +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.sql.Connection;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
> b/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
> index b419949..2d716be 100644
> --- a/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
> +++ b/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.sql.PreparedStatement;
> diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
> b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
> index 839be58..b46892c 100644
> --- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
> +++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.sql.CallableStatement;
> diff --git a/src/main/java/org/apache/commons/dbcp2/SQLExceptionList.java
> b/src/main/java/org/apache/commons/dbcp2/SQLExceptionList.java
> index fc2b7a5..b9277bd 100644
> --- a/src/main/java/org/apache/commons/dbcp2/SQLExceptionList.java
> +++ b/src/main/java/org/apache/commons/dbcp2/SQLExceptionList.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.sql.SQLException;
> diff --git a/src/main/java/org/apache/commons/dbcp2/Utils.java
> b/src/main/java/org/apache/commons/dbcp2/Utils.java
> index 5673dab..34f1715 100644
> --- a/src/main/java/org/apache/commons/dbcp2/Utils.java
> +++ b/src/main/java/org/apache/commons/dbcp2/Utils.java
> @@ -15,7 +15,6 @@
> * limitations under the License.
> *
> */
> -
> package org.apache.commons.dbcp2;
>
> import java.sql.Connection;
> 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 d04aa01..6f0bcc2 100644
> ---
> a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
> +++
> b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2.cpdsadapter;
>
> import java.sql.CallableStatement;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
> b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
> index 6accb74..a08041a 100644
> ---
> a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
> +++
> b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2.cpdsadapter;
>
> import java.io.PrintWriter;
> 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 81269e4..e7796d4 100644
> ---
> a/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
> +++
> b/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2.cpdsadapter;
>
> import java.sql.CallableStatement;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
> b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
> index 90edbe4..7e22622 100644
> ---
> a/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
> +++
> b/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2.datasources;
>
> import java.io.OutputStreamWriter;
> @@ -1251,9 +1250,9 @@ public abstract class InstanceKeyDataSource
> implements DataSource, Referenceable
> @Override
> public synchronized String toString() {
> final StringBuilder builder = new StringBuilder(super.toString());
> - builder.append("[");
> + builder.append('[');
> toStringFields(builder);
> - builder.append("]");
> + builder.append(']');
> return builder.toString();
> }
>
> 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 1ff2fde..511b36e 100644
> ---
> a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
> +++
> b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2.datasources;
>
> import java.sql.Connection;
> @@ -108,7 +107,7 @@ class KeyedCPDSConnectionFactory implements
> KeyedPooledObjectFactory<UserPassKey
> */
> @Deprecated
> public KeyedCPDSConnectionFactory(final ConnectionPoolDataSource
> cpds, final String validationQuery,
> - final int validationQueryTimeoutSeconds, final boolean
> rollbackAfterValidation) {
> + final int validationQueryTimeoutSeconds, final boolean
> rollbackAfterValidation) {
> this(cpds, validationQuery,
> Duration.ofSeconds(validationQueryTimeoutSeconds), rollbackAfterValidation);
> }
>
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java
> b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java
> index 6e5d480..6a6274b 100644
> ---
> a/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java
> +++
> b/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2.datasources;
>
> import java.io.IOException;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
> b/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
> index 89f8c69..deab7c0 100644
> --- a/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
> +++ b/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2.datasources;
>
> import java.io.Serializable;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java
> b/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java
> index af0b38e..04e066d 100644
> ---
> a/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java
> +++
> b/src/main/java/org/apache/commons/dbcp2/datasources/PooledConnectionAndInfo.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2.datasources;
>
> import javax.sql.PooledConnection;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
> b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
> index 2fb2e9a..4293535 100644
> ---
> a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
> +++
> b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2.datasources;
>
> import java.io.IOException;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java
> b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java
> index af9b3ab..b11e253 100644
> ---
> a/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java
> +++
> b/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2.datasources;
>
> import javax.naming.RefAddr;
> diff --git
> a/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
> b/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
> index 057cdec..a8d7540 100644
> --- a/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
> +++ b/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
> @@ -14,7 +14,6 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> package org.apache.commons.dbcp2.datasources;
>
> import java.io.Serializable;
>
Re: [commons-dbcp] branch master updated: Trivial format fix. Use
consistent formatting for all classes.
Posted by Mark Thomas <ma...@apache.org>.
On 02/09/2021 16:16, Gary Gregory wrote:
> The space after the license is on purpose, it is NOT like a Javadoc
> comment, so I do not see why the change is needed. I add that space when it
> is missing!
The code formatting was inconsistent. I went with what looked to be the
majority format for DBCP although it wasn't far off a 50/50 split (maybe
55/45).
I made the same change to Pool where only 1 file had the (arguably
unnecessary) space.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org