ibatis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgbut...@apache.org
Subject svn commit: r504208 [1/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...
Date Tue, 06 Feb 2007 17:23:45 GMT
Author: jgbutler
Date: Tue Feb  6 09:23:44 2007
New Revision: 504208

URL: http://svn.apache.org/viewvc?view=rev&rev=504208
Log:
Abator: More build and test improvements

Added:
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTests.java
      - copied, changed from r503987, ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTest.java
Removed:
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTest.java
Modified:
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java5/ConditionalJava5Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/legacy/ConditionalLegacyTests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java2/FlatJava2Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/java5/FlatJava5Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/flat/legacy/FlatLegacyTests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java2/HierarchicalJava2Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/java5/HierarchicalJava5Tests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/hierarchical/legacy/HierarchicalLegacyTests.java
    ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/miscellaneous/MiscellaneousTests.java

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml?view=diff&rev=504208&r1=504207&r2=504208
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/build.xml Tue Feb  6 09:23:44 2007
@@ -36,6 +36,7 @@
   <property name="generated.source.dir.java5" value="${work.dir}/test/java5/src" />
   <property name="generated.bin.dir.java2" value="${work.dir}/test/java2/bin" />
   <property name="generated.bin.dir.java5" value="${work.dir}/test/java5/bin" />
+  <property name="abator.test.bin.dir" value="${work.dir}/test/abator/bin" />
   <property name="reports.dir" value="${basedir}/reports" />
   <property name="reports.junit" value="${reports.dir}/junit" />
   
@@ -71,7 +72,7 @@
     </propertyfile>
   </target>
   
-  <target name="build.compile" depends="build.prepare" unless="eclipse.running">
+  <target name="build.compile" depends="build.prepare">
     <javac srcdir="${src.dir}"
     	destdir="${work.classes}"
     	deprecation="true" 
@@ -127,13 +128,41 @@
     <fail if="testsFailed" message="The tests did not pass"/>
   </target>
   
-  <target name="test.prepare" depends="build.compile">
+  <target name="build.test" depends="build.compile">
+    <mkdir dir="${abator.test.bin.dir}"/>
+    <mkdir dir="${reports.dir}"/>
+    <mkdir dir="${reports.junit}"/>
+
+    <javac destdir="${abator.test.bin.dir}"
+    	deprecation="true" 
+    	debug="true"
+    	source="1.4"
+    	target="1.4">
+      <src path="${basedir}/../test"/>
+      <classpath>
+        <pathelement location="${deploy.files}/abator.jar"/>
+      </classpath>
+    </javac>
+
+    <junit printsummary="true" showoutput="true">
+      <formatter type="xml"/>
+      <batchtest todir="${reports.junit}" fork="yes" haltonerror="no" failureproperty="testsFailed">
+        <fileset dir="${abator.test.bin.dir}">
+          <include name="**/*Tests.class"/>
+        </fileset>
+      </batchtest>
+      <classpath>
+      	<pathelement location="${abator.test.bin.dir}"/>
+        <pathelement location="${deploy.files}/abator.jar"/>
+      </classpath>
+    </junit>
+  </target>
+  	
+  <target name="test.prepare" depends="build.test">
     <mkdir dir="${generated.source.dir.java2}"/>
     <mkdir dir="${generated.source.dir.java5}"/>
     <mkdir dir="${generated.bin.dir.java2}"/>
     <mkdir dir="${generated.bin.dir.java5}"/>
-    <mkdir dir="${reports.dir}"/>
-    <mkdir dir="${reports.junit}"/>
 	  	
   	<!-- create the test database -->
   	<sql driver="org.hsqldb.jdbcDriver"
@@ -153,7 +182,7 @@
     <taskdef name="abator"
              classname="org.apache.ibatis.abator.ant.AbatorAntTask">
       <classpath>
-    	  <pathelement location="${work.classes}"/>
+    	  <pathelement location="${deploy.files}/abator.jar"/>
       </classpath>
     </taskdef>
   	
@@ -173,7 +202,7 @@
     <taskdef name="abator"
              classname="org.apache.ibatis.abator.ant.AbatorAntTask">
       <classpath>
-    	  <pathelement location="${work.classes}"/>
+    	  <pathelement location="${deploy.files}/abator.jar"/>
       </classpath>
     </taskdef>
   	

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties?view=diff&rev=504208&r1=504207&r2=504208
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/build/version.properties Tue Feb  6 09:23:44 2007
@@ -1,4 +1,4 @@
 #Abator build version info
-#Mon Feb 05 22:55:38 CST 2007
+#Tue Feb 06 11:14:55 CST 2007
 version=1.0.1
-buildNum=302
+buildNum=306

Copied: ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTests.java (from r503987, ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTest.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTests.java?view=diff&rev=504208&p1=ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTest.java&r1=503987&p2=ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTests.java&r2=504208
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTest.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/test/org/apache/ibatis/abator/internal/util/JavaBeansUtilTests.java Tue Feb  6 09:23:44 2007
@@ -24,19 +24,19 @@
  * @author Jeff Butler
  *
  */
-public class JavaBeansUtilTest extends TestCase {
+public class JavaBeansUtilTests extends TestCase {
     
     /**
      * 
      */
-    public JavaBeansUtilTest() {
+    public JavaBeansUtilTests() {
         super();
     }
 
     /**
      * @param arg0
      */
-    public JavaBeansUtilTest(String arg0) {
+    public JavaBeansUtilTests(String arg0) {
         super(arg0);
     }
     

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java?view=diff&rev=504208&r1=504207&r2=504208
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java2/ConditionalJava2Tests.java Tue Feb  6 09:23:44 2007
@@ -68,9 +68,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();
@@ -95,21 +95,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();
@@ -131,21 +131,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();
@@ -163,21 +163,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();
@@ -199,8 +199,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();
@@ -220,13 +220,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();
@@ -234,8 +234,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);
 
@@ -251,18 +251,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();
@@ -283,18 +283,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();
@@ -311,18 +311,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();
@@ -340,13 +340,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());
@@ -354,8 +354,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);
@@ -390,8 +390,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);
 
@@ -402,8 +402,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);
 
@@ -423,24 +423,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);
 
@@ -475,14 +475,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);
@@ -502,15 +502,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);
 
@@ -538,20 +538,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);
@@ -571,43 +571,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();
@@ -636,43 +636,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();
@@ -701,48 +701,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");
@@ -767,48 +766,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);
@@ -840,48 +839,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);
@@ -898,43 +896,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();
@@ -1021,7 +1019,7 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1046,18 +1044,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(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.updateByPrimaryKey(record);
 
-            Pkblobs newRecord = dao.selectByPrimaryKey(new Integer(3));
+            Pkblobs newRecord = dao.selectByPrimaryKey(3);
 
             assertNotNull(newRecord);
             assertEquals(record.getId(), newRecord.getId());
@@ -1073,17 +1071,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
@@ -1100,7 +1098,7 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1109,7 +1107,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();
@@ -1125,13 +1123,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);
@@ -1158,18 +1156,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()));
@@ -1184,13 +1182,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);
@@ -1215,13 +1213,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);
@@ -1241,13 +1239,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);
@@ -1272,8 +1270,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());
@@ -1300,16 +1298,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());
@@ -1318,8 +1316,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());
@@ -1337,16 +1335,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");
 
@@ -1354,8 +1352,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());
@@ -1372,24 +1370,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
@@ -1408,16 +1406,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());
@@ -1428,8 +1426,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);
 
@@ -1446,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());
@@ -1483,16 +1481,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());
@@ -1503,8 +1501,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());
@@ -1521,16 +1519,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());
@@ -1557,16 +1555,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());
@@ -1593,16 +1591,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());

Modified: ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java5/ConditionalJava5Tests.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java5/ConditionalJava5Tests.java?view=diff&rev=504208&r1=504207&r2=504208
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java5/ConditionalJava5Tests.java (original)
+++ ibatis/trunk/java/mapper/mapper2/tools/abator/core/testJava5/abatortest/execute/conditional/java5/ConditionalJava5Tests.java Tue Feb  6 09:23:44 2007
@@ -131,21 +131,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();
@@ -163,21 +163,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();
@@ -199,8 +199,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();
@@ -220,13 +220,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();
@@ -234,8 +234,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);
 
@@ -251,18 +251,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();
@@ -283,18 +283,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();
@@ -311,18 +311,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();
@@ -340,13 +340,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((short) 3);
-            record.setDecimal60field(new Integer(6));
+            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());
@@ -354,8 +354,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);
@@ -390,8 +390,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);
 
@@ -402,8 +402,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);
 
@@ -423,24 +423,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);
 
@@ -475,14 +475,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);
@@ -502,15 +502,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);
 
@@ -538,20 +538,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);
@@ -571,43 +571,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();
@@ -636,43 +636,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();
@@ -701,43 +701,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();
@@ -772,36 +772,36 @@
             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<Integer> ids = new ArrayList<Integer>();
@@ -838,48 +838,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);
@@ -896,43 +895,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();
@@ -1019,7 +1018,7 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1044,19 +1043,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());
@@ -1072,17 +1071,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
@@ -1099,7 +1098,7 @@
 
         try {
             Pkblobs record = new Pkblobs();
-            record.setId(new Integer(3));
+            record.setId(3);
             record.setBlob1(generateRandomBlob());
             record.setBlob2(generateRandomBlob());
             dao.insert(record);
@@ -1108,7 +1107,7 @@
             List<Pkblobs> 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();
@@ -1124,13 +1123,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);
@@ -1157,18 +1156,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()));
@@ -1183,13 +1182,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);
@@ -1214,13 +1213,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);
@@ -1240,13 +1239,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);
@@ -1271,8 +1270,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());
@@ -1299,16 +1298,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());
@@ -1317,8 +1316,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());
@@ -1336,16 +1335,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");
 
@@ -1353,8 +1352,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());
@@ -1371,24 +1370,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
@@ -1407,16 +1406,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());
@@ -1428,8 +1427,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);
 
@@ -1446,16 +1445,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());
@@ -1484,16 +1483,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());
@@ -1505,8 +1504,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());
@@ -1523,16 +1522,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());
@@ -1560,16 +1559,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());
@@ -1596,16 +1595,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());



Mime
View raw message