You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by jg...@apache.org on 2007/02/06 18:23:45 UTC

svn commit: r504208 [4/5] - in /ibatis/trunk/java/mapper/mapper2/tools/abator/core: build/ test/org/apache/ibatis/abator/internal/util/ testJava5/abatortest/execute/conditional/java2/ testJava5/abatortest/execute/conditional/java5/ testJava5/abatortest...

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java2/HierarchicalJava2Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java2/HierarchicalJava2Tests.java?view=diff&rev=504208&r1=504207&r2=504208
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java2/HierarchicalJava2Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java2/HierarchicalJava2Tests.java Tue Feb  6 09:23:44 2007
@@ -70,9 +70,9 @@
 
         try {
             Fieldsonly record = new Fieldsonly();
-            record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
-            record.setIntegerfield(new Integer(5));
+            record.setDoublefield(11.22);
+            record.setFloatfield(33.44f);
+            record.setIntegerfield(5);
             dao.insert(record);
 
             FieldsonlyExample example = new FieldsonlyExample();
@@ -97,21 +97,21 @@
 
         try {
             Fieldsonly record = new Fieldsonly();
-            record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
-            record.setIntegerfield(new Integer(5));
+            record.setDoublefield(11.22);
+            record.setFloatfield(33.44f);
+            record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
-            record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
-            record.setIntegerfield(new Integer(8));
+            record.setDoublefield(44.55);
+            record.setFloatfield(66.77f);
+            record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
-            record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
-            record.setIntegerfield(new Integer(9));
+            record.setDoublefield(88.99);
+            record.setFloatfield(100.111f);
+            record.setIntegerfield(9);
             dao.insert(record);
 
             FieldsonlyExample example = new FieldsonlyExample();
@@ -133,21 +133,21 @@
 
         try {
             Fieldsonly record = new Fieldsonly();
-            record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
-            record.setIntegerfield(new Integer(5));
+            record.setDoublefield(11.22);
+            record.setFloatfield(33.44f);
+            record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
-            record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
-            record.setIntegerfield(new Integer(8));
+            record.setDoublefield(44.55);
+            record.setFloatfield(66.77f);
+            record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
-            record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
-            record.setIntegerfield(new Integer(9));
+            record.setDoublefield(88.99);
+            record.setFloatfield(100.111f);
+            record.setIntegerfield(9);
             dao.insert(record);
 
             FieldsonlyExample example = new FieldsonlyExample();
@@ -165,21 +165,21 @@
 
         try {
             Fieldsonly record = new Fieldsonly();
-            record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
-            record.setIntegerfield(new Integer(5));
+            record.setDoublefield(11.22);
+            record.setFloatfield(33.44f);
+            record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
-            record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
-            record.setIntegerfield(new Integer(8));
+            record.setDoublefield(44.55);
+            record.setFloatfield(66.77f);
+            record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
-            record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
-            record.setIntegerfield(new Integer(9));
+            record.setDoublefield(88.99);
+            record.setFloatfield(100.111f);
+            record.setIntegerfield(9);
             dao.insert(record);
 
             FieldsonlyExample example = new FieldsonlyExample();
@@ -201,8 +201,8 @@
 
         try {
             PkonlyKey key = new PkonlyKey();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -222,13 +222,13 @@
 
         try {
             PkonlyKey key = new PkonlyKey();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -236,8 +236,8 @@
             assertEquals(2, answer.size());
 
             key = new PkonlyKey();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             int rows = dao.deleteByPrimaryKey(key);
             assertEquals(1, rows);
 
@@ -253,18 +253,18 @@
 
         try {
             PkonlyKey key = new PkonlyKey();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(7));
-            key.setSeqNum(new Integer(8));
+            key.setId(7);
+            key.setSeqNum(8);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -285,18 +285,18 @@
 
         try {
             PkonlyKey key = new PkonlyKey();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(7));
-            key.setSeqNum(new Integer(8));
+            key.setId(7);
+            key.setSeqNum(8);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -313,18 +313,18 @@
 
         try {
             PkonlyKey key = new PkonlyKey();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(7));
-            key.setSeqNum(new Integer(8));
+            key.setId(7);
+            key.setSeqNum(8);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -342,13 +342,13 @@
         try {
             Pkfields record = new Pkfields();
             record.setDatefield(new Date());
-            record.setDecimal100field(new Long(10L));
+            record.setDecimal100field(10L);
             record.setDecimal155field(new BigDecimal("15.12345"));
-            record.setDecimal30field(new Short((short) 3));
-            record.setDecimal60field(new Integer(6));
+            record.setDecimal30field((short) 3);
+            record.setDecimal60field(6);
             record.setFirstname("Jeff");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             record.setLastname("Butler");
             record.setTimefield(new Date());
             record.setTimestampfield(new Date());
@@ -356,8 +356,8 @@
             dao.insert(record);
 
             PkfieldsKey key = new PkfieldsKey();
-            key.setId1(new Integer(1));
-            key.setId2(new Integer(2));
+            key.setId1(1);
+            key.setId2(2);
 
             Pkfields returnedRecord = dao.selectByPrimaryKey(key);
             assertNotNull(returnedRecord);
@@ -392,8 +392,8 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Jeff");
             record.setLastname("Smith");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
 
             dao.insert(record);
 
@@ -404,8 +404,8 @@
             assertEquals(1, rows);
 
             PkfieldsKey key = new PkfieldsKey();
-            key.setId1(new Integer(1));
-            key.setId2(new Integer(2));
+            key.setId1(1);
+            key.setId2(2);
 
             Pkfields record2 = dao.selectByPrimaryKey(key);
 
@@ -425,24 +425,24 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Jeff");
             record.setLastname("Smith");
-            record.setDecimal60field(new Integer(5));
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setDecimal60field(5);
+            record.setId1(1);
+            record.setId2(2);
 
             dao.insert(record);
 
             Pkfields newRecord = new Pkfields();
-            newRecord.setId1(new Integer(1));
-            newRecord.setId2(new Integer(2));
+            newRecord.setId1(1);
+            newRecord.setId2(2);
             newRecord.setFirstname("Scott");
-            newRecord.setDecimal60field(new Integer(4));
+            newRecord.setDecimal60field(4);
 
             int rows = dao.updateByPrimaryKeySelective(newRecord);
             assertEquals(1, rows);
 
             PkfieldsKey key = new PkfieldsKey();
-            key.setId1(new Integer(1));
-            key.setId2(new Integer(2));
+            key.setId1(1);
+            key.setId2(2);
 
             Pkfields returnedRecord = dao.selectByPrimaryKey(key);
 
@@ -477,14 +477,14 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Jeff");
             record.setLastname("Smith");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
 
             dao.insert(record);
 
             PkfieldsKey key = new PkfieldsKey();
-            key.setId1(new Integer(1));
-            key.setId2(new Integer(2));
+            key.setId1(1);
+            key.setId2(2);
 
             int rows = dao.deleteByPrimaryKey(key);
             assertEquals(1, rows);
@@ -504,15 +504,15 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Jeff");
             record.setLastname("Smith");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bob");
             record.setLastname("Jones");
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
 
             dao.insert(record);
 
@@ -540,20 +540,20 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Jeff");
             record.setLastname("Smith");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bob");
             record.setLastname("Jones");
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             dao.insert(record);
 
             PkfieldsKey key = new PkfieldsKey();
-            key.setId1(new Integer(3));
-            key.setId2(new Integer(4));
+            key.setId1(3);
+            key.setId2(4);
             Pkfields newRecord = dao.selectByPrimaryKey(key);
 
             assertNotNull(newRecord);
@@ -573,43 +573,43 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Fred");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(1));
+            record.setId1(1);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Wilma");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Pebbles");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(3));
+            record.setId1(1);
+            record.setId2(3);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Barney");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(1));
+            record.setId1(2);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Betty");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(2));
+            record.setId1(2);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bamm Bamm");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(3));
+            record.setId1(2);
+            record.setId2(3);
             dao.insert(record);
 
             PkfieldsExample example = new PkfieldsExample();
@@ -638,43 +638,43 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Fred");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(1));
+            record.setId1(1);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Wilma");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Pebbles");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(3));
+            record.setId1(1);
+            record.setId2(3);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Barney");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(1));
+            record.setId1(2);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Betty");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(2));
+            record.setId1(2);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bamm Bamm");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(3));
+            record.setId1(2);
+            record.setId2(3);
             dao.insert(record);
 
             PkfieldsExample example = new PkfieldsExample();
@@ -703,48 +703,47 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Fred");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(1));
+            record.setId1(1);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Wilma");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Pebbles");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(3));
+            record.setId1(1);
+            record.setId2(3);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Barney");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(1));
+            record.setId1(2);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Betty");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(2));
+            record.setId1(2);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bamm Bamm");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(3));
+            record.setId1(2);
+            record.setId2(3);
             dao.insert(record);
 
             PkfieldsExample example = new PkfieldsExample();
-            example.createCriteria().andFirstnameLike("B%").andId2EqualTo(
-                    new Integer(3));
+            example.createCriteria().andFirstnameLike("B%").andId2EqualTo(3);
             example.or(example.createCriteria().andFirstnameLike("Wi%"));
 
             example.setOrderByClause("ID1, ID2");
@@ -769,48 +768,48 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Fred");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(1));
+            record.setId1(1);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Wilma");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Pebbles");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(3));
+            record.setId1(1);
+            record.setId2(3);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Barney");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(1));
+            record.setId1(2);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Betty");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(2));
+            record.setId1(2);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bamm Bamm");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(3));
+            record.setId1(2);
+            record.setId2(3);
             dao.insert(record);
 
             List ids = new ArrayList();
-            ids.add(new Integer(1));
-            ids.add(new Integer(3));
+            ids.add(1);
+            ids.add(3);
 
             PkfieldsExample example = new PkfieldsExample();
             example.createCriteria().andId2In(ids);
@@ -842,48 +841,47 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Fred");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(1));
+            record.setId1(1);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Wilma");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Pebbles");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(3));
+            record.setId1(1);
+            record.setId2(3);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Barney");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(1));
+            record.setId1(2);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Betty");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(2));
+            record.setId1(2);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bamm Bamm");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(3));
+            record.setId1(2);
+            record.setId2(3);
             dao.insert(record);
 
             PkfieldsExample example = new PkfieldsExample();
-            example.createCriteria().andId2Between(new Integer(1),
-                    new Integer(3));
+            example.createCriteria().andId2Between(1, 3);
 
             example.setOrderByClause("ID1, ID2");
             List answer = dao.selectByExample(example);
@@ -900,43 +898,43 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Fred");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(1));
+            record.setId1(1);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Wilma");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Pebbles");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(3));
+            record.setId1(1);
+            record.setId2(3);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Barney");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(1));
+            record.setId1(2);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Betty");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(2));
+            record.setId1(2);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bamm Bamm");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(3));
+            record.setId1(2);
+            record.setId2(3);
             dao.insert(record);
 
             PkfieldsExample example = new PkfieldsExample();
@@ -1023,7 +1021,7 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1048,20 +1046,20 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             int rows = dao.updateByPrimaryKey(record);
             assertEquals(1, rows);
 
             PkblobsKey key = new PkblobsKey();
-            key.setId(new Integer(3));
+            key.setId(3);
 
             PkblobsWithBLOBs newRecord = dao.selectByPrimaryKey(key);
 
@@ -1079,18 +1077,18 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             PkblobsWithBLOBs newRecord = new PkblobsWithBLOBs();
-            newRecord.setId(new Integer(3));
+            newRecord.setId(3);
             newRecord.setBlob2(generateRandomBlob());
             dao.updateByPrimaryKeySelective(newRecord);
 
             PkblobsKey key = new PkblobsKey();
-            key.setId(new Integer(3));
+            key.setId(3);
 
             PkblobsWithBLOBs returnedRecord = dao.selectByPrimaryKey(key);
             assertNotNull(returnedRecord);
@@ -1109,7 +1107,7 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1119,7 +1117,7 @@
             assertEquals(1, answer.size());
 
             PkblobsKey key = new PkblobsKey();
-            key.setId(new Integer(3));
+            key.setId(3);
             int rows = dao.deleteByPrimaryKey(key);
             assertEquals(1, rows);
 
@@ -1136,13 +1134,13 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new PkblobsWithBLOBs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1169,19 +1167,19 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new PkblobsWithBLOBs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             PkblobsKey key = new PkblobsKey();
-            key.setId(new Integer(6));
+            key.setId(6);
             PkblobsWithBLOBs newRecord = dao.selectByPrimaryKey(key);
             assertNotNull(newRecord);
             assertEquals(record.getId(), newRecord.getId());
@@ -1197,13 +1195,13 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new PkblobsWithBLOBs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1227,13 +1225,13 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new PkblobsWithBLOBs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1253,13 +1251,13 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new PkblobsWithBLOBs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1284,8 +1282,8 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
@@ -1313,16 +1311,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             PkfieldsblobsWithBLOBs updateRecord = new PkfieldsblobsWithBLOBs();
-            updateRecord.setId1(new Integer(3));
-            updateRecord.setId2(new Integer(4));
+            updateRecord.setId1(3);
+            updateRecord.setId2(4);
             updateRecord.setFirstname("Scott");
             updateRecord.setLastname("Jones");
             updateRecord.setBlob1(generateRandomBlob());
@@ -1331,8 +1329,8 @@
             assertEquals(1, rows);
 
             PkfieldsblobsKey key = new PkfieldsblobsKey();
-            key.setId1(new Integer(3));
-            key.setId2(new Integer(4));
+            key.setId1(3);
+            key.setId2(4);
             PkfieldsblobsWithBLOBs newRecord = dao.selectByPrimaryKey(key);
             assertEquals(updateRecord.getFirstname(), newRecord.getFirstname());
             assertEquals(updateRecord.getLastname(), newRecord.getLastname());
@@ -1350,16 +1348,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             Pkfieldsblobs updateRecord = new Pkfieldsblobs();
-            updateRecord.setId1(new Integer(3));
-            updateRecord.setId2(new Integer(4));
+            updateRecord.setId1(3);
+            updateRecord.setId2(4);
             updateRecord.setFirstname("Scott");
             updateRecord.setLastname("Jones");
 
@@ -1367,8 +1365,8 @@
             assertEquals(1, rows);
 
             PkfieldsblobsKey key = new PkfieldsblobsKey();
-            key.setId1(new Integer(3));
-            key.setId2(new Integer(4));
+            key.setId1(3);
+            key.setId2(4);
             PkfieldsblobsWithBLOBs newRecord = dao.selectByPrimaryKey(key);
             assertEquals(updateRecord.getFirstname(), newRecord.getFirstname());
             assertEquals(updateRecord.getLastname(), newRecord.getLastname());
@@ -1385,24 +1383,24 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             PkfieldsblobsWithBLOBs updateRecord = new PkfieldsblobsWithBLOBs();
-            updateRecord.setId1(new Integer(3));
-            updateRecord.setId2(new Integer(4));
+            updateRecord.setId1(3);
+            updateRecord.setId2(4);
             updateRecord.setLastname("Jones");
 
             int rows = dao.updateByPrimaryKeySelective(updateRecord);
             assertEquals(1, rows);
 
             PkfieldsblobsKey key = new PkfieldsblobsKey();
-            key.setId1(new Integer(3));
-            key.setId2(new Integer(4));
+            key.setId1(3);
+            key.setId2(4);
             PkfieldsblobsWithBLOBs returnedRecord = dao.selectByPrimaryKey(key);
             assertEquals(record.getFirstname(), returnedRecord.getFirstname());
             assertEquals(updateRecord.getLastname(), returnedRecord
@@ -1421,16 +1419,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(5));
-            record.setId2(new Integer(6));
+            record.setId1(5);
+            record.setId2(6);
             record.setFirstname("Scott");
             record.setLastname("Jones");
             record.setBlob1(generateRandomBlob());
@@ -1441,8 +1439,8 @@
             assertEquals(2, answer.size());
 
             PkfieldsblobsKey key = new PkfieldsblobsKey();
-            key.setId1(new Integer(5));
-            key.setId2(new Integer(6));
+            key.setId1(5);
+            key.setId2(6);
             int rows = dao.deleteByPrimaryKey(key);
             assertEquals(1, rows);
 
@@ -1459,16 +1457,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(5));
-            record.setId2(new Integer(6));
+            record.setId1(5);
+            record.setId2(6);
             record.setFirstname("Scott");
             record.setLastname("Jones");
             record.setBlob1(generateRandomBlob());
@@ -1496,16 +1494,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(5));
-            record.setId2(new Integer(6));
+            record.setId1(5);
+            record.setId2(6);
             record.setFirstname("Scott");
             record.setLastname("Jones");
             record.setBlob1(generateRandomBlob());
@@ -1516,8 +1514,8 @@
             assertEquals(2, answer.size());
 
             PkfieldsblobsKey key = new PkfieldsblobsKey();
-            key.setId1(new Integer(5));
-            key.setId2(new Integer(6));
+            key.setId1(5);
+            key.setId2(6);
             PkfieldsblobsWithBLOBs newRecord = dao.selectByPrimaryKey(key);
             assertEquals(record.getId1(), newRecord.getId1());
             assertEquals(record.getId2(), newRecord.getId2());
@@ -1534,16 +1532,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(5));
-            record.setId2(new Integer(6));
+            record.setId1(5);
+            record.setId2(6);
             record.setFirstname("Scott");
             record.setLastname("Jones");
             record.setBlob1(generateRandomBlob());
@@ -1570,16 +1568,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(5));
-            record.setId2(new Integer(6));
+            record.setId1(5);
+            record.setId2(6);
             record.setFirstname("Scott");
             record.setLastname("Jones");
             record.setBlob1(generateRandomBlob());
@@ -1607,16 +1605,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(5));
-            record.setId2(new Integer(6));
+            record.setId1(5);
+            record.setId2(6);
             record.setFirstname("Scott");
             record.setLastname("Jones");
             record.setBlob1(generateRandomBlob());

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java5/HierarchicalJava5Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java5/HierarchicalJava5Tests.java?view=diff&rev=504208&r1=504207&r2=504208
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java5/HierarchicalJava5Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java5/HierarchicalJava5Tests.java Tue Feb  6 09:23:44 2007
@@ -70,9 +70,9 @@
 
         try {
             Fieldsonly record = new Fieldsonly();
-            record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
-            record.setIntegerfield(new Integer(5));
+            record.setDoublefield(11.22);
+            record.setFloatfield(33.44f);
+            record.setIntegerfield(5);
             dao.insert(record);
 
             FieldsonlyExample example = new FieldsonlyExample();
@@ -97,21 +97,21 @@
 
         try {
             Fieldsonly record = new Fieldsonly();
-            record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
-            record.setIntegerfield(new Integer(5));
+            record.setDoublefield(11.22);
+            record.setFloatfield(33.44f);
+            record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
-            record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
-            record.setIntegerfield(new Integer(8));
+            record.setDoublefield(44.55);
+            record.setFloatfield(66.77f);
+            record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
-            record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
-            record.setIntegerfield(new Integer(9));
+            record.setDoublefield(88.99);
+            record.setFloatfield(100.111f);
+            record.setIntegerfield(9);
             dao.insert(record);
 
             FieldsonlyExample example = new FieldsonlyExample();
@@ -133,21 +133,21 @@
 
         try {
             Fieldsonly record = new Fieldsonly();
-            record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
-            record.setIntegerfield(new Integer(5));
+            record.setDoublefield(11.22);
+            record.setFloatfield(33.44f);
+            record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
-            record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
-            record.setIntegerfield(new Integer(8));
+            record.setDoublefield(44.55);
+            record.setFloatfield(66.77f);
+            record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
-            record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
-            record.setIntegerfield(new Integer(9));
+            record.setDoublefield(88.99);
+            record.setFloatfield(100.111f);
+            record.setIntegerfield(9);
             dao.insert(record);
 
             FieldsonlyExample example = new FieldsonlyExample();
@@ -165,21 +165,21 @@
 
         try {
             Fieldsonly record = new Fieldsonly();
-            record.setDoublefield(new Double(11.22));
-            record.setFloatfield(new Float(33.44));
-            record.setIntegerfield(new Integer(5));
+            record.setDoublefield(11.22);
+            record.setFloatfield(33.44f);
+            record.setIntegerfield(5);
             dao.insert(record);
 
             record = new Fieldsonly();
-            record.setDoublefield(new Double(44.55));
-            record.setFloatfield(new Float(66.77));
-            record.setIntegerfield(new Integer(8));
+            record.setDoublefield(44.55);
+            record.setFloatfield(66.77f);
+            record.setIntegerfield(8);
             dao.insert(record);
 
             record = new Fieldsonly();
-            record.setDoublefield(new Double(88.99));
-            record.setFloatfield(new Float(100.111));
-            record.setIntegerfield(new Integer(9));
+            record.setDoublefield(88.99);
+            record.setFloatfield(100.111f);
+            record.setIntegerfield(9);
             dao.insert(record);
 
             FieldsonlyExample example = new FieldsonlyExample();
@@ -201,8 +201,8 @@
 
         try {
             PkonlyKey key = new PkonlyKey();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -222,13 +222,13 @@
 
         try {
             PkonlyKey key = new PkonlyKey();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -236,8 +236,8 @@
             assertEquals(2, answer.size());
 
             key = new PkonlyKey();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             int rows = dao.deleteByPrimaryKey(key);
             assertEquals(1, rows);
 
@@ -253,18 +253,18 @@
 
         try {
             PkonlyKey key = new PkonlyKey();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(7));
-            key.setSeqNum(new Integer(8));
+            key.setId(7);
+            key.setSeqNum(8);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -285,18 +285,18 @@
 
         try {
             PkonlyKey key = new PkonlyKey();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(7));
-            key.setSeqNum(new Integer(8));
+            key.setId(7);
+            key.setSeqNum(8);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -313,18 +313,18 @@
 
         try {
             PkonlyKey key = new PkonlyKey();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             dao.insert(key);
 
             key = new PkonlyKey();
-            key.setId(new Integer(7));
-            key.setSeqNum(new Integer(8));
+            key.setId(7);
+            key.setSeqNum(8);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -342,13 +342,13 @@
         try {
             Pkfields record = new Pkfields();
             record.setDatefield(new Date());
-            record.setDecimal100field(new Long(10L));
+            record.setDecimal100field(10L);
             record.setDecimal155field(new BigDecimal("15.12345"));
-            record.setDecimal30field(new Short((short) 3));
-            record.setDecimal60field(new Integer(6));
+            record.setDecimal30field((short) 3);
+            record.setDecimal60field(6);
             record.setFirstname("Jeff");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             record.setLastname("Butler");
             record.setTimefield(new Date());
             record.setTimestampfield(new Date());
@@ -356,8 +356,8 @@
             dao.insert(record);
 
             PkfieldsKey key = new PkfieldsKey();
-            key.setId1(new Integer(1));
-            key.setId2(new Integer(2));
+            key.setId1(1);
+            key.setId2(2);
 
             Pkfields returnedRecord = dao.selectByPrimaryKey(key);
             assertNotNull(returnedRecord);
@@ -392,8 +392,8 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Jeff");
             record.setLastname("Smith");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
 
             dao.insert(record);
 
@@ -404,8 +404,8 @@
             assertEquals(1, rows);
 
             PkfieldsKey key = new PkfieldsKey();
-            key.setId1(new Integer(1));
-            key.setId2(new Integer(2));
+            key.setId1(1);
+            key.setId2(2);
 
             Pkfields record2 = dao.selectByPrimaryKey(key);
 
@@ -425,24 +425,24 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Jeff");
             record.setLastname("Smith");
-            record.setDecimal60field(new Integer(5));
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setDecimal60field(5);
+            record.setId1(1);
+            record.setId2(2);
 
             dao.insert(record);
 
             Pkfields newRecord = new Pkfields();
-            newRecord.setId1(new Integer(1));
-            newRecord.setId2(new Integer(2));
+            newRecord.setId1(1);
+            newRecord.setId2(2);
             newRecord.setFirstname("Scott");
-            newRecord.setDecimal60field(new Integer(4));
+            newRecord.setDecimal60field(4);
 
             int rows = dao.updateByPrimaryKeySelective(newRecord);
             assertEquals(1, rows);
 
             PkfieldsKey key = new PkfieldsKey();
-            key.setId1(new Integer(1));
-            key.setId2(new Integer(2));
+            key.setId1(1);
+            key.setId2(2);
 
             Pkfields returnedRecord = dao.selectByPrimaryKey(key);
 
@@ -477,14 +477,14 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Jeff");
             record.setLastname("Smith");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
 
             dao.insert(record);
 
             PkfieldsKey key = new PkfieldsKey();
-            key.setId1(new Integer(1));
-            key.setId2(new Integer(2));
+            key.setId1(1);
+            key.setId2(2);
 
             int rows = dao.deleteByPrimaryKey(key);
             assertEquals(1, rows);
@@ -504,15 +504,15 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Jeff");
             record.setLastname("Smith");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bob");
             record.setLastname("Jones");
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
 
             dao.insert(record);
 
@@ -540,20 +540,20 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Jeff");
             record.setLastname("Smith");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bob");
             record.setLastname("Jones");
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             dao.insert(record);
 
             PkfieldsKey key = new PkfieldsKey();
-            key.setId1(new Integer(3));
-            key.setId2(new Integer(4));
+            key.setId1(3);
+            key.setId2(4);
             Pkfields newRecord = dao.selectByPrimaryKey(key);
 
             assertNotNull(newRecord);
@@ -573,43 +573,43 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Fred");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(1));
+            record.setId1(1);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Wilma");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Pebbles");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(3));
+            record.setId1(1);
+            record.setId2(3);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Barney");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(1));
+            record.setId1(2);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Betty");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(2));
+            record.setId1(2);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bamm Bamm");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(3));
+            record.setId1(2);
+            record.setId2(3);
             dao.insert(record);
 
             PkfieldsExample example = new PkfieldsExample();
@@ -638,43 +638,43 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Fred");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(1));
+            record.setId1(1);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Wilma");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Pebbles");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(3));
+            record.setId1(1);
+            record.setId2(3);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Barney");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(1));
+            record.setId1(2);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Betty");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(2));
+            record.setId1(2);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bamm Bamm");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(3));
+            record.setId1(2);
+            record.setId2(3);
             dao.insert(record);
 
             PkfieldsExample example = new PkfieldsExample();
@@ -703,48 +703,47 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Fred");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(1));
+            record.setId1(1);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Wilma");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Pebbles");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(3));
+            record.setId1(1);
+            record.setId2(3);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Barney");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(1));
+            record.setId1(2);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Betty");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(2));
+            record.setId1(2);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bamm Bamm");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(3));
+            record.setId1(2);
+            record.setId2(3);
             dao.insert(record);
 
             PkfieldsExample example = new PkfieldsExample();
-            example.createCriteria().andFirstnameLike("B%").andId2EqualTo(
-                    new Integer(3));
+            example.createCriteria().andFirstnameLike("B%").andId2EqualTo(3);
             example.or(example.createCriteria().andFirstnameLike("Wi%"));
 
             example.setOrderByClause("ID1, ID2");
@@ -769,48 +768,48 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Fred");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(1));
+            record.setId1(1);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Wilma");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Pebbles");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(3));
+            record.setId1(1);
+            record.setId2(3);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Barney");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(1));
+            record.setId1(2);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Betty");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(2));
+            record.setId1(2);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bamm Bamm");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(3));
+            record.setId1(2);
+            record.setId2(3);
             dao.insert(record);
 
             List ids = new ArrayList();
-            ids.add(new Integer(1));
-            ids.add(new Integer(3));
+            ids.add(1);
+            ids.add(3);
 
             PkfieldsExample example = new PkfieldsExample();
             example.createCriteria().andId2In(ids);
@@ -842,48 +841,47 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Fred");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(1));
+            record.setId1(1);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Wilma");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Pebbles");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(3));
+            record.setId1(1);
+            record.setId2(3);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Barney");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(1));
+            record.setId1(2);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Betty");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(2));
+            record.setId1(2);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bamm Bamm");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(3));
+            record.setId1(2);
+            record.setId2(3);
             dao.insert(record);
 
             PkfieldsExample example = new PkfieldsExample();
-            example.createCriteria().andId2Between(new Integer(1),
-                    new Integer(3));
+            example.createCriteria().andId2Between(1, 3);
 
             example.setOrderByClause("ID1, ID2");
             List answer = dao.selectByExample(example);
@@ -900,43 +898,43 @@
             Pkfields record = new Pkfields();
             record.setFirstname("Fred");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(1));
+            record.setId1(1);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Wilma");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(2));
+            record.setId1(1);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Pebbles");
             record.setLastname("Flintstone");
-            record.setId1(new Integer(1));
-            record.setId2(new Integer(3));
+            record.setId1(1);
+            record.setId2(3);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Barney");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(1));
+            record.setId1(2);
+            record.setId2(1);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Betty");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(2));
+            record.setId1(2);
+            record.setId2(2);
             dao.insert(record);
 
             record = new Pkfields();
             record.setFirstname("Bamm Bamm");
             record.setLastname("Rubble");
-            record.setId1(new Integer(2));
-            record.setId2(new Integer(3));
+            record.setId1(2);
+            record.setId2(3);
             dao.insert(record);
 
             PkfieldsExample example = new PkfieldsExample();
@@ -1023,7 +1021,7 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1049,20 +1047,20 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             int rows = dao.updateByPrimaryKey(record);
             assertEquals(1, rows);
 
             PkblobsKey key = new PkblobsKey();
-            key.setId(new Integer(3));
+            key.setId(3);
 
             PkblobsWithBLOBs newRecord = dao.selectByPrimaryKey(key);
 
@@ -1080,18 +1078,18 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             PkblobsWithBLOBs newRecord = new PkblobsWithBLOBs();
-            newRecord.setId(new Integer(3));
+            newRecord.setId(3);
             newRecord.setBlob2(generateRandomBlob());
             dao.updateByPrimaryKeySelective(newRecord);
 
             PkblobsKey key = new PkblobsKey();
-            key.setId(new Integer(3));
+            key.setId(3);
 
             PkblobsWithBLOBs returnedRecord = dao.selectByPrimaryKey(key);
             assertNotNull(returnedRecord);
@@ -1110,7 +1108,7 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1120,7 +1118,7 @@
             assertEquals(1, answer.size());
 
             PkblobsKey key = new PkblobsKey();
-            key.setId(new Integer(3));
+            key.setId(3);
             int rows = dao.deleteByPrimaryKey(key);
             assertEquals(1, rows);
 
@@ -1137,13 +1135,13 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new PkblobsWithBLOBs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1170,19 +1168,19 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new PkblobsWithBLOBs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             PkblobsKey key = new PkblobsKey();
-            key.setId(new Integer(6));
+            key.setId(6);
             PkblobsWithBLOBs newRecord = dao.selectByPrimaryKey(key);
             assertNotNull(newRecord);
             assertEquals(record.getId(), newRecord.getId());
@@ -1198,13 +1196,13 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new PkblobsWithBLOBs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1228,13 +1226,13 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new PkblobsWithBLOBs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1254,13 +1252,13 @@
 
         try {
             PkblobsWithBLOBs record = new PkblobsWithBLOBs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new PkblobsWithBLOBs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1286,8 +1284,8 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
@@ -1315,16 +1313,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             PkfieldsblobsWithBLOBs updateRecord = new PkfieldsblobsWithBLOBs();
-            updateRecord.setId1(new Integer(3));
-            updateRecord.setId2(new Integer(4));
+            updateRecord.setId1(3);
+            updateRecord.setId2(4);
             updateRecord.setFirstname("Scott");
             updateRecord.setLastname("Jones");
             updateRecord.setBlob1(generateRandomBlob());
@@ -1333,8 +1331,8 @@
             assertEquals(1, rows);
 
             PkfieldsblobsKey key = new PkfieldsblobsKey();
-            key.setId1(new Integer(3));
-            key.setId2(new Integer(4));
+            key.setId1(3);
+            key.setId2(4);
             PkfieldsblobsWithBLOBs newRecord = dao.selectByPrimaryKey(key);
             assertEquals(updateRecord.getFirstname(), newRecord.getFirstname());
             assertEquals(updateRecord.getLastname(), newRecord.getLastname());
@@ -1352,16 +1350,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             Pkfieldsblobs updateRecord = new Pkfieldsblobs();
-            updateRecord.setId1(new Integer(3));
-            updateRecord.setId2(new Integer(4));
+            updateRecord.setId1(3);
+            updateRecord.setId2(4);
             updateRecord.setFirstname("Scott");
             updateRecord.setLastname("Jones");
 
@@ -1369,8 +1367,8 @@
             assertEquals(1, rows);
 
             PkfieldsblobsKey key = new PkfieldsblobsKey();
-            key.setId1(new Integer(3));
-            key.setId2(new Integer(4));
+            key.setId1(3);
+            key.setId2(4);
             PkfieldsblobsWithBLOBs newRecord = dao.selectByPrimaryKey(key);
             assertEquals(updateRecord.getFirstname(), newRecord.getFirstname());
             assertEquals(updateRecord.getLastname(), newRecord.getLastname());
@@ -1387,24 +1385,24 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             PkfieldsblobsWithBLOBs updateRecord = new PkfieldsblobsWithBLOBs();
-            updateRecord.setId1(new Integer(3));
-            updateRecord.setId2(new Integer(4));
+            updateRecord.setId1(3);
+            updateRecord.setId2(4);
             updateRecord.setLastname("Jones");
 
             int rows = dao.updateByPrimaryKeySelective(updateRecord);
             assertEquals(1, rows);
 
             PkfieldsblobsKey key = new PkfieldsblobsKey();
-            key.setId1(new Integer(3));
-            key.setId2(new Integer(4));
+            key.setId1(3);
+            key.setId2(4);
             PkfieldsblobsWithBLOBs returnedRecord = dao.selectByPrimaryKey(key);
             assertEquals(record.getFirstname(), returnedRecord.getFirstname());
             assertEquals(updateRecord.getLastname(), returnedRecord
@@ -1423,16 +1421,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(5));
-            record.setId2(new Integer(6));
+            record.setId1(5);
+            record.setId2(6);
             record.setFirstname("Scott");
             record.setLastname("Jones");
             record.setBlob1(generateRandomBlob());
@@ -1444,8 +1442,8 @@
             assertEquals(2, answer.size());
 
             PkfieldsblobsKey key = new PkfieldsblobsKey();
-            key.setId1(new Integer(5));
-            key.setId2(new Integer(6));
+            key.setId1(5);
+            key.setId2(6);
             int rows = dao.deleteByPrimaryKey(key);
             assertEquals(1, rows);
 
@@ -1462,16 +1460,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(5));
-            record.setId2(new Integer(6));
+            record.setId1(5);
+            record.setId2(6);
             record.setFirstname("Scott");
             record.setLastname("Jones");
             record.setBlob1(generateRandomBlob());
@@ -1500,16 +1498,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(5));
-            record.setId2(new Integer(6));
+            record.setId1(5);
+            record.setId2(6);
             record.setFirstname("Scott");
             record.setLastname("Jones");
             record.setBlob1(generateRandomBlob());
@@ -1521,8 +1519,8 @@
             assertEquals(2, answer.size());
 
             PkfieldsblobsKey key = new PkfieldsblobsKey();
-            key.setId1(new Integer(5));
-            key.setId2(new Integer(6));
+            key.setId1(5);
+            key.setId2(6);
             PkfieldsblobsWithBLOBs newRecord = dao.selectByPrimaryKey(key);
             assertEquals(record.getId1(), newRecord.getId1());
             assertEquals(record.getId2(), newRecord.getId2());
@@ -1539,16 +1537,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(5));
-            record.setId2(new Integer(6));
+            record.setId1(5);
+            record.setId2(6);
             record.setFirstname("Scott");
             record.setLastname("Jones");
             record.setBlob1(generateRandomBlob());
@@ -1576,16 +1574,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(5));
-            record.setId2(new Integer(6));
+            record.setId1(5);
+            record.setId2(6);
             record.setFirstname("Scott");
             record.setLastname("Jones");
             record.setBlob1(generateRandomBlob());
@@ -1613,16 +1611,16 @@
 
         try {
             PkfieldsblobsWithBLOBs record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(3));
-            record.setId2(new Integer(4));
+            record.setId1(3);
+            record.setId2(4);
             record.setFirstname("Jeff");
             record.setLastname("Smith");
             record.setBlob1(generateRandomBlob());
             dao.insert(record);
 
             record = new PkfieldsblobsWithBLOBs();
-            record.setId1(new Integer(5));
-            record.setId2(new Integer(6));
+            record.setId1(5);
+            record.setId2(6);
             record.setFirstname("Scott");
             record.setLastname("Jones");
             record.setBlob1(generateRandomBlob());