[tests] Cleanup warnings on tests

src/test/java/badbeans/BeanWithNoGetterOverloadedSetters.java

@@ -17,12 +17,15 @@
 
 public class BeanWithNoGetterOverloadedSetters {
 
+  // bad bean with no getter on purpose
+  @SuppressWarnings("unused")
   private String value;
 
   public void setValue(String value) {
     this.value = value;
   }
 
+  // Duplicate is on purpose
   public void setValue(Integer value) {
     this.value = value.toString();
   }

src/test/java/com/ibatis/common/util/PaginatedArrayListTest.java

@@ -81,7 +81,7 @@ public void testOddPaginatedIterator() {
     assertEquals(false, oddPageList.isPreviousPageAvailable());
 
     int count = 0;
-    Iterator i = oddPageList.iterator();
+    Iterator<?> i = oddPageList.iterator();
     while (i.hasNext()) {
       i.next();
       count++;
@@ -151,7 +151,7 @@ public void testEvenPaginatedIterator() {
     assertEquals(false, evenPageList.isPreviousPageAvailable());
 
     int count = 0;
-    Iterator i = evenPageList.iterator();
+    Iterator<?> i = evenPageList.iterator();
     while (i.hasNext()) {
       i.next();
       count++;
@@ -214,7 +214,7 @@ public void testSmallPaginatedIterator() {
     assertEquals(false, smallPageList.isNextPageAvailable());
 
     int count = 0;
-    Iterator i = smallPageList.iterator();
+    Iterator<?> i = smallPageList.iterator();
     while (i.hasNext()) {
       i.next();
       count++;

src/test/java/com/ibatis/sqlmap/BaseSqlMapTest.java

@@ -97,7 +97,7 @@ protected void assertAccount2(Account account) {
     assertEquals(account.getEmailAddress(), "jim.smith@somewhere.com");
   }
 
-  protected void assertList(List list) {
+  protected void assertList(List<?> list) {
     assertEquals(2, list.size());
   }
 
@@ -122,7 +122,7 @@ protected void assertFieldAccount6(FieldAccount account) {
     assertNull(account.emailAddress());
   }
 
-  protected void assertAccount1(Map account) {
+  protected void assertAccount1(Map<?, ?> account) {
     Integer id = (Integer) account.get("id");
     String firstName = (String) account.get("firstName");
     String lastName = (String) account.get("lastName");
@@ -155,7 +155,7 @@ protected void assertOrder1(Order order) {
     assertEquals("C4B 4F4", order.getPostalCode());
   }
 
-  protected void assertOrder1(Map order) {
+  protected void assertOrder1(Map<?, ?> order) {
     Calendar cal = new GregorianCalendar(2003, 1, 15, 8, 15, 00);
 
     assertEquals(Integer.valueOf(1), order.get("id"));

src/test/java/com/ibatis/sqlmap/BatchTest.java

@@ -45,7 +45,7 @@ public void setUp() throws Exception {
 
   @Test
   public void testExecutebatchDetailed() {
-    List accountList1 = new ArrayList();
+    List<Account> accountList1 = new ArrayList<Account>();
     Account account = new Account();
     account.setId(10);
     account.setFirstName("fred");
@@ -81,7 +81,7 @@ public void testExecutebatchDetailed() {
     account.setEmailAddress("fred.flintstone@gmail.com");
     accountList1.add(account);
 
-    List accountList2 = new ArrayList();
+    List<Account> accountList2 = new ArrayList<Account>();
     account = new Account();
     account.setId(15);
     account.setFirstName("fred");
@@ -133,7 +133,7 @@ public void testExecutebatchDetailed() {
         sqlMap.insert("insertAccountViaInlineParameters", accountList2.get(i));
       }
 
-      List results = sqlMap.executeBatchDetailed();
+      List<?> results = sqlMap.executeBatchDetailed();
       sqlMap.commitTransaction();
 
       assertEquals(3, results.size());
@@ -162,7 +162,7 @@ public void testExecutebatchDetailed() {
 
   @Test
   public void testExecutebatchDetailedWithError() {
-    List accountList1 = new ArrayList();
+    List<Account> accountList1 = new ArrayList<Account>();
     Account account = new Account();
     account.setId(10);
     account.setFirstName("fred");
@@ -198,7 +198,7 @@ public void testExecutebatchDetailedWithError() {
     account.setEmailAddress("fred.flintstone@gmail.com");
     accountList1.add(account);
 
-    List accountList2 = new ArrayList();
+    List<Account> accountList2 = new ArrayList<Account>();
     account = new Account();
     account.setId(15);
     account.setFirstName("fred");
@@ -279,7 +279,7 @@ public void testExecutebatchDetailedWithError() {
       BatchUpdateException bue = e.getBatchUpdateException();
       assertEquals(1, bue.getUpdateCounts().length);
 
-      List results = e.getSuccessfulBatchResults();
+      List<?> results = e.getSuccessfulBatchResults();
       assertEquals(2, results.size());
       BatchResult br = (BatchResult) results.get(0);
       assertEquals(5, br.getUpdateCounts().length);
@@ -298,7 +298,7 @@ public void testExecutebatchDetailedWithError() {
 
   @Test
   public void testExecutebatch() {
-    List accountList1 = new ArrayList();
+    List<Account> accountList1 = new ArrayList<Account>();
     Account account = new Account();
     account.setId(10);
     account.setFirstName("fred");
@@ -334,7 +334,7 @@ public void testExecutebatch() {
     account.setEmailAddress("fred.flintstone@gmail.com");
     accountList1.add(account);
 
-    List accountList2 = new ArrayList();
+    List<Account> accountList2 = new ArrayList<Account>();
     account = new Account();
     account.setId(15);
     account.setFirstName("fred");

src/test/java/com/ibatis/sqlmap/CacheStatementTest.java

@@ -45,7 +45,7 @@ public void setUp() throws Exception {
 
   @Test
   public void testMappedStatementQueryWithCache() throws SQLException {
-    List list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
+    List<?> list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
 
     int firstId = System.identityHashCode(list);
 
@@ -70,7 +70,7 @@ public void testMappedStatementQueryWithCache() throws SQLException {
   @Test
   public void testMappedStatementQueryWithCache2() throws SQLException {
     // tests the new methods that don't require a parameter object
-    List list = sqlMap.queryForList("getCachedAccountsViaResultMap");
+    List<?> list = sqlMap.queryForList("getCachedAccountsViaResultMap");
 
     int firstId = System.identityHashCode(list);
 
@@ -94,7 +94,7 @@ public void testMappedStatementQueryWithCache2() throws SQLException {
 
   @Test
   public void testFlushDataCache() throws SQLException {
-    List list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
+    List<?> list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
     int firstId = System.identityHashCode(list);
     list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
     int secondId = System.identityHashCode(list);
@@ -108,7 +108,7 @@ public void testFlushDataCache() throws SQLException {
   @Test
   public void testFlushDataCache2() throws SQLException {
     // tests the new methods that don't require a parameter object
-    List list = sqlMap.queryForList("getCachedAccountsViaResultMap");
+    List<?> list = sqlMap.queryForList("getCachedAccountsViaResultMap");
     int firstId = System.identityHashCode(list);
     list = sqlMap.queryForList("getCachedAccountsViaResultMap");
     int secondId = System.identityHashCode(list);
@@ -121,7 +121,7 @@ public void testFlushDataCache2() throws SQLException {
 
   @Test
   public void testFlushDataCacheOnExecute() throws SQLException {
-    List list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
+    List<?> list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
     int firstId = System.identityHashCode(list);
     list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
     int secondId = System.identityHashCode(list);
@@ -135,7 +135,7 @@ public void testFlushDataCacheOnExecute() throws SQLException {
   @Test
   public void testFlushDataCacheOnExecute2() throws SQLException {
     // tests the new methods that don't require a parameter object
-    List list = sqlMap.queryForList("getCachedAccountsViaResultMap");
+    List<?> list = sqlMap.queryForList("getCachedAccountsViaResultMap");
     int firstId = System.identityHashCode(list);
     list = sqlMap.queryForList("getCachedAccountsViaResultMap");
     int secondId = System.identityHashCode(list);
@@ -148,7 +148,7 @@ public void testFlushDataCacheOnExecute2() throws SQLException {
 
   @Test
   public void testFlushDataCacheOnExecuteInBatch() throws SQLException {
-    List list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
+    List<?> list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
     int firstId = System.identityHashCode(list);
     list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
     int secondId = System.identityHashCode(list);
@@ -164,7 +164,7 @@ public void testFlushDataCacheOnExecuteInBatch() throws SQLException {
   @Test
   public void testFlushDataCacheOnExecuteInBatch2() throws SQLException {
     // tests the new methods that don't require a parameter object
-    List list = sqlMap.queryForList("getCachedAccountsViaResultMap");
+    List<?> list = sqlMap.queryForList("getCachedAccountsViaResultMap");
     int firstId = System.identityHashCode(list);
     list = sqlMap.queryForList("getCachedAccountsViaResultMap");
     int secondId = System.identityHashCode(list);
@@ -179,7 +179,7 @@ public void testFlushDataCacheOnExecuteInBatch2() throws SQLException {
 
   @Test
   public void testFlushDataCacheOnExecuteInBatchWithTx() throws SQLException {
-    List list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
+    List<?> list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
     int firstId = System.identityHashCode(list);
     list = sqlMap.queryForList("getCachedAccountsViaResultMap", null);
     int secondId = System.identityHashCode(list);
@@ -201,7 +201,7 @@ public void testFlushDataCacheOnExecuteInBatchWithTx() throws SQLException {
   @Test
   public void testMappedStatementQueryWithThreadedCache() throws SQLException {
 
-    Map results = new HashMap();
+    Map<String, Object> results = new HashMap<String, Object>();
 
     TestCacheThread.startThread(sqlMap, results, "getCachedAccountsViaResultMap");
     Integer firstId = (Integer) results.get("id");
@@ -211,7 +211,7 @@ public void testMappedStatementQueryWithThreadedCache() throws SQLException {
 
     assertTrue(firstId.equals(secondId));
 
-    List list = (List) results.get("list");
+    List<?> list = (List<?>) results.get("list");
 
     Account account = (Account) list.get(1);
     account.setEmailAddress("new.clinton@ibatis.com");
@@ -228,7 +228,7 @@ public void testMappedStatementQueryWithThreadedCache() throws SQLException {
   @Test
   public void testMappedStatementQueryWithThreadedReadWriteCache() throws SQLException {
 
-    Map results = new HashMap();
+    Map<String, Object> results = new HashMap<String, Object>();
 
     TestCacheThread.startThread(sqlMap, results, "getRWCachedAccountsViaResultMap");
     Integer firstId = (Integer) results.get("id");
@@ -238,7 +238,7 @@ public void testMappedStatementQueryWithThreadedReadWriteCache() throws SQLExcep
 
     assertFalse(firstId.equals(secondId));
 
-    List list = (List) results.get("list");
+    List<?> list = (List<?>) results.get("list");
 
     Account account = (Account) list.get(1);
     account.setEmailAddress("new.clinton@ibatis.com");
@@ -281,10 +281,10 @@ public void testCacheKeyWithTwoParamsSameHashcode() {
 
   private static class TestCacheThread extends Thread {
     private SqlMapClient sqlMap;
-    private Map results;
+    private Map<String, Object> results;
     private String statementName;
 
-    public TestCacheThread(SqlMapClient sqlMap, Map results, String statementName) {
+    public TestCacheThread(SqlMapClient sqlMap, Map<String, Object> results, String statementName) {
       this.sqlMap = sqlMap;
       this.results = results;
       this.statementName = statementName;
@@ -294,7 +294,7 @@ public TestCacheThread(SqlMapClient sqlMap, Map results, String statementName) {
     public void run() {
       try {
         SqlMapSession session = sqlMap.openSession();
-        List list = session.queryForList(statementName, null);
+        List<?> list = session.queryForList(statementName, null);
         int firstId = System.identityHashCode(list);
         list = session.queryForList(statementName, null);
         int secondId = System.identityHashCode(list);
@@ -307,7 +307,7 @@ public void run() {
       }
     }
 
-    public static void startThread(SqlMapClient sqlMap, Map results, String statementName) {
+    public static void startThread(SqlMapClient sqlMap, Map<String, Object> results, String statementName) {
       Thread t = new TestCacheThread(sqlMap, results, statementName);
       t.start();
       try {

src/test/java/com/ibatis/sqlmap/ComplexTypeTest.java

@@ -39,9 +39,9 @@ public void setUp() throws Exception {
 
   @Test
   public void testMapBeanMap() throws Exception {
-    Map map = new HashMap();
+    Map<String, ComplexBean> map = new HashMap<>();
     ComplexBean bean = new ComplexBean();
-    bean.setMap(new HashMap());
+    bean.setMap(new HashMap<String, Integer>());
     bean.getMap().put("id", Integer.valueOf(1));
     map.put("bean", bean);
 

src/test/java/com/ibatis/sqlmap/DiscriminatorTest.java

@@ -39,7 +39,7 @@ public void setUp() throws Exception {
   @Test
   public void testDiscriminator() throws Exception {
 
-    List list = sqlMap.queryForList("getDocuments", null);
+    List<?> list = sqlMap.queryForList("getDocuments", null);
     assertEquals(6, list.size());
 
     assertTrue(list.get(0) instanceof Book);
@@ -64,7 +64,7 @@ public void testDiscriminator() throws Exception {
 
   @Test
   public void testDiscriminatorInNestedResultMap() throws Exception {
-    List list = sqlMap.queryForList("getPersonDocuments");
+    List<?> list = sqlMap.queryForList("getPersonDocuments");
     assertEquals(3, list.size());
 
     assertTrue(((PersonDocument) list.get(0)).getFavoriteDocument() instanceof Magazine);
@@ -75,7 +75,7 @@ public void testDiscriminatorInNestedResultMap() throws Exception {
 
   @Test
   public void testDiscriminatorWithNestedResultMap() throws Exception {
-    List list = sqlMap.queryForList("getDocumentsWithAttributes");
+    List<?> list = sqlMap.queryForList("getDocumentsWithAttributes");
     assertEquals(6, list.size());
 
     assertTrue(list.get(0) instanceof Book);