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 2020/09/21 15:12:41 UTC

[commons-dbcp] 02/06: No need to create arrays explicitly.

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 02526fbd1a88899228d21705e5a50dafc270573e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Sep 21 11:03:23 2020 -0400

    No need to create arrays explicitly.
---
 src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java     | 6 +++---
 src/test/java/org/apache/commons/dbcp2/TestListException.java       | 2 +-
 .../org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java    | 2 +-
 .../org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
index 4be757d..9147992 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
@@ -84,7 +84,7 @@ public class TestBasicDataSource extends TestConnectionPool {
         ds.setUsername("userName");
         ds.setPassword("password");
         ds.setValidationQuery("SELECT DUMMY FROM DUAL");
-        ds.setConnectionInitSqls(Arrays.asList(new String[] { "SELECT 1", "SELECT 2"}));
+        ds.setConnectionInitSqls(Arrays.asList("SELECT 1", "SELECT 2"));
         ds.setDriverClassLoader(new TesterClassLoader());
         ds.setJmxName("org.apache.commons.dbcp2:name=test");
     }
@@ -327,7 +327,7 @@ public class TestBasicDataSource extends TestConnectionPool {
 
     @Test
     public void testEmptyInitConnectionSql() throws Exception {
-        ds.setConnectionInitSqls(Arrays.asList(new String[]{"", "   "}));
+        ds.setConnectionInitSqls(Arrays.asList("", "   "));
         assertNotNull(ds.getConnectionInitSqls());
         assertEquals(0, ds.getConnectionInitSqls().size());
 
@@ -339,7 +339,7 @@ public class TestBasicDataSource extends TestConnectionPool {
     @Test
     public void testInvalidConnectionInitSql() {
         try {
-            ds.setConnectionInitSqls(Arrays.asList(new String[]{"SELECT 1","invalid"}));
+            ds.setConnectionInitSqls(Arrays.asList("SELECT 1", "invalid"));
             try (Connection c = ds.getConnection()) {}
             fail("expected SQLException");
         }
diff --git a/src/test/java/org/apache/commons/dbcp2/TestListException.java b/src/test/java/org/apache/commons/dbcp2/TestListException.java
index 5f437c4..1b335eb 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestListException.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestListException.java
@@ -42,7 +42,7 @@ public class TestListException {
     public void testExceptionList() {
         @SuppressWarnings("unchecked")
         final
-        List<Throwable> exceptions = Arrays.asList(new Throwable[] {new NullPointerException(), new RuntimeException()});
+        List<Throwable> exceptions = Arrays.asList(new NullPointerException(), new RuntimeException());
         final ListException list = new ListException("Internal Error", exceptions);
         assertEquals("Internal Error", list.getMessage());
         assertArrayEquals(exceptions.toArray(), list.getExceptionList().toArray());
diff --git a/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java b/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
index 1ae8d3d..1b2e4f9 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestParallelCreationWithNoIdle.java
@@ -69,7 +69,7 @@ public class TestParallelCreationWithNoIdle  {
         ds.setUsername("userName");
         ds.setPassword("password");
         ds.setValidationQuery("SELECT DUMMY FROM DUAL");
-        ds.setConnectionInitSqls(Arrays.asList(new String[] { "SELECT 1", "SELECT 2"}));
+        ds.setConnectionInitSqls(Arrays.asList("SELECT 1", "SELECT 2"));
         ds.setDriverClassLoader(new TesterClassLoader());
         ds.setJmxName("org.apache.commons.dbcp2:name=test");
     }
diff --git a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
index e8b9b87..ea89ca8 100644
--- a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
+++ b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
@@ -272,7 +272,7 @@ public class TestSynchronizationOrder {
         bds.setUsername("userName");
         bds.setPassword("password");
         bds.setValidationQuery("SELECT DUMMY FROM DUAL");
-        bds.setConnectionInitSqls(Arrays.asList(new String[]{"SELECT 1", "SELECT 2"}));
+        bds.setConnectionInitSqls(Arrays.asList("SELECT 1", "SELECT 2"));
         bds.setDriverClassLoader(new TesterClassLoader());
         bds.setJmxName("org.apache.commons.dbcp2:name=test");
         final AtomicInteger closeCounter = new AtomicInteger();