Add @Override annotations to test sources

Issue: SPR-10129

spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java

@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}

spring-jdbc/src/test/java/org/springframework/beans/TestBean.java

@@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 	/**
 	 * @see org.springframework.beans.ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());

spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java

@@ -45,6 +45,7 @@ public abstract class AbstractJdbcTests extends TestCase {
 	 */
 	private boolean shouldVerify;
 
+	@Override
 	protected void setUp() throws Exception {
 		this.shouldVerify = false;
 		super.setUp();
@@ -68,6 +69,7 @@ public abstract class AbstractJdbcTests extends TestCase {
 		this.shouldVerify = true;
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 

spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java

@@ -124,6 +124,7 @@ public class InitializeDatabaseIntegrationTests {
 			return cache;
 		}
 
+		@Override
 		public void afterPropertiesSet() throws Exception {
 			cache = jdbcTemplate.queryForList("SELECT * FROM T_TEST");
 		}

spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java

@@ -74,6 +74,7 @@ public abstract class AbstractRowMapperTests extends TestCase {
 	protected Statement stmt3;
 	protected JdbcTemplate jdbcTemplate3;
 
+	@Override
 	protected void setUp() throws SQLException {
 		conControl = MockControl.createControl(Connection.class);
 		con = (Connection) conControl.getMock();

spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java

@@ -49,6 +49,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests {
 	private MockControl ctrlResultSetMetaData;
 	private ResultSetMetaData mockResultSetMetaData;
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 
@@ -62,6 +63,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests {
 		mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock();
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		ctrlStatement.replay();
@@ -70,6 +72,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests {
 		ctrlResultSetMetaData.replay();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		if (shouldVerify()) {
@@ -349,6 +352,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 
 		Object o = template.queryForObject(sql, new RowMapper() {
+			@Override
 			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 				return new Integer(rs.getInt(1));
 			}
@@ -852,6 +856,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 
 		Object o = template.queryForObject(sql, new Object[] {new Integer(3)}, new RowMapper() {
+			@Override
 			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 				return new Integer(rs.getInt(1));
 			}

spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java

@@ -159,6 +159,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 	public void testStringsWithStaticSql() throws Exception {
 		doTestStrings(new JdbcTemplateCallback() {
+			@Override
 			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
 				template.query(sql, rch);
 			}
@@ -167,6 +168,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 	public void testStringsWithStaticSqlAndFetchSizeAndMaxRows() throws Exception {
 		doTestStrings(new JdbcTemplateCallback() {
+			@Override
 			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
 				template.query(sql, rch);
 			}
@@ -175,6 +177,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 	public void testStringsWithEmptyPreparedStatementSetter() throws Exception {
 		doTestStrings(new JdbcTemplateCallback() {
+			@Override
 			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
 				template.query(sql, (PreparedStatementSetter) null, rch);
 			}
@@ -184,8 +187,10 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 	public void testStringsWithPreparedStatementSetter() throws Exception {
 		final Integer argument = new Integer(99);
 		doTestStrings(new JdbcTemplateCallback() {
+			@Override
 			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
 				template.query(sql, new PreparedStatementSetter() {
+					@Override
 					public void setValues(PreparedStatement ps) throws SQLException {
 						ps.setObject(1, argument);
 					}
@@ -196,6 +201,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 	public void testStringsWithEmptyPreparedStatementArgs() throws Exception {
 		doTestStrings(new JdbcTemplateCallback() {
+			@Override
 			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
 				template.query(sql, (Object[]) null, rch);
 			}
@@ -205,6 +211,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 	public void testStringsWithPreparedStatementArgs() throws Exception {
 		final Integer argument = new Integer(99);
 		doTestStrings(new JdbcTemplateCallback() {
+			@Override
 			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
 				template.query(sql, new Object[] {argument}, rch);
 			}
@@ -221,6 +228,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		class StringHandler implements RowCallbackHandler {
 			private List list = new LinkedList();
+			@Override
 			public void processRow(ResultSet rs) throws SQLException {
 				list.add(rs.getString(1));
 			}
@@ -365,6 +373,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		template.setNativeJdbcExtractor(new PlainNativeJdbcExtractor());
 		Object result = template.execute(new ConnectionCallback() {
+			@Override
 			public Object doInConnection(Connection con) {
 				assertSame(mockConnection, con);
 				return "test";
@@ -389,6 +398,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		Object result = template.execute(new ConnectionCallback() {
+			@Override
 			public Object doInConnection(Connection con) throws SQLException {
 				PreparedStatement ps = con.prepareStatement("some SQL");
 				ps.close();
@@ -471,6 +481,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		try {
 			template.query(sql, new RowCallbackHandler() {
+				@Override
 				public void processRow(ResultSet rs) {
 					throw rex;
 				}
@@ -790,10 +801,12 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		BatchPreparedStatementSetter setter =
 			new BatchPreparedStatementSetter() {
+			@Override
 			public void setValues(PreparedStatement ps, int i)
 				throws SQLException {
 				ps.setInt(1, ids[i]);
 			}
+			@Override
 			public int getBatchSize() {
 				return ids.length;
 			}
@@ -854,14 +867,17 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		BatchPreparedStatementSetter setter =
 				new InterruptibleBatchPreparedStatementSetter() {
+					@Override
 					public void setValues(PreparedStatement ps, int i) throws SQLException {
 						if (i < ids.length) {
 							ps.setInt(1, ids[i]);
 						}
 					}
+					@Override
 					public int getBatchSize() {
 						return 1000;
 					}
+					@Override
 					public boolean isBatchExhausted(int i) {
 						return (i >= ids.length);
 					}
@@ -922,6 +938,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		BatchPreparedStatementSetter setter =
 				new AbstractInterruptibleBatchPreparedStatementSetter() {
+					@Override
 					protected boolean setValuesIfAvailable(PreparedStatement ps, int i) throws SQLException {
 						if (i < ids.length) {
 							ps.setInt(1, ids[i]);
@@ -986,6 +1003,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		BatchPreparedStatementSetter setter =
 				new AbstractInterruptibleBatchPreparedStatementSetter() {
+					@Override
 					protected boolean setValuesIfAvailable(PreparedStatement ps, int i) throws SQLException {
 						if (i < ids.length) {
 							ps.setInt(1, ids[i]);
@@ -1039,9 +1057,11 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		replay();
 
 		BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() {
+			@Override
 			public void setValues(PreparedStatement ps, int i) throws SQLException {
 				ps.setInt(1, ids[i]);
 			}
+			@Override
 			public int getBatchSize() {
 				return ids.length;
 			}
@@ -1099,9 +1119,11 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		replay();
 
 		BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() {
+			@Override
 			public void setValues(PreparedStatement ps, int i) throws SQLException {
 				ps.setInt(1, ids[i]);
 			}
+			@Override
 			public int getBatchSize() {
 				return ids.length;
 			}
@@ -1242,6 +1264,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		replay();
 
 		ParameterizedPreparedStatementSetter setter = new ParameterizedPreparedStatementSetter<Integer>() {
+			@Override
 			public void setValues(PreparedStatement ps, Integer argument) throws SQLException {
 				ps.setInt(1, argument.intValue());
 			}
@@ -1470,6 +1493,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		replay();
 
 		PreparedStatementSetter pss = new PreparedStatementSetter() {
+			@Override
 			public void setValues(PreparedStatement ps) throws SQLException {
 				ps.setString(1, name);
 			}
@@ -1506,6 +1530,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		replay();
 
 		PreparedStatementSetter pss = new PreparedStatementSetter() {
+			@Override
 			public void setValues(PreparedStatement ps) throws SQLException {
 				ps.setString(1, name);
 			}
@@ -1591,6 +1616,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		t.setIgnoreWarnings(false);
 		try {
 			t.query(sql, new RowCallbackHandler() {
+				@Override
 				public void processRow(ResultSet rs) throws SQLException {
 					rs.getByte(1);
 				}
@@ -1643,6 +1669,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		template.setIgnoreWarnings(true);
 		template.query(sql, new RowCallbackHandler() {
+			@Override
 			public void processRow(ResultSet rs)
 				throws java.sql.SQLException {
 				rs.getByte(1);
@@ -1689,6 +1716,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		try {
 			template.query(sql, new RowCallbackHandler() {
+				@Override
 				public void processRow(ResultSet rs) throws SQLException {
 					throw sex;
 				}
@@ -1736,6 +1764,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		template.afterPropertiesSet();
 		try {
 			template.query(sql, new RowCallbackHandler() {
+				@Override
 				public void processRow(ResultSet rs) throws SQLException {
 					throw sex;
 				}
@@ -1805,6 +1834,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		template.afterPropertiesSet();
 		try {
 			template.query(sql, new RowCallbackHandler() {
+				@Override
 				public void processRow(ResultSet rs)
 					throws SQLException {
 					throw sex;
@@ -1901,39 +1931,49 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		template.setNativeJdbcExtractor(new NativeJdbcExtractor() {
+			@Override
 			public boolean isNativeConnectionNecessaryForNativeStatements() {
 				return false;
 			}
+			@Override
 			public boolean isNativeConnectionNecessaryForNativePreparedStatements() {
 				return false;
 			}
+			@Override
 			public boolean isNativeConnectionNecessaryForNativeCallableStatements() {
 				return false;
 			}
+			@Override
 			public Connection getNativeConnection(Connection con) {
 				return con;
 			}
+			@Override
 			public Connection getNativeConnectionFromStatement(Statement stmt) throws SQLException {
 				return stmt.getConnection();
 			}
+			@Override
 			public Statement getNativeStatement(Statement stmt) {
 				assertTrue(stmt == mockStatement);
 				return mockStatement2;
 			}
+			@Override
 			public PreparedStatement getNativePreparedStatement(PreparedStatement ps) {
 				assertTrue(ps == mockPreparedStatement);
 				return mockPreparedStatement2;
 			}
+			@Override
 			public CallableStatement getNativeCallableStatement(CallableStatement cs) {
 				assertTrue(cs == mockCallableStatement);
 				return mockCallableStatement2;
 			}
+			@Override
 			public ResultSet getNativeResultSet(ResultSet rs) {
 				return rs;
 			}
 		});
 
 		template.query("my query",	new ResultSetExtractor() {
+			@Override
 			public Object extractData(ResultSet rs2) {
 				assertEquals(mockResultSet, rs2);
 				return null;
@@ -1941,10 +1981,12 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		});
 
 		template.query(new PreparedStatementCreator() {
+			@Override
 			public PreparedStatement createPreparedStatement(Connection conn) {
 				return mockPreparedStatement;
 			}
 		}, new ResultSetExtractor() {
+			@Override
 			public Object extractData(ResultSet rs2) {
 				assertEquals(mockResultSet, rs2);
 				return null;
@@ -1952,6 +1994,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		});
 
 		template.call(new CallableStatementCreator() {
+			@Override
 			public CallableStatement createCallableStatement(Connection con) {
 				return mockCallableStatement;
 			}
@@ -2015,6 +2058,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		try {
 			template.query("my query", new ResultSetExtractor() {
+				@Override
 				public Object extractData(ResultSet rs) {
 					throw new InvalidDataAccessApiUsageException("");
 				}
@@ -2027,6 +2071,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		try {
 			template.query(new PreparedStatementCreator() {
+				@Override
 				public PreparedStatement createPreparedStatement(Connection con) throws SQLException {
 					return con.prepareStatement("my query");
 				}
@@ -2034,6 +2079,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 					return null;
 				}
 			}, new ResultSetExtractor() {
+				@Override
 				public Object extractData(ResultSet rs2) {
 					throw new InvalidDataAccessApiUsageException("");
 				}
@@ -2084,6 +2130,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		List params = new ArrayList();
 		params.add(new SqlReturnResultSet("", new RowCallbackHandler() {
+			@Override
 			public void processRow(ResultSet rs) {
 				throw new InvalidDataAccessApiUsageException("");
 			}
@@ -2093,6 +2140,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		try {
 			template.call(new CallableStatementCreator() {
+				@Override
 				public CallableStatement createCallableStatement(Connection conn) throws SQLException {
 					return conn.prepareCall("my query");
 				}
@@ -2143,6 +2191,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		params.add(new SqlOutParameter("a", 12));
 
 		Map out = template.call(new CallableStatementCreator() {
+			@Override
 			public CallableStatement createCallableStatement(Connection conn) throws SQLException {
 				return conn.prepareCall("my query");
 			}
@@ -2157,6 +2206,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 	private static class PlainNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 
+		@Override
 		protected Connection doGetNativeConnection(Connection con) throws SQLException {
 			return con;
 		}
@@ -2179,12 +2229,14 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 			this.sql = sql;
 		}
 
+		@Override
 		public PreparedStatement createPreparedStatement(Connection conn) throws SQLException {
 			PreparedStatement ps = conn.prepareStatement(sql);
 			ps.setInt(1, id);
 			return ps;
 		}
 
+		@Override
 		public String getSql() {
 			return sql;
 		}

spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java

@@ -47,6 +47,7 @@ public class RowMapperTests extends TestCase {
 	private JdbcTemplate jdbcTemplate;
 	private List result;
 
+	@Override
 	protected void setUp() throws SQLException {
 		conControl = MockControl.createControl(Connection.class);
 		con = (Connection) conControl.getMock();
@@ -121,6 +122,7 @@ public class RowMapperTests extends TestCase {
 
 		result = jdbcTemplate.query(
 				new PreparedStatementCreator() {
+					@Override
 					public PreparedStatement createPreparedStatement(Connection con) throws SQLException {
 						return ps;
 					}
@@ -153,6 +155,7 @@ public class RowMapperTests extends TestCase {
 		result = jdbcTemplate.query(
 				"some SQL",
 				new PreparedStatementSetter() {
+					@Override
 					public void setValues(PreparedStatement ps) throws SQLException {
 						ps.setString(1, "test");
 					}
@@ -240,6 +243,7 @@ public class RowMapperTests extends TestCase {
 
 	private static class TestRowMapper implements RowMapper {
 
+		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return new TestBean(rs.getString(1), rs.getInt(2));
 		}

spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java

@@ -31,6 +31,7 @@ public class SimpleRowCountCallbackHandler implements RowCallbackHandler {
 	private int count;
 
 
+	@Override
 	public void processRow(ResultSet rs) throws SQLException {
 		count++;
 	}

spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java

@@ -35,11 +35,13 @@ public class StatementCreatorUtilsTests extends TestCase {
 	private MockControl psControl;
 	private PreparedStatement ps;
 
+	@Override
 	protected void setUp() {
 		psControl = MockControl.createControl(PreparedStatement.class);
 		ps = (PreparedStatement) psControl.getMock();
 	}
 
+	@Override
 	protected void tearDown() {
 		psControl.verify();
 	}

spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java

@@ -71,6 +71,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 	private MockControl ctrlResultSet;
 	private ResultSet mockResultSet;
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		ctrlPreparedStatement =	MockControl.createControl(PreparedStatement.class);
@@ -79,6 +80,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		mockResultSet = (ResultSet) ctrlResultSet.getMock();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		if (shouldVerify()) {
@@ -87,6 +89,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		}
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		ctrlPreparedStatement.replay();
@@ -132,6 +135,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		params.put("perfId", new Integer(1));
 		params.put("priceId", new Integer(1));
 		assertEquals("result", jt.execute(UPDATE_NAMED_PARAMETERS, params, new PreparedStatementCallback() {
+			@Override
 			public Object doInPreparedStatement(PreparedStatement ps) throws SQLException {
 				assertEquals(mockPreparedStatement, ps);
 				ps.executeUpdate();
@@ -164,6 +168,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		params.put("perfId", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
 		params.put("priceId", new SqlParameterValue(Types.INTEGER, new Integer(1)));
 		assertEquals("result", jt.execute(UPDATE_NAMED_PARAMETERS, params, new PreparedStatementCallback() {
+			@Override
 			public Object doInPreparedStatement(PreparedStatement ps) throws SQLException {
 				assertEquals(mockPreparedStatement, ps);
 				ps.executeUpdate();
@@ -259,6 +264,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
 		params.put("country", "UK");
 		Customer cust = (Customer) jt.query(SELECT_NAMED_PARAMETERS, params, new ResultSetExtractor() {
+			@Override
 			public Object extractData(ResultSet rs) throws SQLException, DataAccessException {
 				rs.next();
 				Customer cust = new Customer();
@@ -307,6 +313,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		params.put("country", "UK");
 		final List customers = new LinkedList();
 		jt.query(SELECT_NAMED_PARAMETERS, params, new RowCallbackHandler() {
+			@Override
 			public void processRow(ResultSet rs) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -355,6 +362,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
 		params.put("country", "UK");
 		List customers = jt.query(SELECT_NAMED_PARAMETERS, params, new RowMapper() {
+			@Override
 			public Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -403,6 +411,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
 		params.put("country", "UK");
 		Customer cust = (Customer) jt.queryForObject(SELECT_NAMED_PARAMETERS, params, new RowMapper() {
+			@Override
 			public Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));

spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java

@@ -44,6 +44,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests {
 	private MockControl ctrlResultSetMetaData;
 	private ResultSetMetaData mockResultSetMetaData;
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
@@ -54,6 +55,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests {
 		mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock();
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		ctrlPreparedStatement.replay();
@@ -61,6 +63,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests {
 		ctrlResultSetMetaData.replay();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		if (false && shouldVerify()) {
@@ -317,6 +320,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests {
 		parms.addValue("id", new Integer(3));
 
 		Object o = template.queryForObject(sql, parms, new RowMapper() {
+			@Override
 			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 				return new Integer(rs.getInt(1));
 			}

spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java

@@ -31,6 +31,7 @@ public class CallMetaDataContextTests extends TestCase {
 
 	private CallMetaDataContext context = new CallMetaDataContext();
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 
@@ -51,6 +52,7 @@ public class CallMetaDataContextTests extends TestCase {
 
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		ctrlDatabaseMetaData.verify();

spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java

@@ -31,6 +31,7 @@ public class ParameterizedBeanPropertyRowMapperTests extends AbstractRowMapperTe
 
 	private SimpleJdbcTemplate simpleJdbcTemplate;
 
+	@Override
 	protected void setUp() throws SQLException {
 		super.setUp();
 		simpleJdbcTemplate = new SimpleJdbcTemplate(jdbcTemplate);

spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java

@@ -49,6 +49,7 @@ public class SimpleJdbcCallTests extends TestCase {
 	private MockControl ctrlCallable;
 	private CallableStatement mockCallable;
 
+	@Override
 	protected void setUp() throws Exception {
 		ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
 		mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
@@ -69,6 +70,7 @@ public class SimpleJdbcCallTests extends TestCase {
 		mockCallable = (CallableStatement) ctrlCallable.getMock();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		ctrlDatabaseMetaData.verify();
 		ctrlDataSource.verify();

spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java

@@ -40,6 +40,7 @@ public class SimpleJdbcInsertTests extends TestCase {
 	private MockControl ctrlDatabaseMetaData;
 	private DatabaseMetaData mockDatabaseMetaData;
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 
@@ -60,6 +61,7 @@ public class SimpleJdbcInsertTests extends TestCase {
 
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		ctrlDatabaseMetaData.verify();

spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java

@@ -254,6 +254,7 @@ public class SimpleJdbcTemplateTests extends TestCase {
 		Date expectedResult = new Date();
 
 		ParameterizedRowMapper<Date> rm = new ParameterizedRowMapper<Date>() {
+			@Override
 			public Date mapRow(ResultSet rs, int rowNum) {
 				return new Date();
 			}
@@ -279,6 +280,7 @@ public class SimpleJdbcTemplateTests extends TestCase {
 		Object arg3 = new Object();
 
 		ParameterizedRowMapper<Date> rm = new ParameterizedRowMapper<Date>() {
+			@Override
 			public Date mapRow(ResultSet rs, int rowNum) {
 				return new Date();
 			}
@@ -305,6 +307,7 @@ public class SimpleJdbcTemplateTests extends TestCase {
 		Object arg3 = new Object();
 
 		ParameterizedRowMapper<Date> rm = new ParameterizedRowMapper<Date>() {
+			@Override
 			public Date mapRow(ResultSet rs, int rowNum) {
 				return new Date();
 			}

spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java

@@ -30,6 +30,7 @@ public class TableMetaDataContextTests extends TestCase {
 
 	private TableMetaDataContext context = new TableMetaDataContext();
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 
@@ -50,6 +51,7 @@ public class TableMetaDataContextTests extends TestCase {
 
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		ctrlDatabaseMetaData.verify();

spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java

@@ -37,6 +37,7 @@ public class JdbcDaoSupportTests extends TestCase {
 		DataSource ds = (DataSource) dsControl.getMock();
 		final List test = new ArrayList();
 		JdbcDaoSupport dao = new JdbcDaoSupport() {
+			@Override
 			protected void initDao() {
 				test.add("test");
 			}
@@ -52,6 +53,7 @@ public class JdbcDaoSupportTests extends TestCase {
 		JdbcTemplate template = new JdbcTemplate();
 		final List test = new ArrayList();
 		JdbcDaoSupport dao = new JdbcDaoSupport() {
+			@Override
 			protected void initDao() {
 				test.add("test");
 			}

spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java

@@ -69,6 +69,7 @@ public class LobSupportTests extends TestCase {
 		AbstractLobCreatingPreparedStatementCallback psc =
 			new AbstractLobCreatingPreparedStatementCallback(handler) {
 
+			@Override
 			protected void setValues(PreparedStatement ps, LobCreator lobCreator)
 					throws SQLException, DataAccessException {
 				svc.b = true;
@@ -155,6 +156,7 @@ public class LobSupportTests extends TestCase {
 
 	private AbstractLobStreamingResultSetExtractor getResultSetExtractor(final boolean ex) {
 		AbstractLobStreamingResultSetExtractor lobRse = new AbstractLobStreamingResultSetExtractor() {
+			@Override
 			protected void streamData(ResultSet rs) throws SQLException, IOException {
 				if (ex) {
 					throw new IOException();

spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java

@@ -57,6 +57,7 @@ public class SqlLobValueTests extends TestCase {
 	private MockControl lobCreatorControl;
 	private LobCreator creator;
 
+	@Override
 	public void setUp() {
 		//	create preparedstatement
 		psControl = MockControl.createControl(PreparedStatement.class);
@@ -97,11 +98,13 @@ public class SqlLobValueTests extends TestCase {
 		creator.setBlobAsBytes(ps, 1, testString.getBytes());
 		// set a matcher to match the byte array!
 		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
+			@Override
 			public boolean matches(Object[] arg0, Object[] arg1) {
 				byte[] one = (byte[]) arg0[2];
 				byte[] two = (byte[]) arg1[2];
 				return Arrays.equals(one, two);
 			}
+			@Override
 			public String toString(Object[] arg0) {
 				return "bla";
 			}
@@ -149,10 +152,12 @@ public class SqlLobValueTests extends TestCase {
 		ByteArrayInputStream bais = new ByteArrayInputStream(testContent);
 		creator.setClobAsAsciiStream(ps, 1, bais, 3);
 		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
+			@Override
 			public boolean matches(Object[] arg0, Object[] arg1) {
 				// for now, match always
 				return true;
 			}
+			@Override
 			public String toString(Object[] arg0) {
 				return null;
 			}
@@ -172,10 +177,12 @@ public class SqlLobValueTests extends TestCase {
 		InputStreamReader reader = new InputStreamReader(bais);
 		creator.setClobAsCharacterStream(ps, 1, reader, 3);
 		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
+			@Override
 			public boolean matches(Object[] arg0, Object[] arg1) {
 				// for now, match always
 				return true;
 			}
+			@Override
 			public String toString(Object[] arg0) {
 				return null;
 			}

spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java

@@ -96,6 +96,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 				assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -223,6 +224,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
 				assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -246,6 +248,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 				for (int i = 0; i < 5; i++) {
 
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
 							assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -418,6 +421,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -429,6 +433,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 				tt2.setPropagationBehavior(requiresNew ?
 						TransactionDefinition.PROPAGATION_REQUIRES_NEW : TransactionDefinition.PROPAGATION_REQUIRED);
 				tt2.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) {
 						assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 						assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -547,6 +552,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
 					assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -569,6 +575,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 					try {
 						tt.execute(new TransactionCallbackWithoutResult() {
+							@Override
 							protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 								assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
 								assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -653,9 +660,11 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		@SuppressWarnings("serial")
 		JtaTransactionManager ptm = new JtaTransactionManager(ut) {
+			@Override
 			protected void doRegisterAfterCompletionWithJtaTransaction(
 					JtaTransactionObject txObject, final List synchronizations) {
 				Thread async = new Thread() {
+					@Override
 					public void run() {
 						invokeAfterCompletion(synchronizations, TransactionSynchronization.STATUS_COMMITTED);
 					}
@@ -691,6 +700,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 			final boolean releaseCon = (i != 1);
 
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
 					assertTrue("Is existing transaction", !status.isNewTransaction());
@@ -769,6 +779,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		TransactionTemplate tt = new TransactionTemplate(ptm);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				Connection c = DataSourceUtils.getConnection(dsToUse);
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
@@ -780,6 +791,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 		tt.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ);
 		tt.setReadOnly(true);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				Connection c = DataSourceUtils.getConnection(dsToUse);
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
@@ -865,6 +877,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		TransactionTemplate tt = new TransactionTemplate(ptm);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				Connection c = DataSourceUtils.getConnection(dsToUse);
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
@@ -875,6 +888,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		tt.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				Connection c = DataSourceUtils.getConnection(dsToUse);
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
@@ -890,6 +904,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 		utControl.verify();
 	}
 
+	@Override
 	protected void tearDown() {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());

spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java

@@ -134,6 +134,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
 				assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -242,6 +243,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		final RuntimeException ex = new RuntimeException("Application exception");
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
 					assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -291,6 +293,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		final RuntimeException ex = new RuntimeException("Application exception");
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 					assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
@@ -359,10 +362,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 			final TransactionTemplate tt = new TransactionTemplate(tm);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Is existing transaction", !status.isNewTransaction());
 					assertFalse("Is not rollback-only", status.isRollbackOnly());
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 							assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -433,9 +438,11 @@ public class DataSourceTransactionManagerTests extends TestCase {
 			tt2.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE);
 
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertFalse("Is not rollback-only", status.isRollbackOnly());
 					tt2.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							status.setRollbackOnly();
 						}
@@ -489,9 +496,11 @@ public class DataSourceTransactionManagerTests extends TestCase {
 			tt2.setReadOnly(false);
 
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertFalse("Is not rollback-only", status.isRollbackOnly());
 					tt2.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							status.setRollbackOnly();
 						}
@@ -539,9 +548,11 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 		final TestTransactionSynchronization synch =
 				new TestTransactionSynchronization(ds, TransactionSynchronization.STATUS_COMMITTED) {
+					@Override
 					public void afterCompletion(int status) {
 						super.afterCompletion(status);
 						tt.execute(new TransactionCallbackWithoutResult() {
+							@Override
 							protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							}
 						});
@@ -549,6 +560,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 				};
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				TransactionSynchronizationManager.registerSynchronization(synch);
 			}
@@ -599,10 +611,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 			final TransactionTemplate tt = new TransactionTemplate(tm2);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Is existing transaction", !status.isNewTransaction());
 					assertFalse("Is not rollback-only", status.isRollbackOnly());
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 							assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -661,12 +675,14 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				tt.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 						assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 						assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -737,12 +753,14 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				tt2.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 						assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 						assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -807,12 +825,14 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Is new transaction", status.isNewTransaction());
 					assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
 					assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 					assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 					tt2.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							status.setRollbackOnly();
 						}
@@ -858,12 +878,14 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED);
 				tt.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 						assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 						assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -911,10 +933,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Is new transaction", status.isNewTransaction());
 					tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NEVER);
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							fail("Should have thrown IllegalTransactionStateException");
 						}
@@ -959,11 +983,13 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
 				TransactionTemplate tt2 = new TransactionTemplate(tm);
 				tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 				tt2.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 						assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 						assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -1015,6 +1041,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
 				assertSame(con1, DataSourceUtils.getConnection(ds));
@@ -1022,6 +1049,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 				TransactionTemplate tt2 = new TransactionTemplate(tm);
 				tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 				tt2.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 						assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 						assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -1079,6 +1107,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		tt.setReadOnly(true);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
@@ -1142,6 +1171,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					try {
 						Thread.sleep(1500);
@@ -1207,6 +1237,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				// something transactional
 				assertEquals(con, DataSourceUtils.getConnection(ds));
@@ -1260,6 +1291,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				// something transactional
 				assertEquals(con, DataSourceUtils.getConnection(ds));
@@ -1275,6 +1307,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 				}
 
 				tt.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) {
 						// something transactional
 						assertEquals(con, DataSourceUtils.getConnection(ds));
@@ -1338,6 +1371,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				// something transactional
 				assertEquals(con, DataSourceUtils.getConnection(ds));
@@ -1354,6 +1388,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 				}
 
 				tt.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) {
 						// something transactional
 						assertEquals(con, DataSourceUtils.getConnection(ds));
@@ -1406,6 +1441,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 				}
@@ -1443,6 +1479,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 				}
@@ -1483,6 +1520,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 				}
@@ -1525,6 +1563,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					status.setRollbackOnly();
 				}
@@ -1550,6 +1589,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
@@ -1573,6 +1613,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
@@ -1594,6 +1635,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
@@ -1655,11 +1697,13 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				assertTrue("Isn't nested transaction", !status.hasSavepoint());
 				for (int i = 0; i < count; i++) {
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 							assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -1721,10 +1765,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				assertTrue("Isn't nested transaction", !status.hasSavepoint());
 				tt.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 						assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 						assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -1786,6 +1832,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				Object savepoint = status.createSavepoint();
@@ -1842,6 +1889,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				Object savepoint = status.createSavepoint();
@@ -1883,6 +1931,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 			}
@@ -1919,6 +1968,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				status.setRollbackOnly();
@@ -1930,6 +1980,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		dsControl.verify();
 	}
 
+	@Override
 	protected void tearDown() {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
@@ -1953,15 +2004,19 @@ public class DataSourceTransactionManagerTests extends TestCase {
 			this.status = status;
 		}
 
+		@Override
 		public void suspend() {
 		}
 
+		@Override
 		public void resume() {
 		}
 
+		@Override
 		public void flush() {
 		}
 
+		@Override
 		public void beforeCommit(boolean readOnly) {
 			if (this.status != TransactionSynchronization.STATUS_COMMITTED) {
 				fail("Should never be called");
@@ -1970,11 +2025,13 @@ public class DataSourceTransactionManagerTests extends TestCase {
 			this.beforeCommitCalled = true;
 		}
 
+		@Override
 		public void beforeCompletion() {
 			assertFalse(this.beforeCompletionCalled);
 			this.beforeCompletionCalled = true;
 		}
 
+		@Override
 		public void afterCommit() {
 			if (this.status != TransactionSynchronization.STATUS_COMMITTED) {
 				fail("Should never be called");
@@ -1983,6 +2040,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 			this.afterCommitCalled = true;
 		}
 
+		@Override
 		public void afterCompletion(int status) {
 			assertFalse(this.afterCompletionCalled);
 			this.afterCompletionCalled = true;

spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java

@@ -38,6 +38,7 @@ public class DriverManagerDataSourceTests extends TestCase {
 		ctrlConnection.replay();
 
 		class TestDriverManagerDataSource extends DriverManagerDataSource {
+			@Override
 			protected Connection getConnectionFromDriverManager(String url, Properties props) {
 				assertEquals(jdbcUrl, url);
 				assertEquals(uname, props.getProperty("user"));
@@ -77,6 +78,7 @@ public class DriverManagerDataSourceTests extends TestCase {
 		ctrlConnection.replay();
 
 		class TestDriverManagerDataSource extends DriverManagerDataSource {
+			@Override
 			protected Connection getConnectionFromDriverManager(String url, Properties props) {
 				assertEquals(jdbcUrl, url);
 				assertEquals("uname", props.getProperty("user"));
@@ -117,6 +119,7 @@ public class DriverManagerDataSourceTests extends TestCase {
 		ctrlConnection.replay();
 
 		class TestDriverManagerDataSource extends DriverManagerDataSource {
+			@Override
 			protected Connection getConnectionFromDriverManager(String url, Properties props) {
 				assertEquals(jdbcUrl, url);
 				assertEquals(uname, props.getProperty("user"));

spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java

@@ -12,10 +12,12 @@ public class TestDataSourceWrapper extends AbstractDataSource {
 		this.target = target;
 	}
 
+	@Override
 	public Connection getConnection() throws SQLException {
 		return target.getConnection();
 	}
 
+	@Override
 	public Connection getConnection(String username, String password) throws SQLException {
 		return target.getConnection(username, password);
 	}

spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java

@@ -24,6 +24,7 @@ public class EmbeddedDatabaseFactoryTests {
 
 		private boolean populateCalled;
 
+		@Override
 		public void populate(Connection connection) {
 			this.populateCalled = true;
 		}

spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java

@@ -35,6 +35,7 @@ public final class JndiDataSourceLookupTests {
 	public void testSunnyDay() throws Exception {
 		final DataSource expectedDataSource = new StubDataSource();
 		JndiDataSourceLookup lookup = new JndiDataSourceLookup() {
+			@Override
 			@SuppressWarnings("unchecked")
 			protected Object lookup(String jndiName, Class requiredType) {
 				assertEquals(DATA_SOURCE_NAME, jndiName);
@@ -49,6 +50,7 @@ public final class JndiDataSourceLookupTests {
 	@Test(expected=DataSourceLookupFailureException.class)
 	public void testNoDataSourceAtJndiLocation() throws Exception {
 		JndiDataSourceLookup lookup = new JndiDataSourceLookup() {
+			@Override
 			@SuppressWarnings("unchecked")
 			protected Object lookup(String jndiName, Class requiredType) throws NamingException {
 				assertEquals(DATA_SOURCE_NAME, jndiName);

spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java

@@ -30,10 +30,12 @@ import org.springframework.jdbc.datasource.AbstractDataSource;
  */
 class StubDataSource extends AbstractDataSource {
 
+	@Override
 	public Connection getConnection() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Connection getConnection(String username, String password) throws SQLException {
 		throw new UnsupportedOperationException();
 	}

spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java

@@ -10,6 +10,7 @@ public class CustomerMapper implements RowMapper<Customer> {
 
 	private static final String[] COLUMN_NAMES = new String[] {"id", "forename"};
 
+	@Override
 	public Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 		Customer cust = new Customer();
 		cust.setId(rs.getInt(COLUMN_NAMES[0]));

spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java

@@ -61,6 +61,7 @@ public class GenericSqlQueryTests extends AbstractJdbcTests {
 	private BeanFactory bf;
 
 
+	@Override
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
@@ -72,6 +73,7 @@ public class GenericSqlQueryTests extends AbstractJdbcTests {
 		testDataSource.setTarget(mockDataSource);
 	}
 
+	@Override
 	@After
 	public void tearDown() throws Exception {
 		super.tearDown();
@@ -81,6 +83,7 @@ public class GenericSqlQueryTests extends AbstractJdbcTests {
 		}
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		EasyMock.replay(mockPreparedStatement);

spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java

@@ -52,6 +52,7 @@ public class GenericStoredProcedureTests extends AbstractJdbcTests {
 
 	private BeanFactory bf;
 
+	@Override
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
@@ -62,6 +63,7 @@ public class GenericStoredProcedureTests extends AbstractJdbcTests {
 		testDataSource.setTarget(mockDataSource);
 	}
 
+	@Override
 	@After
 	public void tearDown() throws Exception {
 		super.tearDown();
@@ -70,6 +72,7 @@ public class GenericStoredProcedureTests extends AbstractJdbcTests {
 		}
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		EasyMock.replay(mockCallable);

spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java

@@ -213,6 +213,7 @@ public class RdbmsOperationTests extends TestCase {
 
 	private static class TestRdbmsOperation extends RdbmsOperation {
 
+		@Override
 		protected void compileInternal() {
 		}
 	}

spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java

@@ -82,6 +82,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 	private ResultSet mockResultSet;
 
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		ctrlPreparedStatement =	MockControl.createControl(PreparedStatement.class);
@@ -90,6 +91,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 		mockResultSet = (ResultSet) ctrlResultSet.getMock();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		if (shouldVerify()) {
@@ -98,6 +100,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 		}
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		ctrlPreparedStatement.replay();
@@ -130,6 +133,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 		replay();
 
 		SqlQuery query = new MappingSqlQueryWithParameters() {
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum, Object[] params, Map context) throws SQLException {
 				assertTrue("params were null", params == null);
 				assertTrue("context was null", context == null);
@@ -154,6 +158,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 		replay();
 
 		MappingSqlQuery query = new MappingSqlQuery() {
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				return new Integer(rs.getInt(1));
 			}
@@ -180,6 +185,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 		replay();
 
 		MappingSqlQuery query = new MappingSqlQuery() {
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				return new Integer(rs.getInt(1));
 			}
@@ -374,6 +380,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -431,6 +438,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -522,6 +530,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -587,6 +596,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -654,6 +664,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -712,6 +723,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -767,6 +779,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -797,6 +810,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -876,6 +890,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -943,6 +958,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -1016,6 +1032,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -1057,6 +1074,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -1128,6 +1146,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object updateRow(ResultSet rs, int rownum, Map context) throws SQLException {
 				rs.updateString(2, "" + context.get(new Integer(rs.getInt(COLUMN_NAMES[0]))));
 				return null;
@@ -1148,6 +1167,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			compile();
 		}
 
+		@Override
 		protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 			return rs.getString(1);
 		}

spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java

@@ -66,12 +66,14 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 	private ResultSetMetaData mockResultSetMetaData;
 
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
 		mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		if (shouldVerify()) {
@@ -79,6 +81,7 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 		}
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		ctrlPreparedStatement.replay();

spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java

@@ -62,6 +62,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 	private MockControl ctrlCallable;
 	private CallableStatement mockCallable;
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 
@@ -69,6 +70,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		mockCallable = (CallableStatement) ctrlCallable.getMock();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		if (shouldVerify()) {
@@ -76,6 +78,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		ctrlCallable.replay();
@@ -255,6 +258,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 
 		class TestJdbcTemplate extends JdbcTemplate {
 			int calls;
+			@Override
 			public Map call(CallableStatementCreator csc, List declaredParameters) throws DataAccessException {
 				calls++;
 				return super.call(csc, declaredParameters);
@@ -934,6 +938,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 
 		private static class RowMapperImpl implements RowMapper {
+			@Override
 			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 				return rs.getString(2);
 			}
@@ -964,6 +969,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 			private TestParameterMapper() {
 			}
 
+			@Override
 			public Map createMap(Connection conn) throws SQLException {
 				Map inParms = new HashMap();
 				String testValue = conn.toString();
@@ -989,6 +995,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		public Map executeTest(final int[] inValue) {
 			Map in = new HashMap(1);
 			in.put("in", new AbstractSqlTypeValue() {
+				@Override
 				public Object createTypeValue(Connection con, int type, String typeName) {
 					//assertEquals(Connection.class, con.getClass());
 					//assertEquals(Types.ARRAY, type);
@@ -1030,6 +1037,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 			setDataSource(ds);
 			setSql(SQL);
 			getJdbcTemplate().setExceptionTranslator(new SQLExceptionTranslator() {
+				@Override
 				public DataAccessException translate(
 					String task,
 					String sql,

spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java

@@ -27,6 +27,7 @@ import java.sql.SQLException;
  * @author Thomas Risberg
  */
 public class CustomSqlExceptionTranslator implements SQLExceptionTranslator {
+	@Override
 	public DataAccessException translate(String task, String sql, SQLException ex) {
 		if (ex.getErrorCode() == 2) {
 			return new TransientDataAccessResourceException("Custom", ex);

spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java

@@ -35,6 +35,7 @@ import junit.framework.TestCase;
 public class KeyHolderTests extends TestCase {
 	private KeyHolder kh;
 
+	@Override
 	public void setUp() {
 		kh = new GeneratedKeyHolder();
 	}

spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java

@@ -110,6 +110,7 @@ public class SQLErrorCodeSQLExceptionTranslatorTests extends TestCase {
 		SQLException intVioEx = new SQLException("", "", 6);
 
 		SQLErrorCodeSQLExceptionTranslator sext = new SQLErrorCodeSQLExceptionTranslator() {
+			@Override
 			protected DataAccessException customTranslate(String task, String sql, SQLException sqlex) {
 				assertEquals(TASK, task);
 				assertEquals(SQL, sql);

spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java

@@ -122,6 +122,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	public void testLookupOrder() {
 		class TestSQLErrorCodesFactory extends SQLErrorCodesFactory {
 			private int lookups = 0;
+			@Override
 			protected Resource loadResource(String path) {
 				++lookups;
 				if (lookups == 1) {
@@ -148,6 +149,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	 */
 	public void testFindUserDefinedCodes() {
 		class TestSQLErrorCodesFactory extends SQLErrorCodesFactory {
+			@Override
 			protected Resource loadResource(String path) {
 				if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) {
 					return new ClassPathResource("test-error-codes.xml", SQLErrorCodesFactoryTests.class);
@@ -166,6 +168,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 
 	public void testInvalidUserDefinedCodeFormat() {
 		class TestSQLErrorCodesFactory extends SQLErrorCodesFactory {
+			@Override
 			protected Resource loadResource(String path) {
 				if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) {
 					// Guaranteed to be on the classpath, but most certainly NOT XML
@@ -186,6 +189,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	 */
 	public void testFindCustomCodes() {
 		class TestSQLErrorCodesFactory extends SQLErrorCodesFactory {
+			@Override
 			protected Resource loadResource(String path) {
 				if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) {
 					return new ClassPathResource("custom-error-codes.xml", SQLErrorCodesFactoryTests.class);
@@ -318,6 +322,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	 */
 	public void testWildCardNameRecognized() throws Exception {
 		class WildcardSQLErrorCodesFactory extends SQLErrorCodesFactory {
+			@Override
 			protected Resource loadResource(String path) {
 				if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) {
 					return new ClassPathResource("wildcard-error-codes.xml", SQLErrorCodesFactoryTests.class);

spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java

@@ -39,6 +39,7 @@ public class ResultSetWrappingRowSetTests extends TestCase {
 	private ResultSet rset;
 	private ResultSetWrappingSqlRowSet rowset;
 
+	@Override
 	public void setUp() throws Exception {
 		rsetControl = MockControl.createControl(ResultSet.class);
 		rset = (ResultSet) rsetControl.getMock();