commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1572012 - in /commons/proper/dbcp/trunk/src: main/java/org/apache/commons/dbcp2/ main/java/org/apache/commons/dbcp2/cpdsadapter/ main/java/org/apache/commons/dbcp2/datasources/ test/java/org/apache/commons/dbcp2/datasources/ test/java/org/...
Date Wed, 26 Feb 2014 11:26:56 GMT
Author: markt
Date: Wed Feb 26 11:26:55 2014
New Revision: 1572012

URL: http://svn.apache.org/r1572012
Log:
Review the remaining TODOs within the codebase.
- remove the completed ones
- remove ones that no longer apply
- action the ones that need actioning

Fix some comment typos

Modified:
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
    commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
    commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
    commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java?rev=1572012&r1=1572011&r2=1572012&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
Wed Feb 26 11:26:55 2014
@@ -48,7 +48,7 @@ import java.sql.SQLXML;
  * <p>
  * Extends AbandonedTrace to implement result set tracking and
  * logging of code which created the ResultSet. Tracking the
- * ResultSet ensures that the Statment which created it can
+ * ResultSet ensures that the Statement which created it can
  * close any open ResultSet's on Statement close.
  *
  * @author Glenn L. Nielsen

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java?rev=1572012&r1=1572011&r2=1572012&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
Wed Feb 26 11:26:55 2014
@@ -460,8 +460,6 @@ public class DelegatingStatement extends
 
     /*
      * Note was protected prior to JDBC 4
-     * TODO Consider adding build flags to make this protected unless we are
-     *      using JDBC 4.
      */
     @Override
     public boolean isClosed() throws SQLException {

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1572012&r1=1572011&r2=1572012&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
Wed Feb 26 11:26:55 2014
@@ -76,10 +76,9 @@ class PooledConnectionImpl implements Po
     /**
      * flag set to true, once close() is called.
      */
-    private boolean isClosed; // TODO - make private?
+    private boolean isClosed;
 
     /** My pool of {*link PreparedStatement}s. */
-    // TODO - make final and private?
     private KeyedObjectPool<PStmtKeyCPDS, PoolablePreparedStatement<PStmtKeyCPDS, PoolablePreparedStatementStub>>
pstmtPool = null;
 
     /**

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java?rev=1572012&r1=1572011&r2=1572012&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
Wed Feb 26 11:26:55 2014
@@ -86,8 +86,7 @@ import org.apache.commons.pool2.impl.Gen
 public abstract class InstanceKeyDataSource
         implements DataSource, Referenceable, Serializable {
 
-    // TODO - Recalculate this
-    private static final long serialVersionUID = -4243533936955098795L;
+    private static final long serialVersionUID = -6819270431752240878L;
 
     private static final String GET_CONNECTION_CALLED
             = "A Connection was already requested from this source, "

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java?rev=1572012&r1=1572011&r2=1572012&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
Wed Feb 26 11:26:55 2014
@@ -58,8 +58,7 @@ import org.apache.commons.pool2.impl.Gen
  */
 public class PerUserPoolDataSource extends InstanceKeyDataSource {
 
-    // TODO Re-calculate this
-    private static final long serialVersionUID = -3104731034410444060L;
+    private static final long serialVersionUID = 7872747993848065028L;
 
     private static final Log log =
             LogFactory.getLog(PerUserPoolDataSource.class);

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java?rev=1572012&r1=1572011&r2=1572012&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
Wed Feb 26 11:26:55 2014
@@ -50,8 +50,7 @@ import org.apache.commons.pool2.impl.Gen
  */
 public class SharedPoolDataSource extends InstanceKeyDataSource {
 
-    // TODO Re-calculate this
-    private static final long serialVersionUID = -8132305535403690372L;
+    private static final long serialVersionUID = -1458539734480586454L;
 
     // Pool properties
     private int maxTotal = GenericKeyedObjectPoolConfig.DEFAULT_MAX_TOTAL;

Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java?rev=1572012&r1=1572011&r2=1572012&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
Wed Feb 26 11:26:55 2014
@@ -78,18 +78,13 @@ public class TestPerUserPoolDataSource e
         ds = tds;
     }
 
-    @Override
-    public void testBackPointers() throws Exception {
-        // todo disabled until a wrapping issuen in PerUserPoolDataSource are resolved
-    }
 
     /**
      * Switching 'u1 -> 'u2' and 'p1' -> 'p2' will
      * exhibit the bug detailed in
      * http://issues.apache.org/bugzilla/show_bug.cgi?id=18905
      */
-    public void testIncorrectPassword() throws Exception
-    {
+    public void testIncorrectPassword() throws Exception {
         try {
             // Use bad password
             ds.getConnection("u1", "zlsafjk");

Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java?rev=1572012&r1=1572011&r2=1572012&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
Wed Feb 26 11:26:55 2014
@@ -78,11 +78,6 @@ public class TestSharedPoolDataSource ex
     }
 
 
-    @Override
-    public void testBackPointers() throws Exception {
-        // todo disabled until a wrapping issuen in SharedPoolDataSource are resolved
-    }
-
     /**
      * Switching 'u1 -> 'u2' and 'p1' -> 'p2' will
      * exhibit the bug detailed in

Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java?rev=1572012&r1=1572011&r2=1572012&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
(original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
Wed Feb 26 11:26:55 2014
@@ -43,11 +43,6 @@ public class TestBasicManagedDataSource 
         return basicManagedDataSource;
     }
 
-    @Override
-    public void testHashCode() throws Exception {
-        // TODO reenable... hashcode doesn't work when accessToUnderlyingConnectionAllowed
is false
-    }
-
     /**
      * JIRA: DBCP-294
      * Verify that PoolableConnections created by BasicManagedDataSource unregister themselves



Mime
View raw message