(commons-dbcp) branch master updated: Use final

[ggregory]

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


The following commit(s) were added to refs/heads/master by this push:
     new a0ecc117 Use final
a0ecc117 is described below

commit a0ecc117a0d89703af6742de86bc66544a2458bc
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Feb 18 10:51:42 2024 -0500

    Use final
    
    - Inline single use local variable
    - Remove unused import
---
 src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java   | 2 +-
 .../java/org/apache/commons/dbcp2/PoolableConnectionFactory.java     | 5 ++---
 .../org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java     | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java 
b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
index 11dfbc17..d7d47f68 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
@@ -331,7 +331,7 @@ public class BasicDataSourceFactory implements 
ObjectFactory {
         if (propText != null) {
             try {
                 p.load(new ByteArrayInputStream(propText.replace(';', 
'\n').getBytes(StandardCharsets.ISO_8859_1)));
-            } catch (IOException e) {
+            } catch (final IOException e) {
                 throw new SQLException(propText, e);
             }
         }
diff --git 
a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java 
b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
index ecdedf66..923032f0 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
@@ -458,7 +458,7 @@ public class PoolableConnectionFactory implements 
PooledObjectFactory<PoolableCo
             final String name = dataSourceJmxObjectName.toString() + 
Constants.JMX_CONNECTION_BASE_EXT + connIndex;
             try {
                 connJmxName = new ObjectName(name);
-            } catch (MalformedObjectNameException e) {
+            } catch (final MalformedObjectNameException e) {
                 Utils.closeQuietly((AutoCloseable) conn);
                 throw new SQLException(name, e);
             }
@@ -467,8 +467,7 @@ public class PoolableConnectionFactory implements 
PooledObjectFactory<PoolableCo
         final PoolableConnection pc = new PoolableConnection(conn, pool, 
connJmxName, disconnectionSqlCodes, fastFailValidation);
         pc.setCacheState(cacheState);
 
-        final DefaultPooledObject<PoolableConnection> pooledObject = new 
DefaultPooledObject<>(pc);
-        return pooledObject;
+        return new DefaultPooledObject<>(pc);
     }
 
     @Override
diff --git 
a/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java 
b/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
index 8e7b651a..395d4a13 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
@@ -27,8 +27,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.logging.LogFactory;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;