Merge some string literals

Author: garydgregory

src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java

@@ -174,11 +174,11 @@ public class BasicDataSourceFactory implements ObjectFactory {
                 "Property " + NUPROP_MAX_ACTIVE + " is not used in DBCP2, use " + PROP_MAX_TOTAL + " instead. "
                         + PROP_MAX_TOTAL + " default value is " + GenericObjectPoolConfig.DEFAULT_MAX_TOTAL + ".");
         NUPROP_WARNTEXT.put(NUPROP_REMOVE_ABANDONED,
-                "Property " + NUPROP_REMOVE_ABANDONED + " is not used in DBCP2," + " use one or both of "
+                "Property " + NUPROP_REMOVE_ABANDONED + " is not used in DBCP2, use one or both of "
                         + PROP_REMOVE_ABANDONED_ON_BORROW + " or " + PROP_REMOVE_ABANDONED_ON_MAINTENANCE + " instead. "
                         + "Both have default value set to false.");
         NUPROP_WARNTEXT.put(NUPROP_MAXWAIT,
-                "Property " + NUPROP_MAXWAIT + " is not used in DBCP2" + " , use " + PROP_MAX_WAIT_MILLIS + " instead. "
+                "Property " + NUPROP_MAXWAIT + " is not used in DBCP2 , use " + PROP_MAX_WAIT_MILLIS + " instead. "
                         + PROP_MAX_WAIT_MILLIS + " default value is " + BaseObjectPoolConfig.DEFAULT_MAX_WAIT
                         + ".");
     }

src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java

@@ -111,7 +111,7 @@ public void connectionClosed(final ConnectionEvent event) {
             try {
                 pool.returnObject(pci);
             } catch (final Exception e) {
-                System.err.println("CLOSING DOWN CONNECTION AS IT COULD " + "NOT BE RETURNED TO THE POOL");
+                System.err.println("CLOSING DOWN CONNECTION AS IT COULD NOT BE RETURNED TO THE POOL");
                 pc.removeConnectionEventListener(this);
                 try {
                     doDestroyObject(pci);

src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java

@@ -236,7 +236,7 @@ public Connection getConnection() throws SQLException {
     public Connection getConnection(final String userName, final String userPassword) throws SQLException {
         if (instanceKey == null) {
             throw new SQLException("Must set the ConnectionPoolDataSource "
-                    + "through setDataSourceName or setConnectionPoolDataSource" + " before calling getConnection.");
+                    + "through setDataSourceName or setConnectionPoolDataSource before calling getConnection.");
         }
         getConnectionCalled = true;
         PooledConnectionAndInfo info = null;
@@ -258,7 +258,7 @@ public Connection getConnection(final String userName, final String userPassword
                 // Password has not changed, so refuse client, but return connection to the pool
                 closeDueToException(info);
                 throw new SQLException(
-                        "Given password did not match password used" + " to create the PooledConnection.", ex);
+                        "Given password did not match password used to create the PooledConnection.", ex);
             } catch (final javax.naming.NamingException ne) {
                 throw new SQLException("NamingException encountered connecting to database", ne);
             }
@@ -777,7 +777,7 @@ public void setDataSourceName(final String dataSourceName) {
                     + "set using setConnectionPoolDataSource.");
         }
         if (this.dataSourceName != null) {
-            throw new IllegalStateException("The DataSourceName has already been set. " + "It cannot be altered.");
+            throw new IllegalStateException("The DataSourceName has already been set. It cannot be altered.");
         }
         this.dataSourceName = dataSourceName;
         instanceKey = InstanceKeyDataSourceFactory.registerNewInstance(this);
@@ -1266,8 +1266,8 @@ protected ConnectionPoolDataSource testCPDS(final String userName, final String
             }
             final Object ds = ctx.lookup(dataSourceName);
             if (!(ds instanceof ConnectionPoolDataSource)) {
-                throw new SQLException("Illegal configuration: " + "DataSource " + dataSourceName + " ("
-                        + ds.getClass().getName() + ")" + " doesn't implement javax.sql.ConnectionPoolDataSource");
+                throw new SQLException("Illegal configuration: DataSource " + dataSourceName + " ("
+                        + ds.getClass().getName() + ") doesn't implement javax.sql.ConnectionPoolDataSource");
             }
             cpds = (ConnectionPoolDataSource) ds;
         }

src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java

@@ -101,7 +101,7 @@ public void connectionClosed(final ConnectionEvent event) {
             try {
                 pool.returnObject(pci.getUserPassKey(), pci);
             } catch (final Exception e) {
-                System.err.println("CLOSING DOWN CONNECTION AS IT COULD " + "NOT BE RETURNED TO THE POOL");
+                System.err.println("CLOSING DOWN CONNECTION AS IT COULD NOT BE RETURNED TO THE POOL");
                 pc.removeConnectionEventListener(this);
                 try {
                     pool.invalidateObject(pci.getUserPassKey(), pci);