diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java index 186a4d88b2..518c4d881b 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java @@ -43,6 +43,7 @@ public class CannotGetJdbcConnectionException extends DataAccessResourceFailureE * @deprecated since Spring 2.5, in favor of throwing an * IllegalStateException in case of the driver not being found */ + @Deprecated public CannotGetJdbcConnectionException(String msg, ClassNotFoundException ex) { super(msg, ex); } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java index 4c5592bdb7..9a613cc0fe 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java @@ -62,6 +62,7 @@ public class JdbcUpdateAffectedIncorrectNumberOfRowsException extends IncorrectU return this.actual; } + @Override public boolean wasDataUpdated() { return (getActualRowsAffected() > 0); } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java index 941bb81c64..6892802a88 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java @@ -229,6 +229,7 @@ public class CallableStatementCreatorFactory { } } + @Override public String toString() { StringBuffer buf = new StringBuffer("CallableStatementCreatorFactory.CallableStatementCreatorImpl: sql=["); buf.append(callString).append("]; parameters=").append(this.inParameters); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java index 401dcb0b69..e0daa5f044 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java @@ -311,6 +311,7 @@ public class PreparedStatementCreatorFactory { StatementCreatorUtils.cleanupParameters(this.parameters); } + @Override public String toString() { StringBuffer buf = new StringBuffer("PreparedStatementCreatorFactory.PreparedStatementCreatorImpl: sql=["); buf.append(sql).append("]; parameters=").append(this.parameters); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java index 003a7d6fa1..9cb2cd0c7d 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java @@ -129,6 +129,7 @@ public class ResultSetSupportingSqlParameter extends SqlParameter { /** *

This implementation always returns false. */ + @Override public boolean isInputValueProvided() { return false; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java index c236e9f024..896bc88061 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java @@ -105,6 +105,7 @@ public class SqlInOutParameter extends SqlOutParameter { /** * This implementation always returns true. */ + @Override public boolean isInputValueProvided() { return true; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java index 5cf7be27f8..3a26964cde 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java @@ -62,6 +62,7 @@ public class SqlReturnResultSet extends ResultSetSupportingSqlParameter { * results preocessing of the CallableStatement.getMoreResults/getUpdateCount. *

This implementation always returns true. */ + @Override public boolean isResultsParameter() { return true; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnUpdateCount.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnUpdateCount.java index 3a60e62e45..b5bb9866bf 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnUpdateCount.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnUpdateCount.java @@ -26,6 +26,7 @@ public class SqlReturnUpdateCount extends SqlParameter { * before execution even if they are null. *

This implementation always returns false. */ + @Override public boolean isInputValueProvided() { return false; } @@ -35,6 +36,7 @@ public class SqlReturnUpdateCount extends SqlParameter { * results preocessing of the CallableStatement.getMoreResults/getUpdateCount. *

This implementation always returns true. */ + @Override public boolean isResultsParameter() { return true; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java index d1dee3465a..b35ac67f6a 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java @@ -33,11 +33,13 @@ public class HsqlTableMetaDataProvider extends GenericTableMetaDataProvider { } + @Override public boolean isGetGeneratedKeysSimulated() { return true; } + @Override public String getSimpleQueryForGetGeneratedKey(String tableName, String keyColumnName) { return "select max(identity()) from " + tableName; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java index 7a60b7a2ed..4bac90ae9d 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/PostgresTableMetaDataProvider.java @@ -17,6 +17,7 @@ public class PostgresTableMetaDataProvider extends GenericTableMetaDataProvider } + @Override public boolean isGetGeneratedKeysSimulated() { if (getDatabaseVersion().compareTo("8.2.0") >= 0) { return true; @@ -28,6 +29,7 @@ public class PostgresTableMetaDataProvider extends GenericTableMetaDataProvider } + @Override public String getSimpleQueryForGetGeneratedKey(String tableName, String keyColumnName) { return "RETURNING " + keyColumnName; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java index 5640a77179..8739bcfc5c 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java @@ -91,6 +91,7 @@ public class BeanPropertySqlParameterSource extends AbstractSqlParameterSource { * Derives a default SQL type from the corresponding property type. * @see org.springframework.jdbc.core.StatementCreatorUtils#javaTypeToSqlParameterType */ + @Override public int getSqlType(String paramName) { int sqlType = super.getSqlType(paramName); if (sqlType != TYPE_UNKNOWN) { diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java index 0639716f22..621cf6d9f3 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java @@ -34,6 +34,7 @@ public class NamedParameterJdbcDaoSupport extends JdbcDaoSupport { /** * Create a NamedParameterJdbcTemplate based on the configured JdbcTemplate. */ + @Override protected void initTemplateConfig() { this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(getJdbcTemplate()); } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/ParsedSql.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/ParsedSql.java index 641875e90c..308d8bf347 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/ParsedSql.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/namedparam/ParsedSql.java @@ -137,6 +137,7 @@ public class ParsedSql { /** * Exposes the original SQL String. */ + @Override public String toString() { return this.originalSql; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java index 4e818b64e7..01493faa03 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java @@ -61,6 +61,7 @@ public class ParameterizedBeanPropertyRowMapper extends BeanPropertyRowMapper public ParameterizedBeanPropertyRowMapper() { } + @Override @SuppressWarnings("unchecked") public T mapRow(ResultSet rs, int rowNumber) throws SQLException { return (T) super.mapRow(rs, rowNumber); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java index 195e7fb3a1..b31636a46b 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java @@ -48,6 +48,7 @@ public class ParameterizedSingleColumnRowMapper extends SingleColumnRowMapper public ParameterizedSingleColumnRowMapper() { } + @Override @SuppressWarnings("unchecked") public T mapRow(ResultSet rs, int rowNumber) throws SQLException { return (T) super.mapRow(rs, rowNumber); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java index c26eefce95..c848fa5c35 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java @@ -36,6 +36,7 @@ public class SimpleJdbcDaoSupport extends JdbcDaoSupport { /** * Create a SimpleJdbcTemplate based on the configured JdbcTemplate. */ + @Override protected void initTemplateConfig() { this.simpleJdbcTemplate = new SimpleJdbcTemplate(getJdbcTemplate()); } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java index 16f2846a98..d6ae0fde76 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java @@ -106,6 +106,7 @@ public abstract class JdbcDaoSupport extends DaoSupport { protected void initTemplateConfig() { } + @Override protected void checkDaoConfig() { if (this.jdbcTemplate == null) { throw new IllegalArgumentException("'dataSource' or 'jdbcTemplate' is required"); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java index 36fd35ec40..bc1428509c 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java @@ -186,6 +186,7 @@ public class ConnectionHolder extends ResourceHolderSupport { * JDO 2.0 DataStoreConnections, for example. * @see org.springframework.orm.jdo.DefaultJdoDialect#getJdbcConnection */ + @Override public void released() { super.released(); if (this.currentConnection != null) { @@ -195,6 +196,7 @@ public class ConnectionHolder extends ResourceHolderSupport { } + @Override public void clear() { super.clear(); this.transactionActive = false; diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java index 7a6f045db6..4c2feb3215 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java @@ -173,6 +173,7 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan return getDataSource(); } + @Override protected Object doGetTransaction() { DataSourceTransactionObject txObject = new DataSourceTransactionObject(); txObject.setSavepointAllowed(isNestedTransactionAllowed()); @@ -182,6 +183,7 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan return txObject; } + @Override protected boolean isExistingTransaction(Object transaction) { DataSourceTransactionObject txObject = (DataSourceTransactionObject) transaction; return (txObject.getConnectionHolder() != null && txObject.getConnectionHolder().isTransactionActive()); @@ -190,6 +192,7 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan /** * This implementation sets the isolation level but ignores the timeout. */ + @Override protected void doBegin(Object transaction, TransactionDefinition definition) { DataSourceTransactionObject txObject = (DataSourceTransactionObject) transaction; Connection con = null; @@ -239,6 +242,7 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan } } + @Override protected Object doSuspend(Object transaction) { DataSourceTransactionObject txObject = (DataSourceTransactionObject) transaction; txObject.setConnectionHolder(null); @@ -247,11 +251,13 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan return conHolder; } + @Override protected void doResume(Object transaction, Object suspendedResources) { ConnectionHolder conHolder = (ConnectionHolder) suspendedResources; TransactionSynchronizationManager.bindResource(this.dataSource, conHolder); } + @Override protected void doCommit(DefaultTransactionStatus status) { DataSourceTransactionObject txObject = (DataSourceTransactionObject) status.getTransaction(); Connection con = txObject.getConnectionHolder().getConnection(); @@ -266,6 +272,7 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan } } + @Override protected void doRollback(DefaultTransactionStatus status) { DataSourceTransactionObject txObject = (DataSourceTransactionObject) status.getTransaction(); Connection con = txObject.getConnectionHolder().getConnection(); @@ -280,6 +287,7 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan } } + @Override protected void doSetRollbackOnly(DefaultTransactionStatus status) { DataSourceTransactionObject txObject = (DataSourceTransactionObject) status.getTransaction(); if (status.isDebug()) { @@ -289,6 +297,7 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan txObject.setRollbackOnly(); } + @Override protected void doCleanupAfterCompletion(Object transaction) { DataSourceTransactionObject txObject = (DataSourceTransactionObject) transaction; diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java index c5016a4f14..d43516b239 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java @@ -391,10 +391,12 @@ public abstract class DataSourceUtils { this.order = getConnectionSynchronizationOrder(dataSource); } + @Override public int getOrder() { return this.order; } + @Override public void suspend() { if (this.holderActive) { TransactionSynchronizationManager.unbindResource(this.dataSource); @@ -409,12 +411,14 @@ public abstract class DataSourceUtils { } } + @Override public void resume() { if (this.holderActive) { TransactionSynchronizationManager.bindResource(this.dataSource, this.connectionHolder); } } + @Override public void beforeCompletion() { // Release Connection early if the holder is not open anymore // (that is, not used by another resource like a Hibernate Session @@ -430,6 +434,7 @@ public abstract class DataSourceUtils { } } + @Override public void afterCompletion(int status) { // If we haven't closed the Connection in beforeCompletion, // close it now. The holder might have been used for other diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java index 2e80e28f76..8b57be61cf 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java @@ -119,6 +119,7 @@ public class DriverManagerDataSource extends AbstractDriverBasedDataSource { * If you need to register a new driver, consider using * {@link SimpleDriverDataSource} instead. */ + @Deprecated public DriverManagerDataSource(String driverClassName, String url, String username, String password) { setDriverClassName(driverClassName); setUrl(url); @@ -157,6 +158,7 @@ public class DriverManagerDataSource extends AbstractDriverBasedDataSource { } + @Override protected Connection getConnectionFromDriver(Properties props) throws SQLException { String url = getUrl(); if (logger.isDebugEnabled()) { diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java index 3d75f0536b..937faadaff 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java @@ -123,6 +123,7 @@ public class IsolationLevelDataSourceAdapter extends UserCredentialsDataSourceAd * @see #getCurrentIsolationLevel() * @see #getCurrentReadOnlyFlag() */ + @Override protected Connection doGetConnection(String username, String password) throws SQLException { Connection con = super.doGetConnection(username, password); Boolean readOnlyToUse = getCurrentReadOnlyFlag(); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java index 9214962520..f2d5908626 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java @@ -153,6 +153,7 @@ public class LazyConnectionDataSourceProxy extends DelegatingDataSource { } + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); @@ -216,6 +217,7 @@ public class LazyConnectionDataSourceProxy extends DelegatingDataSource { * @return a lazy Connection handle * @see ConnectionProxy#getTargetConnection() */ + @Override public Connection getConnection() throws SQLException { return (Connection) Proxy.newProxyInstance( ConnectionProxy.class.getClassLoader(), @@ -233,6 +235,7 @@ public class LazyConnectionDataSourceProxy extends DelegatingDataSource { * @return a lazy Connection handle * @see ConnectionProxy#getTargetConnection() */ + @Override public Connection getConnection(String username, String password) throws SQLException { return (Connection) Proxy.newProxyInstance( ConnectionProxy.class.getClassLoader(), diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java index 801e25a121..ed37136a92 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java @@ -56,6 +56,7 @@ public class SimpleConnectionHandle implements ConnectionHandle { } + @Override public String toString() { return "SimpleConnectionHandle: " + this.connection; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java index 982fba1952..2185c0310b 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java @@ -129,6 +129,7 @@ public class SimpleDriverDataSource extends AbstractDriverBasedDataSource { } + @Override protected Connection getConnectionFromDriver(Properties props) throws SQLException { Driver driver = getDriver(); String url = getUrl(); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java index 312f90a6e1..e2cc516d06 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java @@ -94,6 +94,7 @@ public class SingleConnectionDataSource extends DriverManagerDataSource * directly, set up the Driver class manually before invoking this DataSource. * @see java.sql.DriverManager#getConnection(String, String, String) */ + @Deprecated public SingleConnectionDataSource( String driverClassName, String url, String username, String password, boolean suppressClose) { @@ -177,6 +178,7 @@ public class SingleConnectionDataSource extends DriverManagerDataSource } + @Override public Connection getConnection() throws SQLException { synchronized (this.connectionMonitor) { if (this.connection == null) { @@ -197,6 +199,7 @@ public class SingleConnectionDataSource extends DriverManagerDataSource * with a single Connection. Returns the single Connection if given * the same username and password; throws a SQLException else. */ + @Override public Connection getConnection(String username, String password) throws SQLException { if (ObjectUtils.nullSafeEquals(username, getUsername()) && ObjectUtils.nullSafeEquals(password, getPassword())) { diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java index 218830d5d3..f2a4e754f9 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java @@ -121,6 +121,7 @@ public class TransactionAwareDataSourceProxy extends DelegatingDataSource { * @see DataSourceUtils#doGetConnection * @see ConnectionProxy#getTargetConnection */ + @Override public Connection getConnection() throws SQLException { DataSource ds = getTargetDataSource(); Assert.state(ds != null, "'targetDataSource' is required"); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java index 695acbb0f9..c45f0be10e 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java @@ -124,6 +124,7 @@ public class UserCredentialsDataSourceAdapter extends DelegatingDataSource { *

Delegates to {@link #doGetConnection(String, String)} with the * determined credentials as parameters. */ + @Override public Connection getConnection() throws SQLException { JdbcUserCredentials threadCredentials = (JdbcUserCredentials) this.threadBoundCredentials.get(); if (threadCredentials != null) { @@ -138,6 +139,7 @@ public class UserCredentialsDataSourceAdapter extends DelegatingDataSource { * Simply delegates to {@link #doGetConnection(String, String)}, * keeping the given user credentials as-is. */ + @Override public Connection getConnection(String username, String password) throws SQLException { return doGetConnection(username, password); } @@ -178,6 +180,7 @@ public class UserCredentialsDataSourceAdapter extends DelegatingDataSource { this.password = password; } + @Override public String toString() { return "JdbcUserCredentials[username='" + this.username + "',password='" + this.password + "']"; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java index cd9657632e..849c1065fc 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java @@ -113,6 +113,7 @@ public class WebSphereDataSourceAdapter extends IsolationLevelDataSourceAdapter * Checks that the specified 'targetDataSource' actually is * a WebSphere WSDataSource. */ + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); @@ -129,6 +130,7 @@ public class WebSphereDataSourceAdapter extends IsolationLevelDataSourceAdapter * @see #createConnectionSpec * @see com.ibm.websphere.rsadapter.WSDataSource#getConnection(com.ibm.websphere.rsadapter.JDBCConnectionSpec) */ + @Override protected Connection doGetConnection(String username, String password) throws SQLException { // Create JDBCConnectionSpec using current isolation level value and read-only flag. Object connSpec = createConnectionSpec( diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java index 1080b728b3..c9d99065fe 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java @@ -100,6 +100,7 @@ public class IsolationLevelDataSourceRouter extends AbstractRoutingDataSource { * as well as isolation level names as defined on the * {@link org.springframework.transaction.TransactionDefinition TransactionDefinition interface}. */ + @Override protected Object resolveSpecifiedLookupKey(Object lookupKey) { if (lookupKey instanceof Integer) { return (Integer) lookupKey; @@ -117,6 +118,7 @@ public class IsolationLevelDataSourceRouter extends AbstractRoutingDataSource { } } + @Override protected Object determineCurrentLookupKey() { return TransactionSynchronizationManager.getCurrentTransactionIsolationLevel(); } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java index ed1977f19e..242a5c02de 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java @@ -138,6 +138,7 @@ public class BatchSqlUpdate extends SqlUpdate { /** * BatchSqlUpdate does not support BLOB or CLOB parameters. */ + @Override protected boolean supportsLobParameters() { return false; } @@ -157,6 +158,7 @@ public class BatchSqlUpdate extends SqlUpdate { * executed by this method) * @see #flush */ + @Override public int update(Object[] params) throws DataAccessException { validateParameters(params); this.parameterQueue.add(params.clone()); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQuery.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQuery.java index 9e8a60793b..5b42c9ef0e 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQuery.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQuery.java @@ -58,6 +58,7 @@ public abstract class MappingSqlQuery extends MappingSqlQueryWithParameters { * template method, ignoring parameters. * @see #mapRow(ResultSet, int) */ + @Override protected final Object mapRow(ResultSet rs, int rowNum, Object[] parameters, Map context) throws SQLException { diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java index 8a8c9192ef..25560c0311 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java @@ -70,6 +70,7 @@ public abstract class MappingSqlQueryWithParameters extends SqlQuery { * Implementation of protected abstract method. This invokes the subclass's * implementation of the mapRow() method. */ + @Override protected RowMapper newRowMapper(Object[] parameters, Map context) { return new RowMapperImpl(parameters, context); } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java index b0b29970ae..683cf03025 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java @@ -124,6 +124,7 @@ public abstract class SqlCall extends RdbmsOperation { * based on our declared parameters. * @see RdbmsOperation#compileInternal() */ + @Override protected final void compileInternal() { if (isSqlReadyForUse()) { this.callString = getSql(); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java index ec9b2b8cba..659c947ebf 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java @@ -128,6 +128,7 @@ public class SqlFunction extends MappingSqlQuery { * single row returned by the function. If there are a different number * of rows returned, this is treated as an error. */ + @Override protected Object mapRow(ResultSet rs, int rowNum) throws SQLException { return this.rowMapper.mapRow(rs, rowNum); } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java index 3c9a742edf..df90e9de84 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java @@ -51,6 +51,7 @@ public abstract class SqlOperation extends RdbmsOperation { * Overridden method to configure the PreparedStatementCreatorFactory * based on our declared parameters. */ + @Override protected final void compileInternal() { this.preparedStatementFactory = new PreparedStatementCreatorFactory(getSql(), getDeclaredParameters()); this.preparedStatementFactory.setResultSetType(getResultSetType()); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java index fbbdc59866..ed69657c17 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java @@ -75,6 +75,7 @@ public abstract class StoredProcedure extends SqlCall { * StoredProcedure parameter Maps are by default allowed to contain * additional entries that are not actually used as parameters. */ + @Override protected boolean allowsUnusedParameters() { return true; } @@ -90,6 +91,7 @@ public abstract class StoredProcedure extends SqlCall { * Names are purely used to help mapping. * @param param parameter object */ + @Override public void declareParameter(SqlParameter param) throws InvalidDataAccessApiUsageException { if (param.getName() == null) { throw new InvalidDataAccessApiUsageException("Parameters to stored procedures must have names as well as types"); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java index 113c03971d..80d374b306 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java @@ -58,6 +58,7 @@ public abstract class UpdatableSqlQuery extends SqlQuery { * Implementation of the superclass template method. This invokes the subclass's * implementation of the updateRow() method. */ + @Override protected RowMapper newRowMapper(Object[] parameters, Map context) { return new RowMapperImpl(context); } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java index b9c66fdfc4..a30ca62011 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java @@ -170,6 +170,7 @@ public class SQLErrorCodeSQLExceptionTranslator extends AbstractFallbackSQLExcep } + @Override protected DataAccessException doTranslate(String task, String sql, SQLException ex) { SQLException sqlEx = ex; if (sqlEx instanceof BatchUpdateException && sqlEx.getNextException() != null) { diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java index 79c5f96653..fa676fddc9 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java @@ -61,6 +61,7 @@ public class SQLExceptionSubclassTranslator extends AbstractFallbackSQLException setFallbackTranslator(new SQLStateSQLExceptionTranslator()); } + @Override protected DataAccessException doTranslate(String task, String sql, SQLException ex) { if (ex instanceof SQLTransientException) { if (ex instanceof SQLTransactionRollbackException) { diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java index a8c57e190e..bd7863fd1f 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java @@ -86,6 +86,7 @@ public class SQLStateSQLExceptionTranslator extends AbstractFallbackSQLException } + @Override protected DataAccessException doTranslate(String task, String sql, SQLException ex) { String sqlState = getSqlState(ex); if (sqlState != null && sqlState.length() >= 2) { diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractColumnMaxValueIncrementer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractColumnMaxValueIncrementer.java index 069dec794b..713d095a3f 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractColumnMaxValueIncrementer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractColumnMaxValueIncrementer.java @@ -87,6 +87,7 @@ public abstract class AbstractColumnMaxValueIncrementer extends AbstractDataFiel return this.cacheSize; } + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); if (this.columnName == null) { diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java index 0d4ec6c691..26fe080031 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java @@ -59,6 +59,7 @@ public abstract class AbstractSequenceMaxValueIncrementer extends AbstractDataFi /** * Executes the SQL as specified by {@link #getSequenceQuery()}. */ + @Override protected long getNextKey() throws DataAccessException { Connection con = DataSourceUtils.getConnection(getDataSource()); Statement stmt = null; diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.java index 2d9bb84323..c7a08e2546 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2MainframeSequenceMaxValueIncrementer.java @@ -46,6 +46,7 @@ public class DB2MainframeSequenceMaxValueIncrementer extends AbstractSequenceMax } + @Override protected String getSequenceQuery() { return "select next value for " + getIncrementerName() + " from sysibm.sysdummy1"; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2SequenceMaxValueIncrementer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2SequenceMaxValueIncrementer.java index d08526648b..ab725db420 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2SequenceMaxValueIncrementer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DB2SequenceMaxValueIncrementer.java @@ -46,6 +46,7 @@ public class DB2SequenceMaxValueIncrementer extends AbstractSequenceMaxValueIncr } + @Override protected String getSequenceQuery() { return "values nextval for " + getIncrementerName(); } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java index 1577255c14..ddb1e9a725 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java @@ -126,6 +126,7 @@ public class DerbyMaxValueIncrementer extends AbstractColumnMaxValueIncrementer } + @Override protected synchronized long getNextKey() throws DataAccessException { if (this.nextValueIndex < 0 || this.nextValueIndex >= getCacheSize()) { /* diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java index 271bc64447..7c5bf6c562 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/H2SequenceMaxValueIncrementer.java @@ -44,6 +44,7 @@ public class H2SequenceMaxValueIncrementer extends AbstractSequenceMaxValueIncre } + @Override protected String getSequenceQuery() { return "select " + getIncrementerName() + ".nextval from dual"; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.java index 3d1d5745ef..279ba69be0 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlMaxValueIncrementer.java @@ -84,6 +84,7 @@ public class HsqlMaxValueIncrementer extends AbstractColumnMaxValueIncrementer { } + @Override protected synchronized long getNextKey() throws DataAccessException { if (this.nextValueIndex < 0 || this.nextValueIndex >= getCacheSize()) { /* diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.java index 28a56e2ddc..0d589dabf9 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/HsqlSequenceMaxValueIncrementer.java @@ -49,6 +49,7 @@ public class HsqlSequenceMaxValueIncrementer extends AbstractSequenceMaxValueInc } + @Override protected String getSequenceQuery() { return "call next value for " + getIncrementerName(); } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/MySQLMaxValueIncrementer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/MySQLMaxValueIncrementer.java index ac4c2fb4d1..61090aecc0 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/MySQLMaxValueIncrementer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/MySQLMaxValueIncrementer.java @@ -85,6 +85,7 @@ public class MySQLMaxValueIncrementer extends AbstractColumnMaxValueIncrementer } + @Override protected synchronized long getNextKey() throws DataAccessException { if (this.maxId == this.nextId) { /* diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.java index 4760c03aff..ea1bcc9c0a 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/OracleSequenceMaxValueIncrementer.java @@ -45,6 +45,7 @@ public class OracleSequenceMaxValueIncrementer extends AbstractSequenceMaxValueI } + @Override protected String getSequenceQuery() { return "select " + getIncrementerName() + ".nextval from dual"; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/PostgreSQLSequenceMaxValueIncrementer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/PostgreSQLSequenceMaxValueIncrementer.java index 05f021539b..7af3fa69eb 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/PostgreSQLSequenceMaxValueIncrementer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/PostgreSQLSequenceMaxValueIncrementer.java @@ -44,6 +44,7 @@ public class PostgreSQLSequenceMaxValueIncrementer extends AbstractSequenceMaxVa } + @Override protected String getSequenceQuery() { return "select nextval('" + getIncrementerName() + "')"; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.java index f24030a6ff..99d41cc0cd 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SqlServerMaxValueIncrementer.java @@ -73,6 +73,7 @@ public class SqlServerMaxValueIncrementer extends AbstractColumnMaxValueIncremen } + @Override protected synchronized long getNextKey() throws DataAccessException { if (this.nextValueIndex < 0 || this.nextValueIndex >= getCacheSize()) { /* diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java index a19ec82df4..7cff7184f7 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java @@ -73,6 +73,7 @@ public class SybaseMaxValueIncrementer extends AbstractColumnMaxValueIncrementer } + @Override protected synchronized long getNextKey() throws DataAccessException { if (this.nextValueIndex < 0 || this.nextValueIndex >= getCacheSize()) { /* diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java index 9f5fb4d5e8..11b9de15cf 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java @@ -55,11 +55,13 @@ public class SpringLobCreatorSynchronization extends TransactionSynchronizationA this.lobCreator = lobCreator; } + @Override public int getOrder() { return LOB_CREATOR_SYNCHRONIZATION_ORDER; } + @Override public void beforeCompletion() { // Close the LobCreator early if possible, to avoid issues with strict JTA // implementations that issue warnings when doing JDBC operations after @@ -68,6 +70,7 @@ public class SpringLobCreatorSynchronization extends TransactionSynchronizationA this.lobCreator.close(); } + @Override public void afterCompletion(int status) { if (!this.beforeCompletionCalled) { // beforeCompletion not called before (probably because of flushing on commit diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java index 4995b01827..9830899c9d 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java @@ -71,14 +71,17 @@ public class C3P0NativeJdbcExtractor extends NativeJdbcExtractorAdapter { } + @Override public boolean isNativeConnectionNecessaryForNativeStatements() { return true; } + @Override public boolean isNativeConnectionNecessaryForNativePreparedStatements() { return true; } + @Override public boolean isNativeConnectionNecessaryForNativeCallableStatements() { return true; } @@ -89,6 +92,7 @@ public class C3P0NativeJdbcExtractor extends NativeJdbcExtractorAdapter { * raw Connection (which is otherwise not directly supported by C3P0). * @see #getRawConnection */ + @Override protected Connection doGetNativeConnection(Connection con) throws SQLException { if (con instanceof C3P0ProxyConnection) { C3P0ProxyConnection cpCon = (C3P0ProxyConnection) con; diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java index 3b3ec98d2b..9332ca52f5 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java @@ -84,22 +84,27 @@ public class CommonsDbcpNativeJdbcExtractor extends NativeJdbcExtractorAdapter { } + @Override protected Connection doGetNativeConnection(Connection con) throws SQLException { return (Connection) getInnermostDelegate(con); } + @Override public Statement getNativeStatement(Statement stmt) throws SQLException { return (Statement) getInnermostDelegate(stmt); } + @Override public PreparedStatement getNativePreparedStatement(PreparedStatement ps) throws SQLException { return (PreparedStatement) getNativeStatement(ps); } + @Override public CallableStatement getNativeCallableStatement(CallableStatement cs) throws SQLException { return (CallableStatement) getNativeStatement(cs); } + @Override public ResultSet getNativeResultSet(ResultSet rs) throws SQLException { return (ResultSet) getInnermostDelegate(rs); } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java index db468a839f..52b4a55e4e 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java @@ -93,6 +93,7 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter { /** * Retrieve the Connection via JBoss' getUnderlyingConnection method. */ + @Override protected Connection doGetNativeConnection(Connection con) throws SQLException { if (this.wrappedConnectionClass.isAssignableFrom(con.getClass())) { return (Connection) ReflectionUtils.invokeJdbcMethod(this.getUnderlyingConnectionMethod, con); @@ -103,6 +104,7 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter { /** * Retrieve the Connection via JBoss' getUnderlyingStatement method. */ + @Override public Statement getNativeStatement(Statement stmt) throws SQLException { if (this.wrappedStatementClass.isAssignableFrom(stmt.getClass())) { return (Statement) ReflectionUtils.invokeJdbcMethod(this.getUnderlyingStatementMethod, stmt); @@ -113,6 +115,7 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter { /** * Retrieve the Connection via JBoss' getUnderlyingStatement method. */ + @Override public PreparedStatement getNativePreparedStatement(PreparedStatement ps) throws SQLException { return (PreparedStatement) getNativeStatement(ps); } @@ -120,6 +123,7 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter { /** * Retrieve the Connection via JBoss' getUnderlyingStatement method. */ + @Override public CallableStatement getNativeCallableStatement(CallableStatement cs) throws SQLException { return (CallableStatement) getNativeStatement(cs); } @@ -127,6 +131,7 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter { /** * Retrieve the Connection via JBoss' getUnderlyingResultSet method. */ + @Override public ResultSet getNativeResultSet(ResultSet rs) throws SQLException { if (this.wrappedResultSetClass.isAssignableFrom(rs.getClass())) { return (ResultSet) ReflectionUtils.invokeJdbcMethod(this.getUnderlyingResultSetMethod, rs); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java index 80cc76440e..827e482a80 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java @@ -40,22 +40,27 @@ import java.sql.Statement; */ public class Jdbc4NativeJdbcExtractor extends NativeJdbcExtractorAdapter { + @Override protected Connection doGetNativeConnection(Connection con) throws SQLException { return (Connection) con.unwrap(Connection.class); } + @Override public Statement getNativeStatement(Statement stmt) throws SQLException { return (Statement) stmt.unwrap(Statement.class); } + @Override public PreparedStatement getNativePreparedStatement(PreparedStatement ps) throws SQLException { return (PreparedStatement) ps.unwrap(PreparedStatement.class); } + @Override public CallableStatement getNativeCallableStatement(CallableStatement cs) throws SQLException { return (CallableStatement) cs.unwrap(CallableStatement.class); } + @Override public ResultSet getNativeResultSet(ResultSet rs) throws SQLException { return (ResultSet) rs.unwrap(ResultSet.class); } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java index cb59036b83..50a9975e9c 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java @@ -94,6 +94,7 @@ public class SimpleNativeJdbcExtractor extends NativeJdbcExtractorAdapter { this.nativeConnectionNecessaryForNativeStatements = nativeConnectionNecessaryForNativeStatements; } + @Override public boolean isNativeConnectionNecessaryForNativeStatements() { return this.nativeConnectionNecessaryForNativeStatements; } @@ -114,6 +115,7 @@ public class SimpleNativeJdbcExtractor extends NativeJdbcExtractorAdapter { this.nativeConnectionNecessaryForNativePreparedStatements = nativeConnectionNecessary; } + @Override public boolean isNativeConnectionNecessaryForNativePreparedStatements() { return this.nativeConnectionNecessaryForNativePreparedStatements; } @@ -134,6 +136,7 @@ public class SimpleNativeJdbcExtractor extends NativeJdbcExtractorAdapter { this.nativeConnectionNecessaryForNativeCallableStatements = nativeConnectionNecessary; } + @Override public boolean isNativeConnectionNecessaryForNativeCallableStatements() { return this.nativeConnectionNecessaryForNativeCallableStatements; } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java index 728e4bc461..b683195fcb 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java @@ -70,6 +70,7 @@ public class WebLogicNativeJdbcExtractor extends NativeJdbcExtractorAdapter { /** * Return true, as WebLogic returns wrapped Statements. */ + @Override public boolean isNativeConnectionNecessaryForNativeStatements() { return true; } @@ -77,6 +78,7 @@ public class WebLogicNativeJdbcExtractor extends NativeJdbcExtractorAdapter { /** * Return true, as WebLogic returns wrapped PreparedStatements. */ + @Override public boolean isNativeConnectionNecessaryForNativePreparedStatements() { return true; } @@ -84,6 +86,7 @@ public class WebLogicNativeJdbcExtractor extends NativeJdbcExtractorAdapter { /** * Return true, as WebLogic returns wrapped CallableStatements. */ + @Override public boolean isNativeConnectionNecessaryForNativeCallableStatements() { return true; } @@ -91,6 +94,7 @@ public class WebLogicNativeJdbcExtractor extends NativeJdbcExtractorAdapter { /** * Retrieve the Connection via WebLogic's getVendorConnection method. */ + @Override protected Connection doGetNativeConnection(Connection con) throws SQLException { if (this.jdbcExtensionClass.isAssignableFrom(con.getClass())) { return (Connection) ReflectionUtils.invokeJdbcMethod(this.getVendorConnectionMethod, con); diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java index b631f303d9..63ce516c4f 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java @@ -73,6 +73,7 @@ public class WebSphereNativeJdbcExtractor extends NativeJdbcExtractorAdapter { /** * Return true, as WebSphere returns wrapped Statements. */ + @Override public boolean isNativeConnectionNecessaryForNativeStatements() { return true; } @@ -80,6 +81,7 @@ public class WebSphereNativeJdbcExtractor extends NativeJdbcExtractorAdapter { /** * Return true, as WebSphere returns wrapped PreparedStatements. */ + @Override public boolean isNativeConnectionNecessaryForNativePreparedStatements() { return true; } @@ -87,6 +89,7 @@ public class WebSphereNativeJdbcExtractor extends NativeJdbcExtractorAdapter { /** * Return true, as WebSphere returns wrapped CallableStatements. */ + @Override public boolean isNativeConnectionNecessaryForNativeCallableStatements() { return true; } @@ -94,6 +97,7 @@ public class WebSphereNativeJdbcExtractor extends NativeJdbcExtractorAdapter { /** * Retrieve the Connection via WebSphere's getNativeConnection method. */ + @Override protected Connection doGetNativeConnection(Connection con) throws SQLException { if (this.webSphere5ConnectionClass.isAssignableFrom(con.getClass())) { return (Connection) ReflectionUtils.invokeJdbcMethod( diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/XAPoolNativeJdbcExtractor.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/XAPoolNativeJdbcExtractor.java index e1284165fe..b6d8bec02f 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/XAPoolNativeJdbcExtractor.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/XAPoolNativeJdbcExtractor.java @@ -46,6 +46,7 @@ public class XAPoolNativeJdbcExtractor extends NativeJdbcExtractorAdapter { * Return true, as CoreStatement does not allow access to the * underlying Connection. */ + @Override public boolean isNativeConnectionNecessaryForNativeStatements() { return true; } @@ -54,10 +55,12 @@ public class XAPoolNativeJdbcExtractor extends NativeJdbcExtractorAdapter { * Return true, as CoreCallableStatement does not allow access to the * underlying Connection. */ + @Override public boolean isNativeConnectionNecessaryForNativeCallableStatements() { return true; } + @Override protected Connection doGetNativeConnection(Connection con) throws SQLException { if (con instanceof CoreConnection) { return ((CoreConnection) con).con; @@ -65,6 +68,7 @@ public class XAPoolNativeJdbcExtractor extends NativeJdbcExtractorAdapter { return con; } + @Override public PreparedStatement getNativePreparedStatement(PreparedStatement ps) throws SQLException { if (ps instanceof CorePreparedStatement) { return ((CorePreparedStatement) ps).ps; diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java index a0a98bdb5c..e773f97f13 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java @@ -90,6 +90,7 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler { public SqlXmlValue newSqlXmlValue(final String value) { return new AbstractJdbc4SqlXmlValue() { + @Override protected void provideXml(SQLXML xmlObject) throws SQLException, IOException { xmlObject.setString(value); } @@ -98,6 +99,7 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler { public SqlXmlValue newSqlXmlValue(final XmlBinaryStreamProvider provider) { return new AbstractJdbc4SqlXmlValue() { + @Override protected void provideXml(SQLXML xmlObject) throws SQLException, IOException { provider.provideXml(xmlObject.setBinaryStream()); } @@ -106,6 +108,7 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler { public SqlXmlValue newSqlXmlValue(final XmlCharacterStreamProvider provider) { return new AbstractJdbc4SqlXmlValue() { + @Override protected void provideXml(SQLXML xmlObject) throws SQLException, IOException { provider.provideXml(xmlObject.setCharacterStream()); } @@ -114,6 +117,7 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler { public SqlXmlValue newSqlXmlValue(final Class resultClass, final XmlResultProvider provider) { return new AbstractJdbc4SqlXmlValue() { + @Override protected void provideXml(SQLXML xmlObject) throws SQLException, IOException { provider.provideXml(xmlObject.setResult(resultClass)); } @@ -122,6 +126,7 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler { public SqlXmlValue newSqlXmlValue(final Document document) { return new AbstractJdbc4SqlXmlValue() { + @Override protected void provideXml(SQLXML xmlObject) throws SQLException, IOException { ((DOMResult) xmlObject.setResult(DOMResult.class)).setNode(document); }