Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java Mon Aug 27 09:48:33 2018 @@ -66,49 +66,49 @@ import org.apache.torque.util.functions. public class ForeignKeySchemaData { private final List<PIntegerPk> pIntegerPkList - = new ArrayList<PIntegerPk>(); + = new ArrayList<>(); private final List<NullablePIntegerFk> nullablePIntegerFkList - = new ArrayList<NullablePIntegerFk>(); + = new ArrayList<>(); private final List<RequiredPIntegerFk> requiredPIntegerFkList - = new ArrayList<RequiredPIntegerFk>(); + = new ArrayList<>(); private final List<NonPkPIntegerFk> nonPkPIntegerFkList - = new ArrayList<NonPkPIntegerFk>(); + = new ArrayList<>(); private final List<OIntegerPk> oIntegerPkList - = new ArrayList<OIntegerPk>(); + = new ArrayList<>(); private final List<NullableOIntegerFk> nullableOIntegerFkList - = new ArrayList<NullableOIntegerFk>(); + = new ArrayList<>(); private final List<RequiredOIntegerFk> requiredOIntegerFkList - = new ArrayList<RequiredOIntegerFk>(); + = new ArrayList<>(); private final List<NonPkOIntegerFk> nonPkOIntegerFkList - = new ArrayList<NonPkOIntegerFk>(); + = new ArrayList<>(); private final List<CompPkOtherFk> compositePkOtherFkList - = new ArrayList<CompPkOtherFk>(); + = new ArrayList<>(); private final List<CompPkContainsFk> compositePkContainsFkList - = new ArrayList<CompPkContainsFk>(); + = new ArrayList<>(); private final List<CompIntegerVarcharPk> compositeIntegerVarcharPkList - = new ArrayList<CompIntegerVarcharPk>(); + = new ArrayList<>(); private final List<CompIntegerVarcharFk> compositeIntegerVarcharFkList - = new ArrayList<CompIntegerVarcharFk>(); + = new ArrayList<>(); private final List<CompNonpkFk> compositeNonpkFkList - = new ArrayList<CompNonpkFk>(); + = new ArrayList<>(); private final List<MultiRef> multiRefList - = new ArrayList<MultiRef>(); + = new ArrayList<>(); private final List<MultiRefSameTable> multiRefSameTableList - = new ArrayList<MultiRefSameTable>(); + = new ArrayList<>(); /** * Creates the default Test data for the foreign key schema. @@ -235,7 +235,7 @@ public class ForeignKeySchemaData throws TorqueException { NullablePIntegerFk nullablePIntegerFk2 - = new NullablePIntegerFk(); + = new NullablePIntegerFk(); nullablePIntegerFk2.setName( "nullablePIntegerFk2"); result.getPIntegerPkList().get(1).addNullablePIntegerFk( @@ -244,7 +244,7 @@ public class ForeignKeySchemaData nullablePIntegerFk2); NullablePIntegerFk nullablePIntegerFk3a - = new NullablePIntegerFk(); + = new NullablePIntegerFk(); nullablePIntegerFk3a.setName( "nullablePIntegerFk3a"); result.getPIntegerPkList().get(2).addNullablePIntegerFk( @@ -253,7 +253,7 @@ public class ForeignKeySchemaData nullablePIntegerFk3a); NullablePIntegerFk nullablePIntegerFk3b - = new NullablePIntegerFk(); + = new NullablePIntegerFk(); nullablePIntegerFk3b.setName( "nullablePIntegerFk3b"); result.getPIntegerPkList().get(2).addNullablePIntegerFk( @@ -266,7 +266,7 @@ public class ForeignKeySchemaData throws TorqueException { RequiredPIntegerFk requiredPIntegerFk2 - = new RequiredPIntegerFk(); + = new RequiredPIntegerFk(); requiredPIntegerFk2.setName( "requiredPIntegerFk2"); result.getPIntegerPkList().get(1).addRequiredPIntegerFk( @@ -275,7 +275,7 @@ public class ForeignKeySchemaData requiredPIntegerFk2); RequiredPIntegerFk requiredPIntegerFk3a - = new RequiredPIntegerFk(); + = new RequiredPIntegerFk(); requiredPIntegerFk3a.setName( "requiredPIntegerFk3a"); result.getPIntegerPkList().get(2).addRequiredPIntegerFk( @@ -284,7 +284,7 @@ public class ForeignKeySchemaData requiredPIntegerFk3a); RequiredPIntegerFk requiredPIntegerFk3b - = new RequiredPIntegerFk(); + = new RequiredPIntegerFk(); requiredPIntegerFk3b.setName( "requiredPIntegerFk3b"); result.getPIntegerPkList().get(2).addRequiredPIntegerFk( @@ -297,7 +297,7 @@ public class ForeignKeySchemaData throws TorqueException { NonPkPIntegerFk nonPkPIntegerFk1a - = new NonPkPIntegerFk(); + = new NonPkPIntegerFk(); nonPkPIntegerFk1a.setName( "nonPkPIntegerFk1a"); result.getPIntegerPkList().get(0).addNonPkPIntegerFk( @@ -306,7 +306,7 @@ public class ForeignKeySchemaData nonPkPIntegerFk1a); NonPkPIntegerFk nonPkPIntegerFk1b - = new NonPkPIntegerFk(); + = new NonPkPIntegerFk(); nonPkPIntegerFk1b.setName( "nonPkPIntegerFk1b"); result.getPIntegerPkList().get(0).addNonPkPIntegerFk( @@ -315,7 +315,7 @@ public class ForeignKeySchemaData nonPkPIntegerFk1b); NonPkPIntegerFk nonPkPIntegerFk2 - = new NonPkPIntegerFk(); + = new NonPkPIntegerFk(); nonPkPIntegerFk2.setName( "nonPkPIntegerFk2"); result.getPIntegerPkList().get(1).addNonPkPIntegerFk( @@ -346,7 +346,7 @@ public class ForeignKeySchemaData throws TorqueException { NullableOIntegerFk nullableOIntegerFk2 - = new NullableOIntegerFk(); + = new NullableOIntegerFk(); nullableOIntegerFk2.setName( "nullableOIntegerFk2"); result.getOIntegerPkList().get(1).addNullableOIntegerFk( @@ -355,7 +355,7 @@ public class ForeignKeySchemaData nullableOIntegerFk2); NullableOIntegerFk nullableOIntegerFk3a - = new NullableOIntegerFk(); + = new NullableOIntegerFk(); nullableOIntegerFk3a.setName( "nullableOIntegerFk3a"); result.getOIntegerPkList().get(2).addNullableOIntegerFk( @@ -364,7 +364,7 @@ public class ForeignKeySchemaData nullableOIntegerFk3a); NullableOIntegerFk nullableOIntegerFk3b - = new NullableOIntegerFk(); + = new NullableOIntegerFk(); nullableOIntegerFk3b.setName( "nullableOIntegerFk3b"); result.getOIntegerPkList().get(2).addNullableOIntegerFk( @@ -373,7 +373,7 @@ public class ForeignKeySchemaData nullableOIntegerFk3b); NullableOIntegerFk nullableOIntegerFk4 - = new NullableOIntegerFk(); + = new NullableOIntegerFk(); nullableOIntegerFk4.setName( "nullableOIntegerFk4"); result.getNullableOIntegerFkList().add( @@ -384,7 +384,7 @@ public class ForeignKeySchemaData throws TorqueException { RequiredOIntegerFk requiredOIntegerFk2 - = new RequiredOIntegerFk(); + = new RequiredOIntegerFk(); requiredOIntegerFk2.setName( "requiredOIntegerFk2"); result.getOIntegerPkList().get(1).addRequiredOIntegerFk( @@ -393,7 +393,7 @@ public class ForeignKeySchemaData requiredOIntegerFk2); RequiredOIntegerFk requiredOIntegerFk3a - = new RequiredOIntegerFk(); + = new RequiredOIntegerFk(); requiredOIntegerFk3a.setName( "requiredOIntegerFk3a"); result.getOIntegerPkList().get(2).addRequiredOIntegerFk( @@ -402,7 +402,7 @@ public class ForeignKeySchemaData requiredOIntegerFk3a); RequiredOIntegerFk requiredOIntegerFk3b - = new RequiredOIntegerFk(); + = new RequiredOIntegerFk(); requiredOIntegerFk3b.setName( "requiredOIntegerFk3b"); result.getOIntegerPkList().get(2).addRequiredOIntegerFk( @@ -415,7 +415,7 @@ public class ForeignKeySchemaData throws TorqueException { NonPkOIntegerFk nonPkOIntegerFk1a - = new NonPkOIntegerFk(); + = new NonPkOIntegerFk(); nonPkOIntegerFk1a.setName( "nonPkOIntegerFk1a"); result.getOIntegerPkList().get(0).addNonPkOIntegerFk( @@ -424,7 +424,7 @@ public class ForeignKeySchemaData nonPkOIntegerFk1a); NonPkOIntegerFk nonPkOIntegerFk1b - = new NonPkOIntegerFk(); + = new NonPkOIntegerFk(); nonPkOIntegerFk1b.setName( "nonPkOIntegerFk1b"); result.getOIntegerPkList().get(0).addNonPkOIntegerFk( @@ -433,7 +433,7 @@ public class ForeignKeySchemaData nonPkOIntegerFk1b); NonPkOIntegerFk nonPkOIntegerFk2 - = new NonPkOIntegerFk(); + = new NonPkOIntegerFk(); nonPkOIntegerFk2.setName( "nonPkOIntegerFk2"); result.getOIntegerPkList().get(1).addNonPkOIntegerFk( @@ -442,7 +442,7 @@ public class ForeignKeySchemaData nonPkOIntegerFk2); NonPkOIntegerFk nonPkOIntegerFk4 - = new NonPkOIntegerFk(); + = new NonPkOIntegerFk(); nonPkOIntegerFk4.setName( "nonPkOIntegerFk4"); result.getNonPkOIntegerFkList().add( @@ -453,7 +453,7 @@ public class ForeignKeySchemaData throws TorqueException { CompPkOtherFk compositePkOtherFk1a - = new CompPkOtherFk(); + = new CompPkOtherFk(); compositePkOtherFk1a.setName( "compositePkOtherFk1a"); compositePkOtherFk1a.setId1(1); @@ -464,7 +464,7 @@ public class ForeignKeySchemaData compositePkOtherFk1a); CompPkOtherFk compositePkOtherFk1b - = new CompPkOtherFk(); + = new CompPkOtherFk(); compositePkOtherFk1b.setName( "compositePkOtherFk1b"); compositePkOtherFk1b.setId1(1); @@ -475,7 +475,7 @@ public class ForeignKeySchemaData compositePkOtherFk1b); CompPkOtherFk compositePkOtherFk2 - = new CompPkOtherFk(); + = new CompPkOtherFk(); compositePkOtherFk2.setName( "compositePkOtherFk22"); compositePkOtherFk2.setId1(2); @@ -490,7 +490,7 @@ public class ForeignKeySchemaData throws TorqueException { CompPkContainsFk compositePkContainsFk1a - = new CompPkContainsFk(); + = new CompPkContainsFk(); compositePkContainsFk1a.setName( "compositePkContainsFk1a"); compositePkContainsFk1a.setId2("1a"); @@ -500,7 +500,7 @@ public class ForeignKeySchemaData compositePkContainsFk1a); CompPkContainsFk compositePkContainsFk1b - = new CompPkContainsFk(); + = new CompPkContainsFk(); compositePkContainsFk1b.setName( "compositePkOtherFk1b"); compositePkContainsFk1b.setId2("1b"); @@ -510,7 +510,7 @@ public class ForeignKeySchemaData compositePkContainsFk1b); CompPkContainsFk compositePkContainsFk2 - = new CompPkContainsFk(); + = new CompPkContainsFk(); compositePkContainsFk2.setName( "compositePkOtherFk22"); compositePkContainsFk2.setId1(2); @@ -525,7 +525,7 @@ public class ForeignKeySchemaData final ForeignKeySchemaData result) { CompIntegerVarcharPk compositeIntegerVarcharPk1 - = new CompIntegerVarcharPk(); + = new CompIntegerVarcharPk(); compositeIntegerVarcharPk1.setName("compositeIntegerVarcharPk1"); compositeIntegerVarcharPk1.setId1(10); compositeIntegerVarcharPk1.setId2("x"); @@ -535,7 +535,7 @@ public class ForeignKeySchemaData compositeIntegerVarcharPk1); CompIntegerVarcharPk compositeIntegerVarcharPk2 - = new CompIntegerVarcharPk(); + = new CompIntegerVarcharPk(); compositeIntegerVarcharPk2.setName("compositeIntegerVarcharPk2"); compositeIntegerVarcharPk2.setId1(10); compositeIntegerVarcharPk2.setId2("y"); @@ -545,7 +545,7 @@ public class ForeignKeySchemaData compositeIntegerVarcharPk2); CompIntegerVarcharPk compositeIntegerVarcharPk3 - = new CompIntegerVarcharPk(); + = new CompIntegerVarcharPk(); compositeIntegerVarcharPk3.setName("compositeIntegerVarcharPk3"); compositeIntegerVarcharPk3.setId1(11); compositeIntegerVarcharPk3.setId2("x"); @@ -556,41 +556,41 @@ public class ForeignKeySchemaData } private static void fillCompositeIntegerVarcharFks( - final ForeignKeySchemaData result) - throws TorqueException + final ForeignKeySchemaData result) + throws TorqueException { CompIntegerVarcharFk compositeIntegerVarcharFk2 - = new CompIntegerVarcharFk(); + = new CompIntegerVarcharFk(); compositeIntegerVarcharFk2.setName( "compositeIntegerVarcharFk2"); result.getCompositeIntegerVarcharPkList().get(1) - .addCompIntegerVarcharFk( - compositeIntegerVarcharFk2); + .addCompIntegerVarcharFk( + compositeIntegerVarcharFk2); result.getCompositeIntegerVarcharFkList().add( compositeIntegerVarcharFk2); CompIntegerVarcharFk compositeIntegerVarcharFk3a - = new CompIntegerVarcharFk(); + = new CompIntegerVarcharFk(); compositeIntegerVarcharFk3a.setName( "compositeIntegerVarcharFk3a"); result.getCompositeIntegerVarcharPkList().get(2) - .addCompIntegerVarcharFk( - compositeIntegerVarcharFk3a); + .addCompIntegerVarcharFk( + compositeIntegerVarcharFk3a); result.getCompositeIntegerVarcharFkList().add( compositeIntegerVarcharFk3a); CompIntegerVarcharFk compositeIntegerVarcharFk3b - = new CompIntegerVarcharFk(); + = new CompIntegerVarcharFk(); compositeIntegerVarcharFk3b.setName( "compositeIntegerVarcharFk3b"); result.getCompositeIntegerVarcharPkList().get(2) - .addCompIntegerVarcharFk( - compositeIntegerVarcharFk3b); + .addCompIntegerVarcharFk( + compositeIntegerVarcharFk3b); result.getCompositeIntegerVarcharFkList().add( compositeIntegerVarcharFk3b); CompIntegerVarcharFk compositeIntegerVarcharFk4 - = new CompIntegerVarcharFk(); + = new CompIntegerVarcharFk(); compositeIntegerVarcharFk4.setName( "compositeIntegerVarcharFk4"); result.getCompositeIntegerVarcharFkList().add( @@ -598,37 +598,37 @@ public class ForeignKeySchemaData } private static void fillCompositeNonpkFks( - final ForeignKeySchemaData result) - throws TorqueException + final ForeignKeySchemaData result) + throws TorqueException { CompNonpkFk compositeNonpkFk1a - = new CompNonpkFk(); + = new CompNonpkFk(); compositeNonpkFk1a.setName( "compositeNonpkFk1a"); result.getCompositeIntegerVarcharPkList().get(0) - .addCompNonpkFk(compositeNonpkFk1a); + .addCompNonpkFk(compositeNonpkFk1a); result.getCompositeNonpkFkList().add(compositeNonpkFk1a); CompNonpkFk compositeNonpkFk1b - = new CompNonpkFk(); + = new CompNonpkFk(); compositeNonpkFk1b.setName( "compositeNonpkFk1b"); result.getCompositeIntegerVarcharPkList().get(0) - .addCompNonpkFk(compositeNonpkFk1b); + .addCompNonpkFk(compositeNonpkFk1b); result.getCompositeNonpkFkList().add(compositeNonpkFk1b); CompNonpkFk compositeNonpkFk2 - = new CompNonpkFk(); + = new CompNonpkFk(); compositeNonpkFk2.setName( "compositeNonpkFk2"); result.getCompositeIntegerVarcharPkList().get(1) - .addCompNonpkFk(compositeNonpkFk2); + .addCompNonpkFk(compositeNonpkFk2); result.getCompositeNonpkFkList().add(compositeNonpkFk2); } private static void fillMultiRefs( - final ForeignKeySchemaData result) - throws TorqueException + final ForeignKeySchemaData result) + throws TorqueException { { MultiRef multiRef111a = new MultiRef(); @@ -704,8 +704,8 @@ public class ForeignKeySchemaData } private static void fillMultiRefSameTables( - final ForeignKeySchemaData result) - throws TorqueException + final ForeignKeySchemaData result) + throws TorqueException { { MultiRefSameTable multiRefSameTable111a = new MultiRefSameTable(); @@ -953,7 +953,7 @@ public class ForeignKeySchemaData + NullablePIntegerFkPeer.TABLE_NAME); Criteria criteria = new Criteria(); List<NullablePIntegerFk> tableContent - = NullablePIntegerFkPeer.doSelect(criteria); + = NullablePIntegerFkPeer.doSelect(criteria); System.out.println(tableContent); } @@ -962,7 +962,7 @@ public class ForeignKeySchemaData + RequiredPIntegerFkPeer.TABLE_NAME); Criteria criteria = new Criteria(); List<RequiredPIntegerFk> tableContent - = RequiredPIntegerFkPeer.doSelect(criteria); + = RequiredPIntegerFkPeer.doSelect(criteria); System.out.println(tableContent); } @@ -971,7 +971,7 @@ public class ForeignKeySchemaData + NonPkPIntegerFkPeer.TABLE_NAME); Criteria criteria = new Criteria(); List<NonPkPIntegerFk> tableContent - = NonPkPIntegerFkPeer.doSelect(criteria); + = NonPkPIntegerFkPeer.doSelect(criteria); System.out.println(tableContent); } @@ -980,7 +980,7 @@ public class ForeignKeySchemaData + NullableOIntegerFkPeer.TABLE_NAME); Criteria criteria = new Criteria(); List<NullableOIntegerFk> tableContent - = NullableOIntegerFkPeer.doSelect(criteria); + = NullableOIntegerFkPeer.doSelect(criteria); System.out.println(tableContent); } @@ -989,7 +989,7 @@ public class ForeignKeySchemaData + RequiredOIntegerFkPeer.TABLE_NAME); Criteria criteria = new Criteria(); List<RequiredOIntegerFk> tableContent - = RequiredOIntegerFkPeer.doSelect(criteria); + = RequiredOIntegerFkPeer.doSelect(criteria); System.out.println(tableContent); } @@ -998,7 +998,7 @@ public class ForeignKeySchemaData + NonPkOIntegerFkPeer.TABLE_NAME); Criteria criteria = new Criteria(); List<NonPkOIntegerFk> tableContent - = NonPkOIntegerFkPeer.doSelect(criteria); + = NonPkOIntegerFkPeer.doSelect(criteria); System.out.println(tableContent); } @@ -1007,7 +1007,7 @@ public class ForeignKeySchemaData + PIntegerPkPeer.TABLE_NAME); Criteria criteria = new Criteria(); List<PIntegerPk> tableContent - = PIntegerPkPeer.doSelect(criteria); + = PIntegerPkPeer.doSelect(criteria); System.out.println(tableContent); } @@ -1016,7 +1016,7 @@ public class ForeignKeySchemaData + OIntegerPkPeer.TABLE_NAME); Criteria criteria = new Criteria(); List<OIntegerPk> tableContent - = OIntegerPkPeer.doSelect(criteria); + = OIntegerPkPeer.doSelect(criteria); System.out.println(tableContent); } @@ -1025,7 +1025,7 @@ public class ForeignKeySchemaData + CompIntegerVarcharFkPeer.TABLE_NAME); Criteria criteria = new Criteria(); List<CompIntegerVarcharFk> nullablePIntegerFks - = CompIntegerVarcharFkPeer.doSelect(criteria); + = CompIntegerVarcharFkPeer.doSelect(criteria); System.out.println(nullablePIntegerFks); } @@ -1034,7 +1034,7 @@ public class ForeignKeySchemaData + CompNonpkFkPeer.TABLE_NAME); Criteria criteria = new Criteria(); List<CompNonpkFk> nullablePIntegerFks - = CompNonpkFkPeer.doSelect(criteria); + = CompNonpkFkPeer.doSelect(criteria); System.out.println(nullablePIntegerFks); } @@ -1043,7 +1043,7 @@ public class ForeignKeySchemaData + CompIntegerVarcharPkPeer.TABLE_NAME); Criteria criteria = new Criteria(); List<CompIntegerVarcharPk> nullablePIntegerFks - = CompIntegerVarcharPkPeer.doSelect(criteria); + = CompIntegerVarcharPkPeer.doSelect(criteria); System.out.println(nullablePIntegerFks); } } @@ -1057,13 +1057,13 @@ public class ForeignKeySchemaData * * @throws TorqueException if accessing the database fails. */ public static void assertNonPkOIntegerFksInDatabaseEquals( - final List<NonPkOIntegerFk> expected) - throws TorqueException + final List<NonPkOIntegerFk> expected) + throws TorqueException { Criteria criteria = new Criteria().addSelectColumn(new Count("*")); Assert.assertEquals(new Integer(expected.size()), NonPkOIntegerFkPeer.doSelectSingleRecord( - criteria, new IntegerMapper())); + criteria, new IntegerMapper())); for (NonPkOIntegerFk nonPkOIntegerFk : expected) { criteria = NonPkOIntegerFkPeer.buildCriteria(nonPkOIntegerFk); @@ -1085,13 +1085,13 @@ public class ForeignKeySchemaData * * @throws TorqueException if accessing the database fails. */ public static void assertCompositeIntegerVarcharFksInDatabaseEquals( - final List<CompIntegerVarcharFk> expected) - throws TorqueException + final List<CompIntegerVarcharFk> expected) + throws TorqueException { Criteria criteria = new Criteria().addSelectColumn(new Count("*")); Assert.assertEquals(new Integer(expected.size()), CompIntegerVarcharFkPeer.doSelectSingleRecord( - criteria, new IntegerMapper())); + criteria, new IntegerMapper())); for (CompIntegerVarcharFk compIntegerVarcharFk : expected) { criteria = CompIntegerVarcharFkPeer.buildCriteria( @@ -1114,13 +1114,13 @@ public class ForeignKeySchemaData * * @throws TorqueException if accessing the database fails. */ public static void assertNullableOIntegerFksInDatabaseEquals( - final List<NullableOIntegerFk> expected) - throws TorqueException + final List<NullableOIntegerFk> expected) + throws TorqueException { Criteria criteria = new Criteria().addSelectColumn(new Count("*")); Assert.assertEquals(new Integer(expected.size()), NullableOIntegerFkPeer.doSelectSingleRecord( - criteria, new IntegerMapper())); + criteria, new IntegerMapper())); for (NullableOIntegerFk nullableOIntegerFk : expected) { criteria = NullableOIntegerFkPeer.buildCriteria(nullableOIntegerFk); @@ -1142,13 +1142,13 @@ public class ForeignKeySchemaData * * @throws TorqueException if accessing the database fails. */ public static void assertCompositePkOtherFksInDatabaseEquals( - final List<CompPkOtherFk> expected) - throws TorqueException + final List<CompPkOtherFk> expected) + throws TorqueException { Criteria criteria = new Criteria().addSelectColumn(new Count("*")); Assert.assertEquals(new Integer(expected.size()), CompPkOtherFkPeer.doSelectSingleRecord( - criteria, new IntegerMapper())); + criteria, new IntegerMapper())); for (CompPkOtherFk compPkOtherFk : expected) { criteria = CompPkOtherFkPeer.buildCriteria(compPkOtherFk); @@ -1170,13 +1170,13 @@ public class ForeignKeySchemaData * * @throws TorqueException if accessing the database fails. */ public static void assertCompositePkContainsFksInDatabaseEquals( - final List<CompPkContainsFk> expected) - throws TorqueException + final List<CompPkContainsFk> expected) + throws TorqueException { Criteria criteria = new Criteria().addSelectColumn(new Count("*")); Assert.assertEquals(new Integer(expected.size()), CompPkContainsFkPeer.doSelectSingleRecord( - criteria, new IntegerMapper())); + criteria, new IntegerMapper())); for (CompPkContainsFk compPkContainsFk : expected) { criteria = CompPkContainsFkPeer.buildCriteria(compPkContainsFk);
Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java Mon Aug 27 09:48:33 2018 @@ -111,7 +111,7 @@ public class InitShutdownTest extends Te oIntegerPk.setName("shutdownName"); oIntegerPk.save(); List<OIntegerPk> oIntegerPkList - = OIntegerPkPeer.doSelect(new Criteria()); + = OIntegerPkPeer.doSelect(new Criteria()); assertEquals( "List should contain one OIntegerPk", 1, @@ -129,7 +129,7 @@ public class InitShutdownTest extends Te pIntegerPk.setName("shutdownName"); pIntegerPk.save(); List<PIntegerPk> pIntegerPkList - = PIntegerPkPeer.doSelect(new Criteria()); + = PIntegerPkPeer.doSelect(new Criteria()); assertEquals( "List should contain one PIntegerPk", 1, Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java Mon Aug 27 09:48:33 2018 @@ -71,7 +71,7 @@ public class JndiConfigurationTest exten * the full jndi path to the data source. */ protected static final String JNDI_PATH - = JNDI_SUBCONTEXT + "/" + "jndiTestDataSource"; + = JNDI_SUBCONTEXT + "/" + "jndiTestDataSource"; @Override public void setUp() @@ -118,32 +118,32 @@ public class JndiConfigurationTest exten { Configuration dsfactoryConfiguration = torqueConfiguration.subset( Torque.TORQUE_KEY + "." - + DataSourceFactory.DSFACTORY_KEY + "." - + defaultDatabase); + + DataSourceFactory.DSFACTORY_KEY + "." + + defaultDatabase); dsfactoryConfiguration.clear(); } // add the jndi configuration to the configuration torqueConfiguration.setProperty( Torque.TORQUE_KEY + "." - + DataSourceFactory.DSFACTORY_KEY + "." - + defaultDatabase + "." - + DataSourceFactory.FACTORY_KEY, - JndiDataSourceFactory.class.getName()); + + DataSourceFactory.DSFACTORY_KEY + "." + + defaultDatabase + "." + + DataSourceFactory.FACTORY_KEY, + JndiDataSourceFactory.class.getName()); torqueConfiguration.setProperty( Torque.TORQUE_KEY + "." - + DataSourceFactory.DSFACTORY_KEY + "." - + defaultDatabase + "." - + JndiDataSourceFactory.JNDI_KEY + "." - + JndiDataSourceFactory.PATH_KEY, - JNDI_PATH); + + DataSourceFactory.DSFACTORY_KEY + "." + + defaultDatabase + "." + + JndiDataSourceFactory.JNDI_KEY + "." + + JndiDataSourceFactory.PATH_KEY, + JNDI_PATH); torqueConfiguration.setProperty( Torque.TORQUE_KEY + "." - + DataSourceFactory.DSFACTORY_KEY + "." - + defaultDatabase + "." - + JndiDataSourceFactory.JNDI_KEY + "." - + Context.INITIAL_CONTEXT_FACTORY, - org.apache.naming.java.javaURLContextFactory.class.getName()); + + DataSourceFactory.DSFACTORY_KEY + "." + + defaultDatabase + "." + + JndiDataSourceFactory.JNDI_KEY + "." + + Context.INITIAL_CONTEXT_FACTORY, + org.apache.naming.java.javaURLContextFactory.class.getName()); //System.out.println("Configuration for testExternalBindTorqueLookup:"); //debugConfiguration(torqueConfiguration); @@ -195,43 +195,43 @@ public class JndiConfigurationTest exten // add the jndi configuration to the configuration torqueConfiguration.setProperty( Torque.TORQUE_KEY + "." - + DataSourceFactory.DSFACTORY_KEY + "." - + defaultDatabase + "." - + DataSourceFactory.FACTORY_KEY, - JndiDataSourceFactory.class.getName()); + + DataSourceFactory.DSFACTORY_KEY + "." + + defaultDatabase + "." + + DataSourceFactory.FACTORY_KEY, + JndiDataSourceFactory.class.getName()); torqueConfiguration.setProperty( Torque.TORQUE_KEY + "." - + DataSourceFactory.DSFACTORY_KEY + "." - + defaultDatabase + "." - + JndiDataSourceFactory.JNDI_KEY + "." - + JndiDataSourceFactory.PATH_KEY, - JNDI_PATH); + + DataSourceFactory.DSFACTORY_KEY + "." + + defaultDatabase + "." + + JndiDataSourceFactory.JNDI_KEY + "." + + JndiDataSourceFactory.PATH_KEY, + JNDI_PATH); torqueConfiguration.setProperty( Torque.TORQUE_KEY + "." - + DataSourceFactory.DSFACTORY_KEY + "." - + defaultDatabase + "." - + JndiDataSourceFactory.JNDI_KEY + "." - + Context.INITIAL_CONTEXT_FACTORY, - org.apache.naming.java.javaURLContextFactory.class.getName()); + + DataSourceFactory.DSFACTORY_KEY + "." + + defaultDatabase + "." + + JndiDataSourceFactory.JNDI_KEY + "." + + Context.INITIAL_CONTEXT_FACTORY, + org.apache.naming.java.javaURLContextFactory.class.getName()); // add the datasource configuration torqueConfiguration.setProperty( Torque.TORQUE_KEY + "." - + DataSourceFactory.DSFACTORY_KEY + "." - + defaultDatabase + "." - + JndiDataSourceFactory.DATASOURCE_KEY + "." - + JndiDataSourceFactory.CLASSNAME_KEY, - BasicDataSource.class.getName()); - { - Map<String, String> tempStore = new HashMap<String, String>(); - Configuration connectionConfiguration - = torqueConfiguration.subset( - Torque.TORQUE_KEY + "." + DataSourceFactory.DSFACTORY_KEY + "." + defaultDatabase + "." - + AbstractDataSourceFactory.CONNECTION_KEY); + + JndiDataSourceFactory.DATASOURCE_KEY + "." + + JndiDataSourceFactory.CLASSNAME_KEY, + BasicDataSource.class.getName()); + { + Map<String, String> tempStore = new HashMap<>(); + Configuration connectionConfiguration + = torqueConfiguration.subset( + Torque.TORQUE_KEY + "." + + DataSourceFactory.DSFACTORY_KEY + "." + + defaultDatabase + "." + + AbstractDataSourceFactory.CONNECTION_KEY); for (Iterator<String> keyIt = connectionConfiguration.getKeys(); - keyIt.hasNext();) + keyIt.hasNext();) { String key = keyIt.next(); String value = connectionConfiguration.getString(key); @@ -250,11 +250,11 @@ public class JndiConfigurationTest exten } tempStore.put( Torque.TORQUE_KEY + "." - + DataSourceFactory.DSFACTORY_KEY + "." - + defaultDatabase + "." - + JndiDataSourceFactory.DATASOURCE_KEY + "." - + key, - value); + + DataSourceFactory.DSFACTORY_KEY + "." + + defaultDatabase + "." + + JndiDataSourceFactory.DATASOURCE_KEY + "." + + key, + value); } // add the new keys for (String key : tempStore.keySet()) @@ -266,11 +266,11 @@ public class JndiConfigurationTest exten // remove the configuration for the original datasource connectionConfiguration.clear(); Configuration poolConfiguration - = torqueConfiguration.subset( - Torque.TORQUE_KEY + "." - + DataSourceFactory.DSFACTORY_KEY + "." - + defaultDatabase + "." - + AbstractDataSourceFactory.POOL_KEY); + = torqueConfiguration.subset( + Torque.TORQUE_KEY + "." + + DataSourceFactory.DSFACTORY_KEY + "." + + defaultDatabase + "." + + AbstractDataSourceFactory.POOL_KEY); poolConfiguration.clear(); } @@ -324,7 +324,7 @@ public class JndiConfigurationTest exten { Context context = getInitialContext(); BasicDataSource dataSource - = (BasicDataSource) context.lookup(JNDI_PATH); + = (BasicDataSource) context.lookup(JNDI_PATH); if (dataSource == null) { @@ -375,9 +375,9 @@ public class JndiConfigurationTest exten String defaultDatabase = getDefaultDatabase(torqueConfiguration); Configuration dsfactoryConfiguration = torqueConfiguration.subset( Torque.TORQUE_KEY + "." - + DataSourceFactory.DSFACTORY_KEY + "." - + defaultDatabase + "." - + AbstractDataSourceFactory.CONNECTION_KEY); + + DataSourceFactory.DSFACTORY_KEY + "." + + defaultDatabase + "." + + AbstractDataSourceFactory.CONNECTION_KEY); BasicDataSource dataSource = new BasicDataSource(); for (Iterator<String> i = dsfactoryConfiguration.getKeys(); i.hasNext();) @@ -439,16 +439,16 @@ public class JndiConfigurationTest exten Connection connection = null; try { - connection = Torque.getConnection(); + connection = Torque.getConnection(); BookPeer.doSelect(new Criteria(), connection); connection.close(); connection = null; } finally { - if (connection != null) + if (connection != null) { - connection.close(); + connection.close(); } } } @@ -461,7 +461,7 @@ public class JndiConfigurationTest exten */ protected InitialContext getInitialContext() throws NamingException { - Hashtable<String, String> environment = new Hashtable<String, String>(); + Hashtable<String, String> environment = new Hashtable<>(); environment.put( Context.INITIAL_CONTEXT_FACTORY, org.apache.naming.java.javaURLContextFactory.class.getName()); @@ -494,8 +494,8 @@ public class JndiConfigurationTest exten { String defaultDatabase = torqueConfiguration.getString( Torque.TORQUE_KEY + "." - + Torque.DATABASE_KEY + "." - + Torque.DEFAULT_KEY); + + Torque.DATABASE_KEY + "." + + Torque.DEFAULT_KEY); return defaultDatabase; } @@ -506,7 +506,7 @@ public class JndiConfigurationTest exten public static void debugConfiguration(final Configuration configuration) { for (Iterator<String> dsKeyIt = configuration.getKeys(); - dsKeyIt.hasNext(); ) + dsKeyIt.hasNext(); ) { String key = dsKeyIt.next(); System.out.println(key + " = " + configuration.getString(key)); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/PkSchemaData.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/PkSchemaData.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/PkSchemaData.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/PkSchemaData.java Mon Aug 27 09:48:33 2018 @@ -34,7 +34,7 @@ import org.apache.torque.test.peer.NopkP public class PkSchemaData { private List<Nopk> nopkList - = new ArrayList<Nopk>(); + = new ArrayList<>(); /** * Creates the default Test data for the pk schema. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java Mon Aug 27 09:48:33 2018 @@ -52,6 +52,7 @@ public class AvalonMapBuildersTest exten instance = org.apache.torque.Torque.getInstance(); } + @Override public void setUp() throws Exception { super.setUp(); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java Mon Aug 27 09:48:33 2018 @@ -57,10 +57,10 @@ public class BitTest extends BaseDatabas fillTables(); List<BitCompositePk> bitCompositePks - = BitCompositePkPeer.doSelect(new Criteria()); + = BitCompositePkPeer.doSelect(new Criteria()); assertEquals(3, bitCompositePks.size()); List<BitType> bitTypes - = BitTypePeer.doSelect(new Criteria()); + = BitTypePeer.doSelect(new Criteria()); assertEquals(2, bitTypes.size()); } @@ -83,7 +83,7 @@ public class BitTest extends BaseDatabas criteria.and(BitCompositePkPeer.PK1, "false value"); criteria.and(BitCompositePkPeer.PK2, Boolean.FALSE); List<BitCompositePk> result - = BitCompositePkPeer.doSelect(criteria); + = BitCompositePkPeer.doSelect(criteria); assertEquals(1, result.size()); assertEquals("false payload", result.get(0).getPayload()); @@ -116,7 +116,7 @@ public class BitTest extends BaseDatabas BitCompositePkPeer.PK1, "true value"); criteria.and(BitCompositePkPeer.PK2, Boolean.TRUE); List<BitCompositePk> selectResult - = BitCompositePkPeer.doSelect(criteria); + = BitCompositePkPeer.doSelect(criteria); selectResult.get(0).setPayload("true updated payload"); selectResult.get(0).save(); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java Mon Aug 27 09:48:33 2018 @@ -54,7 +54,7 @@ public class BooleanIntCharTest extends public void testReadBooleanIntCharTrueValue() throws Exception { BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); + = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); assertEquals(true, bc.getBintValue()); assertEquals(true, bc.getBcharValue()); assertEquals(Boolean.TRUE, bc.getBintObjectValue()); @@ -69,7 +69,7 @@ public class BooleanIntCharTest extends public void testReadBooleanIntCharFalseValue() throws Exception { BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("f1")); + = BintBcharTypePeer.retrieveByPK(new StringKey("f1")); assertEquals(false, bc.getBintValue()); assertEquals(false, bc.getBcharValue()); assertEquals(Boolean.FALSE, bc.getBintObjectValue()); @@ -84,7 +84,7 @@ public class BooleanIntCharTest extends public void testReadBooleanIntCharNullValue() throws Exception { BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("null")); + = BintBcharTypePeer.retrieveByPK(new StringKey("null")); assertEquals(null, bc.getBintObjectValue()); assertEquals(null, bc.getBcharObjectValue()); } @@ -172,7 +172,7 @@ public class BooleanIntCharTest extends { // prepare BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("f1")); + = BintBcharTypePeer.retrieveByPK(new StringKey("f1")); bc.setBintValue(true); bc.setBcharValue(true); bc.setBintObjectValue(Boolean.TRUE); @@ -198,7 +198,7 @@ public class BooleanIntCharTest extends { // prepare BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); + = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); bc.setBintValue(false); bc.setBcharValue(false); bc.setBintObjectValue(Boolean.FALSE); @@ -224,7 +224,7 @@ public class BooleanIntCharTest extends { // prepare BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); + = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); bc.setBintObjectValue(null); bc.setBcharObjectValue(null); @@ -251,7 +251,7 @@ public class BooleanIntCharTest extends .and(BintBcharTypePeer.BCHAR_OBJECT_VALUE, new Boolean(true)) .and(BintBcharTypePeer.BINT_OBJECT_VALUE, new Boolean(true)); List<BintBcharType> selectedList - = BintBcharTypePeer.doSelect(criteria); + = BintBcharTypePeer.doSelect(criteria); assertEquals(1, selectedList.size()); BintBcharType bintBcharType = selectedList.get(0); assertEquals("t1", bintBcharType.getId()); @@ -271,7 +271,7 @@ public class BooleanIntCharTest extends .and(BintBcharTypePeer.BCHAR_OBJECT_VALUE, new Boolean(false)) .and(BintBcharTypePeer.BINT_OBJECT_VALUE, new Boolean(false)); List<BintBcharType> selectedList - = BintBcharTypePeer.doSelect(criteria); + = BintBcharTypePeer.doSelect(criteria); assertEquals(1, selectedList.size()); BintBcharType bintBcharType = selectedList.get(0); assertEquals("f1", bintBcharType.getId()); @@ -290,7 +290,7 @@ public class BooleanIntCharTest extends .where(BintBcharTypePeer.BCHAR_OBJECT_VALUE, null) .and(BintBcharTypePeer.BINT_OBJECT_VALUE, null); List<BintBcharType> selectedList - = BintBcharTypePeer.doSelect(criteria); + = BintBcharTypePeer.doSelect(criteria); assertEquals(1, selectedList.size()); BintBcharType bintBcharType = selectedList.get(0); assertEquals("null", bintBcharType.getId()); @@ -308,7 +308,7 @@ public class BooleanIntCharTest extends .and(BintBcharTypePeer.BCHAR_VALUE, null) .and(BintBcharTypePeer.BINT_VALUE, null); List<BintBcharType> selectedList - = BintBcharTypePeer.doSelect(criteria); + = BintBcharTypePeer.doSelect(criteria); assertTrue("Should have read 0 dataset with both values false " + "but read " + selectedList.size(), selectedList.size() == 0); @@ -328,11 +328,11 @@ public class BooleanIntCharTest extends BintBcharTypePeer.ID, new ColumnImpl("bc.id")); criteria.where(new ColumnImpl("bc.BINT_VALUE"), new Boolean(false)) - .and(new ColumnImpl("bc.BCHAR_VALUE"), new Boolean(false)) - .and(new ColumnImpl("bc.BINT_OBJECT_VALUE"), new Boolean(false)) - .and(new ColumnImpl("bc.BCHAR_OBJECT_VALUE"), new Boolean(false)); + .and(new ColumnImpl("bc.BCHAR_VALUE"), new Boolean(false)) + .and(new ColumnImpl("bc.BINT_OBJECT_VALUE"), new Boolean(false)) + .and(new ColumnImpl("bc.BCHAR_OBJECT_VALUE"), new Boolean(false)); List<BintBcharType> selectedList - = BintBcharTypePeer.doSelect(criteria); + = BintBcharTypePeer.doSelect(criteria); assertTrue("Should have read 1 dataset with both values false " + "but read " + selectedList.size(), selectedList.size() == 1); @@ -361,7 +361,7 @@ public class BooleanIntCharTest extends Criteria.ISNULL); criteria.where(criterion1.and(criterion2)); List<BintBcharType> selectedList - = BintBcharTypePeer.doSelect(criteria); + = BintBcharTypePeer.doSelect(criteria); // List should be empty, because and creates unfulfillable condition // If BasePeer.correctBooleans() replaces Criterion wrongly, // then we get entries in the list. @@ -389,7 +389,7 @@ public class BooleanIntCharTest extends Criteria.EQUAL); criteria.where(criterion1.or(criterion2)); List<BintBcharType> selectedList - = BintBcharTypePeer.doSelect(criteria); + = BintBcharTypePeer.doSelect(criteria); assertTrue("Should have read 1 dataset complex Criteria " + "but read " + selectedList.size(), selectedList.size() == 1); @@ -410,20 +410,20 @@ public class BooleanIntCharTest extends { // check whether booleans are replaced with unqualified columns Criteria criteria = new Criteria() - .where(new ColumnImpl("BINT_VALUE"), true) - .and(new ColumnImpl("BCHAR_VALUE"), true); + .where(new ColumnImpl("BINT_VALUE"), true) + .and(new ColumnImpl("BCHAR_VALUE"), true); BintBcharTypePeer.correctBooleans(criteria); Criterion criterionInt - = criteria.getTopLevelCriterion().getParts().get(0); + = criteria.getTopLevelCriterion().getParts().get(0); Object intValue = criterionInt.getRValue(); assertTrue("The boolean value should be an instance of Integer", intValue instanceof Integer); Criterion criterionChar - = criteria.getTopLevelCriterion().getParts().get(1); + = criteria.getTopLevelCriterion().getParts().get(1); Object charValue = criterionChar.getRValue(); assertTrue("The boolean value should be an instance of String", @@ -438,24 +438,24 @@ public class BooleanIntCharTest extends public void testCorrectBooleansUnknownColumns() throws Exception { Criteria criteria = new Criteria() - .where("BooleanCheck.bint_value", true) - .and("BooleanCheck.bchar_value", true); + .where("BooleanCheck.bint_value", true) + .and("BooleanCheck.bchar_value", true); BintBcharTypePeer.correctBooleans(criteria); Criterion criterionBool1 - = criteria.getTopLevelCriterion().getParts().get(0); + = criteria.getTopLevelCriterion().getParts().get(0); Object boolValue1 = criterionBool1.getRValue(); assertTrue("The boolean value should be an instance of Boolean", - boolValue1 instanceof Boolean); + boolValue1 instanceof Boolean); Criterion criterionBool2 - = criteria.getTopLevelCriterion().getParts().get(1); + = criteria.getTopLevelCriterion().getParts().get(1); Object boolValue2 = criterionBool2.getRValue(); assertTrue("The boolean value should be an instance of Boolean", - boolValue2 instanceof Boolean); + boolValue2 instanceof Boolean); } /** @@ -488,7 +488,7 @@ public class BooleanIntCharTest extends // verify BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("new")); + = BintBcharTypePeer.retrieveByPK(new StringKey("new")); assertEquals(true, bc.getBintValue()); assertEquals(true, bc.getBcharValue()); assertEquals(Boolean.TRUE, bc.getBintObjectValue()); @@ -525,7 +525,7 @@ public class BooleanIntCharTest extends // verify BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("new")); + = BintBcharTypePeer.retrieveByPK(new StringKey("new")); assertEquals(true, bc.getBintValue()); assertEquals(true, bc.getBcharValue()); assertEquals(Boolean.TRUE, bc.getBintObjectValue()); @@ -562,7 +562,7 @@ public class BooleanIntCharTest extends // verify BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("new")); + = BintBcharTypePeer.retrieveByPK(new StringKey("new")); assertEquals(false, bc.getBintValue()); assertEquals(false, bc.getBcharValue()); assertEquals(Boolean.FALSE, bc.getBintObjectValue()); @@ -599,7 +599,7 @@ public class BooleanIntCharTest extends // verify BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("new")); + = BintBcharTypePeer.retrieveByPK(new StringKey("new")); assertEquals(false, bc.getBintValue()); assertEquals(false, bc.getBcharValue()); assertEquals(Boolean.FALSE, bc.getBintObjectValue()); @@ -636,7 +636,7 @@ public class BooleanIntCharTest extends // verify BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("new")); + = BintBcharTypePeer.retrieveByPK(new StringKey("new")); assertEquals(null, bc.getBintObjectValue()); assertEquals(null, bc.getBcharObjectValue()); } @@ -671,7 +671,7 @@ public class BooleanIntCharTest extends // verify BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("new")); + = BintBcharTypePeer.retrieveByPK(new StringKey("new")); assertEquals(null, bc.getBintObjectValue()); assertEquals(null, bc.getBcharObjectValue()); } @@ -706,7 +706,7 @@ public class BooleanIntCharTest extends // verify BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("f1")); + = BintBcharTypePeer.retrieveByPK(new StringKey("f1")); assertEquals(true, bc.getBintValue()); assertEquals(true, bc.getBcharValue()); assertEquals(Boolean.TRUE, bc.getBintObjectValue()); @@ -743,7 +743,7 @@ public class BooleanIntCharTest extends // verify BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("f1")); + = BintBcharTypePeer.retrieveByPK(new StringKey("f1")); assertEquals(true, bc.getBintValue()); assertEquals(true, bc.getBcharValue()); assertEquals(Boolean.TRUE, bc.getBintObjectValue()); @@ -780,7 +780,7 @@ public class BooleanIntCharTest extends // verify BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); + = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); assertEquals(false, bc.getBintValue()); assertEquals(false, bc.getBcharValue()); assertEquals(Boolean.FALSE, bc.getBintObjectValue()); @@ -817,7 +817,7 @@ public class BooleanIntCharTest extends // verify BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); + = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); assertEquals(false, bc.getBintValue()); assertEquals(false, bc.getBcharValue()); assertEquals(Boolean.FALSE, bc.getBintObjectValue()); @@ -848,7 +848,7 @@ public class BooleanIntCharTest extends // verify BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); + = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); assertEquals(null, bc.getBintObjectValue()); assertEquals(null, bc.getBcharObjectValue()); } @@ -877,7 +877,7 @@ public class BooleanIntCharTest extends // verify BintBcharType bc - = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); + = BintBcharTypePeer.retrieveByPK(new StringKey("t1")); assertEquals(null, bc.getBintObjectValue()); assertEquals(null, bc.getBcharObjectValue()); } Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ByteTypeTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ByteTypeTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ByteTypeTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ByteTypeTest.java Mon Aug 27 09:48:33 2018 @@ -112,9 +112,9 @@ public abstract class ByteTypeTest<T ext { if (!canWriteNullBytes()) { log.error("database with adapter " - + defaultAdapter.getClass().getName() - + " does not support writing null bate arrays to type " - + dbObject.getClass().getName()); + + defaultAdapter.getClass().getName() + + " does not support writing null bate arrays to type " + + dbObject.getClass().getName()); return; } // prepare Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ClobTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ClobTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ClobTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ClobTest.java Mon Aug 27 09:48:33 2018 @@ -95,14 +95,14 @@ public class ClobTest extends BaseDataba * @throws TorqueException if saving fails */ private ClobType fillAndSaveClobType( - ClobType clobType, int size, String charTemplate) - throws TorqueException + ClobType clobType, int size, String charTemplate) + throws TorqueException { { StringBuffer chars = new StringBuffer(); for (int i = 0; i < size; ++i) { - chars.append(charTemplate.charAt(i % charTemplate.length())); + chars.append(charTemplate.charAt(i % charTemplate.length())); } clobType.setClobValue(chars.toString()); } Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/DateTimeTimestampTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/DateTimeTimestampTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/DateTimeTimestampTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/DateTimeTimestampTest.java Mon Aug 27 09:48:33 2018 @@ -77,11 +77,11 @@ public class DateTimeTimestampTest exten // calculate expected value Date expected; -// if (adapter instanceof DBOracle) -// { -// expected = new Date(now.getTime() / 1000L * 1000L); -// } -// else + // if (adapter instanceof DBOracle) + // { + // expected = new Date(now.getTime() / 1000L * 1000L); + // } + // else { Calendar calendar = new GregorianCalendar(); calendar.setTime(now); @@ -122,11 +122,11 @@ public class DateTimeTimestampTest exten // calculate expected value Date expected; -// if (adapter instanceof DBOracle) -// { -// expected = new Date(now.getTime() / 1000L * 1000L); -// } -// else + // if (adapter instanceof DBOracle) + // { + // expected = new Date(now.getTime() / 1000L * 1000L); + // } + // else { Calendar calendar = new GregorianCalendar(); calendar.setTime(now); @@ -139,7 +139,7 @@ public class DateTimeTimestampTest exten // verify long loadedTimestampRounded - = loaded.getTimeValue().getTime() / 1000L * 1000L; + = loaded.getTimeValue().getTime() / 1000L * 1000L; assertEquals(expected, new Date(loadedTimestampRounded)); } @@ -174,11 +174,11 @@ public class DateTimeTimestampTest exten Date actual = loaded.getTimestampValue(); assertFalse( "the loaded value " + dateFormat.format(actual) - + " should not be after " + dateFormat.format(min), + + " should not be after " + dateFormat.format(min), min.after(actual)); assertFalse( "the loaded value " + dateFormat.format(actual) - + " should not be before " + dateFormat.format(max), + + " should not be before " + dateFormat.format(max), max.before(actual)); } @@ -203,7 +203,7 @@ public class DateTimeTimestampTest exten Criteria.CURRENT_DATE, Criteria.GREATER_EQUAL); List<DateTimeTimestampType> result - = DateTimeTimestampTypePeer.doSelect(criteria); + = DateTimeTimestampTypePeer.doSelect(criteria); assertEquals(0, result.size()); } @@ -228,7 +228,7 @@ public class DateTimeTimestampTest exten Criteria.CURRENT_TIME, Criteria.GREATER_EQUAL); List<DateTimeTimestampType> result - = DateTimeTimestampTypePeer.doSelect(criteria); + = DateTimeTimestampTypePeer.doSelect(criteria); assertEquals(0, result.size()); } @@ -253,7 +253,7 @@ public class DateTimeTimestampTest exten Criteria.CURRENT_TIMESTAMP, Criteria.GREATER_EQUAL); List<DateTimeTimestampType> result - = DateTimeTimestampTypePeer.doSelect(criteria); + = DateTimeTimestampTypePeer.doSelect(criteria); assertEquals(0, result.size()); } @@ -280,7 +280,7 @@ public class DateTimeTimestampTest exten criteria.where(DateTimeTimestampTypePeer.DATE_VALUE, new GregorianCalendar(2010, 1, 23).getTime()); List<DateTimeTimestampType> result - = DateTimeTimestampTypePeer.doSelect(criteria); + = DateTimeTimestampTypePeer.doSelect(criteria); // verify assertEquals(1, result.size()); @@ -316,7 +316,7 @@ public class DateTimeTimestampTest exten Criteria criteria = new Criteria(); criteria.where(DateTimeTimestampTypePeer.TIME_VALUE, new Date(1234000)); List<DateTimeTimestampType> result - = DateTimeTimestampTypePeer.doSelect(criteria); + = DateTimeTimestampTypePeer.doSelect(criteria); // verify assertEquals(1, result.size()); @@ -354,7 +354,7 @@ public class DateTimeTimestampTest exten DateTimeTimestampTypePeer.TIME_VALUE, new java.sql.Time(1234000)); List<DateTimeTimestampType> result - = DateTimeTimestampTypePeer.doSelect(criteria); + = DateTimeTimestampTypePeer.doSelect(criteria); // verify assertEquals(1, result.size()); @@ -384,7 +384,7 @@ public class DateTimeTimestampTest exten criteria.where(DateTimeTimestampTypePeer.TIMESTAMP_VALUE, new GregorianCalendar(2010, 1, 23).getTime()); List<DateTimeTimestampType> result - = DateTimeTimestampTypePeer.doSelect(criteria); + = DateTimeTimestampTypePeer.doSelect(criteria); // verify assertEquals(1, result.size()); @@ -416,7 +416,7 @@ public class DateTimeTimestampTest exten toSelect = new Date(toSelect.getTime() - 1000L); criteria.where(DateTimeTimestampTypePeer.TIMESTAMP_VALUE, toSelect); List<DateTimeTimestampType> result - = DateTimeTimestampTypePeer.doSelect(criteria); + = DateTimeTimestampTypePeer.doSelect(criteria); // verify assertEquals(0, result.size()); @@ -450,7 +450,7 @@ public class DateTimeTimestampTest exten DateTimeTimestampTypePeer.TIMESTAMP_VALUE, calendar.getTime()); List<DateTimeTimestampType> result - = DateTimeTimestampTypePeer.doSelect(criteria); + = DateTimeTimestampTypePeer.doSelect(criteria); // verify assertEquals(1, result.size()); @@ -489,7 +489,7 @@ public class DateTimeTimestampTest exten DateTimeTimestampTypePeer.TIMESTAMP_VALUE, calendar.getTime()); List<DateTimeTimestampType> result - = DateTimeTimestampTypePeer.doSelect(criteria); + = DateTimeTimestampTypePeer.doSelect(criteria); // verify assertEquals(0, result.size()); @@ -520,7 +520,7 @@ public class DateTimeTimestampTest exten DateTimeTimestampTypePeer.TIMESTAMP_VALUE, new java.sql.Timestamp(toSelect.getTime())); List<DateTimeTimestampType> result - = DateTimeTimestampTypePeer.doSelect(criteria); + = DateTimeTimestampTypePeer.doSelect(criteria); // verify assertEquals(1, result.size()); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java Mon Aug 27 09:48:33 2018 @@ -162,8 +162,8 @@ public class EnumTest extends BaseDataba columnValues.put( EnumTablePeer.VARCHAR_COLUMN, new JdbcTypedValue( - VarcharColumnEnum.X.getValue(), - 12)); + VarcharColumnEnum.X.getValue(), + 12)); EnumTablePeer.doUpdate( new Criteria().where(EnumTablePeer.ID, databaseStateBeforeTest.get(0).getId()), columnValues); @@ -172,8 +172,8 @@ public class EnumTest extends BaseDataba columnValues.put( EnumTablePeer.VARCHAR_COLUMN, new JdbcTypedValue( - "A", - 12)); + "A", + 12)); try { EnumTablePeer.doUpdate( @@ -229,7 +229,7 @@ public class EnumTest extends BaseDataba Criteria criteria = new Criteria(); EnumTablePeer.doDelete(criteria); - databaseStateBeforeTest = new ArrayList<EnumTable>(); + databaseStateBeforeTest = new ArrayList<>(); EnumTable enumTable = new EnumTable(); enumTable.setIntColumn(MyIntColumnEnum._1); enumTable.setIntPrimitiveColumn(IntPrimitiveColumnEnum._1); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/GetRelatedObjectsJoinTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/GetRelatedObjectsJoinTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/GetRelatedObjectsJoinTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/GetRelatedObjectsJoinTest.java Mon Aug 27 09:48:33 2018 @@ -64,7 +64,7 @@ public class GetRelatedObjectsJoinTest e OIntegerPk baseObject = testData.getOIntegerPkList().get(0); baseObject = OIntegerPkPeer.doSelectSingleRecord(baseObject); List<MultiRef> multiRefs - = baseObject.getMultiRefs(); + = baseObject.getMultiRefs(); // switch silent fetching off Adapter adapter = Torque.getOrCreateDatabase(Torque.getDefaultDB()).getAdapter(); try @@ -99,8 +99,8 @@ public class GetRelatedObjectsJoinTest e OIntegerPk baseObject = testData.getOIntegerPkList().get(0); baseObject = OIntegerPkPeer.doSelectSingleRecord(baseObject); List<MultiRef> multiRefs - = baseObject.getMultiRefsJoinPIntegerPk( - new Criteria().addAscendingOrderByColumn(MultiRefPeer.ID)); + = baseObject.getMultiRefsJoinPIntegerPk( + new Criteria().addAscendingOrderByColumn(MultiRefPeer.ID)); // verify assertEquals(3, multiRefs.size()); @@ -148,8 +148,8 @@ public class GetRelatedObjectsJoinTest e baseObject = OIntegerPkPeer.doSelectSingleRecord(baseObject); baseObject.initMultiRefs(); List<MultiRef> multiRefs - = baseObject.getMultiRefsJoinPIntegerPk( - new Criteria().addAscendingOrderByColumn(MultiRefPeer.ID)); + = baseObject.getMultiRefsJoinPIntegerPk( + new Criteria().addAscendingOrderByColumn(MultiRefPeer.ID)); // verify assertEquals(3, multiRefs.size()); @@ -197,12 +197,12 @@ public class GetRelatedObjectsJoinTest e OIntegerPk baseObject = testData.getOIntegerPkList().get(0); baseObject = OIntegerPkPeer.doSelectSingleRecord(baseObject); baseObject.getMultiRefsJoinPIntegerPk( - new Criteria().addAscendingOrderByColumn(MultiRefPeer.ID)); + new Criteria().addAscendingOrderByColumn(MultiRefPeer.ID)); List<MultiRef> multiRefs - = baseObject.getMultiRefsJoinPIntegerPk( - new Criteria().addAscendingOrderByColumn(MultiRefPeer.ID) - .where(PIntegerPkPeer.ID, - testData.getPIntegerPkList().get(0).getId())); + = baseObject.getMultiRefsJoinPIntegerPk( + new Criteria().addAscendingOrderByColumn(MultiRefPeer.ID) + .where(PIntegerPkPeer.ID, + testData.getPIntegerPkList().get(0).getId())); // verify assertEquals(2, multiRefs.size()); @@ -243,8 +243,8 @@ public class GetRelatedObjectsJoinTest e OIntegerPk baseObject = testData.getOIntegerPkList().get(0); baseObject = OIntegerPkPeer.doSelectSingleRecord(baseObject); List<MultiRefSameTable> multiRefSameTables - = baseObject.getMultiRefSameTableRelatedByReference1sJoinOIntegerPkRelatedByReference2( - new Criteria().addAscendingOrderByColumn(MultiRefSameTablePeer.ID)); + = baseObject.getMultiRefSameTableRelatedByReference1sJoinOIntegerPkRelatedByReference2( + new Criteria().addAscendingOrderByColumn(MultiRefSameTablePeer.ID)); assertEquals(3, multiRefSameTables.size()); assertEquals("multiRefSameTable111a", multiRefSameTables.get(0).getName()); assertEquals("multiRefSameTable111b", multiRefSameTables.get(1).getName()); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java Mon Aug 27 09:48:33 2018 @@ -94,7 +94,7 @@ public class SaveTest extends BaseDataba Criteria criteria = new Criteria().where(OIntegerPkPeer.ID, 3001); List<OIntegerPk> integerObjectPkList - = OIntegerPkPeer.doSelect(criteria); + = OIntegerPkPeer.doSelect(criteria); assertEquals(1, integerObjectPkList.size()); assertEquals( Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/BaseOptimisticLockingTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/BaseOptimisticLockingTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/BaseOptimisticLockingTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/BaseOptimisticLockingTest.java Mon Aug 27 09:48:33 2018 @@ -254,7 +254,7 @@ public abstract class BaseOptimisticLock private List<T> fillDatabase() throws TorqueException { - List<T> result = new ArrayList<T>(); + List<T> result = new ArrayList<>(); peer.doDelete(new Criteria()); T optimisticLocking = newObject(); optimisticLocking.setName("1"); Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java Mon Aug 27 09:48:33 2018 @@ -61,7 +61,7 @@ import org.apache.torque.util.JdbcTypedV public class DefaultValuesFromDatabaseTest extends BaseDatabaseTestCase { private static Log log - = LogFactory.getLog(DefaultValuesFromDatabaseTest.class); + = LogFactory.getLog(DefaultValuesFromDatabaseTest.class); /** The default date format. */ private static String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; @@ -72,7 +72,7 @@ public class DefaultValuesFromDatabaseTe public void testJavaDefault() throws Exception { DatabaseDefaultValues databaseDefaultValues - = new DatabaseDefaultValues(); + = new DatabaseDefaultValues(); assertEquals(Integer.valueOf(2), databaseDefaultValues.getOInteger()); assertEquals(4, databaseDefaultValues.getPInt()); assertEquals("Default!", databaseDefaultValues.getVarcharField()); @@ -92,10 +92,10 @@ public class DefaultValuesFromDatabaseTe public void testGetColumnValuesNewUnchangedObject() throws Exception { DatabaseDefaultValues databaseDefaultValues - = new DatabaseDefaultValues(); + = new DatabaseDefaultValues(); ColumnValues columnValues - = DatabaseDefaultValuesPeer.buildColumnValues( - databaseDefaultValues); + = DatabaseDefaultValuesPeer.buildColumnValues( + databaseDefaultValues); assertEquals(1, columnValues.size()); assertEquals( columnValues.get(DatabaseDefaultValuesPeer.NORMAL_PAYLOAD), @@ -109,7 +109,7 @@ public class DefaultValuesFromDatabaseTe { DatabaseDefaultValuesPeer.doDelete(new Criteria()); DatabaseDefaultValues databaseDefaultValues - = new DatabaseDefaultValues(); + = new DatabaseDefaultValues(); databaseDefaultValues.save(); @@ -122,23 +122,23 @@ public class DefaultValuesFromDatabaseTe assertEquals(null, databaseDefaultValues.getTimestampField()); // re-loading should give the database default values List<DatabaseDefaultValues> databaseDefaultValuesList - = DatabaseDefaultValuesPeer.doSelect(new Criteria()); + = DatabaseDefaultValuesPeer.doSelect(new Criteria()); assertEquals(1, databaseDefaultValuesList.size()); DatabaseDefaultValues databaseDefaultValuesSaved - = databaseDefaultValuesList.get(0); + = databaseDefaultValuesList.get(0); assertEquals( new Integer(2), databaseDefaultValuesSaved.getOInteger()); assertEquals(4, databaseDefaultValuesSaved.getPInt()); assertEquals("Default!", databaseDefaultValuesSaved.getVarcharField()); assertEquals(toString(doSelect(toDate("2010-09-08 00:00:00"), - java.sql.Date.class)), + java.sql.Date.class)), toString(databaseDefaultValuesSaved.getDateField())); assertEquals(toString(doSelect(toDate("1970-01-01 10:20:30"), - java.sql.Time.class)), + java.sql.Time.class)), toString(databaseDefaultValuesSaved.getTimeField())); assertEquals(toString(doSelect(toDate("2010-09-08 11:12:13"), - java.sql.Timestamp.class)), + java.sql.Timestamp.class)), toString(databaseDefaultValuesSaved.getTimestampField())); } @@ -150,19 +150,19 @@ public class DefaultValuesFromDatabaseTe { DatabaseDefaultValuesPeer.doDelete(new Criteria()); DatabaseDefaultValues databaseDefaultValues - = new DatabaseDefaultValues(); + = new DatabaseDefaultValues(); databaseDefaultValues.setOInteger(1); databaseDefaultValues.setPInt(3); databaseDefaultValues.setVarcharField("Changed!"); databaseDefaultValues.setDateField( new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") - .parse("2000-01-02 00:00:00")); + .parse("2000-01-02 00:00:00")); databaseDefaultValues.setTimeField( new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") - .parse("1970-01-01 11:21:31")); + .parse("1970-01-01 11:21:31")); databaseDefaultValues.setTimestampField( new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") - .parse("2010-09-08 12:13:14")); + .parse("2010-09-08 12:13:14")); databaseDefaultValues.save(); @@ -172,34 +172,34 @@ public class DefaultValuesFromDatabaseTe assertEquals("Changed!", databaseDefaultValues.getVarcharField()); assertEquals( new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") - .parse("2000-01-02 00:00:00"), + .parse("2000-01-02 00:00:00"), databaseDefaultValues.getDateField()); assertEquals( new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") - .parse("1970-01-01 11:21:31"), + .parse("1970-01-01 11:21:31"), databaseDefaultValues.getTimeField()); assertEquals( new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") - .parse("2010-09-08 12:13:14"), + .parse("2010-09-08 12:13:14"), databaseDefaultValues.getTimestampField()); List<DatabaseDefaultValues> defaultValuesList - = DatabaseDefaultValuesPeer.doSelect(new Criteria()); + = DatabaseDefaultValuesPeer.doSelect(new Criteria()); assertEquals(1, defaultValuesList.size()); DatabaseDefaultValues databaseDefaultValuesSaved - = defaultValuesList.get(0); + = defaultValuesList.get(0); assertEquals( new Integer(1), databaseDefaultValuesSaved.getOInteger()); assertEquals(3, databaseDefaultValuesSaved.getPInt()); assertEquals("Changed!", databaseDefaultValuesSaved.getVarcharField()); assertEquals(toString(doSelect(toDate("2000-01-02 00:00:00"), - java.sql.Date.class)), + java.sql.Date.class)), toString(databaseDefaultValuesSaved.getDateField())); assertEquals(toString(doSelect(toDate("1970-01-01 11:21:31"), - java.sql.Time.class)), + java.sql.Time.class)), toString(databaseDefaultValuesSaved.getTimeField())); assertEquals(toString(doSelect(toDate("2010-09-08 12:13:14"), - java.sql.Timestamp.class)), + java.sql.Timestamp.class)), toString(databaseDefaultValuesSaved.getTimestampField())); } @@ -210,15 +210,15 @@ public class DefaultValuesFromDatabaseTe { DatabaseDefaultValuesPeer.doDelete(new Criteria()); DatabaseDefaultValues databaseDefaultValues - = new DatabaseDefaultValues(); + = new DatabaseDefaultValues(); databaseDefaultValues.save(); // modify object in db so we can check that the unchanged values // are saved List<DatabaseDefaultValues> databaseDefaultValuesList - = DatabaseDefaultValuesPeer.doSelect(new Criteria()); + = DatabaseDefaultValuesPeer.doSelect(new Criteria()); assertEquals(1, databaseDefaultValuesList.size()); DatabaseDefaultValues changedValuesInDatabase - = databaseDefaultValuesList.get(0); + = databaseDefaultValuesList.get(0); changedValuesInDatabase.setOInteger(1); changedValuesInDatabase.setPInt(3); changedValuesInDatabase.setVarcharField("Changed!"); @@ -244,10 +244,10 @@ public class DefaultValuesFromDatabaseTe // re-loading should give the unchanged values // (changes in the db were overwritten by the second save) databaseDefaultValuesList - = DatabaseDefaultValuesPeer.doSelect(new Criteria()); + = DatabaseDefaultValuesPeer.doSelect(new Criteria()); assertEquals(1, databaseDefaultValuesList.size()); DatabaseDefaultValues databaseDefaultValuesSaved - = databaseDefaultValuesList.get(0); + = databaseDefaultValuesList.get(0); assertEquals( new Integer(2), databaseDefaultValuesSaved.getOInteger()); @@ -278,7 +278,7 @@ public class DefaultValuesFromDatabaseTe Date currentDateAfter = doSelect("CURRENT_DATE", java.sql.Date.class); List<CurrentDateTable> dbStateList - = CurrentDateTablePeer.doSelect(new Criteria()); + = CurrentDateTablePeer.doSelect(new Criteria()); assertEquals(1, dbStateList.size()); CurrentDateTable dbState = dbStateList.get(0); assertFalse( @@ -309,7 +309,7 @@ public class DefaultValuesFromDatabaseTe Date currentDateAfter = doSelect("CURRENT_TIME", Time.class); List<CurrentTimeTable> dbStateList - = CurrentTimeTablePeer.doSelect(new Criteria()); + = CurrentTimeTablePeer.doSelect(new Criteria()); assertEquals(1, dbStateList.size()); CurrentTimeTable dbState = dbStateList.get(0); if (timezoneBuggyInCurrentTime()) @@ -344,7 +344,7 @@ public class DefaultValuesFromDatabaseTe Date currentTimestampAfter = doSelect("CURRENT_TIMESTAMP", Timestamp.class); List<CurrentTimestampTable> dbStateList - = CurrentTimestampTablePeer.doSelect(new Criteria()); + = CurrentTimestampTablePeer.doSelect(new Criteria()); assertEquals(1, dbStateList.size()); CurrentTimestampTable dbState = dbStateList.get(0); assertFalse( Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java?rev=1839288&r1=1839287&r2=1839288&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java Mon Aug 27 09:48:33 2018 @@ -56,7 +56,7 @@ public class DefaultValuesFromJavaTest e || defaultAdapter instanceof MysqlAdapter) { log.error("testCurrentDateAsJavaDefault(): " - + "MSSQL and Mysql do not support the CURRENT_DATE function"); + + "MSSQL and Mysql do not support the CURRENT_DATE function"); return; } GregorianCalendar currentCalendarBefore = new GregorianCalendar(); @@ -73,14 +73,14 @@ public class DefaultValuesFromJavaTest e assertFalse( "currentDate " + javaDefaultValues.getCurrentDateValue() - + " should be >= currentDateBefore " - + currentCalendarBefore.getTime(), + + " should be >= currentDateBefore " + + currentCalendarBefore.getTime(), javaDefaultValues.getCurrentDateValue().before( currentCalendarBefore.getTime())); assertFalse( "currentDate " + javaDefaultValues.getCurrentDateValue() - + " should be <= currentDateAfter " - + currentCalendarAfter.getTime(), + + " should be <= currentDateAfter " + + currentCalendarAfter.getTime(), javaDefaultValues.getCurrentDateValue().after( currentCalendarAfter.getTime())); } @@ -98,8 +98,8 @@ public class DefaultValuesFromJavaTest e || defaultAdapter instanceof MysqlAdapter) { log.error("testCurrentTimeAsJavaDefault(): " - + "Oracle, MSSQL and Mysql do not support " - + "the CURRENT_TIME function"); + + "Oracle, MSSQL and Mysql do not support " + + "the CURRENT_TIME function"); return; } GregorianCalendar currentCalendarBefore = new GregorianCalendar(); @@ -128,8 +128,8 @@ public class DefaultValuesFromJavaTest e if (defaultAdapter instanceof MysqlAdapter) { log.error("testCurrentTimestampAsJavaDefault(): " - + "Mysql does not support " - + "the CURRENT_TIMESTAMP function"); + + "Mysql does not support " + + "the CURRENT_TIMESTAMP function"); return; } Date currentDateBefore = new Date(); @@ -195,7 +195,7 @@ public class DefaultValuesFromJavaTest e JavaDefaultValues javaDefaultValues = new JavaDefaultValues(); assertEquals("2010-09-08 00:00:00", - toString(javaDefaultValues.getDateField())); + toString(javaDefaultValues.getDateField())); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org
