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 [2/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/conditional/legacy/ConditionalLegacyTests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/legacy/ConditionalLegacyTests.java?view=diff&rev=504208&r1=504207&r2=504208
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/legacy/ConditionalLegacyTests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/legacy/ConditionalLegacyTests.java Tue Feb  6 09:23:44 2007
@@ -67,13 +67,13 @@
 
         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();
-            example.setIntegerfield(new Integer(5));
+            example.setIntegerfield(5);
             example.setIntegerfield_Indicator(FieldsonlyExample.EXAMPLE_EQUALS);
 
             List answer = dao.selectByExample(example);
@@ -95,25 +95,25 @@
 
         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();
-            example.setIntegerfield(new Integer(5));
+            example.setIntegerfield(5);
             example
                     .setIntegerfield_Indicator(FieldsonlyExample.EXAMPLE_GREATER_THAN);
 
@@ -133,25 +133,25 @@
 
         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();
-            example.setIntegerfield(new Integer(5));
+            example.setIntegerfield(5);
             example
                     .setIntegerfield_Indicator(FieldsonlyExample.EXAMPLE_GREATER_THAN);
 
@@ -171,8 +171,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();
@@ -192,13 +192,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();
@@ -206,8 +206,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);
 
@@ -223,18 +223,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();
@@ -256,18 +256,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();
@@ -286,13 +286,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());
@@ -300,8 +300,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);
@@ -336,8 +336,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);
 
@@ -348,8 +348,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);
 
@@ -369,24 +369,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);
 
@@ -421,14 +421,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);
@@ -448,15 +448,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);
 
@@ -485,20 +485,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);
@@ -518,21 +518,21 @@
             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);
 
             PkfieldsExample example = new PkfieldsExample();
-            example.setId1(new Integer(3));
+            example.setId1(3);
             example.setId1_Indicator(PkfieldsExample.EXAMPLE_EQUALS);
-            example.setId2(new Integer(4));
+            example.setId2(4);
             example.setId2_Indicator(PkfieldsExample.EXAMPLE_EQUALS);
 
             List answer = dao.selectByExample(example);
@@ -619,7 +619,7 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -644,19 +644,19 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             int rows = dao.updateByPrimaryKey(record);
             assertEquals(1, rows);
 
-            Pkblobs newRecord = dao.selectByPrimaryKey(new Integer(3));
+            Pkblobs newRecord = dao.selectByPrimaryKey(3);
 
             assertNotNull(newRecord);
             assertEquals(record.getId(), newRecord.getId());
@@ -672,17 +672,17 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             Pkblobs newRecord = new Pkblobs();
-            newRecord.setId(new Integer(3));
+            newRecord.setId(3);
             newRecord.setBlob2(generateRandomBlob());
             dao.updateByPrimaryKeySelective(newRecord);
 
-            Pkblobs returnedRecord = dao.selectByPrimaryKey(new Integer(3));
+            Pkblobs returnedRecord = dao.selectByPrimaryKey(3);
             assertNotNull(returnedRecord);
             assertEquals(record.getId(), returnedRecord.getId());
             assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord
@@ -699,7 +699,7 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -708,7 +708,7 @@
             List answer = dao.selectByExampleWithoutBLOBs(example);
             assertEquals(1, answer.size());
 
-            int rows = dao.deleteByPrimaryKey(new Integer(3));
+            int rows = dao.deleteByPrimaryKey(3);
             assertEquals(1, rows);
 
             example = new PkblobsExample();
@@ -724,13 +724,13 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new Pkblobs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -740,7 +740,7 @@
             assertEquals(2, answer.size());
 
             example = new PkblobsExample();
-            example.setId(new Integer(4));
+            example.setId(4);
             example.setId_Indicator(PkblobsExample.EXAMPLE_LESS_THAN);
             int rows = dao.deleteByExample(example);
             assertEquals(1, rows);
@@ -758,18 +758,18 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new Pkblobs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
-            Pkblobs newRecord = dao.selectByPrimaryKey(new Integer(6));
+            Pkblobs newRecord = dao.selectByPrimaryKey(6);
             assertNotNull(newRecord);
             assertEquals(record.getId(), newRecord.getId());
             assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1()));
@@ -784,19 +784,19 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new Pkblobs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             PkblobsExample example = new PkblobsExample();
-            example.setId(new Integer(4));
+            example.setId(4);
             example.setId_Indicator(PkblobsExample.EXAMPLE_GREATER_THAN);
             List answer = dao.selectByExampleWithoutBLOBs(example);
 
@@ -816,19 +816,19 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new Pkblobs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             PkblobsExample example = new PkblobsExample();
-            example.setId(new Integer(4));
+            example.setId(4);
             example.setId_Indicator(PkblobsExample.EXAMPLE_GREATER_THAN);
             List answer = dao.selectByExampleWithBLOBs(example);
 
@@ -848,8 +848,8 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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());
@@ -876,16 +876,16 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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");
             updateRecord.setBlob1(generateRandomBlob());
@@ -894,8 +894,8 @@
             assertEquals(1, rows);
 
             PkfieldsblobsKey key = new PkfieldsblobsKey();
-            key.setId1(new Integer(3));
-            key.setId2(new Integer(4));
+            key.setId1(3);
+            key.setId2(4);
             Pkfieldsblobs newRecord = dao.selectByPrimaryKey(key);
             assertEquals(updateRecord.getFirstname(), newRecord.getFirstname());
             assertEquals(updateRecord.getLastname(), newRecord.getLastname());
@@ -913,16 +913,16 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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");
 
@@ -930,8 +930,8 @@
             assertEquals(1, rows);
 
             PkfieldsblobsKey key = new PkfieldsblobsKey();
-            key.setId1(new Integer(3));
-            key.setId2(new Integer(4));
+            key.setId1(3);
+            key.setId2(4);
             Pkfieldsblobs newRecord = dao.selectByPrimaryKey(key);
             assertEquals(updateRecord.getFirstname(), newRecord.getFirstname());
             assertEquals(updateRecord.getLastname(), newRecord.getLastname());
@@ -948,24 +948,24 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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.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);
             Pkfieldsblobs returnedRecord = dao.selectByPrimaryKey(key);
             assertEquals(record.getFirstname(), returnedRecord.getFirstname());
             assertEquals(updateRecord.getLastname(), returnedRecord
@@ -984,16 +984,16 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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 Pkfieldsblobs();
-            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());
@@ -1004,8 +1004,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);
 
@@ -1022,16 +1022,16 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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 Pkfieldsblobs();
-            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());
@@ -1042,7 +1042,7 @@
             assertEquals(2, answer.size());
 
             example = new PkfieldsblobsExample();
-            example.setId1(new Integer(3));
+            example.setId1(3);
             example.setId1_Indicator(PkfieldsblobsExample.EXAMPLE_NOT_EQUALS);
             int rows = dao.deleteByExample(example);
             assertEquals(1, rows);
@@ -1060,16 +1060,16 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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 Pkfieldsblobs();
-            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());
@@ -1080,8 +1080,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);
             Pkfieldsblobs newRecord = dao.selectByPrimaryKey(key);
             assertEquals(record.getId1(), newRecord.getId1());
             assertEquals(record.getId2(), newRecord.getId2());
@@ -1098,23 +1098,23 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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 Pkfieldsblobs();
-            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());
             dao.insert(record);
 
             PkfieldsblobsExample example = new PkfieldsblobsExample();
-            example.setId2(new Integer(6));
+            example.setId2(6);
             example.setId2_Indicator(PkfieldsblobsExample.EXAMPLE_EQUALS);
             List answer = dao.selectByExampleWithoutBLOBs(example);
             assertEquals(1, answer.size());
@@ -1135,23 +1135,23 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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 Pkfieldsblobs();
-            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());
             dao.insert(record);
 
             PkfieldsblobsExample example = new PkfieldsblobsExample();
-            example.setId2(new Integer(6));
+            example.setId2(6);
             example.setId2_Indicator(PkfieldsblobsExample.EXAMPLE_EQUALS);
             List answer = dao.selectByExampleWithBLOBs(example);
             assertEquals(1, answer.size());

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java2/FlatJava2Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java2/FlatJava2Tests.java?view=diff&rev=504208&r1=504207&r2=504208
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java2/FlatJava2Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java2/FlatJava2Tests.java Tue Feb  6 09:23:44 2007
@@ -97,15 +97,15 @@
             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();
@@ -127,21 +127,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();
@@ -159,21 +159,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();
@@ -195,8 +195,8 @@
 
         try {
             Pkonly key = new Pkonly();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -216,20 +216,20 @@
 
         try {
             Pkonly key = new Pkonly();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             key = new Pkonly();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
             List answer = dao.selectByExample(example);
             assertEquals(2, answer.size());
 
-            int rows = dao.deleteByPrimaryKey(new Integer(5), new Integer(6));
+            int rows = dao.deleteByPrimaryKey(5, 6);
             assertEquals(1, rows);
 
             answer = dao.selectByExample(example);
@@ -244,18 +244,18 @@
 
         try {
             Pkonly key = new Pkonly();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             key = new Pkonly();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             dao.insert(key);
 
             key = new Pkonly();
-            key.setId(new Integer(7));
-            key.setSeqNum(new Integer(8));
+            key.setId(7);
+            key.setSeqNum(8);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -276,18 +276,18 @@
 
         try {
             Pkonly key = new Pkonly();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             key = new Pkonly();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             dao.insert(key);
 
             key = new Pkonly();
-            key.setId(new Integer(7));
-            key.setSeqNum(new Integer(8));
+            key.setId(7);
+            key.setSeqNum(8);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -304,18 +304,18 @@
 
         try {
             Pkonly key = new Pkonly();
-            key.setId(new Integer(1));
-            key.setSeqNum(new Integer(3));
+            key.setId(1);
+            key.setSeqNum(3);
             dao.insert(key);
 
             key = new Pkonly();
-            key.setId(new Integer(5));
-            key.setSeqNum(new Integer(6));
+            key.setId(5);
+            key.setSeqNum(6);
             dao.insert(key);
 
             key = new Pkonly();
-            key.setId(new Integer(7));
-            key.setSeqNum(new Integer(8));
+            key.setId(7);
+            key.setSeqNum(8);
             dao.insert(key);
 
             PkonlyExample example = new PkonlyExample();
@@ -333,21 +333,20 @@
         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());
 
             dao.insert(record);
 
-            Pkfields returnedRecord = dao.selectByPrimaryKey(new Integer(1),
-                    new Integer(2));
+            Pkfields returnedRecord = dao.selectByPrimaryKey(1, 2);
             assertNotNull(returnedRecord);
 
             assertTrue(datesAreEqual(record.getDatefield(), returnedRecord
@@ -380,8 +379,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);
 
@@ -391,8 +390,7 @@
             int rows = dao.updateByPrimaryKey(record);
             assertEquals(1, rows);
 
-            Pkfields record2 = dao.selectByPrimaryKey(new Integer(1),
-                    new Integer(2));
+            Pkfields record2 = dao.selectByPrimaryKey(1, 2);
 
             assertEquals(record.getFirstname(), record2.getFirstname());
             assertEquals(record.getLastname(), record2.getLastname());
@@ -410,23 +408,22 @@
             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);
 
-            Pkfields returnedRecord = dao.selectByPrimaryKey(new Integer(1),
-                    new Integer(2));
+            Pkfields returnedRecord = dao.selectByPrimaryKey(1, 2);
 
             assertTrue(datesAreEqual(record.getDatefield(), returnedRecord
                     .getDatefield()));
@@ -459,12 +456,12 @@
             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);
 
-            int rows = dao.deleteByPrimaryKey(new Integer(1), new Integer(2));
+            int rows = dao.deleteByPrimaryKey(1, 2);
             assertEquals(1, rows);
 
             PkfieldsExample example = new PkfieldsExample();
@@ -482,15 +479,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);
 
@@ -518,19 +515,18 @@
             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);
 
-            Pkfields newRecord = dao.selectByPrimaryKey(new Integer(3),
-                    new Integer(4));
+            Pkfields newRecord = dao.selectByPrimaryKey(3, 4);
 
             assertNotNull(newRecord);
             assertEquals(record.getFirstname(), newRecord.getFirstname());
@@ -549,43 +545,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();
@@ -614,43 +610,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();
@@ -679,48 +675,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");
@@ -745,48 +740,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);
@@ -818,48 +813,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);
@@ -876,43 +870,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();
@@ -999,7 +993,7 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1024,19 +1018,19 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             int rows = dao.updateByPrimaryKey(record);
             assertEquals(1, rows);
 
-            Pkblobs newRecord = dao.selectByPrimaryKey(new Integer(3));
+            Pkblobs newRecord = dao.selectByPrimaryKey(3);
 
             assertNotNull(newRecord);
             assertEquals(record.getId(), newRecord.getId());
@@ -1052,17 +1046,17 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             Pkblobs newRecord = new Pkblobs();
-            newRecord.setId(new Integer(3));
+            newRecord.setId(3);
             newRecord.setBlob2(generateRandomBlob());
             dao.updateByPrimaryKeySelective(newRecord);
 
-            Pkblobs returnedRecord = dao.selectByPrimaryKey(new Integer(3));
+            Pkblobs returnedRecord = dao.selectByPrimaryKey(3);
             assertNotNull(returnedRecord);
             assertEquals(record.getId(), returnedRecord.getId());
             assertTrue(blobsAreEqual(record.getBlob1(), returnedRecord
@@ -1088,7 +1082,7 @@
             List answer = dao.selectByExampleWithoutBLOBs(example);
             assertEquals(1, answer.size());
 
-            int rows = dao.deleteByPrimaryKey(new Integer(3));
+            int rows = dao.deleteByPrimaryKey(3);
             assertEquals(1, rows);
 
             example = new PkblobsExample();
@@ -1104,13 +1098,13 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new Pkblobs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1137,18 +1131,18 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new Pkblobs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
-            Pkblobs newRecord = dao.selectByPrimaryKey(new Integer(6));
+            Pkblobs newRecord = dao.selectByPrimaryKey(6);
             assertNotNull(newRecord);
             assertEquals(record.getId(), newRecord.getId());
             assertTrue(blobsAreEqual(record.getBlob1(), newRecord.getBlob1()));
@@ -1163,13 +1157,13 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new Pkblobs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1194,13 +1188,13 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new Pkblobs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1220,13 +1214,13 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
 
             record = new Pkblobs();
-            record.setId(new Integer(6));
+            record.setId(6);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1251,8 +1245,8 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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());
@@ -1279,16 +1273,16 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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");
             updateRecord.setBlob1(generateRandomBlob());
@@ -1296,8 +1290,7 @@
             int rows = dao.updateByPrimaryKeyWithBLOBs(updateRecord);
             assertEquals(1, rows);
 
-            Pkfieldsblobs newRecord = dao.selectByPrimaryKey(new Integer(3),
-                    new Integer(4));
+            Pkfieldsblobs newRecord = dao.selectByPrimaryKey(3, 4);
             assertEquals(updateRecord.getFirstname(), newRecord.getFirstname());
             assertEquals(updateRecord.getLastname(), newRecord.getLastname());
             assertEquals(record.getId1(), newRecord.getId1());
@@ -1314,24 +1307,23 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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");
 
             int rows = dao.updateByPrimaryKeyWithoutBLOBs(updateRecord);
             assertEquals(1, rows);
 
-            Pkfieldsblobs newRecord = dao.selectByPrimaryKey(new Integer(3),
-                    new Integer(4));
+            Pkfieldsblobs newRecord = dao.selectByPrimaryKey(3, 4);
             assertEquals(updateRecord.getFirstname(), newRecord.getFirstname());
             assertEquals(updateRecord.getLastname(), newRecord.getLastname());
             assertEquals(record.getId1(), newRecord.getId1());
@@ -1347,23 +1339,22 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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.setLastname("Jones");
 
             int rows = dao.updateByPrimaryKeySelective(updateRecord);
             assertEquals(1, rows);
 
-            Pkfieldsblobs returnedRecord = dao.selectByPrimaryKey(
-                    new Integer(3), new Integer(4));
+            Pkfieldsblobs returnedRecord = dao.selectByPrimaryKey(3, 4);
             assertEquals(record.getFirstname(), returnedRecord.getFirstname());
             assertEquals(updateRecord.getLastname(), returnedRecord
                     .getLastname());
@@ -1381,16 +1372,16 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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 Pkfieldsblobs();
-            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());
@@ -1400,7 +1391,7 @@
             List answer = dao.selectByExampleWithoutBLOBs(example);
             assertEquals(2, answer.size());
 
-            int rows = dao.deleteByPrimaryKey(new Integer(5), new Integer(6));
+            int rows = dao.deleteByPrimaryKey(5, 6);
             assertEquals(1, rows);
 
             example = new PkfieldsblobsExample();
@@ -1416,16 +1407,16 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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 Pkfieldsblobs();
-            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());
@@ -1453,16 +1444,16 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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 Pkfieldsblobs();
-            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());
@@ -1472,8 +1463,7 @@
             List answer = dao.selectByExampleWithoutBLOBs(example);
             assertEquals(2, answer.size());
 
-            Pkfieldsblobs newRecord = dao.selectByPrimaryKey(new Integer(5),
-                    new Integer(6));
+            Pkfieldsblobs newRecord = dao.selectByPrimaryKey(5, 6);
             assertEquals(record.getId1(), newRecord.getId1());
             assertEquals(record.getId2(), newRecord.getId2());
             assertEquals(record.getFirstname(), newRecord.getFirstname());
@@ -1489,16 +1479,16 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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 Pkfieldsblobs();
-            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());
@@ -1525,16 +1515,16 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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 Pkfieldsblobs();
-            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());
@@ -1561,16 +1551,16 @@
 
         try {
             Pkfieldsblobs record = new Pkfieldsblobs();
-            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 Pkfieldsblobs();
-            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());