Use generics instead of type casts. Also use generics in ::.

Author: ggregory-rocket

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

@@ -203,19 +203,19 @@ public SQLXML createSQLXML() throws SQLException {
 
     @Override
     public Statement createStatement() throws SQLException {
-        return apply(() -> init(new DelegatingStatement(this, connection.createStatement())));
+        return apply(() -> init(new DelegatingStatement<>(this, connection.createStatement())));
     }
 
     @Override
     public Statement createStatement(final int resultSetType, final int resultSetConcurrency) throws SQLException {
-        return apply(
-            () -> init(new DelegatingStatement(this, connection.createStatement(resultSetType, resultSetConcurrency))));
+        return apply(() -> init(
+            new DelegatingStatement<>(this, connection.createStatement(resultSetType, resultSetConcurrency))));
     }
 
     @Override
     public Statement createStatement(final int resultSetType, final int resultSetConcurrency,
         final int resultSetHoldability) throws SQLException {
-        return apply(() -> init(new DelegatingStatement(this,
+        return apply(() -> init(new DelegatingStatement<>(this,
             connection.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability))));
     }
 
@@ -374,7 +374,7 @@ protected <T extends Throwable> T handleExceptionNoThrow(final T e) {
         return e;
     }
 
-    private <T extends DelegatingStatement> T init(final T ds) throws SQLException {
+    private <T extends DelegatingStatement<?>> T init(final T ds) throws SQLException {
         if (defaultQueryTimeoutSeconds != null && defaultQueryTimeoutSeconds.intValue() != ds.getQueryTimeout()) {
             ds.setQueryTimeout(defaultQueryTimeoutSeconds.intValue());
         }
@@ -485,57 +485,58 @@ protected void passivate() throws SQLException {
 
     @Override
     public CallableStatement prepareCall(final String sql) throws SQLException {
-        return apply(() -> init(new DelegatingCallableStatement(this, connection.prepareCall(sql))));
+        return apply(() -> init(new DelegatingCallableStatement<>(this, connection.prepareCall(sql))));
     }
 
     @Override
     public CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency)
         throws SQLException {
         return apply(() -> init(
-            new DelegatingCallableStatement(this, connection.prepareCall(sql, resultSetType, resultSetConcurrency))));
+            new DelegatingCallableStatement<>(this, connection.prepareCall(sql, resultSetType, resultSetConcurrency))));
     }
 
     @Override
     public CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency,
         final int resultSetHoldability) throws SQLException {
-        return apply(() -> init(new DelegatingCallableStatement(this,
+        return apply(() -> init(new DelegatingCallableStatement<>(this,
             connection.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability))));
     }
 
     @Override
     public PreparedStatement prepareStatement(final String sql) throws SQLException {
-        return apply(() -> init(new DelegatingPreparedStatement(this, connection.prepareStatement(sql))));
+        return apply(() -> init(new DelegatingPreparedStatement<>(this, connection.prepareStatement(sql))));
     }
 
     @Override
     public PreparedStatement prepareStatement(final String sql, final int autoGeneratedKeys) throws SQLException {
         return apply(
-            () -> init(new DelegatingPreparedStatement(this, connection.prepareStatement(sql, autoGeneratedKeys))));
+            () -> init(new DelegatingPreparedStatement<>(this, connection.prepareStatement(sql, autoGeneratedKeys))));
     }
 
     @Override
     public PreparedStatement prepareStatement(final String sql, final int columnIndexes[]) throws SQLException {
         return apply(
-            () -> init(new DelegatingPreparedStatement(this, connection.prepareStatement(sql, columnIndexes))));
+            () -> init(new DelegatingPreparedStatement<>(this, connection.prepareStatement(sql, columnIndexes))));
     }
 
     @Override
     public PreparedStatement prepareStatement(final String sql, final int resultSetType, final int resultSetConcurrency)
         throws SQLException {
-        return apply(() -> init(new DelegatingPreparedStatement(this,
+        return apply(() -> init(new DelegatingPreparedStatement<>(this,
             connection.prepareStatement(sql, resultSetType, resultSetConcurrency))));
     }
 
     @Override
     public PreparedStatement prepareStatement(final String sql, final int resultSetType, final int resultSetConcurrency,
         final int resultSetHoldability) throws SQLException {
-        return apply(() -> init(new DelegatingPreparedStatement(this,
+        return apply(() -> init(new DelegatingPreparedStatement<>(this,
             connection.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability))));
     }
 
     @Override
     public PreparedStatement prepareStatement(final String sql, final String columnNames[]) throws SQLException {
-        return apply(() -> init(new DelegatingPreparedStatement(this, connection.prepareStatement(sql, columnNames))));
+        return apply(
+            () -> init(new DelegatingPreparedStatement<>(this, connection.prepareStatement(sql, columnNames))));
     }
 
     @Override